From 8b6eef6f1d09fe69c2ec98e3d7b4ad515cf6ce8f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 30 Mar 2021 09:17:00 +0100 Subject: [PATCH] Consistent use of @deprecated since See gh-25808 --- .../actuate/endpoint/invoker/cache/CachingOperationInvoker.java | 2 +- .../elasticsearch/rest/RestClientBuilderCustomizer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoker/cache/CachingOperationInvoker.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoker/cache/CachingOperationInvoker.java index 401aa648b53..2ff11ac6058 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoker/cache/CachingOperationInvoker.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoker/cache/CachingOperationInvoker.java @@ -110,7 +110,7 @@ public class CachingOperationInvoker implements OperationInvoker { * @param timeToLive the maximum time in milliseconds that a response can be cached * @return a caching version of the invoker or the original instance if caching is not * required - * @deprecated as of 2.3 to make package-private in 2.4 + * @deprecated since 2.3 for removal in 2.5 */ @Deprecated public static OperationInvoker apply(OperationInvoker invoker, long timeToLive) { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/rest/RestClientBuilderCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/rest/RestClientBuilderCustomizer.java index e08641e42ba..aaec4830986 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/rest/RestClientBuilderCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/rest/RestClientBuilderCustomizer.java @@ -25,7 +25,7 @@ import org.elasticsearch.client.RestClientBuilder; * * @author Brian Clozel * @since 2.1.0 - * @deprecated as of 2.3.1 for removal in 2.5 in favor of + * @deprecated since 2.3.1 for removal in 2.5 in favor of * {@link org.springframework.boot.autoconfigure.elasticsearch.RestClientBuilderCustomizer} */ @FunctionalInterface