Skip to content

Commit 4030b90

Browse files
wind57wind57
committed
fix checkstyle
Signed-off-by: wind57 <[email protected]>
1 parent f25d1e4 commit 4030b90

13 files changed

+24
-24
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2424
import org.springframework.cloud.kubernetes.client.KubernetesClientAutoConfiguration;
2525
import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
26-
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnKubernetesCatalogWatcherEnabled;
2726
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
2827
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryPropertiesAutoConfiguration;
28+
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnKubernetesCatalogWatcherEnabled;
2929
import org.springframework.context.ApplicationEventPublisher;
3030
import org.springframework.context.annotation.Bean;
3131
import org.springframework.context.annotation.Configuration;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2727
import org.springframework.boot.cloud.CloudPlatform;
2828
import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled;
29-
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnBlockingOrReactiveDiscoveryEnabled;
3029
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
3130
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryPropertiesAutoConfiguration;
31+
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnBlockingOrReactiveDiscoveryEnabled;
3232
import org.springframework.context.annotation.Bean;
3333
import org.springframework.context.annotation.Configuration;
3434
import org.springframework.expression.Expression;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
import org.springframework.cloud.kubernetes.client.KubernetesClientAutoConfiguration;
3939
import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
4040
import org.springframework.cloud.kubernetes.commons.config.NamespaceResolutionFailedException;
41-
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnBlockingOrReactiveDiscoveryEnabled;
42-
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnKubernetesDiscoveryEnabled;
4341
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
4442
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryPropertiesAutoConfiguration;
43+
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnBlockingOrReactiveDiscoveryEnabled;
44+
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnKubernetesDiscoveryEnabled;
4545
import org.springframework.context.annotation.Bean;
4646
import org.springframework.context.annotation.Conditional;
4747
import org.springframework.context.annotation.Configuration;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
import org.springframework.cloud.client.CommonsClientAutoConfiguration;
3333
import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAutoConfiguration;
3434
import org.springframework.cloud.kubernetes.client.KubernetesClientAutoConfiguration;
35-
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnSpringCloudKubernetesBlockingDiscovery;
3635
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryClientHealthConfiguration;
3736
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
3837
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryPropertiesAutoConfiguration;
38+
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnSpringCloudKubernetesBlockingDiscovery;
3939
import org.springframework.context.annotation.Bean;
4040
import org.springframework.context.annotation.Conditional;
4141
import org.springframework.context.annotation.Configuration;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@
3636
import org.springframework.cloud.client.discovery.health.reactive.ReactiveDiscoveryClientHealthIndicator;
3737
import org.springframework.cloud.client.discovery.simple.reactive.SimpleReactiveDiscoveryClientAutoConfiguration;
3838
import org.springframework.cloud.kubernetes.commons.PodUtils;
39-
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnSpringCloudKubernetesReactiveDiscovery;
40-
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnSpringCloudKubernetesReactiveDiscoveryHealthInitializer;
4139
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryClientHealthIndicatorInitializer;
4240
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
4341
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryPropertiesAutoConfiguration;
42+
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnSpringCloudKubernetesReactiveDiscovery;
43+
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnSpringCloudKubernetesReactiveDiscoveryHealthInitializer;
4444
import org.springframework.context.ApplicationEventPublisher;
4545
import org.springframework.context.annotation.Bean;
4646
import org.springframework.context.annotation.Conditional;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@
3939
import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled;
4040
import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAutoConfiguration;
4141
import org.springframework.cloud.kubernetes.client.KubernetesClientAutoConfiguration;
42-
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnBlockingOrReactiveDiscoveryEnabled;
43-
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnKubernetesDiscoveryEnabled;
4442
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
4543
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryPropertiesAutoConfiguration;
44+
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnBlockingOrReactiveDiscoveryEnabled;
45+
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnKubernetesDiscoveryEnabled;
4646
import org.springframework.context.annotation.Bean;
4747
import org.springframework.context.annotation.Conditional;
4848
import org.springframework.context.annotation.Configuration;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2222
import org.springframework.boot.context.properties.EnableConfigurationProperties;
2323
import org.springframework.boot.restclient.RestTemplateBuilder;
24+
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
2425
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnHttpDiscoveryCatalogWatcherEnabled;
2526
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnKubernetesCatalogWatcherEnabled;
26-
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
2727
import org.springframework.context.annotation.Bean;
2828
import org.springframework.context.annotation.Configuration;
2929
import org.springframework.core.env.Environment;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
import org.springframework.boot.restclient.RestTemplateBuilder;
2222
import org.springframework.cloud.client.discovery.health.DiscoveryClientHealthIndicatorProperties;
2323
import org.springframework.cloud.kubernetes.commons.PodUtils;
24-
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnSpringCloudKubernetesBlockingDiscovery;
25-
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnSpringCloudKubernetesBlockingDiscoveryHealthInitializer;
2624
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryClientHealthIndicatorInitializer;
2725
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
26+
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnSpringCloudKubernetesBlockingDiscovery;
27+
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnSpringCloudKubernetesBlockingDiscoveryHealthInitializer;
2828
import org.springframework.context.ApplicationEventPublisher;
2929
import org.springframework.context.annotation.Bean;
3030
import org.springframework.context.annotation.Configuration;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
import org.springframework.cloud.client.discovery.health.DiscoveryClientHealthIndicatorProperties;
2222
import org.springframework.cloud.client.discovery.health.reactive.ReactiveDiscoveryClientHealthIndicator;
2323
import org.springframework.cloud.kubernetes.commons.PodUtils;
24-
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnSpringCloudKubernetesReactiveDiscovery;
25-
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnSpringCloudKubernetesReactiveDiscoveryHealthInitializer;
2624
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryClientHealthIndicatorInitializer;
2725
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
26+
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnSpringCloudKubernetesReactiveDiscovery;
27+
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnSpringCloudKubernetesReactiveDiscoveryHealthInitializer;
2828
import org.springframework.context.ApplicationEventPublisher;
2929
import org.springframework.context.annotation.Bean;
3030
import org.springframework.context.annotation.Configuration;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2222
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2323
import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
24-
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnKubernetesCatalogWatcherEnabled;
2524
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
2625
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryPropertiesAutoConfiguration;
26+
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnKubernetesCatalogWatcherEnabled;
2727
import org.springframework.cloud.kubernetes.fabric8.Fabric8AutoConfiguration;
2828
import org.springframework.context.ApplicationEventPublisher;
2929
import org.springframework.context.annotation.Bean;

0 commit comments

Comments
 (0)