Although {@code @Autowired} can technically be declared on individual method - * or constructor parameters since Spring Framework 5.0, most parts of the - * framework ignore such declarations. The only part of the core Spring Framework - * that actively supports autowired parameters is the JUnit Jupiter support in - * the {@code spring-test} module (see the + * or constructor parameters, most parts of the framework ignore such declarations. + * The only part of the core Spring Framework that actively supports autowired + * parameters is the JUnit Jupiter support in the {@code spring-test} module (see the * TestContext framework * reference documentation for details). * *
In the case of a multi-arg constructor or method, the {@link #required} attribute * is applicable to all arguments. Individual parameters may be declared as Java-8 style - * {@link java.util.Optional} or, as of Spring Framework 5.0, also as {@code @Nullable} - * or a not-null parameter type in Kotlin, overriding the base 'required' semantics. + * {@link java.util.Optional} as well as {@code @Nullable} or a not-null parameter + * type in Kotlin, overriding the base 'required' semantics. * *
In case of an array, {@link java.util.Collection}, or {@link java.util.Map} diff --git a/spring-context/src/main/java/org/springframework/context/ConfigurableApplicationContext.java b/spring-context/src/main/java/org/springframework/context/ConfigurableApplicationContext.java index 522102b22704..2861196a5426 100644 --- a/spring-context/src/main/java/org/springframework/context/ConfigurableApplicationContext.java +++ b/spring-context/src/main/java/org/springframework/context/ConfigurableApplicationContext.java @@ -224,8 +224,8 @@ public interface ConfigurableApplicationContext extends ApplicationContext, Life * on JVM shutdown unless it has already been closed at that time. *
This method can be called multiple times. Only one shutdown hook * (at max) will be registered for each context instance. - *
As of Spring Framework 5.2, the {@linkplain Thread#getName() name} of - * the shutdown hook thread should be {@link #SHUTDOWN_HOOK_THREAD_NAME}. + *
The {@linkplain Thread#getName() name} of the shutdown hook thread + * should be {@link #SHUTDOWN_HOOK_THREAD_NAME}. * @see java.lang.Runtime#addShutdownHook * @see #close() */ diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java index f2b45c61fe8b..6df3504ca9c3 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ * {@link LoadTimeWeaver} implementation for GlassFish's * {@code org.glassfish.api.deployment.InstrumentableClassLoader InstrumentableClassLoader}. * - *
As of Spring Framework 5.0, this weaver supports GlassFish 4+. + *
This weaver supports GlassFish 4+. * * @author Costin Leau * @author Juergen Hoeller diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.java index cef5e337c5b7..130dad7e6241 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,8 +31,7 @@ * {@link LoadTimeWeaver} implementation for JBoss's instrumentable ClassLoader. * Thanks to Ales Justin and Marius Bogoevici for the initial prototype. * - *
As of Spring Framework 5.0, this weaver supports WildFly 8+. - * As of Spring Framework 5.1.5, it also supports WildFly 13+. + *
This weaver supports WildFly 13+. * * @author Costin Leau * @author Juergen Hoeller diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java b/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java index 02cadb58f5ca..700c0e9e27e2 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java +++ b/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2023 the original author or authors. + * Copyright 2002-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -295,8 +295,8 @@ public void addTriggerTask(TriggerTask task) { /** * Add a {@link Runnable} task to be triggered per the given cron {@code expression}. - *
As of Spring Framework 5.2, this method will not register the task if the - * {@code expression} is equal to {@link #CRON_DISABLED}. + *
This method will not register the task if the {@code expression} is + * equal to {@link #CRON_DISABLED}. */ public void addCronTask(Runnable task, String expression) { if (!CRON_DISABLED.equals(expression)) { diff --git a/spring-context/src/main/java/org/springframework/validation/DataBinder.java b/spring-context/src/main/java/org/springframework/validation/DataBinder.java index ee94dc55d39c..9fd092376d9d 100644 --- a/spring-context/src/main/java/org/springframework/validation/DataBinder.java +++ b/spring-context/src/main/java/org/springframework/validation/DataBinder.java @@ -549,11 +549,10 @@ public String[] getAllowedFields() { * well as direct equality. *
The default implementation of this method stores disallowed field patterns * in {@linkplain PropertyAccessorUtils#canonicalPropertyName(String) canonical} - * form. As of Spring Framework 5.2.21, the default implementation also transforms - * disallowed field patterns to {@linkplain String#toLowerCase() lowercase} to - * support case-insensitive pattern matching in {@link #isAllowed}. Subclasses - * which override this method must therefore take both of these transformations - * into account. + * form and also transforms disallowed field patterns to + * {@linkplain String#toLowerCase() lowercase} to support case-insensitive + * pattern matching in {@link #isAllowed}. Subclasses which override this + * method must therefore take both of these transformations into account. *
More sophisticated matching can be implemented by overriding the * {@link #isAllowed} method. *
Alternatively, specify a list of allowed field patterns. diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java index 50236152705b..83ca88de8e2d 100644 --- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java +++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java @@ -69,7 +69,7 @@ * at the type level of the containing target class, applying to all public service methods * of that class. By default, JSR-303 will validate against its default group only. * - *
As of Spring 5.0, this functionality requires a Bean Validation 1.1+ provider. + *
This functionality requires a Bean Validation 1.1+ provider. * * @author Juergen Hoeller * @author Rossen Stoyanchev diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.java index e7add2e73e87..134936409ba8 100644 --- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.java +++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2023 the original author or authors. + * Copyright 2002-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -60,7 +60,7 @@ * inline constraint annotations. Validation groups can be specified through {@code @Validated} * as well. By default, JSR-303 will validate against its default group only. * - *
As of Spring 5.0, this functionality requires a Bean Validation 1.1+ provider. + *
This functionality requires a Bean Validation 1.1+ provider. * * @author Juergen Hoeller * @since 3.1 diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java index 336fb6e81fbc..04c73ea79e7f 100644 --- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java +++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java @@ -55,8 +55,7 @@ * {@link CustomValidatorBean} and {@link LocalValidatorFactoryBean}, * and as the primary implementation of the {@link SmartValidator} interface. * - *
As of Spring Framework 5.0, this adapter is fully compatible with - * Bean Validation 1.1 as well as 2.0. + *
This adapter is fully compatible with Bean Validation 1.1 as well as 2.0. * * @author Juergen Hoeller * @author Sam Brannen diff --git a/spring-core/src/main/java/org/springframework/core/SpringVersion.java b/spring-core/src/main/java/org/springframework/core/SpringVersion.java index 962343eef41f..7d03c2160747 100644 --- a/spring-core/src/main/java/org/springframework/core/SpringVersion.java +++ b/spring-core/src/main/java/org/springframework/core/SpringVersion.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,8 +25,8 @@ *
Note that some ClassLoaders do not expose the package metadata, * hence this class might not be able to determine the Spring version * in all environments. Consider using a reflection-based check instead — - * for example, checking for the presence of a specific Spring 5.2 - * method that you intend to call. + * for example, checking for the presence of a specific Spring method that you + * intend to call. * * @author Juergen Hoeller * @since 1.1 diff --git a/spring-core/src/main/java/org/springframework/core/env/Profiles.java b/spring-core/src/main/java/org/springframework/core/env/Profiles.java index 2c2800155a68..e0f8a38ccd62 100644 --- a/spring-core/src/main/java/org/springframework/core/env/Profiles.java +++ b/spring-core/src/main/java/org/springframework/core/env/Profiles.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2023 the original author or authors. + * Copyright 2002-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -62,10 +62,9 @@ public interface Profiles { * without using parentheses. For example, {@code "a & b | c"} is not a valid * expression: it must be expressed as {@code "(a & b) | c"} or * {@code "a & (b | c)"}. - *
As of Spring Framework 5.1.17, two {@code Profiles} instances returned - * by this method are considered equivalent to each other (in terms of - * {@code equals()} and {@code hashCode()} semantics) if they are created - * with identical profile expressions. + *
Two {@code Profiles} instances returned by this method are considered + * equivalent to each other (in terms of {@code equals()} and {@code hashCode()} + * semantics) if they are created with identical profile expressions. * @param profileExpressions the profile expressions to include * @return a new {@link Profiles} instance */ diff --git a/spring-core/src/main/java/org/springframework/core/io/FileSystemResource.java b/spring-core/src/main/java/org/springframework/core/io/FileSystemResource.java index 76e329b5fc8e..f82b5e7bdd74 100644 --- a/spring-core/src/main/java/org/springframework/core/io/FileSystemResource.java +++ b/spring-core/src/main/java/org/springframework/core/io/FileSystemResource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2023 the original author or authors. + * Copyright 2002-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,10 +45,10 @@ * Supports resolution as a {@code File} and also as a {@code URL}. * Implements the extended {@link WritableResource} interface. * - *
Note: As of Spring Framework 5.0, this {@link Resource} implementation uses - * NIO.2 API for read/write interactions. As of 5.1, it may be constructed with a - * {@link java.nio.file.Path} handle in which case it will perform all file system - * interactions via NIO.2, only resorting to {@link File} on {@link #getFile()}. + *
Note: This {@link Resource} implementation uses NIO.2 API for read/write + * interactions and may be constructed with a {@link java.nio.file.Path} handle + * in which case it will perform all file system interactions via NIO.2, only + * resorting to {@link File} on {@link #getFile()}. * * @author Juergen Hoeller * @author Sam Brannen diff --git a/spring-core/src/main/java/org/springframework/util/StopWatch.java b/spring-core/src/main/java/org/springframework/util/StopWatch.java index 1e2568978599..49b888dd938f 100644 --- a/spring-core/src/main/java/org/springframework/util/StopWatch.java +++ b/spring-core/src/main/java/org/springframework/util/StopWatch.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2023 the original author or authors. + * Copyright 2002-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,10 +37,10 @@ *
This class is normally used to verify performance during proof-of-concept * work and in development, rather than as part of production applications. * - *
As of Spring Framework 5.2, running time is tracked and reported in - * nanoseconds. As of 6.1, the default time unit for String renderings is - * seconds with decimal points in nanosecond precision. Custom renderings with - * specific time units can be requested through {@link #prettyPrint(TimeUnit)}. + *
Running time is tracked and reported in nanoseconds. As of Spring Framework + * 6.1, the default time unit for String renderings is seconds with decimal points + * in nanosecond precision. Custom renderings with specific time units can be + * requested through {@link #prettyPrint(TimeUnit)}. * * @author Rod Johnson * @author Juergen Hoeller diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulatorUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulatorUtils.java index f3f0d5780f92..1dc788a33e50 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulatorUtils.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulatorUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,10 +36,10 @@ public abstract class DatabasePopulatorUtils { /** * Execute the given {@link DatabasePopulator} against the given {@link DataSource}. - *
As of Spring Framework 5.3.11, the {@link Connection} for the supplied - * {@code DataSource} will be {@linkplain Connection#commit() committed} if - * it is not configured for {@link Connection#getAutoCommit() auto-commit} and - * is not {@linkplain DataSourceUtils#isConnectionTransactional transactional}. + *
The {@link Connection} for the supplied {@code DataSource} will be + * {@linkplain Connection#commit() committed} if it is not configured for + * {@link Connection#getAutoCommit() auto-commit} and is not + * {@linkplain DataSourceUtils#isConnectionTransactional transactional}. * @param populator the {@code DatabasePopulator} to execute * @param dataSource the {@code DataSource} to execute against * @throws DataAccessException if an error occurs, specifically a {@link ScriptException} diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/MySQLMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/MySQLMaxValueIncrementer.java index 83eb5bf75e15..7183be4cc8b8 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/MySQLMaxValueIncrementer.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/MySQLMaxValueIncrementer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -54,7 +54,7 @@ * "useNewConnection" property to false. In this case you MUST use a non-transactional * storage engine like MYISAM when defining the incrementer table. * - *
As of Spring Framework 5.3.7, {@code MySQLMaxValueIncrementer} is compatible with + *
Note that {@code MySQLMaxValueIncrementer} is compatible with * MySQL safe updates mode. * * @author Jean-Pierre Pawlak @@ -104,7 +104,7 @@ public MySQLMaxValueIncrementer(DataSource dataSource, String incrementerName, S * {@code false} is sufficient if the storage engine of the sequence table * is non-transactional (like MYISAM), avoiding the effort of acquiring an * extra {@code Connection} for the increment operation. - *
Default is {@code true} since Spring Framework 5.0. + *
Default is {@code true}. * @since 4.3.6 * @see DataSource#getConnection() */ diff --git a/spring-jms/src/main/java/org/springframework/jms/annotation/JmsListener.java b/spring-jms/src/main/java/org/springframework/jms/annotation/JmsListener.java index 6d5470686406..e35bd8de74cf 100644 --- a/spring-jms/src/main/java/org/springframework/jms/annotation/JmsListener.java +++ b/spring-jms/src/main/java/org/springframework/jms/annotation/JmsListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2023 the original author or authors. + * Copyright 2002-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -114,9 +114,9 @@ /** * The name for the durable subscription, if any. - *
As of Spring Framework 5.3.26, if an explicit subscription name is not - * specified, a default subscription name will be generated based on the fully - * qualified name of the annotated listener method — for example, + *
If an explicit subscription name is not specified, a default subscription + * name will be generated based on the fully qualified name of the annotated + * listener method — for example, * {@code "org.example.jms.ProductListener.processRequest"} for a * {@code processRequest(...)} listener method in the * {@code org.example.jms.ProductListener} class. diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapter.java b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapter.java index 9675c860d6aa..6518a5cd51d9 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapter.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2023 the original author or authors. + * Copyright 2002-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,7 +43,7 @@ * are provided as additional arguments so that these can be injected as * method arguments if necessary. * - *
As of Spring Framework 5.3.26, {@code MessagingMessageListenerAdapter} implements + *
Note that {@code MessagingMessageListenerAdapter} implements * {@link SubscriptionNameProvider} in order to provide a meaningful default * subscription name. See {@link #getSubscriptionName()} for details. * diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java index d338f36444fd..681a8136e4d3 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java @@ -189,11 +189,11 @@ protected final SessionFactory obtainSessionFactory() { /** * Set the JDBC DataSource that this instance should manage transactions for. - * The DataSource should match the one used by the Hibernate SessionFactory: + *
The DataSource should match the one used by the Hibernate SessionFactory: * for example, you could specify the same JNDI DataSource for both. *
If the SessionFactory was configured with LocalDataSourceConnectionProvider, * i.e. by Spring's LocalSessionFactoryBean with a specified "dataSource", - * the DataSource will be auto-detected: You can still explicitly specify the + * the DataSource will be auto-detected. You can still explicitly specify the * DataSource, but you don't need to in this case. *
A transactional JDBC Connection for this DataSource will be provided to * application code accessing this DataSource directly via DataSourceUtils @@ -210,7 +210,7 @@ protected final SessionFactory obtainSessionFactory() { * for the actual target DataSource. Alternatively, consider switching * {@link #setPrepareConnection "prepareConnection"} to {@code false}. * In both cases, this transaction manager will not eagerly acquire a - * JDBC Connection for each Hibernate Session anymore (as of Spring 5.1). + * JDBC Connection for each Hibernate Session. * @see #setAutodetectDataSource * @see TransactionAwareDataSourceProxy * @see org.springframework.jdbc.datasource.LazyConnectionDataSourceProxy diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java index b8b498cbb8e2..a727bf1c2eaf 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2023 the original author or authors. + * Copyright 2002-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -109,9 +109,7 @@ * Therefore, it has limited namespace support. As such, it is rather unsuitable for * usage within Web Services. * - *
This marshaller requires XStream 1.4.7 or higher, as of Spring 5.2.17. - * Note that {@link XStream} construction has been reworked in 4.0, with the - * stream driver and the class loader getting passed into XStream itself now. + *
This marshaller requires XStream 1.4.7 or higher. * *
As of Spring Framework 6.0, the default {@link HierarchicalStreamDriver} is * a {@link DomDriver} that uses the configured {@linkplain #setEncoding(String) @@ -641,11 +639,10 @@ protected void customizeXStream(XStream xstream) { /** * Return the native XStream delegate used by this marshaller. - *
NOTE: This method has been marked as final as of Spring 4.0. - * It can be used to access the fully configured XStream for marshalling - * but not configuration purposes anymore. - *
As of Spring Framework 5.1.16, creation of the {@link XStream} instance - * returned by this method is thread safe. + *
The creation of the {@link XStream} instance returned by this method is + * thread safe. + *
NOTE: This method is marked as final. It can be used to access + * the fully configured XStream for marshalling but not configuration purposes. */ public final XStream getXStream() { return this.xstream.obtain(); diff --git a/spring-test/src/main/java/org/springframework/test/context/BootstrapWith.java b/spring-test/src/main/java/org/springframework/test/context/BootstrapWith.java index a2f761d46a6d..17b5c61ace0a 100644 --- a/spring-test/src/main/java/org/springframework/test/context/BootstrapWith.java +++ b/spring-test/src/main/java/org/springframework/test/context/BootstrapWith.java @@ -29,7 +29,7 @@ * Spring TestContext Framework. * *
This annotation may also be used as a meta-annotation to create - * custom composed annotations. As of Spring Framework 5.1, a locally + * custom composed annotations. Note, however, that a locally * declared {@code @BootstrapWith} annotation (i.e., one that is directly * present on the current test class) will override any meta-present * declarations of {@code @BootstrapWith}. diff --git a/spring-test/src/main/java/org/springframework/test/context/TestConstructor.java b/spring-test/src/main/java/org/springframework/test/context/TestConstructor.java index a86897731203..b1cd00043f42 100644 --- a/spring-test/src/main/java/org/springframework/test/context/TestConstructor.java +++ b/spring-test/src/main/java/org/springframework/test/context/TestConstructor.java @@ -46,8 +46,8 @@ *
This annotation may be used as a meta-annotation to create custom * composed annotations. * - *
As of Spring Framework 5.2, this annotation is only supported in conjunction - * with the {@link org.springframework.test.context.junit.jupiter.SpringExtension + *
This annotation is only supported in conjunction with the + * {@link org.springframework.test.context.junit.jupiter.SpringExtension * SpringExtension} for use with JUnit Jupiter. Note that the {@code SpringExtension} is * often automatically registered for you — for example, when using annotations such as * {@link org.springframework.test.context.junit.jupiter.SpringJUnitConfig @SpringJUnitConfig} and diff --git a/spring-test/src/main/java/org/springframework/test/context/TestContext.java b/spring-test/src/main/java/org/springframework/test/context/TestContext.java index cce8366ece80..3e6d5109c13d 100644 --- a/spring-test/src/main/java/org/springframework/test/context/TestContext.java +++ b/spring-test/src/main/java/org/springframework/test/context/TestContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2023 the original author or authors. + * Copyright 2002-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,13 +30,13 @@ * {@code TestContext} encapsulates the context in which a test is executed, * agnostic of the actual testing framework in use. * - *
As of Spring Framework 5.0, concrete implementations are highly encouraged - * to implement a copy constructor in order to allow the immutable state - * and attributes of a {@code TestContext} to be used as a template for additional - * contexts created for parallel test execution. The copy constructor must accept a - * single argument of the type of the concrete implementation. Any implementation - * that does not provide a copy constructor will likely fail in an environment - * that executes tests concurrently. + *
Concrete implementations are highly encouraged to implement a copy + * constructor in order to allow the immutable state and attributes of a + * {@code TestContext} to be used as a template for additional contexts created + * for parallel test execution. The copy constructor must accept a single argument + * of the type of the concrete implementation. Any implementation that does not + * provide a copy constructor will likely fail in an environment that executes + * tests concurrently. * *
As of Spring Framework 6.1, concrete implementations are highly encouraged to * override {@link #setMethodInvoker(MethodInvoker)} and {@link #getMethodInvoker()}. diff --git a/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java index 4ebbd80b9950..2b5cba9879e7 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java @@ -60,14 +60,13 @@ *
By default, {@code "multipart/form-data"} is used as the content type when - * {@linkplain #write writing} multipart data. As of Spring Framework 5.2 it is - * also possible to write multipart data using other multipart subtypes such as - * {@code "multipart/mixed"} and {@code "multipart/related"}, as long as the - * multipart subtype is registered as a {@linkplain #getSupportedMediaTypes - * supported media type} and the desired multipart subtype is specified - * as the content type when {@linkplain #write writing} the multipart data. Note - * that {@code "multipart/mixed"} is registered as a supported media type by - * default. + * {@linkplain #write writing} multipart data. It is also possible to write + * multipart data using other multipart subtypes such as {@code "multipart/mixed"} + * and {@code "multipart/related"}, as long as the multipart subtype is registered + * as a {@linkplain #getSupportedMediaTypes supported media type} and the + * desired multipart subtype is specified as the content type when + * {@linkplain #write writing} the multipart data. Note that {@code "multipart/mixed"} + * is registered as a supported media type by default. * *
When writing multipart data, this converter uses other * {@link HttpMessageConverter HttpMessageConverters} to write the respective diff --git a/spring-web/src/main/java/org/springframework/web/method/ControllerAdviceBean.java b/spring-web/src/main/java/org/springframework/web/method/ControllerAdviceBean.java index 969213552c3d..b7d1701a3755 100644 --- a/spring-web/src/main/java/org/springframework/web/method/ControllerAdviceBean.java +++ b/spring-web/src/main/java/org/springframework/web/method/ControllerAdviceBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2023 the original author or authors. + * Copyright 2002-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -220,9 +220,8 @@ public Class getBeanType() { /** * Get the bean instance for this {@code ControllerAdviceBean}, if necessary * resolving the bean name through the {@link BeanFactory}. - *
As of Spring Framework 5.2, once the bean instance has been resolved it - * will be cached if it is a singleton, thereby avoiding repeated lookups in - * the {@code BeanFactory}. + *
Once the bean instance has been resolved it will be cached if it is a + * singleton, thereby avoiding repeated lookups in the {@code BeanFactory}. */ public Object resolveBean() { if (this.resolvedBean == null) { @@ -276,8 +275,8 @@ public String toString() { * Find beans annotated with {@link ControllerAdvice @ControllerAdvice} in the * given {@link ApplicationContext} and wrap them as {@code ControllerAdviceBean} * instances. - *
As of Spring Framework 5.2, the {@code ControllerAdviceBean} instances - * in the returned list are sorted using {@link OrderComparator#sort(List)}. + *
Note that the {@code ControllerAdviceBean} instances in the returned list + * are sorted using {@link OrderComparator#sort(List)}. * @see #getOrder() * @see OrderComparator * @see Ordered diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolver.java index 5784d707b5ce..6a72c052d8cf 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolver.java @@ -41,23 +41,25 @@ import org.springframework.web.servlet.support.RequestContextUtils; /** - * Resolves servlet backed request-related method arguments. Supports values of the - * following types: + * Resolves servlet backed request-related method arguments. + * + *
Supports values of the following types: + * *
Requires Undertow 1.3 or 1.4, including XNIO. * *
When used for testing purposes (e.g. load testing) or for specific use cases - * (like HTTPS configuration), a custom OptionMap should be provided: + * (like HTTPS configuration), a custom {@link OptionMap} should be provided: * *
* OptionMap optionMap = OptionMap.builder()