The CacheControl instance is now defaulted to non null (#1493)

graphql-java · May 14, 2019 · 400d008 · 400d008
1 parent 4fd3721
commit 400d008
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 6 deletions.
diff --git a/src/main/java/graphql/ExecutionInput.java b/src/main/java/graphql/ExecutionInput.java
@@ -150,7 +150,7 @@ public static class Builder {
         private Object root;
         private Map<String, Object> variables = Collections.emptyMap();
         private DataLoaderRegistry dataLoaderRegistry = new DataLoaderRegistry();
-        private CacheControl cacheControl;
+        private CacheControl cacheControl = CacheControl.newCacheControl();
 
         public Builder query(String query) {
             this.query = query;
@@ -209,7 +209,7 @@ public Builder dataLoaderRegistry(DataLoaderRegistry dataLoaderRegistry) {
         }
 
         public Builder cacheControl(CacheControl cacheControl) {
-            this.cacheControl = cacheControl;
+            this.cacheControl = assertNotNull(cacheControl);
             return this;
         }
 

diff --git a/src/main/java/graphql/cachecontrol/CacheControl.java b/src/main/java/graphql/cachecontrol/CacheControl.java
@@ -7,9 +7,11 @@
 import graphql.schema.DataFetchingEnvironment;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import static graphql.Assert.assertNotNull;
 import static graphql.util.FpKit.map;
@@ -67,7 +69,7 @@ Map<String, Object> toMap() {
     private final List<Hint> hints;
 
     private CacheControl() {
-        hints = new ArrayList<>();
+        hints = new CopyOnWriteArrayList<>();
     }
 
 

diff --git a/src/test/groovy/graphql/ExecutionInputTest.groovy b/src/test/groovy/graphql/ExecutionInputTest.groovy
@@ -82,5 +82,8 @@ class ExecutionInputTest extends Specification {
         def executionInput = ExecutionInput.newExecutionInput("{ q }").build()
         then:
         executionInput.query == "{ q }"
+        executionInput.cacheControl != null
+        executionInput.dataLoaderRegistry != null
+        executionInput.variables == [:]
     }
 }
diff --git a/src/test/groovy/graphql/schema/idl/WiringFactoryTest.groovy b/src/test/groovy/graphql/schema/idl/WiringFactoryTest.groovy
@@ -193,10 +193,10 @@ class WiringFactoryTest extends Specification {
 
         GraphQLObjectType humanType = schema.getType("Human") as GraphQLObjectType
 
-        def friendsDataFetcher = schema.getCodeRegistry().getDataFetcher(humanType,humanType.getFieldDefinition("friends")) as NamedDataFetcher
+        def friendsDataFetcher = schema.getCodeRegistry().getDataFetcher(humanType, humanType.getFieldDefinition("friends")) as NamedDataFetcher
         friendsDataFetcher.name == "friends"
 
-        def cyborgDataFetcher = schema.getCodeRegistry().getDataFetcher(humanType,humanType.getFieldDefinition("cyborg")) as NamedDataFetcher
+        def cyborgDataFetcher = schema.getCodeRegistry().getDataFetcher(humanType, humanType.getFieldDefinition("cyborg")) as NamedDataFetcher
         cyborgDataFetcher.name == "cyborg"
 
         GraphQLScalarType longScalar = schema.getType("Long") as GraphQLScalarType
@@ -314,7 +314,7 @@ class WiringFactoryTest extends Specification {
         GraphQLObjectType type = schema.getType("Query") as GraphQLObjectType
 
         expect:
-        def fetcher = schema.getCodeRegistry().getDataFetcher(type,type.getFieldDefinition("homePlanet"))
+        def fetcher = schema.getCodeRegistry().getDataFetcher(type, type.getFieldDefinition("homePlanet"))
         fetcher instanceof PropertyDataFetcher
 
         PropertyDataFetcher propertyDataFetcher = fetcher as PropertyDataFetcher
@@ -329,4 +329,28 @@ class WiringFactoryTest extends Specification {
         propertyDataFetcher2.getPropertyName() == "name"
 
     }
+
+    def "Name"() {
+        WiringFactory wf = new WiringFactory() {
+            @Override
+            boolean providesDataFetcherFactory(FieldWiringEnvironment environment) {
+                def fieldDef = environment.getFieldDefinition();
+                if (fieldDef.getName() == "class") {
+                    return true;
+                }
+                return false;
+            }
+
+            @Override
+            DataFetcher getDataFetcher(FieldWiringEnvironment environment) {
+                return new DataFetcher() {
+                    @Override
+                    Object get(DataFetchingEnvironment env) throws Exception {
+                        def sourceObject = env.getSource()
+                        return sourceObject.getClass().getSimpleName()
+                    }
+                }
+            }
+        }
+    }
 }