add RemoveFieldTestTransform error message

atlassian-labs · Dec 12, 2024 · 1213053 · 1213053
1 parent 5774cd1
commit 1213053
Show file tree

Hide file tree

Showing 11 changed files with 76 additions and 74 deletions.
diff --git a/test/src/test/kotlin/graphql/nadel/tests/transforms/RemoveFieldTestTransform.kt b/test/src/test/kotlin/graphql/nadel/tests/transforms/RemoveFieldTestTransform.kt
@@ -1,5 +1,6 @@
 package graphql.nadel.tests.transforms
 
+import graphql.ErrorType
 import graphql.GraphQLError
 import graphql.introspection.Introspection
 import graphql.nadel.Service
@@ -15,11 +16,10 @@ import graphql.nadel.engine.transform.query.NadelQueryTransformer
 import graphql.nadel.engine.transform.result.NadelResultInstruction
 import graphql.nadel.engine.transform.result.NadelResultKey
 import graphql.nadel.engine.transform.result.json.JsonNodes
+import graphql.nadel.engine.util.newGraphQLError
 import graphql.nadel.engine.util.queryPath
 import graphql.normalized.ExecutableNormalizedField
 import graphql.schema.GraphQLObjectType
-import graphql.validation.ValidationError.newValidationError
-import graphql.validation.ValidationErrorType
 
 class RemoveFieldTestTransform : NadelTransform<GraphQLError> {
     override suspend fun isApplicable(
@@ -40,7 +40,10 @@ class RemoveFieldTestTransform : NadelTransform<GraphQLError> {
             ?: return null
 
         if (objectType.getField(overallField.name)?.getDirective("toBeDeleted") != null) {
-            return newValidationError().validationErrorType(ValidationErrorType.WrongType).build()
+            return newGraphQLError(
+                "field `${objectType.name}.${overallField.name}` has been removed by RemoveFieldTestTransform",
+                ErrorType.DataFetchingException,
+            )
         }
 
         return null

diff --git a/test/src/test/resources/fixtures/chained transforms/two-transforms-on-a-field.yml b/test/src/test/resources/fixtures/chained transforms/two-transforms-on-a-field.yml
@@ -77,12 +77,11 @@ response: |-
     },
     "errors": [
       {
-        "message": "null",
+        "message": "field `Foo.epicEntity` has been removed by RemoveFieldTestTransform",
         "locations": [],
         "extensions": {
-          "classification": "ValidationError"
+          "classification": "DataFetchingException"
         }
       }
-    ],
-    "extensions": {}
+    ]
   }
diff --git a/...sources/fixtures/field removed/hidden-namespaced-hydration-top-level-field-is-removed.yml b/...sources/fixtures/field removed/hidden-namespaced-hydration-top-level-field-is-removed.yml
@@ -91,19 +91,19 @@ serviceCalls:
 # language=JSON
 response: |-
   {
+    "data": {
+      "issueById": {
+        "id": "C1",
+        "comment": null
+      }
+    },
     "errors": [
       {
+        "message": "field `CommentApi.commentById` has been removed by RemoveFieldTestTransform",
         "locations": [],
-        "message": "An error has occurred",
         "extensions": {
-          "classification": "ValidationError"
+          "classification": "DataFetchingException"
         }
       }
-    ],
-    "data": {
-      "issueById": {
-        "id": "C1",
-        "comment": null
-      }
-    }
+    ]
   }
diff --git a/test/src/test/resources/fixtures/field removed/hydration-top-level-field-is-removed.yml b/test/src/test/resources/fixtures/field removed/hydration-top-level-field-is-removed.yml
@@ -80,19 +80,19 @@ serviceCalls:
 # language=JSON
 response: |-
   {
+    "data": {
+      "issueById": {
+        "id": "C1",
+        "comment": null
+      }
+    },
     "errors": [
       {
+        "message": "field `Query.commentById` has been removed by RemoveFieldTestTransform",
         "locations": [],
-        "message": "An error has occurred",
         "extensions": {
-          "classification": "ValidationError"
+          "classification": "DataFetchingException"
         }
       }
-    ],
-    "data": {
-      "issueById": {
-        "id": "C1",
-        "comment": null
-      }
-    }
+    ]
   }
diff --git a/test/src/test/resources/fixtures/field removed/namespaced-field-is-removed-with-renames.yml b/test/src/test/resources/fixtures/field removed/namespaced-field-is-removed-with-renames.yml
@@ -40,18 +40,18 @@ serviceCalls: [ ]
 # language=JSON
 response: |-
   {
+    "data": {
+      "commentApi": {
+        "commentById": null
+      }
+    },
     "errors": [
       {
+        "message": "field `CommentApi.commentById` has been removed by RemoveFieldTestTransform",
         "locations": [],
-        "message": "null",
         "extensions": {
-          "classification": "ValidationError"
+          "classification": "DataFetchingException"
         }
       }
-    ],
-    "data": {
-      "commentApi": {
-        "commentById": null
-      }
-    }
+    ]
   }
