From 01aae943744d62fbd94a03a404910dd793cec3fc Mon Sep 17 00:00:00 2001 From: nimmadi <41557189+nimmadi@users.noreply.github.com> Date: Mon, 23 Jul 2018 11:44:01 -0400 Subject: [PATCH 01/12] Update Error.java --- nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java b/nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java index c4f1a00..71a6994 100644 --- a/nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java +++ b/nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java @@ -19,6 +19,7 @@ public final class Error { private String message; private Location[] locations; + private Map extensions; public String getMessage() { return message; @@ -41,6 +42,7 @@ public String toString() { return "Error{" + "message='" + message + '\'' + ", locations=" + Arrays.toString(locations) + + ", extensions=" + extensions + '}'; } } From df8a0545b5c86a1c4ef305171bc0e00cf04f9840 Mon Sep 17 00:00:00 2001 From: nimmadi <41557189+nimmadi@users.noreply.github.com> Date: Mon, 23 Jul 2018 12:26:05 -0400 Subject: [PATCH 02/12] Update Error.java --- nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java | 1 + 1 file changed, 1 insertion(+) diff --git a/nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java b/nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java index 71a6994..d5bad9d 100644 --- a/nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java +++ b/nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java @@ -14,6 +14,7 @@ package io.aexp.nodes.graphql.internal; import java.util.Arrays; +import java.util.Map; public final class Error { From b9c1600c88080c22ad9f62b7ce4f26bc9296adc9 Mon Sep 17 00:00:00 2001 From: nimmadi <41557189+nimmadi@users.noreply.github.com> Date: Mon, 23 Jul 2018 12:39:23 -0400 Subject: [PATCH 03/12] Update Error.java --- .../io/aexp/nodes/graphql/internal/Error.java | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java b/nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java index d5bad9d..17f0a95 100644 --- a/nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java +++ b/nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java @@ -15,12 +15,15 @@ import java.util.Arrays; import java.util.Map; +import java.util.List; public final class Error { - private String message; - private Location[] locations; private Map extensions; + private Location[] locations; + private String errorType; + private String message; + private List path; public String getMessage() { return message; @@ -38,12 +41,30 @@ void setLocations(Location[] locations) { this.locations = locations; } + public String getErrorType() { + return errorType; + } + + void setErrorType(String errorType) { + this.errorType = errorType; + } + + public List getPath() { + return path; + } + + void setPath(List path) { + this.path = path; + } + @Override public String toString() { return "Error{" + "message='" + message + '\'' + ", locations=" + Arrays.toString(locations) + ", extensions=" + extensions + + ", path=" + path + + ", errorType=" + errorType + '}'; } } From 930be6f8b11f8b0d5540ec593d565909f33f92fb Mon Sep 17 00:00:00 2001 From: nimmadi <41557189+nimmadi@users.noreply.github.com> Date: Mon, 23 Jul 2018 13:07:02 -0400 Subject: [PATCH 04/12] Update Error.java --- nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java b/nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java index 17f0a95..623f1fc 100644 --- a/nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java +++ b/nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java @@ -52,7 +52,7 @@ void setErrorType(String errorType) { public List getPath() { return path; } - + void setPath(List path) { this.path = path; } @@ -64,7 +64,7 @@ public String toString() { ", locations=" + Arrays.toString(locations) + ", extensions=" + extensions + ", path=" + path + - ", errorType=" + errorType + + ", errorType=" + errorType + '}'; } } From 9055e959b069afb04ba2a40235ed637968273f01 Mon Sep 17 00:00:00 2001 From: nimmadi <41557189+nimmadi@users.noreply.github.com> Date: Mon, 23 Jul 2018 13:21:37 -0400 Subject: [PATCH 05/12] Update ErrorTest.java --- .../test/java/io/aexp/nodes/graphql/internal/ErrorTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nodes/src/test/java/io/aexp/nodes/graphql/internal/ErrorTest.java b/nodes/src/test/java/io/aexp/nodes/graphql/internal/ErrorTest.java index 0b0ba23..23611b6 100644 --- a/nodes/src/test/java/io/aexp/nodes/graphql/internal/ErrorTest.java +++ b/nodes/src/test/java/io/aexp/nodes/graphql/internal/ErrorTest.java @@ -25,8 +25,11 @@ public void errorTest() { Error error = new Error(); error.setMessage("error message"); error.setLocations(null); + error.setErrorType("DataFetchingException"); + error.setPath(null); + error.setExtensions(null); assertNull(error.getLocations()); assertEquals("error message", error.getMessage()); - assertEquals("Error{message='error message', locations=null}", error.toString()); + assertEquals("Error{message='error message', locations=null, extensions=null, path=null, errorType='DataFetchingException'}", error.toString()); } } From ae18381bbe4e4c5e09d870ad3cbc3f0a2cc66d13 Mon Sep 17 00:00:00 2001 From: nimmadi <41557189+nimmadi@users.noreply.github.com> Date: Mon, 23 Jul 2018 13:22:15 -0400 Subject: [PATCH 06/12] Update Error.java --- .../io/aexp/nodes/graphql/internal/Error.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java b/nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java index 623f1fc..84a34b9 100644 --- a/nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java +++ b/nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java @@ -25,12 +25,12 @@ public final class Error { private String message; private List path; - public String getMessage() { - return message; + public Map getExtensions() { + return extensions; } - void setMessage(String message) { - this.message = message; + void setExtensions(Map extensions) { + this.extensions = extensions; } public Location[] getLocations() { @@ -49,6 +49,14 @@ void setErrorType(String errorType) { this.errorType = errorType; } + public String getMessage() { + return message; + } + + void setMessage(String message) { + this.message = message; + } + public List getPath() { return path; } @@ -64,7 +72,7 @@ public String toString() { ", locations=" + Arrays.toString(locations) + ", extensions=" + extensions + ", path=" + path + - ", errorType=" + errorType + + ", errorType='" + errorType + '\'' + '}'; } } From 245ea87124ddd8a0a54a017679cd48b67f7934c9 Mon Sep 17 00:00:00 2001 From: nimmadi <41557189+nimmadi@users.noreply.github.com> Date: Mon, 23 Jul 2018 14:37:51 -0400 Subject: [PATCH 07/12] Update Error.java --- .../io/aexp/nodes/graphql/internal/Error.java | 42 +++---------------- 1 file changed, 5 insertions(+), 37 deletions(-) diff --git a/nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java b/nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java index 84a34b9..c4f1a00 100644 --- a/nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java +++ b/nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java @@ -14,40 +14,11 @@ package io.aexp.nodes.graphql.internal; import java.util.Arrays; -import java.util.Map; -import java.util.List; public final class Error { - private Map extensions; - private Location[] locations; - private String errorType; private String message; - private List path; - - public Map getExtensions() { - return extensions; - } - - void setExtensions(Map extensions) { - this.extensions = extensions; - } - - public Location[] getLocations() { - return locations; - } - - void setLocations(Location[] locations) { - this.locations = locations; - } - - public String getErrorType() { - return errorType; - } - - void setErrorType(String errorType) { - this.errorType = errorType; - } + private Location[] locations; public String getMessage() { return message; @@ -57,12 +28,12 @@ void setMessage(String message) { this.message = message; } - public List getPath() { - return path; + public Location[] getLocations() { + return locations; } - void setPath(List path) { - this.path = path; + void setLocations(Location[] locations) { + this.locations = locations; } @Override @@ -70,9 +41,6 @@ public String toString() { return "Error{" + "message='" + message + '\'' + ", locations=" + Arrays.toString(locations) + - ", extensions=" + extensions + - ", path=" + path + - ", errorType='" + errorType + '\'' + '}'; } } From 6c7af7f629b53079beaf1373f7f49ce805d11517 Mon Sep 17 00:00:00 2001 From: nimmadi <41557189+nimmadi@users.noreply.github.com> Date: Mon, 23 Jul 2018 14:39:21 -0400 Subject: [PATCH 08/12] CustomError.java Created new custom error file to add any additional error properties --- .../aexp/nodes/graphql/internal/CustomError | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 nodes/src/main/java/io/aexp/nodes/graphql/internal/CustomError diff --git a/nodes/src/main/java/io/aexp/nodes/graphql/internal/CustomError b/nodes/src/main/java/io/aexp/nodes/graphql/internal/CustomError new file mode 100644 index 0000000..c9c6882 --- /dev/null +++ b/nodes/src/main/java/io/aexp/nodes/graphql/internal/CustomError @@ -0,0 +1,42 @@ +package io.aexp.nodes.graphql.internal; + +import java.util.List; +import java.util.Map; + +public class CustomError { + + private Map extensions; + private String errorType; + private List path; + + public Map getExtensions() { + return extensions; + } + + public void setExtensions(Map extensions) { + this.extensions = extensions; + } + + public String getErrorType() { + return errorType; + } + + public void setErrorType(String errorType) { + this.errorType = errorType; + } + + public List getPath() { + return path; + } + + public void setPath(List path) { + this.path = path; + } + + @Override + public String toString() { + return "extensions=" + extensions + + ", errorType=" + errorType + + ", path=" + path; + } +} From eb643466e4b92c2d5c75cfe6edb22380f20cb9f7 Mon Sep 17 00:00:00 2001 From: nimmadi <41557189+nimmadi@users.noreply.github.com> Date: Mon, 23 Jul 2018 14:39:51 -0400 Subject: [PATCH 09/12] Rename CustomError to CustomError.java --- .../aexp/nodes/graphql/internal/{CustomError => CustomError.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename nodes/src/main/java/io/aexp/nodes/graphql/internal/{CustomError => CustomError.java} (100%) diff --git a/nodes/src/main/java/io/aexp/nodes/graphql/internal/CustomError b/nodes/src/main/java/io/aexp/nodes/graphql/internal/CustomError.java similarity index 100% rename from nodes/src/main/java/io/aexp/nodes/graphql/internal/CustomError rename to nodes/src/main/java/io/aexp/nodes/graphql/internal/CustomError.java From 68bb1365337f862b9a98f9bedf0d6364ef401e55 Mon Sep 17 00:00:00 2001 From: nimmadi <41557189+nimmadi@users.noreply.github.com> Date: Mon, 23 Jul 2018 14:40:36 -0400 Subject: [PATCH 10/12] Update ErrorTest.java --- .../test/java/io/aexp/nodes/graphql/internal/ErrorTest.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nodes/src/test/java/io/aexp/nodes/graphql/internal/ErrorTest.java b/nodes/src/test/java/io/aexp/nodes/graphql/internal/ErrorTest.java index 23611b6..0b0ba23 100644 --- a/nodes/src/test/java/io/aexp/nodes/graphql/internal/ErrorTest.java +++ b/nodes/src/test/java/io/aexp/nodes/graphql/internal/ErrorTest.java @@ -25,11 +25,8 @@ public void errorTest() { Error error = new Error(); error.setMessage("error message"); error.setLocations(null); - error.setErrorType("DataFetchingException"); - error.setPath(null); - error.setExtensions(null); assertNull(error.getLocations()); assertEquals("error message", error.getMessage()); - assertEquals("Error{message='error message', locations=null, extensions=null, path=null, errorType='DataFetchingException'}", error.toString()); + assertEquals("Error{message='error message', locations=null}", error.toString()); } } From 7c683a2b2587fc1ac1edc0c7c248d93249487159 Mon Sep 17 00:00:00 2001 From: nimmadi <41557189+nimmadi@users.noreply.github.com> Date: Mon, 23 Jul 2018 14:49:49 -0400 Subject: [PATCH 11/12] Update Error.java --- nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java b/nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java index c4f1a00..b90cd27 100644 --- a/nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java +++ b/nodes/src/main/java/io/aexp/nodes/graphql/internal/Error.java @@ -15,7 +15,7 @@ import java.util.Arrays; -public final class Error { +public final class Error extends CustomError { private String message; private Location[] locations; From 6832bbfd3108943bc6431cf0a3b680defd02b236 Mon Sep 17 00:00:00 2001 From: nimmadi <41557189+nimmadi@users.noreply.github.com> Date: Mon, 23 Jul 2018 14:55:41 -0400 Subject: [PATCH 12/12] Create CustomErrorTest.java --- .../graphql/internal/CustomErrorTest.java | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 nodes/src/test/java/io/aexp/nodes/graphql/internal/CustomErrorTest.java diff --git a/nodes/src/test/java/io/aexp/nodes/graphql/internal/CustomErrorTest.java b/nodes/src/test/java/io/aexp/nodes/graphql/internal/CustomErrorTest.java new file mode 100644 index 0000000..4fa5868 --- /dev/null +++ b/nodes/src/test/java/io/aexp/nodes/graphql/internal/CustomErrorTest.java @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2018 American Express Travel Related Services Company, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ + +package io.aexp.nodes.graphql.internal; + +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + +import java.util.HashMap; +import java.util.Map; + +public class CustomErrorTest { + + @Test + public void errorTest() { + Map extensions = new HashMap(); + extensions.put("400", "Bad Request"); + CustomError customError = new CustomError(); + customError.setErrorType("DataFetchingException"); + customError.setExtensions(extensions); + customError.setPath(null); + assertNull(customError.getPath()); + assertEquals("DataFetchingException", customError.getErrorType()); + assertEquals(extensions, customError.getExtensions()); + } +}