nonNull assertions for schema objects

andimarek · andimarek · commit d01816ce4fda · 2015-07-18T07:13:46.000+02:00
diff --git a/src/main/java/graphql/introspection/Introspection.java b/src/main/java/graphql/introspection/Introspection.java
@@ -76,7 +76,7 @@ public Object get(DataFetchingEnvironment environment) {
                     .build())
             .field(newFieldDefinition()
                     .name("type")
-                    .type(new GraphQLNonNull(new GraphQLTypeReference("__TYPE")))
+                    .type(new GraphQLNonNull(new GraphQLTypeReference("__Type")))
                     .build())
             .field(newFieldDefinition()
                     .name("defaultValue")
@@ -115,7 +115,7 @@ public Object get(DataFetchingEnvironment environment) {
                     .build())
             .field(newFieldDefinition()
                     .name("type")
-                    .type(new GraphQLNonNull(new GraphQLTypeReference("__TYPE")))
+                    .type(new GraphQLNonNull(new GraphQLTypeReference("__Type")))
                     .build())
             .field(newFieldDefinition()
                     .name("isDeprecated")
@@ -289,6 +289,7 @@ public Object get(DataFetchingEnvironment environment) {
             .build();
 
     public static GraphQLObjectType __Directive = newObject()
+            .name("__Directive")
             .field(newFieldDefinition()
                     .name("name")
                     .type(GraphQLString)
@@ -423,6 +424,7 @@ public Object get(DataFetchingEnvironment environment) {
         // make sure all TypeReferences are resolved
         GraphQLSchema.newSchema()
                 .query(GraphQLObjectType.newObject()
+                        .name("dummySchema")
                         .field(SchemaMetaFieldDef)
                         .field(TypeMetaFieldDef)
                         .field(TypeNameMetaFieldDef)
diff --git a/src/main/java/graphql/schema/GraphQLArgument.java b/src/main/java/graphql/schema/GraphQLArgument.java
@@ -1,17 +1,21 @@
 package graphql.schema;
 
 
+import static graphql.Assert.assertNotNull;
+
 public class GraphQLArgument {
 
     private final String name;
     private final String description;
     private GraphQLInputType type;
     private final Object defaultValue;
 
-    public GraphQLArgument(String name, String description, GraphQLInputType graphQLInputType, Object defaultValue) {
+    public GraphQLArgument(String name, String description, GraphQLInputType type, Object defaultValue) {
+        assertNotNull(name, "name can't be null");
+        assertNotNull(type, "type can't be null");
         this.name = name;
         this.description = description;
-        this.type = graphQLInputType;
+        this.type = type;
         this.defaultValue = defaultValue;
     }
 
diff --git a/src/main/java/graphql/schema/GraphQLDirective.java b/src/main/java/graphql/schema/GraphQLDirective.java
@@ -4,6 +4,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static graphql.Assert.assertNotNull;
+
 public class GraphQLDirective {
 
     private final String name;
@@ -14,6 +16,8 @@ public class GraphQLDirective {
     private final boolean onField;
 
     public GraphQLDirective(String name, String description, List<GraphQLArgument> arguments, boolean onOperation, boolean onFragment, boolean onField) {
+        assertNotNull(name, "name can't be null");
+        assertNotNull(arguments, "arguments can't be null");
         this.name = name;
         this.description = description;
         this.arguments.addAll(arguments);
diff --git a/src/main/java/graphql/schema/GraphQLEnumType.java b/src/main/java/graphql/schema/GraphQLEnumType.java
@@ -9,6 +9,8 @@
 import java.util.List;
 import java.util.Map;
 
+import static graphql.Assert.assertNotNull;
+
 public class GraphQLEnumType implements GraphQLType, GraphQLInputType, GraphQLOutputType, GraphQLUnmodifiedType {
 
     private final String name;
@@ -44,6 +46,7 @@ public List<GraphQLEnumValueDefinition> getValues() {
 
 
     public GraphQLEnumType(String name, String description, List<GraphQLEnumValueDefinition> values) {
+        assertNotNull(name, "name can't be null");
         this.name = name;
         this.description = description;
         buildMap(values);
diff --git a/src/main/java/graphql/schema/GraphQLEnumValueDefinition.java b/src/main/java/graphql/schema/GraphQLEnumValueDefinition.java
@@ -1,6 +1,8 @@
 package graphql.schema;
 
 
+import static graphql.Assert.assertNotNull;
+
 public class GraphQLEnumValueDefinition {
 
     private final String name;
@@ -9,6 +11,7 @@ public class GraphQLEnumValueDefinition {
     private final String deprecationReason;
 
     public GraphQLEnumValueDefinition(String name, String description, Object value, String deprecationReason) {
+        assertNotNull(name, "name can't be null");
         this.name = name;
         this.description = description;
         this.value = value;
diff --git a/src/main/java/graphql/schema/GraphQLFieldDefinition.java b/src/main/java/graphql/schema/GraphQLFieldDefinition.java
@@ -5,6 +5,8 @@
 import java.util.List;
 import java.util.Map;
 
+import static graphql.Assert.assertNotNull;
+
 public class GraphQLFieldDefinition {
 
     private final String name;
@@ -16,13 +18,15 @@ public class GraphQLFieldDefinition {
 
 
     public GraphQLFieldDefinition(String name, String description, GraphQLOutputType type, DataFetcher dataFetcher, List<GraphQLArgument> arguments, String deprecationReason) {
+        assertNotNull(name, "name can't be null");
+        assertNotNull(dataFetcher, "dataFetcher can't be null");
+        assertNotNull(type, "type can't be null");
+        assertNotNull(arguments, "arguments can't be null");
         this.name = name;
         this.description = description;
         this.type = type;
         this.dataFetcher = dataFetcher;
-        if (arguments != null) {
-            this.arguments.addAll(arguments);
-        }
+        this.arguments.addAll(arguments);
         this.deprecationReason = deprecationReason;
     }
 
diff --git a/src/main/java/graphql/schema/GraphQLInputObjectField.java b/src/main/java/graphql/schema/GraphQLInputObjectField.java
@@ -1,6 +1,7 @@
 package graphql.schema;
 
 
+import static graphql.Assert.assertNotNull;
 
 public class GraphQLInputObjectField {
 
@@ -14,6 +15,8 @@ public GraphQLInputObjectField(String name, GraphQLInputType type) {
     }
 
     public GraphQLInputObjectField(String name, String description, GraphQLInputType type, Object defaultValue) {
+        assertNotNull(name, "name can't be null");
+        assertNotNull(type, "type can't be null");
         this.name = name;
         this.type = type;
         this.defaultValue = defaultValue;
diff --git a/src/main/java/graphql/schema/GraphQLInputObjectType.java b/src/main/java/graphql/schema/GraphQLInputObjectType.java
@@ -6,6 +6,8 @@
 import java.util.List;
 import java.util.Map;
 
+import static graphql.Assert.assertNotNull;
+
 public class GraphQLInputObjectType implements GraphQLType, GraphQLInputType, GraphQLUnmodifiedType, GraphQLNullableType {
 
     private final String name;
@@ -15,6 +17,8 @@ public class GraphQLInputObjectType implements GraphQLType, GraphQLInputType, Gr
     private final Map<String, GraphQLInputObjectField> fieldMap = new LinkedHashMap<>();
 
     public GraphQLInputObjectType(String name, String description, List<GraphQLInputObjectField> fields) {
+        assertNotNull(name, "name can't be null");
+        assertNotNull(fields, "fields can't be null");
         this.name = name;
         this.description = description;
         buildMap(fields);
diff --git a/src/main/java/graphql/schema/GraphQLInterfaceType.java b/src/main/java/graphql/schema/GraphQLInterfaceType.java
@@ -6,14 +6,19 @@
 import java.util.List;
 import java.util.Map;
 
-public class GraphQLInterfaceType implements GraphQLType, GraphQLOutputType, GraphQLFieldsContainer, GraphQLCompositeType,GraphQLUnmodifiedType,GraphQLNullableType {
+import static graphql.Assert.assertNotNull;
+
+public class GraphQLInterfaceType implements GraphQLType, GraphQLOutputType, GraphQLFieldsContainer, GraphQLCompositeType, GraphQLUnmodifiedType, GraphQLNullableType {
 
     private final String name;
     private final String description;
     private final Map<String, GraphQLFieldDefinition> fieldDefinitionsByName = new LinkedHashMap<>();
     private final TypeResolver typeResolver;
 
     public GraphQLInterfaceType(String name, String description, List<GraphQLFieldDefinition> fieldDefinitions, TypeResolver typeResolver) {
+        assertNotNull(name, "name can't null");
+        assertNotNull(typeResolver, "typeResolver can't null");
+        assertNotNull(fieldDefinitions, "fieldDefinitions can't null");
         this.name = name;
         this.description = description;
         buildDefinitionMap(fieldDefinitions);
diff --git a/src/main/java/graphql/schema/GraphQLList.java b/src/main/java/graphql/schema/GraphQLList.java
@@ -3,11 +3,14 @@
 
 import java.util.Map;
 
+import static graphql.Assert.assertNotNull;
+
 public class GraphQLList implements GraphQLType, GraphQLInputType, GraphQLOutputType, GraphQLModifiedType, GraphQLNullableType {
 
-    private  GraphQLType wrappedType;
+    private GraphQLType wrappedType;
 
     public GraphQLList(GraphQLType wrappedType) {
+        assertNotNull(wrappedType, "wrappedType can't be null");
         this.wrappedType = wrappedType;
     }
 
diff --git a/src/main/java/graphql/schema/GraphQLNonNull.java b/src/main/java/graphql/schema/GraphQLNonNull.java
@@ -3,11 +3,14 @@
 
 import java.util.Map;
 
+import static graphql.Assert.assertNotNull;
+
 public class GraphQLNonNull implements GraphQLType, GraphQLInputType, GraphQLOutputType, GraphQLModifiedType {
 
     private  GraphQLType wrappedType;
 
     public GraphQLNonNull(GraphQLType wrappedType) {
+        assertNotNull(wrappedType, "wrappedType can't be null");
         this.wrappedType = wrappedType;
     }
 
diff --git a/src/main/java/graphql/schema/GraphQLObjectType.java b/src/main/java/graphql/schema/GraphQLObjectType.java
@@ -6,19 +6,22 @@
 import java.util.List;
 import java.util.Map;
 
+import static graphql.Assert.assertNotNull;
+
 public class GraphQLObjectType implements GraphQLType, GraphQLOutputType, GraphQLFieldsContainer, GraphQLCompositeType, GraphQLUnmodifiedType, GraphQLNullableType {
 
     private final String name;
     private final String description;
     private final Map<String, GraphQLFieldDefinition> fieldDefinitionsByName = new LinkedHashMap<>();
-    private List<GraphQLInterfaceType> interfaces = new ArrayList<>();
-    private final TypeResolver typeResolver;
+    private final List<GraphQLInterfaceType> interfaces = new ArrayList<>();
 
-    public GraphQLObjectType(String name, String description, List<GraphQLFieldDefinition> fieldDefinitions, List<GraphQLInterfaceType> interfaces, TypeResolver typeResolver) {
+    public GraphQLObjectType(String name, String description, List<GraphQLFieldDefinition> fieldDefinitions, List<GraphQLInterfaceType> interfaces) {
+        assertNotNull(name, "name can't null");
+        assertNotNull(fieldDefinitions, "fieldDefinitions can't null");
+        assertNotNull(interfaces, "interfaces can't null");
         this.name = name;
         this.description = description;
         this.interfaces.addAll(interfaces);
-        this.typeResolver = typeResolver;
         buildDefinitionMap(fieldDefinitions);
     }
 
@@ -73,7 +76,6 @@ public static class Builder {
         private String description;
         private List<GraphQLFieldDefinition> fieldDefinitions = new ArrayList<>();
         private List<GraphQLInterfaceType> interfaces = new ArrayList<>();
-        private TypeResolver typeResolver;
 
         public Builder name(String name) {
             this.name = name;
@@ -95,13 +97,8 @@ public Builder withInterface(GraphQLInterfaceType interfaceType) {
             return this;
         }
 
-        public Builder typeResolver(TypeResolver typeResolver) {
-            this.typeResolver = typeResolver;
-            return this;
-        }
-
         public GraphQLObjectType build() {
-            return new GraphQLObjectType(name, description, fieldDefinitions, interfaces, null);
+            return new GraphQLObjectType(name, description, fieldDefinitions, interfaces);
         }
 
 
diff --git a/src/main/java/graphql/schema/GraphQLScalarType.java b/src/main/java/graphql/schema/GraphQLScalarType.java
@@ -1,6 +1,8 @@
 package graphql.schema;
 
 
+import static graphql.Assert.assertNotNull;
+
 public class GraphQLScalarType implements GraphQLType, GraphQLInputType, GraphQLOutputType, GraphQLUnmodifiedType,GraphQLNullableType {
 
     private final String name;
@@ -9,6 +11,8 @@ public class GraphQLScalarType implements GraphQLType, GraphQLInputType, GraphQL
 
 
     public GraphQLScalarType(String name, String description, Coercing coercing) {
+        assertNotNull(name, "name can't be null");
+        assertNotNull(coercing, "coercing can't be null");
         this.name = name;
         this.description = description;
         this.coercing = coercing;
diff --git a/src/main/java/graphql/schema/GraphQLSchema.java b/src/main/java/graphql/schema/GraphQLSchema.java
@@ -6,6 +6,8 @@
 import java.util.Arrays;
 import java.util.List;
 
+import static graphql.Assert.assertNotNull;
+
 public class GraphQLSchema {
 
     private final GraphQLObjectType queryType;
@@ -17,6 +19,7 @@ public GraphQLSchema(GraphQLObjectType queryType) {
 
 
     public GraphQLSchema(GraphQLObjectType queryType, GraphQLObjectType mutationType) {
+        assertNotNull(queryType, "queryType can't be null");
         this.queryType = queryType;
         this.mutationType = mutationType;
     }
diff --git a/src/main/java/graphql/schema/GraphQLTypeReference.java b/src/main/java/graphql/schema/GraphQLTypeReference.java
@@ -1,6 +1,8 @@
 package graphql.schema;
 
 
+import static graphql.Assert.assertNotNull;
+
 /**
  * A special type to allow a object/interface types to reference itself. It's replaced with the real type
  * object when the schema is build.
@@ -10,6 +12,7 @@ public class GraphQLTypeReference implements GraphQLType, GraphQLOutputType {
     private final String name;
 
     public GraphQLTypeReference(String name) {
+        assertNotNull(name, "name can't be null");
         this.name = name;
     }
 
diff --git a/src/main/java/graphql/schema/GraphQLUnionType.java b/src/main/java/graphql/schema/GraphQLUnionType.java
@@ -4,6 +4,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static graphql.Assert.assertNotNull;
+
 public class GraphQLUnionType implements GraphQLType, GraphQLOutputType, GraphQLCompositeType, GraphQLUnmodifiedType, GraphQLNullableType {
 
     private final String name;
@@ -12,10 +14,13 @@ public class GraphQLUnionType implements GraphQLType, GraphQLOutputType, GraphQL
     private final TypeResolver typeResolver;
 
 
-    public GraphQLUnionType(String name, String description, List<GraphQLType> possibleTypes, TypeResolver typeResolver) {
+    public GraphQLUnionType(String name, String description, List<GraphQLType> types, TypeResolver typeResolver) {
+        assertNotNull(name, "name can't be null");
+        assertNotNull(types, "types can't be null");
+        assertNotNull(typeResolver, "typeResolver can't be null");
         this.name = name;
         this.description = description;
-        this.types.addAll(possibleTypes);
+        this.types.addAll(types);
         this.typeResolver = typeResolver;
     }
 
diff --git a/src/main/java/graphql/schema/SchemaUtil.java b/src/main/java/graphql/schema/SchemaUtil.java
diff --git a/src/test/groovy/graphql/TestUtil.groovy b/src/test/groovy/graphql/TestUtil.groovy
diff --git a/src/test/groovy/graphql/validation/TraversalContextTest.groovy b/src/test/groovy/graphql/validation/TraversalContextTest.groovy
diff --git a/src/test/groovy/graphql/validation/ValidationUtilTest.groovy b/src/test/groovy/graphql/validation/ValidationUtilTest.groovy
diff --git a/src/test/groovy/graphql/validation/rules/FieldsOnCorrectTypeTest.groovy b/src/test/groovy/graphql/validation/rules/FieldsOnCorrectTypeTest.groovy
diff --git a/src/test/groovy/graphql/validation/rules/KnownArgumentNamesTest.groovy b/src/test/groovy/graphql/validation/rules/KnownArgumentNamesTest.groovy
diff --git a/src/test/groovy/graphql/validation/rules/ScalarLeafsTest.groovy b/src/test/groovy/graphql/validation/rules/ScalarLeafsTest.groovy
