Separated TypeFunction of array and iterable

Author: osher-sade

src/main/java/graphql/annotations/processor/typeFunctions/ArrayFunction.java

@@ -0,0 +1,42 @@
+package graphql.annotations.processor.typeFunctions;
+
+import graphql.annotations.processor.ProcessingElementsContainer;
+import graphql.schema.GraphQLList;
+import graphql.schema.GraphQLType;
+
+import java.lang.reflect.AnnotatedArrayType;
+import java.lang.reflect.AnnotatedType;
+import java.lang.reflect.ParameterizedType;
+
+/**
+ * Support for arrays
+ */
+public class ArrayFunction implements TypeFunction {
+
+    private DefaultTypeFunction defaultTypeFunction;
+
+    public ArrayFunction(DefaultTypeFunction defaultTypeFunction) {
+        this.defaultTypeFunction = defaultTypeFunction;
+    }
+
+    @Override
+    public boolean canBuildType(Class<?> aClass, AnnotatedType annotatedType) {
+        return aClass.isArray();
+    }
+
+    @Override
+    public GraphQLType buildType(boolean input, Class<?> aClass, AnnotatedType annotatedType, ProcessingElementsContainer container) {
+        if (!(annotatedType instanceof AnnotatedArrayType)) {
+            throw new IllegalArgumentException("Array type parameter should be specified");
+        }
+        AnnotatedArrayType parameterizedType = (AnnotatedArrayType) annotatedType;
+        AnnotatedType arg = parameterizedType.getAnnotatedGenericComponentType();
+        Class<?> klass;
+        if (arg.getType() instanceof ParameterizedType) {
+            klass = (Class<?>) ((ParameterizedType) (arg.getType())).getRawType();
+        } else {
+            klass = (Class<?>) arg.getType();
+        }
+        return new GraphQLList(defaultTypeFunction.buildType(input, klass, arg, container));
+    }
+}

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

@@ -62,6 +62,7 @@ public void activate() {
         typeFunctions.add(new BigDecimalFunction());
         typeFunctions.add(new CharFunction());
         typeFunctions.add(new IterableFunction(DefaultTypeFunction.this));
+        typeFunctions.add(new ArrayFunction(DefaultTypeFunction.this));
         typeFunctions.add(new StreamFunction(DefaultTypeFunction.this));
         typeFunctions.add(new OptionalFunction(DefaultTypeFunction.this));
         typeFunctions.add(new ObjectFunction(graphQLInputProcessor, graphQLOutputProcessor));

src/main/java/graphql/annotations/processor/typeFunctions/IterableFunction.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,13 +18,12 @@
 import graphql.schema.GraphQLList;
 import graphql.schema.GraphQLType;
 
-import java.lang.reflect.AnnotatedArrayType;
 import java.lang.reflect.AnnotatedParameterizedType;
 import java.lang.reflect.AnnotatedType;
 import java.lang.reflect.ParameterizedType;
 
 /**
- * Support for the Iterable things like Lists / Sets / Collections / Arrays and so on..
+ * Support for the Iterable things like Lists / Sets / Collections and so on..
  */
 class IterableFunction implements TypeFunction {
 
@@ -36,24 +35,16 @@ public IterableFunction(DefaultTypeFunction defaultTypeFunction) {
 
     @Override
     public boolean canBuildType(Class<?> aClass, AnnotatedType annotatedType) {
-        return Iterable.class.isAssignableFrom(aClass) || aClass.isArray();
+        return Iterable.class.isAssignableFrom(aClass);
     }
 
     @Override
     public GraphQLType buildType(boolean input, Class<?> aClass, AnnotatedType annotatedType, ProcessingElementsContainer container) {
-        if (!(annotatedType instanceof AnnotatedParameterizedType || annotatedType instanceof AnnotatedArrayType)) {
-            throw new IllegalArgumentException("List or array type parameter should be specified");
+        if (!(annotatedType instanceof AnnotatedParameterizedType)) {
+            throw new IllegalArgumentException("List type parameter should be specified");
         }
-
-        AnnotatedType arg;
-        if (annotatedType instanceof AnnotatedParameterizedType) {
-            AnnotatedParameterizedType parameterizedType = (AnnotatedParameterizedType) annotatedType;
-            arg = parameterizedType.getAnnotatedActualTypeArguments()[0];
-        } else {
-            AnnotatedArrayType parameterizedType = (AnnotatedArrayType) annotatedType;
-            arg = parameterizedType.getAnnotatedGenericComponentType();
-        }
-
+        AnnotatedParameterizedType parameterizedType = (AnnotatedParameterizedType) annotatedType;
+        AnnotatedType arg = parameterizedType.getAnnotatedActualTypeArguments()[0];
         Class<?> klass;
         if (arg.getType() instanceof ParameterizedType) {
             klass = (Class<?>) ((ParameterizedType) (arg.getType())).getRawType();

src/test/java/graphql/annotations/GraphQLIterableTest.java renamed to src/test/java/graphql/annotations/GraphQLIterableAndArrayTest.java

@@ -1,17 +1,3 @@
-/**
- * Copyright 2016 Yurii Rashkovskii
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- */
 package graphql.annotations;
 
 import graphql.ExecutionResult;
@@ -35,7 +21,7 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
-public class GraphQLIterableTest {
+public class GraphQLIterableAndArrayTest {
     @BeforeMethod
     public void init() {
         GraphQLAnnotations.getInstance().getTypeRegistry().clear();
@@ -60,7 +46,7 @@ static class TestObjectDB {
         }
     }
 
-    public static class IterableTestQuery {
+    public static class IterableAndArrayTestQuery {
         @GraphQLField
         @GraphQLDataFetcher(ArrayFetcher.class)
         public TestMappedObject[] array;
@@ -103,7 +89,7 @@ public TestObjectDB[][] get(DataFetchingEnvironment environment) {
 
     @Test
     public void queryWithArray() {
-        GraphQLObjectType object = GraphQLAnnotations.object(IterableTestQuery.class);
+        GraphQLObjectType object = GraphQLAnnotations.object(IterableAndArrayTestQuery.class);
         GraphQLSchema schema = newSchema().query(object).build();
 
         ExecutionResult result = GraphQL.newGraphQL(schema).build().execute("{array {name foo}}");
@@ -114,7 +100,7 @@ public void queryWithArray() {
 
     @Test
     public void queryWithList() {
-        GraphQLObjectType object = GraphQLAnnotations.object(IterableTestQuery.class);
+        GraphQLObjectType object = GraphQLAnnotations.object(IterableAndArrayTestQuery.class);
         GraphQLSchema schema = newSchema().query(object).build();
 
         ExecutionResult result = GraphQL.newGraphQL(schema).build().execute("{list {name foo}}");
@@ -125,7 +111,7 @@ public void queryWithList() {
 
     @Test
     public void queryWithArrayWithinAnArray() {
-        GraphQLObjectType object = GraphQLAnnotations.object(IterableTestQuery.class);
+        GraphQLObjectType object = GraphQLAnnotations.object(IterableAndArrayTestQuery.class);
         GraphQLSchema schema = newSchema().query(object).build();
 
         ExecutionResult result = GraphQL.newGraphQL(schema).build().execute("{arrayWithinArray {name foo}}");