Improve null-safety of core/spring-boot

mhalbritter · mhalbritter · commit aac1845cacf3 · 2025-09-18T11:35:52.000+02:00
See gh-46926
diff --git a/core/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesScanRegistrar.java b/core/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesScanRegistrar.java
@@ -20,6 +20,8 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
@@ -50,9 +52,9 @@ class ConfigurationPropertiesScanRegistrar implements ImportBeanDefinitionRegist
 
 	private final Environment environment;
 
-	private final ResourceLoader resourceLoader;
+	private final @Nullable ResourceLoader resourceLoader;
 
-	ConfigurationPropertiesScanRegistrar(Environment environment, ResourceLoader resourceLoader) {
+	ConfigurationPropertiesScanRegistrar(Environment environment, @Nullable ResourceLoader resourceLoader) {
 		this.environment = environment;
 		this.resourceLoader = resourceLoader;
 	}
diff --git a/core/spring-boot/src/main/java/org/springframework/boot/context/properties/source/CachingConfigurationPropertySource.java b/core/spring-boot/src/main/java/org/springframework/boot/context/properties/source/CachingConfigurationPropertySource.java
@@ -38,7 +38,7 @@ interface CachingConfigurationPropertySource {
 	 * @return a {@link ConfigurationPropertyCaching} instance or {@code null} if the
 	 * source does not support caching.
 	 */
-	static @Nullable ConfigurationPropertyCaching find(ConfigurationPropertySource source) {
+	static @Nullable ConfigurationPropertyCaching find(@Nullable ConfigurationPropertySource source) {
 		if (source instanceof CachingConfigurationPropertySource cachingSource) {
 			return cachingSource.getCaching();
 		}
diff --git a/core/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationProperty.java b/core/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationProperty.java
@@ -22,6 +22,7 @@
 import org.springframework.boot.origin.OriginProvider;
 import org.springframework.boot.origin.OriginTrackedValue;
 import org.springframework.core.style.ToStringCreator;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 
@@ -124,13 +125,15 @@ public int compareTo(ConfigurationProperty other) {
 		return this.name.compareTo(other.name);
 	}
 
+	@Contract("_, !null -> !null")
 	static @Nullable ConfigurationProperty of(ConfigurationPropertyName name, @Nullable OriginTrackedValue value) {
 		if (value == null) {
 			return null;
 		}
 		return new ConfigurationProperty(name, value.getValue(), value.getOrigin());
 	}
 
+	@Contract("_, _, !null, _ -> !null")
 	static @Nullable ConfigurationProperty of(@Nullable ConfigurationPropertySource source,
 			ConfigurationPropertyName name, @Nullable Object value, @Nullable Origin origin) {
 		if (value == null) {
diff --git a/core/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertyName.java b/core/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertyName.java
@@ -210,7 +210,7 @@ public int getNumberOfElements() {
 	 * @return a new {@link ConfigurationPropertyName}
 	 * @throws InvalidConfigurationPropertyNameException if the result is not valid
 	 */
-	public ConfigurationPropertyName append(String suffix) {
+	public ConfigurationPropertyName append(@Nullable String suffix) {
 		if (!StringUtils.hasLength(suffix)) {
 			return this;
 		}
@@ -625,7 +625,7 @@ boolean hasDashedElement() {
 	 * @param name the name to test
 	 * @return {@code true} if the name is valid
 	 */
-	public static boolean isValid(CharSequence name) {
+	public static boolean isValid(@Nullable CharSequence name) {
 		return of(name, true) != null;
 	}
 
@@ -636,7 +636,7 @@ public static boolean isValid(CharSequence name) {
 	 * @throws InvalidConfigurationPropertyNameException if the name is not valid
 	 */
 	@SuppressWarnings("NullAway") // See https://github.com/uber/NullAway/issues/1232
-	public static ConfigurationPropertyName of(CharSequence name) {
+	public static ConfigurationPropertyName of(@Nullable CharSequence name) {
 		return of(name, false);
 	}
 
@@ -647,7 +647,7 @@ public static ConfigurationPropertyName of(CharSequence name) {
 	 * @return a {@link ConfigurationPropertyName} instance
 	 * @since 2.3.1
 	 */
-	public static @Nullable ConfigurationPropertyName ofIfValid(CharSequence name) {
+	public static @Nullable ConfigurationPropertyName ofIfValid(@Nullable CharSequence name) {
 		return of(name, true);
 	}
 
@@ -660,7 +660,7 @@ public static ConfigurationPropertyName of(CharSequence name) {
 	 * {@code returnNullIfInvalid} is {@code false}
 	 */
 	@Contract("_, false -> !null")
-	static @Nullable ConfigurationPropertyName of(CharSequence name, boolean returnNullIfInvalid) {
+	static @Nullable ConfigurationPropertyName of(@Nullable CharSequence name, boolean returnNullIfInvalid) {
 		Elements elements = elementsOf(name, returnNullIfInvalid, ElementsParser.DEFAULT_CAPACITY);
 		return (elements != null) ? new ConfigurationPropertyName(elements) : null;
 	}
diff --git a/core/spring-boot/src/main/java/org/springframework/boot/diagnostics/AbstractFailureAnalyzer.java b/core/spring-boot/src/main/java/org/springframework/boot/diagnostics/AbstractFailureAnalyzer.java
@@ -61,7 +61,7 @@ protected Class<? extends T> getCauseType() {
 	}
 
 	@SuppressWarnings("unchecked")
-	protected final <E extends Throwable> @Nullable E findCause(Throwable failure, Class<E> type) {
+	protected final <E extends Throwable> @Nullable E findCause(@Nullable Throwable failure, Class<E> type) {
 		while (failure != null) {
 			if (type.isInstance(failure)) {
 				return (E) failure;
diff --git a/core/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/MutuallyExclusiveConfigurationPropertiesFailureAnalyzer.java b/core/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/MutuallyExclusiveConfigurationPropertiesFailureAnalyzer.java
@@ -48,9 +48,9 @@
 class MutuallyExclusiveConfigurationPropertiesFailureAnalyzer
 		extends AbstractFailureAnalyzer<MutuallyExclusiveConfigurationPropertiesException> {
 
-	private final ConfigurableEnvironment environment;
+	private final @Nullable ConfigurableEnvironment environment;
 
-	MutuallyExclusiveConfigurationPropertiesFailureAnalyzer(Environment environment) {
+	MutuallyExclusiveConfigurationPropertiesFailureAnalyzer(@Nullable Environment environment) {
 		this.environment = (ConfigurableEnvironment) environment;
 	}
 
diff --git a/core/spring-boot/src/main/java/org/springframework/boot/json/AbstractJsonParser.java b/core/spring-boot/src/main/java/org/springframework/boot/json/AbstractJsonParser.java
@@ -34,11 +34,11 @@
  */
 public abstract class AbstractJsonParser implements JsonParser {
 
-	protected final Map<String, Object> parseMap(String json, Function<String, Map<String, Object>> parser) {
+	protected final Map<String, Object> parseMap(@Nullable String json, Function<String, Map<String, Object>> parser) {
 		return trimParse(json, "{", parser);
 	}
 
-	protected final List<Object> parseList(String json, Function<String, List<Object>> parser) {
+	protected final List<Object> parseList(@Nullable String json, Function<String, List<Object>> parser) {
 		return trimParse(json, "[", parser);
 	}
 
diff --git a/core/spring-boot/src/main/java/org/springframework/boot/json/BasicJsonParser.java b/core/spring-boot/src/main/java/org/springframework/boot/json/BasicJsonParser.java
@@ -44,12 +44,12 @@ public class BasicJsonParser extends AbstractJsonParser {
 	private static final int MAX_DEPTH = 1000;
 
 	@Override
-	public Map<String, Object> parseMap(String json) {
+	public Map<String, Object> parseMap(@Nullable String json) {
 		return tryParse(() -> parseMap(json, (jsonToParse) -> parseMapInternal(0, jsonToParse)), Exception.class);
 	}
 
 	@Override
-	public List<Object> parseList(String json) {
+	public List<Object> parseList(@Nullable String json) {
 		return tryParse(() -> parseList(json, (jsonToParse) -> parseListInternal(0, jsonToParse)), Exception.class);
 	}
 
diff --git a/core/spring-boot/src/main/java/org/springframework/boot/json/GsonJsonParser.java b/core/spring-boot/src/main/java/org/springframework/boot/json/GsonJsonParser.java
@@ -22,6 +22,7 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Thin wrapper to adapt {@link Gson} to a {@link JsonParser}.
@@ -40,13 +41,13 @@ public class GsonJsonParser extends AbstractJsonParser {
 	private final Gson gson = new GsonBuilder().create();
 
 	@Override
-	public Map<String, Object> parseMap(String json) {
+	public Map<String, Object> parseMap(@Nullable String json) {
 		return tryParse(() -> parseMap(json, (trimmed) -> this.gson.fromJson(trimmed, MAP_TYPE.getType())),
 				Exception.class);
 	}
 
 	@Override
-	public List<Object> parseList(String json) {
+	public List<Object> parseList(@Nullable String json) {
 		return tryParse(() -> parseList(json, (trimmed) -> this.gson.fromJson(trimmed, LIST_TYPE.getType())),
 				Exception.class);
 	}
diff --git a/core/spring-boot/src/main/java/org/springframework/boot/json/JacksonJsonParser.java b/core/spring-boot/src/main/java/org/springframework/boot/json/JacksonJsonParser.java
@@ -53,12 +53,12 @@ public JacksonJsonParser() {
 	}
 
 	@Override
-	public Map<String, Object> parseMap(String json) {
+	public Map<String, Object> parseMap(@Nullable String json) {
 		return tryParse(() -> getObjectMapper().readValue(json, MAP_TYPE), Exception.class);
 	}
 
 	@Override
-	public List<Object> parseList(String json) {
+	public List<Object> parseList(@Nullable String json) {
 		return tryParse(() -> getObjectMapper().readValue(json, LIST_TYPE), Exception.class);
 	}
 
diff --git a/core/spring-boot/src/main/java/org/springframework/boot/json/JsonParser.java b/core/spring-boot/src/main/java/org/springframework/boot/json/JsonParser.java
@@ -19,6 +19,8 @@
 import java.util.List;
 import java.util.Map;
 
+import org.jspecify.annotations.Nullable;
+
 /**
  * Parser that can read JSON formatted strings into {@link Map}s or {@link List}s.
  *
@@ -37,14 +39,14 @@ public interface JsonParser {
 	 * @return the parsed JSON as a map
 	 * @throws JsonParseException if the JSON cannot be parsed
 	 */
-	Map<String, Object> parseMap(String json) throws JsonParseException;
+	Map<String, Object> parseMap(@Nullable String json) throws JsonParseException;
 
 	/**
 	 * Parse the specified JSON string into a List.
 	 * @param json the JSON to parse
 	 * @return the parsed JSON as a list
 	 * @throws JsonParseException if the JSON cannot be parsed
 	 */
-	List<Object> parseList(String json) throws JsonParseException;
+	List<Object> parseList(@Nullable String json) throws JsonParseException;
 
 }
diff --git a/core/spring-boot/src/main/java/org/springframework/boot/logging/DelegatingLoggingSystemFactory.java b/core/spring-boot/src/main/java/org/springframework/boot/logging/DelegatingLoggingSystemFactory.java
@@ -28,13 +28,13 @@
  */
 class DelegatingLoggingSystemFactory implements LoggingSystemFactory {
 
-	private final @Nullable Function<ClassLoader, List<LoggingSystemFactory>> delegates;
+	private final @Nullable Function<ClassLoader, @Nullable List<LoggingSystemFactory>> delegates;
 
 	/**
 	 * Create a new {@link DelegatingLoggingSystemFactory} instance.
 	 * @param delegates a function that provides the delegates
 	 */
-	DelegatingLoggingSystemFactory(@Nullable Function<ClassLoader, List<LoggingSystemFactory>> delegates) {
+	DelegatingLoggingSystemFactory(@Nullable Function<ClassLoader, @Nullable List<LoggingSystemFactory>> delegates) {
 		this.delegates = delegates;
 	}
 
diff --git a/core/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/ColorConverter.java b/core/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/ColorConverter.java
@@ -120,7 +120,7 @@ protected void appendAnsiString(StringBuilder toAppendTo, String in, AnsiElement
 	 * @param options the options
 	 * @return a new instance, or {@code null} if the options are invalid
 	 */
-	public static @Nullable ColorConverter newInstance(Configuration config, @Nullable String[] options) {
+	public static @Nullable ColorConverter newInstance(@Nullable Configuration config, @Nullable String[] options) {
 		if (options.length < 1) {
 			LOGGER.error("Incorrect number of options on style. Expected at least 1, received {}", options.length);
 			return null;
diff --git a/core/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/EnclosedInSquareBracketsConverter.java b/core/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/EnclosedInSquareBracketsConverter.java
@@ -67,7 +67,8 @@ public void format(LogEvent event, StringBuilder toAppendTo) {
 	 * @param options the options
 	 * @return a new instance, or {@code null} if the options are invalid
 	 */
-	public static @Nullable EnclosedInSquareBracketsConverter newInstance(Configuration config, String[] options) {
+	public static @Nullable EnclosedInSquareBracketsConverter newInstance(@Nullable Configuration config,
+			String[] options) {
 		if (options.length < 1) {
 			LOGGER.error("Incorrect number of options on style. Expected at least 1, received {}", options.length);
 			return null;
diff --git a/core/spring-boot/src/main/java/org/springframework/boot/logging/logback/EnclosedInSquareBracketsConverter.java b/core/spring-boot/src/main/java/org/springframework/boot/logging/logback/EnclosedInSquareBracketsConverter.java
@@ -32,7 +32,7 @@
 public class EnclosedInSquareBracketsConverter extends CompositeConverter<ILoggingEvent> {
 
 	@Override
-	protected String transform(ILoggingEvent event, String in) {
+	protected String transform(ILoggingEvent event, @Nullable String in) {
 		in = (!StringUtils.hasLength(in)) ? resolveFromFirstOption(event) : in;
 		return (!StringUtils.hasLength(in)) ? "" : "[%s] ".formatted(in);
 	}
diff --git a/core/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystemProperties.java b/core/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystemProperties.java
@@ -68,7 +68,7 @@ public LogbackLoggingSystemProperties(Environment environment,
 	 * @since 3.2.0
 	 */
 	public LogbackLoggingSystemProperties(Environment environment,
-			Function<@Nullable String, @Nullable String> defaultValueResolver,
+			@Nullable Function<@Nullable String, @Nullable String> defaultValueResolver,
 			@Nullable BiConsumer<String, @Nullable String> setter) {
 		super(environment, defaultValueResolver, setter);
 	}
diff --git a/core/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLoggingJsonProperties.java b/core/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLoggingJsonProperties.java
@@ -56,11 +56,11 @@
  * @author Yanming Zhou
  */
 record StructuredLoggingJsonProperties(Set<String> include, Set<String> exclude, Map<String, String> rename,
-		Map<String, String> add, StackTrace stackTrace, Context context,
+		Map<String, String> add, @Nullable StackTrace stackTrace, @Nullable Context context,
 		Set<Class<? extends StructuredLoggingJsonMembersCustomizer<?>>> customizer) {
 
 	StructuredLoggingJsonProperties(Set<String> include, Set<String> exclude, Map<String, String> rename,
-			Map<String, String> add, StackTrace stackTrace, Context context,
+			Map<String, String> add, @Nullable StackTrace stackTrace, @Nullable Context context,
 			@Nullable Set<Class<? extends StructuredLoggingJsonMembersCustomizer<?>>> customizer) {
 		this.include = include;
 		this.exclude = exclude;
@@ -98,8 +98,9 @@ Collection<StructuredLoggingJsonMembersCustomizer<Object>> customizers(Instantia
 	 * @param includeCommonFrames whether common frames should be included
 	 * @param includeHashes whether stack trace hashes should be included
 	 */
-	record StackTrace(@Nullable String printer, Root root, Integer maxLength, Integer maxThrowableDepth,
-			Boolean includeCommonFrames, Boolean includeHashes) {
+	record StackTrace(@Nullable String printer, @Nullable Root root, @Nullable Integer maxLength,
+			@Nullable Integer maxThrowableDepth, @Nullable Boolean includeCommonFrames,
+			@Nullable Boolean includeHashes) {
 
 		@Nullable StackTracePrinter createPrinter() {
 			String name = sanitizePrinter();
diff --git a/core/spring-boot/src/main/java/org/springframework/boot/origin/OriginLookup.java b/core/spring-boot/src/main/java/org/springframework/boot/origin/OriginLookup.java
@@ -47,7 +47,7 @@ public interface OriginLookup<K> {
 	 * @return an {@link Origin} or {@code null}
 	 */
 	@SuppressWarnings("unchecked")
-	static <K> @Nullable Origin getOrigin(Object source, K key) {
+	static <K> @Nullable Origin getOrigin(@Nullable Object source, K key) {
 		if (!(source instanceof OriginLookup)) {
 			return null;
 		}
diff --git a/core/spring-boot/src/main/java/org/springframework/boot/ssl/jks/JksSslStoreDetails.java b/core/spring-boot/src/main/java/org/springframework/boot/ssl/jks/JksSslStoreDetails.java
@@ -61,7 +61,7 @@ private boolean isEmpty(@Nullable String value) {
 	 * @param location the location
 	 * @return a new {@link JksSslStoreDetails} instance.
 	 */
-	public static JksSslStoreDetails forLocation(String location) {
+	public static JksSslStoreDetails forLocation(@Nullable String location) {
 		return new JksSslStoreDetails(null, null, location, null);
 	}
 
diff --git a/core/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemSslStore.java b/core/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemSslStore.java
@@ -78,7 +78,9 @@ public interface PemSslStore {
 	 * @return a new {@link PemSslStore} instance
 	 */
 	default PemSslStore withAlias(@Nullable String alias) {
-		return of(type(), alias, password(), certificates(), privateKey());
+		List<X509Certificate> certificates = certificates();
+		Assert.notNull(certificates, "'certificates' must not be null");
+		return of(type(), alias, password(), certificates, privateKey());
 	}
 
 	/**
@@ -87,7 +89,9 @@ default PemSslStore withAlias(@Nullable String alias) {
 	 * @return a new {@link PemSslStore} instance
 	 */
 	default PemSslStore withPassword(@Nullable String password) {
-		return of(type(), alias(), password, certificates(), privateKey());
+		List<X509Certificate> certificates = certificates();
+		Assert.notNull(certificates, "'certificates' must not be null");
+		return of(type(), alias(), password, certificates, privateKey());
 	}
 
 	/**
@@ -123,7 +127,7 @@ default PemSslStore withPassword(@Nullable String password) {
 	 * @param privateKey the private key
 	 * @return a new {@link PemSslStore} instance
 	 */
-	static PemSslStore of(String type, List<X509Certificate> certificates, PrivateKey privateKey) {
+	static PemSslStore of(@Nullable String type, List<X509Certificate> certificates, @Nullable PrivateKey privateKey) {
 		return of(type, null, null, certificates, privateKey);
 	}
 
@@ -134,7 +138,7 @@ static PemSslStore of(String type, List<X509Certificate> certificates, PrivateKe
 	 * @param privateKey the private key
 	 * @return a new {@link PemSslStore} instance
 	 */
-	static PemSslStore of(List<X509Certificate> certificates, PrivateKey privateKey) {
+	static PemSslStore of(List<X509Certificate> certificates, @Nullable PrivateKey privateKey) {
 		return of(null, null, null, certificates, privateKey);
 	}
 
@@ -151,7 +155,7 @@ static PemSslStore of(List<X509Certificate> certificates, PrivateKey privateKey)
 	 * @return a new {@link PemSslStore} instance
 	 */
 	static PemSslStore of(@Nullable String type, @Nullable String alias, @Nullable String password,
-			@Nullable List<X509Certificate> certificates, @Nullable PrivateKey privateKey) {
+			List<X509Certificate> certificates, @Nullable PrivateKey privateKey) {
 		Assert.notEmpty(certificates, "'certificates' must not be empty");
 		return new PemSslStore() {
 
diff --git a/core/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemSslStoreDetails.java b/core/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemSslStoreDetails.java
@@ -151,7 +151,7 @@ private boolean isEmpty(@Nullable String value) {
 	 * reference to the resource to load)
 	 * @return a new {@link PemSslStoreDetails} instance.
 	 */
-	public static PemSslStoreDetails forCertificate(String certificate) {
+	public static PemSslStoreDetails forCertificate(@Nullable String certificate) {
 		return forCertificates(certificate);
 	}
 
@@ -163,7 +163,7 @@ public static PemSslStoreDetails forCertificate(String certificate) {
 	 * @return a new {@link PemSslStoreDetails} instance.
 	 * @since 3.2.0
 	 */
-	public static PemSslStoreDetails forCertificates(String certificates) {
+	public static PemSslStoreDetails forCertificates(@Nullable String certificates) {
 		return new PemSslStoreDetails(null, certificates, null);
 	}
 
diff --git a/core/spring-boot/src/main/java/org/springframework/boot/system/ApplicationPid.java b/core/spring-boot/src/main/java/org/springframework/boot/system/ApplicationPid.java
@@ -46,7 +46,7 @@ public ApplicationPid() {
 		this.pid = currentProcessPid();
 	}
 
-	protected ApplicationPid(Long pid) {
+	protected ApplicationPid(@Nullable Long pid) {
 		this.pid = pid;
 	}
 
diff --git a/core/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializer.java b/core/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializer.java

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ interface CachingConfigurationPropertySource {`
`38`	`38`	`* @return a {@link ConfigurationPropertyCaching} instance or {@code null} if the`
`39`	`39`	`* source does not support caching.`
`40`	`40`	`*/`
`41`		`- static @Nullable ConfigurationPropertyCaching find(ConfigurationPropertySource source) {`
	`41`	`+ static @Nullable ConfigurationPropertyCaching find(@Nullable ConfigurationPropertySource source) {`
`42`	`42`	`if (source instanceof CachingConfigurationPropertySource cachingSource) {`
`43`	`43`	`return cachingSource.getCaching();`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ protected Class<? extends T> getCauseType() {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`@SuppressWarnings("unchecked")`
`64`		`- protected final <E extends Throwable> @Nullable E findCause(Throwable failure, Class<E> type) {`
	`64`	`+ protected final <E extends Throwable> @Nullable E findCause(@Nullable Throwable failure, Class<E> type) {`
`65`	`65`	`while (failure != null) {`
`66`	`66`	`if (type.isInstance(failure)) {`
`67`	`67`	`return (E) failure;`
Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,9 @@`
`48`	`48`	`class MutuallyExclusiveConfigurationPropertiesFailureAnalyzer`
`49`	`49`	`extends AbstractFailureAnalyzer<MutuallyExclusiveConfigurationPropertiesException> {`
`50`	`50`
`51`		`- private final ConfigurableEnvironment environment;`
	`51`	`+ private final @Nullable ConfigurableEnvironment environment;`
`52`	`52`
`53`		`- MutuallyExclusiveConfigurationPropertiesFailureAnalyzer(Environment environment) {`
	`53`	`+ MutuallyExclusiveConfigurationPropertiesFailureAnalyzer(@Nullable Environment environment) {`
`54`	`54`	`this.environment = (ConfigurableEnvironment) environment;`
`55`	`55`	`}`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -34,11 +34,11 @@`
`34`	`34`	`*/`
`35`	`35`	`public abstract class AbstractJsonParser implements JsonParser {`
`36`	`36`
`37`		`- protected final Map<String, Object> parseMap(String json, Function<String, Map<String, Object>> parser) {`
	`37`	`+ protected final Map<String, Object> parseMap(@Nullable String json, Function<String, Map<String, Object>> parser) {`
`38`	`38`	`return trimParse(json, "{", parser);`
`39`	`39`	`}`
`40`	`40`
`41`		`- protected final List<Object> parseList(String json, Function<String, List<Object>> parser) {`
	`41`	`+ protected final List<Object> parseList(@Nullable String json, Function<String, List<Object>> parser) {`
`42`	`42`	`return trimParse(json, "[", parser);`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -44,12 +44,12 @@ public class BasicJsonParser extends AbstractJsonParser {`
`44`	`44`	`private static final int MAX_DEPTH = 1000;`
`45`	`45`
`46`	`46`	`@Override`
`47`		`- public Map<String, Object> parseMap(String json) {`
	`47`	`+ public Map<String, Object> parseMap(@Nullable String json) {`
`48`	`48`	`return tryParse(() -> parseMap(json, (jsonToParse) -> parseMapInternal(0, jsonToParse)), Exception.class);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`@Override`
`52`		`- public List<Object> parseList(String json) {`
	`52`	`+ public List<Object> parseList(@Nullable String json) {`
`53`	`53`	`return tryParse(() -> parseList(json, (jsonToParse) -> parseListInternal(0, jsonToParse)), Exception.class);`
`54`	`54`	`}`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -53,12 +53,12 @@ public JacksonJsonParser() {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`@Override`
`56`		`- public Map<String, Object> parseMap(String json) {`
	`56`	`+ public Map<String, Object> parseMap(@Nullable String json) {`
`57`	`57`	`return tryParse(() -> getObjectMapper().readValue(json, MAP_TYPE), Exception.class);`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`@Override`
`61`		`- public List<Object> parseList(String json) {`
	`61`	`+ public List<Object> parseList(@Nullable String json) {`
`62`	`62`	`return tryParse(() -> getObjectMapper().readValue(json, LIST_TYPE), Exception.class);`
`63`	`63`	`}`
`64`	`64`