Skip to content

Commit 4b2badd

Browse files
ryanjbaxterryanjbaxter
authored
Merge pull request #2050 from wind57/minor_refactors
Minor refactors
2 parents 4c6ff11 + 170c358 commit 4b2badd

20 files changed

+51
-83
lines changed

‎spring-cloud-kubernetes-fabric8-autoconfig/src/main/java/org/springframework/cloud/kubernetes/fabric8/Fabric8ActuatorConfiguration.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@
3030
*/
3131
@Configuration(proxyBeanMethods = false)
3232
@ConditionalOnKubernetesHealthIndicatorEnabled
33-
public class Fabric8ActuatorConfiguration {
33+
final class Fabric8ActuatorConfiguration {
3434

3535
@Bean
3636
@ConditionalOnEnabledHealthIndicator("kubernetes")
37-
public Fabric8HealthIndicator kubernetesHealthIndicator(PodUtils<Pod> podUtils) {
37+
Fabric8HealthIndicator kubernetesHealthIndicator(PodUtils<Pod> podUtils) {
3838
return new Fabric8HealthIndicator(podUtils);
3939
}
4040

4141
@Bean
4242
@ConditionalOnEnabledInfoContributor("kubernetes")
43-
public Fabric8InfoContributor kubernetesInfoContributor(PodUtils<Pod> podUtils) {
43+
Fabric8InfoContributor kubernetesInfoContributor(PodUtils<Pod> podUtils) {
4444
return new Fabric8InfoContributor(podUtils);
4545
}
4646

‎spring-cloud-kubernetes-fabric8-autoconfig/src/main/java/org/springframework/cloud/kubernetes/fabric8/Fabric8AutoConfiguration.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,7 @@
4242
@Configuration(proxyBeanMethods = false)
4343
@ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES)
4444
@AutoConfigureAfter(KubernetesCommonsAutoConfiguration.class)
45-
public class Fabric8AutoConfiguration {
46-
47-
private static <D> D or(D left, D right) {
48-
return left != null ? left : right;
49-
}
50-
51-
private static Integer orDurationInt(Duration left, Integer right) {
52-
return left != null ? (int) left.toMillis() : right;
53-
}
45+
public final class Fabric8AutoConfiguration {
5446

5547
@Bean
5648
@ConditionalOnMissingBean(Config.class)
@@ -109,8 +101,16 @@ public KubernetesClient kubernetesClient(Config config) {
109101

110102
@Bean
111103
@ConditionalOnMissingBean
112-
public Fabric8PodUtils kubernetesPodUtils(KubernetesClient client) {
104+
Fabric8PodUtils kubernetesPodUtils(KubernetesClient client) {
113105
return new Fabric8PodUtils(client);
114106
}
115107

108+
private static <D> D or(D left, D right) {
109+
return left != null ? left : right;
110+
}
111+
112+
private static Integer orDurationInt(Duration left, Integer right) {
113+
return left != null ? (int) left.toMillis() : right;
114+
}
115+
116116
}

‎spring-cloud-kubernetes-fabric8-autoconfig/src/main/java/org/springframework/cloud/kubernetes/fabric8/Fabric8HealthIndicator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
* @author Ioannis Canellos
3636
* @author Eddú Meléndez
3737
*/
38-
public class Fabric8HealthIndicator extends AbstractKubernetesHealthIndicator {
38+
final class Fabric8HealthIndicator extends AbstractKubernetesHealthIndicator {
3939

4040
private final PodUtils<Pod> utils;
4141

42-
public Fabric8HealthIndicator(PodUtils<Pod> utils) {
42+
Fabric8HealthIndicator(PodUtils<Pod> utils) {
4343
this.utils = utils;
4444
}
4545

‎spring-cloud-kubernetes-fabric8-autoconfig/src/main/java/org/springframework/cloud/kubernetes/fabric8/Fabric8InfoContributor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434
*
3535
* @author Mark Anderson
3636
*/
37-
public class Fabric8InfoContributor extends AbstractKubernetesInfoContributor {
37+
final class Fabric8InfoContributor extends AbstractKubernetesInfoContributor {
3838

3939
private final PodUtils<Pod> utils;
4040

41-
public Fabric8InfoContributor(PodUtils<Pod> utils) {
41+
Fabric8InfoContributor(PodUtils<Pod> utils) {
4242
this.utils = utils;
4343
}
4444

‎spring-cloud-kubernetes-fabric8-autoconfig/src/main/java/org/springframework/cloud/kubernetes/fabric8/Fabric8PodUtils.java‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,7 @@
3535
*
3636
* @author Ioannis Canellos
3737
*/
38-
public class Fabric8PodUtils implements PodUtils<Pod> {
39-
40-
/**
41-
* HOSTNAME environment variable name.
42-
*/
43-
public static final String HOSTNAME = "HOSTNAME";
44-
45-
/**
46-
* KUBERNETES_SERVICE_HOST environment variable name.
47-
*/
48-
public static final String KUBERNETES_SERVICE_HOST = "KUBERNETES_SERVICE_HOST";
38+
final class Fabric8PodUtils implements PodUtils<Pod> {
4939

5040
private static final Log LOG = LogFactory.getLog(Fabric8PodUtils.class);
5141

@@ -57,14 +47,14 @@ public class Fabric8PodUtils implements PodUtils<Pod> {
5747

5848
private final Supplier<Pod> current;
5949

60-
public Fabric8PodUtils(KubernetesClient client) {
50+
Fabric8PodUtils(KubernetesClient client) {
6151
if (client == null) {
6252
throw new IllegalArgumentException("Must provide an instance of KubernetesClient");
6353
}
6454

6555
this.client = client;
66-
this.hostName = EnvReader.getEnv(HOSTNAME);
67-
this.serviceHost = EnvReader.getEnv(KUBERNETES_SERVICE_HOST);
56+
this.hostName = EnvReader.getEnv("HOSTNAME");
57+
this.serviceHost = EnvReader.getEnv("KUBERNETES_SERVICE_HOST");
6858
this.current = LazilyInstantiate.using(this::internalGetPod);
6959
}
7060

‎spring-cloud-kubernetes-fabric8-autoconfig/src/main/java/org/springframework/cloud/kubernetes/fabric8/profile/Fabric8ProfileEnvironmentPostProcessor.java‎ renamed to ‎spring-cloud-kubernetes-fabric8-autoconfig/src/main/java/org/springframework/cloud/kubernetes/fabric8/Fabric8ProfileEnvironmentPostProcessor.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,22 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.cloud.kubernetes.fabric8.profile;
17+
package org.springframework.cloud.kubernetes.fabric8;
1818

1919
import io.fabric8.kubernetes.client.KubernetesClient;
2020
import io.fabric8.kubernetes.client.KubernetesClientBuilder;
2121

2222
import org.springframework.cloud.kubernetes.commons.profile.AbstractKubernetesProfileEnvironmentPostProcessor;
23-
import org.springframework.cloud.kubernetes.fabric8.Fabric8PodUtils;
2423
import org.springframework.core.env.Environment;
2524

26-
public class Fabric8ProfileEnvironmentPostProcessor extends AbstractKubernetesProfileEnvironmentPostProcessor {
25+
final class Fabric8ProfileEnvironmentPostProcessor extends AbstractKubernetesProfileEnvironmentPostProcessor {
2726

2827
@Override
2928
protected boolean isInsideKubernetes(Environment environment) {
3029

3130
try (KubernetesClient client = new KubernetesClientBuilder().build()) {
3231
Fabric8PodUtils podUtils = new Fabric8PodUtils(client);
33-
return environment.containsProperty(Fabric8PodUtils.KUBERNETES_SERVICE_HOST)
34-
|| podUtils.isInsideKubernetes();
32+
return environment.containsProperty("KUBERNETES_SERVICE_HOST") || podUtils.isInsideKubernetes();
3533
}
3634
}
3735

‎spring-cloud-kubernetes-fabric8-autoconfig/src/main/java/org/springframework/cloud/kubernetes/fabric8/Fabric8Utils.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
*/
3838
public final class Fabric8Utils {
3939

40+
private static final LogAccessor LOG = new LogAccessor(LogFactory.getLog(Fabric8Utils.class));
41+
4042
private Fabric8Utils() {
4143

4244
}
@@ -48,8 +50,6 @@ public static ServiceMetadata serviceMetadata(Service service) {
4850
metadata.getLabels(), metadata.getAnnotations());
4951
}
5052

51-
private static final LogAccessor LOG = new LogAccessor(LogFactory.getLog(Fabric8Utils.class));
52-
5353
/**
5454
* this method does the namespace resolution. Namespace is being searched according to
5555
* the order below.
@@ -76,7 +76,7 @@ public static String getApplicationNamespace(KubernetesClient client, @Nullable
7676
String configurationTarget, KubernetesNamespaceProvider provider) {
7777

7878
if (StringUtils.hasText(namespace)) {
79-
LOG.debug(configurationTarget + " namespace : " + namespace);
79+
LOG.debug(() -> configurationTarget + " namespace : " + namespace);
8080
return namespace;
8181
}
8282

‎spring-cloud-kubernetes-fabric8-autoconfig/src/main/resources/META-INF/spring.factories‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
org.springframework.boot.EnvironmentPostProcessor=\
2-
org.springframework.cloud.kubernetes.fabric8.profile.Fabric8ProfileEnvironmentPostProcessor
2+
org.springframework.cloud.kubernetes.fabric8.Fabric8ProfileEnvironmentPostProcessor

‎spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/Fabric8AutoConfigurationTests.java‎ renamed to ‎spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8AutoConfigurationTests.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.cloud.kubernetes;
17+
package org.springframework.cloud.kubernetes.fabric8;
1818

1919
import io.fabric8.kubernetes.client.Config;
2020
import io.fabric8.kubernetes.client.KubernetesClient;
@@ -26,15 +26,11 @@
2626
import org.springframework.beans.factory.annotation.Autowired;
2727
import org.springframework.boot.test.context.SpringBootTest;
2828
import org.springframework.cloud.kubernetes.commons.KubernetesClientProperties;
29-
import org.springframework.cloud.kubernetes.example.App;
30-
import org.springframework.cloud.kubernetes.fabric8.Fabric8HealthIndicator;
31-
import org.springframework.cloud.kubernetes.fabric8.Fabric8InfoContributor;
32-
import org.springframework.cloud.kubernetes.fabric8.Fabric8PodUtils;
3329
import org.springframework.context.ConfigurableApplicationContext;
3430

3531
import static org.assertj.core.api.Assertions.assertThat;
3632

37-
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class,
33+
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = TestApp.class,
3834
properties = { "spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.client.password=mypassword",
3935
"spring.cloud.kubernetes.client.proxy-password=myproxypassword" })
4036
@EnableKubernetesMockClient(crud = true, https = false)

‎spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8ClientUserAgentEnvPropertyTests.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
import org.springframework.beans.factory.annotation.Autowired;
2626
import org.springframework.boot.test.context.SpringBootTest;
27-
import org.springframework.cloud.kubernetes.example.App;
2827
import org.springframework.test.annotation.DirtiesContext;
2928

3029
import static org.assertj.core.api.Assertions.assertThat;
@@ -34,7 +33,7 @@
3433
*
3534
* test "User-Agent" functionality via system properties
3635
*/
37-
@SpringBootTest(classes = App.class, properties = "spring.main.cloud-platform=KUBERNETES")
36+
@SpringBootTest(classes = TestApp.class, properties = "spring.main.cloud-platform=KUBERNETES")
3837
@DirtiesContext
3938
class Fabric8ClientUserAgentEnvPropertyTests {
4039

0 commit comments

Comments
 (0)