From 95c3cb1394931c56e99e92e747d28ab0c5ed2ce5 Mon Sep 17 00:00:00 2001 From: gjoranv Date: Mon, 9 Jan 2023 12:45:10 +0100 Subject: Fix space and punctuation in error messages. --- .../com/yahoo/container/core/config/HandlersConfigurerDi.java | 8 ++++---- container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'container-core') diff --git a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java index 13c07ffb14b..30c271309d1 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java @@ -120,14 +120,14 @@ public class HandlersConfigurerDi { String versionsMessage = ""; if (activeVersions.size() == 1) { - versionsMessage = "There is an installed bundle with the same name with version: " + activeVersions.get(0); + versionsMessage = "There is an installed bundle with the same name with version: " + activeVersions.get(0) + " "; } else if (activeVersions.size() > 1) { - versionsMessage = "There are installed bundles with the same name with versions: " + activeVersions; + versionsMessage = "There are installed bundles with the same name with versions: " + activeVersions + " "; } if (qualifierIsUsed(bundleSpec, activeVersions)) { - versionsMessage += " Note that qualifier strings must be matched exactly"; + versionsMessage += " Note that qualifier strings must be matched exactly. "; } - return String.format("%s. Installed application bundles: [%s]", + return String.format("%sInstalled application bundles: [%s]", versionsMessage, activeBundles.stream() .map(BsnVersion::toReadableString) diff --git a/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java b/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java index 67680570ceb..4acdc3d544b 100644 --- a/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java +++ b/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java @@ -92,7 +92,7 @@ public class OsgiImpl implements Osgi { } protected String bundleResolutionErrorMessage(ComponentSpecification bundleSpec) { - return " If a bundle with the same name is installed, there is a either a version mismatch " + + return "If a bundle with the same name is installed, there is a either a version mismatch " + "or the installed bundle's version contains a qualifier string."; } -- cgit v1.2.3