Skip to content

Commit ac7c32f

Browse files
wind57wind57
committed
first
Signed-off-by: wind57 <[email protected]>
1 parent 7373142 commit ac7c32f

File tree

10 files changed

+20
-32
lines changed

10 files changed

+20
-32
lines changed

‎spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigDataLocationResolver.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@
2121

2222
import org.springframework.boot.bootstrap.BootstrapRegistry;
2323
import org.springframework.boot.bootstrap.ConfigurableBootstrapContext;
24-
import org.springframework.boot.context.config.ConfigDataLocation;
2524
import org.springframework.boot.context.config.ConfigDataLocationResolverContext;
26-
import org.springframework.boot.context.config.Profiles;
2725
import org.springframework.cloud.kubernetes.commons.KubernetesClientProperties;
2826
import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
2927
import org.springframework.cloud.kubernetes.commons.config.ConfigDataRetryableConfigMapPropertySourceLocator;
@@ -34,7 +32,6 @@
3432
import org.springframework.cloud.kubernetes.commons.config.SecretsPropertySourceLocator;
3533
import org.springframework.cloud.kubernetes.commons.configdata.ConfigDataPropertiesHolder;
3634
import org.springframework.cloud.kubernetes.commons.configdata.KubernetesConfigDataLocationResolver;
37-
import org.springframework.core.env.Environment;
3835

