Skip to content

Commit 1f36733

Browse files
committed
fix: set default character encoding to utf8 fixes #406
1 parent 03c2fc0 commit 1f36733

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

graphql-java-servlet/src/main/java/graphql/kickstart/servlet/GraphQLMultipartInvocationInputParser.java

+1
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ private Optional<Part> findPart(Map<String, List<Part>> parts) {
109109
.filter(parts::containsKey)
110110
.map(key -> getPart(parts, key))
111111
.findFirst()
112+
.filter(Optional::isPresent)
112113
.map(Optional::get);
113114
}
114115

graphql-java-servlet/src/main/java/graphql/kickstart/servlet/GraphQLPostInvocationInputParser.java

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import graphql.kickstart.servlet.input.GraphQLInvocationInputFactory;
1111
import java.io.IOException;
1212
import java.util.List;
13-
import java.util.stream.Collectors;
1413
import javax.servlet.http.HttpServletRequest;
1514
import javax.servlet.http.HttpServletResponse;
1615

graphql-java-servlet/src/main/java/graphql/kickstart/servlet/HttpRequestHandlerImpl.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import graphql.GraphQLException;
55
import graphql.kickstart.execution.input.GraphQLInvocationInput;
66
import java.io.IOException;
7+
import java.nio.charset.StandardCharsets;
78
import javax.servlet.http.HttpServletRequest;
89
import javax.servlet.http.HttpServletResponse;
910
import lombok.extern.slf4j.Slf4j;
@@ -32,14 +33,17 @@ public HttpRequestHandlerImpl(
3233
@Override
3334
public void handle(HttpServletRequest request, HttpServletResponse response) throws IOException {
3435
try {
36+
if (request.getCharacterEncoding() == null) {
37+
request.setCharacterEncoding(StandardCharsets.UTF_8.name());
38+
}
3539
GraphQLInvocationInputParser invocationInputParser =
3640
GraphQLInvocationInputParser.create(
3741
request,
3842
configuration.getInvocationInputFactory(),
3943
configuration.getObjectMapper(),
4044
configuration.getContextSetting());
4145
GraphQLInvocationInput invocationInput =
42-
invocationInputParser.getGraphQLInvocationInput(request, response);
46+
invocationInputParser. getGraphQLInvocationInput(request, response);
4347
requestInvoker.execute(invocationInput, request, response);
4448
} catch (GraphQLException | JsonProcessingException e) {
4549
response.setStatus(STATUS_BAD_REQUEST);

0 commit comments

Comments
 (0)