From d33764d2329fc54c81febe19e5f8dff3343cdda1 Mon Sep 17 00:00:00 2001 From: erabii Date: Thu, 14 Nov 2024 16:59:00 +0200 Subject: [PATCH] align annotations (#1793) --- ...ubernetesClientBootstrapConfiguration.java | 2 + ...ientConfigReloadAutoConfigurationTest.java | 45 ++++++++++--------- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientBootstrapConfiguration.java b/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientBootstrapConfiguration.java index 91ae4eb4..9d6992d4 100644 --- a/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientBootstrapConfiguration.java +++ b/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientBootstrapConfiguration.java @@ -31,6 +31,7 @@ import org.springframework.cloud.kubernetes.commons.config.ConditionalOnKubernet import org.springframework.cloud.kubernetes.commons.config.ConfigMapConfigProperties; import org.springframework.cloud.kubernetes.commons.config.KubernetesBootstrapConfiguration; import org.springframework.cloud.kubernetes.commons.config.SecretsConfigProperties; +import org.springframework.cloud.util.ConditionalOnBootstrapEnabled; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -41,6 +42,7 @@ import org.springframework.context.annotation.Import; @Configuration(proxyBeanMethods = false) @AutoConfigureAfter(KubernetesBootstrapConfiguration.class) @Import({ KubernetesCommonsAutoConfiguration.class, KubernetesClientAutoConfiguration.class }) +@ConditionalOnBootstrapEnabled @ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES) public class KubernetesClientBootstrapConfiguration { diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigReloadAutoConfigurationTest.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigReloadAutoConfigurationTest.java index f0bfc7fa..a78b344d 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigReloadAutoConfigurationTest.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigReloadAutoConfigurationTest.java @@ -174,7 +174,8 @@ public class KubernetesClientConfigReloadAutoConfigurationTest { */ @Test void reloadEventEnabledMonitoringConfigMapsEnabledByDefault() { - setup("spring.cloud.kubernetes.reload.enabled=true", "spring.main.cloud-platform=KUBERNETES"); + setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true", + "spring.main.cloud-platform=KUBERNETES"); Map map = context.getBeansOfType(ConfigurationChangeDetector.class); Assertions.assertEquals(map.size(), 1); Assertions.assertTrue(map.values() @@ -197,8 +198,8 @@ public class KubernetesClientConfigReloadAutoConfigurationTest { */ @Test void reloadEventEnabledMonitoringConfigMapsEnabled() { - setup("spring.cloud.kubernetes.reload.enabled=true", "spring.cloud.kubernetes.reload.mode=event", - "spring.main.cloud-platform=KUBERNETES"); + setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true", + "spring.cloud.kubernetes.reload.mode=event", "spring.main.cloud-platform=KUBERNETES"); Map map = context.getBeansOfType(ConfigurationChangeDetector.class); Assertions.assertEquals(map.size(), 1); Assertions.assertTrue(map.values() @@ -259,8 +260,8 @@ public class KubernetesClientConfigReloadAutoConfigurationTest { */ @Test void reloadPollingEnabledMonitoringConfigMapsEnabled() { - setup("spring.cloud.kubernetes.reload.enabled=true", "spring.cloud.kubernetes.reload.mode=polling", - "spring.main.cloud-platform=KUBERNETES"); + setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true", + "spring.cloud.kubernetes.reload.mode=polling", "spring.main.cloud-platform=KUBERNETES"); Map map = context.getBeansOfType(ConfigurationChangeDetector.class); Assertions.assertEquals(map.size(), 1); Assertions.assertTrue( @@ -281,8 +282,8 @@ public class KubernetesClientConfigReloadAutoConfigurationTest { */ @Test void reloadEventEnabledMonitoringConfigMapsDisabledMonitoringSecretsEnabled() { - setup("spring.cloud.kubernetes.reload.enabled=true", "spring.main.cloud-platform=KUBERNETES", - "spring.cloud.kubernetes.reload.monitoring-secrets=true", + setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true", + "spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.reload.monitoring-secrets=true", "spring.cloud.kubernetes.reload.monitoring-configMaps=false", "spring.cloud.kubernetes.reload.mode=event"); Map map = context.getBeansOfType(ConfigurationChangeDetector.class); @@ -308,8 +309,8 @@ public class KubernetesClientConfigReloadAutoConfigurationTest { */ @Test void reloadPollingEnabledMonitoringConfigMapsDisabledMonitoringSecretsEnabled() { - setup("spring.cloud.kubernetes.reload.enabled=true", "spring.main.cloud-platform=KUBERNETES", - "spring.cloud.kubernetes.reload.monitoring-secrets=true", + setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true", + "spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.reload.monitoring-secrets=true", "spring.cloud.kubernetes.reload.monitoring-configMaps=false", "spring.cloud.kubernetes.reload.mode=polling"); Map map = context.getBeansOfType(ConfigurationChangeDetector.class); @@ -332,8 +333,8 @@ public class KubernetesClientConfigReloadAutoConfigurationTest { */ @Test void reloadEventEnabledMonitoringConfigMapsEnabledMonitoringSecretsEnabled() { - setup("spring.cloud.kubernetes.reload.enabled=true", "spring.main.cloud-platform=KUBERNETES", - "spring.cloud.kubernetes.reload.monitoring-secrets=true", + setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true", + "spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.reload.monitoring-secrets=true", "spring.cloud.kubernetes.reload.monitoring-configMaps=true", "spring.cloud.kubernetes.reload.mode=event"); Map map = context.getBeansOfType(ConfigurationChangeDetector.class); @@ -360,8 +361,8 @@ public class KubernetesClientConfigReloadAutoConfigurationTest { */ @Test void reloadPollingEnabledMonitoringConfigMapsEnabledMonitoringSecretsEnabled() { - setup("spring.cloud.kubernetes.reload.enabled=true", "spring.main.cloud-platform=KUBERNETES", - "spring.cloud.kubernetes.reload.monitoring-secrets=true", + setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true", + "spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.reload.monitoring-secrets=true", "spring.cloud.kubernetes.reload.monitoring-configMaps=true", "spring.cloud.kubernetes.reload.mode=polling"); Map map = context.getBeansOfType(ConfigurationChangeDetector.class); @@ -430,8 +431,9 @@ public class KubernetesClientConfigReloadAutoConfigurationTest { */ @Test void reloadEventEnabledMonitoringConfigMapsEnabledMonitoringSecretsDisabled() { - setup("spring.cloud.kubernetes.reload.enabled=true", "spring.cloud.kubernetes.reload.mode=event", - "spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.reload.monitoring-configMaps=true", + setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true", + "spring.cloud.kubernetes.reload.mode=event", "spring.main.cloud-platform=KUBERNETES", + "spring.cloud.kubernetes.reload.monitoring-configMaps=true", "spring.cloud.kubernetes.reload.monitoring-secrets=false"); Map map = context.getBeansOfType(ConfigurationChangeDetector.class); Assertions.assertEquals(map.size(), 1); @@ -456,8 +458,9 @@ public class KubernetesClientConfigReloadAutoConfigurationTest { */ @Test void reloadPollingEnabledMonitoringConfigMapsEnabledMonitoringSecretsDisabled() { - setup("spring.cloud.kubernetes.reload.enabled=true", "spring.cloud.kubernetes.reload.mode=polling", - "spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.reload.monitoring-configMaps=true", + setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true", + "spring.cloud.kubernetes.reload.mode=polling", "spring.main.cloud-platform=KUBERNETES", + "spring.cloud.kubernetes.reload.monitoring-configMaps=true", "spring.cloud.kubernetes.reload.monitoring-secrets=false"); Map map = context.getBeansOfType(ConfigurationChangeDetector.class); Assertions.assertEquals(map.size(), 1); @@ -472,21 +475,23 @@ public class KubernetesClientConfigReloadAutoConfigurationTest { @Test void kubernetesConfigAndSecretEnabledByDefault() { - setup("spring.main.cloud-platform=KUBERNETES"); + setup("spring.cloud.bootstrap.enabled=true", "spring.main.cloud-platform=KUBERNETES"); assertThat(context.containsBean("configMapPropertySourceLocator")).isTrue(); assertThat(context.containsBean("secretsPropertySourceLocator")).isTrue(); } @Test void kubernetesConfigEnabledButSecretDisabled() { - setup("spring.cloud.kubernetes.secrets.enabled=false", "spring.main.cloud-platform=KUBERNETES"); + setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.secrets.enabled=false", + "spring.main.cloud-platform=KUBERNETES"); assertThat(context.containsBean("configMapPropertySourceLocator")).isTrue(); assertThat(context.containsBean("secretsPropertySourceLocator")).isFalse(); } @Test void kubernetesSecretsEnabledButConfigDisabled() { - setup("spring.cloud.kubernetes.config.enabled=false", "spring.main.cloud-platform=KUBERNETES"); + setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.config.enabled=false", + "spring.main.cloud-platform=KUBERNETES"); assertThat(context.containsBean("configMapPropertySourceLocator")).isFalse(); assertThat(context.containsBean("secretsPropertySourceLocator")).isTrue(); }