8273098: Unnecessary Vector usage in java.naming

Reviewed-by: aefimov, dfuchs

Author: turbanoff

src/java.naming/share/classes/com/sun/jndi/ldap/LdapSchemaParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
 
 import javax.naming.*;
 import javax.naming.directory.*;
-import java.util.Vector;
+import java.util.ArrayList;
 
 /**
  * Netscape's 3.1 servers have some schema bugs:
@@ -519,7 +519,7 @@ private static final String[] readQDescrList(String string, int[] pos)
         throws NamingException {
 
         int begin, end;
-        Vector<String> values = new Vector<>(5);
+        ArrayList<String> values = new ArrayList<>(5);
 
         if (debug) {
             System.err.println("ReadQDescrList: pos="+pos[0]);
@@ -543,7 +543,7 @@ private static final String[] readQDescrList(String string, int[] pos)
                                    "' at begin=" + begin + " end =" + end);
             }
 
-            values.addElement(one[0]);
+            values.add(one[0]);
             skipWhitespace(string, pos);
             begin = pos[0];
         }
@@ -552,7 +552,7 @@ private static final String[] readQDescrList(String string, int[] pos)
 
         String[] answer = new String[values.size()];
         for (int i = 0; i < answer.length; i++) {
-            answer[i] = values.elementAt(i);
+            answer[i] = values.get(i);
         }
         return answer;
     }
@@ -613,7 +613,7 @@ private static final String[] readOIDs(String string, int[] pos)
 
         int     begin, cur, end;
         String  oidName = null;
-        Vector<String> values = new Vector<>(5);
+        ArrayList<String> values = new ArrayList<>(5);
 
         if (debug) {
             System.err.println("ReadOIDList: pos="+pos[0]);
@@ -641,7 +641,7 @@ private static final String[] readOIDs(String string, int[] pos)
                 System.err.println("ReadOIDList: found '" + oidName +
                                    "' at begin=" + begin + " end =" + end);
             }
-            values.addElement(oidName);
+            values.add(oidName);
             pos[0] = cur + 1;
             skipWhitespace(string, pos);
             begin = pos[0];
@@ -656,13 +656,13 @@ private static final String[] readOIDs(String string, int[] pos)
 
         int wsBegin = findTrailingWhitespace(string, end - 1);
         oidName = string.substring(begin, wsBegin);
-        values.addElement(oidName);
+        values.add(oidName);
 
         pos[0] = end+1;
 
         String[] answer = new String[values.size()];
         for (int i = 0; i < answer.length; i++) {
-            answer[i] = values.elementAt(i);
+            answer[i] = values.get(i);
         }
         return answer;
     }

src/java.naming/share/classes/com/sun/jndi/ldap/Obj.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,9 +38,9 @@
 import java.io.ObjectStreamClass;
 import java.io.InputStream;
 
+import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Hashtable;
-import java.util.Vector;
 import java.util.StringTokenizer;
 
 import java.lang.reflect.Proxy;
@@ -205,13 +205,13 @@ private static String[] getCodebases(Attribute codebaseAttr) throws
         } else {
             StringTokenizer parser =
                 new StringTokenizer((String)codebaseAttr.get());
-            Vector<String> vec = new Vector<>(10);
+            ArrayList<String> list = new ArrayList<>(10);
             while (parser.hasMoreTokens()) {
-                vec.addElement(parser.nextToken());
+                list.add(parser.nextToken());
             }
-            String[] answer = new String[vec.size()];
+            String[] answer = new String[list.size()];
             for (int i = 0; i < answer.length; i++) {
-                answer[i] = vec.elementAt(i);
+                answer[i] = list.get(i);
             }
             return answer;
         }
@@ -409,11 +409,10 @@ private static Reference decodeReference(Attributes attrs,
             ClassLoader cl = helper.getURLClassLoader(codebases);
 
             /*
-             * Temporary Vector for decoded RefAddr addresses - used to ensure
+             * Temporary array for decoded RefAddr addresses - used to ensure
              * unordered addresses are correctly re-ordered.
              */
-            Vector<RefAddr> refAddrList = new Vector<>();
-            refAddrList.setSize(attr.size());
+            RefAddr[] refAddrList = new RefAddr[attr.size()];
 
             for (NamingEnumeration<?> vals = attr.getAll(); vals.hasMore(); ) {
 
@@ -464,7 +463,7 @@ private static Reference decodeReference(Attributes attrs,
                 // extract content
                 if (start == val.length()) {
                     // Empty content
-                    refAddrList.setElementAt(new StringRefAddr(type, null), posn);
+                    refAddrList[posn] = new StringRefAddr(type, null);
                 } else if (val.charAt(start) == separator) {
                     // Double separators indicate a non-StringRefAddr
                     // Content is a Base64-encoded serialized RefAddr
@@ -480,17 +479,17 @@ private static Reference decodeReference(Attributes attrs,
                             decoder.decode(val.substring(start).getBytes()),
                             cl);
 
-                    refAddrList.setElementAt(ra, posn);
+                    refAddrList[posn] = ra;
                 } else {
                     // Single separator indicates a StringRefAddr
-                    refAddrList.setElementAt(new StringRefAddr(type,
-                        val.substring(start)), posn);
+                    refAddrList[posn] = new StringRefAddr(type,
+                        val.substring(start));
                 }
             }
 
             // Copy to real reference
-            for (int i = 0; i < refAddrList.size(); i++) {
-                ref.add(refAddrList.elementAt(i));
+            for (int i = 0; i < refAddrList.length; i++) {
+                ref.add(refAddrList[i]);
             }
         }
 

src/java.naming/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
 
 import java.io.*;
 import java.security.cert.X509Certificate;
-import java.util.Vector;
+import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.StringTokenizer;
 
@@ -216,13 +216,13 @@ public static LdapResult saslBind(LdapClient clnt, Connection conn,
       */
     private static String[] getSaslMechanismNames(String str) {
         StringTokenizer parser = new StringTokenizer(str);
-        Vector<String> mechs = new Vector<>(10);
+        ArrayList<String> mechs = new ArrayList<>(10);
         while (parser.hasMoreTokens()) {
-            mechs.addElement(parser.nextToken());
+            mechs.add(parser.nextToken());
         }
         String[] mechNames = new String[mechs.size()];
         for (int i = 0; i < mechs.size(); i++) {
-            mechNames[i] = mechs.elementAt(i);
+            mechNames[i] = mechs.get(i);
         }
         return mechNames;
     }