3936
import static org.springframework.cloud.kubernetes.client.KubernetesClientUtils.kubernetesApiClient;
4037
import static org.springframework.cloud.kubernetes.commons.config.ConfigUtils.registerSingle;
@@ -45,7 +42,8 @@
4542
public class KubernetesClientConfigDataLocationResolver extends KubernetesConfigDataLocationResolver {
4643

4744
@Override
48-
protected void registerBeans(ConfigDataLocationResolverContext resolverContext, ConfigDataPropertiesHolder properties, KubernetesNamespaceProvider namespaceProvider) {
45+
protected void registerBeans(ConfigDataLocationResolverContext resolverContext,
46+
ConfigDataPropertiesHolder properties, KubernetesNamespaceProvider namespaceProvider) {
4947
KubernetesClientProperties kubernetesClientProperties = properties.clientProperties();
5048
ConfigMapConfigProperties configMapProperties = properties.configMapProperties();
5149
SecretsConfigProperties secretsProperties = properties.secretsProperties();

‎spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesClientInformerDiscoveryClient.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,10 @@
5050
import static org.springframework.cloud.kubernetes.client.discovery.KubernetesClientDiscoveryClientUtils.serviceMetadata;
5151
import static org.springframework.cloud.kubernetes.client.discovery.KubernetesClientInstanceIdHostPodNameSupplier.externalName;
5252
import static org.springframework.cloud.kubernetes.client.discovery.KubernetesClientInstanceIdHostPodNameSupplier.nonExternalName;
53-
import static org.springframework.cloud.kubernetes.client.discovery.KubernetesClientPodLabelsAndAnnotationsSupplier.externalName;
5453
import static org.springframework.cloud.kubernetes.client.discovery.KubernetesClientPodLabelsAndAnnotationsSupplier.nonExternalName;
5554
import static org.springframework.cloud.kubernetes.commons.discovery.DiscoveryClientUtils.endpointsPort;
56-
import static org.springframework.cloud.kubernetes.commons.discovery.DiscoveryClientUtils.serviceInstance;
5755
import static org.springframework.cloud.kubernetes.commons.discovery.DiscoveryClientUtils.externalNameServiceInstance;
56+
import static org.springframework.cloud.kubernetes.commons.discovery.DiscoveryClientUtils.serviceInstance;
5857
import static org.springframework.cloud.kubernetes.commons.discovery.DiscoveryClientUtils.serviceInstanceMetadata;
5958
import static org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryConstants.EXTERNAL_NAME;
6059

@@ -144,8 +143,8 @@ public List<ServiceInstance> getInstances(String serviceId) {
144143
properties);
145144

146145
KubernetesClientInstanceIdHostPodNameSupplier supplierOne = externalName(service);
147-
ServiceInstance externalNameServiceInstance = externalNameServiceInstance(serviceMetadata,
148-
supplierOne, serviceInstanceMetadata);
146+
ServiceInstance externalNameServiceInstance = externalNameServiceInstance(serviceMetadata, supplierOne,
147+
serviceInstanceMetadata);
149148
serviceInstances.add(externalNameServiceInstance);
150149
}
151150
}

‎spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesClientInformerDiscoveryClientTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -571,8 +571,8 @@ void testExternalNameService() {
571571

572572
List<ServiceInstance> result = discoveryClient.getInstances("blue-service");
573573
assertThat(result.size()).isEqualTo(1);
574-
KubernetesExternalNameServiceInstance externalNameServiceInstance =
575-
(KubernetesExternalNameServiceInstance) result.get(0);
574+
KubernetesExternalNameServiceInstance externalNameServiceInstance = (KubernetesExternalNameServiceInstance) result
575+
.get(0);
576576
assertThat(externalNameServiceInstance.getServiceId()).isEqualTo("blue-service");
577577
assertThat(externalNameServiceInstance.getHost()).isEqualTo("k8s-spring-b");
578578
assertThat(externalNameServiceInstance.getPort()).isEqualTo(-1);

‎spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/DiscoveryClientUtils.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -159,14 +159,13 @@ public static ServiceInstance serviceInstance(@Nullable ServicePortSecureResolve
159159
podMetadata);
160160
}
161161

162-
public static ServiceInstance externalNameServiceInstance(
163-
ServiceMetadata serviceMetadata, Supplier<InstanceIdHostPodName> instanceIdAndHost,
164-
Map<String, String> serviceInstanceMetadata) {
162+
public static ServiceInstance externalNameServiceInstance(ServiceMetadata serviceMetadata,
163+
Supplier<InstanceIdHostPodName> instanceIdAndHost, Map<String, String> serviceInstanceMetadata) {
165164

166165
InstanceIdHostPodName data = instanceIdAndHost.get();
167166

168-
return new KubernetesExternalNameServiceInstance(serviceMetadata.name(), data.host(),
169-
data.instanceId(), serviceInstanceMetadata);
167+
return new KubernetesExternalNameServiceInstance(serviceMetadata.name(), data.host(), data.instanceId(),
168+
serviceInstanceMetadata);
170169

171170
}
172171

‎spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/configdata/KubernetesConfigDataLocationResolverTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class KubernetesConfigDataLocationResolverTests {
5050

5151
@Override
5252
protected void registerBeans(ConfigDataLocationResolverContext resolverContext,
53-
ConfigDataPropertiesHolder properties, KubernetesNamespaceProvider namespaceProvider) {
53+
ConfigDataPropertiesHolder properties, KubernetesNamespaceProvider namespaceProvider) {
5454
}
5555

5656
};

‎spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/configdata/StorePropertiesResolver.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616

1717
package org.springframework.cloud.kubernetes.commons.configdata;
1818

19-
import org.springframework.boot.context.config.ConfigDataLocation;
2019
import org.springframework.boot.context.config.ConfigDataLocationResolverContext;
21-
import org.springframework.boot.context.config.Profiles;
2220
import org.springframework.cloud.kubernetes.commons.KubernetesClientProperties;
2321
import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
2422
import org.springframework.cloud.kubernetes.commons.config.ConfigMapConfigProperties;
@@ -37,7 +35,7 @@ class StorePropertiesResolver extends KubernetesConfigDataLocationResolver {
3735

3836
@Override
3937
protected void registerBeans(ConfigDataLocationResolverContext resolverContext,
40-
ConfigDataPropertiesHolder properties, KubernetesNamespaceProvider namespaceProvider) {
38+
ConfigDataPropertiesHolder properties, KubernetesNamespaceProvider namespaceProvider) {
4139

4240
secretsConfigProperties = properties.secretsProperties();
4341
configMapConfigProperties = properties.configMapProperties();

‎spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigDataLocationResolver.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
import io.fabric8.kubernetes.client.KubernetesClient;
2121

2222
import org.springframework.boot.bootstrap.ConfigurableBootstrapContext;
23-
import org.springframework.boot.context.config.ConfigDataLocation;
2423
import org.springframework.boot.context.config.ConfigDataLocationResolverContext;
25-
import org.springframework.boot.context.config.Profiles;
2624
import org.springframework.cloud.kubernetes.commons.KubernetesClientProperties;
2725
import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
2826
import org.springframework.cloud.kubernetes.commons.config.ConfigDataRetryableConfigMapPropertySourceLocator;
@@ -46,7 +44,7 @@ public class Fabric8ConfigDataLocationResolver extends KubernetesConfigDataLocat
4644

4745
@Override
4846
protected void registerBeans(ConfigDataLocationResolverContext resolverContext,
49-
ConfigDataPropertiesHolder propertiesHolder, KubernetesNamespaceProvider namespaceProvider) {
47+
ConfigDataPropertiesHolder propertiesHolder, KubernetesNamespaceProvider namespaceProvider) {
5048

5149
KubernetesClientProperties kubernetesClientProperties = propertiesHolder.clientProperties();
5250
ConfigMapConfigProperties configMapProperties = propertiesHolder.configMapProperties();

‎spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryClient.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
import org.springframework.core.log.LogAccessor;
4040

4141
import static org.springframework.cloud.kubernetes.commons.discovery.DiscoveryClientUtils.endpointsPort;
42-
import static org.springframework.cloud.kubernetes.commons.discovery.DiscoveryClientUtils.serviceInstance;
4342
import static org.springframework.cloud.kubernetes.commons.discovery.DiscoveryClientUtils.externalNameServiceInstance;
43+
import static org.springframework.cloud.kubernetes.commons.discovery.DiscoveryClientUtils.serviceInstance;
4444
import static org.springframework.cloud.kubernetes.commons.discovery.DiscoveryClientUtils.serviceInstanceMetadata;
4545
import static org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryConstants.EXTERNAL_NAME;
4646
import static org.springframework.cloud.kubernetes.fabric8.Fabric8Utils.serviceMetadata;
@@ -50,7 +50,6 @@
5050
import static org.springframework.cloud.kubernetes.fabric8.discovery.Fabric8DiscoveryClientUtils.services;
5151
import static org.springframework.cloud.kubernetes.fabric8.discovery.Fabric8InstanceIdHostPodNameSupplier.externalName;
5252
import static org.springframework.cloud.kubernetes.fabric8.discovery.Fabric8InstanceIdHostPodNameSupplier.nonExternalName;
53-
import static org.springframework.cloud.kubernetes.fabric8.discovery.Fabric8PodLabelsAndAnnotationsSupplier.externalName;
5453
import static org.springframework.cloud.kubernetes.fabric8.discovery.Fabric8PodLabelsAndAnnotationsSupplier.nonExternalName;
5554

5655
/**
@@ -114,9 +113,8 @@ public List<ServiceInstance> getInstances(String serviceId) {
114113

115114
Fabric8InstanceIdHostPodNameSupplier supplierOne = externalName(service);
116115

117-
ServiceInstance externalNameServiceInstance = externalNameServiceInstance(
118-
serviceMetadata, supplierOne, serviceInstanceMetadata
119-
);
116+
ServiceInstance externalNameServiceInstance = externalNameServiceInstance(serviceMetadata, supplierOne,
117+
serviceInstanceMetadata);
120118

121119
instances.add(externalNameServiceInstance);
122120
}

‎spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryClientTwoTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -553,8 +553,8 @@ void testExternalNameService() {
553553
Fabric8DiscoveryClient discoveryClient = new Fabric8DiscoveryClient(client, properties, null, null, null);
554554
List<ServiceInstance> result = discoveryClient.getInstances("blue-service");
555555
Assertions.assertThat(result.size()).isEqualTo(1);
556-
KubernetesExternalNameServiceInstance externalNameServiceInstance =
557-
(KubernetesExternalNameServiceInstance) result.get(0);
556+
KubernetesExternalNameServiceInstance externalNameServiceInstance = (KubernetesExternalNameServiceInstance) result
557+
.get(0);
558558
Assertions.assertThat(externalNameServiceInstance.getServiceId()).isEqualTo("blue-service");
559559
Assertions.assertThat(externalNameServiceInstance.getHost()).isEqualTo("k8s-spring-b");
560560
Assertions.assertThat(externalNameServiceInstance.getPort()).isEqualTo(-1);

‎spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DummyConfigDataLocationResolver.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
package org.springframework.cloud.kubernetes.fabric8.discovery;
1818

1919
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
20-
import org.springframework.boot.context.config.ConfigDataLocation;
2120
import org.springframework.boot.context.config.ConfigDataLocationResolverContext;
22-
import org.springframework.boot.context.config.Profiles;
2321
import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
2422
import org.springframework.cloud.kubernetes.commons.configdata.ConfigDataPropertiesHolder;
2523
import org.springframework.cloud.kubernetes.commons.configdata.KubernetesConfigDataLocationResolver;
@@ -32,7 +30,7 @@ class Fabric8DummyConfigDataLocationResolver extends KubernetesConfigDataLocatio
3230

3331
@Override
3432
protected void registerBeans(ConfigDataLocationResolverContext resolverContext,
35-
ConfigDataPropertiesHolder properties, KubernetesNamespaceProvider namespaceProvider) {
33+
ConfigDataPropertiesHolder properties, KubernetesNamespaceProvider namespaceProvider) {
3634
}
3735

3836
}

0 commit comments

Comments
 (0)