[java-identity-provider] branch main updated: Logging nits.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=5d7c7bbf38112214ab880b1e952d8a95eb6fb223

The following commit(s) were added to refs/heads/main by this push:
       new  5d7c7bbf3 Logging nits.
5d7c7bbf3 is described below

commit 5d7c7bbf38112214ab880b1e952d8a95eb6fb223
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Feb 9 12:31:49 2021 -0500

    Logging nits.
---
 .../installer/plugin/impl/PluginInstallerArguments.java  |  2 +-
 .../idp/installer/plugin/impl/PluginInstallerCLI.java    | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerArguments.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerArguments.java
index 704cebad1..713ffc0ab 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerArguments.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerArguments.java
@@ -321,7 +321,7 @@ public class PluginInstallerArguments extends AbstractIdPHomeAwareCommandLineArg
         out.println("Plugin");
         out.println("Provides a command line interface for plugin management operations.");
         out.println();
-        out.println("   Plugn [options] springConfiguration [FullName]");
+        out.println("   Plugin [options] springConfiguration [FullName]");
         out.println();
         out.println("      springConfiguration      name of Spring configuration resource to use");
         super.printHelp(out);
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java
index ee53545ba..29ab839e6 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java
@@ -178,7 +178,7 @@ public final class PluginInstallerCLI extends AbstractIdPHomeAwareCommandLine<Pl
             final PluginInstallerArguments args) throws ComponentInitializationException {
         inst.setIdpHome(Path.of(getApplicationContext().getEnvironment().getProperty("idp.home")));
         if (!args.isUnattended()) {
-            inst.setAcceptKey(new InstallerQuery("Accept this Key"));
+            inst.setAcceptKey(new InstallerQuery("Accept this key"));
         }
         inst.setTrustore(args.getTruststore());
         if (getHttpClient()!= null) {
@@ -205,7 +205,7 @@ public final class PluginInstallerCLI extends AbstractIdPHomeAwareCommandLine<Pl
      * @param plugin what we are interested in.
      */
     private void printDetails(final IdPPlugin plugin) {
-        log.debug("Interrogating {} ", plugin.getPluginId());
+        log.debug("Interrogating {}", plugin.getPluginId());
         final PluginState state =  new PluginState(plugin);
         if (getHttpClient() != null) {
             state.setHttpClient(getHttpClient());
@@ -304,7 +304,7 @@ public final class PluginInstallerCLI extends AbstractIdPHomeAwareCommandLine<Pl
         if (thePlugin == null) {
             log.warn("Plugin was not installed {}", pluginId);
             if (fromContentsVersion != null) {
-                log.error("Plugin {} not installed, but contents found.", pluginId);
+                log.error("Plugin {} not installed, but contents found", pluginId);
                 log.debug("{}", contents);
             } else {
                 return;
@@ -319,7 +319,7 @@ public final class PluginInstallerCLI extends AbstractIdPHomeAwareCommandLine<Pl
                     pluginId, installedVersion, fromContentsVersion);
         }
         if (contents.isEmpty()) {
-            log.info("No Contents");
+            log.info("No contents");
         } else {
             for (final String s: contents) {
                 outOrLog(String.format("%s", s));
@@ -341,14 +341,14 @@ public final class PluginInstallerCLI extends AbstractIdPHomeAwareCommandLine<Pl
         final PluginVersion idPVersion;
         if (idpVersionString == null) {
             idPVersion = new PluginVersion(4,1,0);
-            log.error("Could not determine IdP Version.  Assuming 4.1.0");
+            log.error("Could not determine IdP Version. Assuming 4.1.0");
         } else {
             idPVersion = new PluginVersion(idpVersionString);
         }
 
         final List<PluginVersion> availableVersions = new ArrayList<>(state.getAvailableVersions().keySet());
         availableVersions.sort(null);
-        log.debug("Considering versions {}", availableVersions);
+        log.debug("Considering versions: {}", availableVersions);
 
         for (int i = availableVersions.size()-1; i >= 0; i--) {
             final PluginVersion version = availableVersions.get(i);
@@ -403,14 +403,14 @@ public final class PluginInstallerCLI extends AbstractIdPHomeAwareCommandLine<Pl
         if (pluginVersion == null) {
             installVersion = getBestVersion(plugin, state);
             if (installVersion == null) {
-                log.info("No Suitable update version available");
+                log.info("No suitable update version available");
                 return;
             }
         } else {
             installVersion = pluginVersion;
             final Map<PluginVersion, VersionInfo> versions = state.getAvailableVersions();
             if (!versions.containsKey(installVersion)) {
-                log.error("Specified version {} could not be found.  Available versions {}",
+                log.error("Specified version {} could not be found. Available versions: {}",
                         installVersion, versions.keySet());
                 return;
             }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.