Merge pull request #935 from parsharma/519

mp.graphql.showErrorMessage - wildcard

Author: phillip-kruger

server/implementation/src/main/java/io/smallrye/graphql/spi/config/Config.java

@@ -86,8 +86,16 @@ default boolean isListed(Class throwableClass, List<String> classNames) {
         }
 
         // Check that specific class
-        if (classNames.contains(throwableClass.getName())) {
-            return true;
+        for (String configuredValue : classNames) {
+            if (configuredValue.equals(throwableClass.getName())) {
+                return true;
+            } else if (configuredValue.endsWith("*")) {
+                String values = configuredValue.substring(0, configuredValue.length() - 2);
+                if (throwableClass.getName().startsWith(values)) {
+                    return true;
+                }
+                continue;
+            }
         }
 
         // Check transitive

server/tck/src/test/java/io/smallrye/graphql/SmallRyeGraphQLArchiveProcessor.java

@@ -18,6 +18,7 @@
 import io.smallrye.graphql.test.apps.defaultvalue.api.DefaultValueParrotAPI;
 import io.smallrye.graphql.test.apps.enumlist.api.EnumListApi;
 import io.smallrye.graphql.test.apps.error.api.ErrorApi;
+import io.smallrye.graphql.test.apps.exceptionlist.ExceptionListApi;
 import io.smallrye.graphql.test.apps.fieldexistence.api.FieldExistenceApi;
 import io.smallrye.graphql.test.apps.generics.api.ControllerWithGenerics;
 import io.smallrye.graphql.test.apps.grouping.api.BookGraphQLApi;
@@ -97,6 +98,8 @@ public void process(Archive<?> applicationArchive, TestClass testClass) {
             war.addPackage(FieldExistenceApi.class.getPackage());
             war.addPackage(CreatorApi.class.getPackage());
             war.addPackage(EnumListApi.class.getPackage());
+            war.addPackage(ExceptionListApi.class.getPackage());
+
         }
     }
 }

server/tck/src/test/java/io/smallrye/graphql/test/apps/exceptionlist/ExceptionListApi.java

@@ -0,0 +1,19 @@
+package io.smallrye.graphql.test.apps.exceptionlist;
+
+import org.eclipse.microprofile.graphql.GraphQLApi;
+import org.eclipse.microprofile.graphql.Query;
+
+@GraphQLApi
+public class ExceptionListApi {
+
+    @Query
+    public String checkedException() throws MyCheckedException {
+        throw new MyCheckedException("This error should not show");
+    }
+
+    @Query
+    public String uncheckedException() throws MyUncheckedException {
+        throw new MyUncheckedException("This error should show");
+    }
+
+}

server/tck/src/test/java/io/smallrye/graphql/test/apps/exceptionlist/MyCheckedException.java

@@ -0,0 +1,8 @@
+package io.smallrye.graphql.test.apps.exceptionlist;
+
+public class MyCheckedException extends Exception {
+
+    public MyCheckedException(String errMsg) {
+        super(errMsg);
+    }
+}

server/tck/src/test/java/io/smallrye/graphql/test/apps/exceptionlist/MyUncheckedException.java

@@ -0,0 +1,8 @@
+package io.smallrye.graphql.test.apps.exceptionlist;
+
+public class MyUncheckedException extends RuntimeException {
+
+    public MyUncheckedException(String errMsg) {
+        super(errMsg);
+    }
+}

server/tck/src/test/resources/META-INF/microprofile-config.properties

@@ -2,6 +2,7 @@ smallrye.graphql.printDataFetcherException=true
 smallrye.graphql.tracing.enabled=true
 smallrye.graphql.allowGet=true
 smallrye.graphql.logPayload=true
-mp.graphql.showErrorMessage=java.security.AccessControlException
-mp.graphql.hideErrorMessage=java.io.IOException
+
+mp.graphql.showErrorMessage=java.security.AccessControlException,io.smallrye.graphql.test.apps.exceptionlist.*
+mp.graphql.hideErrorMessage=java.io.IOException,io.smallrye.graphql.test.apps.exceptionlist.*
 smallrye.graphql.errorExtensionFields=exception,classification,code,description,validationErrorType,queryPath

server/tck/src/test/resources/tests/exceptionlist/checkedexception/input.graphql

@@ -0,0 +1,3 @@
+{
+    checkedException
+}

server/tck/src/test/resources/tests/exceptionlist/checkedexception/output.json

@@ -0,0 +1,19 @@
+{
+  "errors": [
+    {
+      "message": "Unexpected failure in the system. Jarvis is working to fix it.",
+      "locations": [
+        {
+          "line": 2,
+          "column": 5
+        }
+      ],
+      "path": [
+        "checkedException"
+      ]
+    }
+  ],
+  "data": {
+    "checkedException": null
+  }
+}

server/tck/src/test/resources/tests/exceptionlist/uncheckedexception/input.graphql

@@ -0,0 +1,3 @@
+{
+    uncheckedException
+}

server/tck/src/test/resources/tests/exceptionlist/uncheckedexception/output.json

@@ -0,0 +1,22 @@
+{
+  "errors": [
+    {
+      "message": "This error should show",
+      "locations": [
+        {
+          "line": 2,
+          "column": 5
+        }
+      ],
+      "path": [
+        "uncheckedException"
+      ],
+      "extensions": {
+        "classification": "DataFetchingException"
+      }
+    }
+  ],
+  "data": {
+    "uncheckedException": null
+  }
+}