Spring/spring-graphql
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add non nullable package annotations

Browse Source 
rename GraphQLResponseBody -> GraphQLResponse
This commit is contained in:
Andreas Marek
2020-09-15 02:24:58 +10:00
parent 59214d4c5b
commit 740a3f1f92
8 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-graphql-boot-starter-webflux/src/main/java/org/springframework/graphql/reactive/package-info.java Normal file
View File

@@ -0,0 +1,6 @@
@NonNullApi
@NonNullFields
package org.springframework.graphql.reactive;
import org.springframework.lang.NonNullApi;
import org.springframework.lang.NonNullFields;

6
spring-graphql-boot-starter-webmvc/src/main/java/org/springframework/graphql/servlet/package-info.java Normal file
View File

@@ -0,0 +1,6 @@
@NonNullApi
@NonNullFields
package org.springframework.graphql.servlet;
import org.springframework.lang.NonNullApi;
import org.springframework.lang.NonNullFields;

8
spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLHandler.java
View File

@@ -19,7 +19,7 @@ public class GraphQLHandler {
this.interceptor = interceptor;
}
public Mono<GraphQLResponseBody> graphqlPOST(GraphQLRequestBody body, HttpHeaders httpHeaders) {
public Mono<GraphQLResponse> graphqlPOST(GraphQLRequestBody body, HttpHeaders httpHeaders) {
String query = body.getQuery();
ExecutionInput input = ExecutionInput.newExecutionInput()
.query(query)
@@ -33,15 +33,15 @@ public class GraphQLHandler {
.flatMap(result -> toResponseBody(result, httpHeaders));
}
private Mono<GraphQLResponseBody> toResponseBody(ExecutionResult executionResult, HttpHeaders httpHeaders) {
private Mono<GraphQLResponse> toResponseBody(ExecutionResult executionResult, HttpHeaders httpHeaders) {
Map<String, Object> responseBodyRaw = executionResult.toSpecification();
Object data = responseBodyRaw.get("data");
List<Map<String, Object>> errors = (List<Map<String, Object>>) responseBodyRaw.get("errors");
Map<String, Object> extensions = (Map<String, Object>) responseBodyRaw.get("extensions");
GraphQLResponseBody responseBody = new GraphQLResponseBody(data,
GraphQLResponse responseBody = new GraphQLResponse(data,
errors,
extensions);
Mono<GraphQLResponseBody> graphQLResponseBodyMono = interceptor.customizeResponseBody(responseBody, executionResult, httpHeaders);
Mono<GraphQLResponse> graphQLResponseBodyMono = interceptor.customizeResponseBody(responseBody, executionResult, httpHeaders);
return graphQLResponseBodyMono;
}

4
spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLInterceptor.java
View File

@@ -15,8 +15,8 @@ public interface GraphQLInterceptor {
return Mono.just(result);
}
default Mono<GraphQLResponseBody> customizeResponseBody(GraphQLResponseBody graphQLResponseBody, ExecutionResult executionResult, HttpHeaders httpHeader) {
return Mono.just(graphQLResponseBody);
default Mono<GraphQLResponse> customizeResponseBody(GraphQLResponse graphQLResponse, ExecutionResult executionResult, HttpHeaders httpHeader) {
return Mono.just(graphQLResponse);
}
}

4
spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLResponseBody.java → spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLResponse.java
View File

@@ -3,13 +3,13 @@ package org.springframework.graphql;
import java.util.List;
import java.util.Map;
public class GraphQLResponseBody {
public class GraphQLResponse {
private final Object data;
private final List<Map<String, Object>> errors;
private final Map<String, Object> extensions;
public GraphQLResponseBody(Object data, List<Map<String, Object>> errors, Map<String, Object> extensions) {
public GraphQLResponse(Object data, List<Map<String, Object>> errors, Map<String, Object> extensions) {
this.data = data;
this.errors = errors;
this.extensions = extensions;

6
spring-graphql-common/src/main/java/org/springframework/graphql/package-info.java Normal file
View File

@@ -0,0 +1,6 @@
@NonNullApi
@NonNullFields
package org.springframework.graphql;
import org.springframework.lang.NonNullApi;
import org.springframework.lang.NonNullFields;

6
spring-graphql-webflux/src/main/java/org/springframework/graphql/reactive/components/package-info.java Normal file
View File

@@ -0,0 +1,6 @@
@NonNullApi
@NonNullFields
package org.springframework.graphql.reactive.components;
import org.springframework.lang.NonNullApi;
import org.springframework.lang.NonNullFields;

6
spring-graphql-webmvc/src/main/java/org/springframework/graphql/servlet/components/package-info.java Normal file
View File

@@ -0,0 +1,6 @@
@NonNullApi
@NonNullFields
package org.springframework.graphql.servlet.components;
import org.springframework.lang.NonNullApi;
import org.springframework.lang.NonNullFields;