Tidy up messages

Author: cstamas

src/main/java/org/codehaus/plexus/components/secdispatcher/internal/DefaultSecDispatcher.java

@@ -196,22 +196,22 @@ public ValidationResponse validateConfiguration() {
                             .add("No default dispatcher set in configuration");
                 } else {
                     report.computeIfAbsent(ValidationResponse.Level.INFO, k -> new ArrayList<>())
-                            .add("Default dispatcher set to " + defaultDispatcher);
+                            .add("Default dispatcher configured");
                     Dispatcher dispatcher = dispatchers.get(defaultDispatcher);
                     if (dispatcher == null) {
                         report.computeIfAbsent(ValidationResponse.Level.ERROR, k -> new ArrayList<>())
-                                .add("Default dispatcher " + defaultDispatcher + " not present in system");
+                                .add("Configured default dispatcher not present in system");
                     } else {
                         ValidationResponse dispatcherResponse =
                                 dispatcher.validateConfiguration(prepareDispatcherConfig(defaultDispatcher));
                         subsystems.add(dispatcherResponse);
                         if (!dispatcherResponse.isValid()) {
                             report.computeIfAbsent(ValidationResponse.Level.ERROR, k -> new ArrayList<>())
-                                    .add("Default dispatcher " + defaultDispatcher + " configuration is invalid");
+                                    .add("Configured default dispatcher configuration is invalid");
                         } else {
                             valid = true;
                             report.computeIfAbsent(ValidationResponse.Level.INFO, k -> new ArrayList<>())
-                                    .add("Default dispatcher " + defaultDispatcher + " configuration is valid");
+                                    .add("Configured default dispatcher configuration is valid");
 
                             // below is legacy check, that does not affect validity of config, is merely informational
                             Dispatcher legacy = dispatchers.get(LegacyDispatcher.NAME);

src/main/java/org/codehaus/plexus/components/secdispatcher/internal/dispatchers/LegacyDispatcher.java

@@ -114,24 +114,24 @@ public SecDispatcher.ValidationResponse validateConfiguration(Map<String, String
             String mpe = getMasterMasterPasswordFromSettingsSecurityXml();
             if (mpe == null) {
                 report.computeIfAbsent(SecDispatcher.ValidationResponse.Level.ERROR, k -> new ArrayList<>())
-                        .add("Legacy configuration not found or does not contain encrypted master password");
+                        .add("Legacy configuration not found or does not contains encrypted master password");
             } else {
                 report.computeIfAbsent(SecDispatcher.ValidationResponse.Level.INFO, k -> new ArrayList<>())
-                        .add("Legacy configuration found and contain encrypted master password");
+                        .add("Legacy configuration found with encrypted master password");
 
                 String mp = getMasterPassword();
                 if (mp == null) {
                     report.computeIfAbsent(SecDispatcher.ValidationResponse.Level.ERROR, k -> new ArrayList<>())
-                            .add("Master Password not found");
+                            .add("Legacy master password not found");
                 } else {
                     report.computeIfAbsent(SecDispatcher.ValidationResponse.Level.INFO, k -> new ArrayList<>())
-                            .add("Master Password successfully decrypted");
+                            .add("Legacy master password successfully decrypted");
                     valid = true;
                 }
             }
         } catch (PlexusCipherException e) {
             report.computeIfAbsent(SecDispatcher.ValidationResponse.Level.ERROR, k -> new ArrayList<>())
-                    .add("Master Password decryption failed");
+                    .add("Legacy master password decryption failed");
         }
         return new SecDispatcher.ValidationResponse(getClass().getSimpleName(), valid, report, List.of());
     }

src/main/java/org/codehaus/plexus/components/secdispatcher/internal/dispatchers/MasterDispatcher.java

@@ -131,20 +131,20 @@ public SecDispatcher.ValidationResponse validateConfiguration(Map<String, String
         String masterCipher = config.get(CONF_MASTER_CIPHER);
         if (masterCipher == null) {
             report.computeIfAbsent(SecDispatcher.ValidationResponse.Level.ERROR, k -> new ArrayList<>())
-                    .add("Master Cipher configuration missing");
+                    .add("Cipher configuration missing");
         } else {
             if (!cipher.availableCiphers().contains(masterCipher)) {
                 report.computeIfAbsent(SecDispatcher.ValidationResponse.Level.ERROR, k -> new ArrayList<>())
-                        .add("Master Cipher " + masterCipher + " not supported");
+                        .add("Configured Cipher not supported");
             } else {
                 report.computeIfAbsent(SecDispatcher.ValidationResponse.Level.INFO, k -> new ArrayList<>())
-                        .add("Master Cipher " + masterCipher + " supported");
+                        .add("Configured Cipher supported");
             }
         }
         String masterSource = config.get(CONF_MASTER_SOURCE);
         if (masterSource == null) {
             report.computeIfAbsent(SecDispatcher.ValidationResponse.Level.ERROR, k -> new ArrayList<>())
-                    .add("Master Source configuration missing");
+                    .add("Source configuration missing");
         } else {
             SecDispatcher.ValidationResponse masterSourceResponse = null;
             for (MasterSource masterPasswordSource : masterSources.values()) {
@@ -155,15 +155,15 @@ public SecDispatcher.ValidationResponse validateConfiguration(Map<String, String
             }
             if (masterSourceResponse == null) {
                 report.computeIfAbsent(SecDispatcher.ValidationResponse.Level.ERROR, k -> new ArrayList<>())
-                        .add("Master Source configuration `" + masterSource + "` not handled");
+                        .add("Configured Source configuration not handled");
             } else {
                 subsystems.add(masterSourceResponse);
                 if (!masterSourceResponse.isValid()) {
                     report.computeIfAbsent(SecDispatcher.ValidationResponse.Level.ERROR, k -> new ArrayList<>())
-                            .add("Master Source configuration `" + masterSource + "` invalid");
+                            .add("Configured Source configuration invalid");
                 } else {
                     report.computeIfAbsent(SecDispatcher.ValidationResponse.Level.INFO, k -> new ArrayList<>())
-                            .add("Master Source configuration `" + masterSource + "` valid");
+                            .add("Configured Source configuration valid");
                     valid = true;
                 }
             }