SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename KubernetesHelper to LeaderKubernetesHelper

Browse Source
This commit is contained in:
Gytis Trikleris
2018-06-14 12:41:05 +02:00
committed by Ioannis Canellos
parent 0690831e9e
commit 09c6be34da
7 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/Leader.java
View File

@@ -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;

9
spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderAutoConfiguration.java
View File

@@ -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);
}

4
spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/KubernetesHelper.java → spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderKubernetesHelper.java
View File

@@ -27,7 +27,7 @@ import io.fabric8.kubernetes.client.KubernetesClient;
/**
* @author <a href="mailto:gytis@redhat.com">Gytis Trikleris</a>
*/
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;
}

4
spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeadershipController.java
View File

@@ -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;

6
spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/KubernetesHelperTest.java → spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderKubernetesHelperTest.java
View File

@@ -35,7 +35,7 @@ import static org.mockito.Mockito.verify;
* @author <a href="mailto:gytis@redhat.com">Gytis Trikleris</a>
*/
@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

2
spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderTest.java
View File

@@ -21,7 +21,7 @@ public class LeaderTest {
private static final String ID = "test-id";
@Mock
private KubernetesHelper mockKubernetesHelper;
private LeaderKubernetesHelper mockKubernetesHelper;
private Leader leader;

2
spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeadershipControllerTest.java
View File

@@ -38,7 +38,7 @@ public class LeadershipControllerTest {
private LeaderProperties mockLeaderProperties;
@Mock
private KubernetesHelper mockKubernetesHelper;
private LeaderKubernetesHelper mockKubernetesHelper;
@Mock
private ConfigMap mockConfigMap;