Skip to content

Commit 910b128

Browse files
committed
Change PartReader
1 parent cfa124f commit 910b128

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,11 +194,7 @@ private <T> T deserializePart(HttpServletRequest httpServletRequest, String name
194194
if (part == null) {
195195
return null;
196196
}
197-
try(InputStream inputStream = part.getInputStream()) {
198-
return partReader.readPart(inputStream, type);
199-
} catch (IOException e) {
200-
throw new RuntimeException(e);
201-
}
197+
return partReader.readPart(part, type);
202198
} catch (IOException | ServletException e) {
203199
throw new RuntimeException(e);
204200
}

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.fasterxml.jackson.databind.ObjectMapper;
55
import org.springframework.core.GenericTypeResolver;
66

7+
import javax.servlet.http.Part;
78
import java.io.IOException;
89
import java.io.InputStream;
910
import java.lang.reflect.Type;
@@ -17,10 +18,14 @@ public JacksonPartReader(ObjectMapper objectMapper) {
1718
}
1819

1920
@Override
20-
public <T> T readPart(InputStream inputStream, Type targetType) {
21-
try {
22-
JavaType javaType = getJavaType(targetType);
23-
return objectMapper.readValue(inputStream, javaType);
21+
public <T> T readPart(Part part, Type targetType) {
22+
try(InputStream inputStream = part.getInputStream()) {
23+
try {
24+
JavaType javaType = getJavaType(targetType);
25+
return objectMapper.readValue(inputStream, javaType);
26+
} catch (IOException e) {
27+
throw new RuntimeException(e);
28+
}
2429
} catch (IOException e) {
2530
throw new RuntimeException(e);
2631
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.springframework.graphql.server.webmvc;
22

3-
import java.io.InputStream;
3+
import javax.servlet.http.Part;
44
import java.lang.reflect.Type;
55

66
public interface PartReader {
7-
<T> T readPart(InputStream inputStream, Type targetType);
7+
<T> T readPart(Part part, Type targetType);
88
}

0 commit comments

Comments
 (0)