From 38bbca9cc827f81a70ee90a3b5b81e75c5263add Mon Sep 17 00:00:00 2001 From: Will Dazey Date: Wed, 27 Jan 2021 15:27:46 -0600 Subject: [PATCH] Minor messaging fix for apostrophe usage Signed-off-by: Will Dazey --- .../persistence/exceptions/i18n/JSONExceptionResource.java | 5 +++-- .../exceptions/i18n/QueryExceptionResource.java | 7 ++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/exceptions/i18n/JSONExceptionResource.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/exceptions/i18n/JSONExceptionResource.java index f769ef7217c..29f6570d63d 100644 --- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/exceptions/i18n/JSONExceptionResource.java +++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/exceptions/i18n/JSONExceptionResource.java @@ -1,5 +1,6 @@ /* - * Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022 IBM Corporation. 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 +23,7 @@ */ public final class JSONExceptionResource extends ListResourceBundle { public static final Object[][] contents = { - {"60001", "Input JSON document is invalid or doesn't match target object graph."}, + {"60001", "Input JSON document is invalid or does not match target object graph."}, }; /** diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/exceptions/i18n/QueryExceptionResource.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/exceptions/i18n/QueryExceptionResource.java index 50e8445a06d..494bccfa35a 100644 --- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/exceptions/i18n/QueryExceptionResource.java +++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/exceptions/i18n/QueryExceptionResource.java @@ -1,6 +1,11 @@ /* +<<<<<<< HEAD * Copyright (c) 1998, 2021 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. +>>>>>>> Minor messaging fix for apostrophe usage * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -170,7 +175,7 @@ public final class QueryExceptionResource extends ListResourceBundle { { "6132", "Query argument {0} not found in list of parameters provided during query execution."}, { "6133", "First argument of addUpdate method defines a field to be assigned a new value - it cannot be null."}, { "6134", "Attribute name or expression passed as a first parameter to addUpdate method does not define a field. {1}Attribute name or Expression: [{2}]{1}Descriptor: [{0}]" }, - { "6135", "Attribute name or expression passed as a first parameter to addUpdate method defines a field from a table that''s not mapped to query descriptor. {1}Attribute name or Expression: [{2}]{1}Wrong field: [{3}]{1}Descriptor: [{0}]" }, + { "6135", "Attribute name or expression passed as a first parameter to addUpdate method defines a field from a table that is not mapped to query descriptor. {1}Attribute name or Expression: [{2}]{1}Wrong field: [{3}]{1}Descriptor: [{0}]" }, { "6136", "Classes mapped with multi table inheritance cannot be ReportQuery items. Item: {0}, Expression: {1}."}, { "6137", "An Exception was thrown while executing a ReportQuery with a constructor expression: {0}" }, { "6138", "Query requires temporary storage, but {0} does not support temporary tables." },