From 4bbb4ca5e4eee32129559c510fa8e61a7e116a7a Mon Sep 17 00:00:00 2001 From: spencergibb Date: Thu, 25 Jun 2020 13:15:04 -0400 Subject: [PATCH] Removes @Autowired from fields --- ...ntConfigServiceBootstrapConfiguration.java | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/DiscoveryClientConfigServiceBootstrapConfiguration.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/DiscoveryClientConfigServiceBootstrapConfiguration.java index 4d3815edc9..01638336a2 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/DiscoveryClientConfigServiceBootstrapConfiguration.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/DiscoveryClientConfigServiceBootstrapConfiguration.java @@ -23,7 +23,6 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.ObjectProvider; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; @@ -71,20 +70,24 @@ public ConfigServerInstanceProvider configServerInstanceProvider( } @Bean - public SmartApplicationListener heartbeatListener( + public SmartApplicationListener heartbeatListener(ConfigClientProperties properties, ConfigServerInstanceProvider provider) { - return new HeartbeatListener(); + return new HeartbeatListener(properties, provider); } - private static class HeartbeatListener implements SmartApplicationListener { + private final static class HeartbeatListener implements SmartApplicationListener { - @Autowired - private ConfigClientProperties config; + private final ConfigClientProperties config; - @Autowired - private ConfigServerInstanceProvider instanceProvider; + private final ConfigServerInstanceProvider instanceProvider; - private HeartbeatMonitor monitor = new HeartbeatMonitor(); + private final HeartbeatMonitor monitor = new HeartbeatMonitor(); + + private HeartbeatListener(ConfigClientProperties config, + ConfigServerInstanceProvider instanceProvider) { + this.config = config; + this.instanceProvider = instanceProvider; + } @Override public boolean supportsEventType(Class eventType) {