GitHub-Spring
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Add missing "since" in `@Deprecated` 

See gh-34942

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
pull/34989/head
Yanming Zhou 10 months ago committed by rstoyanchev
parent
b7dfd68d89
commit
f9fa7cc93b
44 changed files with 111 additions and 111 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
  2. 4
      spring-beans/src/main/java/org/springframework/beans/factory/config/AutowireCapableBeanFactory.java
  3. 2
      spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
  4. 4
      spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java
  5. 2
      spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java
  6. 4
      spring-context/src/main/java/org/springframework/context/support/AbstractResourceBasedMessageSource.java
  7. 2
      spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java
  8. 4
      spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java
  9. 4
      spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java
  10. 2
      spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java
  11. 12
      spring-core/src/main/java/org/springframework/core/MethodParameter.java
  12. 4
      spring-core/src/main/java/org/springframework/core/annotation/AnnotationFilter.java
  13. 20
      spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java
  14. 4
      spring-core/src/main/java/org/springframework/core/codec/AbstractDataBufferDecoder.java
  15. 2
      spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java
  16. 4
      spring-core/src/main/java/org/springframework/core/env/Environment.java
  17. 8
      spring-core/src/main/java/org/springframework/core/task/AsyncTaskExecutor.java
  18. 2
      spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java
  19. 4
      spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java
  20. 4
      spring-core/src/main/java/org/springframework/core/type/StandardAnnotationMetadata.java
  21. 4
      spring-core/src/main/java/org/springframework/core/type/StandardClassMetadata.java
  22. 2
      spring-core/src/main/java/org/springframework/core/type/StandardMethodMetadata.java
  23. 4
      spring-core/src/main/java/org/springframework/lang/NonNull.java
  24. 4
      spring-core/src/main/java/org/springframework/lang/NonNullApi.java
  25. 4
      spring-core/src/main/java/org/springframework/lang/NonNullFields.java
  26. 4
      spring-core/src/main/java/org/springframework/lang/Nullable.java
  27. 8
      spring-core/src/main/java/org/springframework/util/ClassUtils.java
  28. 4
      spring-core/src/main/java/org/springframework/util/SerializationUtils.java
  29. 2
      spring-core/src/main/java/org/springframework/util/StringUtils.java
  30. 14
      spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java
  31. 12
      spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java
  32. 4
      spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java
  33. 2
      spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java
  34. 4
      spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseStartupValidator.java
  35. 4
      spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java
  36. 4
      spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughBlob.java
  37. 4
      spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughClob.java
  38. 8
      spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketRequester.java
  39. 4
      spring-test/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java
  40. 4
      spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java
  41. 6
      spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionInterceptor.java
  42. 4
      spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerMapping.java
  43. 8
      spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java
  44. 10
      spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java

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

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

