Minor messaging improvements (#1674)

Signed-off-by: Will Dazey <dazeydev.3@gmail.com>
eclipse-ee4j · Aug 26, 2022 · 294c8ce · 294c8ce
1 parent d20db39
commit 294c8ce
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 26 deletions.
diff --git a/...rc/main/java/org/eclipse/persistence/exceptions/i18n/BeanValidationExceptionResource.java b/...rc/main/java/org/eclipse/persistence/exceptions/i18n/BeanValidationExceptionResource.java
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022 IBM Corporation 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
@@ -28,12 +29,12 @@ public final class BeanValidationExceptionResource extends ListResourceBundle {
     static final Object[][] contents = {
 
             { "7500", "Bean validation mode on {0}marshaller is set to ON, but no Bean validation provider was found." },
-            { "7501", "Bean validation mode on {0}marshaller is set to illegal value, \"{1}\"." },
+            { "7501", "Bean validation mode on {0}marshaller is set to an unsupported value, \"{1}\"." },
 
             { "7510", "Constraints violated on {0}marshalled bean:\n{1}{2}" },
 
-            { "7525", "Cannot parse property {0}, because it is both annotated with @NotNull and has attribute " +
-                    "\"xs:nillable=true\"." }
+            { "7525", "Cannot parse the \"{0}\" property, because it is both annotated with @NotNull and has the " +
+                    "\"xs:nillable=true\" attribute." }
 
     };
 

diff --git a/...e/src/main/java/org/eclipse/persistence/exceptions/i18n/ConcurrencyExceptionResource.java b/...e/src/main/java/org/eclipse/persistence/exceptions/i18n/ConcurrencyExceptionResource.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 1998, 2018 IBM Corporation and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022 IBM Corporation 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,10 +33,10 @@ public class ConcurrencyExceptionResource extends ListResourceBundle {
                                            { "2003", "Wait failure on ClientSession." },
                                            { "2004", "A signal was attempted before wait() on ConcurrencyManager. This normally means that an attempt was made to {0}commit or rollback a transaction before it was started, or to rollback a transaction twice." },
                                            { "2005", "Wait failure on Sequencing Connection Handler for DatabaseSession." },
-                                           { "2006", "Attempt to acquire sequencing values through a single Connection({0}) simultaneously in multiple threads" },
+                                           { "2006", "Attempt to acquire sequencing values through a single Connection({0}) simultaneously in multiple threads." },
                                            { "2007", "Max number of attempts to lock object: {0} exceeded.  Failed to clone the object." },
                                            { "2008", "Max number of attempts to lock object: {0} exceeded.  Failed to merge the transaction." },
-                                           { "2009", "Max number of attempts to lock object exceeded.  Failed to build the object. Thread: {0} has a lock on the object but thread: {1} is building the object"},
+                                           { "2009", "Max number of attempts to lock object exceeded.  Failed to build the object. Thread: {0} has a lock on the object but thread: {1} is building the object."},
                                            { "2010", "Lock has already been transitioned to a Deferred Lock.  A second attempt to transition the lock has been requested by thread: {0} during merge."}
 
     };

diff --git a/...nce.core/src/main/java/org/eclipse/persistence/exceptions/i18n/DBWSExceptionResource.java b/...nce.core/src/main/java/org/eclipse/persistence/exceptions/i18n/DBWSExceptionResource.java
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022 IBM Corporation 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 +23,19 @@
  */
 public class DBWSExceptionResource extends ListResourceBundle {
     static final Object[][] contents = {
-        {"47000", "Could not locate file [{0}]"},
-        {"47001", "Could not locate descriptor [{0}] for operation [{1}] in the O-R project"},
-        {"47002", "Could not locate query [{0}] for descriptor [{1}]"},
-        {"47003", "Could not locate query [{0}] for session [{1}]"},
-        {"47004", "Parameter type [{0}] for operation [{1}] does not exist in the schema"},
-        {"47005", "Parameter type [{0}] for operation [{1}] has no O-X mapping"},
-        {"47006", "Result type [{0}] for operation [{1}] does not exist in the schema"},
-        {"47007", "Result type [{0}] for operation [{1}] has no O-X mapping"},
+        {"47000", "Cannot locate \"[{0}]\" file"},
+        {"47001", "Cannot locate [{0}] descriptor for [{1}] operation in the O-R project"},
+        {"47002", "Cannot locate \"[{0}]\" query for [{1}] descriptor"},
+        {"47003", "Cannot locate \"[{0}]\" query for [{1}] session"},
+        {"47004", "[{0}] parameter type, for [{1}] operation, does not exist in the schema"},
+        {"47005", "[{0}] parameter type, for [{1}] operation, has no O-X mapping"},
+        {"47006", "[{0}] result type, for [{1}] operation, does not exist in the schema"},
+        {"47007", "[{0}] result type, for [{1}] operation, has no O-X mapping"},
         {"47008", "Only Simple XML Format queries support multiple output arguments"},
         {"47009", "INOUT cursor parameters are not supported"},
-        {"47010", "Could not locate O-R session for service [{0}]"},
-        {"47011", "Could not locate O-X session for service [{0}]"},
-        {"47012", "Could not parse DBWS file"},
+        {"47010", "Cannot locate O-R session for [{0}] service"},
+        {"47011", "Cannot locate O-X session for [{0}] service"},
+        {"47012", "Cannot parse DBWS file"},
     };
 
     /**

diff --git a/...re/src/main/java/org/eclipse/persistence/exceptions/i18n/ValidationExceptionResource.java b/...re/src/main/java/org/eclipse/persistence/exceptions/i18n/ValidationExceptionResource.java
@@ -349,7 +349,7 @@ public class ValidationExceptionResource extends ListResourceBundle {
                                            { "7340", "There are multiple mapping files called [{0}] in classpath."},
                                            { "7341", "No eclipselink-orm.xml was specified for the XMLMetadataSource.  Please specify one using either persistence unit property eclipselink.metadata-source.xml.file or eclipselink.metadata-source.xml.url"},
                                            { "7342", "The specified boolean value [{0}] for setting allow native sql queries is invalid, the value must either be \"true\" or \"false\"."},
-                                           { "7343", "Multiple VPD identifiers (tenant discriminator context property) have been specified. Entity [{1}] uses [{0}] and Entity [{3}] uses [{2}]. When using a Multitenant VPD strategy, there can only be one tenant discriminator column per entity and its context property must be consistent across all the Multitenant VPD entities."},
+                                           { "7343", "Multiple VPD identifiers (tenant discriminator context property) have been specified. Entity [{1}] uses [{0}] and Entity [{3}] uses [{2}]. The Multitenant VPD strategy allows only one tenant discriminator column for each entity and its context property must be consistent across all the Multitenant VPD entities."},
                                            { "7344", "VPD (connections and DDL generation) is not supported for the platform: [{0}]."},
                                            { "7345", "{0} file specified for XMLMetadataSource is not found"},
                                            { "7346", "The multitenant context property [{0}] has not been provided. When the persistence unit property (" + PersistenceUnitProperties.MULTITENANT_SHARED_EMF + ") is set to false, all multitenant context properties must be provided up front. This can be done through the persistence unit definition directly or by passing a properties map containing all the multitenant context properties on the create EntityManagerFactory call."},
@@ -362,7 +362,7 @@ public 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", "URL [{0}] for resource [{1}] 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 JPA Specification)"},
  };
 
     /**

diff --git a/.../java/org/eclipse/persistence/internal/localization/i18n/LoggingLocalizationResource.java b/.../java/org/eclipse/persistence/internal/localization/i18n/LoggingLocalizationResource.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2014, 2021 IBM Corporation and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2022 IBM Corporation 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
@@ -227,8 +227,8 @@ public class LoggingLocalizationResource extends ListResourceBundle {
         { "mapping_not_supported_by_mw", "The EclipseLink mapping {0} is not supported by the mapping workbench" },
         { "toplink_ejb_jar_in_jar", "toplink-ejb-jar.xml is included in jar({0}) file, no migration therefore will be performed for this jar." },
         { "jta_cannot_be_disabled_in_cmp", "When using Container Managed Persistence (CMP), JTA cannot be disabled. EclipseLink will act as if JTA is enabled." },
-        { "jta_tsr_lookup_failure", "Could not lookup TransactionSynchronizationRegistry instance: {0}"},
-        { "jta_duplicate_ctrl_property", "JTA transaction controller class defined in both eclipselink.target-server and eclipselink.jta.controller properties. Using value from eclipselink.target-server." },
+        { "jta_tsr_lookup_failure", "Cannot look up TransactionSynchronizationRegistry instance: {0}"},
+        { "jta_duplicate_ctrl_property", "JTA transaction controller class defined in both \"eclipselink.target-server\" and \"eclipselink.jta.controller\" properties. Using value from \"eclipselink.target-server\"." },
         { "descriptor_named_query_cannot_be_added", "Cannot add a descriptor named query whose name conflict with an existing query. Query To Be Added: [{0}] is named: [{1}] with arguments [{2}]." },
         { "metadata_access_type", "The access type for the persistent class [{1}] is set to [{0}]." },
         { "metadata_default_alias", "The alias name for the entity class [{0}] is being defaulted to: {1}." },