Skip to content

Commit c979edd

Browse files
committed
Consistent deprecation markers for 6.2
1 parent 864cb25 commit c979edd

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

spring-expression/src/main/java/org/springframework/expression/spel/ast/Indexer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ private AccessMode(boolean supportsReads, boolean supportsWrites) {
127127
* Create an {@code Indexer} with the given start position, end position, and
128128
* index expression.
129129
* @see #Indexer(boolean, int, int, SpelNodeImpl)
130-
* @deprecated as of Spring Framework 6.2, in favor of {@link #Indexer(boolean, int, int, SpelNodeImpl)}
130+
* @deprecated as of 6.2, in favor of {@link #Indexer(boolean, int, int, SpelNodeImpl)}
131131
*/
132132
@Deprecated(since = "6.2", forRemoval = true)
133133
public Indexer(int startPos, int endPos, SpelNodeImpl indexExpression) {

spring-expression/src/main/java/org/springframework/expression/spel/ast/SpelNodeImpl.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ protected ValueRef getValueRef(ExpressionState state) throws EvaluationException
220220
* @param cf the current {@link CodeFlow}
221221
* @param member the method or constructor for which arguments are being set up
222222
* @param arguments the expression nodes for the expression supplied argument values
223-
* @deprecated As of Spring Framework 6.2, in favor of
223+
* @deprecated as of 6.2, in favor of
224224
* {@link #generateCodeForArguments(MethodVisitor, CodeFlow, Executable, SpelNodeImpl[])}
225225
*/
226226
@Deprecated(since = "6.2")
@@ -322,7 +322,7 @@ private static Class<?> loadClassForExitDescriptor(@Nullable String exitDescript
322322
* <p>This method also performs any boxing, unboxing, or check-casting
323323
* necessary to ensure that the type of the argument on the stack matches the
324324
* supplied {@code paramDesc}.
325-
* @deprecated As of Spring Framework 6.2, in favor of
325+
* @deprecated as of 6.2, in favor of
326326
* {@link CodeFlow#generateCodeForArgument(MethodVisitor, SpelNode, String)}
327327
*/
328328
@Deprecated(since = "6.2")

spring-webflux/src/main/java/org/springframework/web/reactive/resource/WebJarsResourceResolver.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2022 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -46,9 +46,9 @@
4646
* @author Brian Clozel
4747
* @since 5.0
4848
* @see <a href="https://www.webjars.org">webjars.org</a>
49-
* @deprecated as of Spring Framework 6.2 in favor of {@link LiteWebJarsResourceResolver}
49+
* @deprecated as of 6.2, in favor of {@link LiteWebJarsResourceResolver}
5050
*/
51-
@Deprecated(forRemoval = true)
51+
@Deprecated(since = "6.2", forRemoval = true)
5252
public class WebJarsResourceResolver extends AbstractResourceResolver {
5353

5454
private static final String WEBJARS_LOCATION = "META-INF/resources/webjars/";

spring-webmvc/src/main/java/org/springframework/web/servlet/resource/WebJarsResourceResolver.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@
4747
* @see org.springframework.web.servlet.config.annotation.ResourceChainRegistration
4848
* @see <a href="https://www.webjars.org">webjars.org</a>
4949
* @see LiteWebJarsResourceResolver
50-
* @deprecated as of Spring Framework 6.2 in favor of {@link LiteWebJarsResourceResolver}
50+
* @deprecated as of 6.2, in favor of {@link LiteWebJarsResourceResolver}
5151
*/
52-
@Deprecated(forRemoval = true)
52+
@Deprecated(since = "6.2", forRemoval = true)
5353
public class WebJarsResourceResolver extends AbstractResourceResolver {
5454

5555
private static final String WEBJARS_LOCATION = "META-INF/resources/webjars/";

0 commit comments

Comments
 (0)