root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Add missing "since" in `@Deprecated` 

See gh-34942

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
This commit is contained in:
Yanming Zhou 2025-05-26 17:38:18 +08:00 committed by rstoyanchev
parent b7dfd68d89
commit f9fa7cc93b
44 changed files with 111 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
View File

@ -98,7 +98,7 @@ public abstract class BeanUtils {
* @deprecated as of Spring 5.0, following the deprecation of
* {@link Class#newInstance()} in JDK 9
*/
@Deprecated
@Deprecated(since = "5.0")
public static <T> T instantiate(Class<T> clazz) throws BeanInstantiationException {
Assert.notNull(clazz, "Class must not be null");
if (clazz.isInterface()) {

4
spring-beans/src/main/java/org/springframework/beans/factory/config/AutowireCapableBeanFactory.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2025 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.
@ -100,7 +100,7 @@ public interface AutowireCapableBeanFactory extends BeanFactory {
* @deprecated as of Spring 3.0: If you are using mixed autowiring strategies,
* prefer annotation-based autowiring for clearer demarcation of autowiring needs.
*/
@Deprecated
@Deprecated(since = "3.0")
int AUTOWIRE_AUTODETECT = 4;
/**

2
spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
View File

@ -363,7 +363,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
// Specialized methods for fine-grained control over the bean lifecycle
//-------------------------------------------------------------------------
@Deprecated
@Deprecated(since = "6.1")
@Override
public Object createBean(Class<?> beanClass, int autowireMode, boolean dependencyCheck) throws BeansException {
// Use non-singleton bean definition, to avoid registering bean as dependent bean.

4
spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 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.
@ -98,7 +98,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
* @deprecated as of Spring 3.0: If you are using mixed autowiring strategies,
* use annotation-based autowiring for clearer demarcation of autowiring needs.
*/
@Deprecated
@Deprecated(since = "3.0")
public static final int AUTOWIRE_AUTODETECT = AutowireCapableBeanFactory.AUTOWIRE_AUTODETECT;
/**

2
spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java
View File

@ -78,7 +78,7 @@ import org.springframework.util.StringUtils;
* @deprecated as of 5.3, in favor of Spring's common bean definition formats
* and/or custom reader implementations
*/
@Deprecated
@Deprecated(since = "5.3")
public class PropertiesBeanDefinitionReader extends AbstractBeanDefinitionReader {
/**

4
spring-context/src/main/java/org/springframework/context/support/AbstractResourceBasedMessageSource.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 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.
@ -158,7 +158,7 @@ public abstract class AbstractResourceBasedMessageSource extends AbstractMessage
* @since 4.3
* @deprecated as of 5.2.2, in favor of {@link #getDefaultLocale()}
*/
@Deprecated
@Deprecated(since = "5.2.2")
protected boolean isFallbackToSystemLocale() {
return this.fallbackToSystemLocale;
}

2
spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java
View File

@ -200,7 +200,7 @@ public class PropertySourcesPlaceholderConfigurer extends PlaceholderConfigurerS
* {@link #processProperties(ConfigurableListableBeanFactory, ConfigurablePropertyResolver)}
*/
@Override
@Deprecated
@Deprecated(since = "3.1")
protected void processProperties(ConfigurableListableBeanFactory beanFactory, Properties props) {
throw new UnsupportedOperationException(
"Call processProperties(ConfigurableListableBeanFactory, ConfigurablePropertyResolver) instead");

4
spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 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.
@ -153,7 +153,7 @@ public class ConcurrentTaskExecutor implements AsyncTaskExecutor, SchedulingTask
this.adaptedExecutor.execute(task);
}
@Deprecated
@Deprecated(since = "5.3.16")
@Override
public void execute(Runnable task, long startTimeout) {
this.adaptedExecutor.execute(task, startTimeout);

4
spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 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.
@ -302,7 +302,7 @@ public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport
* @deprecated as of 5.3.9, in favor of direct
* {@link #getScheduledThreadPoolExecutor()} access
*/
@Deprecated
@Deprecated(since = "5.3.9")
public boolean isRemoveOnCancelPolicy() {
if (this.scheduledExecutor == null) {
// Not initialized yet: return our setting for the time being.

2
spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java
View File

@ -61,7 +61,7 @@ public final class GenericTypeResolver {
* @return the corresponding generic parameter or return type
* @deprecated since 5.2 in favor of {@code methodParameter.withContainingClass(implementationClass).getParameterType()}
*/
@Deprecated
@Deprecated(since = "5.2")
public static Class<?> resolveParameterType(MethodParameter methodParameter, Class<?> implementationClass) {
Assert.notNull(methodParameter, "MethodParameter must not be null");
Assert.notNull(implementationClass, "Class must not be null");

12
spring-core/src/main/java/org/springframework/core/MethodParameter.java
View File

@ -266,7 +266,7 @@ public class MethodParameter {
* @see #getNestingLevel()
* @deprecated since 5.2 in favor of {@link #nested(Integer)}
*/
@Deprecated
@Deprecated(since = "5.2")
public void increaseNestingLevel() {
this.nestingLevel++;
}
@ -277,7 +277,7 @@ public class MethodParameter {
* @deprecated since 5.2 in favor of retaining the original MethodParameter and
* using {@link #nested(Integer)} if nesting is required
*/
@Deprecated
@Deprecated(since = "5.2")
public void decreaseNestingLevel() {
getTypeIndexesPerLevel().remove(this.nestingLevel);
this.nestingLevel--;
@ -309,7 +309,7 @@ public class MethodParameter {
* @see #getNestingLevel()
* @deprecated since 5.2 in favor of {@link #withTypeIndex}
*/
@Deprecated
@Deprecated(since = "5.2")
public void setTypeIndexForCurrentLevel(int typeIndex) {
getTypeIndexesPerLevel().put(this.nestingLevel, typeIndex);
}
@ -429,7 +429,7 @@ public class MethodParameter {
/**
* Set a containing class to resolve the parameter type against.
*/
@Deprecated
@Deprecated(since = "5.2")
void setContainingClass(Class<?> containingClass) {
this.containingClass = containingClass;
this.parameterType = null;
@ -449,7 +449,7 @@ public class MethodParameter {
/**
* Set a resolved (generic) parameter type.
*/
@Deprecated
@Deprecated(since = "5.2")
void setParameterType(@Nullable Class<?> parameterType) {
this.parameterType = parameterType;
}
@ -760,7 +760,7 @@ public class MethodParameter {
* @return the corresponding MethodParameter instance
* @deprecated as of 5.0, in favor of {@link #forExecutable}
*/
@Deprecated
@Deprecated(since = "5.0")
public static MethodParameter forMethodOrConstructor(Object methodOrConstructor, int parameterIndex) {
if (!(methodOrConstructor instanceof Executable executable)) {
throw new IllegalArgumentException(

4
spring-core/src/main/java/org/springframework/core/annotation/AnnotationFilter.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2025 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.
@ -79,7 +79,7 @@ public interface AnnotationFilter {
* always ignores lang annotations according to the {@link #PLAIN} filter
* (for efficiency reasons)
*/
@Deprecated
@Deprecated(since = "5.2.6")
AnnotationFilter NONE = new AnnotationFilter() {
@Override
public boolean matches(Annotation annotation) {

20
spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java
View File

@ -265,7 +265,7 @@ public abstract class AnnotationUtils {
* @see AnnotatedElement#getAnnotations()
* @deprecated as of 5.2 since it is superseded by the {@link MergedAnnotations} API
*/
@Deprecated
@Deprecated(since = "5.2")
public static Annotation @Nullable [] getAnnotations(AnnotatedElement annotatedElement) {
try {
return synthesizeAnnotationArray(annotatedElement.getAnnotations(), annotatedElement);
@ -289,7 +289,7 @@ public abstract class AnnotationUtils {
* @see AnnotatedElement#getAnnotations()
* @deprecated as of 5.2 since it is superseded by the {@link MergedAnnotations} API
*/
@Deprecated
@Deprecated(since = "5.2")
public static Annotation @Nullable [] getAnnotations(Method method) {
try {
return synthesizeAnnotationArray(BridgeMethodResolver.findBridgedMethod(method).getAnnotations(), method);
@ -328,7 +328,7 @@ public abstract class AnnotationUtils {
* @see java.lang.reflect.AnnotatedElement#getAnnotationsByType
* @deprecated as of 5.2 since it is superseded by the {@link MergedAnnotations} API
*/
@Deprecated
@Deprecated(since = "5.2")
public static <A extends Annotation> Set<A> getRepeatableAnnotations(AnnotatedElement annotatedElement,
Class<A> annotationType) {
@ -365,7 +365,7 @@ public abstract class AnnotationUtils {
* @see java.lang.reflect.AnnotatedElement#getAnnotationsByType
* @deprecated as of 5.2 since it is superseded by the {@link MergedAnnotations} API
*/
@Deprecated
@Deprecated(since = "5.2")
public static <A extends Annotation> Set<A> getRepeatableAnnotations(AnnotatedElement annotatedElement,
Class<A> annotationType, @Nullable Class<? extends Annotation> containerAnnotationType) {
@ -409,7 +409,7 @@ public abstract class AnnotationUtils {
* @see java.lang.reflect.AnnotatedElement#getDeclaredAnnotationsByType
* @deprecated as of 5.2 since it is superseded by the {@link MergedAnnotations} API
*/
@Deprecated
@Deprecated(since = "5.2")
public static <A extends Annotation> Set<A> getDeclaredRepeatableAnnotations(AnnotatedElement annotatedElement,
Class<A> annotationType) {
@ -446,7 +446,7 @@ public abstract class AnnotationUtils {
* @see java.lang.reflect.AnnotatedElement#getDeclaredAnnotationsByType
* @deprecated as of 5.2 since it is superseded by the {@link MergedAnnotations} API
*/
@Deprecated
@Deprecated(since = "5.2")
public static <A extends Annotation> Set<A> getDeclaredRepeatableAnnotations(AnnotatedElement annotatedElement,
Class<A> annotationType, @Nullable Class<? extends Annotation> containerAnnotationType) {
@ -597,7 +597,7 @@ public abstract class AnnotationUtils {
* @see Class#getDeclaredAnnotations()
* @deprecated as of 5.2 since it is superseded by the {@link MergedAnnotations} API
*/
@Deprecated
@Deprecated(since = "5.2")
public static @Nullable Class<?> findAnnotationDeclaringClass(
Class<? extends Annotation> annotationType, @Nullable Class<?> clazz) {
@ -633,7 +633,7 @@ public abstract class AnnotationUtils {
* @see Class#getDeclaredAnnotations()
* @deprecated as of 5.2 since it is superseded by the {@link MergedAnnotations} API
*/
@Deprecated
@Deprecated(since = "5.2")
public static @Nullable Class<?> findAnnotationDeclaringClassForTypes(
List<Class<? extends Annotation>> annotationTypes, @Nullable Class<?> clazz) {
@ -686,7 +686,7 @@ public abstract class AnnotationUtils {
* @see #isAnnotationDeclaredLocally(Class, Class)
* @deprecated as of 5.2 since it is superseded by the {@link MergedAnnotations} API
*/
@Deprecated
@Deprecated(since = "5.2")
public static boolean isAnnotationInherited(Class<? extends Annotation> annotationType, Class<?> clazz) {
return MergedAnnotations.from(clazz, SearchStrategy.INHERITED_ANNOTATIONS)
.stream(annotationType)
@ -704,7 +704,7 @@ public abstract class AnnotationUtils {
* @since 4.2.1
* @deprecated as of 5.2 since it is superseded by the {@link MergedAnnotations} API
*/
@Deprecated
@Deprecated(since = "5.2")
public static boolean isAnnotationMetaPresent(Class<? extends Annotation> annotationType,
@Nullable Class<? extends Annotation> metaAnnotationType) {

4
spring-core/src/main/java/org/springframework/core/codec/AbstractDataBufferDecoder.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2025 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.
@ -100,7 +100,7 @@ public abstract class AbstractDataBufferDecoder<T> extends AbstractDecoder<T> {
* @deprecated as of 5.2, please implement
* {@link #decode(DataBuffer, ResolvableType, MimeType, Map)} instead
*/
@Deprecated
@Deprecated(since = "5.2")
protected @Nullable T decodeDataBuffer(DataBuffer buffer, ResolvableType elementType,
@Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {

2
spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java vendored
View File

@ -377,7 +377,7 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
}
@Override
@Deprecated
@Deprecated(since = "5.1")
public boolean acceptsProfiles(String... profiles) {
Assert.notEmpty(profiles, "Must specify at least one profile");
for (String profile : profiles) {

4
spring-core/src/main/java/org/springframework/core/env/Environment.java vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2025 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.
@ -133,7 +133,7 @@ public interface Environment extends PropertyResolver {
* @deprecated as of 5.1 in favor of {@link #acceptsProfiles(Profiles)} or
* {@link #matchesProfiles(String...)}
*/
@Deprecated
@Deprecated(since = "5.1")
boolean acceptsProfiles(String... profiles);
/**

8
spring-core/src/main/java/org/springframework/core/task/AsyncTaskExecutor.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2025 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.
@ -48,14 +48,14 @@ public interface AsyncTaskExecutor extends TaskExecutor {
* Constant that indicates immediate execution.
* @deprecated as of 5.3.16 along with {@link #execute(Runnable, long)}
*/
@Deprecated
@Deprecated(since = "5.3.16")
long TIMEOUT_IMMEDIATE = 0;
/**
* Constant that indicates no time limit.
* @deprecated as of 5.3.16 along with {@link #execute(Runnable, long)}
*/
@Deprecated
@Deprecated(since = "5.3.16")
long TIMEOUT_INDEFINITE = Long.MAX_VALUE;
@ -74,7 +74,7 @@ public interface AsyncTaskExecutor extends TaskExecutor {
* @see #execute(Runnable)
* @deprecated as of 5.3.16 since the common executors do not support start timeouts
*/
@Deprecated
@Deprecated(since = "5.3.16")
default void execute(Runnable task, long startTimeout) {
execute(task);
}

2
spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java
View File

@ -264,7 +264,7 @@ public class SimpleAsyncTaskExecutor extends CustomizableThreadCreator
* @see #TIMEOUT_IMMEDIATE
* @see #doExecute(Runnable)
*/
@Deprecated
@Deprecated(since = "5.3.16")
@Override
public void execute(Runnable task, long startTimeout) {
Assert.notNull(task, "Runnable must not be null");

4
spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2025 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.
@ -25,7 +25,7 @@ package org.springframework.core.task;
* @see AsyncTaskExecutor#execute(Runnable, long)
* @deprecated as of 5.3.16 since the common executors do not support start timeouts
*/
@Deprecated
@Deprecated(since = "5.3.16")
@SuppressWarnings("serial")
public class TaskTimeoutException extends TaskRejectedException {

4
spring-core/src/main/java/org/springframework/core/type/StandardAnnotationMetadata.java
View File

@ -60,7 +60,7 @@ public class StandardAnnotationMetadata extends StandardClassMetadata implements
* @see #StandardAnnotationMetadata(Class, boolean)
* @deprecated since 5.2 in favor of the factory method {@link AnnotationMetadata#introspect(Class)}
*/
@Deprecated
@Deprecated(since = "5.2")
public StandardAnnotationMetadata(Class<?> introspectedClass) {
this(introspectedClass, false);
}
@ -80,7 +80,7 @@ public class StandardAnnotationMetadata extends StandardClassMetadata implements
* from {@link #getAnnotations()} rather than {@link #getAnnotationAttributes(String)}
* if {@code nestedAnnotationsAsMap} is {@code false}
*/
@Deprecated
@Deprecated(since = "5.2")
public StandardAnnotationMetadata(Class<?> introspectedClass, boolean nestedAnnotationsAsMap) {
super(introspectedClass);
this.mergedAnnotations = MergedAnnotations.from(introspectedClass,

4
spring-core/src/main/java/org/springframework/core/type/StandardClassMetadata.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2025 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.
@ -42,7 +42,7 @@ public class StandardClassMetadata implements ClassMetadata {
* @param introspectedClass the Class to introspect
* @deprecated since 5.2 in favor of {@link StandardAnnotationMetadata}
*/
@Deprecated
@Deprecated(since = "5.2")
public StandardClassMetadata(Class<?> introspectedClass) {
Assert.notNull(introspectedClass, "Class must not be null");
this.introspectedClass = introspectedClass;

2
spring-core/src/main/java/org/springframework/core/type/StandardMethodMetadata.java
View File

@ -54,7 +54,7 @@ public class StandardMethodMetadata implements MethodMetadata {
* @param introspectedMethod the Method to introspect
* @deprecated since 5.2 in favor of obtaining instances via {@link AnnotationMetadata}
*/
@Deprecated
@Deprecated(since = "5.2")
public StandardMethodMetadata(Method introspectedMethod) {
this(introspectedMethod, false);
}

4
spring-core/src/main/java/org/springframework/lang/NonNull.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 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.
@ -52,6 +52,6 @@ import javax.annotation.meta.TypeQualifierNickname;
@Documented
@Nonnull
@TypeQualifierNickname
@Deprecated
@Deprecated(since = "7.0")
public @interface NonNull {
}

4
spring-core/src/main/java/org/springframework/lang/NonNullApi.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 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.
@ -48,6 +48,6 @@ import javax.annotation.meta.TypeQualifierDefault;
@Documented
@Nonnull
@TypeQualifierDefault({ElementType.METHOD, ElementType.PARAMETER})
@Deprecated
@Deprecated(since = "7.0")
public @interface NonNullApi {
}

4
spring-core/src/main/java/org/springframework/lang/NonNullFields.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 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.
@ -47,6 +47,6 @@ import javax.annotation.meta.TypeQualifierDefault;
@Documented
@Nonnull
@TypeQualifierDefault(ElementType.FIELD)
@Deprecated
@Deprecated(since = "7.0")
public @interface NonNullFields {
}

4
spring-core/src/main/java/org/springframework/lang/Nullable.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 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.
@ -52,6 +52,6 @@ import javax.annotation.meta.TypeQualifierNickname;
@Documented
@CheckForNull
@TypeQualifierNickname
@Deprecated
@Deprecated(since = "7.0")
public @interface Nullable {
}

8
spring-core/src/main/java/org/springframework/util/ClassUtils.java
View File

@ -942,7 +942,7 @@ public abstract class ClassUtils {
* @deprecated as of 5.2, in favor of custom (possibly narrower) checks
* such as for a Spring AOP proxy
*/
@Deprecated
@Deprecated(since = "5.2")
public static boolean isCglibProxy(Object object) {
return isCglibProxyClass(object.getClass());
}
@ -954,7 +954,7 @@ public abstract class ClassUtils {
* @deprecated as of 5.2, in favor of custom (possibly narrower) checks
* or simply a check for containing {@link #CGLIB_CLASS_SEPARATOR}
*/
@Deprecated
@Deprecated(since = "5.2")
public static boolean isCglibProxyClass(@Nullable Class<?> clazz) {
return (clazz != null && isCglibProxyClassName(clazz.getName()));
}
@ -966,7 +966,7 @@ public abstract class ClassUtils {
* @deprecated as of 5.2, in favor of custom (possibly narrower) checks
* or simply a check for containing {@link #CGLIB_CLASS_SEPARATOR}
*/
@Deprecated
@Deprecated(since = "5.2")
public static boolean isCglibProxyClassName(@Nullable String className) {
return (className != null && className.contains(CGLIB_CLASS_SEPARATOR));
}
@ -1388,7 +1388,7 @@ public abstract class ClassUtils {
* @see #getPubliclyAccessibleMethodIfPossible(Method, Class)
* @deprecated in favor of {@link #getInterfaceMethodIfPossible(Method, Class)}
*/
@Deprecated
@Deprecated(since = "5.2")
public static Method getInterfaceMethodIfPossible(Method method) {
return getInterfaceMethodIfPossible(method, null);
}

4
spring-core/src/main/java/org/springframework/util/SerializationUtils.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 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.
@ -72,7 +72,7 @@ public abstract class SerializationUtils {
* <p>Prefer the use of an external tool (that serializes to JSON, XML, or
* any other format) which is regularly checked and updated for not allowing RCE.
*/
@Deprecated
@Deprecated(since = "6.0")
public static @Nullable Object deserialize(byte @Nullable [] bytes) {
if (bytes == null) {
return null;

2
spring-core/src/main/java/org/springframework/util/StringUtils.java
View File

@ -108,7 +108,7 @@ public abstract class StringUtils {
* @deprecated as of 5.3, in favor of {@link #hasLength(String)} and
* {@link #hasText(String)} (or {@link ObjectUtils#isEmpty(Object)})
*/
@Deprecated
@Deprecated(since = "5.3")
public static boolean isEmpty(@Nullable Object str) {
return (str == null || "".equals(str));
}

14
spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 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.
@ -369,7 +369,7 @@ public interface JdbcOperations {
* @throws DataAccessException if the query fails
* @deprecated as of 5.3, in favor of {@link #query(String, ResultSetExtractor, Object...)}
*/
@Deprecated
@Deprecated(since = "5.3")
<T> @Nullable T query(String sql, @Nullable Object @Nullable [] args, ResultSetExtractor<T> rse) throws DataAccessException;
/**
@ -440,7 +440,7 @@ public interface JdbcOperations {
* @throws DataAccessException if the query fails
* @deprecated as of 5.3, in favor of {@link #query(String, RowCallbackHandler, Object...)}
*/
@Deprecated
@Deprecated(since = "5.3")
void query(String sql, @Nullable Object @Nullable [] args, RowCallbackHandler rch) throws DataAccessException;
/**
@ -516,7 +516,7 @@ public interface JdbcOperations {
* @throws DataAccessException if the query fails
* @deprecated as of 5.3, in favor of {@link #query(String, RowMapper, Object...)}
*/
@Deprecated
@Deprecated(since = "5.3")
<T> List<T> query(String sql, @Nullable Object @Nullable [] args, RowMapper<T> rowMapper) throws DataAccessException;
/**
@ -623,7 +623,7 @@ public interface JdbcOperations {
* @throws DataAccessException if the query fails
* @deprecated as of 5.3, in favor of {@link #queryForObject(String, RowMapper, Object...)}
*/
@Deprecated
@Deprecated(since = "5.3")
<T> @Nullable T queryForObject(String sql, @Nullable Object @Nullable [] args, RowMapper<T> rowMapper) throws DataAccessException;
/**
@ -687,7 +687,7 @@ public interface JdbcOperations {
* @see #queryForObject(String, Class)
* @deprecated as of 5.3, in favor of {@link #queryForObject(String, Class, Object...)}
*/
@Deprecated
@Deprecated(since = "5.3")
<T> @Nullable T queryForObject(String sql, @Nullable Object @Nullable [] args, Class<T> requiredType) throws DataAccessException;
/**
@ -791,7 +791,7 @@ public interface JdbcOperations {
* @see SingleColumnRowMapper
* @deprecated as of 5.3, in favor of {@link #queryForList(String, Class, Object...)}
*/
@Deprecated
@Deprecated(since = "5.3")
<T> List<T> queryForList(String sql, @Nullable Object @Nullable [] args, Class<T> elementType) throws DataAccessException;
/**

12
spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java
View File

@ -740,7 +740,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
return query(sql, newArgTypePreparedStatementSetter(args, argTypes), rse);
}
@Deprecated
@Deprecated(since = "5.3")
@Override
public <T> @Nullable T query(String sql, @Nullable Object @Nullable [] args, ResultSetExtractor<T> rse) throws DataAccessException {
return query(sql, newArgPreparedStatementSetter(args), rse);
@ -766,7 +766,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
query(sql, newArgTypePreparedStatementSetter(args, argTypes), rch);
}
@Deprecated
@Deprecated(since = "5.3")
@Override
public void query(String sql, @Nullable Object @Nullable [] args, RowCallbackHandler rch) throws DataAccessException {
query(sql, newArgPreparedStatementSetter(args), rch);
@ -792,7 +792,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
return result(query(sql, args, argTypes, new RowMapperResultSetExtractor<>(rowMapper)));
}
@Deprecated
@Deprecated(since = "5.3")
@Override
public <T> List<T> query(String sql, @Nullable Object @Nullable [] args, RowMapper<T> rowMapper) throws DataAccessException {
return result(query(sql, newArgPreparedStatementSetter(args), new RowMapperResultSetExtractor<>(rowMapper)));
@ -859,7 +859,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
return DataAccessUtils.nullableSingleResult(results);
}
@Deprecated
@Deprecated(since = "5.3")
@Override
public <T> @Nullable T queryForObject(String sql,@Nullable Object @Nullable [] args, RowMapper<T> rowMapper) throws DataAccessException {
List<T> results = query(sql, newArgPreparedStatementSetter(args), new RowMapperResultSetExtractor<>(rowMapper, 1));
@ -879,7 +879,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
return queryForObject(sql, args, argTypes, getSingleColumnRowMapper(requiredType));
}
@Deprecated
@Deprecated(since = "5.3")
@Override
public <T> @Nullable T queryForObject(String sql, @Nullable Object @Nullable [] args, Class<T> requiredType) throws DataAccessException {
return queryForObject(sql, getSingleColumnRowMapper(requiredType), args);
@ -905,7 +905,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
return query(sql, args, argTypes, getSingleColumnRowMapper(elementType));
}
@Deprecated
@Deprecated(since = "5.3")
@Override
public <T> List<T> queryForList(String sql, @Nullable Object @Nullable [] args, Class<T> elementType) throws DataAccessException {
return query(sql, newArgPreparedStatementSetter(args), getSingleColumnRowMapper(elementType));

4
spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2025 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.
@ -45,7 +45,7 @@ import org.springframework.util.Assert;
* @deprecated as of 5.3, in favor of Spring's common bean definition formats
* and/or custom reader implementations
*/
@Deprecated
@Deprecated(since = "5.3")
public class JdbcBeanDefinitionReader {
private final org.springframework.beans.factory.support.PropertiesBeanDefinitionReader propReader;

2
spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java
View File

@ -266,7 +266,7 @@ public abstract class DataSourceUtils {
* @deprecated as of 5.1.11, in favor of
* {@link #resetConnectionAfterTransaction(Connection, Integer, boolean)}
*/
@Deprecated
@Deprecated(since = "5.1.11")
public static void resetConnectionAfterTransaction(Connection con, @Nullable Integer previousIsolationLevel) {
Assert.notNull(con, "No Connection specified");
try {

4
spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseStartupValidator.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2025 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.
@ -77,7 +77,7 @@ public class DatabaseStartupValidator implements InitializingBean {
* Set the SQL query string to use for validation.
* @deprecated as of 5.3, in favor of the JDBC 4.0 connection validation
*/
@Deprecated
@Deprecated(since = "5.3")
public void setValidationQuery(String validationQuery) {
this.validationQuery = validationQuery;
}

4
spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 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.
@ -379,7 +379,7 @@ public abstract class JdbcUtils {
* {@link #extractDatabaseMetaData(DataSource, DatabaseMetaDataCallback)}
* with a lambda expression or method reference and a generically typed result
*/
@Deprecated
@Deprecated(since = "5.2.9")
@SuppressWarnings("unchecked")
public static <T> T extractDatabaseMetaData(DataSource dataSource, final String metaDataMethodName)
throws MetaDataAccessException {

4
spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughBlob.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 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.
@ -31,7 +31,7 @@ import org.jspecify.annotations.Nullable;
* @author Juergen Hoeller
* @since 2.5.3
*/
@Deprecated
@Deprecated(since = "6.2")
class PassThroughBlob implements Blob {
private byte @Nullable [] content;

4
spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughClob.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 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.
@ -39,7 +39,7 @@ import org.springframework.util.FileCopyUtils;
* @author Juergen Hoeller
* @since 2.5.3
*/
@Deprecated
@Deprecated(since = "6.2")
class PassThroughClob implements Clob {
private @Nullable String content;

8
spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketRequester.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2025 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.
@ -312,7 +312,7 @@ public interface RSocketRequester extends Disposable {
* @see TcpClientTransport
* @deprecated as of 5.3 in favor of {@link #tcp(String, int)}
*/
@Deprecated
@Deprecated(since = "5.3")
Mono<RSocketRequester> connectTcp(String host, int port);
/**
@ -322,7 +322,7 @@ public interface RSocketRequester extends Disposable {
* @see WebsocketClientTransport
* @deprecated as of 5.3 in favor of {@link #websocket(URI)}
*/
@Deprecated
@Deprecated(since = "5.3")
Mono<RSocketRequester> connectWebSocket(URI uri);
/**
@ -331,7 +331,7 @@ public interface RSocketRequester extends Disposable {
* @return an {@code RSocketRequester} for the connection
* @deprecated as of 5.3 in favor of {@link #transport(ClientTransport)}
*/
@Deprecated
@Deprecated(since = "5.3")
Mono<RSocketRequester> connect(ClientTransport transport);
}

4
spring-test/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2025 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.
@ -418,7 +418,7 @@ class StubWebApplicationContext implements WebApplicationContext {
return BeanUtils.instantiateClass(beanClass);
}
@Deprecated
@Deprecated(since = "6.1")
@Override
public Object createBean(Class<?> beanClass, int autowireMode, boolean dependencyCheck) {
return BeanUtils.instantiateClass(beanClass);

4
spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 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.
@ -533,7 +533,7 @@ public abstract class TransactionAspectSupport implements BeanFactoryAware, Init
* Determine the specific transaction manager to use for the given transaction.
* @deprecated as of 6.2, in favor of {@link #determineTransactionManager(TransactionAttribute, Class)}
*/
@Deprecated
@Deprecated(since = "6.2")
protected @Nullable TransactionManager determineTransactionManager(@Nullable TransactionAttribute txAttr) {
return null;
}

6
spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionInterceptor.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2025 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.
@ -86,7 +86,7 @@ public class TransactionInterceptor extends TransactionAspectSupport implements
* @deprecated as of 5.2.5, in favor of
* {@link #TransactionInterceptor(TransactionManager, TransactionAttributeSource)}
*/
@Deprecated
@Deprecated(since = "5.2.5")
public TransactionInterceptor(PlatformTransactionManager ptm, TransactionAttributeSource tas) {
setTransactionManager(ptm);
setTransactionAttributeSource(tas);
@ -100,7 +100,7 @@ public class TransactionInterceptor extends TransactionAspectSupport implements
* @see #setTransactionAttributes(java.util.Properties)
* @deprecated as of 5.2.5, in favor of {@link #setTransactionAttributes(Properties)}
*/
@Deprecated
@Deprecated(since = "5.2.5")
public TransactionInterceptor(PlatformTransactionManager ptm, Properties attributes) {
setTransactionManager(ptm);
setTransactionAttributes(attributes);

4
spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerMapping.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2025 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.
@ -74,7 +74,7 @@ public interface HandlerMapping {
* To access the cached path used for request mapping, use
* {@link org.springframework.web.util.ServletRequestPathUtils#getCachedPathValue(ServletRequest)}.
*/
@Deprecated
@Deprecated(since = "5.3")
String LOOKUP_PATH = HandlerMapping.class.getName() + ".lookupPath";
/**

8
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 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.
@ -111,7 +111,7 @@ public class WebContentInterceptor extends WebContentGenerator implements Handle
* @deprecated as of 5.3, the path is resolved externally and obtained with
* {@link ServletRequestPathUtils#getCachedPathValue(ServletRequest)}
*/
@Deprecated
@Deprecated(since = "5.3")
public void setAlwaysUseFullPath(boolean alwaysUseFullPath) {
}
@ -122,7 +122,7 @@ public class WebContentInterceptor extends WebContentGenerator implements Handle
* @deprecated as of 5.3, the path is resolved externally and obtained with
* {@link ServletRequestPathUtils#getCachedPathValue(ServletRequest)}
*/
@Deprecated
@Deprecated(since = "5.3")
public void setUrlDecode(boolean urlDecode) {
}
@ -131,7 +131,7 @@ public class WebContentInterceptor extends WebContentGenerator implements Handle
* @deprecated as of 5.3, the path is resolved externally and obtained with
* {@link ServletRequestPathUtils#getCachedPathValue(ServletRequest)}
*/
@Deprecated
@Deprecated(since = "5.3")
public void setUrlPathHelper(UrlPathHelper urlPathHelper) {
}

10
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java
View File

@ -117,7 +117,7 @@ public final class RequestMappingInfo implements RequestCondition<RequestMapping
* {@link #paths(String...)}.
*/
@SuppressWarnings("removal")
@Deprecated
@Deprecated(since = "5.3")
public RequestMappingInfo(@Nullable String name, @Nullable PatternsRequestCondition patterns,
@Nullable RequestMethodsRequestCondition methods, @Nullable ParamsRequestCondition params,
@Nullable HeadersRequestCondition headers, @Nullable ConsumesRequestCondition consumes,
@ -142,7 +142,7 @@ public final class RequestMappingInfo implements RequestCondition<RequestMapping
* {@link #paths(String...)}.
*/
@SuppressWarnings("removal")
@Deprecated
@Deprecated(since = "5.3")
public RequestMappingInfo(@Nullable PatternsRequestCondition patterns,
@Nullable RequestMethodsRequestCondition methods, @Nullable ParamsRequestCondition params,
@Nullable HeadersRequestCondition headers, @Nullable ConsumesRequestCondition consumes,
@ -156,7 +156,7 @@ public final class RequestMappingInfo implements RequestCondition<RequestMapping
* Re-create a RequestMappingInfo with the given custom request condition.
* @deprecated since 5.3 in favor of using {@link #addCustomCondition(RequestCondition)}.
*/
@Deprecated
@Deprecated(since = "5.3")
public RequestMappingInfo(RequestMappingInfo info, @Nullable RequestCondition<?> customRequestCondition) {
this(info.name, info.patternsCondition, info.methodsCondition, info.paramsCondition,
info.headersCondition, info.consumesCondition, info.producesCondition,
@ -986,7 +986,7 @@ public final class RequestMappingInfo implements RequestCondition<RequestMapping
* @deprecated as of 5.3, the path is resolved externally and obtained with
* {@link ServletRequestPathUtils#getCachedPathValue(ServletRequest)}
*/
@Deprecated
@Deprecated(since = "5.3")
public void setUrlPathHelper(@Nullable UrlPathHelper urlPathHelper) {
}
@ -996,7 +996,7 @@ public final class RequestMappingInfo implements RequestCondition<RequestMapping
* {@link ServletRequestPathUtils#getCachedPathValue(ServletRequest)};
* this method always returns {@link UrlPathHelper#defaultInstance}.
*/
@Deprecated
@Deprecated(since = "5.3")
public @Nullable UrlPathHelper getUrlPathHelper() {
return UrlPathHelper.defaultInstance;
}