Replace Vector/NonSynchronizedVector with List/ArrayList in mappings

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
eclipse-ee4j · Feb 22, 2024 · d8375ee · d8375ee
1 parent c5827e7
commit d8375ee
Show file tree

Hide file tree

Showing 46 changed files with 794 additions and 766 deletions.
diff --git a/...lipse.persistence.dbws/src/it/java/dbws/testing/relationships/RelationshipsTestSuite.java b/...lipse.persistence.dbws/src/it/java/dbws/testing/relationships/RelationshipsTestSuite.java
diff --git a/...org/eclipse/persistence/testing/tests/history/HistoricalQualifiedTableEmployeeSystem.java b/...org/eclipse/persistence/testing/tests/history/HistoricalQualifiedTableEmployeeSystem.java
@@ -53,13 +53,13 @@ public org.eclipse.persistence.sessions.Project getInitialProject(String user) {
         }
         mapping.setRelationTableName(user + "." + oldRelationTableName);
 
-        Vector<DatabaseField> targetRelationKeyFields = mapping.getTargetKeyFields();
+        List<DatabaseField> targetRelationKeyFields = mapping.getTargetKeyFields();
         for (DatabaseField targetRelationKeyField : targetRelationKeyFields) {
             String oldName = targetRelationKeyField.getTable().getName();
             targetRelationKeyField.setTableName(user + "." + oldName);
         }
 
