[master] Minor messaging improvements

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

@@ -34,7 +34,7 @@ public final class OptimisticLockExceptionResource extends ListResourceBundle {
                                            { "5009", "The object of class [{1}] with primary key [{0}] cannot be unwrapped because it was deleted since it was last read." },
                                            { "5010", "The object [{0}] cannot be merged because it has changed or been deleted since it was last read. {2}Class> {1}" },
                                            { "5011", "One or more objects cannot be updated because it has changed or been deleted since it was last read" },
-                                           { "5012", "One or more objects of class {0} with parameters list {1} cannot be updated for SQL query {2} because it has changed or been deleted since it was last read" }
+                                           { "5012", "One or more objects of the {0} class with the {1} parameter list cannot be updated for the {2} SQL query because it changed or was deleted since it was last read" }
     };
 
     /**
@@ -51,4 +51,4 @@ public OptimisticLockExceptionResource() {
     protected Object[][] getContents() {
         return contents;
     }
-}
+}

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

@@ -137,7 +137,6 @@ public final class ValidationExceptionResource extends ListResourceBundle {
                                            { "7105", "Error encountered converting encrypting class: [{0}]" },
                                            { "7106", "Error encountered during string encryption." },
                                            { "7107", "Error encountered during string decryption." },
-                                           { "7360", "Database password was encrypted by deprecated algorithm.\nIt's recommended to re-encrypt it by `passwordUpdate.sh` from eclipselink.zip bundle"},
                                            { "7108", "This operation is not supported for non-relational platforms." },
                                            { "7109", "The login in the project used to create the session is null, it must be a valid login." },
                                            { "7110", "At present HistoricalSession only works with Oracle 9R2 or later databases, as it uses Oracle''s Flashback feature." },
@@ -369,9 +368,10 @@ public final class ValidationExceptionResource extends ListResourceBundle {
                                            { "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 the \"[{1}]\" resource does not belong to a valid persistence root, as defined by the Jakarta Persistence specification"},
+                                           { "7357", "The \"[{0}]\" URL for the \"[{1}]\" resource does not belong to a valid persistence root, as defined by the Jakarta Persistence specification." },
                                            { "7358", "Incorrect ASM service name provided."},
                                            { "7359", "No any ASM service available."},
+                                           { "7360", "Database password was encrypted by deprecated algorithm. Reencrypt it by `passwordUpdate.sh` from eclipselink.zip bundle."}
  };
 
     /**

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

@@ -85,12 +85,12 @@ public class ExceptionLocalizationResource extends ListResourceBundle {
                                            { "bean_definition_vector_arguments_are_of_different_sizes", "Bean definition vector arguments are of different sizes" },
                                            { "missing_toplink_bean_definition_for", "Missing TopLink bean definition for {0}" },
                                            { "argument_collection_was_null", "Argument collection was null" },
-                                           { "entity_manager_with_connection_failed", "Execution of user code failed: {0}"},
-                                           { "custom_pu_name_conflict", "Cannot create custom persistence unit with name {0}. This name was found in xml configuration."},
-                                           { "custom_pu_create_error", "Cannot create custom persistence unit with name {0}."},
+                                           { "entity_manager_with_connection_failed", "The user code failed with an error: {0}"},
+                                           { "custom_pu_name_conflict", "Cannot create a custom persistence unit with the name {0}. This name was found in the xml configuration."},
+                                           { "custom_pu_create_error", "Cannot create a custom persistence unit with the name {0}."},
                                            { "custom_pu_create_error_no_caller", "Cannot create custom persistence unit with name {0}. No caller method was found in stack."},
                                            { "custom_pu_create_error_no_caller_class_url", "Cannot create custom persistence unit with name {0}. No caller class {1} URL was found."},
-                                           { "configured_pu_name_conflict", "Cannot create configured persistence unit with name {0}. This name was found in custom persistence units."},
+                                           { "configured_pu_name_conflict", "Cannot create a configured persistence unit with the name {0}. This name was found in custom persistence units."},
                                            { "no_entities_retrieved_for_get_single_result", "getSingleResult() did not retrieve any entities." },
                                            { "no_entities_retrieved_for_get_reference", "Could not find Entity for id: {0}" },
                                            { "too_many_results_for_get_single_result", "More than one result was returned from Query.getSingleResult()" },
@@ -199,9 +199,9 @@ public class ExceptionLocalizationResource extends ListResourceBundle {
                                            { "jaxb_helper_invalid_target_for_marshaller", "The provided target Class [{0}] must be one of EclipseLink JAXBMarshaller or EclipseLink XMLMarshaller." },
                                            { "jaxb_helper_invalid_target_for_binder", "The provided target Class [{0}] must be one of EclipseLink JAXBBinder or EclipseLink XMLBinder." },
                                            { "jpa_persistence_util_non_persistent_class", "PersistenceUtil.getIdentifier(entity) was called with object [{0}] which is not a persistent object." },
-                                           { "jpa_persistence_util_get_version_non_persistent_class", "PersistenceUtil.getVersion(entity) was called with object [{0}] which is not a persistent object." },
-                                           { "jpa_persistence_util_get_version_no_version_in_class", "PersistenceUtil.getVersion(entity) was called with object [{0}] which has no version attribute." },
-                                           { "jpa_non_persistent_class", "Class [{0}] is not a persistent class." },
+                                           { "jpa_persistence_util_get_version_non_persistent_class", "PersistenceUtil.getVersion(entity) was called with the [{0}] object, which is not a persistent object." },
+                                           { "jpa_persistence_util_get_version_no_version_in_class", "PersistenceUtil.getVersion(entity) was called with the [{0}] object, which has no version attribute." },
+                                           { "jpa_non_persistent_class", "The [{0}] class is not a persistent class." },
                                            { "metamodel_identifiable_type_has_no_idclass_attribute", "No @IdClass attributes exist on the IdentifiableType [{0}].  There still may be one or more @Id or an @EmbeddedId on type." },
                                            { "metamodel_identifiable_no_version_attribute_present", "No @Version attribute exists on the identifiable type [{0}]." },
                                            { "metamodel_identifiable_no_id_attribute_present", "No @Id attribute exists on the identifiable type [{0}]." },
@@ -262,7 +262,7 @@ public class ExceptionLocalizationResource extends ListResourceBundle {
                                            { "getpersistenceunitutil_called_on_closed_emf", "getPersistenceUnitUtil() was called on a closed EntityManagerFactory."},
                                            { "named_entity_graph_exists", "NamedEntityGraph with name {0} found on {1} already exists in this persistence unit."},
                                            { "cannot_get_from_non_correlated_query", "getCorrelationParent() called on a from-clause that was not obtained through correlation." },
-                                           { "no_key_in_entity", "Cannot add join of {0} to {1} because target class is missing attribute of source type"},
+                                           { "no_key_in_entity", "Cannot add join of {0} to {1} because the target class is missing an attribute of source type"},
                                            { "RIGHT_JOIN_NOT_SUPPORTED", "Right join is not supported"},
                                            { "wrap_convert_exception", "An exception occurred while calling {0} on converter class {1} with value {2}"},
                                            { "ora_pessimistic_locking_with_rownum", "Pessimistic locking with query row limits is not supported."},
@@ -276,12 +276,12 @@ public class ExceptionLocalizationResource extends ListResourceBundle {
                                            { "json_ora21c_resultset_to_jsonvalue", "Could not convert JDBC ResultSet type to JsonValue."},
                                            { "schema_validation", "Schema validation"},
                                            { "schema_validation_failed", "Schema validation failed"},
-                                           { "schema_validation_missing_table", "The {0} table vas not found in the schema"},
+                                           { "schema_validation_missing_table", "The {0} table has not found in the schema"},
                                            { "schema_validation_table_surplus_columns", "The {0} table has surplus columns in the schema"},
                                            { "schema_validation_table_missing_columns", "The {0} table has missing columns in the schema"},
                                            { "schema_validation_table_different_columns", "The {0} table has different columns in the schema"},
                                            { "truncate_tables_failed", "Tables truncation failed"},
-                                           { "find_option_class_unknown", "The FindOption implementing class {0} is not supported"},
+                                           { "find_option_class_unknown", "The FindOption implementing the {0} class is not supported"},
                                            { "refresh_option_class_unknown", "The RefreshOption implementing class {0} is not supported"},
                                            { "lock_option_class_unknown", "The LockOption implementing class {0} is not supported"},
                                            { "typed_query_reference_is_null", "Reference to a named query is null"}

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

@@ -482,9 +482,8 @@ Current thread (id: {3} name: {4}) stack trace:
         { "dbws_no_wsdl_inline_schema", "The [{0}] WSDL inline schema could not be read."},
         // JPA 3.2
         { "unknown_property_type", "Unknown {0} type of {1} persistence property"},
-        { "error_queryTimeoutParse", "Could not parse jakarta.persistence.query.timeout property value {0}: {1}"},
+        { "error_queryTimeoutParse", "Cannot parse the {0} jakarta.persistence.query.timeout property value: {1}"},
         { "schema_default_truncate_tables_failed", "Failed to truncate tables in the default table schema: {0}"},
-
         { "schema_default_create_tables_failed", "Failed to create tables in the default table schema: {0}"},
         { "schema_default_drop_tables_failed", "Failed to drop tables in the default table schema: {0}"},
         { "schema_default_replace_tables_failed", "Failed to replace tables in the default table schema: {0}"},
@@ -496,8 +495,8 @@ Current thread (id: {3} name: {4}) stack trace:
         { "corrupt_object", "corrupt object: {0}" },
 
         { "encryptor_script_usage", "Usage is `passwordUpdate.sh|.cmd -ip <old encrypted password>`"},
-        { "encryptor_script_description", "This application internally decrypt old encrypted password used by some previous version EclipseLink and encrypt it by latest algorithm."},
-        { "encryptor_script_output", "Re-encrypted password is: {0}"}
+        { "encryptor_script_description", "This application has an old encrypted password that was used by a previous version of EclipseLink. Reencrypt it with the latest algorithm."},
+        { "encryptor_script_output", "The reencrypted password is: {0}"}
     };
 
     /**
@@ -507,4 +506,4 @@ Current thread (id: {3} name: {4}) stack trace:
     protected Object[][] getContents() {
         return contents;
     }
-}
+}

jpa/eclipselink.jpa.testapps/jpa.test.advanced/src/test/java/org/eclipse/persistence/testing/tests/jpa/advanced/EntityManagerJUnitTestSuite.java

@@ -1754,7 +1754,7 @@ public void testOPTIMISTICLock() {
             assertNotNull("Proper exception not thrown when EntityManager.lock(object, OPTIMISTIC) is used.", optimisticLockException);
             if (getDatabaseSession().getPlatform().usesBatchWriting()) {
                 Assert.assertTrue(optimisticLockException.getMessage(),
-                    optimisticLockException.getMessage().contains("One or more objects of class"));
+                    optimisticLockException.getMessage().contains("One or more objects of the"));
                 Assert.assertTrue(optimisticLockException.getMessage(),
                     optimisticLockException.getMessage().contains(Employee.class.getName()));
             }

jpa/eclipselink.jpa.testapps/jpa.test.persistence32/src/test/java/org/eclipse/persistence/testing/tests/jpa/persistence32/EntityManagerFactoryTest.java

@@ -213,10 +213,10 @@ public void testCreateConflictingCustomEntityManagerFactory() {
         } catch (PersistenceException pe) {
             assertTrue(
                     "Unexpected exception message: " + pe.getMessage(),
-                    pe.getMessage().contains("Cannot create custom persistence unit with name"));
+                    pe.getMessage().contains("Cannot create a custom persistence unit with the name"));
             assertTrue(
                     "Unexpected exception message: " + pe.getMessage(),
-                    pe.getMessage().contains("This name was found in xml configuration."));
+                    pe.getMessage().contains("This name was found in the xml configuration."));
         }
     }
 
@@ -233,7 +233,7 @@ public void testCreateConflictingConfiguredEntityManagerFactory() {
         } catch (PersistenceException pe) {
             assertTrue(
                     "Unexpected exception message: " + pe.getMessage(),
-                    pe.getMessage().contains("Cannot create configured persistence unit with name"));
+                    pe.getMessage().contains("Cannot create a configured persistence unit with the name"));
             assertTrue(
                     "Unexpected exception message: " + pe.getMessage(),
                     pe.getMessage().contains("This name was found in custom persistence units."));