diff --git a/test/src/test/resources/fixtures/field removed/namespaced-field-is-removed.yml b/test/src/test/resources/fixtures/field removed/namespaced-field-is-removed.yml
@@ -40,18 +40,18 @@ serviceCalls: [ ]
 # language=JSON
 response: |-
   {
+    "data": {
+      "commentApi": {
+        "commentById": null
+      }
+    },
     "errors": [
       {
+        "message": "field `CommentApi.commentById` has been removed by RemoveFieldTestTransform",
         "locations": [],
-        "message": "null",
         "extensions": {
-          "classification": "ValidationError"
+          "classification": "DataFetchingException"
         }
       }
-    ],
-    "data": {
-      "commentApi": {
-        "commentById": null
-      }
-    }
+    ]
   }
diff --git a/...test/resources/fixtures/field removed/namespaced-hydration-top-level-field-is-removed.yml b/...test/resources/fixtures/field removed/namespaced-hydration-top-level-field-is-removed.yml
@@ -87,19 +87,19 @@ serviceCalls:
 # language=JSON
 response: |-
   {
+    "data": {
+      "issueById": {
+        "id": "C1",
+        "comment": null
+      }
+    },
     "errors": [
       {
+        "message": "field `CommentApi.commentById` has been removed by RemoveFieldTestTransform",
         "locations": [],
-        "message": "An error has occurred",
         "extensions": {
-          "classification": "ValidationError"
+          "classification": "DataFetchingException"
         }
       }
-    ],
-    "data": {
-      "issueById": {
-        "id": "C1",
-        "comment": null
-      }
-    }
+    ]
   }
diff --git a/...res/field removed/top-level-field-is-removed-for-a-subscription-with-namespaced-field.yml b/...res/field removed/top-level-field-is-removed-for-a-subscription-with-namespaced-field.yml
@@ -45,16 +45,16 @@ serviceCalls: [ ]
 # language=JSON
 response: |-
   {
+    "data": {
+      "commentsApi": null
+    },
     "errors": [
       {
+        "message": "field `CommentsApi.onCommentUpdated` has been removed by RemoveFieldTestTransform",
         "locations": [],
-        "message": "null",
         "extensions": {
-          "classification": "ValidationError"
+          "classification": "DataFetchingException"
         }
       }
-    ],
-    "data": {
-      "commentsApi": null
-    }
+    ]
   }
diff --git a/...c/test/resources/fixtures/field removed/top-level-field-is-removed-for-a-subscription.yml b/...c/test/resources/fixtures/field removed/top-level-field-is-removed-for-a-subscription.yml
@@ -37,16 +37,16 @@ serviceCalls: [ ]
 # language=JSON
 response: |-
   {
+    "data": {
+      "onCommentUpdated": null
+    },
     "errors": [
       {
+        "message": "field `Subscription.onCommentUpdated` has been removed by RemoveFieldTestTransform",
         "locations": [],
-        "message": "null",
         "extensions": {
-          "classification": "ValidationError"
+          "classification": "DataFetchingException"
         }
       }
-    ],
-    "data": {
-      "onCommentUpdated": null
-    }
+    ]
   }
diff --git a/test/src/test/resources/fixtures/field removed/top-level-field-is-removed-hint-is-off.yml b/test/src/test/resources/fixtures/field removed/top-level-field-is-removed-hint-is-off.yml
@@ -47,16 +47,16 @@ serviceCalls:
 # language=JSON
 response: |-
   {
+    "data": {
+      "commentById": null
+    },
     "errors": [
       {
+        "message": "field `Query.commentById` has been removed by RemoveFieldTestTransform",
         "locations": [],
-        "message": "null",
         "extensions": {
-          "classification": "ValidationError"
+          "classification": "DataFetchingException"
         }
       }
-    ],
-    "data": {
-      "commentById": null
-    }
+    ]
   }
diff --git a/test/src/test/resources/fixtures/field removed/top-level-field-is-removed.yml b/test/src/test/resources/fixtures/field removed/top-level-field-is-removed.yml
@@ -31,16 +31,16 @@ serviceCalls: [ ]
 # language=JSON
 response: |-
   {
+    "data": {
+      "commentById": null
+    },
     "errors": [
       {
+        "message": "field `Query.commentById` has been removed by RemoveFieldTestTransform",
         "locations": [],
-        "message": "null",
         "extensions": {
-          "classification": "ValidationError"
+          "classification": "DataFetchingException"
         }
       }
-    ],
-    "data": {
-      "commentById": null
-    }
+    ]
   }