Skip to content

Commit 19c3b59

Browse files
committed
make auto-configurations public
Signed-off-by: wind57 <[email protected]>
1 parent 8d46e2c commit 19c3b59

File tree

7 files changed

+7
-16
lines changed

7 files changed

+7
-16
lines changed

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/KubernetesCommonsSanitizeAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
@ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES)
3939
@ConditionalOnClass(name = "org.springframework.boot.actuate.endpoint.SanitizableData")
4040
@ConditionalOnSanitizeSecrets
41-
class KubernetesCommonsSanitizeAutoConfiguration {
41+
public class KubernetesCommonsSanitizeAutoConfiguration {
4242

4343
@Bean
4444
@ConditionalOnMissingBean

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

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

3535
@Bean
3636
@ConditionalOnEnabledHealthIndicator("kubernetes")

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
@@ -38,7 +38,7 @@
3838
@Configuration(proxyBeanMethods = false)
3939
@ConditionalOnKubernetesCatalogWatcherEnabled
4040
@AutoConfigureAfter({ Fabric8AutoConfiguration.class, KubernetesDiscoveryPropertiesAutoConfiguration.class })
41-
final class Fabric8CatalogWatchAutoConfiguration {
41+
public final class Fabric8CatalogWatchAutoConfiguration {
4242

4343
@Bean
4444
@ConditionalOnMissingBean

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
@AutoConfigureBefore({ SimpleDiscoveryClientAutoConfiguration.class, CommonsClientAutoConfiguration.class })
5656
@AutoConfigureAfter({ Fabric8AutoConfiguration.class, KubernetesDiscoveryPropertiesAutoConfiguration.class,
5757
Fabric8DiscoveryClientSpelAutoConfiguration.class, Fabric8DiscoveryClientSpelAutoConfiguration.class })
58-
final class Fabric8DiscoveryClientAutoConfiguration {
58+
public final class Fabric8DiscoveryClientAutoConfiguration {
5959

6060
private static final LogAccessor LOG = new LogAccessor(
6161
LogFactory.getLog(Fabric8DiscoveryClientAutoConfiguration.class));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
@ConditionalOnBlockingOrReactiveDiscoveryEnabled
4444
@ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES)
4545
@AutoConfigureAfter(KubernetesDiscoveryPropertiesAutoConfiguration.class)
46-
final class Fabric8DiscoveryClientSpelAutoConfiguration {
46+
public final class Fabric8DiscoveryClientSpelAutoConfiguration {
4747

4848
@Bean
4949
@ConditionalOnMissingBean

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
@AutoConfigureAfter({ ReactiveCompositeDiscoveryClientAutoConfiguration.class,
5151
Fabric8DiscoveryClientAutoConfiguration.class, KubernetesDiscoveryPropertiesAutoConfiguration.class,
5252
Fabric8DiscoveryClientSpelAutoConfiguration.class })
53-
final class Fabric8ReactiveDiscoveryClientAutoConfiguration {
53+
public final class Fabric8ReactiveDiscoveryClientAutoConfiguration {
5454

5555
@Bean
5656
@ConditionalOnMissingBean
@@ -76,13 +76,4 @@ Fabric8CacheableReactiveDiscoveryClient fabric8CacheableReactiveDiscoveryClient(
7676
return new Fabric8CacheableReactiveDiscoveryClient(blockingClient);
7777
}
7878

79-
// Above two beans are created when cacheable is enabled. In this case, we can't make
80-
// Fabric8DiscoveryClient a @Bean, since blocking discovery might be disabled and we
81-
// do
82-
// not want to allow wiring of it. Nevertheless, we still need an instance of
83-
// Fabric8DiscoveryClient
84-
// in order to create the ReactiveDiscoveryClientHealthIndicator and
85-
// Fabric8CacheableReactiveDiscoveryClient
86-
// As such, we create two of such instances in each bean.
87-
8879
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
@AutoConfigureAfter({ ReactiveCompositeDiscoveryClientAutoConfiguration.class,
6060
Fabric8DiscoveryClientAutoConfiguration.class, KubernetesDiscoveryPropertiesAutoConfiguration.class,
6161
Fabric8DiscoveryClientSpelAutoConfiguration.class, Fabric8ReactiveDiscoveryClientAutoConfiguration.class })
62-
final class Fabric8ReactiveDiscoveryHealthAutoConfiguration {
62+
public final class Fabric8ReactiveDiscoveryHealthAutoConfiguration {
6363

6464
private static final LogAccessor LOG = new LogAccessor(
6565
LogFactory.getLog(Fabric8ReactiveDiscoveryHealthAutoConfiguration.class));

0 commit comments

Comments
 (0)