Simplify internals

Author: garydgregory

commons-vfs2/src/main/java/org/apache/commons/vfs2/UserAuthenticationData.java

@@ -16,11 +16,12 @@
  */
 package org.apache.commons.vfs2;
 
-import java.util.Arrays;
 import java.util.Map;
 import java.util.Objects;
 import java.util.TreeMap;
 
+import org.apache.commons.lang3.ArrayFill;
+
 /**
  * Contains various authentication data.
  */
@@ -103,13 +104,9 @@ public UserAuthenticationData() {
     public void cleanup() {
         // step 1: nullify character buffers
         for (final char[] data : authenticationData.values()) {
-            if (data == null) {
-                continue;
-            }
-
-            Arrays.fill(data, (char) 0);
+            ArrayFill.fill(data, (char) 0);
         }
-        // step 2: allow data itself to gc
+        // step 2: allow data itself to GC
         authenticationData.clear();
     }
 

commons-vfs2/src/main/java/org/apache/commons/vfs2/util/UserAuthenticatorUtils.java

@@ -51,7 +51,6 @@ public static UserAuthenticationData authenticate(final UserAuthenticator auth,
         if (auth == null) {
             return null;
         }
-
         return auth.requestAuthentication(authenticatorTypes);
     }
 
@@ -67,24 +66,20 @@ public static void cleanup(final UserAuthenticationData authData) {
     }
 
     /**
-     * Gets data of given type from the UserAuthenticationData or null if there is no data or data of this type
-     * available.
+     * Gets a copy of the data of a given type from the UserAuthenticationData or null if there is no data or data of this type available.
      *
-     * @param data The UserAuthenticationData.
-     * @param type The type of the element to retrieve.
+     * @param data            The UserAuthenticationData.
+     * @param type            The type of the element to retrieve.
      * @param overriddenValue The default value.
      * @return The data of the given type as a character array or null if the data is not available.
      */
-    public static char[] getData(final UserAuthenticationData data, final UserAuthenticationData.Type type,
-            final char[] overriddenValue) {
+    public static char[] getData(final UserAuthenticationData data, final UserAuthenticationData.Type type, final char[] overriddenValue) {
         if (overriddenValue != null) {
             return overriddenValue;
         }
-
         if (data == null) {
             return null;
         }
-
         return data.getData(type);
     }
 
@@ -98,7 +93,6 @@ public static char[] toChar(final String string) {
         if (string == null) {
             return null;
         }
-
         return string.toCharArray();
     }
 
@@ -112,7 +106,6 @@ public static String toString(final char[] data) {
         if (data == null) {
             return null;
         }
-
         return new String(data);
     }