From 8bbd4384cc83f3a6cb454620fb361f2c0bc4f17a Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Thu, 12 Sep 2019 20:44:09 +0200 Subject: [PATCH] Remove deprecated comment. Move property configuration metadata to loadbalancer module. --- .../additional-spring-configuration-metadata.json | 6 ------ .../config/LoadBalancerAutoConfiguration.java | 2 -- .../additional-spring-configuration-metadata.json | 10 ++++++++++ 3 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 spring-cloud-loadbalancer/src/main/resources/META-INF/additional-spring-configuration-metadata.json 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" + } + ] +}