GH-10083: Add Nullability to transaction package

Related to: #10083

Author: cppwfs

spring-integration-core/src/main/java/org/springframework/integration/transaction/ExpressionEvaluatingTransactionSynchronizationProcessor.java

@@ -53,26 +53,28 @@
  * @author Gary Russell
  * @author Oleg Zhurakousky
  * @author Artem Bilan
+ * @author Glenn Renfro
  *
  * @since 2.2
  *
  */
 public class ExpressionEvaluatingTransactionSynchronizationProcessor extends IntegrationObjectSupport
 		implements TransactionSynchronizationProcessor {
 
+	@SuppressWarnings("NullAway.Init")
 	private volatile EvaluationContext evaluationContext;
 
-	private volatile Expression beforeCommitExpression;
+	private volatile @Nullable Expression beforeCommitExpression;
 
-	private volatile Expression afterCommitExpression;
+	private volatile @Nullable Expression afterCommitExpression;
 
-	private volatile Expression afterRollbackExpression;
+	private volatile @Nullable Expression afterRollbackExpression;
 
-	private volatile MessageChannel beforeCommitChannel;
+	private volatile @Nullable MessageChannel beforeCommitChannel;
 
-	private volatile MessageChannel afterCommitChannel;
+	private volatile @Nullable MessageChannel afterCommitChannel;
 
-	private volatile MessageChannel afterRollbackChannel;
+	private volatile @Nullable MessageChannel afterRollbackChannel;
 
 	public void setIntegrationEvaluationContext(EvaluationContext evaluationContext) {
 		this.evaluationContext = evaluationContext;
@@ -136,7 +138,7 @@ public String getComponentType() {
 		return "processor";
 	}
 
-	private void doProcess(IntegrationResourceHolder holder, Expression expression,
+	private void doProcess(IntegrationResourceHolder holder, @Nullable Expression expression,
 			@Nullable MessageChannel messageChannel, String expressionType) {
 
 		Message<?> message = holder.getMessage();

spring-integration-core/src/main/java/org/springframework/integration/transaction/IntegrationResourceHolder.java

@@ -20,6 +20,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.messaging.Message;
 import org.springframework.transaction.support.ResourceHolder;
 
@@ -29,6 +31,7 @@
  *
  * @author Gary Russell
  * @author Oleg Zhurakousky
+ * @author Glenn Renfro
  *
  * @since 2.2
  *
@@ -39,15 +42,15 @@ public class IntegrationResourceHolder implements ResourceHolder {
 
 	public static final String INPUT_CHANNEL = "inputChannel";
 
-	private volatile Message<?> message;
+	private volatile @Nullable Message<?> message;
 
 	private final Map<String, Object> attributes = new HashMap<>();
 
 	public void setMessage(Message<?> message) {
 		this.message = message;
 	}
 
-	public Message<?> getMessage() {
+	public @Nullable Message<?> getMessage() {
 		return this.message;
 	}
 

spring-integration-core/src/main/java/org/springframework/integration/transaction/TransactionSynchronizationFactoryBean.java

@@ -18,6 +18,8 @@
 
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
@@ -38,6 +40,7 @@
  * @author Artem Bilan
  * @author Gary Russell
  * @author Ngoc Nhan
+ * @author Glenn Renfro
  *
  * @since 4.0
  */
@@ -51,27 +54,28 @@ public class TransactionSynchronizationFactoryBean implements FactoryBean<Defaul
 
 	private final AtomicInteger counter = new AtomicInteger();
 
+	@SuppressWarnings("NullAway.Init")
 	private BeanFactory beanFactory;
 
-	private volatile String beforeCommitExpression;
+	private volatile @Nullable String beforeCommitExpression;
 
-	private volatile String afterCommitExpression;
+	private volatile @Nullable String afterCommitExpression;
 
-	private volatile String afterRollbackExpression;
+	private volatile @Nullable String afterRollbackExpression;
 
-	private volatile MessageChannel beforeCommitChannel;
+	private volatile @Nullable MessageChannel beforeCommitChannel;
 
-	private volatile String beforeCommitChannelName;
+	private volatile @Nullable String beforeCommitChannelName;
 
-	private volatile MessageChannel afterCommitChannel;
+	private volatile @Nullable MessageChannel afterCommitChannel;
 
-	private volatile String afterCommitChannelName;
+	private volatile @Nullable String afterCommitChannelName;
 
-	private volatile MessageChannel afterRollbackChannel;
+	private volatile @Nullable MessageChannel afterRollbackChannel;
 
-	private volatile String afterRollbackChannelName;
+	private volatile @Nullable String afterRollbackChannelName;
 
-	private volatile DestinationResolver<MessageChannel> channelResolver;
+	private volatile @Nullable DestinationResolver<MessageChannel> channelResolver;
 
 	@Override
 	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
@@ -108,7 +112,7 @@ public TransactionSynchronizationFactoryBean beforeCommit(MessageChannel message
 		return beforeCommit(this.beforeCommitExpression, messageChannel);
 	}
 
-	public TransactionSynchronizationFactoryBean beforeCommit(String expression, MessageChannel messageChannel) {
+	public TransactionSynchronizationFactoryBean beforeCommit(@Nullable String expression, @Nullable MessageChannel messageChannel) {
 		Assert.state(StringUtils.hasText(expression) || messageChannel != null,
 				EXPRESSION_OR_CHANNEL_NEEDED);
 		this.beforeCommitExpression = expression;
@@ -134,7 +138,7 @@ public TransactionSynchronizationFactoryBean afterCommit(MessageChannel messageC
 		return afterCommit(this.afterCommitExpression, messageChannel);
 	}
 
-	public TransactionSynchronizationFactoryBean afterCommit(String expression, MessageChannel messageChannel) {
+	public TransactionSynchronizationFactoryBean afterCommit(@Nullable String expression, @Nullable MessageChannel messageChannel) {
 		Assert.state(StringUtils.hasText(expression) || messageChannel != null,
 				EXPRESSION_OR_CHANNEL_NEEDED);
 		this.afterCommitExpression = expression;
@@ -160,7 +164,7 @@ public TransactionSynchronizationFactoryBean afterRollback(MessageChannel messag
 		return afterRollback(this.afterRollbackExpression, messageChannel);
 	}
 
-	public TransactionSynchronizationFactoryBean afterRollback(String expression, MessageChannel messageChannel) {
+	public TransactionSynchronizationFactoryBean afterRollback(@Nullable String expression, @Nullable MessageChannel messageChannel) {
 		Assert.state(StringUtils.hasText(expression) || messageChannel != null,
 				EXPRESSION_OR_CHANNEL_NEEDED);
 		this.afterRollbackExpression = expression;

spring-integration-core/src/main/java/org/springframework/integration/transaction/package-info.java

@@ -2,4 +2,5 @@
  * Provides classes supporting the use of transactions and
  * pseudo transactions in Spring Integration applications.
  */
+@org.jspecify.annotations.NullMarked
 package org.springframework.integration.transaction;