Do not use single char attributes

Space is not a problem, these passwords are in Maven settings
only, so "space saver short attributes" are meaningless.

Author: cstamas

src/main/java/org/codehaus/plexus/components/secdispatcher/SecDispatcher.java

@@ -31,12 +31,12 @@ public interface SecDispatcher {
      *
      * @see #availableDispatchers()
      */
-    String DISPATCHER_NAME_ATTR = "n";
+    String DISPATCHER_NAME_ATTR = "name";
 
     /**
      * Attribute for version that dispatcher should use.
      */
-    String DISPATCHER_VERSION_ATTR = "v";
+    String DISPATCHER_VERSION_ATTR = "version";
 
     /**
      * Returns the set of available dispatcher metadata, never {@code null}.

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

@@ -40,9 +40,9 @@
 public class MasterDispatcher implements Dispatcher, DispatcherMeta {
     public static final String NAME = "master";
 
-    private static final String MASTER_CIPHER_ATTR = "c";
     private static final String CONF_MASTER_CIPHER = "cipher";
     private static final String CONF_MASTER_SOURCE = "source";
+    private static final String MASTER_CIPHER_ATTR = CONF_MASTER_CIPHER;
 
     private final PlexusCipher cipher;
     protected final Map<String, MasterSource> masterSources;
@@ -76,8 +76,7 @@ public Collection<Field> fields() {
                                         Field.Builder b =
                                                 Field.builder(e.getKey()).description(m.description());
                                         if (m.configTemplate().isPresent()) {
-                                            b = b.defaultValue(
-                                                    m.configTemplate().get());
+                                            b.defaultValue(m.configTemplate().get());
                                         }
                                         return b.build();
                                     } else {

src/test/java/org/codehaus/plexus/components/secdispatcher/internal/DefaultSecDispatcherTest.java

@@ -117,9 +117,9 @@ protected void roundtrip() throws Exception {
         // example:
         // {[name=master,cipher=AES/GCM/NoPadding,a=b]vvq66pZ7rkvzSPStGTI9q4QDnsmuDwo+LtjraRel2b0XpcGJFdXcYAHAS75HUA6GLpcVtEkmyQ==}
         assertTrue(encrypted.startsWith("{") && encrypted.endsWith("}"));
-        assertTrue(encrypted.contains("n=master"));
-        assertTrue(encrypted.contains("c=" + AESGCMNoPadding.CIPHER_ALG));
-        assertTrue(encrypted.contains("v=test"));
+        assertTrue(encrypted.contains("name=master"));
+        assertTrue(encrypted.contains("cipher=" + AESGCMNoPadding.CIPHER_ALG));
+        assertTrue(encrypted.contains("version=test"));
         assertTrue(encrypted.contains("a=b"));
         String pass = sd.decrypt(encrypted);
         assertEquals("supersecret", pass);