Update SI Core to add Nullability to module

This is a first pass at the module to make sure it is being converted properly.
Related to #10083

Author: cppwfs

spring-integration-core/src/main/java/org/springframework/integration/context/ExpressionCapable.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 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.
@@ -16,6 +16,9 @@
 
 package org.springframework.integration.context;
 
+
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.expression.Expression;
 
 /**
@@ -32,6 +35,7 @@ public interface ExpressionCapable {
 	 * Return the primary SpEL expression if this component is expression-based.
 	 * @return the expression as a String.
 	 */
+	@Nullable
 	Expression getExpression();
 
 }

spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationContextUtils.java

@@ -16,6 +16,8 @@
 
 package org.springframework.integration.context;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.config.BeanDefinition;
@@ -120,6 +122,7 @@ public abstract class IntegrationContextUtils {
 	 * @param beanFactory BeanFactory for lookup, must not be null.
 	 * @return The {@link MetadataStore} bean whose name is "metadataStore".
 	 */
+	@Nullable
 	public static MetadataStore getMetadataStore(BeanFactory beanFactory) {
 		return getBeanOfType(beanFactory, METADATA_STORE_BEAN_NAME, MetadataStore.class);
 	}
@@ -128,6 +131,7 @@ public static MetadataStore getMetadataStore(BeanFactory beanFactory) {
 	 * @param beanFactory BeanFactory for lookup, must not be null.
 	 * @return The {@link MessageChannel} bean whose name is "errorChannel".
 	 */
+	@Nullable
 	public static MessageChannel getErrorChannel(BeanFactory beanFactory) {
 		return getBeanOfType(beanFactory, ERROR_CHANNEL_BEAN_NAME, MessageChannel.class);
 	}
@@ -136,6 +140,7 @@ public static MessageChannel getErrorChannel(BeanFactory beanFactory) {
 	 * @param beanFactory BeanFactory for lookup, must not be null.
 	 * @return The {@link TaskScheduler} bean whose name is "taskScheduler" if available.
 	 */
+	@Nullable
 	public static TaskScheduler getTaskScheduler(BeanFactory beanFactory) {
 		return getBeanOfType(beanFactory, TASK_SCHEDULER_BEAN_NAME, TaskScheduler.class);
 	}
@@ -156,6 +161,7 @@ public static TaskScheduler getRequiredTaskScheduler(BeanFactory beanFactory) {
 	 * @return the instance of {@link StandardEvaluationContext} bean whose name is
 	 * {@value #INTEGRATION_EVALUATION_CONTEXT_BEAN_NAME}.
 	 */
+	@Nullable
 	public static StandardEvaluationContext getEvaluationContext(BeanFactory beanFactory) {
 		return getBeanOfType(beanFactory, INTEGRATION_EVALUATION_CONTEXT_BEAN_NAME, StandardEvaluationContext.class);
 	}
@@ -166,11 +172,13 @@ public static StandardEvaluationContext getEvaluationContext(BeanFactory beanFac
 	 * {@value #INTEGRATION_SIMPLE_EVALUATION_CONTEXT_BEAN_NAME}.
 	 * @since 4.3.15
 	 */
+	@Nullable
 	public static SimpleEvaluationContext getSimpleEvaluationContext(BeanFactory beanFactory) {
 		return getBeanOfType(beanFactory, INTEGRATION_SIMPLE_EVALUATION_CONTEXT_BEAN_NAME,
 				SimpleEvaluationContext.class);
 	}
 
+	@Nullable
 	private static <T> T getBeanOfType(BeanFactory beanFactory, String beanName, Class<T> type) {
 		Assert.notNull(beanFactory, "BeanFactory must not be null");
 		if (!beanFactory.containsBean(beanName)) {

spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationObjectSupport.java

@@ -18,6 +18,8 @@
 
 import java.util.UUID;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.aop.framework.AopProxyUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
@@ -37,7 +39,6 @@
 import org.springframework.integration.support.channel.ChannelResolverUtils;
 import org.springframework.integration.support.context.NamedComponent;
 import org.springframework.integration.support.utils.IntegrationUtils;
-import org.springframework.lang.Nullable;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.core.DestinationResolver;
 import org.springframework.scheduling.TaskScheduler;
@@ -71,38 +72,50 @@ public abstract class IntegrationObjectSupport implements ComponentSourceAware,
 
 	protected final LogAccessor logger = new LogAccessor(getClass()); // NOSONAR protected
 
+	@SuppressWarnings("NullAway.Init")
 	private DestinationResolver<MessageChannel> channelResolver;
 
+	@SuppressWarnings("NullAway.Init")
 	private String beanName;
 
+	@Nullable
 	private String componentName;
 
+	@SuppressWarnings("NullAway.Init")
 	private BeanFactory beanFactory;
 
+	@Nullable
 	private TaskScheduler taskScheduler;
 
 	private IntegrationProperties integrationProperties = new IntegrationProperties();
 
+	@Nullable
 	private ConversionService conversionService;
 
+	@SuppressWarnings("NullAway.Init")
 	private ApplicationContext applicationContext;
 
+	@SuppressWarnings("NullAway.Init")
 	private MessageBuilderFactory messageBuilderFactory;
 
+	@Nullable
 	private Expression expression;
 
+	@Nullable
 	private Object beanSource;
 
+	@Nullable
 	private String beanDescription;
 
 	private boolean initialized;
 
 	@Override
-	public final void setBeanName(@Nullable String beanName) {
+	public final void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
 
 	@Override
+	@Nullable
 	public String getBeanName() {
 		return this.beanName;
 	}
@@ -112,6 +125,7 @@ public String getBeanName() {
 	 * If {@link #componentName} was not set this method will default to the 'beanName' of this component;
 	 */
 	@Override
+	@Nullable
 	public String getComponentName() {
 		return StringUtils.hasText(this.componentName) ? this.componentName : this.beanName;
 	}
@@ -127,6 +141,7 @@ public void setComponentName(String componentName) {
 	/**
 	 * Subclasses may implement this method to provide component type information.
 	 */
+	@Nullable
 	@Override
 	public String getComponentType() {
 		return null;
@@ -194,6 +209,7 @@ public void setChannelResolver(DestinationResolver<MessageChannel> channelResolv
 	}
 
 	@Override
+	@Nullable
 	public Expression getExpression() {
 		return this.expression;
 	}
@@ -207,6 +223,7 @@ public final void setPrimaryExpression(Expression expression) {
 		this.expression = expression;
 	}
 
+	@SuppressWarnings("NullAway.Init")
 	@Override
 	public final void afterPropertiesSet() {
 		this.integrationProperties = IntegrationContextUtils.getIntegrationProperties(this.beanFactory);
@@ -263,6 +280,7 @@ public void setTaskScheduler(TaskScheduler taskScheduler) {
 		this.taskScheduler = taskScheduler;
 	}
 
+	@Nullable
 	protected TaskScheduler getTaskScheduler() {
 		if (this.taskScheduler == null && this.beanFactory != null) {
 			this.taskScheduler = IntegrationContextUtils.getTaskScheduler(this.beanFactory);
@@ -277,6 +295,7 @@ protected DestinationResolver<MessageChannel> getChannelResolver() {
 		return this.channelResolver;
 	}
 
+	@Nullable
 	public ConversionService getConversionService() {
 		if (this.conversionService == null && this.beanFactory != null) {
 			this.conversionService = IntegrationUtils.getConversionService(this.beanFactory);
@@ -298,6 +317,7 @@ public void setConversionService(ConversionService conversionService) {
 	 * {@link ApplicationContext} is available.
 	 * @return The id, or null if there is no application context.
 	 */
+	@Nullable
 	public String getApplicationContextId() {
 		return this.applicationContext == null ? null : this.applicationContext.getId();
 	}

spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2024 the original author or authors.
+ * Copyright 2014-2025 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.
@@ -19,6 +19,8 @@
 import java.util.Arrays;
 import java.util.Properties;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.integration.JavaUtils;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
@@ -139,6 +141,7 @@ public final class IntegrationProperties {
 
 	private long endpointsDefaultTimeout = IntegrationContextUtils.DEFAULT_TIMEOUT;
 
+	@Nullable
 	private volatile Properties properties;
 
 	static {

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

@@ -1,4 +1,5 @@
 /**
  * Provides classes relating to application context configuration.
  */
+@org.jspecify.annotations.NullMarked
 package org.springframework.integration.context;