From c979eddab1f037ccab963c1751c8a388a7b04fe1 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 30 Oct 2024 16:45:00 +0100 Subject: [PATCH] Consistent deprecation markers for 6.2 --- .../org/springframework/expression/spel/ast/Indexer.java | 2 +- .../springframework/expression/spel/ast/SpelNodeImpl.java | 4 ++-- .../web/reactive/resource/WebJarsResourceResolver.java | 6 +++--- .../web/servlet/resource/WebJarsResourceResolver.java | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Indexer.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Indexer.java index 969b50e46cc..cab438f0478 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Indexer.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Indexer.java @@ -127,7 +127,7 @@ public class Indexer extends SpelNodeImpl { * Create an {@code Indexer} with the given start position, end position, and * index expression. * @see #Indexer(boolean, int, int, SpelNodeImpl) - * @deprecated as of Spring Framework 6.2, in favor of {@link #Indexer(boolean, int, int, SpelNodeImpl)} + * @deprecated as of 6.2, in favor of {@link #Indexer(boolean, int, int, SpelNodeImpl)} */ @Deprecated(since = "6.2", forRemoval = true) public Indexer(int startPos, int endPos, SpelNodeImpl indexExpression) { diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/SpelNodeImpl.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/SpelNodeImpl.java index 7303fde5609..b5ed9d0e2cc 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/SpelNodeImpl.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/SpelNodeImpl.java @@ -220,7 +220,7 @@ public abstract class SpelNodeImpl implements SpelNode, Opcodes { * @param cf the current {@link CodeFlow} * @param member the method or constructor for which arguments are being set up * @param arguments the expression nodes for the expression supplied argument values - * @deprecated As of Spring Framework 6.2, in favor of + * @deprecated as of 6.2, in favor of * {@link #generateCodeForArguments(MethodVisitor, CodeFlow, Executable, SpelNodeImpl[])} */ @Deprecated(since = "6.2") @@ -322,7 +322,7 @@ public abstract class SpelNodeImpl implements SpelNode, Opcodes { *

This method also performs any boxing, unboxing, or check-casting * necessary to ensure that the type of the argument on the stack matches the * supplied {@code paramDesc}. - * @deprecated As of Spring Framework 6.2, in favor of + * @deprecated as of 6.2, in favor of * {@link CodeFlow#generateCodeForArgument(MethodVisitor, SpelNode, String)} */ @Deprecated(since = "6.2") diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/WebJarsResourceResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/WebJarsResourceResolver.java index 1cc18f449a7..c851a379f7e 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/WebJarsResourceResolver.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/WebJarsResourceResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,9 +46,9 @@ import org.springframework.web.server.ServerWebExchange; * @author Brian Clozel * @since 5.0 * @see webjars.org - * @deprecated as of Spring Framework 6.2 in favor of {@link LiteWebJarsResourceResolver} + * @deprecated as of 6.2, in favor of {@link LiteWebJarsResourceResolver} */ -@Deprecated(forRemoval = true) +@Deprecated(since = "6.2", forRemoval = true) public class WebJarsResourceResolver extends AbstractResourceResolver { private static final String WEBJARS_LOCATION = "META-INF/resources/webjars/"; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/WebJarsResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/WebJarsResourceResolver.java index 5a354a5b117..57459b988eb 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/WebJarsResourceResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/WebJarsResourceResolver.java @@ -47,9 +47,9 @@ import org.springframework.lang.Nullable; * @see org.springframework.web.servlet.config.annotation.ResourceChainRegistration * @see webjars.org * @see LiteWebJarsResourceResolver - * @deprecated as of Spring Framework 6.2 in favor of {@link LiteWebJarsResourceResolver} + * @deprecated as of 6.2, in favor of {@link LiteWebJarsResourceResolver} */ -@Deprecated(forRemoval = true) +@Deprecated(since = "6.2", forRemoval = true) public class WebJarsResourceResolver extends AbstractResourceResolver { private static final String WEBJARS_LOCATION = "META-INF/resources/webjars/";