Finish up legacy

Author: cstamas

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

@@ -111,7 +111,8 @@ public String encrypt(String str, Map<String, String> attr) throws SecDispatcher
                 attr.put(
                         DISPATCHER_NAME_ATTR,
                         requireNonNull(
-                                getConfiguration().getDefaultDispatcher(),
+                                requireNonNull(SecUtil.read(configurationFile), "no configuration")
+                                        .getDefaultDispatcher(),
                                 "no default dispatcher set in configuration"));
             }
             String name = attr.get(DISPATCHER_NAME_ATTR);
@@ -176,7 +177,7 @@ public void writeConfiguration(SettingsSecurity configuration) throws IOExceptio
 
     protected Map<String, String> prepareDispatcherConfig(String type) throws IOException {
         HashMap<String, String> dispatcherConf = new HashMap<>();
-        Map<String, String> conf = SecUtil.getConfig(getConfiguration(), type);
+        Map<String, String> conf = SecUtil.getConfig(SecUtil.read(configurationFile), type);
         if (conf != null) {
             dispatcherConf.putAll(conf);
         }
@@ -218,8 +219,4 @@ protected boolean isEncryptedString(String str) {
         if (str == null) return false;
         return cipher.isEncryptedString(str);
     }
-
-    protected SettingsSecurity getConfiguration() throws SecDispatcherException, IOException {
-        return SecUtil.read(configurationFile);
-    }
 }

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

@@ -20,6 +20,7 @@
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 import java.util.HashMap;
@@ -47,7 +48,7 @@ public final class SecUtil {
     private SecUtil() {}
 
     /**
-     * Reads the configuration model up, optionally resolving relocation too.
+     * Reads the configuration model up, if exists, otherwise returns {@code null}.
      */
     public static SettingsSecurity read(Path configurationFile) throws IOException {
         requireNonNull(configurationFile, "configurationFile must not be null");
@@ -57,11 +58,16 @@ public static SettingsSecurity read(Path configurationFile) throws IOException {
                 sec = new SecurityConfigurationStaxReader().read(in);
             }
             return sec;
+        } catch (NoSuchFileException e) {
+            return null;
         } catch (XMLStreamException e) {
             throw new IOException("Parsing error", e);
         }
     }
 
+    /**
+     * Returns config with given name, or {@code null} if not exist.
+     */
     public static Map<String, String> getConfig(SettingsSecurity sec, String name) {
         if (sec != null && name != null) {
             List<Config> cl = sec.getConfigurations();

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

@@ -74,7 +74,7 @@ public String name() {
 
     @Override
     public String displayName() {
-        return "LEGACY (for migration purposes; is hidden)";
+        return "LEGACY (for migration purposes only; can only decrypt)";
     }
 
     @Override