Issue 10083: Apply Nullability to the project

This change is applicable only to spring-integration-camel.
Handled changes in package-info.java.
Handled nullable related issues in CamelMessageHandler.

Signed-off-by: Anayonkar Shivalkar <[email protected]>

Author: anayonkars

spring-integration-camel/src/main/java/org/springframework/integration/camel/dsl/package-info.java

@@ -2,6 +2,5 @@
  * Provides supporting classes for JavaDSL with Apache Camel components.
  */
 
-@org.springframework.lang.NonNullApi
-@org.springframework.lang.NonNullFields
+@org.jspecify.annotations.NullMarked
 package org.springframework.integration.camel.dsl;

spring-integration-camel/src/main/java/org/springframework/integration/camel/outbound/CamelMessageHandler.java

@@ -17,6 +17,7 @@
 package org.springframework.integration.camel.outbound;
 
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 
 import org.apache.camel.CamelContext;
@@ -68,6 +69,7 @@
  */
 public class CamelMessageHandler extends AbstractReplyProducingMessageHandler {
 
+	@Nullable
 	private ProducerTemplate producerTemplate;
 
 	private Expression exchangePatternExpression = new ValueExpression<>(ExchangePattern.InOnly);
@@ -83,6 +85,7 @@ public class CamelMessageHandler extends AbstractReplyProducingMessageHandler {
 	@Nullable
 	private Expression exchangePropertiesExpression;
 
+	@Nullable
 	private StandardEvaluationContext evaluationContext;
 
 	public CamelMessageHandler() {
@@ -197,46 +200,57 @@ public void configure() throws Exception {
 	}
 
 	@Override
+	@Nullable
 	protected Object handleRequestMessage(Message<?> requestMessage) {
+		StandardEvaluationContext localEvaluationContext = Objects.requireNonNull(this.evaluationContext,
+				"'evaluationContext' must not be null");
 		ExchangePattern exchangePattern =
-				this.exchangePatternExpression.getValue(this.evaluationContext, requestMessage, ExchangePattern.class);
+				this.exchangePatternExpression.getValue(localEvaluationContext, requestMessage, ExchangePattern.class);
 
 		Assert.notNull(exchangePattern, "'exchangePatternExpression' must not evaluate to null");
 
 		Endpoint endpoint = resolveEndpoint(requestMessage);
 		Exchange exchange = prepareInExchange(endpoint, exchangePattern, requestMessage);
 
+		ProducerTemplate localProducerTemplate = Objects.requireNonNull(this.producerTemplate,
+				"'producerTemplate' must not be null");
 		if (isAsync()) {
-			CompletableFuture<Exchange> result = this.producerTemplate.asyncSend(endpoint, exchange);
+			CompletableFuture<Exchange> result = localProducerTemplate.asyncSend(endpoint, exchange);
 			return result.thenApply(resultExchange -> buildReply(exchangePattern, resultExchange));
 		}
 		else {
-			Exchange result = this.producerTemplate.send(endpoint, exchange);
+			Exchange result = localProducerTemplate.send(endpoint, exchange);
 			return buildReply(exchangePattern, result);
 		}
 	}
 
 	private Endpoint resolveEndpoint(Message<?> requestMessage) {
+		StandardEvaluationContext localEvaluationContext = Objects.requireNonNull(this.evaluationContext,
+				"'evaluationContext' must not be null");
 		String endpointUri =
 				this.endpointUriExpression != null
-						? this.endpointUriExpression.getValue(this.evaluationContext, requestMessage, String.class)
+						? this.endpointUriExpression.getValue(localEvaluationContext, requestMessage, String.class)
 						: null;
 
+		ProducerTemplate localProducerTemplate = Objects.requireNonNull(this.producerTemplate,
+				"'producerTemplate' must not be null");
 		if (StringUtils.hasText(endpointUri)) {
-			return this.producerTemplate.getCamelContext().getEndpoint(endpointUri);
+			return localProducerTemplate.getCamelContext().getEndpoint(endpointUri);
 		}
 		else {
-			return this.producerTemplate.getDefaultEndpoint();
+			return localProducerTemplate.getDefaultEndpoint();
 		}
 	}
 
 	@SuppressWarnings("unchecked")
 	private Exchange prepareInExchange(Endpoint endpoint, ExchangePattern exchangePattern, Message<?> requestMessage) {
 		Exchange exchange = endpoint.createExchange(exchangePattern);
 
+		StandardEvaluationContext localEvaluationContext = Objects.requireNonNull(this.evaluationContext,
+				"'evaluationContext' must not be null");
 		Map<String, Object> exchangeProperties =
 				this.exchangePropertiesExpression != null
-						? this.exchangePropertiesExpression.getValue(this.evaluationContext, requestMessage, Map.class)
+						? this.exchangePropertiesExpression.getValue(localEvaluationContext, requestMessage, Map.class)
 						: null;
 
 		if (exchangeProperties != null) {

spring-integration-camel/src/main/java/org/springframework/integration/camel/outbound/package-info.java

@@ -2,6 +2,5 @@
  * Provides classes for Apache Camel outbound channel adapters.
  */
 
-@org.springframework.lang.NonNullApi
-@org.springframework.lang.NonNullFields
+@org.jspecify.annotations.NullMarked
 package org.springframework.integration.camel.outbound;

spring-integration-camel/src/main/java/org/springframework/integration/camel/support/package-info.java

@@ -2,6 +2,5 @@
  * Provides supporting classes for Apache Camel channel adapters.
  */
 
-@org.springframework.lang.NonNullApi
-@org.springframework.lang.NonNullFields
+@org.jspecify.annotations.NullMarked
 package org.springframework.integration.camel.support;