Skip to content

Commit 6fc15fc

Browse files
rfelcmanlukasj
rfelcman
authored and
lukasj
committedSep 6, 2022
"JPA" sequence replacement by Jakarta Persistence in resource strings
Signed-off-by: Radek Felcman <radek.felcman@oracle.com>
·
5.0.0-B074.0.0-RC2
1 parent e5f86dc commit 6fc15fc

File tree

38 files changed

+61
-61
lines changed

38 files changed

+61
-61
lines changed
 

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ public static TestModel buildJPAPerformanceTestModel() {
425425
performanceTests.add("org.eclipse.persistence.testing.tests.jpa.memory.JPAMemoryTestModel");
426426

427427
TestModel performanceModel = new TestModel();
428-
performanceModel.setName("JPA Performance Tests");
428+
performanceModel.setName("Jakarta Persistence Performance Tests");
429429
for (int index = 0; index < performanceTests.size(); ++index) {
430430
try {
431431
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

+2-2
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ public final class QueryExceptionResource extends ListResourceBundle {
186186
{ "6148", "Adding {0} to PLSQLStoredProcedureCall is not supported." },
187187
{ "6149", "PLSQLStoredProcedureCall cannot use an unnamed argument." },
188188
{ "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." },
189-
{ "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."},
190-
{ "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."},
189+
{ "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."},
190+
{ "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."},
191191
{ "6153", "CompatibleType must be set on complex type: {0}."},
192192
{ "6154", "TypeName must be set on complex type: {0}."},
193193
{ "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

+4-4
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ public final class ValidationExceptionResource extends ListResourceBundle {
322322
{ "7304", "PersistenceUnitProperties.ORACLE_PROXY_TYPE property set to unknown type [{0}], known types are [{1}], [{2}], [{3}]." },
323323
{ "7305", "An exception was thrown while processing the mapping file from URL: [{0}]." },
324324
{ "7306", "The annotated element [{0}] from the class [{1}] has an incorrect explicit access type specified. It should specify an access type of [{2}]." },
325-
{ "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." },
325+
{ "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." },
326326
{ "7308", "The specified value [{0}] for for the persistence property [{1}] is invalid - [{2}]."},
327327
{ "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}]." },
328328
{ "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 {
351351
{ "7334", "Class [{0}] has an incomplete primary key specification. When specifying primary key columns, the names of those columns must be specified."},
352352
{ "7335", "Duplicate partition value [{1}] given for @ValuePartitioning named [{0}]"},
353353
{ "7336", "Multiple context properties [{2}] and [{3}] specified for the same tenant discriminator field [{1}] for class [{0}]"},
354-
{ "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)."},
354+
{ "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)."},
355355
{ "7338", "You cannot add sequences to a SessionBroker." },
356356
{ "7339", "Alias [{0}] is used by both [{1}] and [{2}] classes. Descriptor alias must be unique." },
357357
{ "7340", "There are multiple mapping files called [{0}] in classpath."},
@@ -365,12 +365,12 @@ public final class ValidationExceptionResource extends ListResourceBundle {
365365
{ "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."},
366366
{ "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." },
367367
{ "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." },
368-
{ "7352", "The converter class [{0}] must implement the JPA jakarta.persistence.AttributeConverter<X, Y> interface to be a valid converter class." },
368+
{ "7352", "The converter class [{0}] must implement the Jakarta Persistence jakarta.persistence.AttributeConverter<X, Y> interface to be a valid converter class." },
369369
{ "7353", "The mapping attribute [{1}] from the class [{0}] is not a valid mapping type for a convert specification." },
370370
{ "7354", "The mapping attribute [{1}] from the class [{0}] is not a valid mapping type for a map key convert specification." },
371371
{ "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." },
372372
{ "7356", "Procedure: [{1}] cannot be executed because {0} does not currently support multiple out parameters"},
373-
{ "7357", "The \"[{0}]\" URL for \"[{1}]\" resource does not belong to a valid persistence root (as per JPA Specification)"},
373+
{ "7357", "The \"[{0}]\" URL for \"[{1}]\" resource does not belong to a valid persistence root (as per Jakarta Persistence Specification)"},
374374
};
375375

376376
/**

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1998, 2022 Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 1998, 2018 IBM Corporation and/or its affiliates. All rights reserved.
44
*
55
* This program and the accompanying materials are made available under the
@@ -138,8 +138,8 @@ public class ExceptionLocalizationResource extends ListResourceBundle {
138138
{ "jpa_helper_invalid_report_query", "The query of type {0} is not an EclipseLink report query and therefore, could not be converted."},
139139
{ "jpa_helper_invalid_read_all_query", "The query of type {0} is not an EclipseLink read all query and therefore, could not be converted."},
140140
{ "jpa_helper_invalid_query", "The query of type {0} is not an EclipseLink query and therefore, could not be converted."},
141-
{ "jpa_helper_invalid_entity_manager_factory", "The JPA EntityManagerFactory {0} is not an EclipseLink EntityManagerFactory and therefore, could not be converted."},
142-
{ "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."},
141+
{ "jpa_helper_invalid_entity_manager_factory", "The Jakarta Persistence EntityManagerFactory {0} is not an EclipseLink EntityManagerFactory and therefore, could not be converted."},
142+
{ "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."},
143143
{ "null_not_supported_identityweakhashmap", "The IdentityWeakHashMap does not support \"null\" as a key or value."},
144144
{ "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."},
145145
{ "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

+2-2
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ public class LoggingLocalizationResource extends ListResourceBundle {
273273
{ "metadata_warning_ignore_temporal", "Ignoring temporal specification on element [{1}] within entity class [{0}] since EclipseLink convert metadata is specified." },
274274
{ "metadata_warning_ignore_serialized", "Ignoring default serialization on element [{1}] within entity class [{0}] since EclipseLink convert metadata is specified." },
275275
{ "metadata_warning_ignore_enumerated", "Ignoring enumerated specification on element [{1}] within entity class [{0}] since EclipseLink convert metadata is specified." },
276-
{ "metadata_warning_ignore_converts", "Ignoring JPA convert specification on element [{1}] within entity class [{0}] since EclipseLink convert metadata is specified." },
276+
{ "metadata_warning_ignore_converts", "Ignoring Jakarta Persistence convert specification on element [{1}] within entity class [{0}] since EclipseLink convert metadata is specified." },
277277
{ "metadata_warning_ignore_auto_apply_converter", "Ignoring the auto-apply converter for element [{1}] within entity class [{0}] since EclipseLink convert metadata is specified." },
278278
{ "metadata_warning_ignore_version_locking", "Optimistic locking metadata is already defined on the descriptor for the entity [{0}]. Ignoring version specification on element [{1}]." },
279279

@@ -318,7 +318,7 @@ public class LoggingLocalizationResource extends ListResourceBundle {
318318
{ "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."},
319319
{ "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."},
320320
{ "metadata_warning_ignore_is_null_allowed", "isNullAllowed is reset to false in {0} because the aggregate has a (possibly nested) target foreign key mapping"},
321-
{ "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, " +
321+
{ "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, " +
322322
"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 " +
323323
"that extends [{2}] or setting the mapping to use basic indirection and the type to be ValueholderInterface." },
324324
{ "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

+2-2
Original file line numberDiff line numberDiff line change
@@ -3216,9 +3216,9 @@ public void testHistoryRelationshipQueryInitialization() {
32163216

32173217
// execute a non historical query through JPQL against the Oyster entity
32183218
oysters = em.createQuery("SELECT e FROM Oyster e", Oyster.class).getResultList();
3219-
assertTrue("JPA query: Oysters should be non-empty", oysters.size() > 0);
3219+
assertTrue("Jakarta Persistence query: Oysters should be non-empty", oysters.size() > 0);
32203220
for (Oyster oysterElem : oysters) {
3221-
assertNotNull("JPA query: Oyster should have a pearl, historical query executed", oysterElem.getPearl());
3221+
assertNotNull("Jakarta Persistence query: Oyster should have a pearl, historical query executed", oysterElem.getPearl());
32223222
}
32233223
} finally {
32243224
closeEntityManager(em);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public String getPersistenceUnitName() {
100100
}
101101

102102
public static Test suite() {
103-
TestSuite suite = new TestSuite("Proxy Authentication JPA Test Suite");
103+
TestSuite suite = new TestSuite("Proxy Authentication Jakarta Persistence Test Suite");
104104

105105
suite.addTest(new ProxyAuthenticationTest("testInternalPool_EMFProxyProperties"));
106106
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public String getPersistenceUnitName() {
5353
}
5454

5555
public static Test suite() {
56-
TestSuite suite = new TestSuite("JPA Advanced Properties Model");
56+
TestSuite suite = new TestSuite("Jakarta Persistence Advanced Properties Model");
5757
suite.addTest(new JPAAdvPropertiesTest("testSetup"));
5858
suite.addTest(new JPAAdvPropertiesTest("testSessionXMLProperty"));
5959
suite.addTest(new JPAAdvPropertiesTest("testSessionEventListenerProperty"));

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
public class DataNucleusPerformanceRegressionModel extends JPAPerformanceRegressionModel {
2727

2828
public DataNucleusPerformanceRegressionModel() {
29-
setDescription("Performance tests that compares DataNucleus JPA performance.");
29+
setDescription("Performance tests that compares DataNucleus Jakarta Persistence performance.");
3030
}
3131

3232
/**

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
public class EssentialsJPAPerformanceRegressionModel extends JPAPerformanceRegressionModel {
2727

2828
public EssentialsJPAPerformanceRegressionModel() {
29-
setDescription("Performance tests that compares TopLink Essentials JPA performance.");
29+
setDescription("Performance tests that compares TopLink Essentials Jakarta Persistence performance.");
3030
}
3131

3232
/**

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
public class HibernateJPAConcurrencyComparisonModel extends JPAConcurrencyComparisonModel {
2828

2929
public HibernateJPAConcurrencyComparisonModel() {
30-
setDescription("Performance tests that compares Hibernate JPA concurrency.");
30+
setDescription("Performance tests that compares Hibernate Jakarta Persistence concurrency.");
3131
}
3232

3333
/**

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
public class HibernateJPAPerformanceRegressionModel extends JPAPerformanceRegressionModel {
2828

2929
public HibernateJPAPerformanceRegressionModel() {
30-
setDescription("Performance tests that compares Hibernate JPA performance.");
30+
setDescription("Performance tests that compares Hibernate Jakarta Persistence performance.");
3131
}
3232

3333
/**

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
public class JPAConcurrencyComparisonModel extends TestModel {
6868

6969
public JPAConcurrencyComparisonModel() {
70-
setDescription("Performance tests that compare JPA concurrency.");
70+
setDescription("Performance tests that compare Jakarta Persistence concurrency.");
7171
}
7272

7373
@Override
@@ -79,7 +79,7 @@ public void addTests() {
7979

8080
public TestSuite getReadingTestSuite() {
8181
TestSuite suite = new TestSuite();
82-
suite.setName("JPAConcurrentReadingTestSuite");
82+
suite.setName("JakartaPersistenceConcurrentReadingTestSuite");
8383
suite.setDescription("This suite tests reading concurrency.");
8484

8585
suite.addTest(new ConcurrencyTestAdapter(new JPAReadAllAddressPerformanceComparisonTest(true)));
@@ -113,7 +113,7 @@ public TestSuite getReadingTestSuite() {
113113

114114
public TestSuite getWritingTestSuite() {
115115
TestSuite suite = new TestSuite();
116-
suite.setName("JPAConcurrentWritingTestSuite");
116+
suite.setName("JakartaPersistenceConcurrentWritingTestSuite");
117117
suite.setDescription("This suite tests writing concurrency.");
118118

119119
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
public class JPAEmulatedIsolatedPerformanceRegressionModel extends JPAIsolatedPerformanceRegressionModel {
2121

2222
public JPAEmulatedIsolatedPerformanceRegressionModel() {
23-
setDescription("Performance tests that compare JPA non-caching performance using an emulated database.");
23+
setDescription("Performance tests that compare Jakarta Persistence non-caching performance using an emulated database.");
2424
this.isEmulated = true;
2525
}
2626
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
public class JPAEmulatedPerformanceRegressionModel extends JPAPerformanceRegressionModel {
2121

2222
public JPAEmulatedPerformanceRegressionModel() {
23-
setDescription("Performance tests that compare JPA performance using an emulated database.");
23+
setDescription("Performance tests that compare Jakarta Persistence performance using an emulated database.");
2424
this.isEmulated = true;
2525
}
2626
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
public class JPAPerformanceComparisonModel extends TestModel {
5151

5252
public JPAPerformanceComparisonModel() {
53-
setDescription("Performance tests that compare JPA performance.");
53+
setDescription("Performance tests that compare Jakarta Persistence performance.");
5454
}
5555

5656
@Override

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public class JPAPerformanceRegressionModel extends TestModel {
7575
public boolean isEmulated;
7676

7777
public JPAPerformanceRegressionModel() {
78-
setDescription("Performance tests that compare JPA performance.");
78+
setDescription("Performance tests that compare Jakarta Persistence performance.");
7979
}
8080

8181
@Override

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
public class OpenJPAPerformanceRegressionModel extends JPAPerformanceRegressionModel {
2929

3030
public OpenJPAPerformanceRegressionModel() {
31-
setDescription("Performance tests that compares OpenJPA JPA performance.");
31+
setDescription("Performance tests that compares OpenJPA Jakarta Persistence performance.");
3232
}
3333

3434
/**

0 commit comments

Comments
 (0)
Please sign in to comment.