Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[master] Minor messaging fix for apostrophe usage #1619

Merged
merged 1 commit into from
Aug 3, 2022
Merged

[master] Minor messaging fix for apostrophe usage #1619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...nce.core/src/main/java/org/eclipse/persistence/exceptions/i18n/JSONExceptionResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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."},
};

/**
Expand Down
7 changes: 6 additions & 1 deletion ...ce.core/src/main/java/org/eclipse/persistence/exceptions/i18n/QueryExceptionResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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." },
Expand Down