From 1c91d75358da03a4596965e72a1b63607c251e2a Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Wed, 16 Aug 2023 15:34:34 -0400 Subject: [PATCH] Renaming class to avoid conflicts --- .../client/config/secrets_retry/SecretsFailFastDisabled.java | 2 +- .../secrets_retry/SecretsFailFastEnabledButRetryDisabled.java | 2 +- .../{Application.java => SecretsRetryApplication.java} | 2 +- .../SecretsRetryDisabledButConfigRetryEnabled.java | 2 +- .../client/config/secrets_retry/SecretsRetryEnabled.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/{Application.java => SecretsRetryApplication.java} (96%) diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/SecretsFailFastDisabled.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/SecretsFailFastDisabled.java index e83623b8..dd23fe1a 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/SecretsFailFastDisabled.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/SecretsFailFastDisabled.java @@ -51,7 +51,7 @@ import static org.mockito.Mockito.verify; properties = { "spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enable-api=true", "spring.main.cloud-platform=KUBERNETES", "spring.config.import=kubernetes:" }, - classes = Application.class) + classes = SecretsRetryApplication.class) class SecretsFailFastDisabled { private static final String API = "/api/v1/namespaces/default/secrets"; diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/SecretsFailFastEnabledButRetryDisabled.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/SecretsFailFastEnabledButRetryDisabled.java index 9f942b4a..b536c300 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/SecretsFailFastEnabledButRetryDisabled.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/SecretsFailFastEnabledButRetryDisabled.java @@ -56,7 +56,7 @@ import static org.mockito.Mockito.verify; "spring.cloud.kubernetes.secrets.retry.enabled=false", "spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enable-api=true", "spring.main.cloud-platform=KUBERNETES", "spring.config.import=kubernetes:" }, - classes = Application.class) + classes = SecretsRetryApplication.class) class SecretsFailFastEnabledButRetryDisabled { private static final String API = "/api/v1/namespaces/default/secrets"; diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/Application.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/SecretsRetryApplication.java similarity index 96% rename from spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/Application.java rename to spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/SecretsRetryApplication.java index 7f3b7731..36a541b9 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/Application.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/SecretsRetryApplication.java @@ -19,6 +19,6 @@ package org.springframework.cloud.kubernetes.client.config.secrets_retry; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -class Application { +class SecretsRetryApplication { } diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/SecretsRetryDisabledButConfigRetryEnabled.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/SecretsRetryDisabledButConfigRetryEnabled.java index 563ae96c..1791fef9 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/SecretsRetryDisabledButConfigRetryEnabled.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/SecretsRetryDisabledButConfigRetryEnabled.java @@ -55,7 +55,7 @@ import static org.mockito.Mockito.verify; "spring.cloud.kubernetes.secrets.retry.enabled=false", "spring.cloud.kubernetes.config.fail-fast=true", "spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enable-api=true", "spring.main.cloud-platform=KUBERNETES", "spring.config.import=kubernetes:" }, - classes = Application.class) + classes = SecretsRetryApplication.class) class SecretsRetryDisabledButConfigRetryEnabled { private static final String API = "/api/v1/namespaces/default/secrets"; diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/SecretsRetryEnabled.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/SecretsRetryEnabled.java index 0631d2ab..bda4f7b4 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/SecretsRetryEnabled.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/SecretsRetryEnabled.java @@ -61,7 +61,7 @@ import static org.mockito.Mockito.spy; "spring.cloud.kubernetes.secrets.retry.max-attempts=5", "spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enable-api=true", "spring.main.cloud-platform=KUBERNETES", "spring.config.import=kubernetes:" }, - classes = Application.class) + classes = SecretsRetryApplication.class) class SecretsRetryEnabled { private static final String API = "/api/v1/namespaces/default/secrets";