Skip to content
This repository was archived by the owner on Oct 25, 2021. It is now read-only.

Commit d9ac5c2

Browse files
andimarekandimarek
authored
Merge pull request #13 from marceloverdijk/mediatype
Making content type resolution more robust
2 parents 3fa9f8e + 1511fb4 commit d9ac5c2

File tree

4 files changed

+45
-26
lines changed

4 files changed

+45
-26
lines changed

‎build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ subprojects {
4040

4141
ext {
4242
graphqlJavaVersion = "15.0"
43-
springVersion = "5.1.2.RELEASE"
44-
springBootVersion = "2.1.0.RELEASE"
45-
jacksonVersion = "2.9.6"
43+
springVersion = "5.1.7.RELEASE"
44+
springBootVersion = "2.1.5.RELEASE"
45+
jacksonVersion = "2.9.8"
4646
assertJVersion = "3.11.1"
4747
}
4848

‎graphql-java-spring-webflux/src/main/java/graphql/spring/web/reactive/components/GraphQLController.java‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
import org.springframework.beans.factory.annotation.Autowired;
1010
import org.springframework.http.HttpHeaders;
1111
import org.springframework.http.HttpStatus;
12+
import org.springframework.http.InvalidMediaTypeException;
1213
import org.springframework.http.MediaType;
14+
import org.springframework.util.StringUtils;
1315
import org.springframework.web.bind.annotation.RequestBody;
1416
import org.springframework.web.bind.annotation.RequestHeader;
1517
import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,6 +29,9 @@
2729
@Internal
2830
public class GraphQLController {
2931

32+
static String APPLICATION_GRAPHQL_VALUE = "application/graphql";
33+
static MediaType APPLICATION_GRAPHQL = MediaType.parseMediaType(APPLICATION_GRAPHQL_VALUE);
34+
3035
@Autowired
3136
GraphQLInvocation graphQLInvocation;
3237

@@ -47,6 +52,14 @@ public Object graphqlPOST(
4752
@RequestBody(required = false) String body,
4853
ServerWebExchange serverWebExchange) {
4954

55+
MediaType mediaType = null;
56+
if (!StringUtils.isEmpty(contentType)) {
57+
try {
58+
mediaType = MediaType.parseMediaType(contentType);
59+
} catch (InvalidMediaTypeException ignore) {
60+
}
61+
}
62+
5063
if (body == null) {
5164
body = "";
5265
}
@@ -62,7 +75,7 @@ public Object graphqlPOST(
6275
// "variables": { "myVariable": "someValue", ... }
6376
// }
6477

65-
if (MediaType.APPLICATION_JSON_VALUE.equals(contentType)) {
78+
if (MediaType.APPLICATION_JSON.equalsTypeAndSubtype(mediaType)) {
6679
GraphQLRequestBody request = jsonSerializer.deserialize(body, GraphQLRequestBody.class);
6780
if (request.getQuery() == null) {
6881
request.setQuery("");
@@ -82,7 +95,7 @@ public Object graphqlPOST(
8295
// * If the "application/graphql" Content-Type header is present,
8396
// treat the HTTP POST body contents as the GraphQL query string.
8497

85-
if ("application/graphql".equals(contentType)) {
98+
if (APPLICATION_GRAPHQL.equalsTypeAndSubtype(mediaType)) {
8699
return executeRequest(body, null, null, serverWebExchange);
87100
}
88101

‎graphql-java-spring-webflux/src/test/java/graphql/spring/web/reactive/components/GraphQLControllerTest.java‎

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import reactor.core.publisher.Mono;
1919
import testconfig.TestAppConfig;
2020

21-
import java.net.URLEncoder;
2221
import java.util.LinkedHashMap;
2322
import java.util.Map;
2423
import java.util.concurrent.CompletableFuture;
@@ -109,9 +108,7 @@ public void testSimplePostRequest() throws Exception {
109108
@Test
110109
public void testQueryParamPostRequest() throws Exception {
111110
String variablesJson = "{\"variable\":\"variableValue\"}";
112-
String variablesValue = URLEncoder.encode(variablesJson, "UTF-8");
113111
String query = "query myQuery {foo}";
114-
String queryString = URLEncoder.encode(query, "UTF-8");
115112
String operationName = "myQuery";
116113

117114
ExecutionResultImpl executionResult = ExecutionResultImpl.newExecutionResult()
@@ -122,10 +119,10 @@ public void testQueryParamPostRequest() throws Exception {
122119
Mockito.when(graphql.executeAsync(captor.capture())).thenReturn(cf);
123120

124121
client.post().uri(uriBuilder -> uriBuilder.path("/graphql")
125-
.queryParam("variables", variablesValue)
126-
.queryParam("query", queryString)
127-
.queryParam("operationName", operationName)
128-
.build(variablesJson, queryString))
122+
.queryParam("variables", "{variables}")
123+
.queryParam("query", "{query}")
124+
.queryParam("operationName", "{operationName}")
125+
.build(variablesJson, query, operationName))
129126
.accept(MediaType.APPLICATION_JSON_UTF8)
130127
.exchange()
131128
.expectStatus().isOk()
@@ -144,7 +141,6 @@ public void testQueryParamPostRequest() throws Exception {
144141
@Test
145142
public void testSimpleQueryParamPostRequest() throws Exception {
146143
String query = "{foo}";
147-
String queryString = URLEncoder.encode(query, "UTF-8");
148144

149145
ExecutionResultImpl executionResult = ExecutionResultImpl.newExecutionResult()
150146
.data("bar")
@@ -154,8 +150,8 @@ public void testSimpleQueryParamPostRequest() throws Exception {
154150
Mockito.when(graphql.executeAsync(captor.capture())).thenReturn(cf);
155151

156152
client.post().uri(uriBuilder -> uriBuilder.path("/graphql")
157-
.queryParam("query", queryString)
158-
.build())
153+
.queryParam("query", "{query}")
154+
.build(query))
159155
.accept(MediaType.APPLICATION_JSON_UTF8)
160156
.exchange()
161157
.expectStatus().isOk()
@@ -196,9 +192,7 @@ public void testApplicationGraphqlPostRequest() throws Exception {
196192
@Test
197193
public void testGetRequest() throws Exception {
198194
String variablesJson = "{\"variable\":\"variableValue\"}";
199-
String variablesValue = URLEncoder.encode(variablesJson, "UTF-8");
200195
String query = "query myQuery {foo}";
201-
String queryString = URLEncoder.encode(query, "UTF-8");
202196
String operationName = "myQuery";
203197

204198
ExecutionResultImpl executionResult = ExecutionResultImpl.newExecutionResult()
@@ -209,10 +203,10 @@ public void testGetRequest() throws Exception {
209203
Mockito.when(graphql.executeAsync(captor.capture())).thenReturn(cf);
210204

211205
client.get().uri(uriBuilder -> uriBuilder.path("/graphql")
212-
.queryParam("variables", variablesValue)
213-
.queryParam("query", queryString)
214-
.queryParam("operationName", operationName)
215-
.build(variablesJson, queryString))
206+
.queryParam("variables", "{variables}")
207+
.queryParam("query", "{query}")
208+
.queryParam("operationName", "{operationName}")
209+
.build(variablesJson, query, operationName))
216210
.accept(MediaType.APPLICATION_JSON_UTF8)
217211
.exchange()
218212
.expectStatus().isOk()
@@ -231,7 +225,6 @@ public void testGetRequest() throws Exception {
231225
@Test
232226
public void testSimpleGetRequest() throws Exception {
233227
String query = "{foo}";
234-
String queryString = URLEncoder.encode(query, "UTF-8");
235228

236229
ExecutionResultImpl executionResult = ExecutionResultImpl.newExecutionResult()
237230
.data("bar")
@@ -241,8 +234,8 @@ public void testSimpleGetRequest() throws Exception {
241234
Mockito.when(graphql.executeAsync(captor.capture())).thenReturn(cf);
242235

243236
client.get().uri(uriBuilder -> uriBuilder.path("/graphql")
244-
.queryParam("query", queryString)
245-
.build())
237+
.queryParam("query", "{query}")
238+
.build(query))
246239
.accept(MediaType.APPLICATION_JSON_UTF8)
247240
.exchange()
248241
.expectStatus().isOk()

‎graphql-java-spring-webmvc/src/main/java/graphql/spring/web/servlet/components/GraphQLController.java‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
import org.springframework.beans.factory.annotation.Autowired;
1010
import org.springframework.http.HttpHeaders;
1111
import org.springframework.http.HttpStatus;
12+
import org.springframework.http.InvalidMediaTypeException;
1213
import org.springframework.http.MediaType;
14+
import org.springframework.util.StringUtils;
1315
import org.springframework.web.bind.annotation.RequestBody;
1416
import org.springframework.web.bind.annotation.RequestHeader;
1517
import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,6 +30,9 @@
2830
@Internal
2931
public class GraphQLController {
3032

33+
static String APPLICATION_GRAPHQL_VALUE = "application/graphql";
34+
static MediaType APPLICATION_GRAPHQL = MediaType.parseMediaType(APPLICATION_GRAPHQL_VALUE);
35+
3136
@Autowired
3237
GraphQLInvocation graphQLInvocation;
3338

@@ -48,6 +53,14 @@ public Object graphqlPOST(
4853
@RequestBody(required = false) String body,
4954
WebRequest webRequest) throws IOException {
5055

56+
MediaType mediaType = null;
57+
if (!StringUtils.isEmpty(contentType)) {
58+
try {
59+
mediaType = MediaType.parseMediaType(contentType);
60+
} catch (InvalidMediaTypeException ignore) {
61+
}
62+
}
63+
5164
if (body == null) {
5265
body = "";
5366
}
@@ -63,7 +76,7 @@ public Object graphqlPOST(
6376
// "variables": { "myVariable": "someValue", ... }
6477
// }
6578

66-
if (MediaType.APPLICATION_JSON_VALUE.equals(contentType)) {
79+
if (MediaType.APPLICATION_JSON.equalsTypeAndSubtype(mediaType)) {
6780
GraphQLRequestBody request = jsonSerializer.deserialize(body, GraphQLRequestBody.class);
6881
if (request.getQuery() == null) {
6982
request.setQuery("");
@@ -83,7 +96,7 @@ public Object graphqlPOST(
8396
// * If the "application/graphql" Content-Type header is present,
8497
// treat the HTTP POST body contents as the GraphQL query string.
8598

86-
if ("application/graphql".equals(contentType)) {
99+
if (APPLICATION_GRAPHQL.equalsTypeAndSubtype(mediaType)) {
87100
return executeRequest(body, null, null, webRequest);
88101
}
89102

0 commit comments

Comments
 (0)