From 01fe68eb821c70edb310df7be5fe0efc5d999cfb Mon Sep 17 00:00:00 2001 From: Gytis Trikleris Date: Thu, 14 Jun 2018 12:41:05 +0200 Subject: [PATCH] Rename KubernetesHelper to LeaderKubernetesHelper --- .../springframework/cloud/kubernetes/leader/Leader.java | 4 ++-- .../cloud/kubernetes/leader/LeaderAutoConfiguration.java | 9 +++++---- ...KubernetesHelper.java => LeaderKubernetesHelper.java} | 4 ++-- .../cloud/kubernetes/leader/LeadershipController.java | 4 ++-- ...esHelperTest.java => LeaderKubernetesHelperTest.java} | 6 +++--- .../cloud/kubernetes/leader/LeaderTest.java | 2 +- .../kubernetes/leader/LeadershipControllerTest.java | 2 +- 7 files changed, 16 insertions(+), 15 deletions(-) rename spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/{KubernetesHelper.java => LeaderKubernetesHelper.java} (95%) rename spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/{KubernetesHelperTest.java => LeaderKubernetesHelperTest.java} (97%) diff --git a/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/Leader.java b/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/Leader.java index b1f257cd..1d52d856 100644 --- a/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/Leader.java +++ b/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/Leader.java @@ -25,9 +25,9 @@ public class Leader { private final String id; - private final KubernetesHelper kubernetesHelper; + private final LeaderKubernetesHelper kubernetesHelper; - public Leader(String role, String id, KubernetesHelper kubernetesHelper) { + public Leader(String role, String id, LeaderKubernetesHelper kubernetesHelper) { this.role = role; this.id = id; this.kubernetesHelper = kubernetesHelper; 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 29e0e6cb..44801d2b 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 @@ -50,13 +50,14 @@ public class LeaderAutoConfiguration { } @Bean - KubernetesHelper kubernetesHelper(LeaderProperties leaderProperties, KubernetesClient kubernetesClient) { - return new KubernetesHelper(leaderProperties, kubernetesClient); + LeaderKubernetesHelper leaderKubernetesHelper(LeaderProperties leaderProperties, + KubernetesClient kubernetesClient) { + return new LeaderKubernetesHelper(leaderProperties, kubernetesClient); } @Bean - LeadershipController leadershipController(LeaderProperties leaderProperties, KubernetesHelper kubernetesHelper, - LeaderEventPublisher leaderEventPublisher) { + LeadershipController leadershipController(LeaderProperties leaderProperties, + LeaderKubernetesHelper kubernetesHelper, LeaderEventPublisher leaderEventPublisher) { return new LeadershipController(leaderProperties, kubernetesHelper, leaderEventPublisher); } diff --git a/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/KubernetesHelper.java b/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderKubernetesHelper.java similarity index 95% rename from spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/KubernetesHelper.java rename to spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderKubernetesHelper.java index 228f4d18..d3844835 100644 --- a/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/KubernetesHelper.java +++ b/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderKubernetesHelper.java @@ -27,7 +27,7 @@ import io.fabric8.kubernetes.client.KubernetesClient; /** * @author Gytis Trikleris */ -public class KubernetesHelper { +public class LeaderKubernetesHelper { private static final String PROVIDER_KEY = "provider"; @@ -41,7 +41,7 @@ public class KubernetesHelper { private final KubernetesClient kubernetesClient; - public KubernetesHelper(LeaderProperties leaderProperties, KubernetesClient kubernetesClient) { + public LeaderKubernetesHelper(LeaderProperties leaderProperties, KubernetesClient kubernetesClient) { this.leaderProperties = leaderProperties; this.kubernetesClient = kubernetesClient; } diff --git a/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeadershipController.java b/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeadershipController.java index 9255d653..e423f0f6 100644 --- a/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeadershipController.java +++ b/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeadershipController.java @@ -36,11 +36,11 @@ public class LeadershipController { private final LeaderProperties leaderProperties; - private final KubernetesHelper kubernetesHelper; + private final LeaderKubernetesHelper kubernetesHelper; private final LeaderEventPublisher leaderEventPublisher; - public LeadershipController(LeaderProperties leaderProperties, KubernetesHelper kubernetesHelper, + public LeadershipController(LeaderProperties leaderProperties, LeaderKubernetesHelper kubernetesHelper, LeaderEventPublisher leaderEventPublisher) { this.leaderProperties = leaderProperties; this.kubernetesHelper = kubernetesHelper; diff --git a/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/KubernetesHelperTest.java b/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderKubernetesHelperTest.java similarity index 97% rename from spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/KubernetesHelperTest.java rename to spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderKubernetesHelperTest.java index e6e1650e..ebc425fb 100644 --- a/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/KubernetesHelperTest.java +++ b/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderKubernetesHelperTest.java @@ -35,7 +35,7 @@ import static org.mockito.Mockito.verify; * @author Gytis Trikleris */ @RunWith(MockitoJUnitRunner.class) -public class KubernetesHelperTest { +public class LeaderKubernetesHelperTest { private static final String NAMESPACE = "test-namespace"; @@ -82,7 +82,7 @@ public class KubernetesHelperTest { @Mock private ConfigMap mockConfigMap; - private KubernetesHelper kubernetesHelper; + private LeaderKubernetesHelper kubernetesHelper; @Before public void before() { @@ -91,7 +91,7 @@ public class KubernetesHelperTest { given(mockKubernetesClient.getNamespace()).willReturn(NAMESPACE); - kubernetesHelper = new KubernetesHelper(mockLeaderProperties, mockKubernetesClient); + kubernetesHelper = new LeaderKubernetesHelper(mockLeaderProperties, mockKubernetesClient); } @Test diff --git a/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderTest.java b/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderTest.java index b23531dc..5f92288b 100644 --- a/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderTest.java +++ b/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderTest.java @@ -21,7 +21,7 @@ public class LeaderTest { private static final String ID = "test-id"; @Mock - private KubernetesHelper mockKubernetesHelper; + private LeaderKubernetesHelper mockKubernetesHelper; private Leader leader; diff --git a/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeadershipControllerTest.java b/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeadershipControllerTest.java index ff04c35a..b5271711 100644 --- a/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeadershipControllerTest.java +++ b/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeadershipControllerTest.java @@ -38,7 +38,7 @@ public class LeadershipControllerTest { private LeaderProperties mockLeaderProperties; @Mock - private KubernetesHelper mockKubernetesHelper; + private LeaderKubernetesHelper mockKubernetesHelper; @Mock private ConfigMap mockConfigMap;