Fixed tests when builder is empty and the ER is null

bbakerman · bbakerman · commit 8e185e1ac5b6 · 2023-02-09T20:52:33.000+11:00
diff --git a/src/main/java/graphql/extensions/ExtensionsBuilder.java b/src/main/java/graphql/extensions/ExtensionsBuilder.java
@@ -113,6 +113,13 @@ public Map<Object, Object> buildExtensions() {
      */
     public ExecutionResult setExtensions(ExecutionResult executionResult) {
         assertNotNull(executionResult);
-        return executionResult.transform(builder -> builder.extensions(buildExtensions()));
+        Map<Object, Object> currentExtensions = executionResult.getExtensions();
+        Map<Object, Object> builderExtensions = buildExtensions();
+        // if there was no extensions map before, and we are not adding anything new
+        // then leave it null
+        if (currentExtensions == null && builderExtensions.isEmpty()) {
+            return executionResult;
+        }
+        return executionResult.transform(builder -> builder.extensions(builderExtensions));
     }
 }
diff --git a/src/test/groovy/graphql/extensions/ExtensionsBuilderTest.groovy b/src/test/groovy/graphql/extensions/ExtensionsBuilderTest.groovy
@@ -193,4 +193,27 @@ class ExtensionsBuilderTest extends Specification {
                 id    : "ID!",
         ]
     }
+
+    def "integration test showing it leaves extensions null if they are empty"() {
+        def sdl = """
+        type Query {
+            name : String!
+            street : String
+            id : ID!
+        }
+        """
+
+        def ei = ExecutionInput.newExecutionInput("query q { name street id }")
+                .root(["name" : "Brad", "id" :1234])
+                .build()
+
+
+        def graphQL = TestUtil.graphQL(sdl, newRuntimeWiring().build()).build()
+
+        when:
+        def er = graphQL.execute(ei)
+        then:
+        er.errors.isEmpty()
+        er.extensions == null
+    }
 }
