Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Provide a simple Instantiator utility class

Browse Source 
Make `Instantiator` a public utility class so that it can be used
by other parts of the codebase.

Closes gh-23029
This commit is contained in:
Phillip Webb
2020-08-20 13:00:06 -07:00
parent f7ef3445a6
commit 167e31d564
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataLoaders.java
View File

@@ -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;

1
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataLocationResolvers.java
View File

@@ -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;

11
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/Instantiator.java → spring-boot-project/spring-boot/src/main/java/org/springframework/boot/util/Instantiator.java
View File

@@ -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 <T> the type to instantiate
* @author Phillip Webb
* @since 2.4.0
*/
class Instantiator<T> {
public class Instantiator<T> {
private static final Comparator<Constructor<?>> CONSTRUCTOR_COMPARATOR = Comparator
.<Constructor<?>>comparingInt(Constructor::getParameterCount).reversed();
@@ -53,7 +54,7 @@ class Instantiator<T> {
* @param type the type to instantiate
* @param availableParameters consumer used to register available parameters
*/
Instantiator(Class<?> type, Consumer<AvailableParameters> availableParameters) {
public Instantiator(Class<?> type, Consumer<AvailableParameters> availableParameters) {
this.type = type;
this.availableParameters = getAvailableParameters(availableParameters);
}
@@ -83,7 +84,7 @@ class Instantiator<T> {
* @param names the class names to instantiate
* @return a list of instantiated instances
*/
List<T> instantiate(Collection<String> names) {
public List<T> instantiate(Collection<String> names) {
List<T> instances = new ArrayList<>(names.size());
for (String name : names) {
instances.add(instantiate(name));
@@ -141,7 +142,7 @@ class Instantiator<T> {
/**
* Callback used to register available parameters.
*/
interface AvailableParameters {
public interface AvailableParameters {
/**
* Add a parameter with an instance value.

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/InstantiatorTests.java → spring-boot-project/spring-boot/src/test/java/org/springframework/boot/util/InstantiatorTests.java
View File

@@ -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;