Removed duplicate creation of GraphQLNonNull type. Support only GraphQLNonNull annotation.

Author: Thomas Draier

src/main/java/graphql/annotations/DefaultTypeFunction.java

@@ -328,8 +328,7 @@ public GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType a
         }
 
         GraphQLType result = typeFunction.buildType(inputType, aClass, annotatedType);
-        if (aClass.getAnnotation(GraphQLNonNull.class) != null ||
-                (annotatedType != null && annotatedType.getAnnotation(GraphQLNonNull.class) != null)) {
+        if (annotatedType != null && annotatedType.isAnnotationPresent(GraphQLNonNull.class)) {
             result = new graphql.schema.GraphQLNonNull(result);
         }
         return result;

src/main/java/graphql/annotations/GraphQLAnnotations.java

@@ -21,7 +21,6 @@
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 
-import javax.validation.constraints.NotNull;
 import java.lang.reflect.*;
 import java.util.*;
 import java.util.function.Function;
@@ -471,7 +470,6 @@ protected GraphQLFieldDefinition getField(Field field) throws GraphQLAnnotations
         }
 
         GraphQLOutputType outputType = (GraphQLOutputType) typeFunction.buildType(field.getType(), field.getAnnotatedType());
-        outputType = field.isAnnotationPresent(NotNull.class) ? new GraphQLNonNull(outputType) : outputType;
 
         boolean isConnection = isConnection(field, outputType);
         if (isConnection) {
@@ -629,7 +627,6 @@ protected GraphQLFieldDefinition getField(Method method) throws GraphQLAnnotatio
         }
 
         GraphQLOutputType outputType = (GraphQLOutputType) outputTypeFunction.buildType(method.getReturnType(), annotatedReturnType);
-        outputType = method.getAnnotation(NotNull.class) == null ? outputType : new GraphQLNonNull(outputType);
 
         boolean isConnection = isConnection(method, outputType);
         if (isConnection) {
@@ -644,7 +641,7 @@ protected GraphQLFieldDefinition getField(Method method) throws GraphQLAnnotatio
                 filter(p -> !DataFetchingEnvironment.class.isAssignableFrom(p.getType())).
                 map(parameter -> {
                     Class<?> t = parameter.getType();
-                    graphql.schema.GraphQLType graphQLType = getInputObject(finalTypeFunction.buildType(t, parameter.getAnnotatedType()), DEFAULT_INPUT_PREFIX);
+                    graphql.schema.GraphQLInputType graphQLType = getInputObject(finalTypeFunction.buildType(t, parameter.getAnnotatedType()), DEFAULT_INPUT_PREFIX);
                     return getArgument(parameter, graphQLType);
                 }).collect(Collectors.toList());
 
@@ -755,10 +752,9 @@ public static GraphQLInputObjectType inputObject(GraphQLObjectType graphQLType,
         return (GraphQLInputObjectType) getInstance().getInputObject(graphQLType, newNamePrefix);
     }
 
-    protected GraphQLArgument getArgument(Parameter parameter, graphql.schema.GraphQLType t) throws
+    protected GraphQLArgument getArgument(Parameter parameter, graphql.schema.GraphQLInputType t) throws
             GraphQLAnnotationsException {
-        GraphQLArgument.Builder builder = newArgument();
-        builder.type(parameter.getAnnotation(NotNull.class) == null ? (GraphQLInputType) t : new graphql.schema.GraphQLNonNull(t));
+        GraphQLArgument.Builder builder = newArgument().type(t);
         GraphQLDescription description = parameter.getAnnotation(GraphQLDescription.class);
         if (description != null) {
             builder.description(description.value());

src/main/java/graphql/annotations/GraphQLNonNull.java

@@ -19,7 +19,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target({ElementType.TYPE, ElementType.TYPE_USE, ElementType.METHOD, ElementType.PARAMETER})
+@Target({ElementType.FIELD, ElementType.TYPE_USE, ElementType.METHOD, ElementType.PARAMETER})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface GraphQLNonNull {
 }

src/test/java/graphql/annotations/GraphQLObjectTest.java

@@ -31,7 +31,6 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import javax.validation.constraints.NotNull;
 import java.lang.reflect.AnnotatedType;
 import java.util.*;
 import java.util.function.Supplier;
@@ -67,13 +66,13 @@ private static class TestObject {
         @GraphQLName("field0")
         @GraphQLDescription("field")
         public
-        @NotNull
+        @GraphQLNonNull
         String field() {
             return "test";
         }
 
         @GraphQLField
-        public String fieldWithArgs(@NotNull String a, @GraphQLDefaultValue(DefaultAValue.class) @GraphQLDescription("b") String b) {
+        public String fieldWithArgs(@GraphQLNonNull String a, @GraphQLDefaultValue(DefaultAValue.class) @GraphQLDescription("b") String b) {
             return b;
         }