From c522cfed4f6641350bfdafb28fe3d671226de0e6 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Fri, 21 Jun 2019 10:04:59 -0500 Subject: [PATCH] Cherry picking 35f4e1f --- .gitignore | 2 +- .../kubernetes/config/ConfigMapPropertySource.java | 11 ++++++----- ...ootTest.java => ConfigMapsFromFilePathsTests.java} | 6 +++--- ...dSpringBootTest.java => ConfigMapsMixedTests.java} | 6 +++--- ...igMapsSpringBootTest.java => ConfigMapsTests.java} | 2 +- ...ava => ConfigMapsWithActiveProfilesNameTests.java} | 2 +- ...java => ConfigMapsWithProfileExpressionTests.java} | 2 +- ...> ConfigMapsWithProfilesNoActiveProfileTests.java} | 2 +- ...BootTest.java => ConfigMapsWithProfilesTests.java} | 2 +- ...tTest.java => ConfigMapsWithoutProfilesTests.java} | 2 +- ...ringBootTest.java => MultipleConfigMapsTests.java} | 2 +- .../kubernetes/leader/LeaderAutoConfiguration.java | 3 +-- .../leader/LeaderAutoConfigurationTests.java | 3 +-- 13 files changed, 22 insertions(+), 23 deletions(-) rename spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/{ConfigMapsFromFilePathsSpringBootTest.java => ConfigMapsFromFilePathsTests.java} (95%) rename spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/{ConfigMapsMixedSpringBootTest.java => ConfigMapsMixedTests.java} (95%) rename spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/{ConfigMapsSpringBootTest.java => ConfigMapsTests.java} (98%) rename spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/{ConfigMapsWithActiveProfilesNameSpringBootTest.java => ConfigMapsWithActiveProfilesNameTests.java} (98%) rename spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/{ConfigMapsWithProfileExpressionSpringBootTest.java => ConfigMapsWithProfileExpressionTests.java} (98%) rename spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/{ConfigMapsWithProfilesNoActiveProfileSpringBootTest.java => ConfigMapsWithProfilesNoActiveProfileTests.java} (98%) rename spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/{ConfigMapsWithProfilesSpringBootTest.java => ConfigMapsWithProfilesTests.java} (98%) rename spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/{ConfigMapsWithoutProfilesSpringBootTest.java => ConfigMapsWithoutProfilesTests.java} (98%) rename spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/{MultipleConfigMapsSpringBootTest.java => MultipleConfigMapsTests.java} (98%) diff --git a/.gitignore b/.gitignore index 480f655d..7918d075 100644 --- a/.gitignore +++ b/.gitignore @@ -77,4 +77,4 @@ crashlytics-build.properties .settings/ .project .classpath -.factorypath +.factorypath \ No newline at end of file diff --git a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapPropertySource.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapPropertySource.java index a74ea030..d75d1477 100644 --- a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapPropertySource.java +++ b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapPropertySource.java @@ -99,16 +99,18 @@ public class ConfigMapPropertySource extends MapPropertySource { } if (environment != null) { - for (String activeProfile:environment.getActiveProfiles()) { + for (String activeProfile : environment.getActiveProfiles()) { String mapNameWithProfile = name + "-" + activeProfile; ConfigMap mapWithProfile = StringUtils.isEmpty(namespace) - ? client.configMaps().withName(mapNameWithProfile).get() - : client.configMaps().inNamespace(namespace).withName(mapNameWithProfile).get(); + ? client.configMaps().withName(mapNameWithProfile).get() + : client.configMaps().inNamespace(namespace) + .withName(mapNameWithProfile).get(); if (mapWithProfile != null) { - result.putAll(processAllEntries(mapWithProfile.getData(), environment)); + result.putAll( + processAllEntries(mapWithProfile.getData(), environment)); } } @@ -125,7 +127,6 @@ public class ConfigMapPropertySource extends MapPropertySource { return new HashMap<>(); } - private static Map processAllEntries(Map input, Environment environment) { diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsFromFilePathsSpringBootTest.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsFromFilePathsTests.java similarity index 95% rename from spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsFromFilePathsSpringBootTest.java rename to spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsFromFilePathsTests.java index 771e4aa0..03df65f6 100644 --- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsFromFilePathsSpringBootTest.java +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsFromFilePathsTests.java @@ -43,9 +43,9 @@ import static org.springframework.cloud.kubernetes.config.ConfigMapTestUtil.crea "spring.application.name=configmap-path-example", "spring.cloud.kubernetes.config.enableApi=false", "spring.cloud.kubernetes.config.paths=" - + ConfigMapsFromFilePathsSpringBootTest.FIRST_FILE_NAME_FULL_PATH + "," - + ConfigMapsFromFilePathsSpringBootTest.SECOND_FILE_NAME_FULL_PATH }) -public class ConfigMapsFromFilePathsSpringBootTest { + + ConfigMapsFromFilePathsTests.FIRST_FILE_NAME_FULL_PATH + "," + + ConfigMapsFromFilePathsTests.SECOND_FILE_NAME_FULL_PATH }) +public class ConfigMapsFromFilePathsTests { protected static final String FILES_ROOT_PATH = "/tmp/scktests"; diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsMixedSpringBootTest.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsMixedTests.java similarity index 95% rename from spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsMixedSpringBootTest.java rename to spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsMixedTests.java index 7e260972..615674a0 100644 --- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsMixedSpringBootTest.java +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsMixedTests.java @@ -42,11 +42,11 @@ import static org.springframework.cloud.kubernetes.config.ConfigMapTestUtil.read @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, properties = { - "spring.application.name=" + ConfigMapsMixedSpringBootTest.APPLICATION_NAME, + "spring.application.name=" + ConfigMapsMixedTests.APPLICATION_NAME, "spring.cloud.kubernetes.config.enableApi=true", "spring.cloud.kubernetes.config.paths=" - + ConfigMapsMixedSpringBootTest.FILE_NAME_FULL_PATH }) -public class ConfigMapsMixedSpringBootTest { + + ConfigMapsMixedTests.FILE_NAME_FULL_PATH }) +public class ConfigMapsMixedTests { protected static final String FILES_ROOT_PATH = "/tmp/scktests"; diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsSpringBootTest.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsTests.java similarity index 98% rename from spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsSpringBootTest.java rename to spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsTests.java index bce19076..b2ae4e08 100644 --- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsSpringBootTest.java +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsTests.java @@ -45,7 +45,7 @@ import static org.assertj.core.api.Assertions.assertThat; "spring.application.name=configmap-example", "spring.cloud.kubernetes.reload.enabled=false" }) @AutoConfigureWebTestClient -public class ConfigMapsSpringBootTest { +public class ConfigMapsTests { private static final String APPLICATION_NAME = "configmap-example"; diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithActiveProfilesNameSpringBootTest.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithActiveProfilesNameTests.java similarity index 98% rename from spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithActiveProfilesNameSpringBootTest.java rename to spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithActiveProfilesNameTests.java index eb4abecc..2496cf63 100644 --- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithActiveProfilesNameSpringBootTest.java +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithActiveProfilesNameTests.java @@ -47,7 +47,7 @@ import static org.springframework.cloud.kubernetes.config.ConfigMapTestUtil.read "spring.cloud.kubernetes.reload.enabled=false" }) @ActiveProfiles("development") @AutoConfigureWebTestClient -public class ConfigMapsWithActiveProfilesNameSpringBootTest { +public class ConfigMapsWithActiveProfilesNameTests { private static final String APPLICATION_NAME = "configmap-with-active-profile-name-example"; diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfileExpressionSpringBootTest.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfileExpressionTests.java similarity index 98% rename from spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfileExpressionSpringBootTest.java rename to spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfileExpressionTests.java index 532216c0..5f1c271f 100644 --- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfileExpressionSpringBootTest.java +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfileExpressionTests.java @@ -46,7 +46,7 @@ import static org.springframework.cloud.kubernetes.config.ConfigMapTestUtil.read "spring.cloud.kubernetes.reload.enabled=false" }) @ActiveProfiles({ "production", "us-east" }) @AutoConfigureWebTestClient -public class ConfigMapsWithProfileExpressionSpringBootTest { +public class ConfigMapsWithProfileExpressionTests { @ClassRule public static KubernetesServer server = new KubernetesServer(); diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesNoActiveProfileSpringBootTest.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesNoActiveProfileTests.java similarity index 98% rename from spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesNoActiveProfileSpringBootTest.java rename to spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesNoActiveProfileTests.java index 18f24e52..72f87c69 100644 --- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesNoActiveProfileSpringBootTest.java +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesNoActiveProfileTests.java @@ -44,7 +44,7 @@ import static org.springframework.cloud.kubernetes.config.ConfigMapTestUtil.read "spring.application.name=configmap-with-profile-no-active-profiles-example", "spring.cloud.kubernetes.reload.enabled=false" }) @AutoConfigureWebTestClient -public class ConfigMapsWithProfilesNoActiveProfileSpringBootTest { +public class ConfigMapsWithProfilesNoActiveProfileTests { private static final String APPLICATION_NAME = "configmap-with-profile-no-active-profiles-example"; diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesSpringBootTest.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesTests.java similarity index 98% rename from spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesSpringBootTest.java rename to spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesTests.java index 32cfe9c0..147a1f93 100644 --- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesSpringBootTest.java +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesTests.java @@ -46,7 +46,7 @@ import static org.springframework.cloud.kubernetes.config.ConfigMapTestUtil.read "spring.cloud.kubernetes.reload.enabled=false" }) @ActiveProfiles("development") @AutoConfigureWebTestClient -public class ConfigMapsWithProfilesSpringBootTest { +public class ConfigMapsWithProfilesTests { private static final String APPLICATION_NAME = "configmap-with-profile-example"; diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithoutProfilesSpringBootTest.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithoutProfilesTests.java similarity index 98% rename from spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithoutProfilesSpringBootTest.java rename to spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithoutProfilesTests.java index 9e1165bb..1c893095 100644 --- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithoutProfilesSpringBootTest.java +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithoutProfilesTests.java @@ -43,7 +43,7 @@ import static org.springframework.cloud.kubernetes.config.ConfigMapTestUtil.read "spring.cloud.kubernetes.reload.enabled=false" }) @ActiveProfiles("development") @AutoConfigureWebTestClient -public class ConfigMapsWithoutProfilesSpringBootTest { +public class ConfigMapsWithoutProfilesTests { private static final String APPLICATION_NAME = "configmap-without-profile-example"; diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/MultipleConfigMapsSpringBootTest.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/MultipleConfigMapsTests.java similarity index 98% rename from spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/MultipleConfigMapsSpringBootTest.java rename to spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/MultipleConfigMapsTests.java index afc65ed7..366ad10d 100644 --- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/MultipleConfigMapsSpringBootTest.java +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/MultipleConfigMapsTests.java @@ -42,7 +42,7 @@ import org.springframework.test.web.reactive.server.WebTestClient; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = ExampleApp.class, properties = { "spring.cloud.bootstrap.name=multiplecms" }) @AutoConfigureWebTestClient -public class MultipleConfigMapsSpringBootTest { +public class MultipleConfigMapsTests { @ClassRule public static KubernetesServer server = new KubernetesServer(); diff --git a/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderAutoConfiguration.java b/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderAutoConfiguration.java index e4bb868b..902821cd 100644 --- a/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderAutoConfiguration.java +++ b/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderAutoConfiguration.java @@ -41,8 +41,7 @@ import org.springframework.integration.leader.event.LeaderEventPublisher; @Configuration @EnableConfigurationProperties(LeaderProperties.class) @ConditionalOnBean(KubernetesClient.class) -@ConditionalOnProperty(value = "spring.cloud.kubernetes.leader.enabled", - matchIfMissing = true) +@ConditionalOnProperty(value = "spring.cloud.kubernetes.leader.enabled", matchIfMissing = true) public class LeaderAutoConfiguration { @Bean diff --git a/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderAutoConfigurationTests.java b/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderAutoConfigurationTests.java index 08cdd31f..0072a811 100644 --- a/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderAutoConfigurationTests.java +++ b/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderAutoConfigurationTests.java @@ -33,8 +33,7 @@ import static org.hamcrest.Matchers.containsString; @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = { // Make sure test passes without Kubernetes cluster - "spring.cloud.kubernetes.leader.autoStartup=false" -}) + "spring.cloud.kubernetes.leader.autoStartup=false" }) public class LeaderAutoConfigurationTests { @Value("${local.server.port}")