diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataLoaders.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataLoaders.java index 4adc7ddaee..3967083bca 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataLoaders.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataLoaders.java @@ -24,6 +24,7 @@ import java.util.List; import org.apache.commons.logging.Log; import org.springframework.boot.logging.DeferredLogFactory; +import org.springframework.boot.util.Instantiator; import org.springframework.core.ResolvableType; import org.springframework.core.io.support.SpringFactoriesLoader; import org.springframework.core.log.LogMessage; diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataLocationResolvers.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataLocationResolvers.java index a6befcef2a..37fad9b73c 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataLocationResolvers.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataLocationResolvers.java @@ -24,6 +24,7 @@ import org.apache.commons.logging.Log; import org.springframework.boot.context.properties.bind.Binder; import org.springframework.boot.logging.DeferredLogFactory; +import org.springframework.boot.util.Instantiator; import org.springframework.core.env.Environment; import org.springframework.core.io.ResourceLoader; import org.springframework.core.io.support.SpringFactoriesLoader; diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/Instantiator.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/util/Instantiator.java similarity index 94% rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/Instantiator.java rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/util/Instantiator.java index 0575d173dd..e22865192d 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/Instantiator.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/util/Instantiator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.context.config; +package org.springframework.boot.util; import java.lang.reflect.Constructor; import java.util.ArrayList; @@ -38,8 +38,9 @@ import org.springframework.util.ReflectionUtils; * * @param the type to instantiate * @author Phillip Webb + * @since 2.4.0 */ -class Instantiator { +public class Instantiator { private static final Comparator> CONSTRUCTOR_COMPARATOR = Comparator .>comparingInt(Constructor::getParameterCount).reversed(); @@ -53,7 +54,7 @@ class Instantiator { * @param type the type to instantiate * @param availableParameters consumer used to register available parameters */ - Instantiator(Class type, Consumer availableParameters) { + public Instantiator(Class type, Consumer availableParameters) { this.type = type; this.availableParameters = getAvailableParameters(availableParameters); } @@ -83,7 +84,7 @@ class Instantiator { * @param names the class names to instantiate * @return a list of instantiated instances */ - List instantiate(Collection names) { + public List instantiate(Collection names) { List instances = new ArrayList<>(names.size()); for (String name : names) { instances.add(instantiate(name)); @@ -141,7 +142,7 @@ class Instantiator { /** * Callback used to register available parameters. */ - interface AvailableParameters { + public interface AvailableParameters { /** * Add a parameter with an instance value. diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/InstantiatorTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/util/InstantiatorTests.java similarity index 98% rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/InstantiatorTests.java rename to spring-boot-project/spring-boot/src/test/java/org/springframework/boot/util/InstantiatorTests.java index abc1a7a1f7..36aecb33e6 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/InstantiatorTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/util/InstantiatorTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.context.config; +package org.springframework.boot.util; import java.util.Arrays; import java.util.Collections;