From c1a83aa5bbda03f266881a0cf2398f8c36950e1c Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Sat, 16 May 2020 14:37:45 +0800 Subject: [PATCH] Replaces deprecated note on Properties with TODO to hide them in 3.x (#1639) I noticed we deleted many things without deprecation in 3.x and figured deprecation was the right way. However, this doesn't work for auto-config properties. This replaces deprecation with a TODO note to hide all the types so that 4.x won't require guessing if someone externally is using them directly or not. --- .../cloud/sleuth/annotation/SleuthAnnotationProperties.java | 1 + .../cloud/sleuth/autoconfig/SleuthProperties.java | 4 +--- .../cloud/sleuth/instrument/async/SleuthAsyncProperties.java | 4 +--- .../circuitbreaker/SleuthCircuitBreakerProperties.java | 4 +--- .../hystrix/SleuthHystrixConcurrencyStrategyProperties.java | 4 +--- .../instrument/messaging/SleuthMessagingProperties.java | 4 +--- .../instrument/opentracing/SleuthOpentracingProperties.java | 4 +--- .../sleuth/instrument/reactor/SleuthReactorProperties.java | 4 +--- .../cloud/sleuth/instrument/redis/TraceRedisProperties.java | 4 +--- .../instrument/rxjava/SleuthRxJavaSchedulersProperties.java | 4 +--- .../instrument/scheduling/SleuthSchedulingProperties.java | 4 +--- .../sleuth/instrument/web/SleuthHttpLegacyProperties.java | 4 +--- .../cloud/sleuth/instrument/web/SleuthHttpProperties.java | 1 + .../cloud/sleuth/instrument/web/SleuthWebProperties.java | 4 +--- .../instrument/web/client/feign/SleuthFeignProperties.java | 4 +--- .../cloud/sleuth/log/SleuthSlf4jProperties.java | 3 +-- .../sleuth/propagation/SleuthTagPropagationProperties.java | 4 +--- .../cloud/sleuth/sampler/SamplerProperties.java | 4 +--- .../cloud/sleuth/zipkin2/ZipkinProperties.java | 4 +--- .../cloud/sleuth/zipkin2/sender/ZipkinSenderProperties.java | 1 + 20 files changed, 20 insertions(+), 50 deletions(-) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/SleuthAnnotationProperties.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/SleuthAnnotationProperties.java index 11f014696..7c4313ac2 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/SleuthAnnotationProperties.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/SleuthAnnotationProperties.java @@ -25,6 +25,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @since 1.2.0 */ @ConfigurationProperties("spring.sleuth.annotation") +// TODO: Hide in 3.x, if it isn't already deleted public class SleuthAnnotationProperties { private boolean enabled = true; diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/autoconfig/SleuthProperties.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/autoconfig/SleuthProperties.java index e59397188..90726e9ed 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/autoconfig/SleuthProperties.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/autoconfig/SleuthProperties.java @@ -26,11 +26,9 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * * @author Marcin Grzejszczak * @since 1.0.11 - * @deprecated This type should have never been public and will be hidden or removed in - * 3.0 */ -@Deprecated @ConfigurationProperties("spring.sleuth") +// TODO: Hide in 3.x, if it isn't already deleted public class SleuthProperties { private boolean enabled = true; diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/SleuthAsyncProperties.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/SleuthAsyncProperties.java index f84f0a456..cfbeeb8a6 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/SleuthAsyncProperties.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/SleuthAsyncProperties.java @@ -26,11 +26,9 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * * @author Jesus Alonso * @since 2.1.0 - * @deprecated This type should have never been public and will be hidden or removed in - * 3.0 */ -@Deprecated @ConfigurationProperties(prefix = "spring.sleuth.async") +// TODO: Hide in 3.x, if it isn't already deleted public class SleuthAsyncProperties { /** diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/circuitbreaker/SleuthCircuitBreakerProperties.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/circuitbreaker/SleuthCircuitBreakerProperties.java index a9614a2a6..ef279a7da 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/circuitbreaker/SleuthCircuitBreakerProperties.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/circuitbreaker/SleuthCircuitBreakerProperties.java @@ -23,10 +23,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * * @author Marcin Grzejszczak * @since 2.2.1 - * @deprecated This type should have never been public and will be hidden or removed in - * 3.0 */ -@Deprecated +// TODO: Hide in 3.x, if it isn't already deleted @ConfigurationProperties("spring.sleuth.circuitbreaker") public class SleuthCircuitBreakerProperties { diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/hystrix/SleuthHystrixConcurrencyStrategyProperties.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/hystrix/SleuthHystrixConcurrencyStrategyProperties.java index 095e96205..f9b58b63c 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/hystrix/SleuthHystrixConcurrencyStrategyProperties.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/hystrix/SleuthHystrixConcurrencyStrategyProperties.java @@ -22,10 +22,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * Sleuth Hystrix settings. * * @author Daniel Albuquerque - * @deprecated This type should have never been public and will be hidden or removed in - * 3.0 */ -@Deprecated +// TODO: Hide in 3.x, if it isn't already deleted @ConfigurationProperties("spring.sleuth.hystrix.strategy") public class SleuthHystrixConcurrencyStrategyProperties { diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/SleuthMessagingProperties.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/SleuthMessagingProperties.java index fe7b6fc17..2c212a704 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/SleuthMessagingProperties.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/SleuthMessagingProperties.java @@ -23,10 +23,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * * @author Marcin Grzejszczak * @since 2.0.0 - * @deprecated This type should have never been public and will be hidden or removed in - * 3.0 */ -@Deprecated +// TODO: Hide in 3.x, if it isn't already deleted @ConfigurationProperties("spring.sleuth") public class SleuthMessagingProperties { diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/opentracing/SleuthOpentracingProperties.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/opentracing/SleuthOpentracingProperties.java index 2b01386da..6f6fb25f8 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/opentracing/SleuthOpentracingProperties.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/opentracing/SleuthOpentracingProperties.java @@ -23,10 +23,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * * @author Marcin Grzejszczak * @since 2.0.0 - * @deprecated This type should have never been public and will be hidden or removed in - * 3.0 */ -@Deprecated +// TODO: Hide in 3.x, if it isn't already deleted @ConfigurationProperties("spring.sleuth.opentracing") public class SleuthOpentracingProperties { diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/SleuthReactorProperties.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/SleuthReactorProperties.java index 9410ba0f6..fa1d433d1 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/SleuthReactorProperties.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/SleuthReactorProperties.java @@ -23,11 +23,9 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * * @author Marcin Grzejszczak * @since 2.0.2 - * @deprecated This type should have never been public and will be hidden or removed in - * 3.0 */ -@Deprecated @ConfigurationProperties("spring.sleuth.reactor") +// TODO: Hide in 3.x, if it isn't already deleted public class SleuthReactorProperties { /** diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/redis/TraceRedisProperties.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/redis/TraceRedisProperties.java index 23c44427d..10f2cc8dc 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/redis/TraceRedisProperties.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/redis/TraceRedisProperties.java @@ -22,11 +22,9 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * Sleuth Redis properties. * * @author Daniel Albuquerque - * @deprecated This type should have never been public and will be hidden or removed in - * 3.0 */ -@Deprecated @ConfigurationProperties("spring.sleuth.redis") +// TODO: Hide in 3.x, if it isn't already deleted public class TraceRedisProperties { /** diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/rxjava/SleuthRxJavaSchedulersProperties.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/rxjava/SleuthRxJavaSchedulersProperties.java index 88d0c0760..6cef41d96 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/rxjava/SleuthRxJavaSchedulersProperties.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/rxjava/SleuthRxJavaSchedulersProperties.java @@ -23,11 +23,9 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * * @author Arthur Gavlyukovskiy * @since 1.0.12 - * @deprecated This type should have never been public and will be hidden or removed in - * 3.0 */ -@Deprecated @ConfigurationProperties("spring.sleuth.rxjava.schedulers") +// TODO: Hide in 3.x, if it isn't already deleted public class SleuthRxJavaSchedulersProperties { /** diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/scheduling/SleuthSchedulingProperties.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/scheduling/SleuthSchedulingProperties.java index a5df0ec8b..55c17254d 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/scheduling/SleuthSchedulingProperties.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/scheduling/SleuthSchedulingProperties.java @@ -24,11 +24,9 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * * @author Arthur Gavlyukovskiy * @since 1.0.12 - * @deprecated This type should have never been public and will be hidden or removed in - * 3.0 */ -@Deprecated @ConfigurationProperties("spring.sleuth.scheduled") +// TODO: Hide in 3.x, if it isn't already deleted public class SleuthSchedulingProperties { /** diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/SleuthHttpLegacyProperties.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/SleuthHttpLegacyProperties.java index a94ae22fc..7c87def61 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/SleuthHttpLegacyProperties.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/SleuthHttpLegacyProperties.java @@ -23,11 +23,9 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * * @author Marcin Grzejszczak * @since 2.0.0 - * @deprecated This type should have never been public and will be hidden or removed in - * 3.0 */ -@Deprecated @ConfigurationProperties("spring.sleuth.http.legacy") +// TODO: Hide in 3.x, if it isn't already deleted public class SleuthHttpLegacyProperties { /** diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/SleuthHttpProperties.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/SleuthHttpProperties.java index 665c154eb..a52ef9def 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/SleuthHttpProperties.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/SleuthHttpProperties.java @@ -25,6 +25,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @since 2.0.0 */ @ConfigurationProperties("spring.sleuth.http") +// TODO: Hide in 3.x, if it isn't already deleted public class SleuthHttpProperties { private boolean enabled = true; diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/SleuthWebProperties.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/SleuthWebProperties.java index 8d577354e..c9d777dc9 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/SleuthWebProperties.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/SleuthWebProperties.java @@ -24,11 +24,9 @@ import org.springframework.boot.context.properties.NestedConfigurationProperty; * * @author Arthur Gavlyukovskiy * @since 1.0.12 - * @deprecated This type should have never been public and will be hidden or removed in - * 3.0 */ -@Deprecated @ConfigurationProperties("spring.sleuth.web") +// TODO: Hide in 3.x, if it isn't already deleted public class SleuthWebProperties { /** diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/SleuthFeignProperties.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/SleuthFeignProperties.java index 006793ba2..e0c13905e 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/SleuthFeignProperties.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/SleuthFeignProperties.java @@ -23,11 +23,9 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * * @author Marcin Grzejszczak * @since 2.0.2 - * @deprecated This type should have never been public and will be hidden or removed in - * 3.0 */ -@Deprecated @ConfigurationProperties("spring.sleuth.feign") +// TODO: Hide in 3.x, if it isn't already deleted public class SleuthFeignProperties { /** diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/log/SleuthSlf4jProperties.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/log/SleuthSlf4jProperties.java index ebf34e144..1b84071eb 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/log/SleuthSlf4jProperties.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/log/SleuthSlf4jProperties.java @@ -26,11 +26,10 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * * @author Arthur Gavlyukovskiy * @since 1.0.12 - * @deprecated This type should have never been public and will be hidden or removed in * 3.0 */ -@Deprecated @ConfigurationProperties("spring.sleuth.log.slf4j") +// TODO: Hide in 3.x, if it isn't already deleted public class SleuthSlf4jProperties { /** diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationProperties.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationProperties.java index 3d68ce96f..ff482e091 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationProperties.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationProperties.java @@ -26,11 +26,9 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * * @author Taras Danylchuk * @since 2.1.0 - * @deprecated This type should have never been public and will be hidden or removed in - * 3.0 */ -@Deprecated @ConfigurationProperties("spring.sleuth.propagation.tag") +// TODO: Hide in 3.x, if it isn't already deleted public class SleuthTagPropagationProperties { /** diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/SamplerProperties.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/SamplerProperties.java index 0808077ec..9dd6f8ebb 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/SamplerProperties.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/SamplerProperties.java @@ -24,11 +24,9 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @author Marcin Grzejszczak * @author Adrian Cole * @since 1.0.0 - * @deprecated This type should have never been public and will be hidden or removed in - * 3.0 */ -@Deprecated @ConfigurationProperties("spring.sleuth.sampler") +// TODO: Hide in 3.x, if it isn't already deleted public class SamplerProperties { /** diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinProperties.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinProperties.java index 08c5f88c6..09535c308 100644 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinProperties.java +++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinProperties.java @@ -25,11 +25,9 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * * @author Spencer Gibb * @since 1.0.0 - * @deprecated This type should have never been public and will be hidden or removed in - * 3.0 */ -@Deprecated @ConfigurationProperties("spring.zipkin") +// TODO: Hide in 3.x, if it isn't already deleted public class ZipkinProperties { /** diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinSenderProperties.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinSenderProperties.java index 7037a36b3..fea8c5db3 100644 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinSenderProperties.java +++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinSenderProperties.java @@ -25,6 +25,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @since 1.3.1 */ @ConfigurationProperties("spring.zipkin.sender") +// TODO: Hide in 3.x, if it isn't already deleted public class ZipkinSenderProperties { /**