Add nullability annotations to module/spring-boot-actuator-autoconfigure

See gh-46587

Author: mhalbritter

module/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/OnEndpointElementCondition.java

@@ -18,13 +18,16 @@
 
 import java.lang.annotation.Annotation;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.boot.autoconfigure.condition.ConditionMessage;
 import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
 import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
 import org.springframework.context.annotation.ConditionContext;
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.env.Environment;
 import org.springframework.core.type.AnnotatedTypeMetadata;
+import org.springframework.util.Assert;
 
 /**
  * Base endpoint element condition. An element can be disabled globally through the
@@ -49,6 +52,7 @@ protected OnEndpointElementCondition(String prefix, Class<? extends Annotation>
 	public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) {
 		AnnotationAttributes annotationAttributes = AnnotationAttributes
 			.fromMap(metadata.getAnnotationAttributes(this.annotationType.getName()));
+		Assert.state(annotationAttributes != null, "'annotationAttributes' must not be null");
 		String endpointName = annotationAttributes.getString("value");
 		ConditionOutcome outcome = getEndpointOutcome(context, endpointName);
 		if (outcome != null) {
@@ -57,7 +61,7 @@ public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeM
 		return getDefaultOutcome(context, annotationAttributes);
 	}
 
-	protected ConditionOutcome getEndpointOutcome(ConditionContext context, String endpointName) {
+	protected @Nullable ConditionOutcome getEndpointOutcome(ConditionContext context, String endpointName) {
 		Environment environment = context.getEnvironment();
 		String enabledProperty = this.prefix + endpointName + ".enabled";
 		if (environment.containsProperty(enabledProperty)) {

module/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/audit/package-info.java

@@ -17,4 +17,7 @@
 /**
  * Auto-configuration for actuator audit concerns.
  */
+@NullMarked
 package org.springframework.boot.actuate.autoconfigure.audit;
+
+import org.jspecify.annotations.NullMarked;

module/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/availability/AvailabilityProbesAutoConfiguration.java

@@ -16,6 +16,8 @@
 
 package org.springframework.boot.actuate.autoconfigure.availability;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.boot.actuate.availability.LivenessStateHealthIndicator;
 import org.springframework.boot.actuate.availability.ReadinessStateHealthIndicator;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -99,7 +101,7 @@ public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeM
 			return ConditionOutcome.noMatch(message.because("not running on a supported cloud platform"));
 		}
 
