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

Add Nullability support into Java DSL

Browse Source
This commit is contained in:
abilan
2023-04-14 14:16:36 -04:00
parent 053cc00484
commit d5181bf0d7
105 changed files with 514 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-graphql/src/main/java/org/springframework/integration/graphql/dsl/package-info.java
View File

@@ -1,4 +1,6 @@
/**
* Provides classes for Java DSL to support GraphQL components.
*/
@org.springframework.lang.NonNullApi
@org.springframework.lang.NonNullFields
package org.springframework.integration.graphql.dsl;

11
spring-integration-graphql/src/main/java/org/springframework/integration/graphql/outbound/GraphQlMessageHandler.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2022 the original author or authors.
* Copyright 2022-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -47,8 +47,9 @@ public class GraphQlMessageHandler extends AbstractReplyProducingMessageHandler
private final ExecutionGraphQlService graphQlService;
private StandardEvaluationContext evaluationContext;
private StandardEvaluationContext evaluationContext = new StandardEvaluationContext();
@Nullable
private Expression operationExpression;
private Expression operationNameExpression = new SupplierExpression<>(() -> null);
@@ -142,11 +143,11 @@ public class GraphQlMessageHandler extends AbstractReplyProducingMessageHandler
graphQlRequest = (ExecutionGraphQlRequest) requestMessage.getPayload();
}
else {
Assert.notNull(this.operationExpression, "'operationExpression' must not be null");
String query = evaluateOperationExpression(requestMessage);
String operationName = evaluateOperationNameExpression(requestMessage);
Map<String, Object> variables = evaluateVariablesExpression(requestMessage);
String id = evaluateExecutionIdExpression(requestMessage);
Assert.notNull(id, "The 'executionIdExpression' must not evaluate to null");
graphQlRequest = new DefaultExecutionGraphQlRequest(query, operationName, variables, null, id, this.locale);
}
@@ -155,20 +156,24 @@ public class GraphQlMessageHandler extends AbstractReplyProducingMessageHandler
}
private String evaluateOperationExpression(Message<?> message) {
Assert.notNull(this.operationExpression, "'operationExpression' must not be null");
String operation = this.operationExpression.getValue(this.evaluationContext, message, String.class);
Assert.notNull(operation, "'operationExpression' must not evaluate to null");
return operation;
}
@Nullable
private String evaluateOperationNameExpression(Message<?> message) {
return this.operationNameExpression.getValue(this.evaluationContext, message, String.class);
}
@Nullable
@SuppressWarnings("unchecked")
private Map<String, Object> evaluateVariablesExpression(Message<?> message) {
return this.variablesExpression.getValue(this.evaluationContext, message, Map.class);
}
@Nullable
private String evaluateExecutionIdExpression(Message<?> message) {
return this.executionIdExpression.getValue(this.evaluationContext, message, String.class);
}

2
spring-integration-graphql/src/main/java/org/springframework/integration/graphql/outbound/package-info.java
View File

@@ -1,4 +1,6 @@
/**
* Provides classes for GraphQL outbound channel adapters.
*/
@org.springframework.lang.NonNullApi
@org.springframework.lang.NonNullFields
package org.springframework.integration.graphql.outbound;