Improve null-safety of module/spring-boot-actuator-autoconfigure

See spring-projectsgh-46587

Author: mhalbritter

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

@@ -122,7 +122,11 @@ private boolean isProbeGroup(String name) {
 		}
 		List<String> additionalPaths = new ArrayList<>();
 		if (this.groups instanceof AdditionalPathsMapper additionalPathsMapper) {
-			additionalPaths.addAll(additionalPathsMapper.getAdditionalPaths(endpointId, webServerNamespace));
+			List<String> mappedAdditionalPaths = getAdditionalPaths(endpointId, webServerNamespace,
+					additionalPathsMapper);
+			if (mappedAdditionalPaths != null) {
+				additionalPaths.addAll(mappedAdditionalPaths);
+			}
 		}
 		additionalPaths.addAll(this.probeGroups.values()
 			.stream()
@@ -134,4 +138,9 @@ private boolean isProbeGroup(String name) {
 		return additionalPaths;
 	}
 
+	private static @Nullable List<String> getAdditionalPaths(EndpointId endpointId,
+			WebServerNamespace webServerNamespace, AdditionalPathsMapper additionalPathsMapper) {
+		return additionalPathsMapper.getAdditionalPaths(endpointId, webServerNamespace);
+	}
+
 }

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

@@ -63,7 +63,7 @@ public ConditionsReportEndpoint(ConfigurableApplicationContext context) {
 
 	@ReadOperation
 	public ConditionsDescriptor conditions() {
-		Map<String, ContextConditionsDescriptor> contextConditionEvaluations = new HashMap<>();
+		Map<@Nullable String, ContextConditionsDescriptor> contextConditionEvaluations = new HashMap<>();
 		ConfigurableApplicationContext target = this.context;
 		while (target != null) {
 			contextConditionEvaluations.put(target.getId(), new ContextConditionsDescriptor(target));
@@ -85,13 +85,13 @@ public ConditionsDescriptor conditions() {
 	 */
 	public static final class ConditionsDescriptor implements OperationResponseBody {
 
-		private final Map<String, ContextConditionsDescriptor> contexts;
+		private final Map<@Nullable String, ContextConditionsDescriptor> contexts;
 
-		private ConditionsDescriptor(Map<String, ContextConditionsDescriptor> contexts) {
+		private ConditionsDescriptor(Map<@Nullable String, ContextConditionsDescriptor> contexts) {
 			this.contexts = contexts;
 		}
 
-		public Map<String, ContextConditionsDescriptor> getContexts() {
+		public Map<@Nullable String, ContextConditionsDescriptor> getContexts() {
 			return this.contexts;
 		}
 

module/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ChildManagementContextInitializer.java

@@ -85,32 +85,35 @@ public void start() {
 		if (!(this.parentContext instanceof WebServerApplicationContext)) {
 			return;
 		}
-		if (this.managementContext == null) {
-			ConfigurableApplicationContext managementContext = createManagementContext();
+		ConfigurableApplicationContext managementContext = this.managementContext;
+		if (managementContext == null) {
+			managementContext = createManagementContext();
 			registerBeans(managementContext);
 			managementContext.refresh();
 			this.managementContext = managementContext;
 		}
 		else {
-			this.managementContext.start();
+			managementContext.start();
 		}
 	}
 
 	@Override
 	public void stop() {
-		if (this.managementContext != null) {
+		ConfigurableApplicationContext managementContext = this.managementContext;
+		if (managementContext != null) {
 			if (this.parentContext.isClosed()) {
-				this.managementContext.close();
+				managementContext.close();
 			}
 			else {
-				this.managementContext.stop();
+				managementContext.stop();
 			}
 		}
 	}
 
 	@Override
 	public boolean isRunning() {
-		return this.managementContext != null && this.managementContext.isRunning();
+		ConfigurableApplicationContext managementContext = this.managementContext;
+		return managementContext != null && managementContext.isRunning();
 	}
 
 	@Override