Enables jspecify

Author: spencergibb

.mvn/maven.config

@@ -1 +1,2 @@
--DaltSnapshotDeploymentRepository=repo.spring.io::default::https://repo.spring.io/libs-snapshot-local -P spring
+-Djspecify.enabled=true
+-P spring

spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/ConfigurationPropertiesRebinderAutoConfiguration.java

@@ -24,7 +24,6 @@
 import org.springframework.cloud.context.properties.ConfigurationPropertiesBeans;
 import org.springframework.cloud.context.properties.ConfigurationPropertiesRebinder;
 import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -35,14 +34,12 @@
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnBean(ConfigurationPropertiesBindingPostProcessor.class)
-public class ConfigurationPropertiesRebinderAutoConfiguration
-		implements ApplicationContextAware, SmartInitializingSingleton {
+public class ConfigurationPropertiesRebinderAutoConfiguration implements SmartInitializingSingleton {
 
-	private ApplicationContext context;
+	private final ApplicationContext context;
 
-	@Override
-	public void setApplicationContext(ApplicationContext applicationContext) {
-		this.context = applicationContext;
+	public ConfigurationPropertiesRebinderAutoConfiguration(ApplicationContext context) {
+		this.context = context;
 	}
 
 	@Bean

spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java

@@ -16,10 +16,13 @@
 
 package org.springframework.cloud.autoconfigure;
 
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.aop.scope.ScopedProxyUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
@@ -133,7 +136,7 @@ public static class RefreshProperties {
 		 * property sources are retained. This property allows property sources, such as
 		 * property sources created by EnvironmentPostProcessors to be retained as well.
 		 */
-		private List<String> additionalPropertySourcesToRetain;
+		private List<String> additionalPropertySourcesToRetain = new ArrayList<>();
 
 		public List<String> getAdditionalPropertySourcesToRetain() {
 			return this.additionalPropertySourcesToRetain;
@@ -157,7 +160,7 @@ public String toString() {
 	protected static class RefreshScopeBeanDefinitionEnhancer
 			implements BeanDefinitionRegistryPostProcessor, EnvironmentAware {
 
-		private Environment environment;
+		private @Nullable Environment environment;
 
 		private boolean bound = false;
 

spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapApplicationListener.java

@@ -27,6 +27,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.boot.Banner.Mode;
 import org.springframework.boot.SpringApplication;
@@ -118,19 +120,24 @@ public void onApplicationEvent(ApplicationEnvironmentPreparedEvent event) {
 		apply(context, event.getSpringApplication(), environment);
 	}
 
-	private ConfigurableApplicationContext findBootstrapContext(ParentContextApplicationContextInitializer initializer,
-			String configName) {
+	private @Nullable ConfigurableApplicationContext findBootstrapContext(
+			ParentContextApplicationContextInitializer initializer, String configName) {
+		ConfigurableApplicationContext parent = null;
 		Field field = ReflectionUtils.findField(ParentContextApplicationContextInitializer.class, "parent");
-		ReflectionUtils.makeAccessible(field);
-		ConfigurableApplicationContext parent = safeCast(ConfigurableApplicationContext.class,
-				ReflectionUtils.getField(field, initializer));
-		if (parent != null && !configName.equals(parent.getId())) {
-			parent = safeCast(ConfigurableApplicationContext.class, parent.getParent());
+		if (field != null) {
+			ReflectionUtils.makeAccessible(field);
+			Object value = ReflectionUtils.getField(field, initializer);
+			if (value != null) {
+				parent = safeCast(ConfigurableApplicationContext.class, value);
+			}
+			if (parent != null && !configName.equals(parent.getId()) && parent.getParent() != null) {
+				parent = safeCast(ConfigurableApplicationContext.class, parent.getParent());
+			}
 		}
 		return parent;
 	}
 
-	private <T> T safeCast(Class<T> type, Object object) {
+	private <T> @Nullable T safeCast(Class<T> type, Object object) {
 		try {
 			return type.cast(object);
 		}
@@ -177,7 +184,7 @@ private ConfigurableApplicationContext bootstrapServiceContext(ConfigurableEnvir
 			.logStartupInfo(false)
 			.web(WebApplicationType.NONE);
 		final SpringApplication builderApplication = builder.application();
-		if (builderApplication.getMainApplicationClass() == null) {
+		if (builderApplication.getMainApplicationClass() == null && application.getMainApplicationClass() != null) {
 			// gh_425:
 			// SpringApplication cannot deduce the MainApplicationClass here
 			// if it is booted from SpringBootServletInitializer due to the
@@ -225,7 +232,7 @@ private void mergeDefaultProperties(MutablePropertySources environment, MutableP
 		String name = DEFAULT_PROPERTIES;
 		if (bootstrap.contains(name)) {
 			PropertySource<?> source = bootstrap.get(name);
-			if (!environment.contains(name)) {
+			if (!environment.contains(name) && source != null) {
 				environment.addLast(source);
 			}
 			else {
@@ -246,6 +253,9 @@ private void mergeDefaultProperties(MutablePropertySources environment, MutableP
 
 	private void mergeAdditionalPropertySources(MutablePropertySources environment, MutablePropertySources bootstrap) {
 		PropertySource<?> defaultProperties = environment.get(DEFAULT_PROPERTIES);
+		if (defaultProperties == null) {
+			defaultProperties = new MapPropertySource(DEFAULT_PROPERTIES, new LinkedHashMap<>());
+		}
 		ExtendedDefaultPropertySource result = defaultProperties instanceof ExtendedDefaultPropertySource
 				? (ExtendedDefaultPropertySource) defaultProperties
 				: new ExtendedDefaultPropertySource(DEFAULT_PROPERTIES, defaultProperties);
@@ -456,7 +466,7 @@ public void add(PropertySource<?> source) {
 		}
 
 		@Override
-		public Object getProperty(String name) {
+		public @Nullable Object getProperty(String name) {
 			if (this.sources.containsProperty(name)) {
 				return this.sources.getProperty(name);
 			}
@@ -480,7 +490,7 @@ public String[] getPropertyNames() {
 		}
 
 		@Override
-		public Origin getOrigin(String name) {
+		public @Nullable Origin getOrigin(String name) {
 			return this.sources.getOrigin(name);
 		}