-        Vector<DatabaseField> sourceRelationKeyFields = mapping.getSourceRelationKeyFields();
+        List<DatabaseField> sourceRelationKeyFields = mapping.getSourceRelationKeyFields();
         for (DatabaseField sourceRelationKeyField : sourceRelationKeyFields) {
             String oldName = sourceRelationKeyField.getTable().getName();
             sourceRelationKeyField.setTableName(user + "." + oldName);

diff --git a/...va/org/eclipse/persistence/testing/tests/interfaces/VariableOneToOneCodeCoverageTest.java b/...va/org/eclipse/persistence/testing/tests/interfaces/VariableOneToOneCodeCoverageTest.java
@@ -14,18 +14,23 @@
 //     Oracle - initial API and implementation from Oracle TopLink
 package org.eclipse.persistence.testing.tests.interfaces;
 
-import java.util.Vector;
-import java.util.Enumeration;
-
-import org.eclipse.persistence.testing.framework.*;
-import org.eclipse.persistence.sessions.Session;
-import org.eclipse.persistence.internal.helper.Helper;
 import org.eclipse.persistence.internal.helper.DatabaseField;
+import org.eclipse.persistence.internal.helper.Helper;
 import org.eclipse.persistence.internal.sessions.AbstractSession;
 import org.eclipse.persistence.mappings.Association;
 import org.eclipse.persistence.mappings.TypedAssociation;
 import org.eclipse.persistence.mappings.VariableOneToOneMapping;
-import org.eclipse.persistence.testing.models.interfaces.*;
+import org.eclipse.persistence.sessions.Session;
+import org.eclipse.persistence.testing.framework.TestCase;
+import org.eclipse.persistence.testing.framework.TestErrorException;
+import org.eclipse.persistence.testing.models.interfaces.Actor;
+import org.eclipse.persistence.testing.models.interfaces.Broadcastor;
+import org.eclipse.persistence.testing.models.interfaces.Employee;
+import org.eclipse.persistence.testing.models.interfaces.Secretary;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
 
 public class VariableOneToOneCodeCoverageTest extends TestCase {
     VariableOneToOneMapping mapping;
@@ -56,10 +61,10 @@ public void runTests() {
         if (mapping.getClassIndicatorAssociations().isEmpty()) {
             testFailures += "addClassIndicator = null did not add a null wrapper type indicator";
         } else {
-            Enumeration e = mapping.getClassIndicatorAssociations().elements();
+            Iterator e = mapping.getClassIndicatorAssociations().iterator();
 
-            while (e.hasMoreElements()) {
-                TypedAssociation association = (TypedAssociation)e.nextElement();
+            while (e.hasNext()) {
+                TypedAssociation association = (TypedAssociation)e.next();
 
                 if (association.getKey() == Employee.class) {
                     if (!(association.getValue() instanceof Helper)) {
@@ -77,15 +82,15 @@ public void runTests() {
 
         mapping.setClassIndicatorAssociations(vectorIn);
 
-        Vector vectorOut = mapping.getClassIndicatorAssociations();
+        List vectorOut = mapping.getClassIndicatorAssociations();
 
         if (vectorOut.size() != 3) {
             testFailures += "setClassIndicatorAssociations - the set failed";
         } else {
             int foundCount = 0;
 
             for (int i = 0; i < vectorOut.size(); i++) {
-                Association ass = (Association)vectorOut.elementAt(i);
+                Association ass = (Association)vectorOut.get(i);
 
                 if (ass.getKey() == Actor.class.getName() && ass.getValue().equals("ASHLEY JUDD")) {
                     foundCount++;
@@ -108,12 +113,12 @@ public void runTests() {
         Vector in = new Vector();
         in.add(assoc);
         mapping.setSourceToTargetQueryKeyFieldAssociations(in);
-        Vector out = mapping.getSourceToTargetQueryKeyFieldAssociations();
+        List out = mapping.getSourceToTargetQueryKeyFieldAssociations();
 
         if (out.size() != 1) {
             testFailures += "setSourceToTargetQueryFieldAssociations - the set failed";
         } else {
-            Association a = (Association)out.elementAt(0);
+            Association a = (Association)out.get(0);
 
             if (!(a.getKey().equals("key") && a.getValue().equals("value"))) {
                 testFailures += "setSourceToTargetQueryFieldAssociations - value in the set failed";
@@ -127,7 +132,7 @@ public void runTests() {
         foreignKeyNames.add("fkey3");
         mapping.setForeignKeyFieldNames(foreignKeyNames);
 
-        Vector fieldNames = mapping.getForeignKeyFieldNames();
+        List fieldNames = mapping.getForeignKeyFieldNames();
 
         if (!(mapping.getForeignKeyFieldNames().contains("fkey1"))) {
             testFailures += "addForeignQueryKeyName - fkey1";

diff --git a/.../it/java/org/eclipse/persistence/testing/tests/validation/MissingMappingForFieldTest.java b/.../it/java/org/eclipse/persistence/testing/tests/validation/MissingMappingForFieldTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021 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
@@ -43,7 +43,7 @@ public void test() {
         org.eclipse.persistence.testing.tests.validation.EmployeeWithProblems person = new org.eclipse.persistence.testing.tests.validation.EmployeeWithProblems();
 
         OneToOneMapping dMapping = (OneToOneMapping)descriptor.getMappingForAttributeName("manager");
-        DatabaseField dField = dMapping.getForeignKeyFields().firstElement();
+        DatabaseField dField = dMapping.getForeignKeyFields().get(0);
         //the following causes the correct error to occure.
         descriptor.getObjectBuilder().getMappingsByField().remove(dField);
 

diff --git a/...persistence/testing/tests/validation/VariableOneToOneMappingIsNotDefinedProperlyTest.java b/...persistence/testing/tests/validation/VariableOneToOneMappingIsNotDefinedProperlyTest.java
@@ -65,9 +65,9 @@ protected void setup() {
         mapping = (VariableOneToOneMapping)descriptor.getMappingForAttributeName("program");
 
         sourceField = new DatabaseField("ACTOR.PROGRAM_ID");
-        targetQueryKeyName = (String)mapping.getSourceToTargetQueryKeyNames().get(sourceField);
+        targetQueryKeyName = mapping.getSourceToTargetQueryKeyNames().get(sourceField);
         mapping.addForeignQueryKeyName("ACTOR.PROGRAM_ID", "name2");
-        mapping.getForeignKeyFields().removeElement(sourceField);
+        mapping.getForeignKeyFields().remove(sourceField);
 
         actor = Actor.example4();
         databaseRow = new DatabaseRecord();
@@ -90,7 +90,7 @@ protected void setup() {
     @Override
     public void reset() {
         mapping.addForeignQueryKeyName("ACTOR.PROGRAM_ID", targetQueryKeyName);
-        mapping.getForeignKeyFields().removeElement(sourceField);
+        mapping.getForeignKeyFields().remove(sourceField);
     }
 
     @Override

diff --git a/...on/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/asm/ASMFactory.java b/...on/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/asm/ASMFactory.java
@@ -14,7 +14,6 @@
 //     Oracle - initial API and implementation
 package org.eclipse.persistence.asm;
 
-import org.eclipse.persistence.asm.internal.Util;
 import org.eclipse.persistence.config.SystemProperties;
 import org.eclipse.persistence.exceptions.ValidationException;
 import org.eclipse.persistence.internal.security.PrivilegedAccessHelper;
@@ -27,7 +26,6 @@
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;

diff --git a/.../main/java/org/eclipse/persistence/asm/internal/platform/eclipselink/ClassWriterImpl.java b/.../main/java/org/eclipse/persistence/asm/internal/platform/eclipselink/ClassWriterImpl.java
@@ -14,7 +14,6 @@
 //     Oracle - initial API and implementation
 package org.eclipse.persistence.asm.internal.platform.eclipselink;
 
-import org.eclipse.persistence.asm.ASMFactory;
 import org.eclipse.persistence.asm.AnnotationVisitor;
 import org.eclipse.persistence.asm.FieldVisitor;
 import org.eclipse.persistence.asm.MethodVisitor;

diff --git a/.../org/eclipse/persistence/asm/internal/platform/eclipselink/SerialVersionUIDAdderImpl.java b/.../org/eclipse/persistence/asm/internal/platform/eclipselink/SerialVersionUIDAdderImpl.java
@@ -14,7 +14,6 @@
 //     Oracle - initial API and implementation
 package org.eclipse.persistence.asm.internal.platform.eclipselink;
 
-import org.eclipse.persistence.asm.ASMFactory;
 import org.eclipse.persistence.asm.Opcodes;
 import org.eclipse.persistence.internal.libraries.asm.ClassVisitor;
 import org.eclipse.persistence.internal.libraries.asm.commons.SerialVersionUIDAdder;

diff --git a/...core/src/main/java/org/eclipse/persistence/asm/internal/platform/ow2/ClassWriterImpl.java b/...core/src/main/java/org/eclipse/persistence/asm/internal/platform/ow2/ClassWriterImpl.java
@@ -14,7 +14,6 @@
 //     Oracle - initial API and implementation
 package org.eclipse.persistence.asm.internal.platform.ow2;
 
-import org.eclipse.persistence.asm.ASMFactory;
 import org.eclipse.persistence.asm.AnnotationVisitor;
 import org.eclipse.persistence.asm.FieldVisitor;
 import org.eclipse.persistence.asm.MethodVisitor;

diff --git a/...ain/java/org/eclipse/persistence/asm/internal/platform/ow2/SerialVersionUIDAdderImpl.java b/...ain/java/org/eclipse/persistence/asm/internal/platform/ow2/SerialVersionUIDAdderImpl.java
@@ -14,7 +14,6 @@
 //     Oracle - initial API and implementation
 package org.eclipse.persistence.asm.internal.platform.ow2;
 
-import org.eclipse.persistence.asm.ASMFactory;
 import org.eclipse.persistence.asm.Opcodes;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.commons.SerialVersionUIDAdder;

diff --git a/...sistence.core/src/main/java/org/eclipse/persistence/eis/mappings/EISOneToManyMapping.java b/...sistence.core/src/main/java/org/eclipse/persistence/eis/mappings/EISOneToManyMapping.java
@@ -772,11 +772,11 @@ public Object clone() {
      * Return all the fields mapped by the mapping.
      */
     @Override
-    protected Vector<DatabaseField> collectFields() {
+    protected List<DatabaseField> collectFields() {
         if (isForeignKeyRelationship()) {
             if (this.getForeignKeyGroupingElement() != null) {
-                Vector<DatabaseField> fields = new Vector<>(1);
-                fields.addElement(this.getForeignKeyGroupingElement());
+                List<DatabaseField> fields = new ArrayList<>(1);
+                fields.add(this.getForeignKeyGroupingElement());
                 return fields;
             } else {
                 return NO_FIELDS;

diff --git a/...rsistence.core/src/main/java/org/eclipse/persistence/eis/mappings/EISOneToOneMapping.java b/...rsistence.core/src/main/java/org/eclipse/persistence/eis/mappings/EISOneToOneMapping.java
@@ -34,6 +34,7 @@
 import org.eclipse.persistence.queries.ReadObjectQuery;
 import org.eclipse.persistence.queries.ReadQuery;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -90,7 +91,7 @@ public class EISOneToOneMapping extends ObjectReferenceMapping implements EISMap
     public EISOneToOneMapping() {
         this.selectionQuery = new ReadObjectQuery();
 
-        this.foreignKeyFields = org.eclipse.persistence.internal.helper.NonSynchronizedVector.newInstance(1);
+        this.foreignKeyFields = new ArrayList<>(1);
 
         this.sourceToTargetKeyFields = new HashMap<>(2);
         this.targetToSourceKeyFields = new HashMap<>(2);
@@ -147,7 +148,7 @@ public void addForeignKeyFieldName(String sourceForeignKeyFieldName, String targ
     @Override
     public Object clone() {
         EISOneToOneMapping clone = (EISOneToOneMapping)super.clone();
-        clone.setForeignKeyFields(org.eclipse.persistence.internal.helper.NonSynchronizedVector.newInstance(getForeignKeyFields().size()));
+        clone.setForeignKeyFields(new ArrayList<>(getForeignKeyFields().size()));
         clone.setSourceToTargetKeyFields(new HashMap<>(getSourceToTargetKeyFields().size()));
         clone.setTargetToSourceKeyFields(new HashMap<>(getTargetToSourceKeyFields().size()));
         Map<DatabaseField, DatabaseField> setOfFields = new HashMap<>(getTargetToSourceKeyFields().size());
@@ -157,7 +158,7 @@ public Object clone() {
 
             DatabaseField fieldClone = field.clone();
             setOfFields.put(field, fieldClone);
-            clone.getForeignKeyFields().addElement(fieldClone);
+            clone.getForeignKeyFields().add(fieldClone);
         }
 
         //get clones from set for source hashtable.  If they do not exist, create a new one.

diff --git a/...eclipse.persistence.core/src/main/java/org/eclipse/persistence/history/HistoryPolicy.java b/...eclipse.persistence.core/src/main/java/org/eclipse/persistence/history/HistoryPolicy.java
@@ -215,7 +215,7 @@ public ClassDescriptor getDescriptor() {
      */
     public final List<DatabaseTable> getHistoricalTables() {
         if (historicalTables == null) {
-            historicalTables = org.eclipse.persistence.internal.helper.NonSynchronizedVector.newInstance(1);
+            historicalTables = new ArrayList<>(1);
         }
         return historicalTables;
     }
@@ -523,7 +523,7 @@ public void addStartFieldName(String startFieldName) {
         startField.setLength(6);
 
         if (startFields == null) {
-            startFields = org.eclipse.persistence.internal.helper.NonSynchronizedVector.newInstance();
+            startFields = new ArrayList<>();
             startFields.add(startField);
             return;
         }

diff --git a/...ersistence/internal/sessions/factories/EclipseLinkObjectPersistenceRuntimeXMLProject.java b/...ersistence/internal/sessions/factories/EclipseLinkObjectPersistenceRuntimeXMLProject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023 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
@@ -17,7 +17,6 @@
 // javase imports
 
 import org.eclipse.persistence.descriptors.ClassDescriptor;
-import org.eclipse.persistence.internal.helper.NonSynchronizedVector;
 import org.eclipse.persistence.mappings.converters.Converter;
 import org.eclipse.persistence.mappings.converters.EnumTypeConverter;
 import org.eclipse.persistence.mappings.transformers.ConstantTransformer;
@@ -34,6 +33,8 @@
 import org.eclipse.persistence.queries.DatabaseQuery;
 import org.eclipse.persistence.sessions.DatasourceLogin;
 
+import java.util.ArrayList;
+
 import static javax.xml.XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI;
 import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI;
 import static org.eclipse.persistence.internal.helper.DatabaseField.NULL_SQL_TYPE;
@@ -96,7 +97,7 @@ protected ClassDescriptor buildProjectDescriptor() {
         descriptor.setSchemaReference(new XMLSchemaClassPathReference(SCHEMA_DIR + ECLIPSELINK_SCHEMA));
 
         XMLCompositeCollectionMapping projectQueriesMapping = new XMLCompositeCollectionMapping();
-        projectQueriesMapping.useCollectionClass(NonSynchronizedVector.class);
+        projectQueriesMapping.useCollectionClass(ArrayList.class);
         projectQueriesMapping.setAttributeName("queries");
         projectQueriesMapping.setSetMethodName("setQueries");
         projectQueriesMapping.setGetMethodName("getQueries");