diff --git a/spring-cloud-kubernetes-client-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/KubernetesClientActuatorConfiguration.java b/spring-cloud-kubernetes-client-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/KubernetesClientActuatorConfiguration.java index ff46d1b5c1..c49908a761 100644 --- a/spring-cloud-kubernetes-client-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/KubernetesClientActuatorConfiguration.java +++ b/spring-cloud-kubernetes-client-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/KubernetesClientActuatorConfiguration.java @@ -30,17 +30,17 @@ */ @Configuration(proxyBeanMethods = false) @ConditionalOnKubernetesHealthIndicatorEnabled -public class KubernetesClientActuatorConfiguration { +final class KubernetesClientActuatorConfiguration { @Bean @ConditionalOnEnabledHealthIndicator("kubernetes") - public KubernetesClientHealthIndicator kubernetesHealthIndicator(PodUtils podUtils) { + KubernetesClientHealthIndicator kubernetesHealthIndicator(PodUtils podUtils) { return new KubernetesClientHealthIndicator(podUtils); } @Bean @ConditionalOnEnabledInfoContributor("kubernetes") - public KubernetesClientInfoContributor kubernetesInfoContributor(PodUtils podUtils) { + KubernetesClientInfoContributor kubernetesInfoContributor(PodUtils podUtils) { return new KubernetesClientInfoContributor(podUtils); } diff --git a/spring-cloud-kubernetes-client-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/KubernetesClientAutoConfiguration.java b/spring-cloud-kubernetes-client-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/KubernetesClientAutoConfiguration.java index 6be0aecd16..8cbd1b4a0c 100644 --- a/spring-cloud-kubernetes-client-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/KubernetesClientAutoConfiguration.java +++ b/spring-cloud-kubernetes-client-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/KubernetesClientAutoConfiguration.java @@ -38,17 +38,17 @@ @Configuration(proxyBeanMethods = false) @ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES) @AutoConfigureAfter(KubernetesCommonsAutoConfiguration.class) -public class KubernetesClientAutoConfiguration { +public final class KubernetesClientAutoConfiguration { @Bean @ConditionalOnMissingBean - public CoreV1Api coreApi(ApiClient apiClient) { + CoreV1Api coreApi(ApiClient apiClient) { return new CoreV1Api(apiClient); } @Bean @ConditionalOnMissingBean - public ApiClient apiClient(KubernetesClientProperties clientProperties) { + ApiClient apiClient(KubernetesClientProperties clientProperties) { ApiClient apiClient = kubernetesApiClient(); apiClient.setUserAgent(clientProperties.userAgent()); return apiClient; @@ -62,7 +62,7 @@ public KubernetesNamespaceProvider kubernetesNamespaceProvider(Environment envir @Bean @ConditionalOnMissingBean - public KubernetesClientPodUtils kubernetesPodUtils(CoreV1Api client, + KubernetesClientPodUtils kubernetesPodUtils(CoreV1Api client, KubernetesNamespaceProvider kubernetesNamespaceProvider) { return new KubernetesClientPodUtils(client, kubernetesNamespaceProvider.getNamespace(), true); } diff --git a/spring-cloud-kubernetes-client-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/KubernetesClientHealthIndicator.java b/spring-cloud-kubernetes-client-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/KubernetesClientHealthIndicator.java index db9ca786be..6ee4ff1909 100644 --- a/spring-cloud-kubernetes-client-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/KubernetesClientHealthIndicator.java +++ b/spring-cloud-kubernetes-client-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/KubernetesClientHealthIndicator.java @@ -31,11 +31,11 @@ /** * @author Ryan Baxter */ -public class KubernetesClientHealthIndicator extends AbstractKubernetesHealthIndicator { +final class KubernetesClientHealthIndicator extends AbstractKubernetesHealthIndicator { private final PodUtils utils; - public KubernetesClientHealthIndicator(PodUtils utils) { + KubernetesClientHealthIndicator(PodUtils utils) { this.utils = utils; } diff --git a/spring-cloud-kubernetes-client-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/KubernetesClientInfoContributor.java b/spring-cloud-kubernetes-client-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/KubernetesClientInfoContributor.java index 5276647f48..e81f363f46 100644 --- a/spring-cloud-kubernetes-client-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/KubernetesClientInfoContributor.java +++ b/spring-cloud-kubernetes-client-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/KubernetesClientInfoContributor.java @@ -31,11 +31,11 @@ /** * @author Ryan Baxter */ -public class KubernetesClientInfoContributor extends AbstractKubernetesInfoContributor { +final class KubernetesClientInfoContributor extends AbstractKubernetesInfoContributor { private final PodUtils utils; - public KubernetesClientInfoContributor(PodUtils utils) { + KubernetesClientInfoContributor(PodUtils utils) { this.utils = utils; } diff --git a/spring-cloud-kubernetes-client-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/KubernetesClientPodUtils.java b/spring-cloud-kubernetes-client-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/KubernetesClientPodUtils.java index 9a2cfc8d4c..3ca97f5070 100644 --- a/spring-cloud-kubernetes-client-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/KubernetesClientPodUtils.java +++ b/spring-cloud-kubernetes-client-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/KubernetesClientPodUtils.java @@ -34,17 +34,7 @@ /** * @author Ryan Baxter */ -public class KubernetesClientPodUtils implements PodUtils { - - /** - * Hostname environment variable name. - */ - public static final String HOSTNAME = "HOSTNAME"; - - /** - * KUBERNETES_SERVICE_HOST environment variable name. - */ - public static final String KUBERNETES_SERVICE_HOST = "KUBERNETES_SERVICE_HOST"; +final class KubernetesClientPodUtils implements PodUtils { private static final Log LOG = LogFactory.getLog(KubernetesClientPodUtils.class); @@ -62,14 +52,14 @@ public class KubernetesClientPodUtils implements PodUtils { // mainly needed for the health and info contributors, so that they report DOWN // correctly - public KubernetesClientPodUtils(CoreV1Api client, String namespace, boolean failFast) { + KubernetesClientPodUtils(CoreV1Api client, String namespace, boolean failFast) { if (client == null) { throw new IllegalArgumentException("Must provide an instance of KubernetesClient"); } this.client = client; - this.hostName = EnvReader.getEnv(HOSTNAME); - this.serviceHost = EnvReader.getEnv(KUBERNETES_SERVICE_HOST); + this.hostName = EnvReader.getEnv("HOSTNAME"); + this.serviceHost = EnvReader.getEnv("KUBERNETES_SERVICE_HOST"); this.current = LazilyInstantiate.using(this::internalGetPod); this.namespace = namespace; this.failFast = failFast; diff --git a/spring-cloud-kubernetes-client-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/profile/KubernetesClientProfileEnvironmentPostProcessor.java b/spring-cloud-kubernetes-client-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/KubernetesClientProfileEnvironmentPostProcessor.java similarity index 83% rename from spring-cloud-kubernetes-client-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/profile/KubernetesClientProfileEnvironmentPostProcessor.java rename to spring-cloud-kubernetes-client-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/KubernetesClientProfileEnvironmentPostProcessor.java index 8e6947bb9d..c50ea26b33 100644 --- a/spring-cloud-kubernetes-client-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/profile/KubernetesClientProfileEnvironmentPostProcessor.java +++ b/spring-cloud-kubernetes-client-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/KubernetesClientProfileEnvironmentPostProcessor.java @@ -14,11 +14,10 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.client.profile; +package org.springframework.cloud.kubernetes.client; import io.kubernetes.client.openapi.apis.CoreV1Api; -import org.springframework.cloud.kubernetes.client.KubernetesClientPodUtils; import org.springframework.cloud.kubernetes.commons.profile.AbstractKubernetesProfileEnvironmentPostProcessor; import org.springframework.core.env.Environment; @@ -28,7 +27,7 @@ * @author Ryan Baxter * @author Thomas Vitale */ -public class KubernetesClientProfileEnvironmentPostProcessor extends AbstractKubernetesProfileEnvironmentPostProcessor { +final class KubernetesClientProfileEnvironmentPostProcessor extends AbstractKubernetesProfileEnvironmentPostProcessor { @Override protected boolean isInsideKubernetes(Environment environment) { diff --git a/spring-cloud-kubernetes-client-autoconfig/src/main/resources/META-INF/spring.factories b/spring-cloud-kubernetes-client-autoconfig/src/main/resources/META-INF/spring.factories index b4cd174ee7..a357eff169 100644 --- a/spring-cloud-kubernetes-client-autoconfig/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-kubernetes-client-autoconfig/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.EnvironmentPostProcessor=\ -org.springframework.cloud.kubernetes.client.profile.KubernetesClientProfileEnvironmentPostProcessor +org.springframework.cloud.kubernetes.client.KubernetesClientProfileEnvironmentPostProcessor diff --git a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorDisabledHealthTest.java b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorDisabledHealthTest.java index 023d628002..5a053ccea8 100644 --- a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorDisabledHealthTest.java +++ b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorDisabledHealthTest.java @@ -23,14 +23,13 @@ import org.springframework.boot.health.registry.ReactiveHealthContributorRegistry; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.web.server.test.LocalManagementPort; -import org.springframework.cloud.kubernetes.client.example.App; import org.springframework.http.MediaType; import org.springframework.test.web.reactive.server.WebTestClient; /** * @author wind57 */ -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = TestApp.class, properties = { "management.health.kubernetes.enabled=false", "management.endpoint.health.show-details=always", "management.endpoint.health.show-components=always", "spring.main.cloud-platform=KUBERNETES", "management.endpoints.web.exposure.include=health" }) diff --git a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledFailFastExceptionTest.java b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledFailFastExceptionTest.java index 2b819dd414..a8fb84fcfe 100644 --- a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledFailFastExceptionTest.java +++ b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledFailFastExceptionTest.java @@ -34,7 +34,6 @@ import org.springframework.boot.health.contributor.Status; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.TestConfiguration; -import org.springframework.cloud.kubernetes.client.example.App; import org.springframework.cloud.kubernetes.commons.EnvReader; import org.springframework.context.annotation.Bean; @@ -42,7 +41,7 @@ * @author wind57 */ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, - classes = { App.class, ActuatorEnabledFailFastExceptionTest.ActuatorConfig.class }, + classes = { TestApp.class, ActuatorEnabledFailFastExceptionTest.ActuatorConfig.class }, properties = { "management.endpoint.health.show-details=always", "management.endpoint.health.show-components=always", "management.endpoints.web.exposure.include=health", "spring.main.cloud-platform=KUBERNETES" }) @@ -76,9 +75,8 @@ private static void mocks() { envReaderMockedStatic = Mockito.mockStatic(EnvReader.class); pathsMockedStatic = Mockito.mockStatic(Paths.class, Mockito.CALLS_REAL_METHODS); - envReaderMockedStatic.when(() -> EnvReader.getEnv(KubernetesClientPodUtils.KUBERNETES_SERVICE_HOST)) - .thenReturn("k8s-host"); - envReaderMockedStatic.when(() -> EnvReader.getEnv(KubernetesClientPodUtils.HOSTNAME)).thenReturn("host"); + envReaderMockedStatic.when(() -> EnvReader.getEnv("KUBERNETES_SERVICE_HOST")).thenReturn("k8s-host"); + envReaderMockedStatic.when(() -> EnvReader.getEnv("HOSTNAME")).thenReturn("host"); Path serviceAccountTokenPath = Mockito.mock(Path.class); File serviceAccountTokenFile = Mockito.mock(File.class); diff --git a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledHealthTest.java b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledHealthTest.java index c2f320c006..6d9e4e276e 100644 --- a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledHealthTest.java +++ b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledHealthTest.java @@ -23,11 +23,10 @@ import org.springframework.boot.health.registry.HealthContributorRegistry; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.web.server.test.LocalManagementPort; -import org.springframework.cloud.kubernetes.client.example.App; import org.springframework.http.MediaType; import org.springframework.test.web.reactive.server.WebTestClient; -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = TestApp.class, properties = { "management.health.kubernetes.enabled=true", "management.endpoint.health.show-details=always", "management.endpoint.health.show-components=always", "management.endpoints.web.exposure.include=health", "spring.main.cloud-platform=KUBERNETES" }) diff --git a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledNoFailFastExceptionTest.java b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledNoFailFastExceptionTest.java index 1a6c9acfdd..23bc9b3f7f 100644 --- a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledNoFailFastExceptionTest.java +++ b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledNoFailFastExceptionTest.java @@ -34,7 +34,6 @@ import org.springframework.boot.health.contributor.Status; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.TestConfiguration; -import org.springframework.cloud.kubernetes.client.example.App; import org.springframework.cloud.kubernetes.commons.EnvReader; import org.springframework.context.annotation.Bean; @@ -42,7 +41,7 @@ * @author wind57 */ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, - classes = { App.class, ActuatorEnabledNoFailFastExceptionTest.ActuatorConfig.class }, + classes = { TestApp.class, ActuatorEnabledNoFailFastExceptionTest.ActuatorConfig.class }, properties = { "management.endpoint.health.show-details=always", "management.endpoint.health.show-components=always", "management.endpoints.web.exposure.include=health", "spring.main.cloud-platform=KUBERNETES" }) @@ -79,9 +78,8 @@ private static void mocks() { envReaderMockedStatic = Mockito.mockStatic(EnvReader.class); pathsMockedStatic = Mockito.mockStatic(Paths.class, Mockito.CALLS_REAL_METHODS); - envReaderMockedStatic.when(() -> EnvReader.getEnv(KubernetesClientPodUtils.KUBERNETES_SERVICE_HOST)) - .thenReturn("k8s-host"); - envReaderMockedStatic.when(() -> EnvReader.getEnv(KubernetesClientPodUtils.HOSTNAME)).thenReturn("host"); + envReaderMockedStatic.when(() -> EnvReader.getEnv("KUBERNETES_SERVICE_HOST")).thenReturn("k8s-host"); + envReaderMockedStatic.when(() -> EnvReader.getEnv("HOSTNAME")).thenReturn("host"); Path serviceAccountTokenPath = Mockito.mock(Path.class); File serviceAccountTokenFile = Mockito.mock(File.class); diff --git a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientHealthIndicatorInsideTests.java b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientHealthIndicatorInsideTests.java index c8b23dfe19..f40eea70e6 100644 --- a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientHealthIndicatorInsideTests.java +++ b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientHealthIndicatorInsideTests.java @@ -20,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.cloud.kubernetes.client.example.App; import org.springframework.context.ApplicationContext; import static org.assertj.core.api.Assertions.assertThat; @@ -28,7 +27,7 @@ /** * @author wind57 */ -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = TestApp.class, properties = "spring.main.cloud-platform=KUBERNETES") public class KubernetesClientHealthIndicatorInsideTests { diff --git a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientHealthIndicatorNotInsideTests.java b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientHealthIndicatorNotInsideTests.java index da521692a0..0d482e9530 100644 --- a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientHealthIndicatorNotInsideTests.java +++ b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientHealthIndicatorNotInsideTests.java @@ -21,7 +21,6 @@ import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.cloud.kubernetes.client.example.App; import org.springframework.context.ApplicationContext; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -29,7 +28,7 @@ /** * @author wind57 */ -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = TestApp.class, properties = { "management.health.kubernetes.enabled=false" }) public class KubernetesClientHealthIndicatorNotInsideTests { diff --git a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientInfoContributorInsideTests.java b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientInfoContributorInsideTests.java index ae26620a35..ce1b0562f1 100644 --- a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientInfoContributorInsideTests.java +++ b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientInfoContributorInsideTests.java @@ -20,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.cloud.kubernetes.client.example.App; import org.springframework.context.ApplicationContext; import static org.assertj.core.api.Assertions.assertThat; @@ -28,7 +27,7 @@ /** * @author wind57 */ -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = TestApp.class, properties = "spring.main.cloud-platform=KUBERNETES") public class KubernetesClientInfoContributorInsideTests { diff --git a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientInfoContributorNotInsideTests.java b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientInfoContributorNotInsideTests.java index 9196c5f2f5..f349a945a1 100644 --- a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientInfoContributorNotInsideTests.java +++ b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientInfoContributorNotInsideTests.java @@ -21,7 +21,6 @@ import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.cloud.kubernetes.client.example.App; import org.springframework.context.ApplicationContext; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -29,7 +28,7 @@ /** * @author wind57 */ -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = TestApp.class, properties = { "management.info.kubernetes.enabled=false" }) public class KubernetesClientInfoContributorNotInsideTests { diff --git a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientPodUtilsTests.java b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientPodUtilsTests.java index 3859838ca0..ba26ee98a9 100644 --- a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientPodUtilsTests.java +++ b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientPodUtilsTests.java @@ -43,10 +43,6 @@ */ class KubernetesClientPodUtilsTests { - private static final String KUBERNETES_SERVICE_HOST = KubernetesClientPodUtils.KUBERNETES_SERVICE_HOST; - - private static final String HOSTNAME = KubernetesClientPodUtils.HOSTNAME; - private static final String SERVICE_ACCOUNT_TOKEN_PATH = Config.SERVICEACCOUNT_TOKEN_PATH; private static final String SERVICE_ACCOUNT_CERT_PATH = Config.SERVICEACCOUNT_CA_PATH; @@ -150,11 +146,11 @@ private void assertSupplierAndClient(Supplier sup, KubernetesClientPodUti } private void mockHost(String host) { - envReader.when(() -> EnvReader.getEnv(KUBERNETES_SERVICE_HOST)).thenReturn(host); + envReader.when(() -> EnvReader.getEnv("KUBERNETES_SERVICE_HOST")).thenReturn(host); } private void mockHostname(String name) { - envReader.when(() -> EnvReader.getEnv(HOSTNAME)).thenReturn(name); + envReader.when(() -> EnvReader.getEnv("HOSTNAME")).thenReturn(name); } private void mockTokenPath(boolean result) { diff --git a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/profile/KubernetesClientProfileEnvironmentPostProcessorNoProfileTests.java b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientProfileEnvironmentPostProcessorNoProfileTests.java similarity index 89% rename from spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/profile/KubernetesClientProfileEnvironmentPostProcessorNoProfileTests.java rename to spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientProfileEnvironmentPostProcessorNoProfileTests.java index c639d33a95..d1bd75c5df 100644 --- a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/profile/KubernetesClientProfileEnvironmentPostProcessorNoProfileTests.java +++ b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientProfileEnvironmentPostProcessorNoProfileTests.java @@ -14,13 +14,12 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.client.profile; +package org.springframework.cloud.kubernetes.client; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.cloud.kubernetes.client.example.App; import org.springframework.core.env.Environment; import static org.assertj.core.api.Assertions.assertThat; @@ -29,7 +28,7 @@ /** * @author Ryan Baxter */ -@SpringBootTest(classes = { App.class }) +@SpringBootTest(classes = { TestApp.class }) class KubernetesClientProfileEnvironmentPostProcessorNoProfileTests { @Autowired diff --git a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/profile/KubernetesClientProfileEnvironmentPostProcessorTests.java b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientProfileEnvironmentPostProcessorTests.java similarity index 88% rename from spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/profile/KubernetesClientProfileEnvironmentPostProcessorTests.java rename to spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientProfileEnvironmentPostProcessorTests.java index 82589a309d..c74c37a2bc 100644 --- a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/profile/KubernetesClientProfileEnvironmentPostProcessorTests.java +++ b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientProfileEnvironmentPostProcessorTests.java @@ -14,13 +14,12 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.client.profile; +package org.springframework.cloud.kubernetes.client; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.cloud.kubernetes.client.example.App; import org.springframework.core.env.Environment; import static io.kubernetes.client.util.Config.ENV_SERVICE_HOST; @@ -32,7 +31,7 @@ * @author Thomas Vitale */ @SpringBootTest(properties = { ENV_SERVICE_HOST + "=10.0.0.1", ENV_SERVICE_PORT + "=80", - "spring.main.cloud-platform=KUBERNETES" }, classes = { App.class }) + "spring.main.cloud-platform=KUBERNETES" }, classes = { TestApp.class }) class KubernetesClientProfileEnvironmentPostProcessorTests { @Autowired diff --git a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/default_api/App.java b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/TestApp.java similarity index 76% rename from spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/default_api/App.java rename to spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/TestApp.java index c4b45ee5c9..b890dd3472 100644 --- a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/default_api/App.java +++ b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/TestApp.java @@ -14,11 +14,16 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.client.default_api; +package org.springframework.cloud.kubernetes.client; +import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -class App { +public class TestApp { + + public static void main(String[] args) { + SpringApplication.run(TestApp.class, args); + } } diff --git a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/default_api/ApiClientUserAgentDefaultHeader.java b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/default_api/ApiClientUserAgentDefaultHeaderTest.java similarity index 93% rename from spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/default_api/ApiClientUserAgentDefaultHeader.java rename to spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/default_api/ApiClientUserAgentDefaultHeaderTest.java index 048d60bd18..f2eabf2b4a 100644 --- a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/default_api/ApiClientUserAgentDefaultHeader.java +++ b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/default_api/ApiClientUserAgentDefaultHeaderTest.java @@ -26,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.cloud.kubernetes.client.TestApp; import static org.assertj.core.api.Assertions.assertThat; @@ -40,9 +41,9 @@ * creates a defaultApiClient that will be autowired instead of the ApiClient created in * KubernetesClientAutoConfiguration */ -@SpringBootTest(classes = App.class, +@SpringBootTest(classes = TestApp.class, properties = { "kubernetes.informer.enabled=false", "spring.main.cloud-platform=KUBERNETES" }) -class ApiClientUserAgentDefaultHeader { +class ApiClientUserAgentDefaultHeaderTest { @Autowired private ApiClient apiClient; diff --git a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/default_api/ApiClientUserAgentNonDefaultHeader.java b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/default_api/ApiClientUserAgentNonDefaultHeaderTest.java similarity index 91% rename from spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/default_api/ApiClientUserAgentNonDefaultHeader.java rename to spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/default_api/ApiClientUserAgentNonDefaultHeaderTest.java index cf27606fc4..3a1e936e23 100644 --- a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/default_api/ApiClientUserAgentNonDefaultHeader.java +++ b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/default_api/ApiClientUserAgentNonDefaultHeaderTest.java @@ -26,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.cloud.kubernetes.client.TestApp; import org.springframework.context.ConfigurableApplicationContext; import static org.assertj.core.api.Assertions.assertThat; @@ -41,9 +42,9 @@ * creates a defaultApiClient that will be autowired instead of the ApiClient created in * KubernetesClientAutoConfiguration */ -@SpringBootTest(classes = App.class, properties = { "kubernetes.informer.enabled=false", +@SpringBootTest(classes = TestApp.class, properties = { "kubernetes.informer.enabled=false", "spring.cloud.kubernetes.client.userAgent=non-default", "spring.main.cloud-platform=KUBERNETES" }) -class ApiClientUserAgentNonDefaultHeader { +class ApiClientUserAgentNonDefaultHeaderTest { @Autowired private ApiClient apiClient; diff --git a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/default_api/DefaultApiClientNotSameAsApiClient.java b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/default_api/DefaultApiClientNotSameAsApiClientTest.java similarity index 92% rename from spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/default_api/DefaultApiClientNotSameAsApiClient.java rename to spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/default_api/DefaultApiClientNotSameAsApiClientTest.java index 3027f50916..0cfec68721 100644 --- a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/default_api/DefaultApiClientNotSameAsApiClient.java +++ b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/default_api/DefaultApiClientNotSameAsApiClientTest.java @@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.cloud.kubernetes.client.TestApp; import static org.assertj.core.api.Assertions.assertThat; @@ -35,9 +36,9 @@ * creates a defaultApiClient that will be autowired instead of the ApiClient created in * KubernetesClientAutoConfiguration */ -@SpringBootTest(classes = App.class, +@SpringBootTest(classes = TestApp.class, properties = { "kubernetes.informer.enabled=false", "spring.main.cloud-platform=KUBERNETES" }) -class DefaultApiClientNotSameAsApiClient { +class DefaultApiClientNotSameAsApiClientTest { @Autowired private ApiClient apiClient; diff --git a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/example/App.java b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/example/App.java deleted file mode 100644 index 3c53f3d371..0000000000 --- a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/example/App.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2013-present 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.client.example; - -import io.kubernetes.client.openapi.ApiClient; -import okhttp3.OkHttpClient; - -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Bean; - -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -/** - * @author wind57 - */ -@SpringBootApplication -public class App { - - @Bean - public ApiClient apiClient() { - ApiClient apiClient = mock(ApiClient.class); - when(apiClient.getHttpClient()).thenReturn(new OkHttpClient.Builder().build()); - return apiClient; - } - -}