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/KubernetesHelper.java index b8c9f849..228f4d18 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/KubernetesHelper.java @@ -46,7 +46,7 @@ public class KubernetesHelper { this.kubernetesClient = kubernetesClient; } - public boolean isPodAlive(String id) { + public boolean podExists(String id) { return kubernetesClient.pods() .inNamespace(leaderProperties.getNamespace(kubernetesClient.getNamespace())) .withLabels(leaderProperties.getLabels()) 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 76657cfb..b1f257cd 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 @@ -42,7 +42,7 @@ public class Leader { } public boolean isValid() { - return kubernetesHelper.isPodAlive(id); + return kubernetesHelper.podExists(id); } } 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/KubernetesHelperTest.java index 04789163..e6e1650e 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/KubernetesHelperTest.java @@ -95,7 +95,7 @@ public class KubernetesHelperTest { } @Test - public void shouldCheckIfPodIsAlive() { + public void shouldCheckIfPodExists() { given(mockKubernetesClient.getNamespace()).willReturn(NAMESPACE); given(mockKubernetesClient.pods()).willReturn(podMixedOperation); given(podMixedOperation.inNamespace(NAMESPACE)).willReturn(podNonNamespaceOperation); @@ -105,7 +105,7 @@ public class KubernetesHelperTest { given(mockPod.getMetadata()).willReturn(mockObjectMeta); given(mockObjectMeta.getName()).willReturn("test-id"); - boolean result = kubernetesHelper.isPodAlive("test-id"); + boolean result = kubernetesHelper.podExists("test-id"); assertThat(result).isTrue(); verify(mockObjectMeta).getName(); 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 7d86048d..b23531dc 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 @@ -42,12 +42,12 @@ public class LeaderTest { @Test public void shouldCheckValidity() { - given(mockKubernetesHelper.isPodAlive(ID)).willReturn(true); + given(mockKubernetesHelper.podExists(ID)).willReturn(true); boolean result = leader.isValid(); assertThat(result).isTrue(); - verify(mockKubernetesHelper).isPodAlive(ID); + verify(mockKubernetesHelper).podExists(ID); } } 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 aa5f2f7d..ff04c35a 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 @@ -86,7 +86,7 @@ public class LeadershipControllerTest { @Test public void shouldAcquireWithoutEventsIfAlreadyLeader() throws InterruptedException { given(mockKubernetesHelper.getConfigMap()).willReturn(mockConfigMap); - given(mockKubernetesHelper.isPodAlive(ID)).willReturn(true); + given(mockKubernetesHelper.podExists(ID)).willReturn(true); given(mockConfigMap.getData()).willReturn(leaderData); boolean result = leadershipController.acquire(mockCandidate); @@ -102,7 +102,7 @@ public class LeadershipControllerTest { public void shouldTakeOverLeadershipFromInvalidLeader() throws InterruptedException { String anotherId = "another-test-id"; given(mockKubernetesHelper.getConfigMap()).willReturn(mockConfigMap); - given(mockKubernetesHelper.isPodAlive(ID)).willReturn(false); + given(mockKubernetesHelper.podExists(ID)).willReturn(false); given(mockConfigMap.getData()).willReturn(leaderData); given(mockCandidate.getId()).willReturn(anotherId); @@ -117,7 +117,7 @@ public class LeadershipControllerTest { @Test public void shouldFailToAcquireIfThereIsAnotherLeader() { given(mockKubernetesHelper.getConfigMap()).willReturn(mockConfigMap); - given(mockKubernetesHelper.isPodAlive(ID)).willReturn(true); + given(mockKubernetesHelper.podExists(ID)).willReturn(true); given(mockConfigMap.getData()).willReturn(leaderData); given(mockCandidate.getId()).willReturn("another-test-id");