From 0df37302af77c37a7d60da4b1fea0d9c9f4d2fd2 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Mon, 21 Sep 2020 15:31:46 -0700
Subject: [PATCH] Make ConfigData Resolvers/Loaders public

Change the visibility of our own ConfigDataLocationResolver and
ConfigDataLoader classes so that they can be created outside of
`spring.factories`.

Closes gh-23434
---
 .../boot/context/config/ConfigTreeConfigDataLoader.java     | 3 ++-
 .../boot/context/config/ConfigTreeConfigDataLocation.java   | 3 ++-
 .../config/ConfigTreeConfigDataLocationResolver.java        | 3 ++-
 .../boot/context/config/ResourceConfigDataLoader.java       | 3 ++-
 .../boot/context/config/ResourceConfigDataLocation.java     | 3 ++-
 .../context/config/ResourceConfigDataLocationResolver.java  | 6 ++++--
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigTreeConfigDataLoader.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigTreeConfigDataLoader.java
index cd285b90973..cc010983300 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigTreeConfigDataLoader.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigTreeConfigDataLoader.java
@@ -27,8 +27,9 @@ import org.springframework.boot.env.ConfigTreePropertySource;
  *
  * @author Madhura Bhave
  * @author Phillip Webb
+ * @since 2.4.0
  */
-class ConfigTreeConfigDataLoader implements ConfigDataLoader<ConfigTreeConfigDataLocation> {
+public class ConfigTreeConfigDataLoader implements ConfigDataLoader<ConfigTreeConfigDataLocation> {
 
 	@Override
 	public ConfigData load(ConfigDataLoaderContext context, ConfigTreeConfigDataLocation location) throws IOException {
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigTreeConfigDataLocation.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigTreeConfigDataLocation.java
index 824067d6967..9e9a135a4d1 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigTreeConfigDataLocation.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigTreeConfigDataLocation.java
@@ -28,9 +28,10 @@ import org.springframework.util.Assert;
  *
  * @author Madhura Bhave
  * @author Phillip Webb
+ * @since 2.4.0
  * @see ConfigTreePropertySource
  */
-class ConfigTreeConfigDataLocation extends ConfigDataLocation {
+public class ConfigTreeConfigDataLocation extends ConfigDataLocation {
 
 	private final Path path;
 
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigTreeConfigDataLocationResolver.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigTreeConfigDataLocationResolver.java
index 396c3b8612a..e507bf6aa30 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigTreeConfigDataLocationResolver.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigTreeConfigDataLocationResolver.java
@@ -24,8 +24,9 @@ import java.util.List;
  *
  * @author Madhura Bhave
  * @author Phillip Webb
+ * @since 2.4.0
  */
-class ConfigTreeConfigDataLocationResolver implements ConfigDataLocationResolver<ConfigTreeConfigDataLocation> {
+public class ConfigTreeConfigDataLocationResolver implements ConfigDataLocationResolver<ConfigTreeConfigDataLocation> {
 
 	private static final String PREFIX = "configtree:";
 
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ResourceConfigDataLoader.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ResourceConfigDataLoader.java
index 551c916d297..743cfe7b950 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ResourceConfigDataLoader.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ResourceConfigDataLoader.java
@@ -25,8 +25,9 @@ import org.springframework.core.io.Resource;
  *
  * @author Phillip Webb
  * @author Madhura Bhave
+ * @since 2.4.0
  */
-class ResourceConfigDataLoader implements ConfigDataLoader<ResourceConfigDataLocation> {
+public class ResourceConfigDataLoader implements ConfigDataLoader<ResourceConfigDataLocation> {
 
 	@Override
 	public ConfigData load(ConfigDataLoaderContext context, ResourceConfigDataLocation location) throws IOException {
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ResourceConfigDataLocation.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ResourceConfigDataLocation.java
index 4c42c2eb5a3..54668b37a4c 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ResourceConfigDataLocation.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ResourceConfigDataLocation.java
@@ -33,8 +33,9 @@ import org.springframework.util.Assert;
  *
  * @author Madhura Bhave
  * @author Phillip Webb
+ * @since 2.4.0
  */
-class ResourceConfigDataLocation extends ConfigDataLocation {
+public class ResourceConfigDataLocation extends ConfigDataLocation {
 
 	private final String name;
 
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ResourceConfigDataLocationResolver.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ResourceConfigDataLocationResolver.java
index 241eee71452..c03b9d12e5b 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ResourceConfigDataLocationResolver.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ResourceConfigDataLocationResolver.java
@@ -50,8 +50,10 @@ import org.springframework.util.StringUtils;
  *
  * @author Madhura Bhave
  * @author Phillip Webb
+ * @since 2.4.0
  */
-class ResourceConfigDataLocationResolver implements ConfigDataLocationResolver<ResourceConfigDataLocation>, Ordered {
+public class ResourceConfigDataLocationResolver
+		implements ConfigDataLocationResolver<ResourceConfigDataLocation>, Ordered {
 
 	private static final String PREFIX = "resource:";
 
@@ -83,7 +85,7 @@ class ResourceConfigDataLocationResolver implements ConfigDataLocationResolver<R
 	 * @param binder a binder backed by the initial {@link Environment}
 	 * @param resourceLoader a {@link ResourceLoader} used to load resources
 	 */
-	ResourceConfigDataLocationResolver(Log logger, Binder binder, ResourceLoader resourceLoader) {
+	public ResourceConfigDataLocationResolver(Log logger, Binder binder, ResourceLoader resourceLoader) {
 		this.logger = logger;
 		this.propertySourceLoaders = SpringFactoriesLoader.loadFactories(PropertySourceLoader.class,
 				getClass().getClassLoader());