Update module descriptor,
fix some compier warnings,
clean up

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestDynamicClassWriter.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestDynamicClassWriter.java
index 071d92d..203fdcd 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestDynamicClassWriter.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestDynamicClassWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 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
@@ -12,12 +12,6 @@
 
 package org.eclipse.persistence.internal.jpa.rs.weaving;
 
-import static org.eclipse.persistence.internal.jpa.weaving.ClassWeaver.ITEM_LINKS_SIGNATURE;
-import static org.eclipse.persistence.internal.jpa.weaving.ClassWeaver.LINK_SIGNATURE;
-import static org.eclipse.persistence.internal.jpa.weaving.ClassWeaver.LIST_RELATIONSHIP_INFO_GENERIC_SIGNATURE;
-import static org.eclipse.persistence.internal.jpa.weaving.ClassWeaver.LIST_RELATIONSHIP_INFO_SIGNATURE;
-import static org.eclipse.persistence.internal.jpa.weaving.ClassWeaver.PERSISTENCE_FIELDNAME_PREFIX;
-import static org.eclipse.persistence.internal.jpa.weaving.ClassWeaver.WEAVED_REST_LAZY_SHORT_SIGNATURE;
 import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ACC_PUBLIC;
 import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ALOAD;
 import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ARETURN;
