diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java index f89003192b6..984218b36a3 100644 --- a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java +++ b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java @@ -95,8 +95,7 @@ public abstract class BeanUtils { * @return the new instance * @throws BeanInstantiationException if the bean cannot be instantiated * @see Class#newInstance() - * @deprecated as of Spring 5.0, following the deprecation of - * {@link Class#newInstance()} in JDK 9 + * @deprecated following the deprecation of {@link Class#newInstance()} in JDK 9 */ @Deprecated(since = "5.0") public static T instantiate(Class clazz) throws BeanInstantiationException { diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/AutowireCapableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/AutowireCapableBeanFactory.java index 57c62202da7..48ba5e61eac 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/AutowireCapableBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/AutowireCapableBeanFactory.java @@ -97,8 +97,8 @@ public interface AutowireCapableBeanFactory extends BeanFactory { * Constant that indicates determining an appropriate autowire strategy * through introspection of the bean class. * @see #autowire - * @deprecated as of Spring 3.0: If you are using mixed autowiring strategies, - * prefer annotation-based autowiring for clearer demarcation of autowiring needs. + * @deprecated If you are using mixed autowiring strategies, prefer + * annotation-based autowiring for clearer demarcation of autowiring needs. */ @Deprecated(since = "3.0") int AUTOWIRE_AUTODETECT = 4; @@ -188,7 +188,7 @@ public interface AutowireCapableBeanFactory extends BeanFactory { * @see #AUTOWIRE_BY_NAME * @see #AUTOWIRE_BY_TYPE * @see #AUTOWIRE_CONSTRUCTOR - * @deprecated as of 6.1, in favor of {@link #createBean(Class)} + * @deprecated in favor of {@link #createBean(Class)} */ @Deprecated(since = "6.1") Object createBean(Class beanClass, int autowireMode, boolean dependencyCheck) throws BeansException; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java index 30f093fa8ef..c584eb56c22 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java @@ -95,8 +95,8 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess * Constant that indicates determining an appropriate autowire strategy * through introspection of the bean class. * @see #setAutowireMode - * @deprecated as of Spring 3.0: If you are using mixed autowiring strategies, - * use annotation-based autowiring for clearer demarcation of autowiring needs. + * @deprecated If you are using mixed autowiring strategies, use + * annotation-based autowiring for clearer demarcation of autowiring needs. */ @Deprecated(since = "3.0") public static final int AUTOWIRE_AUTODETECT = AutowireCapableBeanFactory.AUTOWIRE_AUTODETECT; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java index 906a659cac3..66e122c384d 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java @@ -75,8 +75,8 @@ import org.springframework.util.StringUtils; * @author Rob Harrop * @since 26.11.2003 * @see DefaultListableBeanFactory - * @deprecated as of 5.3, in favor of Spring's common bean definition formats - * and/or custom reader implementations + * @deprecated in favor of Spring's common bean definition formats and/or + * custom reader implementations */ @Deprecated(since = "5.3") public class PropertiesBeanDefinitionReader extends AbstractBeanDefinitionReader { diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractResourceBasedMessageSource.java b/spring-context/src/main/java/org/springframework/context/support/AbstractResourceBasedMessageSource.java index e34bd3b53fc..310576f4ccb 100644 --- a/spring-context/src/main/java/org/springframework/context/support/AbstractResourceBasedMessageSource.java +++ b/spring-context/src/main/java/org/springframework/context/support/AbstractResourceBasedMessageSource.java @@ -156,7 +156,7 @@ public abstract class AbstractResourceBasedMessageSource extends AbstractMessage * Return whether to fall back to the system Locale if no files for a specific * Locale have been found. * @since 4.3 - * @deprecated as of 5.2.2, in favor of {@link #getDefaultLocale()} + * @deprecated in favor of {@link #getDefaultLocale()} */ @Deprecated(since = "5.2.2") protected boolean isFallbackToSystemLocale() { diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java index e97afc81ee7..729be479e0c 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java @@ -299,8 +299,7 @@ public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport /** * Return the current setting for the remove-on-cancel mode. *

Requires an underlying {@link ScheduledThreadPoolExecutor}. - * @deprecated as of 5.3.9, in favor of direct - * {@link #getScheduledThreadPoolExecutor()} access + * @deprecated in favor of direct {@link #getScheduledThreadPoolExecutor()} access */ @Deprecated(since = "5.3.9") public boolean isRemoveOnCancelPolicy() { diff --git a/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java b/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java index 311ebe05aab..3b77fcd1e6f 100644 --- a/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java +++ b/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java @@ -59,7 +59,7 @@ public final class GenericTypeResolver { * @param methodParameter the method parameter specification * @param implementationClass the class to resolve type variables against * @return the corresponding generic parameter or return type - * @deprecated since 5.2 in favor of {@code methodParameter.withContainingClass(implementationClass).getParameterType()} + * @deprecated in favor of {@code methodParameter.withContainingClass(implementationClass).getParameterType()} */ @Deprecated(since = "5.2") public static Class resolveParameterType(MethodParameter methodParameter, Class implementationClass) { diff --git a/spring-core/src/main/java/org/springframework/core/MethodParameter.java b/spring-core/src/main/java/org/springframework/core/MethodParameter.java index c2b69eeef3e..aa5acd48a44 100644 --- a/spring-core/src/main/java/org/springframework/core/MethodParameter.java +++ b/spring-core/src/main/java/org/springframework/core/MethodParameter.java @@ -264,7 +264,7 @@ public class MethodParameter { /** * Increase this parameter's nesting level. * @see #getNestingLevel() - * @deprecated since 5.2 in favor of {@link #nested(Integer)} + * @deprecated in favor of {@link #nested(Integer)} */ @Deprecated(since = "5.2") public void increaseNestingLevel() { @@ -274,7 +274,7 @@ public class MethodParameter { /** * Decrease this parameter's nesting level. * @see #getNestingLevel() - * @deprecated since 5.2 in favor of retaining the original MethodParameter and + * @deprecated in favor of retaining the original MethodParameter and * using {@link #nested(Integer)} if nesting is required */ @Deprecated(since = "5.2") @@ -307,7 +307,7 @@ public class MethodParameter { * @param typeIndex the corresponding type index * (or {@code null} for the default type index) * @see #getNestingLevel() - * @deprecated since 5.2 in favor of {@link #withTypeIndex} + * @deprecated in favor of {@link #withTypeIndex} */ @Deprecated(since = "5.2") public void setTypeIndexForCurrentLevel(int typeIndex) { @@ -758,7 +758,7 @@ public class MethodParameter { * @param methodOrConstructor the Method or Constructor to specify a parameter for * @param parameterIndex the index of the parameter * @return the corresponding MethodParameter instance - * @deprecated as of 5.0, in favor of {@link #forExecutable} + * @deprecated in favor of {@link #forExecutable} */ @Deprecated(since = "5.0") public static MethodParameter forMethodOrConstructor(Object methodOrConstructor, int parameterIndex) { diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationFilter.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationFilter.java index 06fd286048c..b54b9351eb4 100644 --- a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationFilter.java +++ b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationFilter.java @@ -75,9 +75,8 @@ public interface AnnotationFilter { * {@link AnnotationFilter} that never matches and can be used when no * filtering is needed (allowing for any annotation types to be present). * @see #PLAIN - * @deprecated as of 5.2.6 since the {@link MergedAnnotations} model - * always ignores lang annotations according to the {@link #PLAIN} filter - * (for efficiency reasons) + * @deprecated since the {@link MergedAnnotations} model always ignores lang + * annotations according to the {@link #PLAIN} filter, for efficiency reasons */ @Deprecated(since = "5.2.6") AnnotationFilter NONE = new AnnotationFilter() { diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java index b864cb33ce4..e17b8e12f32 100644 --- a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java +++ b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java @@ -263,7 +263,7 @@ public abstract class AnnotationUtils { * failed to resolve at runtime) * @since 4.0.8 * @see AnnotatedElement#getAnnotations() - * @deprecated as of 5.2 since it is superseded by the {@link MergedAnnotations} API + * @deprecated since it is superseded by the {@link MergedAnnotations} API */ @Deprecated(since = "5.2") public static Annotation @Nullable [] getAnnotations(AnnotatedElement annotatedElement) { @@ -287,7 +287,7 @@ public abstract class AnnotationUtils { * failed to resolve at runtime) * @see org.springframework.core.BridgeMethodResolver#findBridgedMethod(Method) * @see AnnotatedElement#getAnnotations() - * @deprecated as of 5.2 since it is superseded by the {@link MergedAnnotations} API + * @deprecated since it is superseded by the {@link MergedAnnotations} API */ @Deprecated(since = "5.2") public static Annotation @Nullable [] getAnnotations(Method method) { @@ -326,7 +326,7 @@ public abstract class AnnotationUtils { * @see org.springframework.core.BridgeMethodResolver#findBridgedMethod * @see java.lang.annotation.Repeatable * @see java.lang.reflect.AnnotatedElement#getAnnotationsByType - * @deprecated as of 5.2 since it is superseded by the {@link MergedAnnotations} API + * @deprecated since it is superseded by the {@link MergedAnnotations} API */ @Deprecated(since = "5.2") public static Set getRepeatableAnnotations(AnnotatedElement annotatedElement, @@ -363,7 +363,7 @@ public abstract class AnnotationUtils { * @see org.springframework.core.BridgeMethodResolver#findBridgedMethod * @see java.lang.annotation.Repeatable * @see java.lang.reflect.AnnotatedElement#getAnnotationsByType - * @deprecated as of 5.2 since it is superseded by the {@link MergedAnnotations} API + * @deprecated since it is superseded by the {@link MergedAnnotations} API */ @Deprecated(since = "5.2") public static Set getRepeatableAnnotations(AnnotatedElement annotatedElement, @@ -407,7 +407,7 @@ public abstract class AnnotationUtils { * @see org.springframework.core.BridgeMethodResolver#findBridgedMethod * @see java.lang.annotation.Repeatable * @see java.lang.reflect.AnnotatedElement#getDeclaredAnnotationsByType - * @deprecated as of 5.2 since it is superseded by the {@link MergedAnnotations} API + * @deprecated since it is superseded by the {@link MergedAnnotations} API */ @Deprecated(since = "5.2") public static Set getDeclaredRepeatableAnnotations(AnnotatedElement annotatedElement, @@ -444,7 +444,7 @@ public abstract class AnnotationUtils { * @see org.springframework.core.BridgeMethodResolver#findBridgedMethod * @see java.lang.annotation.Repeatable * @see java.lang.reflect.AnnotatedElement#getDeclaredAnnotationsByType - * @deprecated as of 5.2 since it is superseded by the {@link MergedAnnotations} API + * @deprecated since it is superseded by the {@link MergedAnnotations} API */ @Deprecated(since = "5.2") public static Set getDeclaredRepeatableAnnotations(AnnotatedElement annotatedElement, @@ -595,7 +595,7 @@ public abstract class AnnotationUtils { * or {@code null} if not found * @see Class#isAnnotationPresent(Class) * @see Class#getDeclaredAnnotations() - * @deprecated as of 5.2 since it is superseded by the {@link MergedAnnotations} API + * @deprecated since it is superseded by the {@link MergedAnnotations} API */ @Deprecated(since = "5.2") public static @Nullable Class findAnnotationDeclaringClass( @@ -631,7 +631,7 @@ public abstract class AnnotationUtils { * @since 3.2.2 * @see Class#isAnnotationPresent(Class) * @see Class#getDeclaredAnnotations() - * @deprecated as of 5.2 since it is superseded by the {@link MergedAnnotations} API + * @deprecated since it is superseded by the {@link MergedAnnotations} API */ @Deprecated(since = "5.2") public static @Nullable Class findAnnotationDeclaringClassForTypes( @@ -684,7 +684,7 @@ public abstract class AnnotationUtils { * is present and inherited * @see Class#isAnnotationPresent(Class) * @see #isAnnotationDeclaredLocally(Class, Class) - * @deprecated as of 5.2 since it is superseded by the {@link MergedAnnotations} API + * @deprecated since it is superseded by the {@link MergedAnnotations} API */ @Deprecated(since = "5.2") public static boolean isAnnotationInherited(Class annotationType, Class clazz) { @@ -702,7 +702,7 @@ public abstract class AnnotationUtils { * @param metaAnnotationType the type of meta-annotation to search for * @return {@code true} if such an annotation is meta-present * @since 4.2.1 - * @deprecated as of 5.2 since it is superseded by the {@link MergedAnnotations} API + * @deprecated since it is superseded by the {@link MergedAnnotations} API */ @Deprecated(since = "5.2") public static boolean isAnnotationMetaPresent(Class annotationType, diff --git a/spring-core/src/main/java/org/springframework/core/codec/AbstractDataBufferDecoder.java b/spring-core/src/main/java/org/springframework/core/codec/AbstractDataBufferDecoder.java index e1076c394c5..a26d106ff2c 100644 --- a/spring-core/src/main/java/org/springframework/core/codec/AbstractDataBufferDecoder.java +++ b/spring-core/src/main/java/org/springframework/core/codec/AbstractDataBufferDecoder.java @@ -97,7 +97,7 @@ public abstract class AbstractDataBufferDecoder extends AbstractDecoder { /** * How to decode a {@code DataBuffer} to the target element type. - * @deprecated as of 5.2, please implement + * @deprecated in favor of implementing * {@link #decode(DataBuffer, ResolvableType, MimeType, Map)} instead */ @Deprecated(since = "5.2") diff --git a/spring-core/src/main/java/org/springframework/core/env/Environment.java b/spring-core/src/main/java/org/springframework/core/env/Environment.java index b420faa0596..15bac656983 100644 --- a/spring-core/src/main/java/org/springframework/core/env/Environment.java +++ b/spring-core/src/main/java/org/springframework/core/env/Environment.java @@ -130,8 +130,7 @@ public interface Environment extends PropertyResolver { * @see #getDefaultProfiles * @see #matchesProfiles(String...) * @see #acceptsProfiles(Profiles) - * @deprecated as of 5.1 in favor of {@link #acceptsProfiles(Profiles)} or - * {@link #matchesProfiles(String...)} + * @deprecated in favor of {@link #acceptsProfiles(Profiles)} or {@link #matchesProfiles(String...)} */ @Deprecated(since = "5.1") boolean acceptsProfiles(String... profiles); diff --git a/spring-core/src/main/java/org/springframework/core/task/AsyncTaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/AsyncTaskExecutor.java index 9352da49028..d4e7268f3e5 100644 --- a/spring-core/src/main/java/org/springframework/core/task/AsyncTaskExecutor.java +++ b/spring-core/src/main/java/org/springframework/core/task/AsyncTaskExecutor.java @@ -46,14 +46,14 @@ public interface AsyncTaskExecutor extends TaskExecutor { /** * Constant that indicates immediate execution. - * @deprecated as of 5.3.16 along with {@link #execute(Runnable, long)} + * @deprecated along with {@link #execute(Runnable, long)} */ @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 along with {@link #execute(Runnable, long)} */ @Deprecated(since = "5.3.16") long TIMEOUT_INDEFINITE = Long.MAX_VALUE; @@ -72,7 +72,7 @@ public interface AsyncTaskExecutor extends TaskExecutor { * of the timeout (i.e. it cannot be started in time) * @throws TaskRejectedException if the given task was not accepted * @see #execute(Runnable) - * @deprecated as of 5.3.16 since the common executors do not support start timeouts + * @deprecated since the common executors do not support start timeouts */ @Deprecated(since = "5.3.16") default void execute(Runnable task, long startTimeout) { diff --git a/spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java b/spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java index 5ce4d71c2f7..fc03e1d92d5 100644 --- a/spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java +++ b/spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java @@ -23,7 +23,7 @@ package org.springframework.core.task; * @author Juergen Hoeller * @since 2.0.3 * @see AsyncTaskExecutor#execute(Runnable, long) - * @deprecated as of 5.3.16 since the common executors do not support start timeouts + * @deprecated since the common executors do not support start timeouts */ @Deprecated(since = "5.3.16") @SuppressWarnings("serial") diff --git a/spring-core/src/main/java/org/springframework/core/type/StandardAnnotationMetadata.java b/spring-core/src/main/java/org/springframework/core/type/StandardAnnotationMetadata.java index acf541e8b83..9bf5b5eac93 100644 --- a/spring-core/src/main/java/org/springframework/core/type/StandardAnnotationMetadata.java +++ b/spring-core/src/main/java/org/springframework/core/type/StandardAnnotationMetadata.java @@ -58,7 +58,7 @@ public class StandardAnnotationMetadata extends StandardClassMetadata implements * Create a new {@code StandardAnnotationMetadata} wrapper for the given Class. * @param introspectedClass the Class to introspect * @see #StandardAnnotationMetadata(Class, boolean) - * @deprecated since 5.2 in favor of the factory method {@link AnnotationMetadata#introspect(Class)} + * @deprecated in favor of the factory method {@link AnnotationMetadata#introspect(Class)} */ @Deprecated(since = "5.2") public StandardAnnotationMetadata(Class introspectedClass) { @@ -75,7 +75,7 @@ public class StandardAnnotationMetadata extends StandardClassMetadata implements * {@link org.springframework.core.annotation.AnnotationAttributes} for compatibility * with ASM-based {@link AnnotationMetadata} implementations * @since 3.1.1 - * @deprecated since 5.2 in favor of the factory method {@link AnnotationMetadata#introspect(Class)}. + * @deprecated in favor of the factory method {@link AnnotationMetadata#introspect(Class)}. * Use {@link MergedAnnotation#asMap(org.springframework.core.annotation.MergedAnnotation.Adapt...) MergedAnnotation.asMap} * from {@link #getAnnotations()} rather than {@link #getAnnotationAttributes(String)} * if {@code nestedAnnotationsAsMap} is {@code false} diff --git a/spring-core/src/main/java/org/springframework/core/type/StandardClassMetadata.java b/spring-core/src/main/java/org/springframework/core/type/StandardClassMetadata.java index ba1e0de52fc..86c47696d44 100644 --- a/spring-core/src/main/java/org/springframework/core/type/StandardClassMetadata.java +++ b/spring-core/src/main/java/org/springframework/core/type/StandardClassMetadata.java @@ -40,7 +40,7 @@ public class StandardClassMetadata implements ClassMetadata { /** * Create a new StandardClassMetadata wrapper for the given Class. * @param introspectedClass the Class to introspect - * @deprecated since 5.2 in favor of {@link StandardAnnotationMetadata} + * @deprecated in favor of {@link StandardAnnotationMetadata} */ @Deprecated(since = "5.2") public StandardClassMetadata(Class introspectedClass) { diff --git a/spring-core/src/main/java/org/springframework/core/type/StandardMethodMetadata.java b/spring-core/src/main/java/org/springframework/core/type/StandardMethodMetadata.java index 3def07d396a..4dedaac96eb 100644 --- a/spring-core/src/main/java/org/springframework/core/type/StandardMethodMetadata.java +++ b/spring-core/src/main/java/org/springframework/core/type/StandardMethodMetadata.java @@ -52,7 +52,7 @@ public class StandardMethodMetadata implements MethodMetadata { /** * Create a new StandardMethodMetadata wrapper for the given Method. * @param introspectedMethod the Method to introspect - * @deprecated since 5.2 in favor of obtaining instances via {@link AnnotationMetadata} + * @deprecated in favor of obtaining instances via {@link AnnotationMetadata} */ @Deprecated(since = "5.2") public StandardMethodMetadata(Method introspectedMethod) { diff --git a/spring-core/src/main/java/org/springframework/lang/NonNull.java b/spring-core/src/main/java/org/springframework/lang/NonNull.java index 36a139caffc..8bad805febe 100644 --- a/spring-core/src/main/java/org/springframework/lang/NonNull.java +++ b/spring-core/src/main/java/org/springframework/lang/NonNull.java @@ -42,7 +42,7 @@ import javax.annotation.meta.TypeQualifierNickname; * @author Sebastien Deleuze * @author Juergen Hoeller * @since 5.0 - * @deprecated since 7.0; use {@link org.jspecify.annotations.NonNull} instead + * @deprecated use {@link org.jspecify.annotations.NonNull} instead * @see NonNullApi * @see NonNullFields * @see Nullable diff --git a/spring-core/src/main/java/org/springframework/lang/NonNullApi.java b/spring-core/src/main/java/org/springframework/lang/NonNullApi.java index fbc5f0cacc1..54cb21ddf18 100644 --- a/spring-core/src/main/java/org/springframework/lang/NonNullApi.java +++ b/spring-core/src/main/java/org/springframework/lang/NonNullApi.java @@ -38,7 +38,7 @@ import javax.annotation.meta.TypeQualifierDefault; * @author Sebastien Deleuze * @author Juergen Hoeller * @since 5.0 - * @deprecated since 7.0; use {@link org.jspecify.annotations.NullMarked} instead + * @deprecated use {@link org.jspecify.annotations.NullMarked} instead * @see NonNullFields * @see Nullable * @see NonNull diff --git a/spring-core/src/main/java/org/springframework/lang/NonNullFields.java b/spring-core/src/main/java/org/springframework/lang/NonNullFields.java index 938e99f0563..21e3a57dfb8 100644 --- a/spring-core/src/main/java/org/springframework/lang/NonNullFields.java +++ b/spring-core/src/main/java/org/springframework/lang/NonNullFields.java @@ -37,7 +37,7 @@ import javax.annotation.meta.TypeQualifierDefault; * * @author Sebastien Deleuze * @since 5.0 - * @deprecated since 7.0; use {@link org.jspecify.annotations.NullMarked} instead + * @deprecated use {@link org.jspecify.annotations.NullMarked} instead * @see NonNullApi * @see Nullable * @see NonNull diff --git a/spring-core/src/main/java/org/springframework/lang/Nullable.java b/spring-core/src/main/java/org/springframework/lang/Nullable.java index 1a74d42b967..95b8713c0df 100644 --- a/spring-core/src/main/java/org/springframework/lang/Nullable.java +++ b/spring-core/src/main/java/org/springframework/lang/Nullable.java @@ -42,7 +42,7 @@ import javax.annotation.meta.TypeQualifierNickname; * @author Sebastien Deleuze * @author Juergen Hoeller * @since 5.0 - * @deprecated since 7.0; use {@link org.jspecify.annotations.Nullable} instead + * @deprecated use {@link org.jspecify.annotations.Nullable} instead * @see NonNullApi * @see NonNullFields * @see NonNull diff --git a/spring-core/src/main/java/org/springframework/util/ClassUtils.java b/spring-core/src/main/java/org/springframework/util/ClassUtils.java index 0bc7b9d0448..7601998947d 100644 --- a/spring-core/src/main/java/org/springframework/util/ClassUtils.java +++ b/spring-core/src/main/java/org/springframework/util/ClassUtils.java @@ -939,7 +939,7 @@ public abstract class ClassUtils { * Check whether the given object is a CGLIB proxy. * @param object the object to check * @see org.springframework.aop.support.AopUtils#isCglibProxy(Object) - * @deprecated as of 5.2, in favor of custom (possibly narrower) checks + * @deprecated in favor of custom (possibly narrower) checks * such as for a Spring AOP proxy */ @Deprecated(since = "5.2") @@ -951,7 +951,7 @@ public abstract class ClassUtils { * Check whether the specified class is a CGLIB-generated class. * @param clazz the class to check * @see #getUserClass(Class) - * @deprecated as of 5.2, in favor of custom (possibly narrower) checks + * @deprecated in favor of custom (possibly narrower) checks * or simply a check for containing {@link #CGLIB_CLASS_SEPARATOR} */ @Deprecated(since = "5.2") @@ -963,7 +963,7 @@ public abstract class ClassUtils { * Check whether the specified class name is a CGLIB-generated class. * @param className the class name to check * @see #CGLIB_CLASS_SEPARATOR - * @deprecated as of 5.2, in favor of custom (possibly narrower) checks + * @deprecated in favor of custom (possibly narrower) checks * or simply a check for containing {@link #CGLIB_CLASS_SEPARATOR} */ @Deprecated(since = "5.2") diff --git a/spring-core/src/main/java/org/springframework/util/StringUtils.java b/spring-core/src/main/java/org/springframework/util/StringUtils.java index 3d2040d2d96..ffdc2d5f56e 100644 --- a/spring-core/src/main/java/org/springframework/util/StringUtils.java +++ b/spring-core/src/main/java/org/springframework/util/StringUtils.java @@ -105,8 +105,8 @@ public abstract class StringUtils { * {@link #hasLength(String)} or {@link #hasText(String)} instead. * @param str the candidate object (possibly a {@code String}) * @since 3.2.1 - * @deprecated as of 5.3, in favor of {@link #hasLength(String)} and - * {@link #hasText(String)} (or {@link ObjectUtils#isEmpty(Object)}) + * @deprecated in favor of {@link #hasLength(String)} and {@link #hasText(String)} + * (or {@link ObjectUtils#isEmpty(Object)}) */ @Deprecated(since = "5.3") public static boolean isEmpty(@Nullable Object str) { diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java index 1be5076cd8f..b7423196ea9 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java @@ -367,7 +367,7 @@ public interface JdbcOperations { * @param rse a callback that will extract results * @return an arbitrary result object, as returned by the ResultSetExtractor * @throws DataAccessException if the query fails - * @deprecated as of 5.3, in favor of {@link #query(String, ResultSetExtractor, Object...)} + * @deprecated in favor of {@link #query(String, ResultSetExtractor, Object...)} */ @Deprecated(since = "5.3") @Nullable T query(String sql, @Nullable Object @Nullable [] args, ResultSetExtractor rse) throws DataAccessException; @@ -438,7 +438,7 @@ public interface JdbcOperations { * only the argument value but also the SQL type and optionally the scale * @param rch a callback that will extract results, one row at a time * @throws DataAccessException if the query fails - * @deprecated as of 5.3, in favor of {@link #query(String, RowCallbackHandler, Object...)} + * @deprecated in favor of {@link #query(String, RowCallbackHandler, Object...)} */ @Deprecated(since = "5.3") void query(String sql, @Nullable Object @Nullable [] args, RowCallbackHandler rch) throws DataAccessException; @@ -514,7 +514,7 @@ public interface JdbcOperations { * @param rowMapper a callback that will map one object per row * @return the result List, containing mapped objects * @throws DataAccessException if the query fails - * @deprecated as of 5.3, in favor of {@link #query(String, RowMapper, Object...)} + * @deprecated in favor of {@link #query(String, RowMapper, Object...)} */ @Deprecated(since = "5.3") List query(String sql, @Nullable Object @Nullable [] args, RowMapper rowMapper) throws DataAccessException; @@ -621,7 +621,7 @@ public interface JdbcOperations { * @throws org.springframework.dao.IncorrectResultSizeDataAccessException * if the query does not return exactly one row * @throws DataAccessException if the query fails - * @deprecated as of 5.3, in favor of {@link #queryForObject(String, RowMapper, Object...)} + * @deprecated in favor of {@link #queryForObject(String, RowMapper, Object...)} */ @Deprecated(since = "5.3") @Nullable T queryForObject(String sql, @Nullable Object @Nullable [] args, RowMapper rowMapper) throws DataAccessException; @@ -685,7 +685,7 @@ public interface JdbcOperations { * if the query does not return a row containing a single column * @throws DataAccessException if the query fails * @see #queryForObject(String, Class) - * @deprecated as of 5.3, in favor of {@link #queryForObject(String, Class, Object...)} + * @deprecated in favor of {@link #queryForObject(String, Class, Object...)} */ @Deprecated(since = "5.3") @Nullable T queryForObject(String sql, @Nullable Object @Nullable [] args, Class requiredType) throws DataAccessException; @@ -789,7 +789,7 @@ public interface JdbcOperations { * @throws DataAccessException if the query fails * @see #queryForList(String, Class) * @see SingleColumnRowMapper - * @deprecated as of 5.3, in favor of {@link #queryForList(String, Class, Object...)} + * @deprecated in favor of {@link #queryForList(String, Class, Object...)} */ @Deprecated(since = "5.3") List queryForList(String sql, @Nullable Object @Nullable [] args, Class elementType) throws DataAccessException; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java index fd2a4c7d4e1..e0814b44c22 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java @@ -42,8 +42,8 @@ import org.springframework.util.Assert; * @author Juergen Hoeller * @see #loadBeanDefinitions * @see org.springframework.beans.factory.support.PropertiesBeanDefinitionReader - * @deprecated as of 5.3, in favor of Spring's common bean definition formats - * and/or custom reader implementations + * @deprecated in favor of Spring's common bean definition formats and/or custom + * reader implementations */ @Deprecated(since = "5.3") public class JdbcBeanDefinitionReader { diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java index 06b9cebf232..64be10894b9 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java @@ -263,8 +263,7 @@ public abstract class DataSourceUtils { * regarding read-only flag and isolation level. * @param con the Connection to reset * @param previousIsolationLevel the isolation level to restore, if any - * @deprecated as of 5.1.11, in favor of - * {@link #resetConnectionAfterTransaction(Connection, Integer, boolean)} + * @deprecated in favor of {@link #resetConnectionAfterTransaction(Connection, Integer, boolean)} */ @Deprecated(since = "5.1.11") public static void resetConnectionAfterTransaction(Connection con, @Nullable Integer previousIsolationLevel) { diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseStartupValidator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseStartupValidator.java index e4c2325b904..0654bcb8038 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseStartupValidator.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseStartupValidator.java @@ -75,7 +75,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 in favor of the JDBC 4.0 connection validation */ @Deprecated(since = "5.3") public void setValidationQuery(String validationQuery) { diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java index 7559918deeb..3054008313e 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java @@ -375,7 +375,7 @@ public abstract class JdbcUtils { * @throws MetaDataAccessException if we couldn't access the DatabaseMetaData * or failed to invoke the specified method * @see java.sql.DatabaseMetaData - * @deprecated as of 5.2.9, in favor of + * @deprecated in favor of * {@link #extractDatabaseMetaData(DataSource, DatabaseMetaDataCallback)} * with a lambda expression or method reference and a generically typed result */ diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketRequester.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketRequester.java index 2da4bf04a94..108651f3ea9 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketRequester.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketRequester.java @@ -310,7 +310,7 @@ public interface RSocketRequester extends Disposable { * @param port the server port * @return an {@code RSocketRequester} for the connection * @see TcpClientTransport - * @deprecated as of 5.3 in favor of {@link #tcp(String, int)} + * @deprecated in favor of {@link #tcp(String, int)} */ @Deprecated(since = "5.3") Mono connectTcp(String host, int port); @@ -320,7 +320,7 @@ public interface RSocketRequester extends Disposable { * @param uri the RSocket server endpoint URI * @return an {@code RSocketRequester} for the connection * @see WebsocketClientTransport - * @deprecated as of 5.3 in favor of {@link #websocket(URI)} + * @deprecated in favor of {@link #websocket(URI)} */ @Deprecated(since = "5.3") Mono connectWebSocket(URI uri); @@ -329,7 +329,7 @@ public interface RSocketRequester extends Disposable { * Connect to the server with the given {@code ClientTransport}. * @param transport the client transport to use * @return an {@code RSocketRequester} for the connection - * @deprecated as of 5.3 in favor of {@link #transport(ClientTransport)} + * @deprecated in favor of {@link #transport(ClientTransport)} */ @Deprecated(since = "5.3") Mono connect(ClientTransport transport); diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java index e3df130feaf..b531eb22c83 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java @@ -531,7 +531,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 in favor of {@link #determineTransactionManager(TransactionAttribute, Class)} */ @Deprecated(since = "6.2") protected @Nullable TransactionManager determineTransactionManager(@Nullable TransactionAttribute txAttr) { diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionInterceptor.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionInterceptor.java index 15d1f529bd1..d58d4057d5a 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionInterceptor.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionInterceptor.java @@ -83,7 +83,7 @@ public class TransactionInterceptor extends TransactionAspectSupport implements * @param tas the attribute source to be used to find transaction attributes * @see #setTransactionManager * @see #setTransactionAttributeSource - * @deprecated as of 5.2.5, in favor of + * @deprecated in favor of * {@link #TransactionInterceptor(TransactionManager, TransactionAttributeSource)} */ @Deprecated(since = "5.2.5") @@ -98,7 +98,7 @@ public class TransactionInterceptor extends TransactionAspectSupport implements * @param attributes the transaction attributes in properties format * @see #setTransactionManager * @see #setTransactionAttributes(java.util.Properties) - * @deprecated as of 5.2.5, in favor of {@link #setTransactionAttributes(Properties)} + * @deprecated in favor of {@link #setTransactionAttributes(Properties)} */ @Deprecated(since = "5.2.5") public TransactionInterceptor(PlatformTransactionManager ptm, Properties attributes) { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerMapping.java index 2ca735f427a..f1e24350a2e 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerMapping.java @@ -68,7 +68,7 @@ public interface HandlerMapping { * {@link org.springframework.web.util.UrlPathHelper} could be the full path * or without the context path, decoded or not, etc. * @since 5.2 - * @deprecated as of 5.3 in favor of + * @deprecated in favor of * {@link org.springframework.web.util.UrlPathHelper#PATH_ATTRIBUTE} and * {@link org.springframework.web.util.ServletRequestPathUtils#PATH_ATTRIBUTE}. * To access the cached path used for request mapping, use diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java index a1478a78323..2d5a9bde09d 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java @@ -108,7 +108,7 @@ public class WebContentInterceptor extends WebContentGenerator implements Handle * Shortcut to the * {@link org.springframework.web.util.UrlPathHelper#setAlwaysUseFullPath * same property} on the configured {@code UrlPathHelper}. - * @deprecated as of 5.3, the path is resolved externally and obtained with + * @deprecated the path is resolved externally and obtained with * {@link ServletRequestPathUtils#getCachedPathValue(ServletRequest)} */ @Deprecated(since = "5.3") @@ -119,7 +119,7 @@ public class WebContentInterceptor extends WebContentGenerator implements Handle * Shortcut to the * {@link org.springframework.web.util.UrlPathHelper#setUrlDecode * same property} on the configured {@code UrlPathHelper}. - * @deprecated as of 5.3, the path is resolved externally and obtained with + * @deprecated the path is resolved externally and obtained with * {@link ServletRequestPathUtils#getCachedPathValue(ServletRequest)} */ @Deprecated(since = "5.3") @@ -128,7 +128,7 @@ public class WebContentInterceptor extends WebContentGenerator implements Handle /** * Set the UrlPathHelper to use for resolution of lookup paths. - * @deprecated as of 5.3, the path is resolved externally and obtained with + * @deprecated the path is resolved externally and obtained with * {@link ServletRequestPathUtils#getCachedPathValue(ServletRequest)} */ @Deprecated(since = "5.3") diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java index 39fcdfb7960..09537af197e 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java @@ -113,8 +113,7 @@ public final class RequestMappingInfo implements RequestConditionBy default this is not set. * @since 4.2.8 - * @deprecated as of 5.3, the path is resolved externally and obtained with + * @deprecated the path is resolved externally and obtained with * {@link ServletRequestPathUtils#getCachedPathValue(ServletRequest)} */ @Deprecated(since = "5.3") @@ -992,7 +991,7 @@ public final class RequestMappingInfo implements RequestCondition