-		private ConditionOutcome onProperty(Environment environment, ConditionMessage.Builder message,
+		private @Nullable ConditionOutcome onProperty(Environment environment, ConditionMessage.Builder message,
 				String propertyName) {
 			String enabled = environment.getProperty(propertyName);
 			if (enabled != null) {

module/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/availability/AvailabilityProbesHealthEndpointGroup.java

@@ -20,6 +20,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.boot.actuate.endpoint.SecurityContext;
 import org.springframework.boot.actuate.health.AdditionalHealthEndpointPath;
 import org.springframework.boot.actuate.health.HealthEndpointGroup;
@@ -36,9 +38,9 @@ class AvailabilityProbesHealthEndpointGroup implements HealthEndpointGroup {
 
 	private final Set<String> members;
 
-	private final AdditionalHealthEndpointPath additionalPath;
+	private final @Nullable AdditionalHealthEndpointPath additionalPath;
 
-	AvailabilityProbesHealthEndpointGroup(AdditionalHealthEndpointPath additionalPath, String... members) {
+	AvailabilityProbesHealthEndpointGroup(@Nullable AdditionalHealthEndpointPath additionalPath, String... members) {
 		this.members = new HashSet<>(Arrays.asList(members));
 		this.additionalPath = additionalPath;
 	}
@@ -69,7 +71,7 @@ public HttpCodeStatusMapper getHttpCodeStatusMapper() {
 	}
 
 	@Override
-	public AdditionalHealthEndpointPath getAdditionalPath() {
+	public @Nullable AdditionalHealthEndpointPath getAdditionalPath() {
 		return this.additionalPath;
 	}
 

module/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/availability/AvailabilityProbesHealthEndpointGroups.java

@@ -25,6 +25,8 @@
 import java.util.Objects;
 import java.util.Set;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.boot.actuate.endpoint.EndpointId;
 import org.springframework.boot.actuate.endpoint.web.AdditionalPathsMapper;
 import org.springframework.boot.actuate.endpoint.web.WebServerNamespace;
@@ -101,7 +103,7 @@ public Set<String> getNames() {
 	}
 
 	@Override
-	public HealthEndpointGroup get(String name) {
+	public @Nullable HealthEndpointGroup get(String name) {
 		HealthEndpointGroup group = this.groups.get(name);
 		if (group == null || isProbeGroup(name)) {
 			group = this.probeGroups.get(name);
@@ -114,7 +116,7 @@ private boolean isProbeGroup(String name) {
 	}
 
 	@Override
-	public List<String> getAdditionalPaths(EndpointId endpointId, WebServerNamespace webServerNamespace) {
+	public @Nullable List<String> getAdditionalPaths(EndpointId endpointId, WebServerNamespace webServerNamespace) {
 		if (!HealthEndpoint.ID.equals(endpointId)) {
 			return null;
 		}

module/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/availability/package-info.java

@@ -18,4 +18,7 @@
  * Auto-configuration that extends health endpoints so that they can be used as
  * availability probes.
  */
+@NullMarked
 package org.springframework.boot.actuate.autoconfigure.availability;
+
+import org.jspecify.annotations.NullMarked;

module/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/beans/package-info.java

@@ -17,4 +17,7 @@
 /**
  * Auto-configuration for actuator Spring Bean concerns.
  */
+@NullMarked
 package org.springframework.boot.actuate.autoconfigure.beans;
+
+import org.jspecify.annotations.NullMarked;

module/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/condition/ConditionsReportEndpoint.java

@@ -26,6 +26,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.jspecify.annotations.Nullable;
 
 import org.springframework.boot.actuate.endpoint.OperationResponseBody;
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
@@ -71,7 +72,7 @@ public ConditionsDescriptor conditions() {
 		return new ConditionsDescriptor(contextConditionEvaluations);
 	}
 
-	private ConfigurableApplicationContext getConfigurableParent(ConfigurableApplicationContext context) {
+	private @Nullable ConfigurableApplicationContext getConfigurableParent(ConfigurableApplicationContext context) {
 		ApplicationContext parent = context.getParent();
 		if (parent instanceof ConfigurableApplicationContext configurableParent) {
 			return configurableParent;
@@ -111,7 +112,7 @@ public static final class ContextConditionsDescriptor {
 
 		private final Set<String> unconditionalClasses;
 
-		private final String parentId;
+		private final @Nullable String parentId;
 
 		public ContextConditionsDescriptor(ConfigurableApplicationContext context) {
 			ConditionEvaluationReport report = ConditionEvaluationReport.get(context.getBeanFactory());
@@ -150,7 +151,7 @@ public Set<String> getUnconditionalClasses() {
 			return this.unconditionalClasses;
 		}
 
-		public String getParentId() {
+		public @Nullable String getParentId() {
 			return this.parentId;
 		}
 

module/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/condition/package-info.java

@@ -17,4 +17,7 @@
 /**
  * Auto-configuration for actuator condition concerns.
  */
+@NullMarked
 package org.springframework.boot.actuate.autoconfigure.condition;
+
+import org.jspecify.annotations.NullMarked;

module/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/context/package-info.java

@@ -17,4 +17,7 @@
 /**
  * Auto-configuration for actuator Spring Context concerns.
  */
+@NullMarked
 package org.springframework.boot.actuate.autoconfigure.context;
+
+import org.jspecify.annotations.NullMarked;