4
spring-beans/src/main/java/org/springframework/beans/factory/config/AutowireCapableBeanFactory.java
Unescape 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"); * 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.
@ -100,7 +100,7 @@ public interface AutowireCapableBeanFactory extends BeanFactory {
* @deprecated as of Spring 3.0: If you are using mixed autowiring strategies, * @deprecated as of Spring 3.0: If you are using mixed autowiring strategies,
* prefer annotation-based autowiring for clearer demarcation of autowiring needs. * prefer annotation-based autowiring for clearer demarcation of autowiring needs.
*/ */
@Deprecated @Deprecated(since = "3.0")
int AUTOWIRE_AUTODETECT = 4; int AUTOWIRE_AUTODETECT = 4;
/** /**

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

@ -363,7 +363,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
// Specialized methods for fine-grained control over the bean lifecycle // Specialized methods for fine-grained control over the bean lifecycle
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
@Deprecated @Deprecated(since = "6.1")
@Override @Override
public Object createBean(Class<?> beanClass, int autowireMode, boolean dependencyCheck) throws BeansException { public Object createBean(Class<?> beanClass, int autowireMode, boolean dependencyCheck) throws BeansException {
// Use non-singleton bean definition, to avoid registering bean as dependent bean. // 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
Unescape 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"); * 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.
@ -98,7 +98,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
* @deprecated as of Spring 3.0: If you are using mixed autowiring strategies, * @deprecated as of Spring 3.0: If you are using mixed autowiring strategies,
* use annotation-based autowiring for clearer demarcation of autowiring needs. * use annotation-based autowiring for clearer demarcation of autowiring needs.
*/ */
@Deprecated @Deprecated(since = "3.0")
public static final int AUTOWIRE_AUTODETECT = AutowireCapableBeanFactory.AUTOWIRE_AUTODETECT; public static final int AUTOWIRE_AUTODETECT = AutowireCapableBeanFactory.AUTOWIRE_AUTODETECT;
/** /**

2
spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java
Unescape 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 * @deprecated as of 5.3, in favor of Spring's common bean definition formats
* and/or custom reader implementations * and/or custom reader implementations
*/ */
@Deprecated @Deprecated(since = "5.3")
public class PropertiesBeanDefinitionReader extends AbstractBeanDefinitionReader { public class PropertiesBeanDefinitionReader extends AbstractBeanDefinitionReader {
/** /**

4
spring-context/src/main/java/org/springframework/context/support/AbstractResourceBasedMessageSource.java
Unescape 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"); * 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.
@ -158,7 +158,7 @@ public abstract class AbstractResourceBasedMessageSource extends AbstractMessage
* @since 4.3 * @since 4.3
* @deprecated as of 5.2.2, in favor of {@link #getDefaultLocale()} * @deprecated as of 5.2.2, in favor of {@link #getDefaultLocale()}
*/ */
@Deprecated @Deprecated(since = "5.2.2")
protected boolean isFallbackToSystemLocale() { protected boolean isFallbackToSystemLocale() {
return this.fallbackToSystemLocale; return this.fallbackToSystemLocale;
} }

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

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

4
spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java
Unescape 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"); * 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.
@ -153,7 +153,7 @@ public class ConcurrentTaskExecutor implements AsyncTaskExecutor, SchedulingTask
this.adaptedExecutor.execute(task); this.adaptedExecutor.execute(task);
} }
@Deprecated @Deprecated(since = "5.3.16")
@Override @Override
public void execute(Runnable task, long startTimeout) { public void execute(Runnable task, long startTimeout) {
this.adaptedExecutor.execute(task, startTimeout); this.adaptedExecutor.execute(task, startTimeout);

4
spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java
Unescape 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"); * 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.
@ -302,7 +302,7 @@ public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport
* @deprecated as of 5.3.9, in favor of direct * @deprecated as of 5.3.9, in favor of direct
* {@link #getScheduledThreadPoolExecutor()} access * {@link #getScheduledThreadPoolExecutor()} access
*/ */
@Deprecated @Deprecated(since = "5.3.9")
public boolean isRemoveOnCancelPolicy() { public boolean isRemoveOnCancelPolicy() {
if (this.scheduledExecutor == null) { if (this.scheduledExecutor == null) {
// Not initialized yet: return our setting for the time being. // Not initialized yet: return our setting for the time being.

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

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

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

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

4
spring-core/src/main/java/org/springframework/core/annotation/AnnotationFilter.java
Unescape 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"); * 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.
@ -79,7 +79,7 @@ public interface AnnotationFilter {
* always ignores lang annotations according to the {@link #PLAIN} filter * always ignores lang annotations according to the {@link #PLAIN} filter
* (for efficiency reasons) * (for efficiency reasons)
*/ */
@Deprecated @Deprecated(since = "5.2.6")
AnnotationFilter NONE = new AnnotationFilter() { AnnotationFilter NONE = new AnnotationFilter() {
@Override @Override
public boolean matches(Annotation annotation) { public boolean matches(Annotation annotation) {

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

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

4
spring-core/src/main/java/org/springframework/core/codec/AbstractDataBufferDecoder.java
Unescape 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"); * 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.
@ -100,7 +100,7 @@ public abstract class AbstractDataBufferDecoder<T> extends AbstractDecoder<T> {
* @deprecated as of 5.2, please implement * @deprecated as of 5.2, please implement
* {@link #decode(DataBuffer, ResolvableType, MimeType, Map)} instead * {@link #decode(DataBuffer, ResolvableType, MimeType, Map)} instead
*/ */
@Deprecated @Deprecated(since = "5.2")
protected @Nullable T decodeDataBuffer(DataBuffer buffer, ResolvableType elementType, protected @Nullable T decodeDataBuffer(DataBuffer buffer, ResolvableType elementType,
@Nullable MimeType mimeType, @Nullable Map<String, Object> hints) { @Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {

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

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

4
spring-core/src/main/java/org/springframework/core/env/Environment.java vendored
Unescape 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"); * 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.
@ -133,7 +133,7 @@ public interface Environment extends PropertyResolver {
* @deprecated as of 5.1 in favor of {@link #acceptsProfiles(Profiles)} or * @deprecated as of 5.1 in favor of {@link #acceptsProfiles(Profiles)} or
* {@link #matchesProfiles(String...)} * {@link #matchesProfiles(String...)}
*/ */
@Deprecated @Deprecated(since = "5.1")
boolean acceptsProfiles(String... profiles); boolean acceptsProfiles(String... profiles);
/** /**

8
spring-core/src/main/java/org/springframework/core/task/AsyncTaskExecutor.java
Unescape 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"); * 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.
@ -48,14 +48,14 @@ public interface AsyncTaskExecutor extends TaskExecutor {
* Constant that indicates immediate execution. * Constant that indicates immediate execution.
* @deprecated as of 5.3.16 along with {@link #execute(Runnable, long)} * @deprecated as of 5.3.16 along with {@link #execute(Runnable, long)}
*/ */
@Deprecated @Deprecated(since = "5.3.16")
long TIMEOUT_IMMEDIATE = 0; long TIMEOUT_IMMEDIATE = 0;
/** /**
* Constant that indicates no time limit. * Constant that indicates no time limit.
* @deprecated as of 5.3.16 along with {@link #execute(Runnable, long)} * @deprecated as of 5.3.16 along with {@link #execute(Runnable, long)}
*/ */
@Deprecated @Deprecated(since = "5.3.16")
long TIMEOUT_INDEFINITE = Long.MAX_VALUE; long TIMEOUT_INDEFINITE = Long.MAX_VALUE;
@ -74,7 +74,7 @@ public interface AsyncTaskExecutor extends TaskExecutor {
* @see #execute(Runnable) * @see #execute(Runnable)
* @deprecated as of 5.3.16 since the common executors do not support start timeouts * @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) { default void execute(Runnable task, long startTimeout) {
execute(task); execute(task);
} }

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

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

4
spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java
Unescape 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"); * 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.
@ -25,7 +25,7 @@ package org.springframework.core.task;
* @see AsyncTaskExecutor#execute(Runnable, long) * @see AsyncTaskExecutor#execute(Runnable, long)
* @deprecated as of 5.3.16 since the common executors do not support start timeouts * @deprecated as of 5.3.16 since the common executors do not support start timeouts
*/ */
@Deprecated @Deprecated(since = "5.3.16")
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class TaskTimeoutException extends TaskRejectedException { public class TaskTimeoutException extends TaskRejectedException {

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

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

4
spring-core/src/main/java/org/springframework/core/type/StandardClassMetadata.java
Unescape 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"); * 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.
@ -42,7 +42,7 @@ public class StandardClassMetadata implements ClassMetadata {
* @param introspectedClass the Class to introspect * @param introspectedClass the Class to introspect
* @deprecated since 5.2 in favor of {@link StandardAnnotationMetadata} * @deprecated since 5.2 in favor of {@link StandardAnnotationMetadata}
*/ */
@Deprecated @Deprecated(since = "5.2")
public StandardClassMetadata(Class<?> introspectedClass) { public StandardClassMetadata(Class<?> introspectedClass) {
Assert.notNull(introspectedClass, "Class must not be null"); Assert.notNull(introspectedClass, "Class must not be null");
this.introspectedClass = introspectedClass; this.introspectedClass = introspectedClass;

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

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

4
spring-core/src/main/java/org/springframework/lang/NonNull.java
Unescape 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"); * 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.
@ -52,6 +52,6 @@ import javax.annotation.meta.TypeQualifierNickname;
@Documented @Documented
@Nonnull @Nonnull
@TypeQualifierNickname @TypeQualifierNickname
@Deprecated @Deprecated(since = "7.0")
public @interface NonNull { public @interface NonNull {
} }

4
spring-core/src/main/java/org/springframework/lang/NonNullApi.java
Unescape 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"); * 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.
@ -48,6 +48,6 @@ import javax.annotation.meta.TypeQualifierDefault;
@Documented @Documented
@Nonnull @Nonnull
@TypeQualifierDefault({ElementType.METHOD, ElementType.PARAMETER}) @TypeQualifierDefault({ElementType.METHOD, ElementType.PARAMETER})
@Deprecated @Deprecated(since = "7.0")
public @interface NonNullApi { public @interface NonNullApi {
} }

4
spring-core/src/main/java/org/springframework/lang/NonNullFields.java
Unescape 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"); * 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.
@ -47,6 +47,6 @@ import javax.annotation.meta.TypeQualifierDefault;
@Documented @Documented
@Nonnull @Nonnull
@TypeQualifierDefault(ElementType.FIELD) @TypeQualifierDefault(ElementType.FIELD)
@Deprecated @Deprecated(since = "7.0")
public @interface NonNullFields { public @interface NonNullFields {
} }

4
spring-core/src/main/java/org/springframework/lang/Nullable.java
Unescape 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"); * 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.
@ -52,6 +52,6 @@ import javax.annotation.meta.TypeQualifierNickname;
@Documented @Documented
@CheckForNull @CheckForNull
@TypeQualifierNickname @TypeQualifierNickname
@Deprecated @Deprecated(since = "7.0")
public @interface Nullable { public @interface Nullable {
} }

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

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

4
spring-core/src/main/java/org/springframework/util/SerializationUtils.java
Unescape 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"); * 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.
@ -72,7 +72,7 @@ public abstract class SerializationUtils {
* <p>Prefer the use of an external tool (that serializes to JSON, XML, or * <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. * 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) { public static @Nullable Object deserialize(byte @Nullable [] bytes) {
if (bytes == null) { if (bytes == null) {
return null; return null;

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

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

14
spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java
Unescape 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"); * 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.
@ -369,7 +369,7 @@ public interface JdbcOperations {
* @throws DataAccessException if the query fails * @throws DataAccessException if the query fails
* @deprecated as of 5.3, in favor of {@link #query(String, ResultSetExtractor, Object...)} * @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; <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 * @throws DataAccessException if the query fails
* @deprecated as of 5.3, in favor of {@link #query(String, RowCallbackHandler, Object...)} * @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; 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 * @throws DataAccessException if the query fails
* @deprecated as of 5.3, in favor of {@link #query(String, RowMapper, Object...)} * @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; <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 * @throws DataAccessException if the query fails
* @deprecated as of 5.3, in favor of {@link #queryForObject(String, RowMapper, Object...)} * @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; <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) * @see #queryForObject(String, Class)
* @deprecated as of 5.3, in favor of {@link #queryForObject(String, Class, Object...)} * @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; <T> @Nullable T queryForObject(String sql, @Nullable Object @Nullable [] args, Class<T> requiredType) throws DataAccessException;
/** /**
@ -791,7 +791,7 @@ public interface JdbcOperations {
* @see SingleColumnRowMapper * @see SingleColumnRowMapper
* @deprecated as of 5.3, in favor of {@link #queryForList(String, Class, Object...)} * @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; <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
Unescape View File

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

4
spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java
Unescape 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"); * 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.
@ -45,7 +45,7 @@ import org.springframework.util.Assert;
* @deprecated as of 5.3, in favor of Spring's common bean definition formats * @deprecated as of 5.3, in favor of Spring's common bean definition formats
* and/or custom reader implementations * and/or custom reader implementations
*/ */
@Deprecated @Deprecated(since = "5.3")
public class JdbcBeanDefinitionReader { public class JdbcBeanDefinitionReader {
private final org.springframework.beans.factory.support.PropertiesBeanDefinitionReader propReader; private final org.springframework.beans.factory.support.PropertiesBeanDefinitionReader propReader;

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

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

4
spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseStartupValidator.java
Unescape 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"); * 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.
@ -77,7 +77,7 @@ public class DatabaseStartupValidator implements InitializingBean {
* Set the SQL query string to use for validation. * Set the SQL query string to use for validation.
* @deprecated as of 5.3, in favor of the JDBC 4.0 connection 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) { public void setValidationQuery(String validationQuery) {
this.validationQuery = validationQuery; this.validationQuery = validationQuery;
} }

4
spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java
Unescape 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"); * 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.
@ -379,7 +379,7 @@ public abstract class JdbcUtils {
* {@link #extractDatabaseMetaData(DataSource, DatabaseMetaDataCallback)} * {@link #extractDatabaseMetaData(DataSource, DatabaseMetaDataCallback)}
* with a lambda expression or method reference and a generically typed result * with a lambda expression or method reference and a generically typed result
*/ */
@Deprecated @Deprecated(since = "5.2.9")
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public static <T> T extractDatabaseMetaData(DataSource dataSource, final String metaDataMethodName) public static <T> T extractDatabaseMetaData(DataSource dataSource, final String metaDataMethodName)
throws MetaDataAccessException { throws MetaDataAccessException {

4
spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughBlob.java
Unescape 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"); * 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.
@ -31,7 +31,7 @@ import org.jspecify.annotations.Nullable;
* @author Juergen Hoeller * @author Juergen Hoeller
* @since 2.5.3 * @since 2.5.3
*/ */
@Deprecated @Deprecated(since = "6.2")
class PassThroughBlob implements Blob { class PassThroughBlob implements Blob {
private byte @Nullable [] content; private byte @Nullable [] content;

4
spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughClob.java
Unescape 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"); * 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.
@ -39,7 +39,7 @@ import org.springframework.util.FileCopyUtils;
* @author Juergen Hoeller * @author Juergen Hoeller
* @since 2.5.3 * @since 2.5.3
*/ */
@Deprecated @Deprecated(since = "6.2")
class PassThroughClob implements Clob { class PassThroughClob implements Clob {
private @Nullable String content; private @Nullable String content;

8
spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketRequester.java
Unescape 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"); * 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.
@ -312,7 +312,7 @@ public interface RSocketRequester extends Disposable {
* @see TcpClientTransport * @see TcpClientTransport
* @deprecated as of 5.3 in favor of {@link #tcp(String, int)} * @deprecated as of 5.3 in favor of {@link #tcp(String, int)}
*/ */
@Deprecated @Deprecated(since = "5.3")
Mono<RSocketRequester> connectTcp(String host, int port); Mono<RSocketRequester> connectTcp(String host, int port);
/** /**
@ -322,7 +322,7 @@ public interface RSocketRequester extends Disposable {
* @see WebsocketClientTransport * @see WebsocketClientTransport
* @deprecated as of 5.3 in favor of {@link #websocket(URI)} * @deprecated as of 5.3 in favor of {@link #websocket(URI)}
*/ */
@Deprecated @Deprecated(since = "5.3")
Mono<RSocketRequester> connectWebSocket(URI uri); Mono<RSocketRequester> connectWebSocket(URI uri);
/** /**
@ -331,7 +331,7 @@ public interface RSocketRequester extends Disposable {
* @return an {@code RSocketRequester} for the connection * @return an {@code RSocketRequester} for the connection
* @deprecated as of 5.3 in favor of {@link #transport(ClientTransport)} * @deprecated as of 5.3 in favor of {@link #transport(ClientTransport)}
*/ */
@Deprecated @Deprecated(since = "5.3")
Mono<RSocketRequester> connect(ClientTransport transport); Mono<RSocketRequester> connect(ClientTransport transport);
} }

4
spring-test/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java
Unescape 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"); * 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.
@ -418,7 +418,7 @@ class StubWebApplicationContext implements WebApplicationContext {
return BeanUtils.instantiateClass(beanClass); return BeanUtils.instantiateClass(beanClass);
} }
@Deprecated @Deprecated(since = "6.1")
@Override @Override
public Object createBean(Class<?> beanClass, int autowireMode, boolean dependencyCheck) { public Object createBean(Class<?> beanClass, int autowireMode, boolean dependencyCheck) {
return BeanUtils.instantiateClass(beanClass); return BeanUtils.instantiateClass(beanClass);

4
spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java
Unescape 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"); * 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.
@ -533,7 +533,7 @@ public abstract class TransactionAspectSupport implements BeanFactoryAware, Init
* Determine the specific transaction manager to use for the given transaction. * Determine the specific transaction manager to use for the given transaction.
* @deprecated as of 6.2, in favor of {@link #determineTransactionManager(TransactionAttribute, Class)} * @deprecated as of 6.2, in favor of {@link #determineTransactionManager(TransactionAttribute, Class)}
*/ */
@Deprecated @Deprecated(since = "6.2")
protected @Nullable TransactionManager determineTransactionManager(@Nullable TransactionAttribute txAttr) { protected @Nullable TransactionManager determineTransactionManager(@Nullable TransactionAttribute txAttr) {
return null; return null;
} }

6
spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionInterceptor.java
Unescape 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"); * 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.
@ -86,7 +86,7 @@ public class TransactionInterceptor extends TransactionAspectSupport implements
* @deprecated as of 5.2.5, in favor of * @deprecated as of 5.2.5, in favor of
* {@link #TransactionInterceptor(TransactionManager, TransactionAttributeSource)} * {@link #TransactionInterceptor(TransactionManager, TransactionAttributeSource)}
*/ */
@Deprecated @Deprecated(since = "5.2.5")
public TransactionInterceptor(PlatformTransactionManager ptm, TransactionAttributeSource tas) { public TransactionInterceptor(PlatformTransactionManager ptm, TransactionAttributeSource tas) {
setTransactionManager(ptm); setTransactionManager(ptm);
setTransactionAttributeSource(tas); setTransactionAttributeSource(tas);
@ -100,7 +100,7 @@ public class TransactionInterceptor extends TransactionAspectSupport implements
* @see #setTransactionAttributes(java.util.Properties) * @see #setTransactionAttributes(java.util.Properties)
* @deprecated as of 5.2.5, in favor of {@link #setTransactionAttributes(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) { public TransactionInterceptor(PlatformTransactionManager ptm, Properties attributes) {
setTransactionManager(ptm); setTransactionManager(ptm);
setTransactionAttributes(attributes); setTransactionAttributes(attributes);

4
spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerMapping.java
Unescape 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"); * 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.
@ -74,7 +74,7 @@ public interface HandlerMapping {
* To access the cached path used for request mapping, use * To access the cached path used for request mapping, use
* {@link org.springframework.web.util.ServletRequestPathUtils#getCachedPathValue(ServletRequest)}. * {@link org.springframework.web.util.ServletRequestPathUtils#getCachedPathValue(ServletRequest)}.
*/ */
@Deprecated @Deprecated(since = "5.3")
String LOOKUP_PATH = HandlerMapping.class.getName() + ".lookupPath"; String LOOKUP_PATH = HandlerMapping.class.getName() + ".lookupPath";
/** /**

8
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java
Unescape 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"); * 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.
@ -111,7 +111,7 @@ public class WebContentInterceptor extends WebContentGenerator implements Handle
* @deprecated as of 5.3, the path is resolved externally and obtained with * @deprecated as of 5.3, the path is resolved externally and obtained with
* {@link ServletRequestPathUtils#getCachedPathValue(ServletRequest)} * {@link ServletRequestPathUtils#getCachedPathValue(ServletRequest)}
*/ */
@Deprecated @Deprecated(since = "5.3")
public void setAlwaysUseFullPath(boolean alwaysUseFullPath) { 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 * @deprecated as of 5.3, the path is resolved externally and obtained with
* {@link ServletRequestPathUtils#getCachedPathValue(ServletRequest)} * {@link ServletRequestPathUtils#getCachedPathValue(ServletRequest)}
*/ */
@Deprecated @Deprecated(since = "5.3")
public void setUrlDecode(boolean urlDecode) { 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 * @deprecated as of 5.3, the path is resolved externally and obtained with
* {@link ServletRequestPathUtils#getCachedPathValue(ServletRequest)} * {@link ServletRequestPathUtils#getCachedPathValue(ServletRequest)}
*/ */
@Deprecated @Deprecated(since = "5.3")
public void setUrlPathHelper(UrlPathHelper urlPathHelper) { public void setUrlPathHelper(UrlPathHelper urlPathHelper) {
} }

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

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

Write Preview
Loading…
Cancel
Save