Let autoconfiguration handle @EnableDiscoveryClient.

"@EnableDiscoveryClient is no longer required. You can put a DiscoveryClient implementation on the classpath to cause the Spring Boot application to register with the service discovery server." https://docs.spring.io/spring-cloud-commons/reference/spring-cloud-commons/common-abstractions.html
jonatan-ivanov · Jul 13, 2024 · 27ed5f2 · 27ed5f2
1 parent f6ca3b5
commit 27ed5f2
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 8 deletions.
diff --git a/spring-boot-admin/src/main/java/org/example/teahouse/sba/SbaApplication.java b/spring-boot-admin/src/main/java/org/example/teahouse/sba/SbaApplication.java
@@ -6,12 +6,10 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.PropertySource;
 
 @EnableAdminServer
-@EnableDiscoveryClient
 @SpringBootApplication
 @PropertySource("classpath:build.properties")
 @Import({CommonActuatorConfig.class})

diff --git a/tea-service/src/main/java/org/example/teahouse/tea/TeaServiceApplication.java b/tea-service/src/main/java/org/example/teahouse/tea/TeaServiceApplication.java
@@ -3,13 +3,11 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.PropertySource;
 
 @EnableFeignClients
-@EnableDiscoveryClient
 @SpringBootApplication
 @PropertySource("classpath:build.properties")
 @ComponentScan(basePackages = { "org.example.teahouse" })

diff --git a/tealeaf-service/src/main/java/org/example/teahouse/tealeaf/TealeafServiceApplication.java b/tealeaf-service/src/main/java/org/example/teahouse/tealeaf/TealeafServiceApplication.java
@@ -3,11 +3,9 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.PropertySource;
 
-@EnableDiscoveryClient
 @SpringBootApplication
 @PropertySource("classpath:build.properties")
 @ComponentScan(basePackages = { "org.example.teahouse" })

diff --git a/water-service/src/main/java/org/example/teahouse/water/WaterServiceApplication.java b/water-service/src/main/java/org/example/teahouse/water/WaterServiceApplication.java
@@ -3,11 +3,9 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.PropertySource;
 
-@EnableDiscoveryClient
 @SpringBootApplication
 @PropertySource("classpath:build.properties")
 @ComponentScan(basePackages = { "org.example.teahouse" })