Skip to content

Commit cfe690d

Browse files
wind57wind57
committed
merge main
Signed-off-by: wind57 <[email protected]>
2 parents ca0c134 + 910a385 commit cfe690d

File tree

27 files changed

+41
-41
lines changed

27 files changed

+41
-41
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.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.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
@@ -40,10 +40,10 @@
4040
import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAutoConfiguration;
4141
import org.springframework.cloud.kubernetes.client.KubernetesClientAutoConfiguration;
4242
import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
43-
import org.springframework.cloud.kubernetes.commons.discovery.ConditionalOnBlockingOrReactiveDiscoveryEnabled;
44-
import org.springframework.cloud.kubernetes.commons.discovery.ConditionalOnKubernetesDiscoveryEnabled;
4543
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
4644
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryPropertiesAutoConfiguration;
45+
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnBlockingOrReactiveDiscoveryEnabled;
46+
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnKubernetesDiscoveryEnabled;
4747
import org.springframework.context.annotation.Bean;
4848
import org.springframework.context.annotation.Configuration;
4949
import org.springframework.core.log.LogAccessor;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434
import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAutoConfiguration;
3535
import org.springframework.cloud.kubernetes.client.KubernetesClientAutoConfiguration;
3636
import org.springframework.cloud.kubernetes.commons.PodUtils;
37-
import org.springframework.cloud.kubernetes.commons.discovery.ConditionalOnSpringCloudKubernetesBlockingDiscovery;
38-
import org.springframework.cloud.kubernetes.commons.discovery.ConditionalOnSpringCloudKubernetesBlockingDiscoveryHealthInitializer;
3937
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryClientHealthIndicatorInitializer;
4038
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
4139
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryPropertiesAutoConfiguration;
40+
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnSpringCloudKubernetesBlockingDiscovery;
41+
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnSpringCloudKubernetesBlockingDiscoveryHealthInitializer;
4242
import org.springframework.context.ApplicationEventPublisher;
4343
import org.springframework.context.annotation.Bean;
4444
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.ConditionalOnSpringCloudKubernetesReactiveDiscovery;
40-
import org.springframework.cloud.kubernetes.commons.discovery.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.Configuration;

‎spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/ConditionalOnBlockingOrReactiveDiscoveryEnabled.java‎ renamed to ‎spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/conditionals/ConditionalOnBlockingOrReactiveDiscoveryEnabled.java‎

Lines changed: 1 addition & 1 deletion
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.commons.discovery;
17+
package org.springframework.cloud.kubernetes.commons.discovery.conditionals;
1818

1919
import java.lang.annotation.Documented;
2020
import java.lang.annotation.ElementType;

‎spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/ConditionalOnDiscoveryCacheableBlockingDisabled.java‎ renamed to ‎spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/conditionals/ConditionalOnDiscoveryCacheableBlockingDisabled.java‎

Lines changed: 1 addition & 1 deletion
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.commons.discovery;
17+
package org.springframework.cloud.kubernetes.commons.discovery.conditionals;
1818

1919
import java.lang.annotation.Documented;
2020
import java.lang.annotation.ElementType;

‎spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/ConditionalOnDiscoveryCacheableBlockingEnabled.java‎ renamed to ‎spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/conditionals/ConditionalOnDiscoveryCacheableBlockingEnabled.java‎

Lines changed: 1 addition & 1 deletion
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.commons.discovery;
17+
package org.springframework.cloud.kubernetes.commons.discovery.conditionals;
1818

1919
import java.lang.annotation.Documented;
2020
import java.lang.annotation.ElementType;

‎spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/ConditionalOnDiscoveryCacheableReactiveDisabled.java‎ renamed to ‎spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/conditionals/ConditionalOnDiscoveryCacheableReactiveDisabled.java‎

Lines changed: 1 addition & 1 deletion
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.commons.discovery;
17+
package org.springframework.cloud.kubernetes.commons.discovery.conditionals;
1818

1919
import java.lang.annotation.Documented;
2020
import java.lang.annotation.ElementType;

‎spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/ConditionalOnDiscoveryCacheableReactiveEnabled.java‎ renamed to ‎spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/conditionals/ConditionalOnDiscoveryCacheableReactiveEnabled.java‎

Lines changed: 1 addition & 1 deletion
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.commons.discovery;
17+
package org.springframework.cloud.kubernetes.commons.discovery.conditionals;
1818

1919
import java.lang.annotation.Documented;
2020
import java.lang.annotation.ElementType;

0 commit comments

Comments
 (0)