From ad3f2cb53a786a08ff43855e82d4d0cb04ee6323 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Tue, 7 Apr 2020 11:31:44 -0400 Subject: [PATCH] Deprecates concurrency-limits module. fixes gh-3767 --- .../concurrency/limits/micrometer/MicrometerMetricRegistry.java | 2 ++ .../concurrency/limits/reactive/ConcurrencyLimitsWebFilter.java | 2 ++ .../reactive/ReactiveConcurrencyLimitsAutoConfiguration.java | 2 ++ .../limits/reactive/ServerWebExchangeLimiterBuilder.java | 2 ++ .../limits/web/ConcurrencyLimitsHandlerInterceptor.java | 2 ++ .../limits/web/MvcConcurrencyLimitsAutoConfiguration.java | 2 ++ 6 files changed, 12 insertions(+) diff --git a/spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/micrometer/MicrometerMetricRegistry.java b/spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/micrometer/MicrometerMetricRegistry.java index 0527f5cbb..4273e3f3c 100644 --- a/spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/micrometer/MicrometerMetricRegistry.java +++ b/spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/micrometer/MicrometerMetricRegistry.java @@ -27,7 +27,9 @@ import io.micrometer.core.instrument.Tags; * A Micrometer-specific {@link MetricRegistry} implementation. * * @author Spencer Gibb + * @deprecated to be removed in 3.0.0 */ +@Deprecated public class MicrometerMetricRegistry implements MetricRegistry { private final MeterRegistry meterRegistry; diff --git a/spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/reactive/ConcurrencyLimitsWebFilter.java b/spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/reactive/ConcurrencyLimitsWebFilter.java index 6d90527aa..a0b7a0c37 100644 --- a/spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/reactive/ConcurrencyLimitsWebFilter.java +++ b/spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/reactive/ConcurrencyLimitsWebFilter.java @@ -29,7 +29,9 @@ import org.springframework.web.server.WebFilterChain; * {@link Limiter} to handle requests. * * @author Spencer Gibb + * @deprecated to be removed in 3.0.0 */ +@Deprecated public class ConcurrencyLimitsWebFilter implements WebFilter { private final Limiter limiter; diff --git a/spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/reactive/ReactiveConcurrencyLimitsAutoConfiguration.java b/spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/reactive/ReactiveConcurrencyLimitsAutoConfiguration.java index 574e84ba1..d8223330f 100644 --- a/spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/reactive/ReactiveConcurrencyLimitsAutoConfiguration.java +++ b/spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/reactive/ReactiveConcurrencyLimitsAutoConfiguration.java @@ -35,7 +35,9 @@ import org.springframework.web.server.WebFilter; * Reactive autoconfiguration class for registering Netflix {@link Limiter} bean. * * @author Spencer Gibb + * @deprecated to be removed in 3.0.0 */ +@Deprecated @Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.REACTIVE) @ConditionalOnClass({ WebFilter.class, Mono.class }) diff --git a/spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/reactive/ServerWebExchangeLimiterBuilder.java b/spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/reactive/ServerWebExchangeLimiterBuilder.java index bdb649a6b..a355ec154 100644 --- a/spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/reactive/ServerWebExchangeLimiterBuilder.java +++ b/spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/reactive/ServerWebExchangeLimiterBuilder.java @@ -27,7 +27,9 @@ import org.springframework.web.server.ServerWebExchange; * Builder for ServerWebExchange Limiter. * * @author Spencer Gibb + * @deprecated to be removed in 3.0.0 */ +@Deprecated public class ServerWebExchangeLimiterBuilder extends AbstractPartitionedLimiter.Builder { diff --git a/spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/web/ConcurrencyLimitsHandlerInterceptor.java b/spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/web/ConcurrencyLimitsHandlerInterceptor.java index 6a4745d4a..5ef100cd9 100644 --- a/spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/web/ConcurrencyLimitsHandlerInterceptor.java +++ b/spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/web/ConcurrencyLimitsHandlerInterceptor.java @@ -34,7 +34,9 @@ import org.springframework.web.servlet.ModelAndView; * {@link Limiter} to handle requests. * * @author Spencer Gibb + * @deprecated to be removed in 3.0.0 */ +@Deprecated public class ConcurrencyLimitsHandlerInterceptor implements HandlerInterceptor { private final Limiter limiter; diff --git a/spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/web/MvcConcurrencyLimitsAutoConfiguration.java b/spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/web/MvcConcurrencyLimitsAutoConfiguration.java index 8061fdb34..fb40d30c0 100644 --- a/spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/web/MvcConcurrencyLimitsAutoConfiguration.java +++ b/spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/web/MvcConcurrencyLimitsAutoConfiguration.java @@ -39,10 +39,12 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; * MVC autoconfiguration class for registering Netflix {@link Limiter} bean. * * @author Spencer Gibb + * @deprecated to be removed in 3.0.0 */ @Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.SERVLET) @ConditionalOnClass({ HttpServletRequest.class, HandlerInterceptor.class }) +@Deprecated public class MvcConcurrencyLimitsAutoConfiguration implements WebMvcConfigurer { private final ObjectProvider> configurerProvider;