Skip to content

Commit c53ea0a

Browse files
committed
Relocate DefaultPropertiesPropertySource to env
Move `DefaultPropertiesPropertySource` from `org.springframework.boot` to `org.springframework.boot.env` since it's not directly tied to `SpringApplication`. See gh-47232
1 parent 6c84674 commit c53ea0a

File tree

6 files changed

+6
-4
lines changed

6 files changed

+6
-4
lines changed

core/spring-boot-test/src/main/java/org/springframework/boot/test/context/ConfigDataApplicationContextInitializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616

1717
package org.springframework.boot.test.context;
1818

19-
import org.springframework.boot.DefaultPropertiesPropertySource;
2019
import org.springframework.boot.bootstrap.DefaultBootstrapContext;
2120
import org.springframework.boot.context.config.ConfigData;
2221
import org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessor;
22+
import org.springframework.boot.env.DefaultPropertiesPropertySource;
2323
import org.springframework.boot.env.RandomValuePropertySource;
2424
import org.springframework.context.ApplicationContextInitializer;
2525
import org.springframework.context.ConfigurableApplicationContext;

core/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
import org.springframework.boot.context.properties.bind.Binder;
6666
import org.springframework.boot.context.properties.source.ConfigurationPropertySources;
6767
import org.springframework.boot.convert.ApplicationConversionService;
68+
import org.springframework.boot.env.DefaultPropertiesPropertySource;
6869
import org.springframework.context.ApplicationContext;
6970
import org.springframework.context.ApplicationContextInitializer;
7071
import org.springframework.context.ApplicationListener;

core/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.apache.commons.logging.Log;
2727
import org.jspecify.annotations.Nullable;
2828

29-
import org.springframework.boot.DefaultPropertiesPropertySource;
3029
import org.springframework.boot.bootstrap.BootstrapRegistry.InstanceSupplier;
3130
import org.springframework.boot.bootstrap.BootstrapRegistry.Scope;
3231
import org.springframework.boot.bootstrap.ConfigurableBootstrapContext;
@@ -36,6 +35,7 @@
3635
import org.springframework.boot.context.properties.bind.Binder;
3736
import org.springframework.boot.context.properties.bind.PlaceholdersResolver;
3837
import org.springframework.boot.context.properties.source.ConfigurationPropertySource;
38+
import org.springframework.boot.env.DefaultPropertiesPropertySource;
3939
import org.springframework.boot.logging.DeferredLogFactory;
4040
import org.springframework.core.env.ConfigurableEnvironment;
4141
import org.springframework.core.env.Environment;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot;
17+
package org.springframework.boot.env;
1818

1919
import java.util.HashMap;
2020
import java.util.Map;

core/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
import org.springframework.boot.context.event.ApplicationStartingEvent;
7272
import org.springframework.boot.context.event.SpringApplicationEvent;
7373
import org.springframework.boot.convert.ApplicationConversionService;
74+
import org.springframework.boot.env.DefaultPropertiesPropertySource;
7475
import org.springframework.boot.testsupport.classpath.ForkedClassPath;
7576
import org.springframework.boot.testsupport.classpath.resources.WithResource;
7677
import org.springframework.boot.testsupport.system.CapturedOutput;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot;
17+
package org.springframework.boot.env;
1818

1919
import java.util.Collections;
2020
import java.util.function.Consumer;

0 commit comments

Comments
 (0)