refactor

spring-cloud · Dec 14, 2023 · 8f47a9f · 8f47a9f
1 parent 398a5f1
commit 8f47a9f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/...pringframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfiguration.java b/...pringframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfiguration.java
@@ -22,7 +22,6 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.cloud.CloudPlatform;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.client.RestTemplateBuilder;
@@ -56,7 +55,6 @@
 @Deprecated(forRemoval = true)
 public class KubernetesDiscoveryClientAutoConfiguration {
 
-	@ConditionalOnProperty(value = "use.deprecated.blocking.client.auto.configuration", matchIfMissing = true)
 	@Configuration(proxyBeanMethods = false)
 	public static class Servlet {
 
@@ -86,7 +84,6 @@ public InitializingBean indicatorInitializer(ApplicationEventPublisher applicati
 
 	}
 
-	@ConditionalOnProperty(value = "use.deprecated.reactive.client.auto.configuration", matchIfMissing = true)
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnReactiveDiscoveryEnabled
 	public static class Reactive {

diff --git a/...ubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/App.java b/...ubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/App.java
@@ -16,16 +16,14 @@
 
 package org.springframework.cloud.kubernetes.discovery;
 
-import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 
 /**
  * @author wind57
  */
-@SpringBootApplication
+@SpringBootConfiguration
+@EnableAutoConfiguration
 class App {
 
-	static void main(String[] args) {
-
-	}
-
 }
diff --git a/...springframework/cloud/kubernetes/discovery/BlockingDiscoveryHealthPublishedEventTest.java b/...springframework/cloud/kubernetes/discovery/BlockingDiscoveryHealthPublishedEventTest.java
@@ -29,7 +29,7 @@
  */
 @SpringBootTest(properties = { "spring.main.cloud-platform=kubernetes", "spring.cloud.config.enabled=false",
 		"spring.cloud.kubernetes.discovery.discovery-server-url=http://example",
-		"spring.cloud.discovery.reactive.enabled=false", "use.deprecated.blocking.client.auto.configuration=false" },
+		"spring.cloud.discovery.reactive.enabled=false" },
 		classes = { HealthEventListenerConfiguration.class, App.class })
 class BlockingDiscoveryHealthPublishedEventTest {
 

diff --git a/...springframework/cloud/kubernetes/discovery/ReactiveDiscoveryHealthPublishedEventTest.java b/...springframework/cloud/kubernetes/discovery/ReactiveDiscoveryHealthPublishedEventTest.java
@@ -32,8 +32,7 @@
 @SpringBootTest(properties = { "spring.main.cloud-platform=kubernetes", "spring.cloud.config.enabled=false",
 		"spring.cloud.kubernetes.discovery.discovery-server-url=http://example",
 		// disable blocking implementation
-		"spring.cloud.discovery.blocking.enabled=false", "use.deprecated.reactive.client.auto.configuration=false",
-		"use.deprecated.blocking.client.auto.configuration=false" },
+		"spring.cloud.discovery.blocking.enabled=false" },
 		classes = { HealthEventListenerConfiguration.class, App.class })
 class ReactiveDiscoveryHealthPublishedEventTest {