refactoring of list completion

andimarek · andimarek · commit e10e5244ba3f · 2016-01-17T17:45:43.000+01:00
diff --git a/src/main/java/graphql/execution/ExecutionStrategy.java b/src/main/java/graphql/execution/ExecutionStrategy.java
@@ -9,10 +9,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static graphql.introspection.Introspection.*;
 
@@ -62,14 +59,7 @@ protected ExecutionResult completeValue(ExecutionContext executionContext, Graph
         } else if (result == null) {
             return null;
         } else if (fieldType instanceof GraphQLList) {
-            if (result.getClass().isArray()) {
-                List<Object> resultList = new ArrayList<>();
-                for (Object value : (Object[]) result) {
-                    resultList.add(value);
-                }
-                return completeValueForList(executionContext, (GraphQLList) fieldType, fields, resultList);
-            }
-            return completeValueForList(executionContext, (GraphQLList) fieldType, fields, (List<Object>) result);
+            return completeValueForList(executionContext, (GraphQLList) fieldType, fields, result);
         } else if (fieldType instanceof GraphQLScalarType) {
             return completeValueForScalar((GraphQLScalarType) fieldType, result);
         } else if (fieldType instanceof GraphQLEnumType) {
@@ -99,6 +89,14 @@ protected ExecutionResult completeValue(ExecutionContext executionContext, Graph
         return executionContext.getExecutionStrategy().execute(executionContext, resolvedType, result, subFields);
     }
 
+    private ExecutionResult completeValueForList(ExecutionContext executionContext, GraphQLList fieldType, List<Field> fields, Object result) {
+        if (result.getClass().isArray()) {
+            result = Arrays.asList((Object[]) result);
+        }
+
+        return completeValueForList(executionContext, fieldType, fields, (List<Object>) result);
+    }
+
     protected GraphQLObjectType resolveType(GraphQLInterfaceType graphQLInterfaceType, Object value) {
         GraphQLObjectType result = graphQLInterfaceType.getTypeResolver().getType(value);
         if (result == null) {
