fix

Signed-off-by: wind57 <[email protected]>

Author: wind57

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

@@ -52,8 +52,9 @@
 import static org.springframework.cloud.kubernetes.client.KubernetesClientUtils.getApplicationNamespace;
 
 /**
- * This one uses: 'ConditionalOnBlockingOrReactiveDiscoveryEnabled' because beans it contains
- * are specific to both clients.
+ * This one uses: 'ConditionalOnBlockingOrReactiveDiscoveryEnabled' because beans it
+ * contains are specific to both clients.
+ *
  * @author wind57
  */
 @Configuration(proxyBeanMethods = false)
@@ -66,7 +67,7 @@
 final class KubernetesClientInformerAutoConfiguration {
 
 	private static final LogAccessor LOG = new LogAccessor(
-		LogFactory.getLog(KubernetesClientInformerAutoConfiguration.class));
+			LogFactory.getLog(KubernetesClientInformerAutoConfiguration.class));
 
 	// we rely on the order of namespaces to enable listers, as such provide a bean of
 	// namespaces as a list, instead of the incoming Set.
@@ -104,16 +105,16 @@ List<SharedInformerFactory> sharedInformerFactories(ApiClient apiClient, List<St
 
 	@Bean
 	@ConditionalOnMissingBean(value = V1Service.class,
-		parameterizedContainer = { List.class, SharedIndexInformer.class })
+			parameterizedContainer = { List.class, SharedIndexInformer.class })
 	List<SharedIndexInformer<V1Service>> serviceSharedIndexInformers(
-		List<SharedInformerFactory> sharedInformerFactories, List<String> selectiveNamespaces,
-		ApiClient apiClient) {
+			List<SharedInformerFactory> sharedInformerFactories, List<String> selectiveNamespaces,
+			ApiClient apiClient) {
 
 		int howManyNamespaces = selectiveNamespaces.size();
 		List<SharedIndexInformer<V1Service>> serviceSharedIndexedInformers = new ArrayList<>(howManyNamespaces);
 		for (int i = 0; i < howManyNamespaces; ++i) {
 			GenericKubernetesApi<V1Service, V1ServiceList> servicesApi = new GenericKubernetesApi<>(V1Service.class,
-				V1ServiceList.class, "", "v1", "services", apiClient);
+					V1ServiceList.class, "", "v1", "services", apiClient);
 			SharedIndexInformer<V1Service> sharedIndexInformer = sharedInformerFactories.get(i)
 				.sharedIndexInformerFor(servicesApi, V1Service.class, 0L, selectiveNamespaces.get(i));
 			serviceSharedIndexedInformers.add(sharedIndexInformer);
@@ -124,7 +125,7 @@ List<SharedIndexInformer<V1Service>> serviceSharedIndexInformers(
 	@Bean
 	@ConditionalOnMissingBean(value = V1Service.class, parameterizedContainer = { List.class, Lister.class })
 	List<Lister<V1Service>> serviceListers(List<String> selectiveNamespaces,
-		List<SharedIndexInformer<V1Service>> serviceSharedIndexInformers) {
+			List<SharedIndexInformer<V1Service>> serviceSharedIndexInformers) {
 
 		int howManyNamespaces = selectiveNamespaces.size();
 		List<Lister<V1Service>> serviceListers = new ArrayList<>(howManyNamespaces);
@@ -141,16 +142,16 @@ List<Lister<V1Service>> serviceListers(List<String> selectiveNamespaces,
 
 	@Bean
 	@ConditionalOnMissingBean(value = V1Endpoints.class,
-		parameterizedContainer = { List.class, SharedIndexInformer.class })
+			parameterizedContainer = { List.class, SharedIndexInformer.class })
 	List<SharedIndexInformer<V1Endpoints>> endpointsSharedIndexInformers(
-		List<SharedInformerFactory> sharedInformerFactories, List<String> selectiveNamespaces,
-		ApiClient apiClient) {
+			List<SharedInformerFactory> sharedInformerFactories, List<String> selectiveNamespaces,
+			ApiClient apiClient) {
 
 		int howManyNamespaces = selectiveNamespaces.size();
 		List<SharedIndexInformer<V1Endpoints>> endpointsSharedIndexedInformers = new ArrayList<>(howManyNamespaces);
 		for (int i = 0; i < howManyNamespaces; ++i) {
 			GenericKubernetesApi<V1Endpoints, V1EndpointsList> endpointsApi = new GenericKubernetesApi<>(
-				V1Endpoints.class, V1EndpointsList.class, "", "v1", "endpoints", apiClient);
+					V1Endpoints.class, V1EndpointsList.class, "", "v1", "endpoints", apiClient);
 			SharedIndexInformer<V1Endpoints> sharedIndexInformer = sharedInformerFactories.get(i)
 				.sharedIndexInformerFor(endpointsApi, V1Endpoints.class, 0L, selectiveNamespaces.get(i));
 			endpointsSharedIndexedInformers.add(sharedIndexInformer);
@@ -161,7 +162,7 @@ List<SharedIndexInformer<V1Endpoints>> endpointsSharedIndexInformers(
 	@Bean
 	@ConditionalOnMissingBean(value = V1Endpoints.class, parameterizedContainer = { List.class, Lister.class })
 	List<Lister<V1Endpoints>> endpointsListers(List<String> selectiveNamespaces,
-		List<SharedIndexInformer<V1Endpoints>> serviceSharedIndexInformers) {
+			List<SharedIndexInformer<V1Endpoints>> serviceSharedIndexInformers) {
 
 		int howManyNamespaces = selectiveNamespaces.size();
 		List<Lister<V1Endpoints>> endpointsListers = new ArrayList<>(howManyNamespaces);

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

@@ -25,8 +25,8 @@
 import io.kubernetes.client.openapi.apis.CoreV1Api;
 import io.kubernetes.client.openapi.models.V1Endpoints;
 import io.kubernetes.client.openapi.models.V1Service;
-
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -55,7 +55,7 @@
 final class KubernetesClientInformerDiscoveryClientAutoConfiguration {
 
 	private static final LogAccessor LOG = new LogAccessor(
-		LogFactory.getLog(KubernetesClientInformerDiscoveryClientAutoConfiguration.class));
+			LogFactory.getLog(KubernetesClientInformerDiscoveryClientAutoConfiguration.class));
 
 	@Bean
 	@ConditionalOnMissingBean
@@ -71,7 +71,7 @@ KubernetesClientInformerDiscoveryClient kubernetesClientInformerDiscoveryClient(
 	@Bean
 	@ConditionalOnSpringCloudKubernetesBlockingDiscoveryHealthInitializer
 	KubernetesDiscoveryClientHealthIndicatorInitializer indicatorInitializer(
-		ApplicationEventPublisher applicationEventPublisher, PodUtils<?> podUtils) {
+			ApplicationEventPublisher applicationEventPublisher, PodUtils<?> podUtils) {
 		LOG.debug(() -> "Will publish InstanceRegisteredEvent from blocking implementation");
 		return new KubernetesDiscoveryClientHealthIndicatorInitializer(podUtils, applicationEventPublisher);
 	}

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

@@ -69,9 +69,9 @@ KubernetesClientInformerReactiveDiscoveryClient kubernetesClientReactiveDiscover
 			List<Lister<V1Endpoints>> endpointsListers, List<SharedInformer<V1Service>> serviceInformers,
 			List<SharedInformer<V1Endpoints>> endpointsInformers, KubernetesDiscoveryProperties properties,
 			CoreV1Api coreV1Api, Predicate<V1Service> predicate) {
-		KubernetesClientInformerDiscoveryClient kubernetesClientInformerDiscoveryClient =
-			new KubernetesClientInformerDiscoveryClient(sharedInformerFactories, serviceListers, endpointsListers,
-				serviceInformers, endpointsInformers, properties, coreV1Api, predicate);
+		KubernetesClientInformerDiscoveryClient kubernetesClientInformerDiscoveryClient = new KubernetesClientInformerDiscoveryClient(
+				sharedInformerFactories, serviceListers, endpointsListers, serviceInformers, endpointsInformers,
+				properties, coreV1Api, predicate);
 		return new KubernetesClientInformerReactiveDiscoveryClient(kubernetesClientInformerDiscoveryClient);
 	}
 
@@ -81,7 +81,7 @@ KubernetesClientInformerReactiveDiscoveryClient kubernetesClientReactiveDiscover
 	@Bean
 	@ConditionalOnSpringCloudKubernetesReactiveDiscoveryHealthInitializer
 	KubernetesDiscoveryClientHealthIndicatorInitializer reactiveIndicatorInitializer(
-		ApplicationEventPublisher applicationEventPublisher, PodUtils<?> podUtils) {
+			ApplicationEventPublisher applicationEventPublisher, PodUtils<?> podUtils) {
 		LOG.debug(() -> "Will publish InstanceRegisteredEvent from reactive implementation");
 		return new KubernetesDiscoveryClientHealthIndicatorInitializer(podUtils, applicationEventPublisher);
 	}
@@ -92,8 +92,8 @@ KubernetesDiscoveryClientHealthIndicatorInitializer reactiveIndicatorInitializer
 	@Bean
 	@ConditionalOnSpringCloudKubernetesReactiveDiscoveryHealthInitializer
 	ReactiveDiscoveryClientHealthIndicator kubernetesReactiveDiscoveryClientHealthIndicator(
-		KubernetesClientInformerReactiveDiscoveryClient client,
-		DiscoveryClientHealthIndicatorProperties properties) {
+			KubernetesClientInformerReactiveDiscoveryClient client,
+			DiscoveryClientHealthIndicatorProperties properties) {
 		return new ReactiveDiscoveryClientHealthIndicator(client, properties);
 	}