Browse Source

Consistent deprecation markers for 6.2

pull/33827/head
Juergen Hoeller 1 year ago
parent
commit
c979eddab1
  1. 2
      spring-expression/src/main/java/org/springframework/expression/spel/ast/Indexer.java
  2. 4
      spring-expression/src/main/java/org/springframework/expression/spel/ast/SpelNodeImpl.java
  3. 6
      spring-webflux/src/main/java/org/springframework/web/reactive/resource/WebJarsResourceResolver.java
  4. 4
      spring-webmvc/src/main/java/org/springframework/web/servlet/resource/WebJarsResourceResolver.java

2
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 * Create an {@code Indexer} with the given start position, end position, and
* index expression. * index expression.
* @see #Indexer(boolean, int, int, SpelNodeImpl) * @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) @Deprecated(since = "6.2", forRemoval = true)
public Indexer(int startPos, int endPos, SpelNodeImpl indexExpression) { public Indexer(int startPos, int endPos, SpelNodeImpl indexExpression) {

4
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 cf the current {@link CodeFlow}
* @param member the method or constructor for which arguments are being set up * @param member the method or constructor for which arguments are being set up
* @param arguments the expression nodes for the expression supplied argument values * @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[])} * {@link #generateCodeForArguments(MethodVisitor, CodeFlow, Executable, SpelNodeImpl[])}
*/ */
@Deprecated(since = "6.2") @Deprecated(since = "6.2")
@ -322,7 +322,7 @@ public abstract class SpelNodeImpl implements SpelNode, Opcodes {
* <p>This method also performs any boxing, unboxing, or check-casting * <p>This method also performs any boxing, unboxing, or check-casting
* necessary to ensure that the type of the argument on the stack matches the * necessary to ensure that the type of the argument on the stack matches the
* supplied {@code paramDesc}. * 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)} * {@link CodeFlow#generateCodeForArgument(MethodVisitor, SpelNode, String)}
*/ */
@Deprecated(since = "6.2") @Deprecated(since = "6.2")

6
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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 * @author Brian Clozel
* @since 5.0 * @since 5.0
* @see <a href="https://www.webjars.org">webjars.org</a> * @see <a href="https://www.webjars.org">webjars.org</a>
* @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 { public class WebJarsResourceResolver extends AbstractResourceResolver {
private static final String WEBJARS_LOCATION = "META-INF/resources/webjars/"; private static final String WEBJARS_LOCATION = "META-INF/resources/webjars/";

4
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 org.springframework.web.servlet.config.annotation.ResourceChainRegistration
* @see <a href="https://www.webjars.org">webjars.org</a> * @see <a href="https://www.webjars.org">webjars.org</a>
* @see LiteWebJarsResourceResolver * @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 { public class WebJarsResourceResolver extends AbstractResourceResolver {
private static final String WEBJARS_LOCATION = "META-INF/resources/webjars/"; private static final String WEBJARS_LOCATION = "META-INF/resources/webjars/";

Loading…
Cancel
Save