diff --git a/spring-cloud-commons/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-cloud-commons/src/main/resources/META-INF/additional-spring-configuration-metadata.json index b8499d25..dd3b1a41 100644 --- a/spring-cloud-commons/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-cloud-commons/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -47,12 +47,6 @@ "name": "management.endpoint.env.post.enabled", "description": "Enables writable environment endpoint.", "type": "java.lang.Boolean" - }, - { - "defaultValue": true, - "name": "spring.cloud.loadbalancer.ribbon.enabled", - "description": "Causes `RibbonLoadBalancerClient` to be used by default.", - "type": "java.lang.Boolean" } ] } diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/LoadBalancerAutoConfiguration.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/LoadBalancerAutoConfiguration.java index 96f62a96..bd08cdd0 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/LoadBalancerAutoConfiguration.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/LoadBalancerAutoConfiguration.java @@ -37,8 +37,6 @@ import org.springframework.context.annotation.Configuration; @LoadBalancerClients @AutoConfigureBefore({ ReactorLoadBalancerClientAutoConfiguration.class, ReactiveLoadBalancerAutoConfiguration.class }) -// @EnableCaching //TODO: how to enforce, or check conditions? -// @AutoConfigureBefore(CacheAutoConfiguration.class) public class LoadBalancerAutoConfiguration { private final ObjectProvider> configurations; diff --git a/spring-cloud-loadbalancer/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-cloud-loadbalancer/src/main/resources/META-INF/additional-spring-configuration-metadata.json new file mode 100644 index 00000000..f19dd0a9 --- /dev/null +++ b/spring-cloud-loadbalancer/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -0,0 +1,10 @@ +{ + "properties": [ + { + "defaultValue": true, + "name": "spring.cloud.loadbalancer.ribbon.enabled", + "description": "Causes `RibbonLoadBalancerClient` to be used by default.", + "type": "java.lang.Boolean" + } + ] +}