implement requested changes

issue spring-projects#3501
dmfrey · Feb 16, 2022 · 7a78516 · 7a78516
1 parent 5fe7b91
commit 7a78516
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/...src/main/java/org/springframework/integration/graphql/outbound/GraphQlMessageHandler.java b/...src/main/java/org/springframework/integration/graphql/outbound/GraphQlMessageHandler.java
@@ -80,14 +80,14 @@ public void setQueryExpression(Expression queryExpression) {
 	 * @param operationName the GraphQL Operation Name to use.
 	 */
 	public void setOperationName(String operationName) {
-		setOperationNameTypeExpression(new LiteralExpression(operationName));
+		setOperationNameExpression(new LiteralExpression(operationName));
 	}
 
 	/**
 	 * Set a SpEL expression to evaluate a GraphQL Operation Name to execute.
 	 * @param operationNameExpression the expression to use.
 	 */
-	public void setOperationNameTypeExpression(Expression operationNameExpression) {
+	public void setOperationNameExpression(Expression operationNameExpression) {
 		Assert.notNull(operationNameExpression, "'operationNameExpression' must not be null");
 		this.operationNameExpression = operationNameExpression;
 	}
@@ -129,20 +129,18 @@ else if (requestMessage.getPayload() instanceof String && !Strings.isNullOrEmpty
 		}
 	}
 
-	String evaluateQueryExpression(Message<?> message) {
+	private String evaluateQueryExpression(Message<?> message) {
 		String query = this.queryExpression.getValue(this.evaluationContext, message, String.class);
 		Assert.notNull(query, "'queryExpression' must not evaluate to null");
 		return query;
 	}
 
-	String evaluateOperationNameExpression(Message<?> message) {
-		Assert.notNull(this.operationNameExpression, "'operationNameExpression' must not be null when 'query' mode is used");
+	private String evaluateOperationNameExpression(Message<?> message) {
 		return this.operationNameExpression.getValue(this.evaluationContext, message, String.class);
 	}
 
 	@SuppressWarnings("unchecked")
-	Map<String, Object> evaluateVariablesExpression(Message<?> message) {
-		Assert.notNull(this.variablesExpression, "'variablesExpression' must not be null when 'query' mode is used");
+	private Map<String, Object> evaluateVariablesExpression(Message<?> message) {
 		return this.variablesExpression.getValue(this.evaluationContext, message, Map.class);
 	}
 

diff --git a/...est/java/org/springframework/integration/graphql/outbound/GraphQlMessageHandlerTests.java b/...est/java/org/springframework/integration/graphql/outbound/GraphQlMessageHandlerTests.java
@@ -313,10 +313,6 @@ void testHandleMessageForSubscriptionWithInvalidPayload() {
 
 	}
 
-	private static <T> T waitFor(Mono<T> mono) {
-		return mono.block(Duration.ofSeconds(10));
-	}
-
 	@Controller
 	static class GraphQlController {