"JPA" sequence replacement by Jakarta Persistence in resource strings

Signed-off-by: Radek Felcman <[email protected]>

foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/tests/TestRunModel.java

@@ -425,7 +425,7 @@ public static TestModel buildJPAPerformanceTestModel() {
         performanceTests.add("org.eclipse.persistence.testing.tests.jpa.memory.JPAMemoryTestModel");
 
         TestModel performanceModel = new TestModel();
-        performanceModel.setName("JPA Performance Tests");
+        performanceModel.setName("Jakarta Persistence Performance Tests");
         for (int index = 0; index < performanceTests.size(); ++index) {
             try {
                 performanceModel.addTest((TestModel)Class.forName(performanceTests.elementAt(index)).getConstructor().newInstance());

foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/exceptions/i18n/QueryExceptionResource.java

@@ -186,8 +186,8 @@ public final class QueryExceptionResource extends ListResourceBundle {
        { "6148", "Adding {0} to PLSQLStoredProcedureCall is not supported." },
        { "6149", "PLSQLStoredProcedureCall cannot use an unnamed argument." },
        { "6150", "A null value cannot be used as a key in a container of type [{1}]. Ensure your key values for the objects of type [{0}] cannot be null." },
-       { "6151", "An exception occurred while attempting to set a Redirector {0} passed through a JPA Query Hint {1}.  Please verify that the provided Redirector implements org.eclipse.persistence.queries.QueryRedirector."},
-       { "6152", "An exception occurred while attempting to instantiate the class {0} passed through a JPA Query Hint {1}.  Please verify that the class has a default constructor."},
+       { "6151", "An exception occurred while attempting to set a Redirector {0} passed through a Jakarta Persistence Query Hint {1}.  Please verify that the provided Redirector implements org.eclipse.persistence.queries.QueryRedirector."},
+       { "6152", "An exception occurred while attempting to instantiate the class {0} passed through a Jakarta Persistence Query Hint {1}.  Please verify that the class has a default constructor."},
        { "6153", "CompatibleType must be set on complex type: {0}."},
        { "6154", "TypeName must be set on complex type: {0}."},
        { "6155", "No relation table found in {0}. {2}joinCriteria Expression: [{1}]"},

foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/exceptions/i18n/ValidationExceptionResource.java

@@ -322,7 +322,7 @@ public final class ValidationExceptionResource extends ListResourceBundle {
                                            { "7304", "PersistenceUnitProperties.ORACLE_PROXY_TYPE property set to unknown type [{0}], known types are [{1}], [{2}], [{3}]." },
                                            { "7305", "An exception was thrown while processing the mapping file from URL: [{0}]." },
                                            { "7306", "The annotated element [{0}] from the class [{1}] has an incorrect explicit access type specified. It should specify an access type of [{2}]." },
-                                           { "7307", "Missing a logging context string for the context [{0}]. This is an internal exception that occurred retrieving a log message for JPA metadata processing, please report a bug." },
+                                           { "7307", "Missing a logging context string for the context [{0}]. This is an internal exception that occurred retrieving a log message for Jakarta Persistence metadata processing, please report a bug." },
                                            { "7308", "The specified value [{0}] for for the persistence property [{1}] is invalid - [{2}]."},
                                            { "7309", "The attribute named [{1}] from the embeddable class [{0}] is not a valid mapping to use with an attribute-override for the attribute [{3}] on class [{2}]." },
                                            { "7310", "The target class of the element collection attribute [{0}] on the class [{1}] cannot be determined.  When not using generics, ensure the target class is defined on the element collection mapping."},
@@ -351,7 +351,7 @@ public final class ValidationExceptionResource extends ListResourceBundle {
                                            { "7334", "Class [{0}] has an incomplete primary key specification. When specifying primary key columns, the names of those columns must be specified."},
                                            { "7335", "Duplicate partition value [{1}] given for @ValuePartitioning named [{0}]"},
                                            { "7336", "Multiple context properties [{2}] and [{3}] specified for the same tenant discriminator field [{1}] for class [{0}]"},
-                                           { "7337", "The mapped tenant discriminator column [{1}] on the class [{0}] must be marked as read only. In JPA this is done by setting insertable=false and updatable=false on the column e.g. @Column(name=\"TENANT_ID\", insertable=false, updatable=false)."},
+                                           { "7337", "The mapped tenant discriminator column [{1}] on the class [{0}] must be marked as read only. In Jakarta Persistence API this is done by setting insertable=false and updatable=false on the column e.g. @Column(name=\"TENANT_ID\", insertable=false, updatable=false)."},
                                            { "7338", "You cannot add sequences to a SessionBroker." },
                                            { "7339", "Alias [{0}] is used by both [{1}] and [{2}] classes. Descriptor alias must be unique." },
                                            { "7340", "There are multiple mapping files called [{0}] in classpath."},
@@ -365,12 +365,12 @@ public final class ValidationExceptionResource extends ListResourceBundle {
                                            { "7348", "The embedded mapping [{1}] from [{0}] does not specify an attribute name to which the convert is to be applied. You must specify an attribute name on the Embeddable."},
                                            { "7350", "The convert attribute name [{3}] from the mapping [{1}] from the class [{0}] was not found on the embeddable class [{2}]. Please ensure the attribute exists and is correctly named." },
                                            { "7351", "The converter class [{2}] specified on the mapping attribute [{1}] from the class [{0}] was not found. Please ensure the converter class name is correct and exists with the persistence unit definition." },
-                                           { "7352", "The converter class [{0}] must implement the JPA jakarta.persistence.AttributeConverter<X, Y> interface to be a valid converter class." },
+                                           { "7352", "The converter class [{0}] must implement the Jakarta Persistence jakarta.persistence.AttributeConverter<X, Y> interface to be a valid converter class." },
                                            { "7353", "The mapping attribute [{1}] from the class [{0}] is not a valid mapping type for a convert specification." },
                                            { "7354", "The mapping attribute [{1}] from the class [{0}] is not a valid mapping type for a map key convert specification." },
                                            { "7355", "The mapping attribute [{1}] from the class [{0}] is not a valid mapping type for a convert using an attribute name specification. An attribute name should only be specified to traverse an Embedded mapping type." },
                                            { "7356", "Procedure: [{1}] cannot be executed because {0} does not currently support multiple out parameters"},
-                                           { "7357", "The \"[{0}]\" URL for \"[{1}]\" resource does not belong to a valid persistence root (as per JPA Specification)"},
+                                           { "7357", "The \"[{0}]\" URL for \"[{1}]\" resource does not belong to a valid persistence root (as per Jakarta Persistence Specification)"},
  };
 
     /**

foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/localization/i18n/ExceptionLocalizationResource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022 Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 1998, 2018 IBM Corporation and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -138,8 +138,8 @@ public class ExceptionLocalizationResource extends ListResourceBundle {
                                            { "jpa_helper_invalid_report_query", "The query of type {0} is not an EclipseLink report query and therefore, could not be converted."},
                                            { "jpa_helper_invalid_read_all_query", "The query of type {0} is not an EclipseLink read all query and therefore, could not be converted."},
                                            { "jpa_helper_invalid_query", "The query of type {0} is not an EclipseLink query and therefore, could not be converted."},
-                                           { "jpa_helper_invalid_entity_manager_factory", "The JPA EntityManagerFactory {0} is not an EclipseLink EntityManagerFactory and therefore, could not be converted."},
-                                           { "jpa_helper_invalid_entity_manager_factory_for_refresh", "The JPA EntityManagerFactory {0} is not an EclipseLink EntityManagerFactory and therefore, could not have its metadata refreshed."},
+                                           { "jpa_helper_invalid_entity_manager_factory", "The Jakarta Persistence EntityManagerFactory {0} is not an EclipseLink EntityManagerFactory and therefore, could not be converted."},
+                                           { "jpa_helper_invalid_entity_manager_factory_for_refresh", "The Jakarta Persistence EntityManagerFactory {0} is not an EclipseLink EntityManagerFactory and therefore, could not have its metadata refreshed."},
                                            { "null_not_supported_identityweakhashmap", "The IdentityWeakHashMap does not support \"null\" as a key or value."},
                                            { "entity_manager_properties_conflict_default_connector_vs_jndi_connector", "EntityManager properties conflict: jakarta.persistence.driver and/or jakarta.persistence.url require DefaultConnector, but jakarta.persistence.jtaDataSource and/or jakarta.persistence.nonjtaDataSource require JNDIConnector."},
                                            { "entity_manager_properties_conflict_default_connector_vs_external_transaction_controller", "EntityManager properties conflict: jakarta.persistence.driver and/or jakarta.persistence.url require DefaultConnector, but persistence unit uses external transaction controller, therefore JNDIConnector is required."},

foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/localization/i18n/LoggingLocalizationResource.java

@@ -273,7 +273,7 @@ public class LoggingLocalizationResource extends ListResourceBundle {
         { "metadata_warning_ignore_temporal", "Ignoring temporal specification on element [{1}] within entity class [{0}] since EclipseLink convert metadata is specified." },
         { "metadata_warning_ignore_serialized", "Ignoring default serialization on element [{1}] within entity class [{0}] since EclipseLink convert metadata is specified." },
         { "metadata_warning_ignore_enumerated", "Ignoring enumerated specification on element [{1}] within entity class [{0}] since EclipseLink convert metadata is specified." },
-        { "metadata_warning_ignore_converts", "Ignoring JPA convert specification on element [{1}] within entity class [{0}] since EclipseLink convert metadata is specified." },
+        { "metadata_warning_ignore_converts", "Ignoring Jakarta Persistence convert specification on element [{1}] within entity class [{0}] since EclipseLink convert metadata is specified." },
         { "metadata_warning_ignore_auto_apply_converter", "Ignoring the auto-apply converter for element [{1}] within entity class [{0}] since EclipseLink convert metadata is specified." },
         { "metadata_warning_ignore_version_locking", "Optimistic locking metadata is already defined on the descriptor for the entity [{0}]. Ignoring version specification on element [{1}]." },
 
@@ -318,7 +318,7 @@ public class LoggingLocalizationResource extends ListResourceBundle {
         { "metadata_warning_partitioned_not_set", "@Partitioning found on the element {1} of class {0}, but no @Partitioned.  The @Partitioned annotation must be used to set the partitioning policy, @Partitioning just defines the policy, but does not set it."},
         { "metadata_warning_reference_column_not_found", "The reference column name [{0}] mapped on the element [{1}] does not correspond to a valid id or basic field/column on the mapping reference. Will use referenced column name as provided."},
         { "metadata_warning_ignore_is_null_allowed", "isNullAllowed is reset to false in {0} because the aggregate has a (possibly nested) target foreign key mapping"},
-        { "non_jpa_allowed_type_used_for_collection_using_lazy_access", "Element [{1}] within entity class [{0}] uses a collection type [{2}] when the JPA specification only supports java.util.Collection, " +
+        { "non_jpa_allowed_type_used_for_collection_using_lazy_access", "Element [{1}] within entity class [{0}] uses a collection type [{2}] when the Jakarta Persistence specification only supports java.util.Collection, " +
             "java.util.Set, java.util.List, or java.util.Map.  This type is supported with eager loading; using lazy loading with this collection type requires additional configuration and an IndirectContainer implementation " +
             "that extends [{2}] or setting the mapping to use basic indirection and the type to be ValueholderInterface." },
         { "metadata_warning_integer_discriminator_could_not_be_built", "Class [{0}] specifies discriminatorType=INTEGER and uses [{1}] as the discriminatorValue.  That value cannot be converted to an integer.  We will attempt to use this value in String format." },

jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/AdvancedJPAJunitTest.java

@@ -3216,9 +3216,9 @@ public void testHistoryRelationshipQueryInitialization() {
 
             // execute a non historical query through JPQL against the Oyster entity
             oysters = em.createQuery("SELECT e FROM Oyster e", Oyster.class).getResultList();
-            assertTrue("JPA query: Oysters should be non-empty", oysters.size() > 0);
+            assertTrue("Jakarta Persistence query: Oysters should be non-empty", oysters.size() > 0);
             for (Oyster oysterElem : oysters) {
-                assertNotNull("JPA query: Oyster should have a pearl, historical query executed", oysterElem.getPearl());
+                assertNotNull("Jakarta Persistence query: Oyster should have a pearl, historical query executed", oysterElem.getPearl());
             }
         } finally {
             closeEntityManager(em);

jpa/eclipselink.jpa.testapps.oracle/jpa.test.oracle.proxyauthentication/src/test/java/org/eclipse/persistence/testing/tests/jpa/proxyauthentication/ProxyAuthenticationTest.java

@@ -100,7 +100,7 @@ public String getPersistenceUnitName() {
     }
 
     public static Test suite() {
-        TestSuite suite = new TestSuite("Proxy Authentication JPA Test Suite");
+        TestSuite suite = new TestSuite("Proxy Authentication Jakarta Persistence Test Suite");
 
         suite.addTest(new ProxyAuthenticationTest("testInternalPool_EMFProxyProperties"));
         suite.addTest(new ProxyAuthenticationTest("testInternalPool_EMFProxyProperties_ExclusiveIsolated"));

jpa/eclipselink.jpa.testapps/jpa.test.jpaadvancedproperties/src/test/java/org/eclipse/persistence/testing/tests/jpa/jpaadvancedproperties/JPAAdvPropertiesTest.java

@@ -53,7 +53,7 @@ public String getPersistenceUnitName() {
     }
 
     public static Test suite() {
-        TestSuite suite = new TestSuite("JPA Advanced Properties Model");
+        TestSuite suite = new TestSuite("Jakarta Persistence Advanced Properties Model");
         suite.addTest(new JPAAdvPropertiesTest("testSetup"));
         suite.addTest(new JPAAdvPropertiesTest("testSessionXMLProperty"));
         suite.addTest(new JPAAdvPropertiesTest("testSessionEventListenerProperty"));

jpa/eclipselink.jpa.testapps/jpa.test.performance/src/test/java/org/eclipse/persistence/testing/tests/jpa/performance/DataNucleusPerformanceRegressionModel.java

@@ -26,7 +26,7 @@
 public class DataNucleusPerformanceRegressionModel extends JPAPerformanceRegressionModel {
 
     public DataNucleusPerformanceRegressionModel() {
-        setDescription("Performance tests that compares DataNucleus JPA performance.");
+        setDescription("Performance tests that compares DataNucleus Jakarta Persistence performance.");
     }
 
     /**

jpa/eclipselink.jpa.testapps/jpa.test.performance/src/test/java/org/eclipse/persistence/testing/tests/jpa/performance/EssentialsJPAPerformanceRegressionModel.java

@@ -26,7 +26,7 @@
 public class EssentialsJPAPerformanceRegressionModel extends JPAPerformanceRegressionModel {
 
     public EssentialsJPAPerformanceRegressionModel() {
-        setDescription("Performance tests that compares TopLink Essentials JPA performance.");
+        setDescription("Performance tests that compares TopLink Essentials Jakarta Persistence performance.");
     }
 
     /**

jpa/eclipselink.jpa.testapps/jpa.test.performance/src/test/java/org/eclipse/persistence/testing/tests/jpa/performance/HibernateJPAConcurrencyComparisonModel.java

@@ -27,7 +27,7 @@
 public class HibernateJPAConcurrencyComparisonModel extends JPAConcurrencyComparisonModel {
 
     public HibernateJPAConcurrencyComparisonModel() {
-        setDescription("Performance tests that compares Hibernate JPA concurrency.");
+        setDescription("Performance tests that compares Hibernate Jakarta Persistence concurrency.");
     }
 
     /**

jpa/eclipselink.jpa.testapps/jpa.test.performance/src/test/java/org/eclipse/persistence/testing/tests/jpa/performance/HibernateJPAPerformanceRegressionModel.java

@@ -27,7 +27,7 @@
 public class HibernateJPAPerformanceRegressionModel extends JPAPerformanceRegressionModel {
 
     public HibernateJPAPerformanceRegressionModel() {
-        setDescription("Performance tests that compares Hibernate JPA performance.");
+        setDescription("Performance tests that compares Hibernate Jakarta Persistence performance.");
     }
 
     /**

jpa/eclipselink.jpa.testapps/jpa.test.performance/src/test/java/org/eclipse/persistence/testing/tests/jpa/performance/JPAConcurrencyComparisonModel.java

@@ -67,7 +67,7 @@
 public class JPAConcurrencyComparisonModel extends TestModel {
 
     public JPAConcurrencyComparisonModel() {
-        setDescription("Performance tests that compare JPA concurrency.");
+        setDescription("Performance tests that compare Jakarta Persistence concurrency.");
     }
 
     @Override
@@ -79,7 +79,7 @@ public void addTests() {
 
     public TestSuite getReadingTestSuite() {
         TestSuite suite = new TestSuite();
-        suite.setName("JPAConcurrentReadingTestSuite");
+        suite.setName("JakartaPersistenceConcurrentReadingTestSuite");
         suite.setDescription("This suite tests reading concurrency.");
 
         suite.addTest(new ConcurrencyTestAdapter(new JPAReadAllAddressPerformanceComparisonTest(true)));
@@ -113,7 +113,7 @@ public TestSuite getReadingTestSuite() {
 
     public TestSuite getWritingTestSuite() {
         TestSuite suite = new TestSuite();
-        suite.setName("JPAConcurrentWritingTestSuite");
+        suite.setName("JakartaPersistenceConcurrentWritingTestSuite");
         suite.setDescription("This suite tests writing concurrency.");
 
         suite.addTest(new ConcurrencyTestAdapter(new JPAInsertAddressPerformanceComparisonTest()));

jpa/eclipselink.jpa.testapps/jpa.test.performance/src/test/java/org/eclipse/persistence/testing/tests/jpa/performance/JPAEmulatedIsolatedPerformanceRegressionModel.java

@@ -20,7 +20,7 @@
 public class JPAEmulatedIsolatedPerformanceRegressionModel extends JPAIsolatedPerformanceRegressionModel {
 
     public JPAEmulatedIsolatedPerformanceRegressionModel() {
-        setDescription("Performance tests that compare JPA non-caching performance using an emulated database.");
+        setDescription("Performance tests that compare Jakarta Persistence non-caching performance using an emulated database.");
         this.isEmulated = true;
     }
 }

jpa/eclipselink.jpa.testapps/jpa.test.performance/src/test/java/org/eclipse/persistence/testing/tests/jpa/performance/JPAEmulatedPerformanceRegressionModel.java

@@ -20,7 +20,7 @@
 public class JPAEmulatedPerformanceRegressionModel extends JPAPerformanceRegressionModel {
 
     public JPAEmulatedPerformanceRegressionModel() {
-        setDescription("Performance tests that compare JPA performance using an emulated database.");
+        setDescription("Performance tests that compare Jakarta Persistence performance using an emulated database.");
         this.isEmulated = true;
     }
 }

jpa/eclipselink.jpa.testapps/jpa.test.performance/src/test/java/org/eclipse/persistence/testing/tests/jpa/performance/JPAPerformanceComparisonModel.java

@@ -50,7 +50,7 @@
 public class JPAPerformanceComparisonModel extends TestModel {
 
     public JPAPerformanceComparisonModel() {
-        setDescription("Performance tests that compare JPA performance.");
+        setDescription("Performance tests that compare Jakarta Persistence performance.");
     }
 
     @Override

jpa/eclipselink.jpa.testapps/jpa.test.performance/src/test/java/org/eclipse/persistence/testing/tests/jpa/performance/JPAPerformanceRegressionModel.java

@@ -75,7 +75,7 @@ public class JPAPerformanceRegressionModel extends TestModel {
     public boolean isEmulated;
 
     public JPAPerformanceRegressionModel() {
-        setDescription("Performance tests that compare JPA performance.");
+        setDescription("Performance tests that compare Jakarta Persistence performance.");
     }
 
     @Override

jpa/eclipselink.jpa.testapps/jpa.test.performance/src/test/java/org/eclipse/persistence/testing/tests/jpa/performance/OpenJPAPerformanceRegressionModel.java

@@ -28,7 +28,7 @@
 public class OpenJPAPerformanceRegressionModel extends JPAPerformanceRegressionModel {
 
     public OpenJPAPerformanceRegressionModel() {
-        setDescription("Performance tests that compares OpenJPA JPA performance.");
+        setDescription("Performance tests that compares OpenJPA Jakarta Persistence performance.");
     }
 
     /**