Skip to content

Commit 68d6028

Browse files
committed
refactor: Remove obsolete SpringFactoriesLoader#loadFactoryNames
1 parent 75d8311 commit 68d6028

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ConfigDataContextRefresher.java

+3-6
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.springframework.boot.DefaultBootstrapContext;
2929
import org.springframework.boot.SpringApplication;
3030
import org.springframework.boot.env.EnvironmentPostProcessor;
31+
import org.springframework.boot.env.EnvironmentPostProcessorsFactory;
3132
import org.springframework.boot.logging.DeferredLogFactory;
3233
import org.springframework.cloud.autoconfigure.RefreshAutoConfiguration;
3334
import org.springframework.cloud.context.config.ContextRefreshedWithApplicationEvent;
@@ -76,12 +77,8 @@ protected void updateEnvironment() {
7677
// decrypt happen after refresh. The hard coded call to
7778
// ConfigDataEnvironmentPostProcessor.applyTo() is now automated as well.
7879
DeferredLogFactory logFactory = new PassthruDeferredLogFactory();
79-
SpringFactoriesLoader.ArgumentResolver argumentResolver = SpringFactoriesLoader.ArgumentResolver.of(DeferredLogFactory.class, logFactory);
80-
argumentResolver = argumentResolver.and(ConfigurableBootstrapContext.class, bootstrapContext);
81-
argumentResolver = argumentResolver.and(BootstrapContext.class, bootstrapContext);
82-
argumentResolver = argumentResolver.and(BootstrapRegistry.class, bootstrapContext);
83-
SpringFactoriesLoader loader = SpringFactoriesLoader.forDefaultResourceLocation(getClass().getClassLoader());
84-
List<EnvironmentPostProcessor> postProcessors = loader.load(EnvironmentPostProcessor.class, argumentResolver);
80+
EnvironmentPostProcessorsFactory environmentPostProcessorsFactory = EnvironmentPostProcessorsFactory.fromSpringFactories(getClass().getClassLoader());
81+
List<EnvironmentPostProcessor> postProcessors = environmentPostProcessorsFactory.getEnvironmentPostProcessors(logFactory, bootstrapContext);
8582
for (EnvironmentPostProcessor postProcessor : postProcessors) {
8683
postProcessor.postProcessEnvironment(environment, application);
8784
}

0 commit comments

Comments
 (0)