Nullability refinements

See gh-26462

Author: jhoeller

spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java

@@ -284,6 +284,7 @@ protected Set<String> doGetActiveProfiles() {
  * @since 5.3.4
  * @see #ACTIVE_PROFILES_PROPERTY_NAME
  */
+@Nullable
 protected String doGetActiveProfilesProperty() {
 return getProperty(ACTIVE_PROFILES_PROPERTY_NAME);
 }
@@ -350,6 +351,7 @@ protected Set<String> doGetDefaultProfiles() {
  * @since 5.3.4
  * @see #DEFAULT_PROFILES_PROPERTY_NAME
  */
+@Nullable
 protected String doGetDefaultProfilesProperty() {
 return getProperty(DEFAULT_PROFILES_PROPERTY_NAME);
 }

spring-core/src/test/java/org/springframework/core/env/CustomEnvironmentTests.java

@@ -24,6 +24,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.lang.Nullable;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -34,8 +36,6 @@
  */
 class CustomEnvironmentTests {
 
-// -- tests relating to customizing reserved default profiles ----------------------
-
 @Test
 void control() {
 Environment env = new AbstractEnvironment() { };
@@ -111,11 +111,12 @@ protected Set<String> getReservedDefaultProfiles() {
 public void withNoProfileProperties() {
 ConfigurableEnvironment env = new AbstractEnvironment() {
 @Override
+@Nullable
 protected String doGetActiveProfilesProperty() {
 return null;
 }
-
 @Override
+@Nullable
 protected String doGetDefaultProfilesProperty() {
 return null;
 }
@@ -140,23 +141,23 @@ class CustomMutablePropertySources extends MutablePropertySources {}
 @Test
 void withCustomPropertyResolver() {
 class CustomPropertySourcesPropertyResolver extends PropertySourcesPropertyResolver {
-public CustomPropertySourcesPropertyResolver(
-PropertySources propertySources) {
+public CustomPropertySourcesPropertyResolver(PropertySources propertySources) {
 super(propertySources);
 }
-
 @Override
+@Nullable
 public String getProperty(String key) {
 return super.getProperty(key)+"-test";
 }
 }
+
 ConfigurableEnvironment env = new AbstractEnvironment() {
 @Override
-protected ConfigurablePropertyResolver createPropertyResolver(
-MutablePropertySources propertySources) {
+protected ConfigurablePropertyResolver createPropertyResolver(MutablePropertySources propertySources) {
 return new CustomPropertySourcesPropertyResolver(propertySources);
 }
 };
+
 Map<String, Object> values = new LinkedHashMap<>();
 values.put("spring", "framework");
 PropertySource<?> propertySource = new MapPropertySource("test", values);
@@ -168,6 +169,4 @@ private Profiles defaultProfile() {
 return Profiles.of(AbstractEnvironment.RESERVED_DEFAULT_PROFILE_NAME);
 }
 
-
-// -- tests relating to customizing property sources -------------------------------
 }