Use collections API when using Vector

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
eclipse-ee4j · Feb 27, 2024 · 9c3c30c · 9c3c30c
1 parent 9e60c41
commit 9c3c30c
Show file tree

Hide file tree

Showing 86 changed files with 365 additions and 369 deletions.
diff --git a/...e.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/DeleteOperation.java b/...e.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/DeleteOperation.java
@@ -141,7 +141,7 @@ public Object invoke(XRServiceAdapter xrService, Invocation invocation) {
             if (((Vector) toBeDeleted).isEmpty()) {
                 toBeDeleted = null;
             } else {
-                toBeDeleted = ((Vector)toBeDeleted).firstElement();
+                toBeDeleted = ((Vector)toBeDeleted).get(0);
             }
         }
         if (toBeDeleted != null) {

diff --git a/...se.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/QueryOperation.java b/...se.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/QueryOperation.java
@@ -430,12 +430,12 @@ public Object invoke(XRServiceAdapter xrService, Invocation invocation) {
             if (isSimpleXMLFormat()) {
                 value = createSimpleXMLFormat(xrService, value);
             } else {
-                if (!isCollection() && value instanceof Vector) {
+                if (!isCollection() && value instanceof Vector<?> v) {
                     // JPAQuery will return a single result in a Vector
-                    if (((Vector<?>) value).isEmpty()) {
+                    if (v.isEmpty()) {
                         return null;
                     }
-                    value = ((Vector<?>) value).firstElement();
+                    value = v.get(0);
                 }
 
                 QName resultType = getResultType();
@@ -538,7 +538,7 @@ public Object createSimpleXMLFormat(XRServiceAdapter xrService, Object value) {
         if (xmlTag != null && !EMPTY_STR.equals(xmlTag)) {
             tempXMLTag = xmlTag;
         }
-        Vector<DatabaseRecord> records = null;
+        List<DatabaseRecord> records = null;
         if (value instanceof ArrayList) {
             // JPA query results in a list of raw values
             // Here we have raw values returned as opposed to DatabaseRecords - this means
@@ -569,20 +569,20 @@ public Object createSimpleXMLFormat(XRServiceAdapter xrService, Object value) {
             } else {
                 dr.add(new DatabaseField(RESULT_STR), ((ArrayList<?>) value).get(0));
             }
-            records = new Vector<>();
+            records = new ArrayList<>();
             records.add(dr);
         } else if (value instanceof Vector) {
-            Class<?> vectorContent = ((Vector<?>)value).firstElement().getClass();
+            Class<?> vectorContent = ((Vector<?>)value).get(0).getClass();
             if (DatabaseRecord.class.isAssignableFrom(vectorContent)) {
                 records = (Vector<DatabaseRecord>)value;
             } else {
-                records = new Vector<>();
+                records = new ArrayList<>();
                 DatabaseRecord dr = new DatabaseRecord();
-                dr.add(new DatabaseField(RESULT_STR), ((Vector<?>)value).firstElement());
+                dr.add(new DatabaseField(RESULT_STR), ((Vector<?>)value).get(0));
                 records.add(dr);
             }
         } else {
-            records = new Vector<>();
+            records = new ArrayList<>();
             DatabaseRecord dr = new DatabaseRecord();
             dr.add(new DatabaseField(RESULT_STR), value);
             records.add(dr);

diff --git a/....persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/XRServiceFactory.java b/....persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/XRServiceFactory.java
@@ -42,7 +42,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import java.util.Vector;
 
 import jakarta.persistence.SharedCacheMode;
 import jakarta.persistence.ValidationMode;

diff --git a/...orba/src/main/java/org/eclipse/persistence/sessions/remote/corba/sun/CORBAConnection.java b/...orba/src/main/java/org/eclipse/persistence/sessions/remote/corba/sun/CORBAConnection.java
@@ -154,7 +154,7 @@ public Vector cursoredStreamNextPage(RemoteCursoredStream remoteCursoredStream,
             for (Iterator<Object> iterator = serverNextPageObjects.iterator(); iterator.hasNext();) {
                 // 2612538 - the default size of Map (32) is appropriate
                 Object clientObject = session.getObjectCorrespondingTo(iterator.next(), transporter.getObjectDescriptors(), new IdentityHashMap(), (ObjectLevelReadQuery)query);
-                clientNextPageObjects.addElement(clientObject);
+                clientNextPageObjects.add(clientObject);
             }
         }
 

diff --git a/...e.corba/src/main/java/org/eclipse/persistence/sessions/remote/rmi/iiop/RMIConnection.java b/...e.corba/src/main/java/org/eclipse/persistence/sessions/remote/rmi/iiop/RMIConnection.java
@@ -204,7 +204,7 @@ public Vector cursoredStreamNextPage(RemoteCursoredStream remoteCursoredStream,
             for (Iterator<Object> iterator = serverNextPageObjects.iterator(); iterator.hasNext();) {
                 // 2612538 - the default size of Map (32) is appropriate
                 Object clientObject = session.getObjectCorrespondingTo(iterator.next(), transporter.getObjectDescriptors(), new IdentityHashMap(), (ObjectLevelReadQuery)query);
-                clientNextPageObjects.addElement(clientObject);
+                clientNextPageObjects.add(clientObject);
             }
         }
 

diff --git a/...st.framework/src/main/java/org/eclipse/persistence/testing/framework/BatchTestRunner.java b/...st.framework/src/main/java/org/eclipse/persistence/testing/framework/BatchTestRunner.java
@@ -56,10 +56,10 @@ private void run(String[] args) {
         log("*** Beginning of running " + batchName + ", model by model. ***");
         PromptTestRunner ptr = new PromptTestRunner();
         for (int index = 0; index < testList.size(); ++index) {
-            String arg1 = "testmodel=" + testList.elementAt(index);
+            String arg1 = "testmodel=" + testList.get(index);
             String arg2 = "pfile=" + pFileName;
             String[] a = { arg1, arg2 };
-            log("*** Running " + testList.elementAt(index));
+            log("*** Running " + testList.get(index));
             ptr.run(a);
         }
         long endTime = System.currentTimeMillis();

diff --git a/...ork/src/main/java/org/eclipse/persistence/testing/framework/DeleteAllQueryTestHelper.java b/...ork/src/main/java/org/eclipse/persistence/testing/framework/DeleteAllQueryTestHelper.java
@@ -122,14 +122,14 @@ protected static String execute(Session mainSession, Class<?> referenceClass, Ex
         // deleted objects should've disappeared, others remain
         String classErrorMsg = "";
         for(int i=0; i < objectsToDelete.size(); i++) {
-            Object deletedObject = session.readObject(objectsToDelete.elementAt(i));
+            Object deletedObject = session.readObject(objectsToDelete.get(i));
             if(deletedObject != null) {
                 classErrorMsg = classErrorMsg + "Deleted object "+ deletedObject +" is stil in cache; ";
                 break;
             }
         }
         for(int i=0; i < objectsLeftAfterOriginalDeletion.size(); i++) {
-            Object remainingObject = objectsLeftAfterOriginalDeletion.elementAt(i);
+            Object remainingObject = objectsLeftAfterOriginalDeletion.get(i);
             Object remainingObjectRead = session.readObject(remainingObject);
             if(remainingObjectRead == null) {
                 classErrorMsg = classErrorMsg + "Remaining object " + remainingObject +" is not in cache; ";
@@ -141,14 +141,14 @@ protected static String execute(Session mainSession, Class<?> referenceClass, Ex
         clearCache(mainSession);
         // deleted objects should've disappeared, others remain
         for(int i=0; i < objectsToDelete.size(); i++) {
-            Object deletedObject = session.readObject(objectsToDelete.elementAt(i));
+            Object deletedObject = session.readObject(objectsToDelete.get(i));
             if(deletedObject != null) {
                 classErrorMsg = classErrorMsg + "Deleted object "+ deletedObject + " is stil in db; ";
                 break;
             }
         }
         for(int i=0; i < objectsLeftAfterOriginalDeletion.size(); i++) {
-            Object remainingObject = objectsLeftAfterOriginalDeletion.elementAt(i);
+            Object remainingObject = objectsLeftAfterOriginalDeletion.get(i);
             Object remainingObjectRead = session.readObject(remainingObject);
             if(remainingObjectRead == null) {
                 classErrorMsg = classErrorMsg + "Remaining object " + remainingObject +" is not in db; ";

diff --git a/...test.framework/src/main/java/org/eclipse/persistence/testing/framework/JUnitTestCase.java b/...test.framework/src/main/java/org/eclipse/persistence/testing/framework/JUnitTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -130,7 +130,7 @@ public static Vector<JUnitTestCase> suite(Class<?> junitTestCaseClass) {
         Enumeration<Test> tests = suite.tests();
         while (tests.hasMoreElements()) {
             junit.framework.TestCase testCaseToAdd = (junit.framework.TestCase)tests.nextElement();
-            testsOut.addElement(new JUnitTestCase(testCaseToAdd));
+            testsOut.add(new JUnitTestCase(testCaseToAdd));
         }
         return testsOut;
     }

diff --git a/...t.framework/src/main/java/org/eclipse/persistence/testing/framework/LoadBuildProject.java b/...t.framework/src/main/java/org/eclipse/persistence/testing/framework/LoadBuildProject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -71,7 +71,7 @@ protected void buildLoadBuildSummaryDescriptor() {
         // SECTION: DESCRIPTOR
         descriptor.setJavaClass(org.eclipse.persistence.testing.framework.LoadBuildSummary.class);
         Vector<String> vector = new Vector<>();
-        vector.addElement("LOADBUILD");
+        vector.add("LOADBUILD");
         descriptor.setTableNames(vector);
         descriptor.addPrimaryKeyFieldName("LOADBUILD.id");
         //descriptor.addPrimaryKeyFieldName("LOADBUILD.lbtimestamp");
@@ -164,7 +164,7 @@ protected void buildTestResultDescriptor() {
         // SECTION: DESCRIPTOR
         descriptor.setJavaClass(org.eclipse.persistence.testing.framework.TestResult.class);
         Vector<String> vector = new Vector<>();
-        vector.addElement("RESULT");
+        vector.add("RESULT");
         descriptor.setTableNames(vector);
         descriptor.addPrimaryKeyFieldName("RESULT.id");
 
@@ -249,7 +249,7 @@ protected void buildTestResultsSummaryDescriptor() {
         // SECTION: DESCRIPTOR
         descriptor.setJavaClass(org.eclipse.persistence.testing.framework.TestResultsSummary.class);
         Vector<String> vector = new Vector<>();
-        vector.addElement("SUMMARY");
+        vector.add("SUMMARY");
         descriptor.setTableNames(vector);
         descriptor.addPrimaryKeyFieldName("SUMMARY.id");
 

diff --git a/...t.framework/src/main/java/org/eclipse/persistence/testing/framework/LoadBuildSummary.java b/...t.framework/src/main/java/org/eclipse/persistence/testing/framework/LoadBuildSummary.java
@@ -95,7 +95,7 @@ public void addResult(TestResult result) {
         } else if (results.getValue() == null) {
             results.setValue(new Vector<>());
         }
-        getResults().addElement(result);
+        getResults().add(result);
     }
 
     /**
@@ -114,7 +114,7 @@ public void addSummary(TestResultsSummary summary) {
                 iterator.remove();
             }
         }
-        getSummaries().addElement(summary);
+        getSummaries().add(summary);
     }
 
     public void computeNumberOfTestsAndErrors() {
@@ -125,7 +125,7 @@ public void computeNumberOfTestsAndErrors() {
         for (Iterator<TestResultsSummary> iterator = getSummaries().iterator(); iterator.hasNext();) {
             TestResultsSummary summary = iterator.next();
             if (summary.getParent() == null) {
-                rootSummaries.addElement(summary);
+                rootSummaries.add(summary);
             }
         }
         for (Iterator<TestResultsSummary> iterator = rootSummaries.iterator(); iterator.hasNext();) {
@@ -196,8 +196,8 @@ public void initializeLoadBuild() {
 
         // remove test result that belongs to a testSummary
         for (int i = 0; i < getResults().size(); i++) {
-            if ((getResults().elementAt(i)).getSummary() != null) {
-                getResults().removeElementAt(i);
+            if ((getResults().get(i)).getSummary() != null) {
+                getResults().remove(i);
                 i--;
             }
         }
@@ -231,8 +231,8 @@ public void setLoadBuildSummaryForTests() {
 
         // remove test result that belongs to a testSummary
         for (int i = 0; i < getResults().size(); i++) {
-            if ((getResults().elementAt(i)).getSummary() != null) {
-                getResults().removeElementAt(i);
+            if ((getResults().get(i)).getSummary() != null) {
+                getResults().remove(i);
                 i--;
             }
         }

diff --git a/...e.test.framework/src/main/java/org/eclipse/persistence/testing/framework/ReadAllTest.java b/...e.test.framework/src/main/java/org/eclipse/persistence/testing/framework/ReadAllTest.java
@@ -112,7 +112,7 @@ protected void test() {
                 stream = (CursoredStream)getSession().executeQuery(getQuery());
             }
             while (!stream.atEnd()) {
-                ((Vector)this.objectsFromDatabase).addElement(stream.read());
+                ((Vector)this.objectsFromDatabase).add(stream.read());
             }
         } else {
             if (hasArguments()) {

diff --git a/...est.framework/src/main/java/org/eclipse/persistence/testing/framework/TestCollection.java b/...est.framework/src/main/java/org/eclipse/persistence/testing/framework/TestCollection.java
@@ -313,7 +313,7 @@ public Enumeration<Test> tests() {
      */
     @Override
     public junit.framework.Test testAt(int index) {
-        return getTests().elementAt(index);
+        return getTests().get(index);
     }
 
     @Override
@@ -446,7 +446,7 @@ public void computeResultSummary() {
      * Remove the test colleciton.
      */
     protected void removeTest(TestEntity test) {
-        getTests().removeElement(test);
+        getTests().remove(test);
     }
 
     @Override

diff --git a/....test.framework/src/main/java/org/eclipse/persistence/testing/framework/TestExecutor.java b/....test.framework/src/main/java/org/eclipse/persistence/testing/framework/TestExecutor.java
@@ -175,7 +175,7 @@ public TestExecutor() {
      */
     public void addConfigureSystem(TestSystem system) {
         if (!configuredSystemsContainsInstanceOf(system)) {
-            getConfiguredSystems().addElement(system);
+            getConfiguredSystems().add(system);
         }
     }
 
@@ -197,7 +197,7 @@ public void configureSystem(TestSystem system) throws Exception {
         if (!configuredSystemsContainsInstanceOf(system)) {
             system.run(getSession());
             getSession().getIdentityMapAccessor().initializeAllIdentityMaps();
-            getConfiguredSystems().addElement(system);
+            getConfiguredSystems().add(system);
         }
     }
 
@@ -648,14 +648,14 @@ public void removeFromConfiguredSystemsInstanceOf(TestSystem system) {
              iterator.hasNext();) {
             TestSystem aSystem = iterator.next();
             if (aSystem.getClass().equals(system.getClass())) {
-                systemsToRemove.addElement(aSystem);
+                systemsToRemove.add(aSystem);
             }
         }
 
         // Do the removing
         for (Iterator<TestSystem> iterator = systemsToRemove.iterator();
              iterator.hasNext();) {
-            getConfiguredSystems().removeElement(iterator.next());
+            getConfiguredSystems().remove(iterator.next());
         }
     }
 

diff --git a/...ore.test.framework/src/main/java/org/eclipse/persistence/testing/framework/TestModel.java b/...ore.test.framework/src/main/java/org/eclipse/persistence/testing/framework/TestModel.java
@@ -106,7 +106,7 @@ public TestModel() {
      * Basically this means that required system will recreate new database.
      */
     public final void addForcedRequiredSystem(TestSystem requiredSystem) {
-        getForcedRequiredSystems().addElement(requiredSystem);
+        getForcedRequiredSystems().add(requiredSystem);
     }
 
     /**
@@ -123,7 +123,7 @@ public void addForcedRequiredSystems() {
      * Basically this means that required system will recreate new database.
      */
     public final void addRequiredSystem(TestSystem requiredSystem) {
-        getRequiredSystems().addElement(requiredSystem);
+        getRequiredSystems().add(requiredSystem);
     }
 
     /**
@@ -218,7 +218,7 @@ public void execute(TestExecutor executor) throws Throwable {
                             break;
                     }
                     executor.execute(test);
-                    getFinishedTests().addElement(test);
+                    getFinishedTests().add(test);
                 }
             } catch (Throwable exception) {
                 try {
@@ -493,6 +493,6 @@ public junit.framework.Test testAt(int index) {
         if (isSetup() || (!getTests().isEmpty())) {
             return super.testAt(index);
         }
-        return getFinishedTests().elementAt(index);
+        return getFinishedTests().get(index);
     }
 }
diff --git a/...framework/src/main/java/org/eclipse/persistence/testing/framework/TestResultsSummary.java b/...framework/src/main/java/org/eclipse/persistence/testing/framework/TestResultsSummary.java
@@ -109,7 +109,7 @@ public void appendTestCaseResult(TestCase testCase) {
             }
             default -> throw new Error("Wrong test result");
         }
-        getResults().addElement(testCase.getTestResult());
+        getResults().add(testCase.getTestResult());
         testCase.getTestResult().setSummary(this);
         LoadBuildSystem.loadBuild.addSummary(this);
     }

diff --git a/...ore.test.framework/src/main/java/org/eclipse/persistence/testing/framework/TestSuite.java b/...ore.test.framework/src/main/java/org/eclipse/persistence/testing/framework/TestSuite.java
@@ -87,7 +87,7 @@ public void execute(TestExecutor executor) throws Throwable {
                 break;
             }
             executor.execute(test);
-            getFinishedTests().addElement(test);
+            getFinishedTests().add(test);
         }
         long endTime = System.nanoTime();
         getSummary().setTotalTime(endTime - startTime);