add export of internal.weaving package

Signed-off-by: Lukas Jungmann <[email protected]> (cherry picked from commit 02b78ac)
eclipse-ee4j · Aug 13, 2024 · c85dc28 · c85dc28
1 parent a7b2199
commit c85dc28
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/bundles/eclipselink/src/main/java/module-info.java b/bundles/eclipselink/src/main/java/module-info.java
@@ -241,6 +241,7 @@
     exports org.eclipse.persistence.internal.sessions.factories;
     exports org.eclipse.persistence.internal.sessions.factories.model;
     exports org.eclipse.persistence.internal.sessions.remote;
+    exports org.eclipse.persistence.internal.weaving;
     exports org.eclipse.persistence.internal.xr;
 
     //exported through EclipseLink INTERNAL API

diff --git a/foundation/org.eclipse.persistence.core/src/main/java/module-info.java b/foundation/org.eclipse.persistence.core/src/main/java/module-info.java
@@ -194,7 +194,7 @@
             org.eclipse.persistence.sdo,
             org.eclipse.persistence.pgsql;
     exports org.eclipse.persistence.internal.mappings.converters to org.eclipse.persistence.jpa;
-    exports org.eclipse.persistence.internal.weaving to org.eclipse.persistence.jpa;
+    exports org.eclipse.persistence.internal.weaving;
     exports org.eclipse.persistence.internal.cache to org.eclipse.persistence.moxy;
     exports org.eclipse.persistence.internal.oxm.schema to
             org.eclipse.persistence.dbws,

diff --git a/...stence.core/src/main/java/org/eclipse/persistence/descriptors/DescriptorQueryManager.java b/...stence.core/src/main/java/org/eclipse/persistence/descriptors/DescriptorQueryManager.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 1998, 2021 IBM Corporation. All rights reserved.
+ * Copyright (c) 1998, 2024 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 IBM Corporation. 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
@@ -202,7 +202,7 @@ public synchronized void addQuery(DatabaseQuery query) {
         List<DatabaseQuery> queriesByName = getQueries().get(query.getName());
         if (queriesByName == null) {
             // lazily create Vector in Hashtable.
-            queriesByName = org.eclipse.persistence.internal.helper.NonSynchronizedVector.newInstance();
+            queriesByName = new ArrayList<>();
             getQueries().put(query.getName(), queriesByName);
         } else {
             int argumentTypesSize = 0;
@@ -597,9 +597,9 @@ public DatabaseQuery getLocalQuery(String name, Vector arguments) {
         if (arguments != null) {
             argumentTypesSize = arguments.size();
         }
-        Vector argumentTypes = org.eclipse.persistence.internal.helper.NonSynchronizedVector.newInstance(argumentTypesSize);
+        List<Class<?>> argumentTypes = new ArrayList<>(argumentTypesSize);
         for (int i = 0; i < argumentTypesSize; i++) {
-            argumentTypes.addElement(arguments.elementAt(i).getClass());
+            argumentTypes.add(arguments.elementAt(i).getClass());
         }
         return getLocalQueryByArgumentTypes(name, argumentTypes);