From ab59e9a08a5cc65da449884bbe006b5bf1f187f4 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Wed, 19 Oct 2022 15:20:01 -0400 Subject: [PATCH] Updates for config beans that are also autowired. --- .../cloud/netflix/eureka/EurekaInstanceConfigBean.java | 2 ++ .../EurekaClientConfigServerAutoConfigurationTests.java | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBean.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBean.java index 474405986..22cd6c191 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBean.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBean.java @@ -25,6 +25,7 @@ import com.netflix.appinfo.DataCenterInfo; import com.netflix.appinfo.InstanceInfo.InstanceStatus; import com.netflix.appinfo.MyDataCenterInfo; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.cloud.commons.util.InetUtils; import org.springframework.cloud.commons.util.InetUtils.HostInfo; @@ -285,6 +286,7 @@ public class EurekaInstanceConfigBean implements CloudEurekaInstanceConfig, Envi private EurekaInstanceConfigBean() { } + @Autowired public EurekaInstanceConfigBean(InetUtils inetUtils) { this.inetUtils = inetUtils; this.hostInfo = this.inetUtils.findFirstNonLoopbackHostInfo(); diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaClientConfigServerAutoConfigurationTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaClientConfigServerAutoConfigurationTests.java index 042baef31..702108590 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaClientConfigServerAutoConfigurationTests.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaClientConfigServerAutoConfigurationTests.java @@ -21,6 +21,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.test.context.runner.ApplicationContextRunner; +import org.springframework.cloud.commons.util.UtilAutoConfiguration; import org.springframework.cloud.config.server.config.ConfigServerProperties; import org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean; @@ -44,7 +45,7 @@ class EurekaClientConfigServerAutoConfigurationTests { void onWhenRequested() { new ApplicationContextRunner() .withConfiguration(AutoConfigurations.of(EurekaClientConfigServerAutoConfiguration.class, - ConfigServerProperties.class, EurekaInstanceConfigBean.class)) + UtilAutoConfiguration.class, ConfigServerProperties.class, EurekaInstanceConfigBean.class)) .withPropertyValues("spring.cloud.config.server.prefix=/config").run(c -> { assertThat(c.getBeanNamesForType(EurekaInstanceConfig.class).length).isEqualTo(1); EurekaInstanceConfig instance = c.getBean(EurekaInstanceConfig.class); @@ -56,7 +57,7 @@ class EurekaClientConfigServerAutoConfigurationTests { void notOverridingMetamapSettings() { new ApplicationContextRunner() .withConfiguration(AutoConfigurations.of(EurekaClientConfigServerAutoConfiguration.class, - ConfigServerProperties.class, EurekaInstanceConfigBean.class)) + UtilAutoConfiguration.class, ConfigServerProperties.class, EurekaInstanceConfigBean.class)) .withPropertyValues("spring.cloud.config.server.prefix=/config") .withPropertyValues("eureka.instance.metadataMap.configPath=/differentpath").run(c -> { assertThat(c.getBeanNamesForType(EurekaInstanceConfig.class).length).isEqualTo(1);