minor unification of two conditionals (#1577)

spring-cloud · Feb 16, 2024 · 05dbdcf · 05dbdcf
1 parent 3720fb0
commit 05dbdcf
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 21 deletions.
diff --git a/...va/org/springframework/cloud/kubernetes/client/KubernetesClientActuatorConfiguration.java b/...va/org/springframework/cloud/kubernetes/client/KubernetesClientActuatorConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,20 +20,16 @@
 
 import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
 import org.springframework.boot.actuate.autoconfigure.info.ConditionalOnEnabledInfoContributor;
-import org.springframework.boot.actuate.health.HealthIndicator;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform;
-import org.springframework.boot.cloud.CloudPlatform;
 import org.springframework.cloud.kubernetes.commons.PodUtils;
+import org.springframework.cloud.kubernetes.commons.autoconfig.ConditionalOnKubernetesHealthIndicatorEnabled;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
  * @author wind57
  */
 @Configuration(proxyBeanMethods = false)
-@ConditionalOnClass(HealthIndicator.class)
-@ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES)
+@ConditionalOnKubernetesHealthIndicatorEnabled
 public class KubernetesClientActuatorConfiguration {
 
 	@Bean

diff --git a/...rk/cloud/kubernetes/commons/autoconfig/ConditionalOnKubernetesHealthIndicatorEnabled.java b/...rk/cloud/kubernetes/commons/autoconfig/ConditionalOnKubernetesHealthIndicatorEnabled.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2013-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.kubernetes.commons.autoconfig;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform;
+import org.springframework.boot.cloud.CloudPlatform;
+
+/**
+ * @author wind57
+ **/
+@Target({ ElementType.TYPE, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Inherited
+@ConditionalOnClass(name = "org.springframework.boot.actuate.health.HealthIndicator")
+@ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES)
+public @interface ConditionalOnKubernetesHealthIndicatorEnabled {
+
+}
diff --git a/...mmons/discovery/ConditionalOnSpringCloudKubernetesBlockingDiscoveryHealthInitializer.java b/...mmons/discovery/ConditionalOnSpringCloudKubernetesBlockingDiscoveryHealthInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.springframework.boot.actuate.health.HealthIndicator;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.cloud.client.ConditionalOnDiscoveryHealthIndicatorEnabled;
 
@@ -36,7 +35,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @Inherited
-@ConditionalOnClass({ HealthIndicator.class })
+@ConditionalOnClass(name = "org.springframework.boot.actuate.health.HealthIndicator")
 @ConditionalOnDiscoveryHealthIndicatorEnabled
 public @interface ConditionalOnSpringCloudKubernetesBlockingDiscoveryHealthInitializer {
 

diff --git a/.../main/java/org/springframework/cloud/kubernetes/fabric8/Fabric8ActuatorConfiguration.java b/.../main/java/org/springframework/cloud/kubernetes/fabric8/Fabric8ActuatorConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,20 +20,16 @@
 
 import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
 import org.springframework.boot.actuate.autoconfigure.info.ConditionalOnEnabledInfoContributor;
-import org.springframework.boot.actuate.health.HealthIndicator;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform;
-import org.springframework.boot.cloud.CloudPlatform;
 import org.springframework.cloud.kubernetes.commons.PodUtils;
+import org.springframework.cloud.kubernetes.commons.autoconfig.ConditionalOnKubernetesHealthIndicatorEnabled;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
  * @author wind57
  */
 @Configuration(proxyBeanMethods = false)
-@ConditionalOnClass(HealthIndicator.class)
-@ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES)
+@ConditionalOnKubernetesHealthIndicatorEnabled
 public class Fabric8ActuatorConfiguration {
 
 	@Bean

diff --git a/...ionClientNotPresentWhenIstioDisabled.java → ...lientNotPresentWhenIstioDisabledTest.java b/...ionClientNotPresentWhenIstioDisabled.java → ...lientNotPresentWhenIstioDisabledTest.java
@@ -30,7 +30,7 @@
  */
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class,
 		properties = { "spring.cloud.istio.enabled=false" })
-class IstioAutoConfigurationClientNotPresentWhenIstioDisabled {
+class IstioAutoConfigurationClientNotPresentWhenIstioDisabledTest {
 
 	@Autowired
 	private ConfigurableApplicationContext context;

diff --git a/...ientNotPresentWhenKubernetesDisabled.java → ...NotPresentWhenKubernetesDisabledTest.java b/...ientNotPresentWhenKubernetesDisabled.java → ...NotPresentWhenKubernetesDisabledTest.java
@@ -29,7 +29,7 @@
  * @author wind57
  */
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class)
-class IstioAutoConfigurationClientNotPresentWhenKubernetesDisabled {
+class IstioAutoConfigurationClientNotPresentWhenKubernetesDisabledTest {
 
 	@Autowired
 	private ConfigurableApplicationContext context;

diff --git a/...oConfigurationClientPresentByDefault.java → ...figurationClientPresentByDefaultTest.java b/...oConfigurationClientPresentByDefault.java → ...figurationClientPresentByDefaultTest.java
@@ -30,7 +30,7 @@
  */
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class,
 		properties = "spring.main.cloud-platform=KUBERNETES")
-class IstioAutoConfigurationClientPresentByDefault {
+class IstioAutoConfigurationClientPresentByDefaultTest {
 
 	@Autowired
 	private ConfigurableApplicationContext context;

diff --git a/...urationClientPresentWhenIstioEnabled.java → ...ionClientPresentWhenIstioEnabledTest.java b/...urationClientPresentWhenIstioEnabled.java → ...ionClientPresentWhenIstioEnabledTest.java
@@ -30,7 +30,7 @@
  */
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class,
 		properties = { "spring.cloud.istio.enabled=true", "spring.main.cloud-platform=KUBERNETES" })
-class IstioAutoConfigurationClientPresentWhenIstioEnabled {
+class IstioAutoConfigurationClientPresentWhenIstioEnabledTest {
 
 	@Autowired
 	private ConfigurableApplicationContext context;