fix build-time warnings

bundles/eclipselink/src/main/java/module-info.java

@@ -12,17 +12,17 @@
 
 module eclipselink {
 
-    requires java.desktop;
-    requires java.management;
-    requires java.naming;
-    requires java.rmi;
-    requires java.sql;
-    requires java.xml;
+    requires transitive java.desktop;
+    requires transitive java.management;
+    requires transitive java.naming;
+    requires transitive java.rmi;
+    requires transitive java.sql;
+    requires transitive java.xml;
 
     //following cannot be optional because we provide
     //implementation of its spi/extension here
-    requires jakarta.persistence;
-    requires jakarta.xml.bind;
+    requires transitive jakarta.persistence;
+    requires transitive jakarta.xml.bind;
     requires com.sun.tools.xjc;
 
 
@@ -43,6 +43,7 @@
     exports org.eclipse.persistence.jpa.jpql;
     exports org.eclipse.persistence.jpa.jpql.parser;
     exports org.eclipse.persistence.jpa.jpql.utility.iterable;
+    exports org.eclipse.persistence.jpa.jpql.utility.iterator;
 
     exports org.eclipse.persistence;
     exports org.eclipse.persistence.annotations;
@@ -176,6 +177,7 @@
 
     exports org.eclipse.persistence.sdo;
     exports org.eclipse.persistence.sdo.helper;
+    exports org.eclipse.persistence.sdo.helper.delegates;
     exports org.eclipse.persistence.sdo.types;
 
     exports org.eclipse.persistence.dbws;
@@ -196,6 +198,96 @@
     exports org.eclipse.persistence.jpa.rs.util.metadatasources;
     exports org.eclipse.persistence.jpa.rs.util.xmladapters;
 
+    //exported through EclipseLink PUBLIC API
+    exports org.eclipse.persistence.internal.cache;
+    exports org.eclipse.persistence.internal.codegen;
+    exports org.eclipse.persistence.internal.core.databaseaccess;
+    exports org.eclipse.persistence.internal.core.descriptors;
+    exports org.eclipse.persistence.internal.core.helper;
+    exports org.eclipse.persistence.internal.core.queries;
+    exports org.eclipse.persistence.internal.core.sessions;
+    exports org.eclipse.persistence.internal.databaseaccess;
+    exports org.eclipse.persistence.internal.descriptors;
+    exports org.eclipse.persistence.internal.descriptors.changetracking;
+    exports org.eclipse.persistence.internal.dynamic;
+    exports org.eclipse.persistence.internal.expressions;
+    exports org.eclipse.persistence.internal.helper;
+    exports org.eclipse.persistence.internal.identitymaps;
+    exports org.eclipse.persistence.internal.indirection;
+    exports org.eclipse.persistence.internal.jaxb;
+    exports org.eclipse.persistence.internal.jpa;
+    exports org.eclipse.persistence.internal.jpa.deployment;
+    exports org.eclipse.persistence.internal.jpa.metadata.xml;
+    exports org.eclipse.persistence.internal.jpa.rs.metadata.model;
+    exports org.eclipse.persistence.internal.jpa.rs.weaving;
+    exports org.eclipse.persistence.internal.libraries.asm;
+    exports org.eclipse.persistence.internal.localization;
+    exports org.eclipse.persistence.internal.oxm;
+    exports org.eclipse.persistence.internal.oxm.mappings;
+    exports org.eclipse.persistence.internal.oxm.record;
+    exports org.eclipse.persistence.internal.oxm.record.namespaces;
+    exports org.eclipse.persistence.internal.oxm.schema.model;
+    exports org.eclipse.persistence.internal.oxm.unmapped;
+    exports org.eclipse.persistence.internal.platform.database;
+    exports org.eclipse.persistence.internal.platform.database.oracle;
+    exports org.eclipse.persistence.internal.queries;
+    exports org.eclipse.persistence.internal.security;
+    exports org.eclipse.persistence.internal.sequencing;
+    exports org.eclipse.persistence.internal.sessions;
+    exports org.eclipse.persistence.internal.sessions.coordination;
+    exports org.eclipse.persistence.internal.sessions.coordination.corba;
+    exports org.eclipse.persistence.internal.sessions.coordination.jms;
+    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.xr;
+
+    //exported through EclipseLink INTERNAL API
+    exports org.eclipse.persistence.internal.helper.linkedlist;
+    exports org.eclipse.persistence.internal.helper.type;
+    exports org.eclipse.persistence.internal.jpa.metadata;
+    exports org.eclipse.persistence.internal.jpa.metadata.accessors;
+    exports org.eclipse.persistence.internal.jpa.metadata.accessors.classes;
+    exports org.eclipse.persistence.internal.jpa.metadata.accessors.mappings;
+    exports org.eclipse.persistence.internal.jpa.metadata.accessors.objects;
+    exports org.eclipse.persistence.internal.jpa.metadata.additionalcriteria;
+    exports org.eclipse.persistence.internal.jpa.metadata.cache;
+    exports org.eclipse.persistence.internal.jpa.metadata.changetracking;
+    exports org.eclipse.persistence.internal.jpa.metadata.columns;
+    exports org.eclipse.persistence.internal.jpa.metadata.converters;
+    exports org.eclipse.persistence.internal.jpa.metadata.copypolicy;
+    exports org.eclipse.persistence.internal.jpa.metadata.graphs;
+    exports org.eclipse.persistence.internal.jpa.metadata.inheritance;
+    exports org.eclipse.persistence.internal.jpa.metadata.listeners;
+    exports org.eclipse.persistence.internal.jpa.metadata.locking;
+    exports org.eclipse.persistence.internal.jpa.metadata.mappings;
+    exports org.eclipse.persistence.internal.jpa.metadata.multitenant;
+    exports org.eclipse.persistence.internal.jpa.metadata.nosql;
+    exports org.eclipse.persistence.internal.jpa.metadata.partitioning;
+    exports org.eclipse.persistence.internal.jpa.metadata.queries;
+    exports org.eclipse.persistence.internal.jpa.metadata.sequencing;
+    exports org.eclipse.persistence.internal.jpa.metadata.sop;
+    exports org.eclipse.persistence.internal.jpa.metadata.structures;
+    exports org.eclipse.persistence.internal.jpa.metadata.tables;
+    exports org.eclipse.persistence.internal.jpa.metadata.transformers;
+    exports org.eclipse.persistence.internal.oxm.schema;
+    exports org.eclipse.persistence.internal.sessions.cdi;
+    exports org.eclipse.persistence.internal.sessions.coordination.broadcast;
+    exports org.eclipse.persistence.internal.sessions.factories.model.event;
+    exports org.eclipse.persistence.internal.sessions.factories.model.log;
+    exports org.eclipse.persistence.internal.sessions.factories.model.login;
+    exports org.eclipse.persistence.internal.sessions.factories.model.platform;
+    exports org.eclipse.persistence.internal.sessions.factories.model.pool;
+    exports org.eclipse.persistence.internal.sessions.factories.model.project;
+    exports org.eclipse.persistence.internal.sessions.factories.model.rcm;
+    exports org.eclipse.persistence.internal.sessions.factories.model.rcm.command;
+    exports org.eclipse.persistence.internal.sessions.factories.model.sequencing;
+    exports org.eclipse.persistence.internal.sessions.factories.model.session;
+    exports org.eclipse.persistence.internal.sessions.factories.model.transport;
+    exports org.eclipse.persistence.internal.sessions.factories.model.transport.discovery;
+    exports org.eclipse.persistence.internal.sessions.factories.model.transport.naming;
+    exports org.eclipse.persistence.internal.xr.sxf;
+
     provides jakarta.persistence.spi.PersistenceProvider with org.eclipse.persistence.jpa.PersistenceProvider;
     provides jakarta.xml.bind.JAXBContextFactory with org.eclipse.persistence.jaxb.XMLBindingContextFactory;
     provides com.sun.tools.xjc.Plugin with org.eclipse.persistence.jaxb.plugins.BeanValidationPlugin;

dbws/org.eclipse.persistence.dbws/src/main/java/module-info.java

@@ -48,10 +48,16 @@
     exports org.eclipse.persistence.jpa.rs.util.metadatasources;
     exports org.eclipse.persistence.jpa.rs.util.xmladapters;
 
-    // dbws builder
-    exports org.eclipse.persistence.internal.dbws;
+    //exported through DBWS PUBLIC API
+    exports org.eclipse.persistence.internal.jpa.rs.metadata.model;
+    exports org.eclipse.persistence.internal.jpa.rs.weaving;
     exports org.eclipse.persistence.internal.xr;
+
+    //exported through DBWS INTERNAL API
     exports org.eclipse.persistence.internal.xr.sxf;
 
+    //INTERNAL ONLY exports
+    exports org.eclipse.persistence.internal.dbws to org.eclipse.persistence.dbws.builder;
+
     uses org.eclipse.persistence.jpa.rs.PersistenceContextFactoryProvider;
 }

dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/QueryParameters.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 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
@@ -14,9 +14,7 @@
 //      gonural - initial
 package org.eclipse.persistence.jpa.rs;
 
-import org.eclipse.persistence.config.QueryHints;
-
-public class QueryParameters extends QueryHints {
+public class QueryParameters {
     // Currently, in JPA-RS, the separation between query parameters and matrix parameters
     // is done such a way that:
     // - the predefined attributes (i.e. eclipselink query hints) are treated as query parameters

foundation/org.eclipse.persistence.corba/src/main/java/module-info.java

@@ -10,14 +10,20 @@
  * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
  */
 
+/**
+ * CORBA support for EclipseLink.
+ */
 module org.eclipse.persistence.corba {
 
-    requires java.rmi;
+    requires transitive java.rmi;
 
-    requires org.eclipse.persistence.core;
+    requires transitive org.eclipse.persistence.core;
 
     exports org.eclipse.persistence.sessions.coordination.corba;
     exports org.eclipse.persistence.sessions.coordination.corba.sun;
     exports org.eclipse.persistence.sessions.remote.corba.sun;
     exports org.eclipse.persistence.sessions.remote.rmi.iiop;
+
+    //exported through PUBLIC API
+    exports org.eclipse.persistence.internal.sessions.coordination.corba;
 }

foundation/org.eclipse.persistence.core/src/main/java/module-info.java

@@ -12,10 +12,10 @@
 
 module org.eclipse.persistence.core {
 
-    requires java.desktop;
-    requires java.management;
-    requires java.naming;
-    requires java.rmi;
+    requires transitive java.desktop;
+    requires transitive java.management; //server platforms
+    requires transitive java.naming;
+    requires transitive java.rmi;
     requires transitive java.sql;
     requires transitive java.xml;
 
@@ -127,7 +127,7 @@
     exports org.eclipse.persistence.transaction.was;
     exports org.eclipse.persistence.transaction.wls;
 
-    exports org.eclipse.persistence.internal.cache;
+    //exported through PUBLIC API
     exports org.eclipse.persistence.internal.codegen;
     exports org.eclipse.persistence.internal.core.databaseaccess;
     exports org.eclipse.persistence.internal.core.descriptors;
@@ -140,52 +140,66 @@
     exports org.eclipse.persistence.internal.dynamic;
     exports org.eclipse.persistence.internal.expressions;
     exports org.eclipse.persistence.internal.helper;
-    exports org.eclipse.persistence.internal.helper.linkedlist;
-    exports org.eclipse.persistence.internal.helper.type;
-    exports org.eclipse.persistence.internal.history;
     exports org.eclipse.persistence.internal.identitymaps;
     exports org.eclipse.persistence.internal.indirection;
-    exports org.eclipse.persistence.internal.jpa.jpql;
-    exports org.eclipse.persistence.internal.localization;
-    exports org.eclipse.persistence.internal.mappings.converters;
     exports org.eclipse.persistence.internal.oxm;
-    exports org.eclipse.persistence.internal.oxm.accessor;
-    exports org.eclipse.persistence.internal.oxm.conversion;
-    exports org.eclipse.persistence.internal.oxm.documentpreservation;
     exports org.eclipse.persistence.internal.oxm.mappings;
-    exports org.eclipse.persistence.internal.oxm.record;
-    exports org.eclipse.persistence.internal.oxm.record.deferred;
-    exports org.eclipse.persistence.internal.oxm.record.json;
     exports org.eclipse.persistence.internal.oxm.record.namespaces;
-    exports org.eclipse.persistence.internal.oxm.schema;
-    exports org.eclipse.persistence.internal.oxm.schema.model;
+    exports org.eclipse.persistence.internal.oxm.record;
     exports org.eclipse.persistence.internal.oxm.unmapped;
-    exports org.eclipse.persistence.internal.platform.database;
     exports org.eclipse.persistence.internal.queries;
     exports org.eclipse.persistence.internal.security;
     exports org.eclipse.persistence.internal.sequencing;
-    exports org.eclipse.persistence.internal.sessions;
-    exports org.eclipse.persistence.internal.sessions.cdi;
     exports org.eclipse.persistence.internal.sessions.coordination;
-    exports org.eclipse.persistence.internal.sessions.coordination.broadcast;
     exports org.eclipse.persistence.internal.sessions.coordination.jms;
-    exports org.eclipse.persistence.internal.sessions.coordination.rmi;
     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.sessions;
+
+    //exported through INTERNAL API
+    exports org.eclipse.persistence.internal.helper.linkedlist;
+    exports org.eclipse.persistence.internal.helper.type;
+    exports org.eclipse.persistence.internal.sessions.cdi;
+    exports org.eclipse.persistence.internal.sessions.coordination.broadcast;
     exports org.eclipse.persistence.internal.sessions.factories.model.event;
     exports org.eclipse.persistence.internal.sessions.factories.model.log;
     exports org.eclipse.persistence.internal.sessions.factories.model.login;
     exports org.eclipse.persistence.internal.sessions.factories.model.platform;
     exports org.eclipse.persistence.internal.sessions.factories.model.pool;
     exports org.eclipse.persistence.internal.sessions.factories.model.project;
-    exports org.eclipse.persistence.internal.sessions.factories.model.property;
-    exports org.eclipse.persistence.internal.sessions.factories.model.rcm;
     exports org.eclipse.persistence.internal.sessions.factories.model.rcm.command;
+    exports org.eclipse.persistence.internal.sessions.factories.model.rcm;
     exports org.eclipse.persistence.internal.sessions.factories.model.sequencing;
     exports org.eclipse.persistence.internal.sessions.factories.model.session;
     exports org.eclipse.persistence.internal.sessions.factories.model.transport;
     exports org.eclipse.persistence.internal.sessions.factories.model.transport.discovery;
     exports org.eclipse.persistence.internal.sessions.factories.model.transport.naming;
-    exports org.eclipse.persistence.internal.sessions.remote;
-    exports org.eclipse.persistence.internal.weaving;
+
+    //INTERNAL ONLY exports
+    exports org.eclipse.persistence.internal.jpa.jpql to org.eclipse.persistence.jpa;
+    exports org.eclipse.persistence.internal.localization to
+            org.eclipse.persistence.dbws,
+            org.eclipse.persistence.jpa,
+            org.eclipse.persistence.jpa.modelgen,
+            org.eclipse.persistence.moxy,
+            org.eclipse.persistence.oracle,
+            org.eclipse.persistence.sdo;
+    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.cache to org.eclipse.persistence.moxy;
+    exports org.eclipse.persistence.internal.oxm.schema to
+            org.eclipse.persistence.dbws,
+            org.eclipse.persistence.dbws.builder,
+            org.eclipse.persistence.moxy,
+            org.eclipse.persistence.sdo;
+    exports org.eclipse.persistence.internal.oxm.schema.model to
+            org.eclipse.persistence.dbws,
+            org.eclipse.persistence.dbws.builder,
+            org.eclipse.persistence.moxy,
+            org.eclipse.persistence.sdo;
+    exports org.eclipse.persistence.internal.oxm.conversion to org.eclipse.persistence.dbws;
+    exports org.eclipse.persistence.internal.sessions.coordination.rmi to org.eclipse.persistence.corba;
+    exports org.eclipse.persistence.internal.platform.database to org.eclipse.persistence.oracle;
+
 }

foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/Version.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 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
@@ -34,7 +34,7 @@
  * @author Eric Gwin
  * @since 1.0,
  */
-public class Version {
+public final class Version {
     // The current version of EclipseLink.
     // This will be used by all product components and included in exceptions.
     private static String product = "Eclipse Persistence Services";
@@ -49,6 +49,9 @@ public class Version {
 
     private static Properties versionProperties;
 
+    private Version() {
+        //no instance please
+    }
 
     /**
      * Returns version {@link String} containing three part version number

foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/annotations/BasicMap.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 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
@@ -53,6 +53,7 @@
  */
 @Target({METHOD, FIELD})
 @Retention(RUNTIME)
+@Deprecated
 public @interface BasicMap {
     /**
      * (Optional) Defines whether the value of the field or property should

foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/annotations/CollectionTable.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 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
@@ -39,6 +39,7 @@
  */
 @Target({METHOD, FIELD})
 @Retention(RUNTIME)
+@Deprecated
 public @interface CollectionTable {
     /**
      * (Optional) The name of the collection table. If it is not specified, it

foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/annotations/NamedStoredProcedureQuery.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 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
@@ -56,8 +56,9 @@
     /**
      * (Optional) Refers to the class of the result.
      * @deprecated
-     * @see resultClasses
+     * @see #resultClasses
      */
+    @Deprecated
     Class resultClass() default void.class;
 
     /**
@@ -68,8 +69,9 @@
     /**
      * (Optional) The name of the SQLResultMapping.
      * @deprecated
-     * @see resultSetMappings
+     * @see #resultSetMappings
      */
+    @Deprecated
     String resultSetMapping() default "";
 
     /**