Merge pull request #123 from graphql-java-kickstart/feature/122

Deprecated getFiles and added clearer replacements

Author: oliemansm

build.gradle

@@ -41,7 +41,7 @@ dependencies {
     testRuntime "cglib:cglib-nodep:3.2.4"
     testRuntime "org.objenesis:objenesis:2.5.1"
     testCompile 'org.slf4j:slf4j-simple:1.7.24'
-    testCompile 'org.springframework:spring-test:4.3.7.RELEASE' // MockHttpServletRequest, MockHttpServletResponse
+    testCompile 'org.springframework:spring-test:4.3.7.RELEASE'
     testRuntime 'org.springframework:spring-web:4.3.7.RELEASE'
 
     // OSGi

src/main/java/graphql/servlet/AbstractGraphQLHttpServlet.java

@@ -142,7 +142,7 @@ public AbstractGraphQLHttpServlet(List<GraphQLServletListener> listeners, boolea
                             variablesMap.ifPresent(map -> graphQLRequests.forEach(r -> mapMultipartVariables(r, map, fileItems)));
                             GraphQLBatchedInvocationInput invocationInput =
                                 invocationInputFactory.create(graphQLRequests, request, response);
-                            invocationInput.getContext().setFiles(fileItems);
+                            invocationInput.getContext().setParts(fileItems);
                             queryBatched(queryInvoker, graphQLObjectMapper, invocationInput, response);
                             return;
                         } else {
@@ -156,7 +156,7 @@ public AbstractGraphQLHttpServlet(List<GraphQLServletListener> listeners, boolea
                             variablesMap.ifPresent(m -> mapMultipartVariables(graphQLRequest, m, fileItems));
                             GraphQLSingleInvocationInput invocationInput =
                                 invocationInputFactory.create(graphQLRequest, request, response);
-                            invocationInput.getContext().setFiles(fileItems);
+                            invocationInput.getContext().setParts(fileItems);
                             query(queryInvoker, graphQLObjectMapper, invocationInput, response);
                             return;
                         }

src/main/java/graphql/servlet/GraphQLContext.java

@@ -8,9 +8,12 @@
 import javax.servlet.http.Part;
 import javax.websocket.Session;
 import javax.websocket.server.HandshakeRequest;
+import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 public class GraphQLContext {
 
@@ -20,7 +23,7 @@ public class GraphQLContext {
     private HandshakeRequest handshakeRequest;
 
     private Subject subject;
-    private Map<String, List<Part>> files;
+    private Map<String, List<Part>> parts;
 
     private DataLoaderRegistry dataLoaderRegistry;
 
@@ -75,12 +78,37 @@ public Optional<HandshakeRequest> getHandshakeRequest() {
         return Optional.ofNullable(handshakeRequest);
     }
 
+    /**
+     * @return list of all parts representing files
+     */
+    public List<Part> getFileParts() {
+        return getParts().values()
+                .stream()
+                .flatMap(Collection::stream)
+                .filter(part -> part.getContentType() != null)
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * Contrary what the name implies this method returns all parts and not just the ones that represent actual files.
+     * That's why this method has been deprecated in favor of the ones that communicate their intent more clearly.
+     *
+     * @deprecated use {@link #getParts()} or {@link #getFileParts()} instead
+     */
+    @Deprecated
     public Optional<Map<String, List<Part>>> getFiles() {
-        return Optional.ofNullable(files);
+        return Optional.ofNullable(parts);
+    }
+
+    /**
+     * @return map representing all form fields
+     */
+    public Map<String, List<Part>> getParts() {
+        return parts != null ? parts : new HashMap<>();
     }
 
-    public void setFiles(Map<String, List<Part>> files) {
-        this.files = files;
+    public void setParts(Map<String, List<Part>> parts) {
+        this.parts = parts;
     }
 
     public Optional<DataLoaderRegistry> getDataLoaderRegistry() {