From c60b6dba5271e386f45347b129da6e763b8d93a7 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Thu, 6 Aug 2020 16:07:47 -0400 Subject: [PATCH] Updates to use "spring.config.use-legacy-processing" where needed. --- .../netflix/eureka/EurekaClientAutoConfigurationTests.java | 3 +-- .../config/EurekaConfigServerBootstrapConfigurationTests.java | 1 + ...gServerBootstrapConfigurationWebClientIntegrationTests.java | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java index 306b40eca..24fadd4fe 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java @@ -461,8 +461,7 @@ public class EurekaClientAutoConfigurationTests { assertThat(healthCheckHandler).isInstanceOf(EurekaHealthCheckHandler.class); assertThat(oldEurekaClient.getHealthCheckHandler()).isSameAs(healthCheckHandler); - ContextRefresher refresher = this.context.getBean("contextRefresher", - ContextRefresher.class); + ContextRefresher refresher = this.context.getBean(ContextRefresher.class); refresher.refresh(); EurekaClient newEurekaClient = getLazyInitEurekaClient(); diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfigurationTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfigurationTests.java index 696fec499..7cb010538 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfigurationTests.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfigurationTests.java @@ -107,6 +107,7 @@ public class EurekaConfigServerBootstrapConfigurationTests { // FIXME: why do I need to do this? (fails in maven build without it. TomcatURLStreamHandlerFactory.disable(); new SpringApplicationBuilder(TestConfigDiscoveryConfiguration.class).properties( + "spring.config.use-legacy-processing=true", "spring.cloud.config.discovery.enabled=true", "spring.main.sources=" + TestConfigDiscoveryBootstrapConfiguration.class.getName(), diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfigurationWebClientIntegrationTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfigurationWebClientIntegrationTests.java index 17179473c..7798c3c54 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfigurationWebClientIntegrationTests.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfigurationWebClientIntegrationTests.java @@ -39,6 +39,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Spencer Gibb */ @SpringBootTest(properties = { "spring.cloud.config.discovery.enabled=true", + "spring.config.use-legacy-processing=true", "eureka.client.webclient.enabled=true", "spring.codec.max-in-memory-size=310000" }, webEnvironment = RANDOM_PORT) public class EurekaConfigServerBootstrapConfigurationWebClientIntegrationTests {