Migrated from param to part and file

Author: nkonev

spring-graphql/src/main/java/org/springframework/graphql/server/webmvc/GraphQlHttpHandler.java

@@ -17,6 +17,8 @@
 package org.springframework.graphql.server.webmvc;
 
 import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Type;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -25,6 +27,7 @@
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.Part;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.logging.Log;
@@ -124,27 +127,26 @@ public ServerResponse handleRequest(ServerRequest serverRequest) throws ServletE
 	}
 
 	public ServerResponse handleMultipartRequest(ServerRequest serverRequest) throws ServletException {
-        Optional<String> operation = serverRequest.param("operations");
-        Optional<String> mapParam = serverRequest.param("map");
+        HttpServletRequest httpServletRequest = serverRequest.servletRequest();
 
-        Map<String, Object> inputQuery = operation
-            .map(part ->
-                partReader.<Map<String, Object>>readPart(part, MAP_PARAMETERIZED_TYPE_REF.getType())
-            )
-            .orElse(new HashMap<>());
+        Map<String, Object> inputQuery = Optional.ofNullable(this.<Map<String, Object>>deserializePart(
+            httpServletRequest,
+            "operations",
+            MAP_PARAMETERIZED_TYPE_REF.getType()
+        )).orElse(new HashMap<>());
 
 		final Map<String, Object> queryVariables = getFromMapOrEmpty(inputQuery, "variables");
 		final Map<String, Object> extensions = getFromMapOrEmpty(inputQuery, "extensions");
 
-        Map<String, MultipartFile> fileParams = readMultipartFiles(serverRequest);
+        Map<String, MultipartFile> fileParams = readMultipartFiles(httpServletRequest);
 
-		Map<String, List<String>> fileMapInput =
-            mapParam.map(part ->
-                partReader.<Map<String, List<String>>>readPart(part, LIST_PARAMETERIZED_TYPE_REF.getType())
-            )
-            .orElse(new HashMap<>());
+        Map<String, List<String>> fileMappings = Optional.ofNullable(this.<Map<String, List<String>>>deserializePart(
+                httpServletRequest,
+                "map",
+                LIST_PARAMETERIZED_TYPE_REF.getType()
+        )).orElse(new HashMap<>());
 
-		fileMapInput.forEach((String fileKey, List<String> objectPaths) -> {
+        fileMappings.forEach((String fileKey, List<String> objectPaths) -> {
 			MultipartFile file = fileParams.get(fileKey);
 			if (file != null) {
 				objectPaths.forEach((String objectPath) -> {
@@ -186,16 +188,31 @@ public ServerResponse handleMultipartRequest(ServerRequest serverRequest) throws
 		return ServerResponse.async(responseMono);
 	}
 
-	private Map<String, Object> getFromMapOrEmpty(Map<String, Object> input, String key) {
+    private <T> T deserializePart(HttpServletRequest httpServletRequest, String name, Type type) {
+        try {
+            Part part = httpServletRequest.getPart(name);
+            if (part == null) {
+                return null;
+            }
+            try(InputStream inputStream = part.getInputStream()) {
+                return partReader.readPart(inputStream, type);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        } catch (IOException | ServletException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private Map<String, Object> getFromMapOrEmpty(Map<String, Object> input, String key) {
 		if (input.containsKey(key)) {
 			return (Map<String, Object>)input.get(key);
 		} else {
 			return new HashMap<>();
 		}
 	}
 
-    private static Map<String, MultipartFile> readMultipartFiles(ServerRequest request) {
-        HttpServletRequest httpServletRequest = request.servletRequest();
+    private static Map<String, MultipartFile> readMultipartFiles(HttpServletRequest httpServletRequest) {
         Assert.isInstanceOf(MultipartHttpServletRequest.class, httpServletRequest,
                 "Request should be of type MultipartHttpServletRequest");
         MultipartHttpServletRequest multipartHttpServletRequest = (MultipartHttpServletRequest) httpServletRequest;

spring-graphql/src/main/java/org/springframework/graphql/server/webmvc/JacksonPartReader.java

@@ -5,6 +5,7 @@
 import org.springframework.core.GenericTypeResolver;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.lang.reflect.Type;
 
 public class JacksonPartReader implements PartReader {
@@ -16,10 +17,10 @@ public JacksonPartReader(ObjectMapper objectMapper) {
     }
 
     @Override
-    public <T> T readPart(String param, Type targetType) {
+    public <T> T readPart(InputStream inputStream, Type targetType) {
         try {
             JavaType javaType = getJavaType(targetType);
-            return objectMapper.readValue(param, javaType);
+            return objectMapper.readValue(inputStream, javaType);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }

spring-graphql/src/main/java/org/springframework/graphql/server/webmvc/PartReader.java

@@ -1,7 +1,8 @@
 package org.springframework.graphql.server.webmvc;
 
+import java.io.InputStream;
 import java.lang.reflect.Type;
 
 public interface PartReader {
-    <T> T readPart(String param, Type targetType);
+    <T> T readPart(InputStream inputStream, Type targetType);
 }

spring-graphql/src/test/java/org/springframework/graphql/server/webmvc/GraphQlHttpHandlerTests.java

@@ -167,8 +167,8 @@ private MockHttpServletRequest createMultipartServletRequest(String query, Strin
         );
         operations.put("variables", variables);
 
-        servletRequest.addParameter("operations", getJsonString(operations));
-        servletRequest.addParameter("map", getJsonString(partMappings));
+        servletRequest.addPart(new MockPart("operations", getJsonArray(operations)));
+        servletRequest.addPart(new MockPart("map", getJsonArray(partMappings)));
 
         return servletRequest;
     }
@@ -196,9 +196,9 @@ private byte[] getFileByteArray(Resource resource) {
         }
     }
 
-    private String getJsonString(Object o) {
+    private byte[] getJsonArray(Object o) {
         try {
-            return objectMapper.writeValueAsString(o);
+            return objectMapper.writeValueAsBytes(o);
         } catch (JsonProcessingException e) {
             throw new RuntimeException(e);
         }