@@ -39,6 +33,13 @@
  * @since EclipseLink 3.0
  */
 public class RestDynamicClassWriter extends MetadataDynamicClassWriter {
+    //from org.eclipse.persistence.internal.jpa.weaving.ClassWeaver which we do not want to export from o.e.p.jpa
+    public static final String WEAVED_REST_LAZY_SHORT_SIGNATURE = "org/eclipse/persistence/internal/jpa/rs/weaving/PersistenceWeavedRest";
+    public static final String LIST_RELATIONSHIP_INFO_SIGNATURE = "Ljava/util/List;";
+    public static final String LIST_RELATIONSHIP_INFO_GENERIC_SIGNATURE = "Ljava/util/List<Lorg/eclipse/persistence/internal/jpa/rs/weaving/RelationshipInfo;>;";
+    public static final String LINK_SIGNATURE = "Lorg/eclipse/persistence/internal/jpa/rs/metadata/model/Link;";
+    public static final String ITEM_LINKS_SIGNATURE = "Lorg/eclipse/persistence/internal/jpa/rs/metadata/model/ItemLinks;";
+    public static final String PERSISTENCE_FIELDNAME_PREFIX = "_persistence_";
 
     public RestDynamicClassWriter(MetadataDynamicClassWriter w) {
         super(w.getDescriptor());
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/security/PrivilegedMethodInvoker.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/security/PrivilegedMethodInvoker.java
index eba3338..5df06f3 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/security/PrivilegedMethodInvoker.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/security/PrivilegedMethodInvoker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2019 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
@@ -19,7 +19,7 @@
 import java.lang.reflect.InvocationTargetException;
 
 
-public class PrivilegedMethodInvoker implements PrivilegedExceptionAction {
+public class PrivilegedMethodInvoker<T> implements PrivilegedExceptionAction<T> {
 
     private final Method method;
     private final Object target;
@@ -36,8 +36,8 @@ public PrivilegedMethodInvoker(Method method, Object target, Object[] args){
     }
 
     @Override
-    public Object run() throws IllegalAccessException, InvocationTargetException {
-        return PrivilegedAccessHelper.invokeMethod(method, target, args);
+    public T run() throws IllegalAccessException, InvocationTargetException {
+        return (T) PrivilegedAccessHelper.invokeMethod(method, target, args);
     }
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/module-info.java b/jpa/org.eclipse.persistence.jpa/src/main/java/module-info.java
index 63d9018..087c5c6 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/module-info.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/module-info.java
@@ -29,27 +29,37 @@
     exports org.eclipse.persistence.jpa.metadata;
     exports org.eclipse.persistence.tools.weaving.jpa;
 
-    // modelgen
-    exports org.eclipse.persistence.internal.jpa.deployment;
+
+    exports org.eclipse.persistence.internal.jpa;
+    exports org.eclipse.persistence.internal.jpa.deployment; // exp metadata/metadata.objects
+    exports org.eclipse.persistence.internal.jpa.metadata.xml;
+
+    //internals accessible through o.e.p.internal.jpa.metadata.xml
     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.xml;
-
-    // dbws
-    exports org.eclipse.persistence.internal.jpa;
-    exports org.eclipse.persistence.internal.jpa.weaving;
-
-    // dbws builder
-    exports org.eclipse.persistence.internal.jpa.metadata.accessors;
+    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;
 
     provides jakarta.persistence.spi.PersistenceProvider with org.eclipse.persistence.jpa.PersistenceProvider;
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/CMP3Policy.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/CMP3Policy.java
index 3afe53d..2c71f83 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/CMP3Policy.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/CMP3Policy.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
@@ -204,10 +204,8 @@ public String getPKClassName() {
     @Override
     public Object getPKClassInstance() {
         try {
-            return getPKClass().newInstance();
-        } catch (IllegalAccessException ex) {
-            throw DescriptorException.exceptionAccessingPrimaryKeyInstance(this.getDescriptor(), ex);
-        } catch (InstantiationException ex){
+            return getPKClass().getConstructor().newInstance();
+        } catch (ReflectiveOperationException ex) {
             throw DescriptorException.exceptionAccessingPrimaryKeyInstance(this.getDescriptor(), ex);
         }
     }
@@ -329,7 +327,7 @@ public Object createBeanUsingKey(Object key, AbstractSession session) {
                 while (mapping.isAggregateObjectMapping()) {
                     Object aggregate = mapping.getRealAttributeValueFromObject(toWriteInto, session);
                     if (aggregate == null) {
-                        aggregate = mapping.getReferenceDescriptor().getJavaClass().newInstance();
+                        aggregate = mapping.getReferenceDescriptor().getJavaClass().getConstructor().newInstance();
                         mapping.setRealAttributeValueInObject(toWriteInto, aggregate);
                     }
                     mapping = mapping.getReferenceDescriptor().getObjectBuilder().getMappingForAttributeName(keyElements[index].getAttributeName());
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerFactoryProvider.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerFactoryProvider.java
index ab953aa..f0f3b35 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerFactoryProvider.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerFactoryProvider.java
@@ -89,6 +89,12 @@ public class EntityManagerFactoryProvider {
     };
 
     /**
+     * Default constructor to allow reflection.
+     */
+    public EntityManagerFactoryProvider() {
+    }
+
+    /**
      * Add an EntityManagerSetupImpl to the cached list
      * These are used to ensure all persistence units that are the same get the same underlying session
      * @param name
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerImpl.java
index 1dc4727..bcc3038 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerImpl.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerImpl.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.
  * Copyright (c) 1998, 2019 IBM Corporation and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -157,7 +157,7 @@ public class EntityManagerImpl implements org.eclipse.persistence.jpa.JpaEntityM
     protected enum OperationType {FIND, REFRESH, LOCK};
 
     /** Allows transparent transactions across JTA and local transactions. */
-    protected TransactionWrapperImpl transaction;
+    private TransactionWrapperImpl transaction;
 
     /** Store if this entity manager has been closed. */
     protected boolean isOpen;
@@ -255,7 +255,7 @@ protected enum OperationType {FIND, REFRESH, LOCK};
     abstract static class PropertyProcessor {
         abstract void process(String name, Object value, EntityManagerImpl em);
     }
-    static Map<String, PropertyProcessor> processors = new HashMap() {
+    static Map<String, PropertyProcessor> processors = new HashMap<>() {
         {
             put(EntityManagerProperties.JOIN_EXISTING_TRANSACTION, new PropertyProcessor() {
             @Override
@@ -377,10 +377,10 @@ void process(String name, Object value, EntityManagerImpl em) {
             @Override
             void process(String name, Object value, EntityManagerImpl em) {
                 if( em.connectionPolicies != null) {
-                    Map mapOfProperties = (Map)value;
-                    Iterator it = mapOfProperties.keySet().iterator();
+                    Map<String, ?> mapOfProperties = (Map<String, ?>) value;
+                    Iterator<String> it = mapOfProperties.keySet().iterator();
                     while (it.hasNext()) {
-                        String sessionName = (String)it.next();
+                        String sessionName = it.next();
                         if (em.connectionPolicies.containsKey(sessionName)) {
                             // Property used to create ConnectionPolicy has changed - already existing ConnectionPolicy should be removed.
                             // A new one will be created when the new active persistence context is created.
@@ -508,7 +508,7 @@ protected void initialize(Map properties) {
             this.connectionPolicy = ((ServerSession)this.databaseSession).getDefaultConnectionPolicy();
         } else if (this.databaseSession.isBroker()) {
             SessionBroker broker = (SessionBroker)this.databaseSession;
-            this.connectionPolicies = new HashMap(broker.getSessionsByName().size());
+            this.connectionPolicies = new HashMap<>(broker.getSessionsByName().size());
             Iterator<Map.Entry<String, AbstractSession>> it = broker.getSessionsByName().entrySet().iterator();
             while (it.hasNext()) {
                 Map.Entry<String, AbstractSession> entry = it.next();
@@ -2157,7 +2157,7 @@ public void setProperty(String propertyName, Object value) {
                 // getProperties method always returns non-null Map
                 this.properties = this.extendedPersistenceContext.getParent().getProperties();
             } else {
-                this.properties = new HashMap();
+                this.properties = new HashMap<>();
             }
         }
 
@@ -2873,7 +2873,7 @@ public LockModeType getLockMode(Object entity) {
      */
     @Override
     public Map<String, Object> getProperties() {
-        Map sessionMap = new HashMap(getAbstractSession().getProperties());
+        Map<String, Object> sessionMap = new HashMap<>(getAbstractSession().getProperties());
         if (this.properties != null) {
             sessionMap.putAll(this.properties);
         }
@@ -3100,13 +3100,13 @@ public <T> List<EntityGraph<? super T>> getEntityGraphs(Class<T> entityClass) {
         }
         List<EntityGraph<? super T>> result = new ArrayList<EntityGraph<? super T>>();
         for (AttributeGroup group : descriptor.getAttributeGroups().values()){
-            result.add(new EntityGraphImpl(group));
+            result.add(new EntityGraphImpl<>(group));
         }
         if (descriptor.hasInheritance()){
             while(descriptor.getInheritancePolicy().getParentDescriptor() != null){
                 descriptor = descriptor.getInheritancePolicy().getParentDescriptor();
                 for (AttributeGroup group : descriptor.getAttributeGroups().values()){
-                    result.add(new EntityGraphImpl(group));
+                    result.add(new EntityGraphImpl<>(group));
                 }
             }
         }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerSetupImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerSetupImpl.java
index 6fd48c9..709ceeb 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerSetupImpl.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerSetupImpl.java
@@ -325,9 +325,9 @@ public class EntityManagerSetupImpl implements MetadataRefreshListener {
     // session name should uniquely identify the session
     protected String sessionName;
 
-    protected MetadataProcessor processor = null;
+    private MetadataProcessor processor = null;
     /** Holds a reference to the weaver class transformer so it can be cleared after login. */
-    protected PersistenceWeaver weaver = null;
+    private PersistenceWeaver weaver = null;
     protected PersistenceUnitInfo persistenceUnitInfo = null;
     // count a number of open factories that use this object.
     protected int factoryCount = 0;
@@ -885,8 +885,8 @@ private void processDescriptorsFromCachedProject(ClassLoader realClassLoader) th
         for (ClassDescriptor descriptor: session.getProject().getDescriptors().values()) {
             //process customizers:
             if (descriptor.getDescriptorCustomizerClassName() != null) {
-                Class listenerClass = this.findClass(descriptor.getDescriptorCustomizerClassName(), realClassLoader);
-                DescriptorCustomizer customizer = (DescriptorCustomizer)this.buildObjectForClass(listenerClass, DescriptorCustomizer.class);
+                Class listenerClass = findClass(descriptor.getDescriptorCustomizerClassName(), realClassLoader);
+                DescriptorCustomizer customizer = (DescriptorCustomizer) buildObjectForClass(listenerClass, DescriptorCustomizer.class);
                 try {
                     customizer.customize(descriptor);
                 } catch (Exception e) {
@@ -1256,8 +1256,8 @@ protected void updateLoggers(Map persistenceProperties, boolean serverPlatformCh
                 // Logger class was specified and it's not what's already there.
                 Class sessionLogClass = findClassForProperty(loggerClassName, PersistenceUnitProperties.LOGGING_LOGGER, loader);
                 try {
-                    singletonLog = (SessionLog)sessionLogClass.newInstance();
-                    sessionLog = (SessionLog)sessionLogClass.newInstance();
+                    singletonLog = (SessionLog)sessionLogClass.getConstructor().newInstance();
+                    sessionLog = (SessionLog)sessionLogClass.getConstructor().newInstance();
                 } catch (Exception ex) {
                     throw EntityManagerSetupException.failedToInstantiateLogger(loggerClassName, PersistenceUnitProperties.LOGGING_LOGGER, ex);
                 }
@@ -1413,7 +1413,7 @@ protected List<StructConverter> getStructConverters(ClassLoader realClassLoader)
             for (String converter: session.getProject().getStructConverters()) {
                 Class clazz = null;
                 try {
-                    clazz = this.findClass(converter, realClassLoader);
+                    clazz = findClass(converter, realClassLoader);
                 } catch (PrivilegedActionException exception) {
                     throw ValidationException.unableToLoadClass(converter, exception.getException());
                 } catch (ClassNotFoundException exception) {
@@ -1421,7 +1421,7 @@ protected List<StructConverter> getStructConverters(ClassLoader realClassLoader)
                 }
 
                 try {
-                    structConverters.add((StructConverter)this.buildObjectForClass(clazz, StructConverter.class));
+                    structConverters.add((StructConverter) buildObjectForClass(clazz, StructConverter.class));
                 } catch (PrivilegedActionException e) {
                     throw ValidationException.errorInstantiatingClass(clazz, e.getException());
                 } catch (IllegalAccessException e) {
@@ -2240,7 +2240,7 @@ protected void updateCacheCoordination(Map m, ClassLoader loader) {
                     value = "org.eclipse.persistence.sessions.coordination.jgroups.JGroupsTransportManager";
                     // Avoid compile and runtime dependency.
                     Class transportClass = findClassForProperty(value, PersistenceUnitProperties.COORDINATION_PROTOCOL, loader);
-                    TransportManager transport = (TransportManager)transportClass.newInstance();
+                    TransportManager transport = (TransportManager)transportClass.getConstructor().newInstance();
                     rcm.setTransportManager(transport);
                     String config = getConfigPropertyAsStringLogDebug(PersistenceUnitProperties.COORDINATION_JGROUPS_CONFIG, m, this.session);
                     if (config != null) {
@@ -2308,14 +2308,14 @@ protected void updateCacheCoordination(Map m, ClassLoader loader) {
                     property = PersistenceUnitProperties.COORDINATION_PROTOCOL;
                     value = protocol;
                     Class transportClass = findClassForProperty(protocol, PersistenceUnitProperties.COORDINATION_PROTOCOL, loader);
-                    rcm.setTransportManager((TransportManager)transportClass.newInstance());
+                    rcm.setTransportManager((TransportManager)transportClass.getConstructor().newInstance());
                 }
                 String serializer = getConfigPropertyAsStringLogDebug(PersistenceUnitProperties.COORDINATION_SERIALIZER, m, this.session);
                 if (serializer != null) {
                     property = PersistenceUnitProperties.COORDINATION_SERIALIZER;
                     value = serializer;
                     Class transportClass = findClassForProperty(serializer, PersistenceUnitProperties.COORDINATION_SERIALIZER, loader);
-                    rcm.setSerializer((Serializer)transportClass.newInstance());
+                    rcm.setSerializer((Serializer)transportClass.getConstructor().newInstance());
                 }
 
                 String naming = getConfigPropertyAsStringLogDebug(PersistenceUnitProperties.COORDINATION_NAMING_SERVICE, m, this.session);
@@ -2373,7 +2373,7 @@ protected void updateSerializer(Map m, ClassLoader loader) {
             if (serializer.length() > 0) {
                 try {
                     Class transportClass = findClassForProperty(serializer, PersistenceUnitProperties.SERIALIZER, loader);
-                    this.session.setSerializer((Serializer)transportClass.newInstance());
+                    this.session.setSerializer((Serializer)transportClass.getConstructor().newInstance());
                 } catch (Exception exception) {
                     this.session.handleException(ValidationException.invalidValueForProperty(serializer, PersistenceUnitProperties.SERIALIZER, exception));
                 }
@@ -2967,7 +2967,7 @@ protected void processSessionCustomizer(Map m, ClassLoader loader) {
         if (customizer instanceof String) {
             Class sessionCustomizerClass = findClassForProperty((String) customizer, PersistenceUnitProperties.SESSION_CUSTOMIZER, loader);
             try {
-                sessionCustomizer = (SessionCustomizer) sessionCustomizerClass.newInstance();
+                sessionCustomizer = (SessionCustomizer) sessionCustomizerClass.getConstructor().newInstance();
             } catch (Exception ex) {
                 throw EntityManagerSetupException.failedWhileProcessingProperty(PersistenceUnitProperties.SESSION_CUSTOMIZER, (String) customizer, ex);
             }
@@ -3048,7 +3048,7 @@ protected void processDescriptorCustomizers(Map m, ClassLoader loader) {
             if (descriptor != null) {
                 Class customizerClass = findClassForProperty(customizerClassName, PersistenceUnitProperties.DESCRIPTOR_CUSTOMIZER_ + name, loader);
                 try {
-                    DescriptorCustomizer customizer = (DescriptorCustomizer)customizerClass.newInstance();
+                    DescriptorCustomizer customizer = (DescriptorCustomizer)customizerClass.getConstructor().newInstance();
                     customizer.customize(descriptor);
                 } catch (Exception ex) {
                     throw EntityManagerSetupException.failedWhileProcessingProperty(PersistenceUnitProperties.DESCRIPTOR_CUSTOMIZER_ + name, customizerClassName, ex);
@@ -3292,7 +3292,7 @@ protected void updateMetadataRepository(Map m, ClassLoader loader){
                 } else {
                     Class transportClass = findClassForProperty(repository, PersistenceUnitProperties.METADATA_SOURCE, loader);
                     try {
-                        processor.setMetadataSource((MetadataSource)transportClass.newInstance());
+                        processor.setMetadataSource((MetadataSource)transportClass.getConstructor().newInstance());
                     } catch (Exception invalid) {
                         session.handleException(EntityManagerSetupException.failedToInstantiateProperty(repository, PersistenceUnitProperties.METADATA_SOURCE,invalid));
                     }
@@ -3318,7 +3318,7 @@ protected void updateTunerPreDeploy(Map m, ClassLoader loader) {
                 }
                 Class tunerClass = findClassForProperty(tuning, PersistenceUnitProperties.TUNING, loader);
                 try {
-                    tuner = (SessionTuner)tunerClass.newInstance();
+                    tuner = (SessionTuner)tunerClass.getConstructor().newInstance();
                 } catch (Exception invalid) {
                     this.session.handleException(EntityManagerSetupException.failedToInstantiateProperty(tuning, PersistenceUnitProperties.TUNING, invalid));
                 }
@@ -3424,7 +3424,7 @@ protected void updateProjectCache(Map m, ClassLoader loader){
                 } else {
                     Class transportClass = findClassForProperty(accessorType, PersistenceUnitProperties.PROJECT_CACHE, loader);
                     try {
-                        projectCacheAccessor = (ProjectCache)transportClass.newInstance();
+                        projectCacheAccessor = (ProjectCache)transportClass.getConstructor().newInstance();
                     } catch (Exception invalid) {
                         session.handleException(EntityManagerSetupException.failedToInstantiateProperty(accessorType, PersistenceUnitProperties.METADATA_SOURCE,invalid));
                     }
@@ -4004,7 +4004,7 @@ private void addBeanValidationListeners(Map puProperties, ClassLoader appClassLo
                         helperClass = PrivilegedAccessHelper.getClassForName(helperClassName, true, eclipseLinkClassLoader);
                     }
                 }
-                BeanValidationInitializationHelper beanValidationInitializationHelper = (BeanValidationInitializationHelper)helperClass.newInstance();
+                BeanValidationInitializationHelper beanValidationInitializationHelper = (BeanValidationInitializationHelper)helperClass.getConstructor().newInstance();
                 beanValidationInitializationHelper.bootstrapBeanValidation(puProperties, session, appClassLoader);
             } catch (Throwable e) {  //Catching Throwable to catch any linkage errors on vms that resolve eagerly
                 if (validationMode == ValidationMode.CALLBACK) {
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/PersistenceInitializationActivator.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/PersistenceInitializationActivator.java
index 54f70c4..12d10bd 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/PersistenceInitializationActivator.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/PersistenceInitializationActivator.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
@@ -24,5 +24,5 @@ public interface PersistenceInitializationActivator {
      * Return whether the given class name identifies a persistence provider that is supported by
      * this PersistenceInitializationActivator
      */
-    public boolean isPersistenceProviderSupported(String providerClassName);
+    boolean isPersistenceProviderSupported(String providerClassName);
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/QueryHintsHandler.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/QueryHintsHandler.java
index 475e816..7565c26 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/QueryHintsHandler.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/QueryHintsHandler.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.
  * Copyright (c) 1998, 2019 IBM Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -122,6 +122,9 @@ public class QueryHintsHandler {
 
     public static final String QUERY_HINT_PROPERTY = "eclipselink.query.hints";
 
+    private QueryHintsHandler() {
+    }
+
     /**
      * Verifies the hints.
      *
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/QueryImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/QueryImpl.java
index d4e825f..4e6076e 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/QueryImpl.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/QueryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -470,7 +470,7 @@ public List getResultList() {
                     throw QueryException.invalidContainerClass(containerClass, ClassConstants.List_Class);
                 }
             } else if (query.isReadObjectQuery()) {
-                List resultList = new ArrayList();
+                List<Object> resultList = new ArrayList<>();
                 Object result = executeReadQuery();
                 if (result != null) {
                     resultList.add(result);
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/StoredProcedureQueryImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/StoredProcedureQueryImpl.java
index 801d5d7..c2f2447 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/StoredProcedureQueryImpl.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/StoredProcedureQueryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2019 IBM Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -57,10 +57,7 @@
 import jakarta.persistence.TemporalType;
 
 import org.eclipse.persistence.exceptions.DatabaseException;
-import org.eclipse.persistence.internal.databaseaccess.Accessor;
-import org.eclipse.persistence.internal.databaseaccess.DatabaseAccessor;
-import org.eclipse.persistence.internal.databaseaccess.DatabaseCall;
-import org.eclipse.persistence.internal.databaseaccess.OutputParameterForCallableStatement;
+import org.eclipse.persistence.internal.databaseaccess.*;
 import org.eclipse.persistence.internal.helper.DatabaseField;
 import org.eclipse.persistence.internal.jpa.querydef.ParameterExpressionImpl;
 import org.eclipse.persistence.internal.localization.ExceptionLocalization;
@@ -435,11 +432,11 @@ protected Map<String, Parameter<?>> getInternalParameters() {
 
                 DatabaseField field = null;
 
-                if (parameterType == getCall().INOUT) {
+                if (parameterType == DatasourceCall.INOUT) {
                     field = (DatabaseField) ((Object[]) parameter)[0];
-                } else if (parameterType == getCall().IN) {
+                } else if (parameterType == DatasourceCall.IN) {
                     field = (DatabaseField) parameter;
-                } else if (parameterType == getCall().OUT || parameterType == getCall().OUT_CURSOR) {
+                } else if (parameterType == DatasourceCall.OUT || parameterType == DatasourceCall.OUT_CURSOR) {
                     if (parameter instanceof OutputParameterForCallableStatement) {
                         field = ((OutputParameterForCallableStatement) parameter).getOutputField();
                     } else {
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/BeanValidationInitializationHelper.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/BeanValidationInitializationHelper.java
index ad65dbc..069fca0 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/BeanValidationInitializationHelper.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/BeanValidationInitializationHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -36,9 +36,13 @@
  * @author Mitesh Meswani
  */
 public interface BeanValidationInitializationHelper {
-    public void bootstrapBeanValidation(Map puProperties, AbstractSession session, ClassLoader appClassLoader);
+    void bootstrapBeanValidation(Map puProperties, AbstractSession session, ClassLoader appClassLoader);
 
-    static class BeanValidationInitializationHelperImpl implements BeanValidationInitializationHelper {
+    class BeanValidationInitializationHelperImpl implements BeanValidationInitializationHelper {
+
+        public BeanValidationInitializationHelperImpl() {
+        }
+
         @Override
         public void bootstrapBeanValidation(Map puProperties, AbstractSession session, ClassLoader appClassLoader) {
 
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/JPAInitializer.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/JPAInitializer.java
index e21c2ea..50896a5 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/JPAInitializer.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/JPAInitializer.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.
  * Copyright (c) 1998, 2018 IBM Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -66,7 +66,10 @@ public abstract class JPAInitializer {
     protected Map<String, EntityManagerSetupImpl> initialEmSetupImpls;
 
     // Initializers keyed by their initializationClassloaders
-    protected static Map<ClassLoader, JPAInitializer> initializers = new Hashtable();
+    protected static Map<ClassLoader, JPAInitializer> initializers = new Hashtable<>();
+
+    protected JPAInitializer() {
+    }
 
     /**
      * Initialize the logging file if it is specified by the system property.
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/JavaSECMPInitializerAgent.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/JavaSECMPInitializerAgent.java
index b859b02..27566c3 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/JavaSECMPInitializerAgent.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/JavaSECMPInitializerAgent.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
@@ -31,6 +31,10 @@
  * that no domain classes that use lazy loading may be references in any way other than reflective in the application
  */
 public class JavaSECMPInitializerAgent {
+
+    private JavaSECMPInitializerAgent() {
+    }
+
     public static void premain(String agentArgs, Instrumentation instr) throws Throwable {
         // Reflection allows:
         //  JavaSECMPInitializerAgent to be the *ONLY* class is the jar file specified in -javaagent;
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/PersistenceUnitProcessor.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/PersistenceUnitProcessor.java
index 024a651..d29a6d0 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/PersistenceUnitProcessor.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/PersistenceUnitProcessor.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.
  * Copyright (c) 1998, 2018 IBM Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -110,6 +110,12 @@ public enum Mode {
     private static final int WEBINF_CLASSES_LEN = WEBINF_CLASSES_STR.length();
 
     /**
+     * Default constructor.
+     */
+    protected PersistenceUnitProcessor() {
+    }
+
+    /**
      * Entries in a zip file are directory entries using slashes to separate
      * them. Build a class name using '.' instead of slash and removing the
      * '.class' extension.
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/SEPersistenceUnitProperty.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/SEPersistenceUnitProperty.java
index 025d4bf..312eeae 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/SEPersistenceUnitProperty.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/SEPersistenceUnitProperty.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
@@ -30,6 +30,12 @@ public class SEPersistenceUnitProperty {
     protected String name;
     protected String value;
 
+    /**
+     * Default constructor.
+     */
+    public SEPersistenceUnitProperty() {
+    }
+
     public String getName() {
         return name;
     }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/MetadataConstants.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/MetadataConstants.java
index a52ab6a..2289987 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/MetadataConstants.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/MetadataConstants.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
@@ -40,7 +40,7 @@
  * @author Guy Pelletier
  * @since EclipseLink 1.1
  */
-public class MetadataConstants {
+public final class MetadataConstants {
     /** JPA Annotations */
     public static final String JPA_ACCESS = "jakarta.persistence.Access";
     public static final String JPA_ASSOCIATION_OVERRIDE = "jakarta.persistence.AssociationOverride";
@@ -193,4 +193,6 @@ public class MetadataConstants {
     public static final String ECLIPSELINK_PERSISTENCE_PACKAGE_PREFIX = "org.eclipse.persistence";
     public static final String ECLIPSELINK_OXM_PACKAGE_PREFIX = "org.eclipse.persistence.oxm";
 
+    private MetadataConstants() {
+    }
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/MetadataHelper.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/MetadataHelper.java
index ace2108..ce8219f 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/MetadataHelper.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/MetadataHelper.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
@@ -55,6 +55,9 @@ public class MetadataHelper {
     public static final String JPA_ORM_FILE = "META-INF/orm.xml";
     public static final String ECLIPSELINK_ORM_FILE = "META-INF/eclipselink-orm.xml";
 
+    private MetadataHelper() {
+    }
+
     /**
      * INTERNAL:
      * Return the canonical name. This will apply the prefix and suffix
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/MetadataLogger.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/MetadataLogger.java
index a46c3b4..ece7f53 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/MetadataLogger.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/MetadataLogger.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
@@ -59,6 +59,7 @@
 package org.eclipse.persistence.internal.jpa.metadata;
 
 import java.util.HashMap;
+import java.util.Map;
 
 import org.eclipse.persistence.exceptions.ValidationException;
 
@@ -227,7 +228,7 @@ public class MetadataLogger {
     /*************************************************************************/
 
     protected AbstractSession m_session;
-    protected HashMap m_ctxStrings;
+    protected Map<String, String> m_ctxStrings;
 
     /**
      * INTERNAL:
@@ -236,7 +237,7 @@ public MetadataLogger(AbstractSession session) {
         m_session = session;
 
         // Initialize the context strings.
-        m_ctxStrings = new HashMap();
+        m_ctxStrings = new HashMap<>();
 
         // Generic override messages for XML and annotations.
         addContextString(OVERRIDE_ANNOTATION_WITH_XML);
@@ -387,7 +388,7 @@ protected void addContextString(String context) {
      * Return the logging context string for the given context.
      */
     protected String getLoggingContextString(String context) {
-        String ctxString = (String) m_ctxStrings.get(context);
+        String ctxString = m_ctxStrings.get(context);
 
         if (ctxString == null) {
            throw ValidationException.missingContextStringForContext(context);
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/MetadataProject.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/MetadataProject.java
index 9dc6715..74ecf8a 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/MetadataProject.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/MetadataProject.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.
  * Copyright (c) 1998, 2018 IBM Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -1321,7 +1321,7 @@ protected String getSharedCacheModeName() {
 
                 if (PrivilegedAccessHelper.shouldUsePrivilegedAccess()) {
                     method = AccessController.doPrivileged(new PrivilegedGetDeclaredMethod(PersistenceUnitInfo.class, "getSharedCacheMode", null));
-                    m_sharedCacheMode = (SharedCacheMode) AccessController.doPrivileged(new PrivilegedMethodInvoker(method, m_persistenceUnitInfo));
+                    m_sharedCacheMode = AccessController.doPrivileged(new PrivilegedMethodInvoker<SharedCacheMode>(method, m_persistenceUnitInfo));
                 } else {
                     method = PrivilegedAccessHelper.getDeclaredMethod(PersistenceUnitInfo.class, "getSharedCacheMode", null);
                     m_sharedCacheMode = (SharedCacheMode) PrivilegedAccessHelper.invokeMethod(method, m_persistenceUnitInfo, null);
@@ -1594,8 +1594,8 @@ protected void processEmbeddableMappingAccessors() {
      * to be processed will be handled now.
      */
     protected void processAccessorsWithDerivedIDs() {
-        HashSet<ClassAccessor> processed = new HashSet();
-        HashSet<ClassAccessor> processing = new HashSet();
+        HashSet<ClassAccessor> processed = new HashSet<>();
+        HashSet<ClassAccessor> processing = new HashSet<>();
 
         for (ClassAccessor classAccessor : m_accessorsWithDerivedId.values()) {
             classAccessor.processDerivedId(processing, processed);
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/accessors/mappings/MappedKeyMapAccessor.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/accessors/mappings/MappedKeyMapAccessor.java
index 0fe5039..3dbdf16 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/accessors/mappings/MappedKeyMapAccessor.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/accessors/mappings/MappedKeyMapAccessor.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
@@ -49,55 +49,55 @@ public interface MappedKeyMapAccessor {
     /**
      * INTERNAL:
      */
-    public List<AssociationOverrideMetadata> getMapKeyAssociationOverrides();
+    List<AssociationOverrideMetadata> getMapKeyAssociationOverrides();
 
     /**
      * INTERNAL:
      */
-    public List<AttributeOverrideMetadata> getMapKeyAttributeOverrides();
+    List<AttributeOverrideMetadata> getMapKeyAttributeOverrides();
 
     /**
      * INTERNAL:
      */
-    public MapKeyMetadata getMapKey();
+    MapKeyMetadata getMapKey();
 
     /**
      * INTERNAL:
      */
-    public MetadataClass getMapKeyClass();
+    MetadataClass getMapKeyClass();
 
     /**
      * INTERNAL:
      */
-    public MetadataClass getMapKeyClassWithGenerics();
+    MetadataClass getMapKeyClassWithGenerics();
 
     /**
      * INTERNAL:
      */
-    public String getMapKeyConvert();
+    String getMapKeyConvert();
 
     /**
      * INTERNAL:
      */
-    public List<ConvertMetadata> getMapKeyConverts();
+    List<ConvertMetadata> getMapKeyConverts();
 
     /**
      * INTERNAL:
      */
-    public ColumnMetadata getMapKeyColumn();
+    ColumnMetadata getMapKeyColumn();
 
     /**
      * INTERNAL:
      */
-    public ForeignKeyMetadata getMapKeyForeignKey();
+    ForeignKeyMetadata getMapKeyForeignKey();
 
     /**
      * INTERNAL:
      */
-    public List<JoinColumnMetadata> getMapKeyJoinColumns();
+    List<JoinColumnMetadata> getMapKeyJoinColumns();
 
     /**
      * INTERNAL:
      */
-    public void setMapKeyClass(MetadataClass cls);
+    void setMapKeyClass(MetadataClass cls);
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/accessors/objects/MetadataAnnotation.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/accessors/objects/MetadataAnnotation.java
index 1eb24ae..a67ab84 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/accessors/objects/MetadataAnnotation.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/accessors/objects/MetadataAnnotation.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
@@ -40,6 +40,12 @@ public class MetadataAnnotation {
     protected Map<String, Object> m_attributes = new HashMap<String, Object>();
 
     /**
+     * Default constructor.
+     */
+    public MetadataAnnotation() {
+    }
+
+    /**
      * INTERNAL:
      */
     public void addAttribute(String key, Object value) {
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/accessors/objects/MetadataAsmFactory.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/accessors/objects/MetadataAsmFactory.java
index 580468a..222aac7 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/accessors/objects/MetadataAsmFactory.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/accessors/objects/MetadataAsmFactory.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.
  * Copyright (c) 1998, 2018 Hans Harz, Andrew Rustleund, IBM Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -41,14 +41,12 @@
 import org.eclipse.persistence.internal.libraries.asm.EclipseLinkAnnotationVisitor;
 import org.eclipse.persistence.internal.libraries.asm.Attribute;
 import org.eclipse.persistence.internal.libraries.asm.ClassReader;
-import org.eclipse.persistence.internal.libraries.asm.ClassVisitor;
 import org.eclipse.persistence.internal.libraries.asm.EclipseLinkClassVisitor;
 import org.eclipse.persistence.internal.libraries.asm.EclipseLinkFieldVisitor;
 import org.eclipse.persistence.internal.libraries.asm.EclipseLinkClassReader;
 import org.eclipse.persistence.internal.libraries.asm.FieldVisitor;
 import org.eclipse.persistence.internal.libraries.asm.EclipseLinkMethodVisitor;
 import org.eclipse.persistence.internal.libraries.asm.MethodVisitor;
-import org.eclipse.persistence.internal.libraries.asm.Opcodes;
 import org.eclipse.persistence.internal.libraries.asm.Type;
 import org.eclipse.persistence.internal.localization.ExceptionLocalization;
 import org.eclipse.persistence.internal.security.PrivilegedAccessHelper;
@@ -203,7 +201,7 @@ public void resolveGenericTypes(MetadataClass child, List<String> genericTypes,
 
             List<String> parentGenericTypes = parent.getGenericType();
             if (parentGenericTypes != null) {
-                List genericParentTemp = new ArrayList(genericTypes);
+                List<String> genericParentTemp = new ArrayList<>(genericTypes);
                 genericParentTemp.removeAll(child.getInterfaces());
 
                 int size = genericParentTemp.size();
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/accessors/objects/MetadataClass.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/accessors/objects/MetadataClass.java
index fc5e0be..ac945e5 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/accessors/objects/MetadataClass.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/accessors/objects/MetadataClass.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
@@ -110,7 +110,7 @@ public MetadataClass(MetadataFactory factory, Class cls) {
      */
     public void addEnclosedClass(MetadataClass enclosedClass) {
         if (m_enclosedClasses == null) {
-            m_enclosedClasses = new ArrayList<MetadataClass>();
+            m_enclosedClasses = new ArrayList<>();
         }
 
         m_enclosedClasses.add(enclosedClass);
@@ -121,7 +121,7 @@ public void addEnclosedClass(MetadataClass enclosedClass) {
      */
     public void addField(MetadataField field) {
         if (m_fields == null) {
-            m_fields = new HashMap<String, MetadataField>();
+            m_fields = new HashMap<>();
         }
 
         m_fields.put(field.getName(), field);
@@ -132,7 +132,7 @@ public void addField(MetadataField field) {
      */
     public void addInterface(String interfaceName) {
         if (m_interfaces == null) {
-            m_interfaces = new ArrayList<String>();
+            m_interfaces = new ArrayList<>();
         }
 
         m_interfaces.add(interfaceName);
@@ -143,7 +143,7 @@ public void addInterface(String interfaceName) {
      */
     public void addMethod(MetadataMethod method) {
         if (m_methods == null) {
-            m_methods = new HashMap<String, MetadataMethod>();
+            m_methods = new HashMap<>();
         }
 
         m_methods.put(method.getName(), method);
@@ -243,7 +243,7 @@ public boolean extendsInterface(String className) {
      */
     public List<MetadataClass> getEnclosedClasses() {
         if (m_enclosedClasses == null) {
-            m_enclosedClasses = new ArrayList<MetadataClass>();
+            m_enclosedClasses = new ArrayList<>();
         }
 
         return m_enclosedClasses;
@@ -278,7 +278,7 @@ public MetadataField getField(String name, boolean checkSuperClass) {
      */
     public Map<String, MetadataField> getFields() {
         if (m_fields == null) {
-            m_fields = new HashMap<String, MetadataField>();
+            m_fields = new HashMap<>();
 
             if (m_isLazy) {
                 m_factory.getMetadataClass(getName(), false);
@@ -293,7 +293,7 @@ public Map<String, MetadataField> getFields() {
      */
     public List<String> getInterfaces() {
         if (m_interfaces == null) {
-            m_interfaces = new ArrayList<String>();
+            m_interfaces = new ArrayList<>();
         }
 
         return m_interfaces;
@@ -312,7 +312,7 @@ protected MetadataMethod getMethod(String name) {
      * Return the method with the name and argument types.
      */
     public MetadataMethod getMethod(String name, Class[] arguments) {
-        List<String> argumentNames = new ArrayList<String>(arguments.length);
+        List<String> argumentNames = new ArrayList<>(arguments.length);
 
         for (int index = 0; index < arguments.length; index++) {
             argumentNames.add(arguments[index].getName());
@@ -385,7 +385,7 @@ public MetadataMethod getMethodForPropertyName(String propertyName) {
      */
     public Map<String, MetadataMethod> getMethods() {
         if (m_methods == null) {
-            m_methods = new HashMap<String, MetadataMethod>();
+            m_methods = new HashMap<>();
 
             if (m_isLazy) {
                 m_factory.getMetadataClass(getName(), false);
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/listeners/EntityListener.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/listeners/EntityListener.java
index 5e5a77f..d2e832d 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/listeners/EntityListener.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/listeners/EntityListener.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
@@ -303,7 +303,7 @@ void invokeMethod(Method method, Object onObject, Object[] objectList) {
             try {
                 if (PrivilegedAccessHelper.shouldUsePrivilegedAccess()){
                     try {
-                        AccessController.doPrivileged(new PrivilegedMethodInvoker(method, onObject, objectList));
+                        AccessController.doPrivileged(new PrivilegedMethodInvoker<Void>(method, onObject, objectList));
                     } catch (PrivilegedActionException exception) {
                         Exception throwableException = exception.getException();
                         if (throwableException instanceof IllegalAccessException) {
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/listeners/EntityListenerMetadata.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/listeners/EntityListenerMetadata.java
index 0274458..aa0cdf8 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/listeners/EntityListenerMetadata.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/listeners/EntityListenerMetadata.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,6 +34,7 @@
 import java.security.PrivilegedActionException;
 
 import java.util.HashSet;
+import java.util.Set;
 
 import org.eclipse.persistence.descriptors.DescriptorEventListener;
 
@@ -200,7 +201,7 @@ protected Method getCallbackMethod(String methodName, Method[] methods) {
      * methods from superclasses.
      */
     Method[] getCandidateCallbackMethodsForEntityListener() {
-        HashSet candidateMethods = new HashSet();
+        Set<Method> candidateMethods = new HashSet<>();
         Class listenerClass = m_listener.getListenerClass();
 
         // Add all the declared methods ...
@@ -219,7 +220,7 @@ protected Method getCallbackMethod(String methodName, Method[] methods) {
             candidateMethods.add(methods[i]);
         }
 
-        return (Method[]) candidateMethods.toArray(new Method[candidateMethods.size()]);
+        return candidateMethods.toArray(new Method[candidateMethods.size()]);
     }
 
     /**
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/listeners/JPAEntityListenerHolder.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/listeners/JPAEntityListenerHolder.java
index ae38044..70fce14 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/listeners/JPAEntityListenerHolder.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/listeners/JPAEntityListenerHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -44,6 +44,12 @@ public class JPAEntityListenerHolder implements SerializableDescriptorEventHolde
 
     public Map<String,java.util.List<MethodSerialImpl>> serializableMethods;
 
+    /**
+     * Default constructor.
+     */
+    public JPAEntityListenerHolder() {
+    }
+
     public void setIsDefaultListener(Boolean isDefaultListener) {
         this.isDefaultListener = isDefaultListener;
     }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/mappings/MapKeyMetadata.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/mappings/MapKeyMetadata.java
index 228953f..17f532d8 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/mappings/MapKeyMetadata.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/mappings/MapKeyMetadata.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
@@ -120,7 +120,7 @@ public String process(ContainerMapping mapping, MappingAccessor mappingAccessor)
             // A persistent property or field name may have have been provided.
             // If one has not we will default to the primary key of the reference
             // class. The primary key cannot be composite at this point.
-            String fieldOrPropertyName = MetadataHelper.getName(m_name, referenceDescriptor.getIdAttributeName(), logger.MAP_KEY_ATTRIBUTE_NAME, logger, mappingAccessor.getAnnotatedElementName());
+            String fieldOrPropertyName = MetadataHelper.getName(m_name, referenceDescriptor.getIdAttributeName(), MetadataLogger.MAP_KEY_ATTRIBUTE_NAME, logger, mappingAccessor.getAnnotatedElementName());
 
             // Look up the referenceAccessor
             MetadataAccessor referenceAccessor = referenceDescriptor.getMappingAccessor(fieldOrPropertyName);
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/queries/PLSQLParameterMetadata.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/queries/PLSQLParameterMetadata.java
index 5d02a1a..65213a2 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/queries/PLSQLParameterMetadata.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/queries/PLSQLParameterMetadata.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
@@ -15,6 +15,7 @@
 package org.eclipse.persistence.internal.jpa.metadata.queries;
 
 import org.eclipse.persistence.annotations.Direction;
+import org.eclipse.persistence.internal.databaseaccess.DatasourceCall;
 import org.eclipse.persistence.internal.helper.DatabaseField;
 import org.eclipse.persistence.internal.helper.DatabaseType;
 import org.eclipse.persistence.internal.jpa.metadata.MetadataProject;
@@ -267,7 +268,7 @@ public void process(PLSQLStoredProcedureCall call, boolean functionReturn) {
             }
         } else if (m_direction.equals(Direction.OUT_CURSOR.name())) {
             boolean multipleCursors = false;
-            if (call.getParameterTypes().contains(call.OUT_CURSOR)) {
+            if (call.getParameterTypes().contains(DatasourceCall.OUT_CURSOR)) {
                 multipleCursors = true;
             }
             call.useNamedCursorOutputAsResultSet(procedureParameterName, type);
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/sequencing/SequenceGeneratorMetadata.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/sequencing/SequenceGeneratorMetadata.java
index fc3b705..a3a1cc4 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/sequencing/SequenceGeneratorMetadata.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/sequencing/SequenceGeneratorMetadata.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
@@ -226,7 +226,7 @@ public NativeSequence process(MetadataLogger logger) {
 
         // Process the sequence name.
         if (m_sequenceName == null || m_sequenceName.equals("")) {
-            logger.logConfigMessage(logger.SEQUENCE_GENERATOR_SEQUENCE_NAME, m_name, getAccessibleObject(), getLocation());
+            logger.logConfigMessage(MetadataLogger.SEQUENCE_GENERATOR_SEQUENCE_NAME, m_name, getAccessibleObject(), getLocation());
             sequence.setName(m_name);
         } else {
             sequence.setName(m_sequenceName);
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/sequencing/TableGeneratorMetadata.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/sequencing/TableGeneratorMetadata.java
index eea5956..1b3932c 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/sequencing/TableGeneratorMetadata.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/sequencing/TableGeneratorMetadata.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
@@ -221,7 +221,7 @@ public TableSequence process(MetadataLogger logger) {
 
         // Process the sequence name.
         if (m_pkColumnValue == null || m_pkColumnValue.equals("")) {
-            logger.logConfigMessage(logger.TABLE_GENERATOR_PK_COLUMN_VALUE, m_generatorName, getAccessibleObject(), getLocation());
+            logger.logConfigMessage(MetadataLogger.TABLE_GENERATOR_PK_COLUMN_VALUE, m_generatorName, getAccessibleObject(), getLocation());
             sequence.setName(m_generatorName);
         } else {
             sequence.setName(m_pkColumnValue);
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/tables/IndexMetadata.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/tables/IndexMetadata.java
index ff84320..198e696 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/tables/IndexMetadata.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/tables/IndexMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2019 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
@@ -61,7 +61,7 @@ public class IndexMetadata extends ORMetadata {
     private String m_table;
     private String m_columnList;
 
-    private List<String> m_columnNames = new ArrayList();
+    private List<String> m_columnNames = new ArrayList<>();
 
     /**
      * INTERNAL:
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/xml/EmptyElementConverter.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/xml/EmptyElementConverter.java
index 7860d7a..b2515b8 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/xml/EmptyElementConverter.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/xml/EmptyElementConverter.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
@@ -26,6 +26,12 @@
  */
 public class EmptyElementConverter implements Converter {
 
+    /**
+     * Default constructor.
+     */
+    public EmptyElementConverter() {
+    }
+
     @Override
     public Object convertDataValueToObjectValue(Object dataValue, Session session) {
         if ("".equals(dataValue)) {
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/xml/XMLEntityMappings.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/xml/XMLEntityMappings.java
index 49a2600..fa4b6ef 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/xml/XMLEntityMappings.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/xml/XMLEntityMappings.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
@@ -967,7 +967,7 @@ public EntityAccessor reloadEntity(EntityAccessor accessor, MetadataDescriptor d
         // Create entity mappings object to write out.
         XMLEntityMappings xmlEntityMappings = newXMLEntityMappingsObject();
 
-        ArrayList list = new ArrayList();
+        List<EntityAccessor> list = new ArrayList<>();
         list.add(accessor);
         xmlEntityMappings.setEntities(list);
 
@@ -992,7 +992,7 @@ public MappedSuperclassAccessor reloadMappedSuperclass(MappedSuperclassAccessor
         // Create entity mappings object to write out.
         XMLEntityMappings xmlEntityMappings = newXMLEntityMappingsObject();
 
-        ArrayList list = new ArrayList();
+        List<MappedSuperclassAccessor> list = new ArrayList<>();
         list.add(accessor);
         xmlEntityMappings.setMappedSuperclasses(list);
 
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/xml/XMLEntityMappingsReader.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/xml/XMLEntityMappingsReader.java
index ca5134e..88f83d1 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/xml/XMLEntityMappingsReader.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/xml/XMLEntityMappingsReader.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.
  * Copyright (c) 1998, 2018 IBM and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -92,6 +92,9 @@ public class XMLEntityMappingsReader {
     private static Schema m_orm3_0Schema;
     private static Schema m_eclipseLinkOrmSchema;
 
+    private XMLEntityMappingsReader() {
+    }
+
     /**
      * Check the orm.xml to determine which project and schema to use.
      * EclipseLink ORM is used if input Reader is null
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/InternalExpression.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/InternalExpression.java
index 989c0b4..840e7e8 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/InternalExpression.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/InternalExpression.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
@@ -45,19 +45,19 @@
 // @since EclipseLink 1.2
 public interface InternalExpression{
 
-    public boolean isPredicate();
+    boolean isPredicate();
 
-    public boolean isCompoundExpression();
+    boolean isCompoundExpression();
 
-    public boolean isExpression();
+    boolean isExpression();
 
-    public boolean isLiteral();
+    boolean isLiteral();
 
-    public boolean isParameter();
+    boolean isParameter();
 
-    public boolean isSubquery();
+    boolean isSubquery();
 
     //conjunction or disjunction
-    public boolean isJunction();
+    boolean isJunction();
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/InternalSelection.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/InternalSelection.java
index ba0ff2a..e689853 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/InternalSelection.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/InternalSelection.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
@@ -31,12 +31,12 @@
  */
 public interface InternalSelection{
 
-    public void findRootAndParameters(CommonAbstractCriteriaImpl criteriaQuery);
+    void findRootAndParameters(CommonAbstractCriteriaImpl criteriaQuery);
 
-    public org.eclipse.persistence.expressions.Expression getCurrentNode();
+    org.eclipse.persistence.expressions.Expression getCurrentNode();
 
-    public boolean isFrom();
-    public boolean isRoot();
-    public boolean isConstructor();
+    boolean isFrom();
+    boolean isRoot();
+    boolean isConstructor();
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/ExceptionFactory.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/transaction/ExceptionFactory.java
similarity index 92%
rename from jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/ExceptionFactory.java
rename to jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/transaction/ExceptionFactory.java
index aaa2b83..2aebd06 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/ExceptionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/transaction/ExceptionFactory.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
@@ -12,7 +12,7 @@
 
 // Contributors:
 //     Oracle - initial API and implementation from Oracle TopLink
-package org.eclipse.persistence.internal.jpa;
+package org.eclipse.persistence.internal.jpa.transaction;
 
 import java.io.StringWriter;
 import java.io.PrintWriter;
@@ -20,7 +20,7 @@
 import jakarta.transaction.SystemException;
 import jakarta.transaction.RollbackException;
 
-public class ExceptionFactory {
+class ExceptionFactory {
     public ExceptionFactory() {
     }
 
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/transaction/TransactionImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/transaction/TransactionImpl.java
index 7940928..8eec1c4 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/transaction/TransactionImpl.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/transaction/TransactionImpl.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
@@ -21,7 +21,6 @@
 import javax.transaction.xa.XAResource;
 import jakarta.transaction.*;
 import org.eclipse.persistence.exceptions.TransactionException;
-import org.eclipse.persistence.internal.jpa.ExceptionFactory;
 import org.eclipse.persistence.internal.jpa.jdbc.ConnectionProxyHandler;
 import org.eclipse.persistence.internal.jpa.jdbc.DataSourceImpl;
 
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/transaction/TransactionManagerImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/transaction/TransactionManagerImpl.java
index f33a8cc..03046cf 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/transaction/TransactionManagerImpl.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/transaction/TransactionManagerImpl.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
@@ -17,7 +17,6 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 import jakarta.transaction.*;
-import org.eclipse.persistence.internal.jpa.ExceptionFactory;
 import org.eclipse.persistence.internal.jpa.jdbc.DataSourceImpl;
 
 /**
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/transaction/TransactionWrapper.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/transaction/TransactionWrapper.java
index 167c2c1..dcaaa8f 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/transaction/TransactionWrapper.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/transaction/TransactionWrapper.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
@@ -21,5 +21,5 @@
  * Wraps a class that returns a JDK 1.5 EntityTransaction.
  */
 public interface TransactionWrapper {
-    public abstract EntityTransaction getTransaction();
+    EntityTransaction getTransaction();
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/weaving/PersistenceWeaver.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/weaving/PersistenceWeaver.java
index 41e8eb4..9ebe5e7 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/weaving/PersistenceWeaver.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/weaving/PersistenceWeaver.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
@@ -35,7 +35,6 @@
 import org.eclipse.persistence.logging.AbstractSessionLog;
 import org.eclipse.persistence.logging.SessionLog;
 import org.eclipse.persistence.logging.SessionLogEntry;
-import org.eclipse.persistence.sessions.Session;
 
 /**
  * INTERNAL:
@@ -51,18 +50,6 @@ public class PersistenceWeaver implements ClassTransformer {
     /**
      * INTERNAL:
      * Creates an instance of dynamic byte code weaver.
-     * @param session EclipseLink session (not used so {@code null} value is OK).
-     * @param classDetailsMap Class name to {@link ClassDetails} map.
-     * @deprecated Session instance is no longer needed for logging. Will be removed in 2.8.
-     */
-    @Deprecated
-    public PersistenceWeaver(final Session session, final Map<String, ClassDetails> classDetailsMap) {
-        this.classDetailsMap = classDetailsMap;
-    }
-
-    /**
-     * INTERNAL:
-     * Creates an instance of dynamic byte code weaver.
      * @param classDetailsMap Class name to {@link ClassDetails} map.
      * @since 2.7
      */
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/ArchiveFactory.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/ArchiveFactory.java
index e81d3ce..d44b2ef 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/ArchiveFactory.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/ArchiveFactory.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
@@ -36,7 +36,7 @@ public interface ArchiveFactory {
      * @throws URISyntaxException
      * @throws IOException
      */
-    public Archive createArchive(URL rootUrl, Map properties) throws URISyntaxException, IOException;
+    Archive createArchive(URL rootUrl, Map properties) throws URISyntaxException, IOException;
 
     /**
      * Return an instance of an implementer of Archive that can process the URL provided
@@ -46,5 +46,5 @@ public interface ArchiveFactory {
      * @throws URISyntaxException
      * @throws IOException
      */
-    public Archive createArchive(URL rootUrl, String descriptorLocation, Map properties) throws URISyntaxException, IOException;
+    Archive createArchive(URL rootUrl, String descriptorLocation, Map properties) throws URISyntaxException, IOException;
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/JpaEntityManager.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/JpaEntityManager.java
index 37ab3ab..3aa39e0 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/JpaEntityManager.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/JpaEntityManager.java
@@ -145,7 +145,7 @@ public interface JpaEntityManager extends jakarta.persistence.EntityManager, Aut
      * or have a common inheritance hierarchy mapped root class.
      * The AttributeGroup should correspond to the entity type.
      */
-    public void load(Object entityOrEntities, AttributeGroup group);
+    void load(Object entityOrEntities, AttributeGroup group);
 
     /**
      * This method will return copy the passed entity using the passed AttributeGroup.
@@ -153,5 +153,5 @@ public interface JpaEntityManager extends jakarta.persistence.EntityManager, Aut
      * or have a common inheritance hierarchy mapped root class.
      * The AttributeGroup should correspond to the entity type.
      */
-    public Object copy(Object entityOrEntities, AttributeGroup group);
+    Object copy(Object entityOrEntities, AttributeGroup group);
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/JpaEntityManagerFactory.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/JpaEntityManagerFactory.java
index 67a73c7..a70e567 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/JpaEntityManagerFactory.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/JpaEntityManagerFactory.java
@@ -36,13 +36,13 @@ public interface JpaEntityManagerFactory extends EntityManagerFactory, AutoClose
      * Returns the DatabaseSession that the Factory will be using and
      * initializes it if it is not available.
      */
-    public DatabaseSessionImpl getDatabaseSession();
+    DatabaseSessionImpl getDatabaseSession();
 
     /**
      * Returns the ServerSession that the Factory will be using and
      * initializes it if it is not available.
      */
-    public ServerSession getServerSession();
+    ServerSession getServerSession();
 
     /**
      * Returns the SessionBroker that the Factory will be using and
@@ -51,7 +51,7 @@ public interface JpaEntityManagerFactory extends EntityManagerFactory, AutoClose
      * Calls to this method should only be made on entity managers
      * representing composite persistence units.
      */
-    public SessionBroker getSessionBroker();
+    SessionBroker getSessionBroker();
 
     /**
      * Gets the underlying implementation of the EntityManagerFactory.
@@ -60,7 +60,7 @@ public interface JpaEntityManagerFactory extends EntityManagerFactory, AutoClose
      * to refresh will not affect that metadata on this EntityManagerFactory.
      * @return
      */
-    public EntityManagerFactoryDelegate unwrap();
+    EntityManagerFactoryDelegate unwrap();
 
     /**
      * As this EntityManagerFactory to refresh itself.  This will cause the
@@ -68,7 +68,7 @@ public interface JpaEntityManagerFactory extends EntityManagerFactory, AutoClose
      * to be bootstrapped.  Existing EntityManagers will continue to use the old implementation
      * @param properties
      */
-    public void refreshMetadata(Map<String, Object> properties);
+    void refreshMetadata(Map<String, Object> properties);
 
 }
 
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/JpaHelper.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/JpaHelper.java
index dc0549f..8efd1ab 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/JpaHelper.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/JpaHelper.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
@@ -35,6 +35,10 @@
  * @author dclarke, gpelletie
  */
 public class JpaHelper {
+
+    private JpaHelper() {
+    }
+
     /**
      * Verify if the JPA provider is EclipseLink. If you are in a container
      * and not in a transaction this method may incorrectly return false.
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/JpaQuery.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/JpaQuery.java
index d9c1781..529175e 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/JpaQuery.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/JpaQuery.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
@@ -33,13 +33,13 @@ public interface JpaQuery<X> extends jakarta.persistence.TypedQuery<X> {
      * a named query and it has not yet been looked up, the query will be looked up
      * and stored as the cached query.
      */
-    public DatabaseQuery getDatabaseQuery();
+    DatabaseQuery getDatabaseQuery();
 
     /**
      * PUBLIC:
      * return the EntityManager for this query
      */
-    public JpaEntityManager getEntityManager();
+    JpaEntityManager getEntityManager();
 
     /**
      * PUBLIC:
@@ -47,19 +47,19 @@ public interface JpaQuery<X> extends jakarta.persistence.TypedQuery<X> {
      * that returns objects as a collection rather than a List
      * @return Collection of results
      */
-    public Collection getResultCollection();
+    Collection getResultCollection();
 
     /**
      * PUBLIC:
      * Non-standard method to return results of a ReadQuery that uses a Cursor.
      * @return Cursor on results, either a CursoredStream, or ScrollableCursor
      */
-    public Cursor getResultCursor();
+    Cursor getResultCursor();
 
     /**
      * PUBLIC:
      * Replace the cached query with the given query.
      */
-    public void setDatabaseQuery(DatabaseQuery query);
+    void setDatabaseQuery(DatabaseQuery query);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/PersistenceProvider.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/PersistenceProvider.java
index 0e9b02c..202ddb0 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/PersistenceProvider.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/PersistenceProvider.java
@@ -289,7 +289,7 @@ public boolean checkForProviderProperty(Map properties){
                 provider = ((Class)provider).getName();
             }
             try{
-                if (!(((String)provider).equals(EntityManagerFactoryProvider.class.getName()) || ((String)provider).equals(PersistenceProvider.class.getName()))){
+                if (!(EntityManagerFactoryProvider.class.getName().equals(provider) || PersistenceProvider.class.getName().equals(provider))){
                     return false;
                     //user has requested another provider so lets ignore this request.
                 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/AccessMethods.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/AccessMethods.java
index f0dc921..cadf47e 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/AccessMethods.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/AccessMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,7 +22,7 @@
  */
 public interface AccessMethods {
 
-    public AccessMethods setGetMethod(String getMethod);
-    public AccessMethods setSetMethod(String setMethod);
+    AccessMethods setGetMethod(String getMethod);
+    AccessMethods setSetMethod(String setMethod);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/AdditionalCriteria.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/AdditionalCriteria.java
index e5d1042..39a82f7 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/AdditionalCriteria.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/AdditionalCriteria.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,6 +22,6 @@
  */
 public interface AdditionalCriteria {
 
-    public AdditionalCriteria setCriteria(String criteria);
+    AdditionalCriteria setCriteria(String criteria);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Array.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Array.java
index f8701b3..35f59d3 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Array.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Array.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,21 +22,21 @@
  */
 public interface Array {
 
-    public Property addProperty();
-    public Array setAccess(String access);
-    public AccessMethods setAccessMethods();
-    public Array setAttributeType(String attributeType);
-    public Column setColumn();
-    public Array setConvert(String convert);
-    public Converter setConverter();
-    public Array setDatabaseType(String databaseType);
-    public Enumerated setEnumerated();
-    public Lob setLob();
-    public Array setName(String name);
-    public ObjectTypeConverter setObjectTypeConverter();
-    public StructConverter setStructConverter();
-    public Array setTargetClass(String targetClass);
-    public Temporal setTemporal();
-    public TypeConverter setTypeConverter();
+    Property addProperty();
+    Array setAccess(String access);
+    AccessMethods setAccessMethods();
+    Array setAttributeType(String attributeType);
+    Column setColumn();
+    Array setConvert(String convert);
+    Converter setConverter();
+    Array setDatabaseType(String databaseType);
+    Enumerated setEnumerated();
+    Lob setLob();
+    Array setName(String name);
+    ObjectTypeConverter setObjectTypeConverter();
+    StructConverter setStructConverter();
+    Array setTargetClass(String targetClass);
+    Temporal setTemporal();
+    TypeConverter setTypeConverter();
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/AssociationOverride.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/AssociationOverride.java
index 84ccd57..dae868d 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/AssociationOverride.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/AssociationOverride.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,9 +22,9 @@
  */
 public interface AssociationOverride {
 
-    public JoinColumn addJoinColumn();
-    public ForeignKey setForeignKey();
-    public JoinTable setJoinTable();
-    public AssociationOverride setName(String name);
+    JoinColumn addJoinColumn();
+    ForeignKey setForeignKey();
+    JoinTable setJoinTable();
+    AssociationOverride setName(String name);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/AttributeOverride.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/AttributeOverride.java
index bac254f..8236afc 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/AttributeOverride.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/AttributeOverride.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,7 +22,7 @@
  */
 public interface AttributeOverride {
 
-    public Column setColumn();
-    public AttributeOverride setName(String name);
+    Column setColumn();
+    AttributeOverride setName(String name);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Basic.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Basic.java
index 2c3384a..ac398c3 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Basic.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Basic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,32 +22,32 @@
  */
 public interface Basic {
 
-    public Convert addConvert();
-    public Property addProperty();
-    public Basic setAccess(String access);
-    public AccessMethods setAccessMethods();
-    public Basic setAttributeType(String attributeType);
-    public CacheIndex setCacheIndex();
-    public Column setColumn();
-    public Basic setConvert(String convert);
-    public Converter setConverter();
-    public Enumerated setEnumerated();
-    public Basic setFetch(String fetch);
-    public Field setField();
-    public GeneratedValue setGeneratedValue();
-    public Index setIndex();
-    public Lob setLob();
-    public Basic setMutable(Boolean mutable);
-    public Basic setName(String name);
-    public ObjectTypeConverter setObjectTypeConverter();
-    public Basic setOptional(Boolean optional);
-    public ReturnInsert setReturnInsert();
-    public Basic setReturnUpdate();
-    public SequenceGenerator setSequenceGenerator();
-    public StructConverter setStructConverter();
-    public TableGenerator setTableGenerator();
-    public Temporal setTemporal();
-    public TypeConverter setTypeConverter();
-    public UuidGenerator setUuidGenerator();
+    Convert addConvert();
+    Property addProperty();
+    Basic setAccess(String access);
+    AccessMethods setAccessMethods();
+    Basic setAttributeType(String attributeType);
+    CacheIndex setCacheIndex();
+    Column setColumn();
+    Basic setConvert(String convert);
+    Converter setConverter();
+    Enumerated setEnumerated();
+    Basic setFetch(String fetch);
+    Field setField();
+    GeneratedValue setGeneratedValue();
+    Index setIndex();
+    Lob setLob();
+    Basic setMutable(Boolean mutable);
+    Basic setName(String name);
+    ObjectTypeConverter setObjectTypeConverter();
+    Basic setOptional(Boolean optional);
+    ReturnInsert setReturnInsert();
+    Basic setReturnUpdate();
+    SequenceGenerator setSequenceGenerator();
+    StructConverter setStructConverter();
+    TableGenerator setTableGenerator();
+    Temporal setTemporal();
+    TypeConverter setTypeConverter();
+    UuidGenerator setUuidGenerator();
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/BatchFetch.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/BatchFetch.java
index 367f365..db1aabb 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/BatchFetch.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/BatchFetch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,7 +22,7 @@
  */
 public interface BatchFetch {
 
-    public BatchFetch setSize(Integer size);
-    public BatchFetch setType(String type);
+    BatchFetch setSize(Integer size);
+    BatchFetch setType(String type);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Cache.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Cache.java
index 6e19611..53233da 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Cache.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Cache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,15 +22,15 @@
  */
 public interface Cache {
 
-    public Cache setAlwaysRefresh(Boolean alwaysRefresh);
-    public Cache setCoordinationType(String coordinationType);
-    public Cache setDatabaseChangeNotificationType(String databaseChangeNotificationType);
-    public Cache setDisableHits(Boolean disableHits);
-    public Cache setExpiry(Integer expiry);
-    public TimeOfDay setExpiryTimeOfDay();
-    public Cache setIsolation(String isolation);
-    public Cache setRefreshOnlyIfNewer(Boolean refreshOnlyIfNewer);
-    public Cache setSize(Integer size);
-    public Cache setType(String type);
+    Cache setAlwaysRefresh(Boolean alwaysRefresh);
+    Cache setCoordinationType(String coordinationType);
+    Cache setDatabaseChangeNotificationType(String databaseChangeNotificationType);
+    Cache setDisableHits(Boolean disableHits);
+    Cache setExpiry(Integer expiry);
+    TimeOfDay setExpiryTimeOfDay();
+    Cache setIsolation(String isolation);
+    Cache setRefreshOnlyIfNewer(Boolean refreshOnlyIfNewer);
+    Cache setSize(Integer size);
+    Cache setType(String type);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/CacheIndex.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/CacheIndex.java
index 269f336..20ebd1b 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/CacheIndex.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/CacheIndex.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,7 +22,7 @@
  */
 public interface CacheIndex {
 
-    public CacheIndex addColumnName(String columnName);
-    public CacheIndex setUpdateable(Boolean updateable);
+    CacheIndex addColumnName(String columnName);
+    CacheIndex setUpdateable(Boolean updateable);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/CacheInterceptor.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/CacheInterceptor.java
index 021c164..35372e2 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/CacheInterceptor.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/CacheInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,6 +22,6 @@
  */
 public interface CacheInterceptor {
 
-    public CacheInterceptor setInterceptorClassName(String interceptorClassName);
+    CacheInterceptor setInterceptorClassName(String interceptorClassName);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Cascade.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Cascade.java
index 3db5245..db7a940 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Cascade.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Cascade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,11 +22,11 @@
  */
 public interface Cascade {
 
-    public Cascade setCascadeAll();
-    public Cascade setCascadeDetach();
-    public Cascade setCascadeMerge();
-    public Cascade setCascadePersist();
-    public Cascade setCascadeRefresh();
-    public Cascade setCascadeRemove();
+    Cascade setCascadeAll();
+    Cascade setCascadeDetach();
+    Cascade setCascadeMerge();
+    Cascade setCascadePersist();
+    Cascade setCascadeRefresh();
+    Cascade setCascadeRemove();
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ChangeTracking.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ChangeTracking.java
index 23cdc36..5dd1010 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ChangeTracking.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ChangeTracking.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,6 +22,6 @@
  */
 public interface ChangeTracking {
 
-    public ChangeTracking setType(String type);
+    ChangeTracking setType(String type);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/CloneCopyPolicy.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/CloneCopyPolicy.java
index 442be8b..cecab02 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/CloneCopyPolicy.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/CloneCopyPolicy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,7 +22,7 @@
  */
 public interface CloneCopyPolicy {
 
-    public CloneCopyPolicy setMethodName(String methodName);
-    public CloneCopyPolicy setWorkingCopyMethodName(String workingCopyMethodName);
+    CloneCopyPolicy setMethodName(String methodName);
+    CloneCopyPolicy setWorkingCopyMethodName(String workingCopyMethodName);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/CollectionTable.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/CollectionTable.java
index 2a11485..d67aa29 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/CollectionTable.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/CollectionTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,13 +22,13 @@
  */
 public interface CollectionTable {
 
-    public Index addIndex();
-    public JoinColumn addJoinColumn();
-    public UniqueConstraint addUniqueConstraint();
-    public CollectionTable setCatalog(String catalog);
-    public CollectionTable setCreationSuffix(String creationSuffix);
-    public ForeignKey setForeignKey();
-    public CollectionTable setName(String name);
-    public CollectionTable setSchema(String schema);
+    Index addIndex();
+    JoinColumn addJoinColumn();
+    UniqueConstraint addUniqueConstraint();
+    CollectionTable setCatalog(String catalog);
+    CollectionTable setCreationSuffix(String creationSuffix);
+    ForeignKey setForeignKey();
+    CollectionTable setName(String name);
+    CollectionTable setSchema(String schema);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Column.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Column.java
index 995db7f..8e69e2d 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Column.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Column.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,15 +22,15 @@
  */
 public interface Column {
 
-    public Column setName(String name);
-    public Column setUnique(Boolean unique);
-    public Column setNullable(Boolean nullable);
-    public Column setInsertable(Boolean insertable);
-    public Column setUpdatable(Boolean updatable);
-    public Column setColumnDefinition(String columnDefinition);
-    public Column setTable(String table);
-    public Column setLength(Integer length);
-    public Column setPrecision(Integer precision);
-    public Column setScale(Integer scale);
+    Column setName(String name);
+    Column setUnique(Boolean unique);
+    Column setNullable(Boolean nullable);
+    Column setInsertable(Boolean insertable);
+    Column setUpdatable(Boolean updatable);
+    Column setColumnDefinition(String columnDefinition);
+    Column setTable(String table);
+    Column setLength(Integer length);
+    Column setPrecision(Integer precision);
+    Column setScale(Integer scale);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ColumnResult.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ColumnResult.java
index 8fa793f..173374d 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ColumnResult.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ColumnResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,7 +22,7 @@
  */
 public interface ColumnResult {
 
-    public ColumnResult setName(String name);
-    public ColumnResult setType(String type);
+    ColumnResult setName(String name);
+    ColumnResult setType(String type);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ConstructorResult.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ConstructorResult.java
index c26ef48..061ade3 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ConstructorResult.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ConstructorResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,7 +22,7 @@
  */
 public interface ConstructorResult {
 
-    public ColumnResult addColumnResult();
-    public ConstructorResult setTargetClass(String targetClass);
+    ColumnResult addColumnResult();
+    ConstructorResult setTargetClass(String targetClass);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ConversionValue.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ConversionValue.java
index 0bcb0cd..e3b1292 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ConversionValue.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ConversionValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,7 +22,7 @@
  */
 public interface ConversionValue {
 
-    public ConversionValue setDataValue(String dataValue);
-    public ConversionValue setObjectValue(String objectValue);
+    ConversionValue setDataValue(String dataValue);
+    ConversionValue setObjectValue(String objectValue);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Convert.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Convert.java
index b9aa080..0caadc5 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Convert.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Convert.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,8 +22,8 @@
  */
 public interface Convert {
 
-    public Convert setAttributeName(String attributeName);
-    public Convert setConverter(String converter);
-    public Convert setDisableConversion(Boolean disableConversion);
+    Convert setAttributeName(String attributeName);
+    Convert setConverter(String converter);
+    Convert setDisableConversion(Boolean disableConversion);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Converter.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Converter.java
index f36cd48..f97420b 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Converter.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Converter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,7 +22,7 @@
  */
 public interface Converter {
 
-    public Converter setName(String name);
-    public Converter setClass(String className);
+    Converter setName(String name);
+    Converter setClass(String className);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ConverterClass.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ConverterClass.java
index 04d262f..b5dd69f 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ConverterClass.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ConverterClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,7 +22,7 @@
  */
 public interface ConverterClass {
 
-    public ConverterClass setClass(String className);
-    public ConverterClass setAutoApply(Boolean autoApply);
+    ConverterClass setClass(String className);
+    ConverterClass setAutoApply(Boolean autoApply);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/CopyPolicy.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/CopyPolicy.java
index 3283b8d..6ba1a31 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/CopyPolicy.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/CopyPolicy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,6 +22,6 @@
  */
 public interface CopyPolicy {
 
-    public CopyPolicy setCopyPolicyClassName(String copyPolicyClassName);
+    CopyPolicy setCopyPolicyClassName(String copyPolicyClassName);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/DataService.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/DataService.java
index abe709d..d765cfd 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/DataService.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/DataService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,7 +22,7 @@
  */
 public interface DataService {
 
-    public abstract PersistenceUnit getUnit();
-    public abstract String getName();
+    PersistenceUnit getUnit();
+    String getName();
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/DiscriminatorClass.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/DiscriminatorClass.java
index c9564d4..1fe0995 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/DiscriminatorClass.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/DiscriminatorClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,7 +22,7 @@
  */
 public interface DiscriminatorClass {
 
-    public DiscriminatorClass setDiscriminator(String discriminator);
-    public DiscriminatorClass setValue(String value);
+    DiscriminatorClass setDiscriminator(String discriminator);
+    DiscriminatorClass setValue(String value);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/DiscriminatorColumn.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/DiscriminatorColumn.java
index 8891d35..8567cea 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/DiscriminatorColumn.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/DiscriminatorColumn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,9 +22,9 @@
  */
 public interface DiscriminatorColumn {
 
-    public DiscriminatorColumn setName(String name);
-    public DiscriminatorColumn setDiscriminatorType(String discriminatorType);
-    public DiscriminatorColumn setColumnDefinition(String columnDefinition);
-    public DiscriminatorColumn setLength(Integer length);
+    DiscriminatorColumn setName(String name);
+    DiscriminatorColumn setDiscriminatorType(String discriminatorType);
+    DiscriminatorColumn setColumnDefinition(String columnDefinition);
+    DiscriminatorColumn setLength(Integer length);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ElementCollection.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ElementCollection.java
index c0340c3..3215238 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ElementCollection.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ElementCollection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,52 +22,52 @@
  */
 public interface ElementCollection {
 
-    public AssociationOverride addAssociationOverride();
-    public AttributeOverride addAttributeOverride();
-    public Convert addConvert();
-    public AssociationOverride addMapKeyAssociationOverride();
-    public AttributeOverride addMapKeyAttributeOverride();
-    public Convert addMapKeyConvert();
-    public JoinColumn addMapKeyJoinColumn();
-    public Property addProperty();
-    public ElementCollection setAccess(String access);
-    public AccessMethods setAccessMethods();
-    public ElementCollection setAttributeType(String attributeType);
-    public BatchFetch setBatchFetch();
-    public ElementCollection setCascadeOnDelete(Boolean cascadeOnDelete);
-    public CollectionTable setCollectionTable();
-    public Column setColumn();
-    public ElementCollection setCompositeMember(String compositeMember);
-    public ElementCollection setConvert(String convert);
-    public Converter setConverter();
-    public ElementCollection setDeleteAll(Boolean deleteAll);
-    public Enumerated setEnumerated();
-    public ElementCollection setFetch(String fetch);
-    public Field setField();
-    public HashPartitioning setHashPartitioning();
-    public ElementCollection setJoinFetch(String joinFetch);
-    public Lob setLob();
-    public MapKey setMapKey();
-    public ElementCollection setMapKeyClass(String mapKeyClass);
-    public Column setMapKeyColumn();
-    public ElementCollection setMapKeyConvert(String mapKeyConvert);
-    public Enumerated setMapKeyEnumerated();
-    public ForeignKey setMapKeyForeignKey();
-    public Temporal setMapKeyTemporal();
-    public ElementCollection setName(String name);
-    public ElementCollection setNonCacheable(Boolean nonCacheable);
-    public ObjectTypeConverter setObjectTypeConverter();
-    public ElementCollection setOrderBy(String orderBy);
-    public OrderColumn setOrderColumn();
-    public Partitioning setPartitioning();
-    public PinnedPartitioning setPinnedPartitioning();
-    public RangePartitioning setRangePartitioning();
-    public ReplicationPartitioning setReplicationPartitioning();
-    public RoundRobinPartitioning setRoundRobinPartitioning();
-    public StructConverter setStructConverter();
-    public ElementCollection setTargetClass(String targetClass);
-    public Temporal setTemporal();
-    public TypeConverter setTypeConverter();
-    public UnionPartitioning setUnionPartitioning();
-    public ValuePartitioning setValuePartitioning();
+    AssociationOverride addAssociationOverride();
+    AttributeOverride addAttributeOverride();
+    Convert addConvert();
+    AssociationOverride addMapKeyAssociationOverride();
+    AttributeOverride addMapKeyAttributeOverride();
+    Convert addMapKeyConvert();
+    JoinColumn addMapKeyJoinColumn();
+    Property addProperty();
+    ElementCollection setAccess(String access);
+    AccessMethods setAccessMethods();
+    ElementCollection setAttributeType(String attributeType);
+    BatchFetch setBatchFetch();
+    ElementCollection setCascadeOnDelete(Boolean cascadeOnDelete);
+    CollectionTable setCollectionTable();
+    Column setColumn();
+    ElementCollection setCompositeMember(String compositeMember);
+    ElementCollection setConvert(String convert);
+    Converter setConverter();
+    ElementCollection setDeleteAll(Boolean deleteAll);
+    Enumerated setEnumerated();
+    ElementCollection setFetch(String fetch);
+    Field setField();
+    HashPartitioning setHashPartitioning();
+    ElementCollection setJoinFetch(String joinFetch);
+    Lob setLob();
+    MapKey setMapKey();
+    ElementCollection setMapKeyClass(String mapKeyClass);
+    Column setMapKeyColumn();
+    ElementCollection setMapKeyConvert(String mapKeyConvert);
+    Enumerated setMapKeyEnumerated();
+    ForeignKey setMapKeyForeignKey();
+    Temporal setMapKeyTemporal();
+    ElementCollection setName(String name);
+    ElementCollection setNonCacheable(Boolean nonCacheable);
+    ObjectTypeConverter setObjectTypeConverter();
+    ElementCollection setOrderBy(String orderBy);
+    OrderColumn setOrderColumn();
+    Partitioning setPartitioning();
+    PinnedPartitioning setPinnedPartitioning();
+    RangePartitioning setRangePartitioning();
+    ReplicationPartitioning setReplicationPartitioning();
+    RoundRobinPartitioning setRoundRobinPartitioning();
+    StructConverter setStructConverter();
+    ElementCollection setTargetClass(String targetClass);
+    Temporal setTemporal();
+    TypeConverter setTypeConverter();
+    UnionPartitioning setUnionPartitioning();
+    ValuePartitioning setValuePartitioning();
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Embeddable.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Embeddable.java
index dc94ed6..c42eb74 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Embeddable.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Embeddable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,44 +22,44 @@
  */
 public interface Embeddable {
 
-    public Array addArray();
-    public AssociationOverride addAssociationOverride();
-    public AttributeOverride addAttributeOverride();
-    public Basic addBasic();
-    public Converter addConverter();
-    public ElementCollection addElementCollection();
-    public Embedded addEmbedded();
-    public Id addId();
-    public ManyToMany addManyToMany();
-    public ManyToOne addManyToOne();
-    public ObjectTypeConverter addObjectTypeConverter();
-    public OneToMany addOneToMany();
-    public OneToOne addOneToOne();
-    public OracleArray addOracleArray();
-    public OracleObject addOracleObject();
-    public PlsqlRecord addPlsqlRecord();
-    public PlsqlTable addPlsqlTable();
-    public Property addProperty();
-    public StructConverter addStructConverter();
-    public Structure addStructure();
-    public Transformation addTransformation();
-    public Transient addTransient();
-    public TypeConverter addTypeConverter();
-    public VariableOneToOne addVariableOneToOne();
-    public Version addVersion();
-    public Embeddable setAccess(String access);
-    public AccessMethods setAccessMethods();
-    public ChangeTracking setChangeTracking();
-    public Embeddable setClass(String cls);
-    public CloneCopyPolicy setCloneCopyPolicy();
-    public CopyPolicy setCopyPolicy();
-    public Embeddable setCustomizer(String customizer);
-    public EmbeddedId setEmbeddedId();
-    public Embeddable setExcludeDefaultMappings(Boolean excludeDefaultMappings);
-    public InstantiationCopyPolicy setInstantiationCopyPolicy();
-    public Embeddable setMetadataComplete(Boolean metadataComplete);
-    public NoSql setNoSql();
-    public Embeddable setParentClass(String parentClass);
-    public Struct setStruct();
+    Array addArray();
+    AssociationOverride addAssociationOverride();
+    AttributeOverride addAttributeOverride();
+    Basic addBasic();
+    Converter addConverter();
+    ElementCollection addElementCollection();
+    Embedded addEmbedded();
+    Id addId();
+    ManyToMany addManyToMany();
+    ManyToOne addManyToOne();
+    ObjectTypeConverter addObjectTypeConverter();
+    OneToMany addOneToMany();
+    OneToOne addOneToOne();
+    OracleArray addOracleArray();
+    OracleObject addOracleObject();
+    PlsqlRecord addPlsqlRecord();
+    PlsqlTable addPlsqlTable();
+    Property addProperty();
+    StructConverter addStructConverter();
+    Structure addStructure();
+    Transformation addTransformation();
+    Transient addTransient();
+    TypeConverter addTypeConverter();
+    VariableOneToOne addVariableOneToOne();
+    Version addVersion();
+    Embeddable setAccess(String access);
+    AccessMethods setAccessMethods();
+    ChangeTracking setChangeTracking();
+    Embeddable setClass(String cls);
+    CloneCopyPolicy setCloneCopyPolicy();
+    CopyPolicy setCopyPolicy();
+    Embeddable setCustomizer(String customizer);
+    EmbeddedId setEmbeddedId();
+    Embeddable setExcludeDefaultMappings(Boolean excludeDefaultMappings);
+    InstantiationCopyPolicy setInstantiationCopyPolicy();
+    Embeddable setMetadataComplete(Boolean metadataComplete);
+    NoSql setNoSql();
+    Embeddable setParentClass(String parentClass);
+    Struct setStruct();
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Embedded.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Embedded.java
index d7ae2ee..6c46028 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Embedded.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Embedded.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,14 +22,14 @@
  */
 public interface Embedded {
 
-    public AssociationOverride addAssociationOverride();
-    public AttributeOverride addAttributeOverride();
-    public Convert addConvert();
-    public Property addProperty();
-    public Embedded setAccess(String access);
-    public AccessMethods setAccessMethods();
-    public Embedded setAttributeType(String attributeType);
-    public Field setField();
-    public Embedded setName(String name);
+    AssociationOverride addAssociationOverride();
+    AttributeOverride addAttributeOverride();
+    Convert addConvert();
+    Property addProperty();
+    Embedded setAccess(String access);
+    AccessMethods setAccessMethods();
+    Embedded setAttributeType(String attributeType);
+    Field setField();
+    Embedded setName(String name);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/EmbeddedId.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/EmbeddedId.java
index f65e55c..a1f70bb 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/EmbeddedId.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/EmbeddedId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,11 +22,11 @@
  */
 public interface EmbeddedId {
 
-    public AttributeOverride addAttributeOverride();
-    public Property addProperty();
-    public EmbeddedId setAccess(String access);
-    public AccessMethods setAccessMethods();
-    public EmbeddedId setAttributeType(String attributeType);
-    public EmbeddedId setName(String name);
+    AttributeOverride addAttributeOverride();
+    Property addProperty();
+    EmbeddedId setAccess(String access);
+    AccessMethods setAccessMethods();
+    EmbeddedId setAttributeType(String attributeType);
+    EmbeddedId setName(String name);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Entity.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Entity.java
index dd486dd..85777ab 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Entity.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Entity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,97 +22,97 @@
  */
 public interface Entity {
 
-    public Array addArray();
-    public AssociationOverride addAssociationOverride();
-    public AttributeOverride addAttributeOverride();
-    public Basic addBasic();
-    public CacheIndex addCacheIndex();
-    public Convert addConvert();
-    public Converter addConverter();
-    public ElementCollection addElementCollection();
-    public EntityListener addEntityListener();
-    public Embedded addEmbedded();
-    public FetchGroup addFetchGroup();
-    public Id addId();
-    public Index addIndex();
-    public ManyToMany addManyToMany();
-    public ManyToOne addManyToOne();
-    public NamedNativeQuery addNamedNativeQuery();
-    public NamedPlsqlStoredFunctionQuery addNamedPLSQLStoredFunctionQuery();
-    public NamedPlsqlStoredProcedureQuery addNamedPLSQLStoredProcedureQuery();
-    public NamedQuery addNamedQuery();
-    public NamedStoredFunctionQuery addNamedStoredFunctionQuery();
-    public NamedStoredProcedureQuery addNamedStoredProcedureQuery();
-    public ObjectTypeConverter addObjectTypeConverter();
-    public OneToMany addOneToMany();
-    public OneToOne addOneToOne();
-    public OracleArray addOracleArray();
-    public OracleObject addOracleObject();
-    public PlsqlRecord addPlsqlRecord();
-    public PlsqlTable addPlsqlTable();
-    public PrimaryKeyJoinColumn addPrimaryKeyJoinColumn();
-    public Property addProperty();
-    public SecondaryTable addSecondaryTable();
-    public SqlResultSetMapping addSqlResultSetMapping();
-    public StructConverter addStructConverter();
-    public Structure addStructure();
-    public Transformation addTransformation();
-    public Transient addTransient();
-    public TypeConverter addTypeConverter();
-    public VariableOneToOne addVariableOneToOne();
-    public Version addVersion();
-    public Entity setAccess(String access);
-    public AccessMethods setAccessMethods();
-    public AdditionalCriteria setAdditionalCriteria();
-    public Cache setCache();
-    public Entity setCacheable(Boolean cacheable);
-    public CacheInterceptor setCacheInterceptor();
-    public Entity setCascadeOnDelete(Boolean cascadeOnDelete);
-    public ChangeTracking setChangeTracking();
-    public Entity setClass(String cls);
-    public Entity setClassExtractor(String classExtractor);
-    public CloneCopyPolicy setCloneCopyPolicy();
-    public CopyPolicy setCopyPolicy();
-    public Entity setCustomizer(String customizer);
-    public DiscriminatorColumn setDiscriminatorColumn();
-    public Entity setDiscriminatorValue(String discriminatorValue);
-    public EmbeddedId setEmbeddedId();
-    public Entity setExcludeDefaultListeners(Boolean excludeDefaultListeners);
-    public Entity setExcludeDefaultMappings(Boolean excludeDefaultMappings);
-    public Entity setExcludeSuperclassListeners(Boolean excludeSuperclassListeners);
-    public Entity setExistenceChecking(String existenceChecking);
-    public HashPartitioning setHashPartitioning();
-    public Entity setIdClass(String idClass);
-    public Inheritance setInheritance();
-    public InstantiationCopyPolicy setInstantiationCopyPolicy();
-    public Entity setMetadataComplete(Boolean metadataComplete);
-    public Multitenant setMultitenant();
-    public Entity setName(String name);
-    public NoSql setNoSql();
-    public OptimisticLocking setOptimisticLocking();
-    public Entity setParentClass(String parentClass);
-    public Partitioning setPartitioning();
-    public PinnedPartitioning setPinnedPartitioning();
-    public Entity setPostLoad(String methodName);
-    public Entity setPostPersist(String methodName);
-    public Entity setPostRemove(String methodName);
-    public Entity setPostUpdate(String methodName);
-    public Entity setPrePersist(String methodName);
-    public Entity setPreRemove(String methodName);
-    public Entity setPreUpdate(String methodName);
-    public PrimaryKey setPrimaryKey();
-    public ForeignKey setPrimaryKeyForeignKey();
-    public QueryRedirectors setQueryRedirectors();
-    public RangePartitioning setRangePartitioning();
-    public Entity setReadOnly(Boolean readOnly);
-    public ReplicationPartitioning setReplicationPartitioning();
-    public RoundRobinPartitioning setRoundRobinPartitioning();
-    public SequenceGenerator setSequenceGenerator();
-    public Struct setStruct();
-    public Table setTable();
-    public TableGenerator setTableGenerator();
-    public UnionPartitioning setUnionPartitioning();
-    public UuidGenerator setUuidGenerator();
-    public ValuePartitioning setValuePartitioning();
+    Array addArray();
+    AssociationOverride addAssociationOverride();
+    AttributeOverride addAttributeOverride();
+    Basic addBasic();
+    CacheIndex addCacheIndex();
+    Convert addConvert();
+    Converter addConverter();
+    ElementCollection addElementCollection();
+    EntityListener addEntityListener();
+    Embedded addEmbedded();
+    FetchGroup addFetchGroup();
+    Id addId();
+    Index addIndex();
+    ManyToMany addManyToMany();
+    ManyToOne addManyToOne();
+    NamedNativeQuery addNamedNativeQuery();
+    NamedPlsqlStoredFunctionQuery addNamedPLSQLStoredFunctionQuery();
+    NamedPlsqlStoredProcedureQuery addNamedPLSQLStoredProcedureQuery();
+    NamedQuery addNamedQuery();
+    NamedStoredFunctionQuery addNamedStoredFunctionQuery();
+    NamedStoredProcedureQuery addNamedStoredProcedureQuery();
+    ObjectTypeConverter addObjectTypeConverter();
+    OneToMany addOneToMany();
+    OneToOne addOneToOne();
+    OracleArray addOracleArray();
+    OracleObject addOracleObject();
+    PlsqlRecord addPlsqlRecord();
+    PlsqlTable addPlsqlTable();
+    PrimaryKeyJoinColumn addPrimaryKeyJoinColumn();
+    Property addProperty();
+    SecondaryTable addSecondaryTable();
+    SqlResultSetMapping addSqlResultSetMapping();
+    StructConverter addStructConverter();
+    Structure addStructure();
+    Transformation addTransformation();
+    Transient addTransient();
+    TypeConverter addTypeConverter();
+    VariableOneToOne addVariableOneToOne();
+    Version addVersion();
+    Entity setAccess(String access);
+    AccessMethods setAccessMethods();
+    AdditionalCriteria setAdditionalCriteria();
+    Cache setCache();
+    Entity setCacheable(Boolean cacheable);
+    CacheInterceptor setCacheInterceptor();
+    Entity setCascadeOnDelete(Boolean cascadeOnDelete);
+    ChangeTracking setChangeTracking();
+    Entity setClass(String cls);
+    Entity setClassExtractor(String classExtractor);
+    CloneCopyPolicy setCloneCopyPolicy();
+    CopyPolicy setCopyPolicy();
+    Entity setCustomizer(String customizer);
+    DiscriminatorColumn setDiscriminatorColumn();
+    Entity setDiscriminatorValue(String discriminatorValue);
+    EmbeddedId setEmbeddedId();
+    Entity setExcludeDefaultListeners(Boolean excludeDefaultListeners);
+    Entity setExcludeDefaultMappings(Boolean excludeDefaultMappings);
+    Entity setExcludeSuperclassListeners(Boolean excludeSuperclassListeners);
+    Entity setExistenceChecking(String existenceChecking);
+    HashPartitioning setHashPartitioning();
+    Entity setIdClass(String idClass);
+    Inheritance setInheritance();
+    InstantiationCopyPolicy setInstantiationCopyPolicy();
+    Entity setMetadataComplete(Boolean metadataComplete);
+    Multitenant setMultitenant();
+    Entity setName(String name);
+    NoSql setNoSql();
+    OptimisticLocking setOptimisticLocking();
+    Entity setParentClass(String parentClass);
+    Partitioning setPartitioning();
+    PinnedPartitioning setPinnedPartitioning();
+    Entity setPostLoad(String methodName);
+    Entity setPostPersist(String methodName);
+    Entity setPostRemove(String methodName);
+    Entity setPostUpdate(String methodName);
+    Entity setPrePersist(String methodName);
+    Entity setPreRemove(String methodName);
+    Entity setPreUpdate(String methodName);
+    PrimaryKey setPrimaryKey();
+    ForeignKey setPrimaryKeyForeignKey();
+    QueryRedirectors setQueryRedirectors();
+    RangePartitioning setRangePartitioning();
+    Entity setReadOnly(Boolean readOnly);
+    ReplicationPartitioning setReplicationPartitioning();
+    RoundRobinPartitioning setRoundRobinPartitioning();
+    SequenceGenerator setSequenceGenerator();
+    Struct setStruct();
+    Table setTable();
+    TableGenerator setTableGenerator();
+    UnionPartitioning setUnionPartitioning();
+    UuidGenerator setUuidGenerator();
+    ValuePartitioning setValuePartitioning();
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/EntityListener.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/EntityListener.java
index 842c66f..6b84bbe 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/EntityListener.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/EntityListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,13 +22,13 @@
  */
 public interface EntityListener {
 
-    public EntityListener setClass(String className);
-    public EntityListener setPostLoad(String methodName);
-    public EntityListener setPostPersist(String methodName);
-    public EntityListener setPostRemove(String methodName);
-    public EntityListener setPostUpdate(String methodName);
-    public EntityListener setPrePersist(String methodName);
-    public EntityListener setPreRemove(String methodName);
-    public EntityListener setPreUpdate(String methodName);
+    EntityListener setClass(String className);
+    EntityListener setPostLoad(String methodName);
+    EntityListener setPostPersist(String methodName);
+    EntityListener setPostRemove(String methodName);
+    EntityListener setPostUpdate(String methodName);
+    EntityListener setPrePersist(String methodName);
+    EntityListener setPreRemove(String methodName);
+    EntityListener setPreUpdate(String methodName);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/EntityResult.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/EntityResult.java
index acdb932..ce94eaa 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/EntityResult.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/EntityResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,8 +22,8 @@
  */
 public interface EntityResult {
 
-    public FieldResult addFieldResult();
-    public EntityResult setDiscriminatorColumn(String discriminatorColumn);
-    public EntityResult setEntityClass(String entityClass);
+    FieldResult addFieldResult();
+    EntityResult setDiscriminatorColumn(String discriminatorColumn);
+    EntityResult setEntityClass(String entityClass);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Enumerated.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Enumerated.java
index 9dcce70..329f563 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Enumerated.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Enumerated.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,6 +22,6 @@
  */
 public interface Enumerated {
 
-    public Enumerated setType(String type);
+    Enumerated setType(String type);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/FetchAttribute.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/FetchAttribute.java
index cfc9477..c2b57ea 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/FetchAttribute.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/FetchAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,5 +22,5 @@
  */
 public interface FetchAttribute {
 
-    public FetchAttribute setName(String name);
+    FetchAttribute setName(String name);
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/FetchGroup.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/FetchGroup.java
index 1eda27e..1a9bc05 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/FetchGroup.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/FetchGroup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,8 +22,8 @@
  */
 public interface FetchGroup {
 
-    public FetchAttribute addAttribute();
-    public FetchGroup setLoad(Boolean load);
-    public FetchGroup setName(String name);
+    FetchAttribute addAttribute();
+    FetchGroup setLoad(Boolean load);
+    FetchGroup setName(String name);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Field.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Field.java
index e23e374..7d7230f 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Field.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Field.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,6 +22,6 @@
  */
 public interface Field {
 
-    public Field setName(String name);
+    Field setName(String name);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/FieldResult.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/FieldResult.java
index db09cc8..d5c53dd 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/FieldResult.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/FieldResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,7 +22,7 @@
  */
 public interface FieldResult {
 
-    public FieldResult setColumn(String column);
-    public FieldResult setName(String name);
+    FieldResult setColumn(String column);
+    FieldResult setName(String name);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ForeignKey.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ForeignKey.java
index 018b15c..93e576c 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ForeignKey.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ForeignKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,8 +22,8 @@
  */
 public interface ForeignKey {
 
-    public ForeignKey setConstraintMode(String constraintMode);
-    public ForeignKey setForeignKeyDefinition(String foreignKeyDefinition);
-    public ForeignKey setName(String name);
+    ForeignKey setConstraintMode(String constraintMode);
+    ForeignKey setForeignKeyDefinition(String foreignKeyDefinition);
+    ForeignKey setName(String name);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/GeneratedValue.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/GeneratedValue.java
index 7013a90..915411a 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/GeneratedValue.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/GeneratedValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,7 +22,7 @@
  */
 public interface GeneratedValue {
 
-    public GeneratedValue setGenerator(String generator);
-    public GeneratedValue setStrategy(String strategy);
+    GeneratedValue setGenerator(String generator);
+    GeneratedValue setStrategy(String strategy);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/HashPartitioning.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/HashPartitioning.java
index 9b8a8b5..30c7053 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/HashPartitioning.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/HashPartitioning.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,9 +22,9 @@
  */
 public interface HashPartitioning {
 
-    public HashPartitioning addConnectionPool(String connectionPool);
-    public HashPartitioning setName(String name);
-    public Column setPartitionColumn();
-    public HashPartitioning setUnionUnpartitionableQueries(Boolean unionUnpartitionableQueries);
+    HashPartitioning addConnectionPool(String connectionPool);
+    HashPartitioning setName(String name);
+    Column setPartitionColumn();
+    HashPartitioning setUnionUnpartitionableQueries(Boolean unionUnpartitionableQueries);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Id.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Id.java
index fc8f631..8cd4a2c 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Id.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Id.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,31 +22,31 @@
  */
 public interface Id {
 
-    public Property addProperty();
-    public Id setAccess(String access);
-    public AccessMethods setAccessMethods();
-    public Id setAttributeType(String attributeType);
-    public CacheIndex setCacheIndex();
-    public Column setColumn();
-    public Id setConvert(String convert);
-    public Converter setConverter();
-    public Enumerated setEnumerated();
-    public Id setFetch(String fetch);
-    public Field setField();
-    public GeneratedValue setGeneratedValue();
-    public Index setIndex();
-    public Lob setLob();
-    public Id setMutable(Boolean mutable);
-    public Id setName(String name);
-    public ObjectTypeConverter setObjectTypeConverter();
-    public Id setOptional(Boolean optional);
-    public ReturnInsert setReturnInsert();
-    public Id setReturnUpdate();
-    public SequenceGenerator setSequenceGenerator();
-    public StructConverter setStructConverter();
-    public TableGenerator setTableGenerator();
-    public Temporal setTemporal();
-    public TypeConverter setTypeConverter();
-    public UuidGenerator setUuidGenerator();
+    Property addProperty();
+    Id setAccess(String access);
+    AccessMethods setAccessMethods();
+    Id setAttributeType(String attributeType);
+    CacheIndex setCacheIndex();
+    Column setColumn();
+    Id setConvert(String convert);
+    Converter setConverter();
+    Enumerated setEnumerated();
+    Id setFetch(String fetch);
+    Field setField();
+    GeneratedValue setGeneratedValue();
+    Index setIndex();
+    Lob setLob();
+    Id setMutable(Boolean mutable);
+    Id setName(String name);
+    ObjectTypeConverter setObjectTypeConverter();
+    Id setOptional(Boolean optional);
+    ReturnInsert setReturnInsert();
+    Id setReturnUpdate();
+    SequenceGenerator setSequenceGenerator();
+    StructConverter setStructConverter();
+    TableGenerator setTableGenerator();
+    Temporal setTemporal();
+    TypeConverter setTypeConverter();
+    UuidGenerator setUuidGenerator();
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Index.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Index.java
index c2ff27a..6138710 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Index.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Index.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,12 +22,12 @@
  */
 public interface Index {
 
-    public Index addColumnName(String columnName); // EclipseLink index
-    public Index setCatalog(String catalog); // EclipseLink index
-    public Index setColumnList(String columnList); // JPA 2.1 index
-    public Index setName(String name); // EclipseLink and JPA 2.1 index
-    public Index setSchema(String schema); // EclipseLink index
-    public Index setTable(String table); // EclipseLink index
-    public Index setUnique(Boolean unique); // EclipseLink and JPA 2.1 index
+    Index addColumnName(String columnName); // EclipseLink index
+    Index setCatalog(String catalog); // EclipseLink index
+    Index setColumnList(String columnList); // JPA 2.1 index
+    Index setName(String name); // EclipseLink and JPA 2.1 index
+    Index setSchema(String schema); // EclipseLink index
+    Index setTable(String table); // EclipseLink index
+    Index setUnique(Boolean unique); // EclipseLink and JPA 2.1 index
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Inheritance.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Inheritance.java
index 49c4a6f..3abc2dc 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Inheritance.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Inheritance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,6 +22,6 @@
  */
 public interface Inheritance {
 
-    public Inheritance setStrategy(String strategy);
+    Inheritance setStrategy(String strategy);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/JoinColumn.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/JoinColumn.java
index 10d34bc..b0f35e8 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/JoinColumn.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/JoinColumn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,13 +22,13 @@
  */
 public interface JoinColumn {
 
-    public JoinColumn setName(String name);
-    public JoinColumn setReferencedColumnName(String referencedColumnName);
-    public JoinColumn setUnique(Boolean unique);
-    public JoinColumn setNullable(Boolean nullable);
-    public JoinColumn setInsertable(Boolean insertable);
-    public JoinColumn setUpdatable(Boolean updatable);
-    public JoinColumn setColumnDefinition(String columnDefinition);
-    public JoinColumn setTable(String table);
+    JoinColumn setName(String name);
+    JoinColumn setReferencedColumnName(String referencedColumnName);
+    JoinColumn setUnique(Boolean unique);
+    JoinColumn setNullable(Boolean nullable);
+    JoinColumn setInsertable(Boolean insertable);
+    JoinColumn setUpdatable(Boolean updatable);
+    JoinColumn setColumnDefinition(String columnDefinition);
+    JoinColumn setTable(String table);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/JoinField.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/JoinField.java
index 58a6fac..a3bebb7 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/JoinField.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/JoinField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,7 +22,7 @@
  */
 public interface JoinField {
 
-    public JoinField setName(String name);
-    public JoinField setReferencedFieldName(String referencedFieldName);
+    JoinField setName(String name);
+    JoinField setReferencedFieldName(String referencedFieldName);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/JoinTable.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/JoinTable.java
index feef0ff..abbc31e 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/JoinTable.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/JoinTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,15 +22,15 @@
  */
 public interface JoinTable {
 
-    public Index addIndex();
-    public JoinColumn addInverseJoinColumn();
-    public JoinColumn addJoinColumn();
-    public UniqueConstraint addUniqueConstraint();
-    public JoinTable setCatalog(String catalog);
-    public JoinTable setCreationSuffix(String creationSuffix);
-    public ForeignKey setForeignKey();
-    public ForeignKey setInverseForeignKey();
-    public JoinTable setName(String name);
-    public JoinTable setSchema(String schema);
+    Index addIndex();
+    JoinColumn addInverseJoinColumn();
+    JoinColumn addJoinColumn();
+    UniqueConstraint addUniqueConstraint();
+    JoinTable setCatalog(String catalog);
+    JoinTable setCreationSuffix(String creationSuffix);
+    ForeignKey setForeignKey();
+    ForeignKey setInverseForeignKey();
+    JoinTable setName(String name);
+    JoinTable setSchema(String schema);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ManyToMany.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ManyToMany.java
index 1381f90..e528740 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ManyToMany.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ManyToMany.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,45 +22,45 @@
  */
 public interface ManyToMany {
 
-    public JoinField addJoinField();
-    public AssociationOverride addMapKeyAssociationOverride();
-    public AttributeOverride addMapKeyAttributeOverride();
-    public Convert addMapKeyConvert();
-    public JoinColumn addMapKeyJoinColumn();
-    public Property addProperty();
-    public ManyToMany setAccess(String access);
-    public AccessMethods setAccessMethods();
-    public ManyToMany setAttributeType(String attributeType);
-    public BatchFetch setBatchFetch();
-    public Cascade setCascade();
-    public ManyToMany setCascadeOnDelete(Boolean cascadeOnDelete);
-    public Converter setConverter();
-    public ManyToMany setFetch(String fetch);
-    public HashPartitioning setHashPartitioning();
-    public ManyToMany setJoinFetch(String joinFetch);
-    public JoinTable setJoinTable();
-    public MapKey setMapKey();
-    public ManyToMany setMapKeyClass(String mapKeyClass);
-    public Column setMapKeyColumn();
-    public ManyToMany setMapKeyConvert(String mapKeyConvert);
-    public Enumerated setMapKeyEnumerated();
-    public ForeignKey setMapKeyForeignKey();
-    public Temporal setMapKeyTemporal();
-    public ManyToMany setMappedBy(String mappedBy);
-    public ManyToMany setName(String name);
-    public ManyToMany setNonCacheable(Boolean nonCacheable);
-    public ObjectTypeConverter setObjectTypeConverter();
-    public ManyToMany setOrderBy(String orderBy);
-    public OrderColumn setOrderColumn();
-    public Partitioning setPartitioning();
-    public PinnedPartitioning setPinnedPartitioning();
-    public RangePartitioning setRangePartitioning();
-    public ReplicationPartitioning setReplicationPartitioning();
-    public RoundRobinPartitioning setRoundRobinPartitioning();
-    public StructConverter setStructConverter();
-    public ManyToMany setTargetEntity(String targetEntity);
-    public TypeConverter setTypeConverter();
-    public UnionPartitioning setUnionPartitioning();
-    public ValuePartitioning setValuePartitioning();
+    JoinField addJoinField();
+    AssociationOverride addMapKeyAssociationOverride();
+    AttributeOverride addMapKeyAttributeOverride();
+    Convert addMapKeyConvert();
+    JoinColumn addMapKeyJoinColumn();
+    Property addProperty();
+    ManyToMany setAccess(String access);
+    AccessMethods setAccessMethods();
+    ManyToMany setAttributeType(String attributeType);
+    BatchFetch setBatchFetch();
+    Cascade setCascade();
+    ManyToMany setCascadeOnDelete(Boolean cascadeOnDelete);
+    Converter setConverter();
+    ManyToMany setFetch(String fetch);
+    HashPartitioning setHashPartitioning();
+    ManyToMany setJoinFetch(String joinFetch);
+    JoinTable setJoinTable();
+    MapKey setMapKey();
+    ManyToMany setMapKeyClass(String mapKeyClass);
+    Column setMapKeyColumn();
+    ManyToMany setMapKeyConvert(String mapKeyConvert);
+    Enumerated setMapKeyEnumerated();
+    ForeignKey setMapKeyForeignKey();
+    Temporal setMapKeyTemporal();
+    ManyToMany setMappedBy(String mappedBy);
+    ManyToMany setName(String name);
+    ManyToMany setNonCacheable(Boolean nonCacheable);
+    ObjectTypeConverter setObjectTypeConverter();
+    ManyToMany setOrderBy(String orderBy);
+    OrderColumn setOrderColumn();
+    Partitioning setPartitioning();
+    PinnedPartitioning setPinnedPartitioning();
+    RangePartitioning setRangePartitioning();
+    ReplicationPartitioning setReplicationPartitioning();
+    RoundRobinPartitioning setRoundRobinPartitioning();
+    StructConverter setStructConverter();
+    ManyToMany setTargetEntity(String targetEntity);
+    TypeConverter setTypeConverter();
+    UnionPartitioning setUnionPartitioning();
+    ValuePartitioning setValuePartitioning();
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ManyToOne.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ManyToOne.java
index 608be39..590cb97 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ManyToOne.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ManyToOne.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,31 +22,31 @@
  */
 public interface ManyToOne {
 
-    public JoinColumn addJoinColumn();
-    public JoinField addJoinField();
-    public Property addProperty();
-    public ManyToOne setAccess(String access);
-    public AccessMethods setAccessMethods();
-    public BatchFetch setBatchFetch();
-    public Cascade setCascade();
-    public ManyToOne setFetch(String fetch);
-    public ForeignKey setForeignKey();
-    public HashPartitioning setHashPartitioning();
-    public ManyToOne setId(Boolean id);
-    public ManyToOne setJoinFetch(String joinFetch);
-    public JoinTable setJoinTable();
-    public ManyToOne setMapsId(String mapsId);
-    public ManyToOne setName(String name);
-    public ManyToOne setNonCacheable(Boolean nonCacheable);
-    public ManyToOne setOptional(Boolean optional);
-    public ManyToOne setPartitioned(String partitioned);
-    public Partitioning setPartitioning();
-    public PinnedPartitioning setPinnedPartitioning();
-    public RangePartitioning setRangePartitioning();
-    public ReplicationPartitioning setReplicationPartitioning();
-    public RoundRobinPartitioning setRoundRobinPartitioning();
-    public ManyToOne setTargetEntity(String targetEntity);
-    public UnionPartitioning setUnionPartitioning();
-    public ValuePartitioning setValuePartitioning();
+    JoinColumn addJoinColumn();
+    JoinField addJoinField();
+    Property addProperty();
+    ManyToOne setAccess(String access);
+    AccessMethods setAccessMethods();
+    BatchFetch setBatchFetch();
+    Cascade setCascade();
+    ManyToOne setFetch(String fetch);
+    ForeignKey setForeignKey();
+    HashPartitioning setHashPartitioning();
+    ManyToOne setId(Boolean id);
+    ManyToOne setJoinFetch(String joinFetch);
+    JoinTable setJoinTable();
+    ManyToOne setMapsId(String mapsId);
+    ManyToOne setName(String name);
+    ManyToOne setNonCacheable(Boolean nonCacheable);
+    ManyToOne setOptional(Boolean optional);
+    ManyToOne setPartitioned(String partitioned);
+    Partitioning setPartitioning();
+    PinnedPartitioning setPinnedPartitioning();
+    RangePartitioning setRangePartitioning();
+    ReplicationPartitioning setReplicationPartitioning();
+    RoundRobinPartitioning setRoundRobinPartitioning();
+    ManyToOne setTargetEntity(String targetEntity);
+    UnionPartitioning setUnionPartitioning();
+    ValuePartitioning setValuePartitioning();
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/MapKey.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/MapKey.java
index 5fe7da4..926fda0 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/MapKey.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/MapKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,6 +22,6 @@
  */
 public interface MapKey {
 
-    public MapKey setName(String name);
+    MapKey setName(String name);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/MappedSuperclass.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/MappedSuperclass.java
index 20e0d9c..04b582f 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/MappedSuperclass.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/MappedSuperclass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,83 +22,83 @@
  */
 public interface MappedSuperclass {
 
-    public Array addArray();
-    public AssociationOverride addAssociationOverride();
-    public AttributeOverride addAttributeOverride();
-    public Basic addBasic();
-    public CacheIndex addCacheIndex();
-    public Converter addConverter();
-    public ElementCollection addElementCollection();
-    public EntityListener addEntityListener();
-    public Embedded addEmbedded();
-    public FetchGroup addFetchGroup();
-    public Id addId();
-    public ManyToMany addManyToMany();
-    public ManyToOne addManyToOne();
-    public NamedNativeQuery addNamedNativeQuery();
-    public NamedPlsqlStoredFunctionQuery addNamedPLSQLStoredFunctionQuery();
-    public NamedPlsqlStoredProcedureQuery addNamedPLSQLStoredProcedureQuery();
-    public NamedQuery addNamedQuery();
-    public NamedStoredFunctionQuery addNamedStoredFunctionQuery();
-    public NamedStoredProcedureQuery addNamedStoredProcedureQuery();
-    public ObjectTypeConverter addObjectTypeConverter();
-    public OneToMany addOneToMany();
-    public OneToOne addOneToOne();
-    public OracleArray addOracleArray();
-    public OracleObject addOracleObject();
-    public PlsqlRecord addPlsqlRecord();
-    public PlsqlTable addPlsqlTable();
-    public Property addProperty();
-    public SqlResultSetMapping addSqlResultSetMapping();
-    public StructConverter addStructConverter();
-    public Structure addStructure();
-    public Transformation addTransformation();
-    public Transient addTransient();
-    public TypeConverter addTypeConverter();
-    public VariableOneToOne addVariableOneToOne();
-    public Version addVersion();
-    public MappedSuperclass setAccess(String access);
-    public AccessMethods setAccessMethods();
-    public AdditionalCriteria setAdditionalCriteria();
-    public Cache setCache();
-    public MappedSuperclass setCacheable(Boolean cacheable);
-    public CacheInterceptor setCacheInterceptor();
-    public ChangeTracking setChangeTracking();
-    public MappedSuperclass setClass(String cls);
-    public CloneCopyPolicy setCloneCopyPolicy();
-    public CopyPolicy setCopyPolicy();
-    public MappedSuperclass setCustomizer(String customizer);
-    public EmbeddedId setEmbeddedId();
-    public MappedSuperclass setExcludeDefaultListeners(Boolean excludeDefaultListeners);
-    public MappedSuperclass setExcludeDefaultMappings(Boolean excludeDefaultMappings);
-    public MappedSuperclass setExcludeSuperclassListeners(Boolean excludeSuperclassListeners);
-    public MappedSuperclass setExistenceChecking(String existenceChecking);
-    public HashPartitioning setHashPartitioning();
-    public MappedSuperclass setIdClass(String idClass);
-    public InstantiationCopyPolicy setInstantiationCopyPolicy();
-    public MappedSuperclass setMetadataComplete(Boolean metadataComplete);
-    public Multitenant setMultitenant();
-    public OptimisticLocking setOptimisticLocking();
-    public MappedSuperclass setParentClass(String parentClass);
-    public Partitioning setPartitioning();
-    public PinnedPartitioning setPinnedPartitioning();
-    public MappedSuperclass setPostLoad(String methodName);
-    public MappedSuperclass setPostPersist(String methodName);
-    public MappedSuperclass setPostRemove(String methodName);
-    public MappedSuperclass setPostUpdate(String methodName);
-    public MappedSuperclass setPrePersist(String methodName);
-    public MappedSuperclass setPreRemove(String methodName);
-    public MappedSuperclass setPreUpdate(String methodName);
-    public PrimaryKey setPrimaryKey();
-    public QueryRedirectors setQueryRedirectors();
-    public RangePartitioning setRangePartitioning();
-    public MappedSuperclass setReadOnly(Boolean readOnly);
-    public ReplicationPartitioning setReplicationPartitioning();
-    public RoundRobinPartitioning setRoundRobinPartitioning();
-    public SequenceGenerator setSequenceGenerator();
-    public TableGenerator setTableGenerator();
-    public UnionPartitioning setUnionPartitioning();
-    public UuidGenerator setUuidGenerator();
-    public ValuePartitioning setValuePartitioning();
+    Array addArray();
+    AssociationOverride addAssociationOverride();
+    AttributeOverride addAttributeOverride();
+    Basic addBasic();
+    CacheIndex addCacheIndex();
+    Converter addConverter();
+    ElementCollection addElementCollection();
+    EntityListener addEntityListener();
+    Embedded addEmbedded();
+    FetchGroup addFetchGroup();
+    Id addId();
+    ManyToMany addManyToMany();
+    ManyToOne addManyToOne();
+    NamedNativeQuery addNamedNativeQuery();
+    NamedPlsqlStoredFunctionQuery addNamedPLSQLStoredFunctionQuery();
+    NamedPlsqlStoredProcedureQuery addNamedPLSQLStoredProcedureQuery();
+    NamedQuery addNamedQuery();
+    NamedStoredFunctionQuery addNamedStoredFunctionQuery();
+    NamedStoredProcedureQuery addNamedStoredProcedureQuery();
+    ObjectTypeConverter addObjectTypeConverter();
+    OneToMany addOneToMany();
+    OneToOne addOneToOne();
+    OracleArray addOracleArray();
+    OracleObject addOracleObject();
+    PlsqlRecord addPlsqlRecord();
+    PlsqlTable addPlsqlTable();
+    Property addProperty();
+    SqlResultSetMapping addSqlResultSetMapping();
+    StructConverter addStructConverter();
+    Structure addStructure();
+    Transformation addTransformation();
+    Transient addTransient();
+    TypeConverter addTypeConverter();
+    VariableOneToOne addVariableOneToOne();
+    Version addVersion();
+    MappedSuperclass setAccess(String access);
+    AccessMethods setAccessMethods();
+    AdditionalCriteria setAdditionalCriteria();
+    Cache setCache();
+    MappedSuperclass setCacheable(Boolean cacheable);
+    CacheInterceptor setCacheInterceptor();
+    ChangeTracking setChangeTracking();
+    MappedSuperclass setClass(String cls);
+    CloneCopyPolicy setCloneCopyPolicy();
+    CopyPolicy setCopyPolicy();
+    MappedSuperclass setCustomizer(String customizer);
+    EmbeddedId setEmbeddedId();
+    MappedSuperclass setExcludeDefaultListeners(Boolean excludeDefaultListeners);
+    MappedSuperclass setExcludeDefaultMappings(Boolean excludeDefaultMappings);
+    MappedSuperclass setExcludeSuperclassListeners(Boolean excludeSuperclassListeners);
+    MappedSuperclass setExistenceChecking(String existenceChecking);
+    HashPartitioning setHashPartitioning();
+    MappedSuperclass setIdClass(String idClass);
+    InstantiationCopyPolicy setInstantiationCopyPolicy();
+    MappedSuperclass setMetadataComplete(Boolean metadataComplete);
+    Multitenant setMultitenant();
+    OptimisticLocking setOptimisticLocking();
+    MappedSuperclass setParentClass(String parentClass);
+    Partitioning setPartitioning();
+    PinnedPartitioning setPinnedPartitioning();
+    MappedSuperclass setPostLoad(String methodName);
+    MappedSuperclass setPostPersist(String methodName);
+    MappedSuperclass setPostRemove(String methodName);
+    MappedSuperclass setPostUpdate(String methodName);
+    MappedSuperclass setPrePersist(String methodName);
+    MappedSuperclass setPreRemove(String methodName);
+    MappedSuperclass setPreUpdate(String methodName);
+    PrimaryKey setPrimaryKey();
+    QueryRedirectors setQueryRedirectors();
+    RangePartitioning setRangePartitioning();
+    MappedSuperclass setReadOnly(Boolean readOnly);
+    ReplicationPartitioning setReplicationPartitioning();
+    RoundRobinPartitioning setRoundRobinPartitioning();
+    SequenceGenerator setSequenceGenerator();
+    TableGenerator setTableGenerator();
+    UnionPartitioning setUnionPartitioning();
+    UuidGenerator setUuidGenerator();
+    ValuePartitioning setValuePartitioning();
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Mappings.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Mappings.java
index 717fca2..7cb6103 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Mappings.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Mappings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,43 +22,43 @@
  */
 public interface Mappings {
 
-    public Converter addConverter();
-    public ConverterClass addConverterClass();
-    public Embeddable addEmbeddable();
-    public Entity addEntity();
-    public HashPartitioning addHashPartitioning();
-    public MappedSuperclass addMappedSuperclass();
-    public NamedNativeQuery addNamedNativeQuery();
-    public NamedPlsqlStoredFunctionQuery addNamedPlsqlStoredFunctionQuery();
-    public NamedPlsqlStoredProcedureQuery addNamedPlsqlStoredProcedureQuery();
-    public NamedQuery addNamedQuery();
-    public NamedStoredFunctionQuery addNamedStoredFunctionQuery();
-    public NamedStoredProcedureQuery addNamedStoredProcedureQuery();
-    public ObjectTypeConverter addObjectTypeConverter();
-    public OracleArray addOracleArray();
-    public OracleObject addOracleObject();
-    public Partitioning addPartitioning();
-    public PinnedPartitioning addPinnedPartitioning();
-    public PlsqlRecord addPlsqlRecord();
-    public PlsqlTable addPlsqlTable();
-    public RangePartitioning addRangePartitioning();
-    public ReplicationPartitioning addReplicationPartititioning();
-    public RoundRobinPartitioning addRoundRobinPartitioning();
-    public SequenceGenerator addSequenceGenerator();
-    public SqlResultSetMapping addSqlResultSetMapping();
-    public StructConverter addStructConverter();
-    public TableGenerator addTableGenerator();
-    public TenantDiscriminatorColumn addTenantDiscriminatorColumn();
-    public TypeConverter addTypeConverter();
-    public UnionPartitioning addUnionPartitioning();
-    public UuidGenerator addUuidGenerator();
-    public ValuePartitioning addValuePartitioning();
-    public Mappings setAccess(String access);
-    public AccessMethods setAccessMethods();
-    public Mappings setCatalog(String catalog);
-    public Mappings setPackage(String pkg);
-    public PersistenceUnitMetadata setPersistenceUnitMetadata();
-    public Mappings setSchema(String schema);
-    public Mappings setVersion(String version);
+    Converter addConverter();
+    ConverterClass addConverterClass();
+    Embeddable addEmbeddable();
+    Entity addEntity();
+    HashPartitioning addHashPartitioning();
+    MappedSuperclass addMappedSuperclass();
+    NamedNativeQuery addNamedNativeQuery();
+    NamedPlsqlStoredFunctionQuery addNamedPlsqlStoredFunctionQuery();
+    NamedPlsqlStoredProcedureQuery addNamedPlsqlStoredProcedureQuery();
+    NamedQuery addNamedQuery();
+    NamedStoredFunctionQuery addNamedStoredFunctionQuery();
+    NamedStoredProcedureQuery addNamedStoredProcedureQuery();
+    ObjectTypeConverter addObjectTypeConverter();
+    OracleArray addOracleArray();
+    OracleObject addOracleObject();
+    Partitioning addPartitioning();
+    PinnedPartitioning addPinnedPartitioning();
+    PlsqlRecord addPlsqlRecord();
+    PlsqlTable addPlsqlTable();
+    RangePartitioning addRangePartitioning();
+    ReplicationPartitioning addReplicationPartititioning();
+    RoundRobinPartitioning addRoundRobinPartitioning();
+    SequenceGenerator addSequenceGenerator();
+    SqlResultSetMapping addSqlResultSetMapping();
+    StructConverter addStructConverter();
+    TableGenerator addTableGenerator();
+    TenantDiscriminatorColumn addTenantDiscriminatorColumn();
+    TypeConverter addTypeConverter();
+    UnionPartitioning addUnionPartitioning();
+    UuidGenerator addUuidGenerator();
+    ValuePartitioning addValuePartitioning();
+    Mappings setAccess(String access);
+    AccessMethods setAccessMethods();
+    Mappings setCatalog(String catalog);
+    Mappings setPackage(String pkg);
+    PersistenceUnitMetadata setPersistenceUnitMetadata();
+    Mappings setSchema(String schema);
+    Mappings setVersion(String version);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Multitenant.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Multitenant.java
index 5eefdf2..d2163d7 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Multitenant.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Multitenant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,9 +22,9 @@
  */
 public interface Multitenant {
 
-    public TenantDiscriminatorColumn addTenantDiscriminatorColumn();
-    public Multitenant setIncludeCriteria(Boolean includeCriteria);
-    public TenantTableDiscriminator setTenantTableDiscriminator();
-    public Multitenant setType(String type);
+    TenantDiscriminatorColumn addTenantDiscriminatorColumn();
+    Multitenant setIncludeCriteria(Boolean includeCriteria);
+    TenantTableDiscriminator setTenantTableDiscriminator();
+    Multitenant setType(String type);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/NamedNativeQuery.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/NamedNativeQuery.java
index 0417de0..526ae26 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/NamedNativeQuery.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/NamedNativeQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,10 +22,10 @@
  */
 public interface NamedNativeQuery {
 
-    public QueryHint addQueryHint();
-    public NamedNativeQuery setName(String name);
-    public NamedNativeQuery setQuery(String query);
-    public NamedNativeQuery setResultClass(String resultClass);
-    public NamedNativeQuery setResultSetMapping(String resultSetMapping);
+    QueryHint addQueryHint();
+    NamedNativeQuery setName(String name);
+    NamedNativeQuery setQuery(String query);
+    NamedNativeQuery setResultClass(String resultClass);
+    NamedNativeQuery setResultSetMapping(String resultSetMapping);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/NamedPlsqlStoredFunctionQuery.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/NamedPlsqlStoredFunctionQuery.java
index 8f58e01..3bc5b0f 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/NamedPlsqlStoredFunctionQuery.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/NamedPlsqlStoredFunctionQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,11 +22,11 @@
  */
 public interface NamedPlsqlStoredFunctionQuery {
 
-    public PlsqlParameter addParameter();
-    public QueryHint addQueryHint();
-    public NamedPlsqlStoredFunctionQuery setFunctionName(String functionName);
-    public PlsqlParameter setReturnParameter();
-    public NamedPlsqlStoredFunctionQuery setName(String name);
-    public NamedPlsqlStoredFunctionQuery setResultSetMapping(String resultSetMapping);
+    PlsqlParameter addParameter();
+    QueryHint addQueryHint();
+    NamedPlsqlStoredFunctionQuery setFunctionName(String functionName);
+    PlsqlParameter setReturnParameter();
+    NamedPlsqlStoredFunctionQuery setName(String name);
+    NamedPlsqlStoredFunctionQuery setResultSetMapping(String resultSetMapping);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/NamedPlsqlStoredProcedureQuery.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/NamedPlsqlStoredProcedureQuery.java
index 627d991..479e483 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/NamedPlsqlStoredProcedureQuery.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/NamedPlsqlStoredProcedureQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,11 +22,11 @@
  */
 public interface NamedPlsqlStoredProcedureQuery {
 
-    public PlsqlParameter addParameter();
-    public QueryHint addQueryHint();
-    public NamedPlsqlStoredProcedureQuery setName(String name);
-    public NamedPlsqlStoredProcedureQuery setProcedureName(String procedureName);
-    public NamedPlsqlStoredProcedureQuery setResultClass(String resultClass);
-    public NamedPlsqlStoredProcedureQuery setResultSetMapping(String resultSetMapping);
+    PlsqlParameter addParameter();
+    QueryHint addQueryHint();
+    NamedPlsqlStoredProcedureQuery setName(String name);
+    NamedPlsqlStoredProcedureQuery setProcedureName(String procedureName);
+    NamedPlsqlStoredProcedureQuery setResultClass(String resultClass);
+    NamedPlsqlStoredProcedureQuery setResultSetMapping(String resultSetMapping);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/NamedQuery.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/NamedQuery.java
index b3de039..f1445c6 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/NamedQuery.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/NamedQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,9 +22,9 @@
  */
 public interface NamedQuery {
 
-    public QueryHint addQueryHint();
-    public NamedQuery setName(String name);
-    public NamedQuery setQuery(String query);
-    public NamedQuery setLockMode(String lockMode);
+    QueryHint addQueryHint();
+    NamedQuery setName(String name);
+    NamedQuery setQuery(String query);
+    NamedQuery setLockMode(String lockMode);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/NamedStoredFunctionQuery.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/NamedStoredFunctionQuery.java
index bfb866a..7c32b1d 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/NamedStoredFunctionQuery.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/NamedStoredFunctionQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,12 +22,12 @@
  */
 public interface NamedStoredFunctionQuery {
 
-    public StoredProcedureParameter addParameter();
-    public QueryHint addQueryHint();
-    public NamedStoredFunctionQuery setCallByIndex(Boolean callByIndex);
-    public NamedStoredFunctionQuery setFunctionName(String functionName);
-    public NamedStoredFunctionQuery setName(String name);
-    public NamedStoredFunctionQuery setResultSetMapping(String resultSetMapping);
-    public StoredProcedureParameter setReturnParameter();
+    StoredProcedureParameter addParameter();
+    QueryHint addQueryHint();
+    NamedStoredFunctionQuery setCallByIndex(Boolean callByIndex);
+    NamedStoredFunctionQuery setFunctionName(String functionName);
+    NamedStoredFunctionQuery setName(String name);
+    NamedStoredFunctionQuery setResultSetMapping(String resultSetMapping);
+    StoredProcedureParameter setReturnParameter();
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/NamedStoredProcedureQuery.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/NamedStoredProcedureQuery.java
index 726d00e..c3d33ee 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/NamedStoredProcedureQuery.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/NamedStoredProcedureQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,14 +22,14 @@
  */
 public interface NamedStoredProcedureQuery {
 
-    public QueryHint addQueryHint();
-    public StoredProcedureParameter addParameter();
-    public NamedStoredProcedureQuery addResultClass(String resultClass);
-    public NamedStoredProcedureQuery addResultSetMapping(String resultSetMapping);
-    public NamedStoredProcedureQuery setName(String name);
-    public NamedStoredProcedureQuery setProcedureName(String procedureName);
-    public NamedStoredProcedureQuery setReturnsResult(Boolean returnsResultSet);
-    public NamedStoredProcedureQuery setMultipleResultSets(Boolean multipleResultSets);
-    public NamedStoredProcedureQuery setCallByIndex(Boolean callByIndex);
+    QueryHint addQueryHint();
+    StoredProcedureParameter addParameter();
+    NamedStoredProcedureQuery addResultClass(String resultClass);
+    NamedStoredProcedureQuery addResultSetMapping(String resultSetMapping);
+    NamedStoredProcedureQuery setName(String name);
+    NamedStoredProcedureQuery setProcedureName(String procedureName);
+    NamedStoredProcedureQuery setReturnsResult(Boolean returnsResultSet);
+    NamedStoredProcedureQuery setMultipleResultSets(Boolean multipleResultSets);
+    NamedStoredProcedureQuery setCallByIndex(Boolean callByIndex);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/NoSql.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/NoSql.java
index 5373517..1abd90c 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/NoSql.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/NoSql.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,7 +22,7 @@
  */
 public interface NoSql {
 
-    public NoSql setDataFormat(String dataFormat);
-    public NoSql setDataType(String dataType);
+    NoSql setDataFormat(String dataFormat);
+    NoSql setDataType(String dataType);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ObjectTypeConverter.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ObjectTypeConverter.java
index f1b0cc7..73678de 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ObjectTypeConverter.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ObjectTypeConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,10 +22,10 @@
  */
 public interface ObjectTypeConverter {
 
-    public ObjectTypeConverter setName(String name);
-    public ObjectTypeConverter setDataType(String dataType);
-    public ObjectTypeConverter setObjectType(String objectType);
-    public ConversionValue addConversionValue();
-    public ObjectTypeConverter setDefaultObjectValue(String defaultObjectValue);
+    ObjectTypeConverter setName(String name);
+    ObjectTypeConverter setDataType(String dataType);
+    ObjectTypeConverter setObjectType(String objectType);
+    ConversionValue addConversionValue();
+    ObjectTypeConverter setDefaultObjectValue(String defaultObjectValue);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/OneToMany.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/OneToMany.java
index 8d48c93..dc3e047 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/OneToMany.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/OneToMany.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,50 +22,50 @@
  */
 public interface OneToMany {
 
-    public JoinColumn addJoinColumn();
-    public JoinField addJoinField();
-    public AssociationOverride addMapKeyAssociationOverride();
-    public AttributeOverride addMapKeyAttributeOverride();
-    public Convert addMapKeyConvert();
-    public JoinColumn addMapKeyJoinColumn();
-    public Property addProperty();
-    public OneToMany setAccess(String access);
-    public AccessMethods setAccessMethods();
-    public OneToMany setAttributeType(String attributeType);
-    public BatchFetch setBatchFetch();
-    public Cascade setCascade();
-    public OneToMany setCascadeOnDelete(Boolean cascadeOnDelete);
-    public Converter setConverter();
-    public OneToMany setDeleteAll(Boolean deleteAll);
-    public OneToMany setFetch(String fetch);
-    public ForeignKey setForeignKey();
-    public HashPartitioning setHashPartitioning();
-    public OneToMany setJoinFetch(String joinFetch);
-    public JoinTable setJoinTable();
-    public MapKey setMapKey();
-    public OneToMany setMapKeyClass(String mapKeyClass);
-    public Column setMapKeyColumn();
-    public OneToMany setMapKeyConvert(String mapKeyConvert);
-    public Enumerated setMapKeyEnumerated();
-    public ForeignKey setMapKeyForeignKey();
-    public Temporal setMapKeyTemporal();
-    public OneToMany setMappedBy(String mappedBy);
-    public OneToMany setName(String name);
-    public OneToMany setNonCacheable(Boolean nonCacheable);
-    public ObjectTypeConverter setObjectTypeConverter();
-    public OneToMany setOrderBy(String orderBy);
-    public OrderColumn setOrderColumn();
-    public OneToMany setOrphanRemoval(Boolean orphanRemoval);
-    public Partitioning setPartitioning();
-    public PinnedPartitioning setPinnedPartitioning();
-    public OneToMany setPrivateOwned(Boolean privateOwned);
-    public RangePartitioning setRangePartitioning();
-    public ReplicationPartitioning setReplicationPartitioning();
-    public RoundRobinPartitioning setRoundRobinPartitioning();
-    public StructConverter setStructConverter();
-    public OneToMany setTargetEntity(String targetEntity);
-    public TypeConverter setTypeConverter();
-    public UnionPartitioning setUnionPartitioning();
-    public ValuePartitioning setValuePartitioning();
+    JoinColumn addJoinColumn();
+    JoinField addJoinField();
+    AssociationOverride addMapKeyAssociationOverride();
+    AttributeOverride addMapKeyAttributeOverride();
+    Convert addMapKeyConvert();
+    JoinColumn addMapKeyJoinColumn();
+    Property addProperty();
+    OneToMany setAccess(String access);
+    AccessMethods setAccessMethods();
+    OneToMany setAttributeType(String attributeType);
+    BatchFetch setBatchFetch();
+    Cascade setCascade();
+    OneToMany setCascadeOnDelete(Boolean cascadeOnDelete);
+    Converter setConverter();
+    OneToMany setDeleteAll(Boolean deleteAll);
+    OneToMany setFetch(String fetch);
+    ForeignKey setForeignKey();
+    HashPartitioning setHashPartitioning();
+    OneToMany setJoinFetch(String joinFetch);
+    JoinTable setJoinTable();
+    MapKey setMapKey();
+    OneToMany setMapKeyClass(String mapKeyClass);
+    Column setMapKeyColumn();
+    OneToMany setMapKeyConvert(String mapKeyConvert);
+    Enumerated setMapKeyEnumerated();
+    ForeignKey setMapKeyForeignKey();
+    Temporal setMapKeyTemporal();
+    OneToMany setMappedBy(String mappedBy);
+    OneToMany setName(String name);
+    OneToMany setNonCacheable(Boolean nonCacheable);
+    ObjectTypeConverter setObjectTypeConverter();
+    OneToMany setOrderBy(String orderBy);
+    OrderColumn setOrderColumn();
+    OneToMany setOrphanRemoval(Boolean orphanRemoval);
+    Partitioning setPartitioning();
+    PinnedPartitioning setPinnedPartitioning();
+    OneToMany setPrivateOwned(Boolean privateOwned);
+    RangePartitioning setRangePartitioning();
+    ReplicationPartitioning setReplicationPartitioning();
+    RoundRobinPartitioning setRoundRobinPartitioning();
+    StructConverter setStructConverter();
+    OneToMany setTargetEntity(String targetEntity);
+    TypeConverter setTypeConverter();
+    UnionPartitioning setUnionPartitioning();
+    ValuePartitioning setValuePartitioning();
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/OneToOne.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/OneToOne.java
index be8200d..f7121b3 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/OneToOne.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/OneToOne.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,37 +22,37 @@
  */
 public interface OneToOne {
 
-    public JoinColumn addJoinColumn();
-    public JoinField addJoinField();
-    public PrimaryKeyJoinColumn addPrimaryKeyJoinColumn();
-    public Property addProperty();
-    public OneToOne setAccess(String access);
-    public AccessMethods setAccessMethods();
-    public BatchFetch setBatchFetch();
-    public Cascade setCascade();
-    public OneToOne setCascadeOnDelete(Boolean cascadeOnDelete);
-    public OneToOne setFetch(String fetch);
-    public ForeignKey setForeignKey();
-    public HashPartitioning setHashPartitioning();
-    public OneToOne setId(Boolean id);
-    public OneToOne setJoinFetch(String joinFetch);
-    public JoinTable setJoinTable();
-    public OneToOne setMappedBy(String mappedBy);
-    public OneToOne setMapsId(String mapsId);
-    public OneToOne setName(String name);
-    public OneToOne setNonCacheable(Boolean nonCacheable);
-    public OneToOne setOptional(Boolean optional);
-    public OneToOne setOrphanRemoval(Boolean orphanRemoval);
-    public OneToOne setPartitioned(String partitioned);
-    public Partitioning setPartitioning();
-    public PinnedPartitioning setPinnedPartitioning();
-    public ForeignKey setPrimaryKeyForeignKey();
-    public OneToOne setPrivateOwned(Boolean privateOwned);
-    public RangePartitioning setRangePartitioning();
-    public ReplicationPartitioning setReplicationPartitioning();
-    public RoundRobinPartitioning setRoundRobinPartitioning();
-    public OneToOne setTargetEntity(String targetEntity);
-    public UnionPartitioning setUnionPartitioning();
-    public ValuePartitioning setValuePartitioning();
+    JoinColumn addJoinColumn();
+    JoinField addJoinField();
+    PrimaryKeyJoinColumn addPrimaryKeyJoinColumn();
+    Property addProperty();
+    OneToOne setAccess(String access);
+    AccessMethods setAccessMethods();
+    BatchFetch setBatchFetch();
+    Cascade setCascade();
+    OneToOne setCascadeOnDelete(Boolean cascadeOnDelete);
+    OneToOne setFetch(String fetch);
+    ForeignKey setForeignKey();
+    HashPartitioning setHashPartitioning();
+    OneToOne setId(Boolean id);
+    OneToOne setJoinFetch(String joinFetch);
+    JoinTable setJoinTable();
+    OneToOne setMappedBy(String mappedBy);
+    OneToOne setMapsId(String mapsId);
+    OneToOne setName(String name);
+    OneToOne setNonCacheable(Boolean nonCacheable);
+    OneToOne setOptional(Boolean optional);
+    OneToOne setOrphanRemoval(Boolean orphanRemoval);
+    OneToOne setPartitioned(String partitioned);
+    Partitioning setPartitioning();
+    PinnedPartitioning setPinnedPartitioning();
+    ForeignKey setPrimaryKeyForeignKey();
+    OneToOne setPrivateOwned(Boolean privateOwned);
+    RangePartitioning setRangePartitioning();
+    ReplicationPartitioning setReplicationPartitioning();
+    RoundRobinPartitioning setRoundRobinPartitioning();
+    OneToOne setTargetEntity(String targetEntity);
+    UnionPartitioning setUnionPartitioning();
+    ValuePartitioning setValuePartitioning();
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/OptimisticLocking.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/OptimisticLocking.java
index 8387fee..4680278 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/OptimisticLocking.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/OptimisticLocking.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,8 +22,8 @@
  */
 public interface OptimisticLocking {
 
-    public Column addSelectedColumn();
-    public OptimisticLocking setCascade(Boolean cascade);
-    public OptimisticLocking setType(String type);
+    Column addSelectedColumn();
+    OptimisticLocking setCascade(Boolean cascade);
+    OptimisticLocking setType(String type);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/OracleArray.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/OracleArray.java
index dc1425d..16d2218 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/OracleArray.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/OracleArray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,8 +22,8 @@
  */
 public interface OracleArray {
 
-    public OracleArray setJavaType(String javaType);
-    public OracleArray setName(String name);
-    public OracleArray setNestedType(String nestedType);
+    OracleArray setJavaType(String javaType);
+    OracleArray setName(String name);
+    OracleArray setNestedType(String nestedType);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/OracleObject.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/OracleObject.java
index 7a96158..4bdca91 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/OracleObject.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/OracleObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,8 +22,8 @@
  */
 public interface OracleObject {
 
-    public PlsqlParameter addField();
-    public OracleObject setName(String name);
-    public OracleObject setJavaType(String javaType);
+    PlsqlParameter addField();
+    OracleObject setName(String name);
+    OracleObject setJavaType(String javaType);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/OrderColumn.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/OrderColumn.java
index ab2b194..30f2cda 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/OrderColumn.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/OrderColumn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,11 +22,11 @@
  */
 public interface OrderColumn {
 
-    public OrderColumn setColumnDefinition(String columnDefinition);
-    public OrderColumn setCorrectionType(String correctionType);
-    public OrderColumn setName(String name);
-    public OrderColumn setNullable(Boolean nullable);
-    public OrderColumn setInsertable(Boolean insertable);
-    public OrderColumn setUpdatable(Boolean updatable);
+    OrderColumn setColumnDefinition(String columnDefinition);
+    OrderColumn setCorrectionType(String correctionType);
+    OrderColumn setName(String name);
+    OrderColumn setNullable(Boolean nullable);
+    OrderColumn setInsertable(Boolean insertable);
+    OrderColumn setUpdatable(Boolean updatable);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Partitioning.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Partitioning.java
index d1c8846..7fd88f7 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Partitioning.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Partitioning.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,7 +22,7 @@
  */
 public interface Partitioning {
 
-    public Partitioning setClass(String className);
-    public Partitioning setName(String name);
+    Partitioning setClass(String className);
+    Partitioning setName(String name);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PersistenceUnit.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PersistenceUnit.java
index 1167e4f..c976715 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PersistenceUnit.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PersistenceUnit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -25,21 +25,21 @@
  */
 public interface PersistenceUnit {
 
-    public Mappings addMappings();
-    public ClassLoader getClassLoader();
-    public PersistenceUnitInfo getPersistenceUnitInfo();
-    public String getName();
-    public PersistenceUnit setClass(String cls);
-    public PersistenceUnit setExcludeUnlistedClasses(Boolean setExcludeUnlistedClasses);
-    public PersistenceUnit setJarFile(String jarFile); // pointless
-    public PersistenceUnit setJtaDataSource(String jtaDataSource);
-    public PersistenceUnit setMappingFile(String mappingFile); // pointless.
-    public PersistenceUnit setName(String name);
-    public PersistenceUnit setNonJtaDataSource(String nonJtaDataSource);
-    public PersistenceUnit setProperty(String name, Object value);
-    public PersistenceUnit setProvider(String provider);
-    public PersistenceUnit setSharedCacheMode(String sharedCacheMode);
-    public PersistenceUnit setTransactionType(PersistenceUnitTransactionType transactionType);
-    public PersistenceUnit setValidationMode(String validationMode);
+    Mappings addMappings();
+    ClassLoader getClassLoader();
+    PersistenceUnitInfo getPersistenceUnitInfo();
+    String getName();
+    PersistenceUnit setClass(String cls);
+    PersistenceUnit setExcludeUnlistedClasses(Boolean setExcludeUnlistedClasses);
+    PersistenceUnit setJarFile(String jarFile); // pointless
+    PersistenceUnit setJtaDataSource(String jtaDataSource);
+    PersistenceUnit setMappingFile(String mappingFile); // pointless.
+    PersistenceUnit setName(String name);
+    PersistenceUnit setNonJtaDataSource(String nonJtaDataSource);
+    PersistenceUnit setProperty(String name, Object value);
+    PersistenceUnit setProvider(String provider);
+    PersistenceUnit setSharedCacheMode(String sharedCacheMode);
+    PersistenceUnit setTransactionType(PersistenceUnitTransactionType transactionType);
+    PersistenceUnit setValidationMode(String validationMode);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PersistenceUnitDefaults.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PersistenceUnitDefaults.java
index 71ef105..9f4eacc 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PersistenceUnitDefaults.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PersistenceUnitDefaults.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,13 +22,13 @@
  */
 public interface PersistenceUnitDefaults {
 
-    public EntityListener addEntityListener();
-    public TenantDiscriminatorColumn addTenantDiscriminatorColumn();
-    public PersistenceUnitDefaults setAccess(String access);
-    public AccessMethods setAccessMethods();
-    public PersistenceUnitDefaults setCascadePersist(Boolean cascadePersist);
-    public PersistenceUnitDefaults setCatalog(String catalog);
-    public PersistenceUnitDefaults setDelimitedIdentifiers(Boolean delimitedIdentifiers);
-    public PersistenceUnitDefaults setSchema(String schema);
+    EntityListener addEntityListener();
+    TenantDiscriminatorColumn addTenantDiscriminatorColumn();
+    PersistenceUnitDefaults setAccess(String access);
+    AccessMethods setAccessMethods();
+    PersistenceUnitDefaults setCascadePersist(Boolean cascadePersist);
+    PersistenceUnitDefaults setCatalog(String catalog);
+    PersistenceUnitDefaults setDelimitedIdentifiers(Boolean delimitedIdentifiers);
+    PersistenceUnitDefaults setSchema(String schema);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PersistenceUnitMetadata.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PersistenceUnitMetadata.java
index 93b5ece..6cc8c1a 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PersistenceUnitMetadata.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PersistenceUnitMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,8 +22,8 @@
  */
 public interface PersistenceUnitMetadata {
 
-    public PersistenceUnitMetadata setExcludeDefaultMappings(Boolean excludeDefaultMappings);
-    public PersistenceUnitDefaults setPersitenceUnitDefault();
-    public PersistenceUnitMetadata setXmlMappingMetadataComplete(Boolean xmlMappingMetadataComplete);
+    PersistenceUnitMetadata setExcludeDefaultMappings(Boolean excludeDefaultMappings);
+    PersistenceUnitDefaults setPersitenceUnitDefault();
+    PersistenceUnitMetadata setXmlMappingMetadataComplete(Boolean xmlMappingMetadataComplete);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PinnedPartitioning.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PinnedPartitioning.java
index 9070e0e..78e59ef 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PinnedPartitioning.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PinnedPartitioning.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,7 +22,7 @@
  */
 public interface PinnedPartitioning {
 
-    public PinnedPartitioning setConnectionPool(String connectionPool);
-    public PinnedPartitioning setName(String name);
+    PinnedPartitioning setConnectionPool(String connectionPool);
+    PinnedPartitioning setName(String name);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PlsqlParameter.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PlsqlParameter.java
index b6264ab..79df646 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PlsqlParameter.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PlsqlParameter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,13 +22,13 @@
  */
 public interface PlsqlParameter {
 
-    public PlsqlParameter setDatabaseType(String databaseType);
-    public PlsqlParameter setDirection(String direction);
-    public PlsqlParameter setLength(Integer length);
-    public PlsqlParameter setName(String name);
-    public PlsqlParameter setOptional(Boolean optional);
-    public PlsqlParameter setPrecision(Integer precision);
-    public PlsqlParameter setQueryParameter(String queryParameter);
-    public PlsqlParameter setScale(Integer scale);
+    PlsqlParameter setDatabaseType(String databaseType);
+    PlsqlParameter setDirection(String direction);
+    PlsqlParameter setLength(Integer length);
+    PlsqlParameter setName(String name);
+    PlsqlParameter setOptional(Boolean optional);
+    PlsqlParameter setPrecision(Integer precision);
+    PlsqlParameter setQueryParameter(String queryParameter);
+    PlsqlParameter setScale(Integer scale);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PlsqlRecord.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PlsqlRecord.java
index 0d4582b..adae30a 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PlsqlRecord.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PlsqlRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,9 +22,9 @@
  */
 public interface PlsqlRecord {
 
-    public PlsqlParameter addField();
-    public PlsqlRecord setCompatibleType(String compatibleType);
-    public PlsqlRecord setJavaType(String javaType);
-    public PlsqlRecord setName(String name);
+    PlsqlParameter addField();
+    PlsqlRecord setCompatibleType(String compatibleType);
+    PlsqlRecord setJavaType(String javaType);
+    PlsqlRecord setName(String name);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PlsqlTable.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PlsqlTable.java
index 1fb1af6..1151101 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PlsqlTable.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PlsqlTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,9 +22,9 @@
  */
 public interface PlsqlTable {
 
-    public PlsqlTable setCompatibleType(String compatibleType);
-    public PlsqlTable setJavaType(String javaType);
-    public PlsqlTable setName(String name);
-    public PlsqlTable setNestedType(String nestedType);
+    PlsqlTable setCompatibleType(String compatibleType);
+    PlsqlTable setJavaType(String javaType);
+    PlsqlTable setName(String name);
+    PlsqlTable setNestedType(String nestedType);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PrimaryKey.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PrimaryKey.java
index 97195ca..636aed0 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PrimaryKey.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PrimaryKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,8 +22,8 @@
  */
 public interface PrimaryKey {
 
-    public Column addColumn();
-    public PrimaryKey setCacheKeyType(String cacheKeyType);
-    public PrimaryKey setValidation(String validation);
+    Column addColumn();
+    PrimaryKey setCacheKeyType(String cacheKeyType);
+    PrimaryKey setValidation(String validation);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PrimaryKeyJoinColumn.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PrimaryKeyJoinColumn.java
index c26a4a5..d2b51d7 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PrimaryKeyJoinColumn.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/PrimaryKeyJoinColumn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,8 +22,8 @@
  */
 public interface PrimaryKeyJoinColumn {
 
-    public PrimaryKeyJoinColumn setName(String name);
-    public PrimaryKeyJoinColumn setReferencedColumnName(String referencedColumnName);
-    public PrimaryKeyJoinColumn setColumnDefinition(String columnDefinition);
+    PrimaryKeyJoinColumn setName(String name);
+    PrimaryKeyJoinColumn setReferencedColumnName(String referencedColumnName);
+    PrimaryKeyJoinColumn setColumnDefinition(String columnDefinition);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Property.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Property.java
index 124f4d6..47cdd94 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Property.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Property.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,8 +22,8 @@
  */
 public interface Property {
 
-    public Property setName(String name);
-    public Property setValue(String value);
-    public Property setValueType(String valueType);
+    Property setName(String name);
+    Property setValue(String value);
+    Property setValueType(String valueType);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/QueryHint.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/QueryHint.java
index db1937c..8f89ac7 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/QueryHint.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/QueryHint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,7 +22,7 @@
  */
 public interface QueryHint {
 
-    public QueryHint setName(String name);
-    public QueryHint setValue(String value);
+    QueryHint setName(String name);
+    QueryHint setValue(String value);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/QueryRedirectors.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/QueryRedirectors.java
index cd6eac1..ef7aee2 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/QueryRedirectors.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/QueryRedirectors.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,12 +22,12 @@
  */
 public interface QueryRedirectors {
 
-    public QueryRedirectors setAllQueriesRedirector(String defaultRedirector);
-    public QueryRedirectors setDeleteRedirector(String deleteRedirector);
-    public QueryRedirectors setInsertRedirector(String insertRedirector);
-    public QueryRedirectors setReadAllRedirector(String readAllRedirector);
-    public QueryRedirectors setReadObjectRedirector(String readObjectRedirector);
-    public QueryRedirectors setReportRedirector(String reportRedirector);
-    public QueryRedirectors setUpdateRedirector(String updateRedirector);
+    QueryRedirectors setAllQueriesRedirector(String defaultRedirector);
+    QueryRedirectors setDeleteRedirector(String deleteRedirector);
+    QueryRedirectors setInsertRedirector(String insertRedirector);
+    QueryRedirectors setReadAllRedirector(String readAllRedirector);
+    QueryRedirectors setReadObjectRedirector(String readObjectRedirector);
+    QueryRedirectors setReportRedirector(String reportRedirector);
+    QueryRedirectors setUpdateRedirector(String updateRedirector);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/RangePartition.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/RangePartition.java
index 9303efe..83b844a 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/RangePartition.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/RangePartition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,8 +22,8 @@
  */
 public interface RangePartition {
 
-    public RangePartition setEndValue(String endValue);
-    public RangePartition setConnectionPool(String connectionPool);
-    public RangePartition setStartValue(String startValue);
+    RangePartition setEndValue(String endValue);
+    RangePartition setConnectionPool(String connectionPool);
+    RangePartition setStartValue(String startValue);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/RangePartitioning.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/RangePartitioning.java
index af7b208..182f25d 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/RangePartitioning.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/RangePartitioning.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,10 +22,10 @@
  */
 public interface RangePartitioning {
 
-    public RangePartition addPartition();
-    public RangePartitioning setName(String name);
-    public Column setPartitionColumn();
-    public RangePartitioning setUnionUnpartitionableQueries(Boolean unionUnpartitionableQueries);
-    public RangePartitioning setPartitionValueType(String partitionValueType);
+    RangePartition addPartition();
+    RangePartitioning setName(String name);
+    Column setPartitionColumn();
+    RangePartitioning setUnionUnpartitionableQueries(Boolean unionUnpartitionableQueries);
+    RangePartitioning setPartitionValueType(String partitionValueType);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ReadTransformer.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ReadTransformer.java
index 30a1105..c104512 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ReadTransformer.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ReadTransformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,7 +22,7 @@
  */
 public interface ReadTransformer {
 
-    public ReadTransformer setMethod(String method);
-    public ReadTransformer setTransformerClass(String transformerClass);
+    ReadTransformer setMethod(String method);
+    ReadTransformer setTransformerClass(String transformerClass);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ReplicationPartitioning.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ReplicationPartitioning.java
index 4d759f0..e14df75 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ReplicationPartitioning.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ReplicationPartitioning.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,7 +22,7 @@
  */
 public interface ReplicationPartitioning {
 
-    public ReplicationPartitioning addConnectionPool(String connectionPool);
-    public ReplicationPartitioning setName(String name);
+    ReplicationPartitioning addConnectionPool(String connectionPool);
+    ReplicationPartitioning setName(String name);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/RoundRobinPartitioning.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/RoundRobinPartitioning.java
index 21bb389..fb184a5 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/RoundRobinPartitioning.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/RoundRobinPartitioning.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,8 +22,8 @@
  */
 public interface RoundRobinPartitioning {
 
-    public RoundRobinPartitioning addConnectionPool(String connectionPool);
-    public RoundRobinPartitioning setName(String name);
-    public RoundRobinPartitioning setReplicateWrites(Boolean replicateWrites);
+    RoundRobinPartitioning addConnectionPool(String connectionPool);
+    RoundRobinPartitioning setName(String name);
+    RoundRobinPartitioning setReplicateWrites(Boolean replicateWrites);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/RuntimeFactory.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/RuntimeFactory.java
index aaad520..e89eead 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/RuntimeFactory.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/RuntimeFactory.java
@@ -42,6 +42,8 @@
  * @since EclipseLink 2.5.1
  */
 public class RuntimeFactory {
+    private RuntimeFactory() {
+    }
 
     public EntityManagerFactory createEntityManagerFactory(PersistenceUnit pu) {
         EntityManagerSetupImpl emSetupImpl = null;
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/SecondaryTable.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/SecondaryTable.java
index a19ee03..0a6324b 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/SecondaryTable.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/SecondaryTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,13 +22,13 @@
  */
 public interface SecondaryTable {
 
-    public Index addIndex();
-    public PrimaryKeyJoinColumn addPrimaryKeyJoinColumn();
-    public UniqueConstraint addUniqueConstraint();
-    public SecondaryTable setCatalog(String catalog);
-    public SecondaryTable setCreationSuffix(String creationSuffix);
-    public SecondaryTable setName(String name);
-    public ForeignKey setPrimaryKeyForeignKey();
-    public SecondaryTable setSchema(String schema);
+    Index addIndex();
+    PrimaryKeyJoinColumn addPrimaryKeyJoinColumn();
+    UniqueConstraint addUniqueConstraint();
+    SecondaryTable setCatalog(String catalog);
+    SecondaryTable setCreationSuffix(String creationSuffix);
+    SecondaryTable setName(String name);
+    ForeignKey setPrimaryKeyForeignKey();
+    SecondaryTable setSchema(String schema);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/SequenceGenerator.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/SequenceGenerator.java
index 3c6a60d..2cf29c4 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/SequenceGenerator.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/SequenceGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,11 +22,11 @@
  */
 public interface SequenceGenerator {
 
-    public SequenceGenerator setAllocationSize(Integer allocationSize);
-    public SequenceGenerator setCatalog(String catalog);
-    public SequenceGenerator setInitialValue(Integer initialValue);
-    public SequenceGenerator setName(String name);
-    public SequenceGenerator setSchema(String schema);
-    public SequenceGenerator setSequenceName(String sequenceName);
+    SequenceGenerator setAllocationSize(Integer allocationSize);
+    SequenceGenerator setCatalog(String catalog);
+    SequenceGenerator setInitialValue(Integer initialValue);
+    SequenceGenerator setName(String name);
+    SequenceGenerator setSchema(String schema);
+    SequenceGenerator setSequenceName(String sequenceName);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/SqlResultSetMapping.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/SqlResultSetMapping.java
index 49c3d55..e63f3e4 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/SqlResultSetMapping.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/SqlResultSetMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,9 +22,9 @@
  */
 public interface SqlResultSetMapping {
 
-    public ColumnResult addColumnResult();
-    public ConstructorResult addConstructorResult();
-    public EntityResult addEntityResult();
-    public SqlResultSetMapping setName(String name);
+    ColumnResult addColumnResult();
+    ConstructorResult addConstructorResult();
+    EntityResult addEntityResult();
+    SqlResultSetMapping setName(String name);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/StoredProcedureParameter.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/StoredProcedureParameter.java
index 2baf058..6206bae 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/StoredProcedureParameter.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/StoredProcedureParameter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,12 +22,12 @@
  */
 public interface StoredProcedureParameter {
 
-    public StoredProcedureParameter setJdbcType(Integer jdbcType);
-    public StoredProcedureParameter setJdbcTypeName(String jdbcTypeName);
-    public StoredProcedureParameter setMode(String mode);
-    public StoredProcedureParameter setName(String name);
-    public StoredProcedureParameter setOptional(Boolean optional);
-    public StoredProcedureParameter setQueryParameter(String queryParameter);
-    public StoredProcedureParameter setType(String type);
+    StoredProcedureParameter setJdbcType(Integer jdbcType);
+    StoredProcedureParameter setJdbcTypeName(String jdbcTypeName);
+    StoredProcedureParameter setMode(String mode);
+    StoredProcedureParameter setName(String name);
+    StoredProcedureParameter setOptional(Boolean optional);
+    StoredProcedureParameter setQueryParameter(String queryParameter);
+    StoredProcedureParameter setType(String type);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Struct.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Struct.java
index c65bc22..59d70e3 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Struct.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Struct.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,7 +22,7 @@
  */
 public interface Struct {
 
-    public Struct addField(String field);
-    public Struct setName(String name);
+    Struct addField(String field);
+    Struct setName(String name);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/StructConverter.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/StructConverter.java
index c689cf9..67fd1d4 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/StructConverter.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/StructConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,7 +22,7 @@
  */
 public interface StructConverter {
 
-    public StructConverter setName(String name);
-    public StructConverter setConverter(String converter);
+    StructConverter setName(String name);
+    StructConverter setConverter(String converter);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Structure.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Structure.java
index 31d4e28..6aac789 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Structure.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Structure.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,10 +22,10 @@
  */
 public interface Structure {
 
-    public Property addProperty();
-    public Structure setAccess(String access);
-    public AccessMethods setAccessMethods();
-    public Structure setAttributeType(String attributeType);
-    public Structure setName(String name);
+    Property addProperty();
+    Structure setAccess(String access);
+    AccessMethods setAccessMethods();
+    Structure setAttributeType(String attributeType);
+    Structure setName(String name);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Table.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Table.java
index 12c7135..655575e 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Table.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Table.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,11 +22,11 @@
  */
 public interface Table {
 
-    public Index addIndex();
-    public UniqueConstraint addUniqueConstraint();
-    public Table setCatalog(String catalog);
-    public Table setCreationSuffix(String creationSuffix);
-    public Table setName(String name);
-    public Table setSchema(String schema);
+    Index addIndex();
+    UniqueConstraint addUniqueConstraint();
+    Table setCatalog(String catalog);
+    Table setCreationSuffix(String creationSuffix);
+    Table setName(String name);
+    Table setSchema(String schema);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/TableGenerator.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/TableGenerator.java
index 4678b0b..1f9d473 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/TableGenerator.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/TableGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,17 +22,17 @@
  */
 public interface TableGenerator {
 
-    public Index addIndex();
-    public UniqueConstraint addUniqueConstraint();
-    public TableGenerator setAllocationSize(Integer allocationSize);
-    public TableGenerator setCatalog(String catalog);
-    public TableGenerator setCreationSuffix(String creationSuffix);
-    public TableGenerator setInitialValue(Integer initialValue);
-    public TableGenerator setName(String name);
-    public TableGenerator setPKColumnName(String pkColumnName);
-    public TableGenerator setPKColumnValue(String pkColumnValue);
-    public TableGenerator setSchema(String schema);
-    public TableGenerator setTable(String table);
-    public TableGenerator setValueColumnName(String valueColumnName);
+    Index addIndex();
+    UniqueConstraint addUniqueConstraint();
+    TableGenerator setAllocationSize(Integer allocationSize);
+    TableGenerator setCatalog(String catalog);
+    TableGenerator setCreationSuffix(String creationSuffix);
+    TableGenerator setInitialValue(Integer initialValue);
+    TableGenerator setName(String name);
+    TableGenerator setPKColumnName(String pkColumnName);
+    TableGenerator setPKColumnValue(String pkColumnValue);
+    TableGenerator setSchema(String schema);
+    TableGenerator setTable(String table);
+    TableGenerator setValueColumnName(String valueColumnName);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Temporal.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Temporal.java
index bdef9a9..9c96583 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Temporal.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Temporal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,6 +22,6 @@
  */
 public interface Temporal {
 
-    public Temporal setType(String type);
+    Temporal setType(String type);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/TenantDiscriminatorColumn.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/TenantDiscriminatorColumn.java
index 938f480..5a73efb 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/TenantDiscriminatorColumn.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/TenantDiscriminatorColumn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,12 +22,12 @@
  */
 public interface TenantDiscriminatorColumn {
 
-    public TenantDiscriminatorColumn setColumnDefinition(String columnDefinition);
-    public TenantDiscriminatorColumn setContextProperty(String contextProperty);
-    public TenantDiscriminatorColumn setDiscriminatorType(String discriminatorType);
-    public TenantDiscriminatorColumn setLength(Integer length);
-    public TenantDiscriminatorColumn setName(String name);
-    public TenantDiscriminatorColumn setPrimaryKey(Boolean primaryKey);
-    public TenantDiscriminatorColumn setTable(String table);
+    TenantDiscriminatorColumn setColumnDefinition(String columnDefinition);
+    TenantDiscriminatorColumn setContextProperty(String contextProperty);
+    TenantDiscriminatorColumn setDiscriminatorType(String discriminatorType);
+    TenantDiscriminatorColumn setLength(Integer length);
+    TenantDiscriminatorColumn setName(String name);
+    TenantDiscriminatorColumn setPrimaryKey(Boolean primaryKey);
+    TenantDiscriminatorColumn setTable(String table);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/TenantTableDiscriminator.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/TenantTableDiscriminator.java
index 0898a72..93a3608 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/TenantTableDiscriminator.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/TenantTableDiscriminator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,7 +22,7 @@
  */
 public interface TenantTableDiscriminator {
 
-    public TenantTableDiscriminator setContextProperty(String contextProperty);
-    public TenantTableDiscriminator setType(String type);
+    TenantTableDiscriminator setContextProperty(String contextProperty);
+    TenantTableDiscriminator setType(String type);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/TimeOfDay.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/TimeOfDay.java
index 94a8fd9..581e263 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/TimeOfDay.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/TimeOfDay.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,9 +22,9 @@
  */
 public interface TimeOfDay {
 
-    public TimeOfDay setHour(Integer hour);
-    public TimeOfDay setMillisecond(Integer millisecond);
-    public TimeOfDay setMinute(Integer minute);
-    public TimeOfDay setSecond(Integer second);
+    TimeOfDay setHour(Integer hour);
+    TimeOfDay setMillisecond(Integer millisecond);
+    TimeOfDay setMinute(Integer minute);
+    TimeOfDay setSecond(Integer second);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Transformation.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Transformation.java
index 4ad2c50..d608ec0 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Transformation.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Transformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,15 +22,15 @@
  */
 public interface Transformation {
 
-    public Property addProperty();
-    public WriteTransformer addWriteTransformer();
-    public Transformation setAccess(String access);
-    public AccessMethods setAccessMethods();
-    public Transformation setAttributeType(String attributeType);
-    public Transformation setFetch(String fetch);
-    public Transformation setMutable(Boolean mutable);
-    public Transformation setName(String name);
-    public Transformation setOptional(Boolean optional);
-    public ReadTransformer setReadTransformer();
+    Property addProperty();
+    WriteTransformer addWriteTransformer();
+    Transformation setAccess(String access);
+    AccessMethods setAccessMethods();
+    Transformation setAttributeType(String attributeType);
+    Transformation setFetch(String fetch);
+    Transformation setMutable(Boolean mutable);
+    Transformation setName(String name);
+    Transformation setOptional(Boolean optional);
+    ReadTransformer setReadTransformer();
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Transient.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Transient.java
index df33246..01f31d7 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Transient.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Transient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,6 +22,6 @@
  */
 public interface Transient {
 
-    public Transient setName(String name);
+    Transient setName(String name);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/TypeConverter.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/TypeConverter.java
index b5d6864..411bf8b 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/TypeConverter.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/TypeConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,8 +22,8 @@
  */
 public interface TypeConverter {
 
-    public TypeConverter setName(String name);
-    public TypeConverter setDataType(String dataType);
-    public TypeConverter setObjectType(String objectType);
+    TypeConverter setName(String name);
+    TypeConverter setDataType(String dataType);
+    TypeConverter setObjectType(String objectType);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/UnionPartitioning.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/UnionPartitioning.java
index 6dc1dc5..3e0de9e 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/UnionPartitioning.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/UnionPartitioning.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,8 +22,8 @@
  */
 public interface UnionPartitioning {
 
-    public UnionPartitioning addConnectionPool(String connectionPool);
-    public UnionPartitioning setName(String name);
-    public UnionPartitioning setReplicateWrites(Boolean replicateWrites);
+    UnionPartitioning addConnectionPool(String connectionPool);
+    UnionPartitioning setName(String name);
+    UnionPartitioning setReplicateWrites(Boolean replicateWrites);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/UniqueConstraint.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/UniqueConstraint.java
index 1d8ac48..7d935f5 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/UniqueConstraint.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/UniqueConstraint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,7 +22,7 @@
  */
 public interface UniqueConstraint {
 
-    public UniqueConstraint addColumnName(String columnName);
-    public UniqueConstraint setName(String name);
+    UniqueConstraint addColumnName(String columnName);
+    UniqueConstraint setName(String name);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/UuidGenerator.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/UuidGenerator.java
index 8d1c4de..d4de5ec 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/UuidGenerator.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/UuidGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,6 +22,6 @@
  */
 public interface UuidGenerator {
 
-    public UuidGenerator setName(String name);
+    UuidGenerator setName(String name);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ValuePartition.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ValuePartition.java
index ea72945..8d5c4da 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ValuePartition.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ValuePartition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,7 +22,7 @@
  */
 public interface ValuePartition {
 
-    public ValuePartition setConnectionPool(String connectionPool);
-    public ValuePartition setValue(String value);
+    ValuePartition setConnectionPool(String connectionPool);
+    ValuePartition setValue(String value);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ValuePartitioning.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ValuePartitioning.java
index da5eef3..68ce5ed 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ValuePartitioning.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/ValuePartitioning.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,11 +22,11 @@
  */
 public interface ValuePartitioning {
 
-    public ValuePartition addPartition();
-    public ValuePartitioning setDefaultConnectionPool(String defaultConnectionPool);
-    public ValuePartitioning setName(String name);
-    public Column setPartitionColumn();
-    public ValuePartitioning setPartitionValueType(String partitionValueType);
-    public ValuePartitioning setUnionUnpartitionableQueries(Boolean unionUnpartitionableQueries);
+    ValuePartition addPartition();
+    ValuePartitioning setDefaultConnectionPool(String defaultConnectionPool);
+    ValuePartitioning setName(String name);
+    Column setPartitionColumn();
+    ValuePartitioning setPartitionValueType(String partitionValueType);
+    ValuePartitioning setUnionUnpartitionableQueries(Boolean unionUnpartitionableQueries);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/VariableOneToOne.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/VariableOneToOne.java
index 1add9c2..e58a5f5 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/VariableOneToOne.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/VariableOneToOne.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,28 +22,28 @@
  */
 public interface VariableOneToOne {
 
-    public DiscriminatorClass addDiscriminatorClass();
-    public JoinColumn addJoinColumn();
-    public Property addProperty();
-    public VariableOneToOne setAccess(String access);
-    public AccessMethods setAccessMethods();
-    public Cascade setCascade();
-    public DiscriminatorColumn setDiscriminatorColumn();
-    public VariableOneToOne setFetch(String fetch);
-    public HashPartitioning setHashPartitioning();
-    public VariableOneToOne setName(String name);
-    public VariableOneToOne setNonCacheable(Boolean nonCacheable);
-    public VariableOneToOne setOptional(Boolean optional);
-    public VariableOneToOne setOrphanRemoval(Boolean orphanRemoval);
-    public VariableOneToOne setPartitioned(String partitioned);
-    public Partitioning setPartitioning();
-    public PinnedPartitioning setPinnedPartitioning();
-    public VariableOneToOne setPrivateOwned(Boolean privateOwned);
-    public RangePartitioning setRangePartitioning();
-    public ReplicationPartitioning setReplicationPartitioning();
-    public RoundRobinPartitioning setRoundRobinPartitioning();
-    public VariableOneToOne setTargetInterface(String targetInterface);
-    public UnionPartitioning setUnionPartitioning();
-    public ValuePartitioning setValuePartitioning();
+    DiscriminatorClass addDiscriminatorClass();
+    JoinColumn addJoinColumn();
+    Property addProperty();
+    VariableOneToOne setAccess(String access);
+    AccessMethods setAccessMethods();
+    Cascade setCascade();
+    DiscriminatorColumn setDiscriminatorColumn();
+    VariableOneToOne setFetch(String fetch);
+    HashPartitioning setHashPartitioning();
+    VariableOneToOne setName(String name);
+    VariableOneToOne setNonCacheable(Boolean nonCacheable);
+    VariableOneToOne setOptional(Boolean optional);
+    VariableOneToOne setOrphanRemoval(Boolean orphanRemoval);
+    VariableOneToOne setPartitioned(String partitioned);
+    Partitioning setPartitioning();
+    PinnedPartitioning setPinnedPartitioning();
+    VariableOneToOne setPrivateOwned(Boolean privateOwned);
+    RangePartitioning setRangePartitioning();
+    ReplicationPartitioning setReplicationPartitioning();
+    RoundRobinPartitioning setRoundRobinPartitioning();
+    VariableOneToOne setTargetInterface(String targetInterface);
+    UnionPartitioning setUnionPartitioning();
+    ValuePartitioning setValuePartitioning();
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Version.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Version.java
index 0e5fa94..84f7665 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Version.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/Version.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,19 +22,19 @@
  */
 public interface Version {
 
-    public Property addProperty();
-    public Version setAccess(String access);
-    public AccessMethods setAccessMethods();
-    public Version setAttributeType(String attributeType);
-    public Column setColumn();
-    public Version setConvert(String convert);
-    public Converter setConverter();
-    public Index setIndex();
-    public Version setMutable(Boolean mutable);
-    public Version setName(String name);
-    public ObjectTypeConverter setObjectTypeConverter();
-    public StructConverter setStructConverter();
-    public Temporal setTemporal();
-    public TypeConverter setTypeConverter();
+    Property addProperty();
+    Version setAccess(String access);
+    AccessMethods setAccessMethods();
+    Version setAttributeType(String attributeType);
+    Column setColumn();
+    Version setConvert(String convert);
+    Converter setConverter();
+    Index setIndex();
+    Version setMutable(Boolean mutable);
+    Version setName(String name);
+    ObjectTypeConverter setObjectTypeConverter();
+    StructConverter setStructConverter();
+    Temporal setTemporal();
+    TypeConverter setTypeConverter();
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/WriteTransformer.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/WriteTransformer.java
index d6efc68..56deb63 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/WriteTransformer.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/config/WriteTransformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,8 +22,8 @@
  */
 public interface WriteTransformer {
 
-    public Column setColumn();
-    public WriteTransformer setMethod(String method);
-    public WriteTransformer setTransformerClass(String transformerClass);
+    Column setColumn();
+    WriteTransformer setMethod(String method);
+    WriteTransformer setTransformerClass(String transformerClass);
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/dynamic/DynamicIdentityPolicy.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/dynamic/DynamicIdentityPolicy.java
index 6fc3c9d..0632960 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/dynamic/DynamicIdentityPolicy.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/dynamic/DynamicIdentityPolicy.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,6 +34,13 @@
  */
 public class DynamicIdentityPolicy extends CMP3Policy {
 
+    /**
+     * Default constructor;
+     */
+    public DynamicIdentityPolicy() {
+        super();
+    }
+
     @Override
     public Object createPrimaryKeyFromId(Object key, AbstractSession session) {
         if (key instanceof Object[]) {
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/metadata/FileBasedProjectCache.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/metadata/FileBasedProjectCache.java
index a866d9a..f0a0a91 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/metadata/FileBasedProjectCache.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/metadata/FileBasedProjectCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2018 IBM Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -20,12 +20,9 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.ObjectOutputStream;
-import java.security.AccessController;
 import java.util.Map;
 
 import org.eclipse.persistence.config.PersistenceUnitProperties;
-import org.eclipse.persistence.internal.security.PrivilegedAccessHelper;
-import org.eclipse.persistence.internal.security.PrivilegedGetSystemProperty;
 import org.eclipse.persistence.logging.SessionLog;
 import org.eclipse.persistence.sessions.Project;
 
@@ -36,8 +33,14 @@
  */
 public class FileBasedProjectCache implements ProjectCache {
 
+    /**
+     * Default constructor.
+     */
+    public FileBasedProjectCache() {
+    }
+
     @Override
-    public Project retrieveProject(Map properties, ClassLoader loader, SessionLog log) {
+    public Project retrieveProject(Map<String, ?> properties, ClassLoader loader, SessionLog log) {
         Project project = null;
         java.io.ObjectInputStream in = null;
         String fileName = (String)getConfigPropertyLogDebug(
@@ -67,7 +70,7 @@ public Project retrieveProject(Map properties, ClassLoader loader, SessionLog lo
     }
 
     @Override
-    public void storeProject(Project project, Map properties, SessionLog log) {
+    public void storeProject(Project project, Map<String, ?> properties, SessionLog log) {
         String fileName = (String)getConfigPropertyLogDebug(
                 PersistenceUnitProperties.PROJECT_CACHE_FILE,
                 properties, log);
@@ -101,26 +104,12 @@ public void storeProject(Project project, Map properties, SessionLog log) {
     /**
      * Check the provided map for an object with the given name.  If that object is not available, check the
      * System properties.  Log the value returned if logging is enabled at the FINEST level
-     * @param propertyName
-     * @param properties
-     * @param log
-     * @return
+     * @param propertyName property name
+     * @param properties properties
+     * @param log logger
+     * @return object for the given name, null if not found
      */
-    public Object getConfigPropertyLogDebug(final String propertyName, Map properties, SessionLog log) {
-        Object value = null;
-        if (properties != null) {
-            value = properties.get(propertyName);
-        }
-        if (value == null) {
-            if (PrivilegedAccessHelper.shouldUsePrivilegedAccess()) {
-                value = AccessController.doPrivileged(new PrivilegedGetSystemProperty(propertyName));
-            } else {
-                value = System.getProperty(propertyName);
-            }
-        }
-        if ((value != null) && (log !=  null)) {
-            log.log(SessionLog.FINEST, SessionLog.PROPERTIES, "property_value_specified", new Object[]{propertyName, value});
-        }
-        return value;
+    public Object getConfigPropertyLogDebug(final String propertyName, Map<String, ?> properties, SessionLog log) {
+        return PropertyHelper.getConfigPropertyLogDebug(propertyName, properties, log);
     }
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/metadata/MetadataSource.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/metadata/MetadataSource.java
index 8de37f5..adf908d 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/metadata/MetadataSource.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/metadata/MetadataSource.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
@@ -48,7 +48,7 @@ public interface MetadataSource {
      *
      * @since EclipseLink 2.4
      */
-    public Map<String, Object> getPropertyOverrides(Map<String, Object> properties, ClassLoader classLoader, SessionLog log);
+    Map<String, Object> getPropertyOverrides(Map<String, Object> properties, ClassLoader classLoader, SessionLog log);
 
     /**
      * PUBLIC: This method is responsible for returning the object
@@ -65,5 +65,5 @@ public interface MetadataSource {
      * lazy OneToOne mapping after weaving has already occurred will result in
      * an exception if they are expected to have been woven into the class.
      */
-    public XMLEntityMappings getEntityMappings(Map<String, Object> properties, ClassLoader classLoader, SessionLog log);
+    XMLEntityMappings getEntityMappings(Map<String, Object> properties, ClassLoader classLoader, SessionLog log);
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/metadata/MetadataSourceAdapter.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/metadata/MetadataSourceAdapter.java
index b673899..a06ad7a 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/metadata/MetadataSourceAdapter.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/metadata/MetadataSourceAdapter.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
@@ -31,6 +31,12 @@
  */
 public abstract class MetadataSourceAdapter implements MetadataSource {
 
+    /**
+     * Default constructor.
+     */
+    protected MetadataSourceAdapter() {
+    }
+
     @Override
     public XMLEntityMappings getEntityMappings(Map<String, Object> properties, ClassLoader classLoader, SessionLog log) {
         return null;
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/metadata/ProjectCache.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/metadata/ProjectCache.java
index 17bd148..da8b0ff 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/metadata/ProjectCache.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/metadata/ProjectCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -40,7 +40,7 @@ public interface ProjectCache {
      *
      * @since EclipseLink 2.4.1
      */
-    public Project retrieveProject(Map properties, ClassLoader loader, SessionLog log);
+    Project retrieveProject(Map<String, ?> properties, ClassLoader loader, SessionLog log);
 
     /**
      * PUBLIC: This method is responsible for caching a project instance representing the
@@ -48,7 +48,7 @@ public interface ProjectCache {
      *
      * @since EclipseLink 2.4.1
      */
-    public void storeProject(Project project, Map properties, SessionLog log);
+    void storeProject(Project project, Map<String, ?> properties, SessionLog log);
 
 
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/metadata/PropertyHelper.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/metadata/PropertyHelper.java
new file mode 100644
index 0000000..dc71a90
--- /dev/null
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/metadata/PropertyHelper.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 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
+ * http://www.eclipse.org/legal/epl-2.0,
+ * or the Eclipse Distribution License v. 1.0 which is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+ */
+
+package org.eclipse.persistence.jpa.metadata;
+
+import org.eclipse.persistence.internal.security.PrivilegedAccessHelper;
+import org.eclipse.persistence.internal.security.PrivilegedGetSystemProperty;
+import org.eclipse.persistence.logging.SessionLog;
+
+import java.security.AccessController;
+import java.util.Map;
+
+/**
+ * Helper class to avoid duplicating code.
+ */
+final class PropertyHelper {
+
+    /**
+     * Check the provided map for an object with the given name.  If that object is not available, check the
+     * System properties.  Log the value returned if logging is enabled at the FINEST level
+     * @param propertyName property name
+     * @param properties properties
+     * @param log logger
+     * @return object for the given name, null if not found
+     */
+    static Object getConfigPropertyLogDebug(final String propertyName, Map<String, ?> properties, SessionLog log) {
+        Object value = null;
+        if (properties != null) {
+            value = properties.get(propertyName);
+        }
+        if (value == null) {
+            if (PrivilegedAccessHelper.shouldUsePrivilegedAccess()) {
+                value = AccessController.doPrivileged(new PrivilegedGetSystemProperty(propertyName));
+            } else {
+                value = System.getProperty(propertyName);
+            }
+        }
+        if ((value != null) && (log !=  null)) {
+            log.log(SessionLog.FINEST, SessionLog.PROPERTIES, "property_value_specified", new Object[]{propertyName, value});
+        }
+        return value;
+    }
+}
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/metadata/XMLMetadataSource.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/metadata/XMLMetadataSource.java
index 8ab906b6..571ebf2 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/metadata/XMLMetadataSource.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/jpa/metadata/XMLMetadataSource.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.
  * Copyright (c) 1998, 2018 IBM Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -23,15 +23,12 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.net.URL;
-import java.security.AccessController;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
 import org.eclipse.persistence.internal.jpa.metadata.xml.XMLEntityMappingsReader;
-import org.eclipse.persistence.internal.security.PrivilegedAccessHelper;
-import org.eclipse.persistence.internal.security.PrivilegedGetSystemProperty;
 import org.eclipse.persistence.internal.jpa.metadata.xml.XMLEntityMappings;
 
 import org.eclipse.persistence.config.PersistenceUnitProperties;
@@ -45,6 +42,12 @@
 public class XMLMetadataSource extends MetadataSourceAdapter {
 
     /**
+     * Default constructor.
+     */
+    public XMLMetadataSource() {
+    }
+
+    /**
      * This method returns a Reader for an EclipseLink-ORM.xml.  It will use the
      * PersistenceUnitProperties.METADATA_SOURCE_XML_URL property if available to create an
      * InputStreamReader from a URL, and if not available, use the
@@ -205,26 +208,12 @@ protected static URL getFileURL(String fileName, ClassLoader classLoader, Sessio
     /**
      * Check the provided map for an object with the given name.  If that object is not available, check the
      * System properties.  Log the value returned if logging is enabled
-     * @param propertyName
-     * @param properties
-     * @param log
-     * @return
+     * @param propertyName property name
+     * @param properties properties
+     * @param log logger
+     * @return object for the given name, null if not found
      */
-    public Object getConfigPropertyLogDebug(final String propertyName, Map properties, SessionLog log) {
-        Object value = null;
-        if (properties != null) {
-            value = properties.get(propertyName);
-        }
-        if (value == null) {
-            if (PrivilegedAccessHelper.shouldUsePrivilegedAccess()) {
-                value = AccessController.doPrivileged(new PrivilegedGetSystemProperty(propertyName));
-            } else {
-                value = System.getProperty(propertyName);
-            }
-        }
-        if ((value != null) && (log !=  null)) {
-            log.log(SessionLog.FINEST, SessionLog.PROPERTIES, "property_value_specified", new Object[]{propertyName, value});
-        }
-        return value;
+    public Object getConfigPropertyLogDebug(final String propertyName, Map<String, ?> properties, SessionLog log) {
+        return PropertyHelper.getConfigPropertyLogDebug(propertyName, properties, log);
     }
 }
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/tools/weaving/jpa/StaticWeaveAntTask.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/tools/weaving/jpa/StaticWeaveAntTask.java
index 779f4ef..877ab0a 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/tools/weaving/jpa/StaticWeaveAntTask.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/tools/weaving/jpa/StaticWeaveAntTask.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
@@ -14,6 +14,13 @@
 //     Oracle - initial API and implementation from Oracle TopLink
 package org.eclipse.persistence.tools.weaving.jpa;
 
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.Path;
+import org.eclipse.persistence.exceptions.StaticWeaveException;
+import org.eclipse.persistence.logging.AbstractSessionLog;
+import org.eclipse.persistence.logging.SessionLog;
+
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -21,15 +28,9 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.Vector;
-
-import org.eclipse.persistence.exceptions.StaticWeaveException;
-import org.eclipse.persistence.logging.AbstractSessionLog;
-import org.eclipse.persistence.logging.SessionLog;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.types.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 /**
 * <p>
@@ -75,11 +76,17 @@ public class StaticWeaveAntTask extends Task{
     private String persistenceinfo;
     private String persistencexml;
     private String target;
-    private Vector classPaths = new Vector();
+    private List<Path> classPaths = new ArrayList<>();
     private int logLevel = SessionLog.OFF;
     private Writer logWriter;
 
     /**
+     * Default constructor.
+     */
+    public StaticWeaveAntTask() {
+    }
+
+    /**
      * Set the input archive to be used to weave.
      */
     public void setSource(String source) {
@@ -138,17 +145,13 @@ public void addClasspath(Path path) {
     /**
      * Parse the class path element and store them into vector.
      */
-    private Vector getPathElement(){
-        Vector pathElements = new Vector();
-        for(int i=0;i<classPaths.size();i++){
-            String thisPath = ((Path)classPaths.get(i)).toString();
-            if(thisPath!=null){
-               String[] thisSplitedPath=thisPath.split(File.pathSeparator);
-               if(thisSplitedPath!=null){
-                   for(int j=0;j<thisSplitedPath.length;j++){
-                     pathElements.add(thisSplitedPath[j]);
-                   }
-               }
+    private List<String> getPathElement(){
+        List<String> pathElements = new ArrayList<>();
+        for (int i = 0; i < classPaths.size(); i++) {
+            String thisPath = classPaths.get(i).toString();
+            if (thisPath != null) {
+                String[] thisSplitedPath = thisPath.split(File.pathSeparator);
+                pathElements.addAll(Arrays.asList(thisSplitedPath));
             }
         }
         return pathElements;
@@ -159,11 +162,11 @@ private Vector getPathElement(){
      * the classloader.
      */
     private URL[] getURLs(){
-        Vector pathElements = getPathElement();
+        List<String> pathElements = getPathElement();
         URL[] urls = new URL[pathElements.size()];
         for(int i=0;i<pathElements.size();i++){
            try {
-               urls[i] = (new File((String)pathElements.get(i))).toURI().toURL();
+               urls[i] = (new File(pathElements.get(i))).toURI().toURL();
            } catch (MalformedURLException e) {
                throw StaticWeaveException.exceptionPerformWeaving(e, pathElements.get(i));
            }