From 15502e1c6ae6f47605f655fe0f6ee1a6fd15ca2d Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Tue, 9 Feb 2021 11:01:03 -0500 Subject: [PATCH] Formatting changes --- .../config/KubernetesConfigTestBase.java | 8 +- .../ConfigReloadAutoConfigurationTest.java | 81 +++++++------------ .../KubernetesClientServicesFunction.java | 4 +- 3 files changed, 37 insertions(+), 56 deletions(-) diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/KubernetesConfigTestBase.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/KubernetesConfigTestBase.java index f37b6d00..fa066d0b 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/KubernetesConfigTestBase.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/KubernetesConfigTestBase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.config; +package org.springframework.cloud.kubernetes.fabric8.config; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.server.mock.KubernetesServer; @@ -25,7 +25,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.autoconfigure.RefreshAutoConfiguration; -import org.springframework.cloud.kubernetes.config.reload.ConfigReloadAutoConfiguration; +import org.springframework.cloud.bootstrap.BootstrapConfiguration; +import org.springframework.cloud.kubernetes.fabric8.config.reload.ConfigReloadAutoConfiguration; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -48,8 +49,7 @@ public class KubernetesConfigTestBase { context = new SpringApplicationBuilder(PropertyPlaceholderAutoConfiguration.class, KubernetesClientTestConfiguration.class, BootstrapConfiguration.class, ConfigReloadAutoConfiguration.class, RefreshAutoConfiguration.class) - .web(org.springframework.boot.WebApplicationType.NONE) - .properties(env).run(); + .web(org.springframework.boot.WebApplicationType.NONE).properties(env).run(); } @After diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload/ConfigReloadAutoConfigurationTest.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload/ConfigReloadAutoConfigurationTest.java index 53d26bd6..ed1cb389 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload/ConfigReloadAutoConfigurationTest.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload/ConfigReloadAutoConfigurationTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.config.reload; +package org.springframework.cloud.kubernetes.fabric8.config.reload; import java.util.HashMap; @@ -24,7 +24,7 @@ import io.fabric8.kubernetes.client.KubernetesClient; import org.junit.BeforeClass; import org.junit.Test; -import org.springframework.cloud.kubernetes.config.KubernetesConfigTestBase; +import org.springframework.cloud.kubernetes.fabric8.config.KubernetesConfigTestBase; import static org.assertj.core.api.Assertions.assertThat; @@ -46,91 +46,72 @@ public class ConfigReloadAutoConfigurationTest extends KubernetesConfigTestBase KubernetesClient mockClient = getContext().getBean(KubernetesClient.class); // Configure the kubernetes master url to point to the mock server - System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, - mockClient.getConfiguration().getMasterUrl()); + System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, mockClient.getConfiguration().getMasterUrl()); System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true"); System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false"); - System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, - "false"); + System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false"); System.setProperty(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, "test"); System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true"); HashMap data = new HashMap<>(); data.put("bean.greeting", "Hello ConfigMap, %s!"); server.expect().withPath("/api/v1/namespaces/test/configmaps/" + APPLICATION_NAME) - .andReturn(200, new ConfigMapBuilder().withNewMetadata() - .withName(APPLICATION_NAME).endMetadata().addToData(data).build()) + .andReturn(200, new ConfigMapBuilder().withNewMetadata().withName(APPLICATION_NAME).endMetadata() + .addToData(data).build()) .always(); - server.expect() - .withPath("/api/v1/namespaces/spring/configmaps/" + APPLICATION_NAME) - .andReturn(200, new ConfigMapBuilder().withNewMetadata() - .withName(APPLICATION_NAME).endMetadata().addToData(data).build()) + server.expect().withPath("/api/v1/namespaces/spring/configmaps/" + APPLICATION_NAME) + .andReturn(200, new ConfigMapBuilder().withNewMetadata().withName(APPLICATION_NAME).endMetadata() + .addToData(data).build()) .always(); } @Test public void kubernetesConfigReloadDisabled() throws Exception { setup("spring.cloud.kubernetes.reload.enabled=false"); - assertThat(this.getContext().containsBean("configurationChangeDetector")) - .isFalse(); - assertThat(this.getContext().containsBean("configurationUpdateStrategy")) - .isFalse(); + assertThat(this.getContext().containsBean("configurationChangeDetector")).isFalse(); + assertThat(this.getContext().containsBean("configurationUpdateStrategy")).isFalse(); } @Test public void kubernetesConfigReloadWhenKubernetesConfigDisabled() throws Exception { setup("spring.cloud.kubernetes.config.enabled=false"); - assertThat(this.getContext().containsBean("configurationChangeDetector")) - .isFalse(); - assertThat(this.getContext().containsBean("configurationUpdateStrategy")) - .isFalse(); + assertThat(this.getContext().containsBean("configurationChangeDetector")).isFalse(); + assertThat(this.getContext().containsBean("configurationUpdateStrategy")).isFalse(); } @Test public void kubernetesConfigReloadWhenKubernetesDisabled() throws Exception { setup("spring.cloud.kubernetes.enabled=false"); - assertThat(this.getContext().containsBean("configurationChangeDetector")) - .isFalse(); - assertThat(this.getContext().containsBean("configurationUpdateStrategy")) - .isFalse(); + assertThat(this.getContext().containsBean("configurationChangeDetector")).isFalse(); + assertThat(this.getContext().containsBean("configurationUpdateStrategy")).isFalse(); } @Test public void kubernetesReloadEnabled() throws Exception { - setup("spring.cloud.kubernetes.enabled=true", - "spring.cloud.kubernetes.config.enabled=true", - "spring.cloud.kubernetes.secrets.enabled=true", - "spring.cloud.kubernetes.reload.enabled=true"); - assertThat(this.getContext().containsBean("configMapPropertySourceLocator")) - .isTrue(); - assertThat(this.getContext().containsBean("secretsPropertySourceLocator")) - .isTrue(); - assertThat(this.getContext().containsBean("propertyChangeWatcher")).isTrue(); + setup("spring.cloud.kubernetes.enabled=true", "spring.cloud.kubernetes.config.enabled=true", + "spring.cloud.kubernetes.secrets.enabled=true", "spring.cloud.kubernetes.reload.enabled=true"); + assertThat(this.getContext().containsBean("configMapPropertySourceLocator")).isTrue(); + assertThat(this.getContext().containsBean("secretsPropertySourceLocator")).isTrue(); + assertThat(this.getContext().containsBean("configMapPropertyChangeEventWatcher")).isTrue(); + assertThat(this.getContext().containsBean("secretsPropertyChangeEventWatcher")).isTrue(); } @Test public void kubernetesReloadEnabledButSecretDisabled() throws Exception { - setup("spring.cloud.kubernetes.enabled=true", - "spring.cloud.kubernetes.config.enabled=true", - "spring.cloud.kubernetes.secrets.enabled=false", - "spring.cloud.kubernetes.reload.enabled=true"); - assertThat(this.getContext().containsBean("configMapPropertySourceLocator")) - .isTrue(); - assertThat(this.getContext().containsBean("secretsPropertySourceLocator")) - .isFalse(); - assertThat(this.getContext().containsBean("propertyChangeWatcher")).isTrue(); + setup("spring.cloud.kubernetes.enabled=true", "spring.cloud.kubernetes.config.enabled=true", + "spring.cloud.kubernetes.secrets.enabled=false", "spring.cloud.kubernetes.reload.enabled=true"); + assertThat(this.getContext().containsBean("configMapPropertySourceLocator")).isTrue(); + assertThat(this.getContext().containsBean("secretsPropertySourceLocator")).isFalse(); + assertThat(this.getContext().containsBean("configMapPropertyChangeEventWatcher")).isTrue(); + assertThat(this.getContext().containsBean("secretsPropertyChangeEventWatcher")).isFalse(); } @Test public void kubernetesReloadEnabledButSecretAndConfigDisabled() throws Exception { - setup("spring.cloud.kubernetes.enabled=true", - "spring.cloud.kubernetes.config.enabled=false", - "spring.cloud.kubernetes.secrets.enabled=false", - "spring.cloud.kubernetes.reload.enabled=true"); - assertThat(this.getContext().containsBean("configMapPropertySourceLocator")) - .isFalse(); - assertThat(this.getContext().containsBean("secretsPropertySourceLocator")) - .isFalse(); + setup("spring.cloud.kubernetes.enabled=true", "spring.cloud.kubernetes.config.enabled=false", + "spring.cloud.kubernetes.secrets.enabled=false", "spring.cloud.kubernetes.reload.enabled=true"); + assertThat(this.getContext().containsBean("configMapPropertySourceLocator")).isFalse(); + assertThat(this.getContext().containsBean("secretsPropertySourceLocator")).isFalse(); assertThat(this.getContext().containsBean("propertyChangeWatcher")).isFalse(); } diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesClientServicesFunction.java b/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesClientServicesFunction.java index 4d5ca6bc..ba0ea6ac 100644 --- a/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesClientServicesFunction.java +++ b/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesClientServicesFunction.java @@ -42,7 +42,7 @@ import io.fabric8.kubernetes.client.dsl.FilterWatchListDeletable; * * @author Georgios Andrianakis */ -public interface KubernetesClientServicesFunction extends - Function> { +public interface KubernetesClientServicesFunction + extends Function> { }