From aa95282290e9d3cd1bdf827f5614bdafdb0e9676 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 23 Oct 2025 12:07:00 +0100 Subject: [PATCH] Polish `@since` tags Closes gh-47779 --- .../boot/bootstrap/BootstrapRegistry.java | 7 ++----- .../context/properties/PropertyMapper.java | 9 ++++---- .../EnvironmentPostProcessorsFactory.java | 1 - .../web/servlet/support/ErrorPageFilter.java | 4 ++-- .../support/SpringBootServletInitializer.java | 1 - .../boot/loader/tools/AbstractJarWriter.java | 4 ++-- .../web/ManagementContextConfiguration.java | 3 +-- .../test/autoconfigure/DataCassandraTest.java | 1 - .../jpa/test/autoconfigure/DataJpaTest.java | 1 - .../ldap/test/autoconfigure/DataLdapTest.java | 1 - .../test/autoconfigure/DataMongoTest.java | 1 - .../test/autoconfigure/DataNeo4jTest.java | 1 - .../test/autoconfigure/DataRedisTest.java | 1 - .../autoconfigure/HttpCodecsProperties.java | 2 +- .../autoconfigure/HttpMessageConverters.java | 1 - .../boot/jackson/ObjectValueDeserializer.java | 1 - .../boot/jackson2/JsonObjectDeserializer.java | 1 - .../boot/jackson2/JsonObjectSerializer.java | 2 +- .../jdbc/test/autoconfigure/JdbcTest.java | 3 +-- .../ConfigurableJettyWebServerFactory.java | 1 - .../boot/jms/ConnectionFactoryUnwrapper.java | 1 - .../jooq/test/autoconfigure/JooqTest.java | 1 - .../boot/jpa/EntityManagerFactoryBuilder.java | 8 ++----- .../autoconfigure/EntityScanner.java | 1 - .../netty/NettyReactiveWebServerFactory.java | 2 -- .../reactor/netty/SslServerCustomizer.java | 1 - .../boot/restclient/RestTemplateBuilder.java | 21 ------------------- .../boot/resttestclient/TestRestTemplate.java | 2 -- .../server/LocalRSocketServerPort.java | 2 +- .../actuate/web/servlet/EndpointRequest.java | 6 +----- .../ConfigurableTomcatWebServerFactory.java | 1 - .../autoconfigure/ServerProperties.java | 2 +- ...nfigurableWebServerApplicationContext.java | 2 +- .../MissingWebServerFactoryBeanException.java | 2 +- ...PortInfoApplicationContextInitializer.java | 2 +- .../context/WebServerApplicationContext.java | 11 +++++----- .../WebServerGracefulShutdownLifecycle.java | 2 +- .../context/WebServerInitializedEvent.java | 2 +- .../context/WebServerPortFileWriter.java | 2 +- ...igReactiveWebServerApplicationContext.java | 2 +- .../ReactiveWebServerApplicationContext.java | 2 +- .../ReactiveWebServerInitializedEvent.java | 2 +- .../ConfigurableServletWebServerFactory.java | 2 -- .../server/servlet/WebListenerRegistrar.java | 2 +- ...figServletWebServerApplicationContext.java | 2 +- .../servlet/context/ServletComponentScan.java | 2 +- .../ServletWebServerApplicationContext.java | 2 +- .../ServletWebServerInitializedEvent.java | 2 +- ...onContextServletContextAwareProcessor.java | 2 +- ...XmlServletWebServerApplicationContext.java | 2 +- .../boot/webclient/WebClientCustomizer.java | 2 +- .../test/autoconfigure/WebFluxTest.java | 1 - .../webmvc/test/autoconfigure/WebMvcTest.java | 1 - .../AutoConfigureMockWebServiceClient.java | 2 +- .../server/AutoConfigureWebServiceServer.java | 2 +- ...MockWebServiceClientAutoConfiguration.java | 2 +- .../server/WebServiceServerTest.java | 2 +- 57 files changed, 45 insertions(+), 106 deletions(-) diff --git a/core/spring-boot/src/main/java/org/springframework/boot/bootstrap/BootstrapRegistry.java b/core/spring-boot/src/main/java/org/springframework/boot/bootstrap/BootstrapRegistry.java index 379797e853f..9d6a4dda29e 100644 --- a/core/spring-boot/src/main/java/org/springframework/boot/bootstrap/BootstrapRegistry.java +++ b/core/spring-boot/src/main/java/org/springframework/boot/bootstrap/BootstrapRegistry.java @@ -105,12 +105,12 @@ public interface BootstrapRegistry { * bootstrap instances. * @return the instance or {@code null} */ - @Nullable T get(BootstrapContext context); + @Nullable + T get(BootstrapContext context); /** * Return the scope of the supplied instance. * @return the scope - * @since 2.4.2 */ default Scope getScope() { return Scope.SINGLETON; @@ -120,7 +120,6 @@ public interface BootstrapRegistry { * Return a new {@link InstanceSupplier} with an updated {@link Scope}. * @param scope the new scope * @return a new {@link InstanceSupplier} instance with the new scope - * @since 2.4.2 */ default InstanceSupplier withScope(Scope scope) { Assert.notNull(scope, "'scope' must not be null"); @@ -166,8 +165,6 @@ public interface BootstrapRegistry { /** * The scope of an instance. - * - * @since 2.4.2 */ enum Scope { diff --git a/core/spring-boot/src/main/java/org/springframework/boot/context/properties/PropertyMapper.java b/core/spring-boot/src/main/java/org/springframework/boot/context/properties/PropertyMapper.java index 38e0a67f234..b66f64e3a77 100644 --- a/core/spring-boot/src/main/java/org/springframework/boot/context/properties/PropertyMapper.java +++ b/core/spring-boot/src/main/java/org/springframework/boot/context/properties/PropertyMapper.java @@ -383,7 +383,8 @@ public final class PropertyMapper { * @param value the value to adapt * @return an adapted value or {@code null} */ - @Nullable R adapt(T value); + @Nullable + R adapt(T value); } @@ -502,7 +503,6 @@ public final class PropertyMapper { * * @param the source type * @param the result type - * @since 4.0.0 */ @FunctionalInterface public interface Adapter { @@ -512,7 +512,8 @@ public final class PropertyMapper { * @param value the value to adapt * @return an adapted value or {@code null} */ - @Nullable R adapt(@Nullable T value); + @Nullable + R adapt(@Nullable T value); } @@ -521,7 +522,6 @@ public final class PropertyMapper { * * @param the source type * @param the result type - * @since 4.0.0 */ @FunctionalInterface public interface Factory { @@ -541,7 +541,6 @@ public final class PropertyMapper { * * @param the source type * @param the result type - * @since 4.0.0 */ @FunctionalInterface public interface Mapper { diff --git a/core/spring-boot/src/main/java/org/springframework/boot/support/EnvironmentPostProcessorsFactory.java b/core/spring-boot/src/main/java/org/springframework/boot/support/EnvironmentPostProcessorsFactory.java index 9701dd52bfb..66fb3f64b95 100644 --- a/core/spring-boot/src/main/java/org/springframework/boot/support/EnvironmentPostProcessorsFactory.java +++ b/core/spring-boot/src/main/java/org/springframework/boot/support/EnvironmentPostProcessorsFactory.java @@ -81,7 +81,6 @@ public interface EnvironmentPostProcessorsFactory { * @param classLoader the source class loader * @param classNames the post processor class names * @return an {@link EnvironmentPostProcessorsFactory} instance - * @since 2.4.8 */ static EnvironmentPostProcessorsFactory of(@Nullable ClassLoader classLoader, String... classNames) { return new ReflectionEnvironmentPostProcessorsFactory(classLoader, classNames); diff --git a/core/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/ErrorPageFilter.java b/core/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/ErrorPageFilter.java index 80e0e25d8b1..dab2a420944 100644 --- a/core/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/ErrorPageFilter.java +++ b/core/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/ErrorPageFilter.java @@ -197,7 +197,6 @@ public class ErrorPageFilter implements Filter, ErrorPageRegistry, Ordered { * description based on the request {@code servletPath} and {@code pathInfo}. * @param request the source request * @return the description - * @since 1.5.0 */ protected String getDescription(HttpServletRequest request) { String pathInfo = (request.getPathInfo() != null) ? request.getPathInfo() : ""; @@ -356,7 +355,8 @@ public class ErrorPageFilter implements Filter, ErrorPageRegistry, Ordered { } } - @Nullable String getMessage() { + @Nullable + String getMessage() { return this.message; } diff --git a/core/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializer.java b/core/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializer.java index 4304cca8b85..bea2e32e926 100644 --- a/core/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializer.java +++ b/core/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializer.java @@ -190,7 +190,6 @@ public abstract class SpringBootServletInitializer implements WebApplicationInit * the {@link SpringApplication}. The default implementation returns a new * {@code SpringApplicationBuilder} in its default state. * @return the {@code SpringApplicationBuilder}. - * @since 1.3.0 */ protected SpringApplicationBuilder createSpringApplicationBuilder() { return new SpringApplicationBuilder(); diff --git a/loader/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/AbstractJarWriter.java b/loader/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/AbstractJarWriter.java index afd3efbc774..8a9f2dbd728 100644 --- a/loader/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/AbstractJarWriter.java +++ b/loader/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/AbstractJarWriter.java @@ -166,7 +166,6 @@ public abstract class AbstractJarWriter implements LoaderClassesWriter { * @param location the location of the index file * @param lines the lines to write * @throws IOException if the write fails - * @since 2.3.0 */ public void writeIndexFile(@Nullable String location, Collection lines) throws IOException { if (location != null) { @@ -363,7 +362,8 @@ public abstract class AbstractJarWriter implements LoaderClassesWriter { */ EntryTransformer NONE = (jarEntry) -> jarEntry; - @Nullable JarArchiveEntry transform(JarArchiveEntry jarEntry); + @Nullable + JarArchiveEntry transform(JarArchiveEntry jarEntry); } diff --git a/module/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/ManagementContextConfiguration.java b/module/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/ManagementContextConfiguration.java index 93a21240691..7da51777c56 100644 --- a/module/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/ManagementContextConfiguration.java +++ b/module/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/ManagementContextConfiguration.java @@ -51,7 +51,6 @@ public @interface ManagementContextConfiguration { * Specifies the type of management context that is required for this configuration to * be applied. * @return the required management context type - * @since 2.0.0 */ ManagementContextType value() default ManagementContextType.ANY; @@ -75,7 +74,7 @@ public @interface ManagementContextConfiguration { * "@Bean Lite Mode" (see {@link Bean @Bean's javadoc}). It is therefore behaviorally * equivalent to removing the {@code @Configuration} stereotype. * @return whether to proxy {@code @Bean} methods - * @since 2.2 + * @since 2.2.0 */ @AliasFor(annotation = Configuration.class) boolean proxyBeanMethods() default true; diff --git a/module/spring-boot-data-cassandra-test/src/main/java/org/springframework/boot/data/cassandra/test/autoconfigure/DataCassandraTest.java b/module/spring-boot-data-cassandra-test/src/main/java/org/springframework/boot/data/cassandra/test/autoconfigure/DataCassandraTest.java index bfed9bed0ad..2f2700bc43a 100644 --- a/module/spring-boot-data-cassandra-test/src/main/java/org/springframework/boot/data/cassandra/test/autoconfigure/DataCassandraTest.java +++ b/module/spring-boot-data-cassandra-test/src/main/java/org/springframework/boot/data/cassandra/test/autoconfigure/DataCassandraTest.java @@ -66,7 +66,6 @@ public @interface DataCassandraTest { * Properties in form {@literal key=value} that should be added to the Spring * {@link Environment} before the test runs. * @return the properties to add - * @since 2.1.0 */ String[] properties() default {}; diff --git a/module/spring-boot-data-jpa-test/src/main/java/org/springframework/boot/data/jpa/test/autoconfigure/DataJpaTest.java b/module/spring-boot-data-jpa-test/src/main/java/org/springframework/boot/data/jpa/test/autoconfigure/DataJpaTest.java index fdbc5b82aba..50fa36b2eff 100644 --- a/module/spring-boot-data-jpa-test/src/main/java/org/springframework/boot/data/jpa/test/autoconfigure/DataJpaTest.java +++ b/module/spring-boot-data-jpa-test/src/main/java/org/springframework/boot/data/jpa/test/autoconfigure/DataJpaTest.java @@ -95,7 +95,6 @@ public @interface DataJpaTest { * Properties in form {@literal key=value} that should be added to the Spring * {@link Environment} before the test runs. * @return the properties to add - * @since 2.1.0 */ String[] properties() default {}; diff --git a/module/spring-boot-data-ldap-test/src/main/java/org/springframework/boot/data/ldap/test/autoconfigure/DataLdapTest.java b/module/spring-boot-data-ldap-test/src/main/java/org/springframework/boot/data/ldap/test/autoconfigure/DataLdapTest.java index fbd2f33533f..abd7b43de3b 100644 --- a/module/spring-boot-data-ldap-test/src/main/java/org/springframework/boot/data/ldap/test/autoconfigure/DataLdapTest.java +++ b/module/spring-boot-data-ldap-test/src/main/java/org/springframework/boot/data/ldap/test/autoconfigure/DataLdapTest.java @@ -69,7 +69,6 @@ public @interface DataLdapTest { * Properties in form {@literal key=value} that should be added to the Spring * {@link Environment} before the test runs. * @return the properties to add - * @since 2.1.0 */ String[] properties() default {}; diff --git a/module/spring-boot-data-mongodb-test/src/main/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTest.java b/module/spring-boot-data-mongodb-test/src/main/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTest.java index cb1e7c8f28a..f4a3c8fb85b 100644 --- a/module/spring-boot-data-mongodb-test/src/main/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTest.java +++ b/module/spring-boot-data-mongodb-test/src/main/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTest.java @@ -67,7 +67,6 @@ public @interface DataMongoTest { * Properties in form {@literal key=value} that should be added to the Spring * {@link Environment} before the test runs. * @return the properties to add - * @since 2.1.0 */ String[] properties() default {}; diff --git a/module/spring-boot-data-neo4j-test/src/main/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTest.java b/module/spring-boot-data-neo4j-test/src/main/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTest.java index ed12f461dd1..f16793d1791 100644 --- a/module/spring-boot-data-neo4j-test/src/main/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTest.java +++ b/module/spring-boot-data-neo4j-test/src/main/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTest.java @@ -74,7 +74,6 @@ public @interface DataNeo4jTest { * Properties in form {@literal key=value} that should be added to the Spring * {@link Environment} before the test runs. * @return the properties to add - * @since 2.1.0 */ String[] properties() default {}; diff --git a/module/spring-boot-data-redis-test/src/main/java/org/springframework/boot/data/redis/test/autoconfigure/DataRedisTest.java b/module/spring-boot-data-redis-test/src/main/java/org/springframework/boot/data/redis/test/autoconfigure/DataRedisTest.java index eff22d9b10e..40cb6d20df4 100644 --- a/module/spring-boot-data-redis-test/src/main/java/org/springframework/boot/data/redis/test/autoconfigure/DataRedisTest.java +++ b/module/spring-boot-data-redis-test/src/main/java/org/springframework/boot/data/redis/test/autoconfigure/DataRedisTest.java @@ -66,7 +66,6 @@ public @interface DataRedisTest { * Properties in form {@literal key=value} that should be added to the Spring * {@link Environment} before the test runs. * @return the properties to add - * @since 2.1.0 */ String[] properties() default {}; diff --git a/module/spring-boot-http-codec/src/main/java/org/springframework/boot/http/codec/autoconfigure/HttpCodecsProperties.java b/module/spring-boot-http-codec/src/main/java/org/springframework/boot/http/codec/autoconfigure/HttpCodecsProperties.java index 5f6780dc775..b45bf2226a3 100644 --- a/module/spring-boot-http-codec/src/main/java/org/springframework/boot/http/codec/autoconfigure/HttpCodecsProperties.java +++ b/module/spring-boot-http-codec/src/main/java/org/springframework/boot/http/codec/autoconfigure/HttpCodecsProperties.java @@ -26,7 +26,7 @@ import org.springframework.util.unit.DataSize; * * @author Brian Clozel * @author Andy Wilkinson - * @since 3.5.0 + * @since 4.0.0 */ @ConfigurationProperties("spring.http.codecs") public class HttpCodecsProperties { diff --git a/module/spring-boot-http-converter/src/main/java/org/springframework/boot/http/converter/autoconfigure/HttpMessageConverters.java b/module/spring-boot-http-converter/src/main/java/org/springframework/boot/http/converter/autoconfigure/HttpMessageConverters.java index 503e7c1515e..c7dc2226e71 100644 --- a/module/spring-boot-http-converter/src/main/java/org/springframework/boot/http/converter/autoconfigure/HttpMessageConverters.java +++ b/module/spring-boot-http-converter/src/main/java/org/springframework/boot/http/converter/autoconfigure/HttpMessageConverters.java @@ -185,7 +185,6 @@ public class HttpMessageConverters implements Iterable> * {@link AllEncompassingFormHttpMessageConverter}. * @param converters a mutable list of the converters that will be used. * @return the final converts list to use - * @since 1.3.0 */ protected List> postProcessPartConverters(List> converters) { return converters; diff --git a/module/spring-boot-jackson/src/main/java/org/springframework/boot/jackson/ObjectValueDeserializer.java b/module/spring-boot-jackson/src/main/java/org/springframework/boot/jackson/ObjectValueDeserializer.java index 53d5a8f74bf..3cc183728ec 100644 --- a/module/spring-boot-jackson/src/main/java/org/springframework/boot/jackson/ObjectValueDeserializer.java +++ b/module/spring-boot-jackson/src/main/java/org/springframework/boot/jackson/ObjectValueDeserializer.java @@ -74,7 +74,6 @@ public abstract class ObjectValueDeserializer extends ValueDeserializer { * @param the result type * @param mapper a mapper to convert the value when it is not {@code null} * @return the node value or {@code null} - * @since 3.4.0 */ protected final @Nullable R nullSafeValue(@Nullable JsonNode jsonNode, Class type, Function mapper) { diff --git a/module/spring-boot-jackson2/src/main/java/org/springframework/boot/jackson2/JsonObjectDeserializer.java b/module/spring-boot-jackson2/src/main/java/org/springframework/boot/jackson2/JsonObjectDeserializer.java index db3c2629da8..812d59a69df 100644 --- a/module/spring-boot-jackson2/src/main/java/org/springframework/boot/jackson2/JsonObjectDeserializer.java +++ b/module/spring-boot-jackson2/src/main/java/org/springframework/boot/jackson2/JsonObjectDeserializer.java @@ -89,7 +89,6 @@ public abstract class JsonObjectDeserializer extends com.fasterxml.jackson.da * @param the result type * @param mapper a mapper to convert the value when it is not {@code null} * @return the node value or {@code null} - * @since 3.4.0 */ protected final @Nullable R nullSafeValue(JsonNode jsonNode, Class type, Function mapper) { D value = nullSafeValue(jsonNode, type); diff --git a/module/spring-boot-jackson2/src/main/java/org/springframework/boot/jackson2/JsonObjectSerializer.java b/module/spring-boot-jackson2/src/main/java/org/springframework/boot/jackson2/JsonObjectSerializer.java index d4b1e490068..08650ce1f8a 100644 --- a/module/spring-boot-jackson2/src/main/java/org/springframework/boot/jackson2/JsonObjectSerializer.java +++ b/module/spring-boot-jackson2/src/main/java/org/springframework/boot/jackson2/JsonObjectSerializer.java @@ -30,7 +30,7 @@ import org.springframework.boot.jackson.ObjectValueSerializer; * * @param the supported object type * @author Phillip Webb - * @since 1.4.0 + * @since 4.0.0 * @see JsonObjectDeserializer * @deprecated since 4.0.0 for removal in 4.2.0 in favor of Jackson 3 and * {@link ObjectValueSerializer} diff --git a/module/spring-boot-jdbc-test/src/main/java/org/springframework/boot/jdbc/test/autoconfigure/JdbcTest.java b/module/spring-boot-jdbc-test/src/main/java/org/springframework/boot/jdbc/test/autoconfigure/JdbcTest.java index 6663bd68544..83ae8ab5570 100644 --- a/module/spring-boot-jdbc-test/src/main/java/org/springframework/boot/jdbc/test/autoconfigure/JdbcTest.java +++ b/module/spring-boot-jdbc-test/src/main/java/org/springframework/boot/jdbc/test/autoconfigure/JdbcTest.java @@ -60,7 +60,7 @@ import org.springframework.transaction.annotation.Transactional; * * @author Stephane Nicoll * @author Artsiom Yudovin - * @since 1.5.0 + * @since 4.0.0 * @see AutoConfigureJdbc * @see AutoConfigureTestDatabase */ @@ -82,7 +82,6 @@ public @interface JdbcTest { * Properties in form {@literal key=value} that should be added to the Spring * {@link Environment} before the test runs. * @return the properties to add - * @since 2.1.0 */ String[] properties() default {}; diff --git a/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/ConfigurableJettyWebServerFactory.java b/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/ConfigurableJettyWebServerFactory.java index a471dedd832..4e794b0ed94 100644 --- a/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/ConfigurableJettyWebServerFactory.java +++ b/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/ConfigurableJettyWebServerFactory.java @@ -66,7 +66,6 @@ public interface ConfigurableJettyWebServerFactory extends ConfigurableWebServer /** * Sets the maximum number of concurrent connections. * @param maxConnections the maximum number of concurrent connections - * @since 4.0.0 */ void setMaxConnections(int maxConnections); diff --git a/module/spring-boot-jms/src/main/java/org/springframework/boot/jms/ConnectionFactoryUnwrapper.java b/module/spring-boot-jms/src/main/java/org/springframework/boot/jms/ConnectionFactoryUnwrapper.java index 154776c121f..4a9796e8b98 100644 --- a/module/spring-boot-jms/src/main/java/org/springframework/boot/jms/ConnectionFactoryUnwrapper.java +++ b/module/spring-boot-jms/src/main/java/org/springframework/boot/jms/ConnectionFactoryUnwrapper.java @@ -41,7 +41,6 @@ public final class ConnectionFactoryUnwrapper { * @param connectionFactory a connection factory * @return the native connection factory that a {@link CachingConnectionFactory} * wraps, if any - * @since 3.4.1 */ public static ConnectionFactory unwrapCaching(ConnectionFactory connectionFactory) { if (connectionFactory instanceof CachingConnectionFactory cachingConnectionFactory) { diff --git a/module/spring-boot-jooq-test/src/main/java/org/springframework/boot/jooq/test/autoconfigure/JooqTest.java b/module/spring-boot-jooq-test/src/main/java/org/springframework/boot/jooq/test/autoconfigure/JooqTest.java index dfe881e4304..cebe38c83ab 100644 --- a/module/spring-boot-jooq-test/src/main/java/org/springframework/boot/jooq/test/autoconfigure/JooqTest.java +++ b/module/spring-boot-jooq-test/src/main/java/org/springframework/boot/jooq/test/autoconfigure/JooqTest.java @@ -74,7 +74,6 @@ public @interface JooqTest { * Properties in form {@literal key=value} that should be added to the Spring * {@link Environment} before the test runs. * @return the properties to add - * @since 2.1.0 */ String[] properties() default {}; diff --git a/module/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/EntityManagerFactoryBuilder.java b/module/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/EntityManagerFactoryBuilder.java index f819c1a0bc2..42bd53ac9e4 100644 --- a/module/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/EntityManagerFactoryBuilder.java +++ b/module/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/EntityManagerFactoryBuilder.java @@ -73,7 +73,6 @@ public class EntityManagerFactoryBuilder { * provider, based on the {@linkplain #dataSource(DataSource) configured data source} * @param persistenceUnitManager optional source of persistence unit information (can * be null) - * @since 3.4.4 */ public EntityManagerFactoryBuilder(JpaVendorAdapter jpaVendorAdapter, Function> jpaPropertiesFactory, @@ -91,7 +90,6 @@ public class EntityManagerFactoryBuilder { * be null) * @param persistenceUnitRootLocation the persistence unit root location to use as a * fallback or {@code null} - * @since 3.4.4 */ public EntityManagerFactoryBuilder(JpaVendorAdapter jpaVendorAdapter, Function> jpaPropertiesFactory, @@ -116,7 +114,6 @@ public class EntityManagerFactoryBuilder { * Configure the bootstrap executor to be used by the * {@link LocalContainerEntityManagerFactoryBean}. * @param bootstrapExecutor the executor - * @since 2.1.0 */ public void setBootstrapExecutor(AsyncTaskExecutor bootstrapExecutor) { this.bootstrapExecutor = bootstrapExecutor; @@ -127,7 +124,6 @@ public class EntityManagerFactoryBuilder { * to be applied to the PersistenceUnitInfo used for creating the * {@link LocalContainerEntityManagerFactoryBean}. * @param persistenceUnitPostProcessors the persistence unit post processors to use - * @since 2.5.0 */ public void setPersistenceUnitPostProcessors(PersistenceUnitPostProcessor... persistenceUnitPostProcessors) { this.persistenceUnitPostProcessors = persistenceUnitPostProcessors; @@ -173,7 +169,7 @@ public class EntityManagerFactoryBuilder { * @return the builder for fluent usage * @see #managedTypes(PersistenceManagedTypes) */ - public Builder packages(String @Nullable ... packagesToScan) { + public Builder packages(String @Nullable... packagesToScan) { this.packagesToScan = packagesToScan; return this; } @@ -226,7 +222,7 @@ public class EntityManagerFactoryBuilder { * @param mappingResources the mapping resources to use * @return the builder for fluent usage */ - public Builder mappingResources(String @Nullable ... mappingResources) { + public Builder mappingResources(String @Nullable... mappingResources) { this.mappingResources = mappingResources; return this; } diff --git a/module/spring-boot-persistence/src/main/java/org/springframework/boot/persistence/autoconfigure/EntityScanner.java b/module/spring-boot-persistence/src/main/java/org/springframework/boot/persistence/autoconfigure/EntityScanner.java index a4093ee67a5..da8f7aba0e1 100644 --- a/module/spring-boot-persistence/src/main/java/org/springframework/boot/persistence/autoconfigure/EntityScanner.java +++ b/module/spring-boot-persistence/src/main/java/org/springframework/boot/persistence/autoconfigure/EntityScanner.java @@ -87,7 +87,6 @@ public class EntityScanner { * @param context the {@link ApplicationContext} to use * @return a {@link ClassPathScanningCandidateComponentProvider} suitable to scan * entities - * @since 2.4.0 */ protected ClassPathScanningCandidateComponentProvider createClassPathScanningCandidateComponentProvider( ApplicationContext context) { diff --git a/module/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/NettyReactiveWebServerFactory.java b/module/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/NettyReactiveWebServerFactory.java index d762c05b926..515263e1fcb 100644 --- a/module/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/NettyReactiveWebServerFactory.java +++ b/module/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/NettyReactiveWebServerFactory.java @@ -134,7 +134,6 @@ public class NettyReactiveWebServerFactory extends AbstractReactiveWebServerFact /** * Set if x-forward-* headers should be processed. * @param useForwardHeaders if x-forward headers should be used - * @since 4.0.0 */ public void setUseForwardHeaders(boolean useForwardHeaders) { this.useForwardHeaders = useForwardHeaders; @@ -143,7 +142,6 @@ public class NettyReactiveWebServerFactory extends AbstractReactiveWebServerFact /** * Set the {@link ReactorResourceFactory} to get the shared resources from. * @param resourceFactory the server resources - * @since 4.0.0 */ public void setResourceFactory(@Nullable ReactorResourceFactory resourceFactory) { this.resourceFactory = resourceFactory; diff --git a/module/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/SslServerCustomizer.java b/module/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/SslServerCustomizer.java index ec821c4581f..ce72e649573 100644 --- a/module/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/SslServerCustomizer.java +++ b/module/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/SslServerCustomizer.java @@ -108,7 +108,6 @@ public class SslServerCustomizer implements NettyServerCustomizer { * Create an {@link AbstractProtocolSslContextSpec} for a given {@link SslBundle}. * @param sslBundle the {@link SslBundle} to use * @return an {@link AbstractProtocolSslContextSpec} instance - * @since 4.0.0 */ protected final AbstractProtocolSslContextSpec createSslContextSpec(SslBundle sslBundle) { AbstractProtocolSslContextSpec sslContextSpec = (this.http2 != null && this.http2.isEnabled()) diff --git a/module/spring-boot-restclient/src/main/java/org/springframework/boot/restclient/RestTemplateBuilder.java b/module/spring-boot-restclient/src/main/java/org/springframework/boot/restclient/RestTemplateBuilder.java index f3afb1d9987..d39a04aa96d 100644 --- a/module/spring-boot-restclient/src/main/java/org/springframework/boot/restclient/RestTemplateBuilder.java +++ b/module/spring-boot-restclient/src/main/java/org/springframework/boot/restclient/RestTemplateBuilder.java @@ -245,7 +245,6 @@ public class RestTemplateBuilder { * previously defined interceptors. * @param interceptors the interceptors to set * @return a new builder instance - * @since 1.4.1 * @see #additionalInterceptors(ClientHttpRequestInterceptor...) */ public RestTemplateBuilder interceptors(ClientHttpRequestInterceptor... interceptors) { @@ -259,7 +258,6 @@ public class RestTemplateBuilder { * previously defined interceptors. * @param interceptors the interceptors to set * @return a new builder instance - * @since 1.4.1 * @see #additionalInterceptors(ClientHttpRequestInterceptor...) */ public RestTemplateBuilder interceptors(Collection interceptors) { @@ -275,7 +273,6 @@ public class RestTemplateBuilder { * that should be used with the {@link RestTemplate}. * @param interceptors the interceptors to add * @return a new builder instance - * @since 1.4.1 * @see #interceptors(ClientHttpRequestInterceptor...) */ public RestTemplateBuilder additionalInterceptors(ClientHttpRequestInterceptor... interceptors) { @@ -288,7 +285,6 @@ public class RestTemplateBuilder { * that should be used with the {@link RestTemplate}. * @param interceptors the interceptors to add * @return a new builder instance - * @since 1.4.1 * @see #interceptors(ClientHttpRequestInterceptor...) */ public RestTemplateBuilder additionalInterceptors(Collection interceptors) { @@ -317,7 +313,6 @@ public class RestTemplateBuilder { * each time we {@link #build()} a new {@link RestTemplate} instance. * @param requestFactorySupplier the supplier for the request factory * @return a new builder instance - * @since 2.0.0 * @see ClientHttpRequestFactoryBuilder#of(Supplier) * @see #requestFactoryBuilder(ClientHttpRequestFactoryBuilder) */ @@ -331,7 +326,6 @@ public class RestTemplateBuilder { * {@link #build()} a new {@link RestTemplate} instance. * @param requestFactoryBuilder the {@link ClientHttpRequestFactoryBuilder} to use * @return a new builder instance - * @since 3.4.0 * @see ClientHttpRequestFactoryBuilder */ public RestTemplateBuilder requestFactoryBuilder(ClientHttpRequestFactoryBuilder requestFactoryBuilder) { @@ -375,7 +369,6 @@ public class RestTemplateBuilder { * @param username the user name * @param password the password * @return a new builder instance - * @since 2.1.0 * @see #basicAuthentication(String, String, Charset) */ public RestTemplateBuilder basicAuthentication(String username, String password) { @@ -389,7 +382,6 @@ public class RestTemplateBuilder { * @param password the password * @param charset the charset to use * @return a new builder instance - * @since 2.2.0 */ public RestTemplateBuilder basicAuthentication(String username, String password, @Nullable Charset charset) { return new RestTemplateBuilder(this.clientSettings, this.detectRequestFactory, this.rootUri, @@ -404,7 +396,6 @@ public class RestTemplateBuilder { * @param name the name of the header * @param values the header values * @return a new builder instance - * @since 2.2.0 */ public RestTemplateBuilder defaultHeader(String name, String... values) { Assert.notNull(name, "'name' must not be null"); @@ -421,7 +412,6 @@ public class RestTemplateBuilder { * readTimeout} and {@link #sslBundle(SslBundle) sslBundle} values. * @param clientSettings the client settings * @return a new builder instance - * @since 4.0.0 */ public RestTemplateBuilder clientSettings(HttpClientSettings clientSettings) { Assert.notNull(clientSettings, "'clientSettings' must not be null"); @@ -435,7 +425,6 @@ public class RestTemplateBuilder { * @param clientSettingsCustomizer a {@link UnaryOperator} to update client factory * settings * @return a new builder instance - * @since 4.0.0 */ public RestTemplateBuilder clientSettings(UnaryOperator clientSettingsCustomizer) { Assert.notNull(clientSettingsCustomizer, "'clientSettingsCustomizer' must not be null"); @@ -449,7 +438,6 @@ public class RestTemplateBuilder { * Sets the connection timeout on the underlying {@link ClientHttpRequestFactory}. * @param connectTimeout the connection timeout * @return a new builder instance. - * @since 3.4.0 */ public RestTemplateBuilder connectTimeout(Duration connectTimeout) { return new RestTemplateBuilder(this.clientSettings.withConnectTimeout(connectTimeout), @@ -462,7 +450,6 @@ public class RestTemplateBuilder { * Sets the read timeout on the underlying {@link ClientHttpRequestFactory}. * @param readTimeout the read timeout * @return a new builder instance. - * @since 3.4.0 */ public RestTemplateBuilder readTimeout(Duration readTimeout) { return new RestTemplateBuilder(this.clientSettings.withReadTimeout(readTimeout), this.detectRequestFactory, @@ -475,7 +462,6 @@ public class RestTemplateBuilder { * Sets the redirect strategy on the underlying {@link ClientHttpRequestFactory}. * @param redirects the redirect strategy * @return a new builder instance. - * @since 4.0.0 */ public RestTemplateBuilder redirects(HttpRedirects redirects) { return new RestTemplateBuilder(this.clientSettings.withRedirects(redirects), this.detectRequestFactory, @@ -488,7 +474,6 @@ public class RestTemplateBuilder { * Sets the SSL bundle on the underlying {@link ClientHttpRequestFactory}. * @param sslBundle the SSL bundle * @return a new builder instance - * @since 3.4.0 */ public RestTemplateBuilder sslBundle(SslBundle sslBundle) { return new RestTemplateBuilder(this.clientSettings.withSslBundle(sslBundle), this.detectRequestFactory, @@ -564,7 +549,6 @@ public class RestTemplateBuilder { * configured request customizers. * @param requestCustomizers the request customizers to set * @return a new builder instance - * @since 2.2.0 * @see #additionalRequestCustomizers(RestTemplateRequestCustomizer...) */ public RestTemplateBuilder requestCustomizers(RestTemplateRequestCustomizer... requestCustomizers) { @@ -579,7 +563,6 @@ public class RestTemplateBuilder { * configured request customizers. * @param requestCustomizers the request customizers to set * @return a new builder instance - * @since 2.2.0 * @see #additionalRequestCustomizers(RestTemplateRequestCustomizer...) */ public RestTemplateBuilder requestCustomizers( @@ -597,7 +580,6 @@ public class RestTemplateBuilder { * order that they were added. * @param requestCustomizers the request customizers to add * @return a new builder instance - * @since 2.2.0 * @see #requestCustomizers(RestTemplateRequestCustomizer...) */ public RestTemplateBuilder additionalRequestCustomizers(RestTemplateRequestCustomizer... requestCustomizers) { @@ -611,7 +593,6 @@ public class RestTemplateBuilder { * order that they were added. * @param requestCustomizers the request customizers to add * @return a new builder instance - * @since 2.2.0 * @see #requestCustomizers(Collection) */ public RestTemplateBuilder additionalRequestCustomizers( @@ -685,7 +666,6 @@ public class RestTemplateBuilder { * Build a new {@link ClientHttpRequestFactory} instance using the settings of this * builder. * @return a {@link ClientHttpRequestFactory} or {@code null} - * @since 2.2.0 */ public @Nullable ClientHttpRequestFactory buildRequestFactory() { ClientHttpRequestFactoryBuilder requestFactoryBuilder = requestFactoryBuilder(); @@ -696,7 +676,6 @@ public class RestTemplateBuilder { * Return a {@link ClientHttpRequestFactoryBuilder} instance using the settings of * this builder. * @return a {@link ClientHttpRequestFactoryBuilder} or {@code null} - * @since 3.5.0 */ public @Nullable ClientHttpRequestFactoryBuilder requestFactoryBuilder() { if (this.requestFactoryBuilder != null) { diff --git a/module/spring-boot-resttestclient/src/main/java/org/springframework/boot/resttestclient/TestRestTemplate.java b/module/spring-boot-resttestclient/src/main/java/org/springframework/boot/resttestclient/TestRestTemplate.java index 0703b531a34..1a34b268469 100644 --- a/module/spring-boot-resttestclient/src/main/java/org/springframework/boot/resttestclient/TestRestTemplate.java +++ b/module/spring-boot-resttestclient/src/main/java/org/springframework/boot/resttestclient/TestRestTemplate.java @@ -981,7 +981,6 @@ public class TestRestTemplate { * type (when possible). * @param clientSettings the new client settings * @return the new template - * @since 4.0.0 */ public TestRestTemplate withClientSettings(HttpClientSettings clientSettings) { return new TestRestTemplate(this.builder.clientSettings(clientSettings), @@ -995,7 +994,6 @@ public class TestRestTemplate { * type (when possible). * @param clientSettingsCustomizer a {@link UnaryOperator} to update the settings * @return the new template - * @since 4.0.0 */ public TestRestTemplate withClientSettings(UnaryOperator clientSettingsCustomizer) { return new TestRestTemplate(this.builder.clientSettings(clientSettingsCustomizer), diff --git a/module/spring-boot-rsocket-test/src/main/java/org/springframework/boot/test/rsocket/server/LocalRSocketServerPort.java b/module/spring-boot-rsocket-test/src/main/java/org/springframework/boot/test/rsocket/server/LocalRSocketServerPort.java index 0456edd9a6c..0d79a4d27ea 100644 --- a/module/spring-boot-rsocket-test/src/main/java/org/springframework/boot/test/rsocket/server/LocalRSocketServerPort.java +++ b/module/spring-boot-rsocket-test/src/main/java/org/springframework/boot/test/rsocket/server/LocalRSocketServerPort.java @@ -31,7 +31,7 @@ import org.springframework.beans.factory.annotation.Value; * * @author Verónica Vásquez * @author Eddú Meléndez - * @since 2.7.0 + * @since 4.0.0 */ @Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE }) @Retention(RetentionPolicy.RUNTIME) diff --git a/module/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/actuate/web/servlet/EndpointRequest.java b/module/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/actuate/web/servlet/EndpointRequest.java index 7249f4903ac..85ee64bef24 100644 --- a/module/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/actuate/web/servlet/EndpointRequest.java +++ b/module/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/actuate/web/servlet/EndpointRequest.java @@ -58,7 +58,7 @@ import org.springframework.web.context.WebApplicationContext; * @author Madhura Bhave * @author Phillip Webb * @author Chris Bono - * @since 2.0.0 + * @since 4.0.0 */ public final class EndpointRequest { @@ -130,7 +130,6 @@ public final class EndpointRequest { * @param webServerNamespace the web server namespace * @param endpoints the endpoints to include * @return the configured {@link RequestMatcher} - * @since 3.4.0 */ public static AdditionalPathsEndpointRequestMatcher toAdditionalPaths(WebServerNamespace webServerNamespace, Class... endpoints) { @@ -146,7 +145,6 @@ public final class EndpointRequest { * @param webServerNamespace the web server namespace * @param endpoints the endpoints to include * @return the configured {@link RequestMatcher} - * @since 3.4.0 */ public static AdditionalPathsEndpointRequestMatcher toAdditionalPaths(WebServerNamespace webServerNamespace, String... endpoints) { @@ -326,7 +324,6 @@ public final class EndpointRequest { * @param httpMethod the HTTP method to include * @return a copy of the matcher further restricted to only match requests with * the specified HTTP method - * @since 3.5.0 */ public EndpointRequestMatcher withHttpMethod(HttpMethod httpMethod) { return new EndpointRequestMatcher(this.includes, this.excludes, this.includeLinks, httpMethod); @@ -430,7 +427,6 @@ public final class EndpointRequest { * @param httpMethod the HTTP method to include * @return a copy of the matcher further restricted to only match requests with * the specified HTTP method - * @since 3.5.0 */ public AdditionalPathsEndpointRequestMatcher withHttpMethod(HttpMethod httpMethod) { return new AdditionalPathsEndpointRequestMatcher(this.webServerNamespace, this.endpoints, httpMethod); diff --git a/module/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/ConfigurableTomcatWebServerFactory.java b/module/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/ConfigurableTomcatWebServerFactory.java index 5395eee1787..a4b53c5e1d8 100644 --- a/module/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/ConfigurableTomcatWebServerFactory.java +++ b/module/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/ConfigurableTomcatWebServerFactory.java @@ -75,7 +75,6 @@ public interface ConfigurableTomcatWebServerFactory extends ConfigurableWebServe * Add {@link TomcatProtocolHandlerCustomizer}s that should be added to the Tomcat * {@link Connector}. * @param tomcatProtocolHandlerCustomizers the customizers to add - * @since 4.0.0 */ void addProtocolHandlerCustomizers(TomcatProtocolHandlerCustomizer... tomcatProtocolHandlerCustomizers); diff --git a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/autoconfigure/ServerProperties.java b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/autoconfigure/ServerProperties.java index bc67f8463c2..e708fd9abe1 100644 --- a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/autoconfigure/ServerProperties.java +++ b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/autoconfigure/ServerProperties.java @@ -68,7 +68,7 @@ import org.springframework.util.unit.DataSize; * @author Florian Storz * @author Michael Weidmann * @author Lasse Wulff - * @since 1.0.0 + * @since 4.0.0 */ @ConfigurationProperties("server") public class ServerProperties { diff --git a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/ConfigurableWebServerApplicationContext.java b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/ConfigurableWebServerApplicationContext.java index 26e00b71a6a..688d717d9b7 100644 --- a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/ConfigurableWebServerApplicationContext.java +++ b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/ConfigurableWebServerApplicationContext.java @@ -26,7 +26,7 @@ import org.springframework.context.ConfigurableApplicationContext; * addition to the methods in the {WebServerApplicationContext} interface. * * @author Phillip Webb - * @since 2.0.0 + * @since 4.0.0 */ public interface ConfigurableWebServerApplicationContext extends ConfigurableApplicationContext, WebServerApplicationContext { diff --git a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/MissingWebServerFactoryBeanException.java b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/MissingWebServerFactoryBeanException.java index f8588b701fb..603a96a4ab1 100644 --- a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/MissingWebServerFactoryBeanException.java +++ b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/MissingWebServerFactoryBeanException.java @@ -26,7 +26,7 @@ import org.springframework.boot.web.server.WebServerFactory; * * @author Guirong Hu * @author Andy Wilkinson - * @since 2.7.0 + * @since 4.0.0 */ public class MissingWebServerFactoryBeanException extends NoSuchBeanDefinitionException { diff --git a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/ServerPortInfoApplicationContextInitializer.java b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/ServerPortInfoApplicationContextInitializer.java index cb5eeec61e4..60b80967c35 100644 --- a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/ServerPortInfoApplicationContextInitializer.java +++ b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/ServerPortInfoApplicationContextInitializer.java @@ -47,7 +47,7 @@ import org.springframework.util.StringUtils; * * @author Dave Syer * @author Phillip Webb - * @since 2.0.0 + * @since 4.0.0 */ public class ServerPortInfoApplicationContextInitializer implements ApplicationContextInitializer, ApplicationListener { diff --git a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/WebServerApplicationContext.java b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/WebServerApplicationContext.java index 45943f8dcae..577c2030488 100644 --- a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/WebServerApplicationContext.java +++ b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/WebServerApplicationContext.java @@ -28,7 +28,7 @@ import org.springframework.util.ObjectUtils; * create and manage the lifecycle of an embedded {@link WebServer}. * * @author Phillip Webb - * @since 2.0.0 + * @since 4.0.0 */ public interface WebServerApplicationContext extends ApplicationContext { @@ -42,7 +42,6 @@ public interface WebServerApplicationContext extends ApplicationContext { /** * {@link SmartLifecycle#getPhase() SmartLifecycle phase} in which starting and * stopping of the web server is performed. - * @since 4.0.0 */ int START_STOP_LIFECYCLE_PHASE = GRACEFUL_SHUTDOWN_PHASE - 1024; @@ -51,7 +50,8 @@ public interface WebServerApplicationContext extends ApplicationContext { * the server has not yet been created. * @return the web server */ - @Nullable WebServer getWebServer(); + @Nullable + WebServer getWebServer(); /** * Returns the namespace of the web server application context or {@code null} if no @@ -60,7 +60,8 @@ public interface WebServerApplicationContext extends ApplicationContext { * different port). * @return the server namespace */ - @Nullable String getServerNamespace(); + @Nullable + String getServerNamespace(); /** * Returns {@code true} if the specified context is a @@ -68,7 +69,6 @@ public interface WebServerApplicationContext extends ApplicationContext { * @param context the context to check * @param serverNamespace the server namespace to match against * @return {@code true} if the server namespace of the context matches - * @since 2.1.8 */ static boolean hasServerNamespace(@Nullable ApplicationContext context, String serverNamespace) { return (context instanceof WebServerApplicationContext webServerApplicationContext) @@ -81,7 +81,6 @@ public interface WebServerApplicationContext extends ApplicationContext { * @param context the context * @return the server namespace or {@code null} if the context is not a * {@link WebServerApplicationContext} - * @since 2.6.0 */ static @Nullable String getServerNamespace(@Nullable ApplicationContext context) { return (context instanceof WebServerApplicationContext configurableContext) diff --git a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/WebServerGracefulShutdownLifecycle.java b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/WebServerGracefulShutdownLifecycle.java index 682c329c541..5b7fe4ccc3c 100644 --- a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/WebServerGracefulShutdownLifecycle.java +++ b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/WebServerGracefulShutdownLifecycle.java @@ -23,7 +23,7 @@ import org.springframework.context.SmartLifecycle; * {@link SmartLifecycle} to trigger {@link WebServer} graceful shutdown. * * @author Andy Wilkinson - * @since 2.5.0 + * @since 4.0.0 */ public final class WebServerGracefulShutdownLifecycle implements SmartLifecycle { diff --git a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/WebServerInitializedEvent.java b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/WebServerInitializedEvent.java index 1b1fc8708f1..5358b0ddb7f 100644 --- a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/WebServerInitializedEvent.java +++ b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/WebServerInitializedEvent.java @@ -25,7 +25,7 @@ import org.springframework.context.ApplicationEvent; * * @author Brian Clozel * @author Stephane Nicoll - * @since 2.0.0 + * @since 4.0.0 */ @SuppressWarnings("serial") public abstract class WebServerInitializedEvent extends ApplicationEvent { diff --git a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/WebServerPortFileWriter.java b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/WebServerPortFileWriter.java index d88140663fd..3f8a133e6c0 100644 --- a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/WebServerPortFileWriter.java +++ b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/WebServerPortFileWriter.java @@ -40,7 +40,7 @@ import org.springframework.util.StringUtils; * @author David Liu * @author Phillip Webb * @author Andy Wilkinson - * @since 2.0.0 + * @since 4.0.0 */ public class WebServerPortFileWriter implements ApplicationListener { diff --git a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/reactive/context/AnnotationConfigReactiveWebServerApplicationContext.java b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/reactive/context/AnnotationConfigReactiveWebServerApplicationContext.java index 82ad5f7d099..e60ef7b43b7 100644 --- a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/reactive/context/AnnotationConfigReactiveWebServerApplicationContext.java +++ b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/reactive/context/AnnotationConfigReactiveWebServerApplicationContext.java @@ -52,7 +52,7 @@ import org.springframework.util.ObjectUtils; * to deliberately override certain bean definitions through an extra Configuration class. * * @author Phillip Webb - * @since 2.0.0 + * @since 4.0.0 * @see #register(Class...) * @see #scan(String...) * @see ReactiveWebServerApplicationContext diff --git a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/reactive/context/ReactiveWebServerApplicationContext.java b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/reactive/context/ReactiveWebServerApplicationContext.java index 096387ff93a..6994665c25b 100644 --- a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/reactive/context/ReactiveWebServerApplicationContext.java +++ b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/reactive/context/ReactiveWebServerApplicationContext.java @@ -39,7 +39,7 @@ import org.springframework.util.StringUtils; * from a contained {@link ReactiveWebServerFactory} bean. * * @author Brian Clozel - * @since 2.0.0 + * @since 4.0.0 */ public class ReactiveWebServerApplicationContext extends GenericReactiveWebApplicationContext implements ConfigurableWebServerApplicationContext { diff --git a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/reactive/context/ReactiveWebServerInitializedEvent.java b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/reactive/context/ReactiveWebServerInitializedEvent.java index 75a013a9a7d..809790d900b 100644 --- a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/reactive/context/ReactiveWebServerInitializedEvent.java +++ b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/reactive/context/ReactiveWebServerInitializedEvent.java @@ -25,7 +25,7 @@ import org.springframework.boot.web.server.context.WebServerInitializedEvent; * * @author Brian Clozel * @author Stephane Nicoll - * @since 2.0.0 + * @since 4.0.0 */ public class ReactiveWebServerInitializedEvent extends WebServerInitializedEvent { diff --git a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/ConfigurableServletWebServerFactory.java b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/ConfigurableServletWebServerFactory.java index 3cf9142f711..5a8f9daa8f0 100644 --- a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/ConfigurableServletWebServerFactory.java +++ b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/ConfigurableServletWebServerFactory.java @@ -69,7 +69,6 @@ public interface ConfigurableServletWebServerFactory /** * Sets the display name of the application deployed in the web server. * @param displayName the displayName to set - * @since 4.0.0 */ default void setDisplayName(String displayName) { getSettings().setDisplayName(displayName); @@ -105,7 +104,6 @@ public interface ConfigurableServletWebServerFactory /** * Adds mime-type mappings. * @param mimeMappings the mime type mappings to add - * @since 4.0.0 */ default void addMimeMappings(MimeMappings mimeMappings) { getSettings().addMimeMappings(mimeMappings); diff --git a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/WebListenerRegistrar.java b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/WebListenerRegistrar.java index 5a799ec2939..b2719c7580d 100644 --- a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/WebListenerRegistrar.java +++ b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/WebListenerRegistrar.java @@ -22,7 +22,7 @@ import jakarta.servlet.annotation.WebListener; * Interface to be implemented by types that register {@link WebListener @WebListeners}. * * @author Andy Wilkinson - * @since 2.4.0 + * @since 4.0.0 */ public interface WebListenerRegistrar { diff --git a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/context/AnnotationConfigServletWebServerApplicationContext.java b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/context/AnnotationConfigServletWebServerApplicationContext.java index 7c3969e62f6..0a93b4e498c 100644 --- a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/context/AnnotationConfigServletWebServerApplicationContext.java +++ b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/context/AnnotationConfigServletWebServerApplicationContext.java @@ -49,7 +49,7 @@ import org.springframework.util.ClassUtils; * to deliberately override certain bean definitions through an extra Configuration class. * * @author Phillip Webb - * @since 1.0.0 + * @since 4.0.0 * @see #register(Class...) * @see #scan(String...) * @see ServletWebServerApplicationContext diff --git a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/context/ServletComponentScan.java b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/context/ServletComponentScan.java index 42a4d234625..215bf241952 100644 --- a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/context/ServletComponentScan.java +++ b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/context/ServletComponentScan.java @@ -39,7 +39,7 @@ import org.springframework.core.annotation.AliasFor; * absence, scanning will be performed from the package of the class with the annotation. * * @author Andy Wilkinson - * @since 1.3.0 + * @since 4.0.0 * @see WebServlet * @see WebFilter * @see WebListener diff --git a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/context/ServletWebServerApplicationContext.java b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/context/ServletWebServerApplicationContext.java index ddda5023638..077b6402d9b 100644 --- a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/context/ServletWebServerApplicationContext.java +++ b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/context/ServletWebServerApplicationContext.java @@ -87,7 +87,7 @@ import org.springframework.web.context.support.WebApplicationContextUtils; * @author Phillip Webb * @author Dave Syer * @author Scott Frederick - * @since 2.0.0 + * @since 4.0.0 * @see AnnotationConfigServletWebServerApplicationContext * @see XmlServletWebServerApplicationContext * @see ServletWebServerFactory diff --git a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/context/ServletWebServerInitializedEvent.java b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/context/ServletWebServerInitializedEvent.java index d757bbe0812..8e3f980a007 100644 --- a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/context/ServletWebServerInitializedEvent.java +++ b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/context/ServletWebServerInitializedEvent.java @@ -28,7 +28,7 @@ import org.springframework.boot.web.server.context.WebServerInitializedEvent; * stop and start it if they want to. * * @author Dave Syer - * @since 2.0.0 + * @since 4.0.0 */ @SuppressWarnings("serial") public class ServletWebServerInitializedEvent extends WebServerInitializedEvent { diff --git a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/context/WebApplicationContextServletContextAwareProcessor.java b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/context/WebApplicationContextServletContextAwareProcessor.java index 22949175b9a..0e317a20c39 100644 --- a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/context/WebApplicationContextServletContextAwareProcessor.java +++ b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/context/WebApplicationContextServletContextAwareProcessor.java @@ -31,7 +31,7 @@ import org.springframework.web.context.support.ServletContextAwareProcessor; * initialized. * * @author Phillip Webb - * @since 1.0.0 + * @since 4.0.0 */ public class WebApplicationContextServletContextAwareProcessor extends ServletContextAwareProcessor { diff --git a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/context/XmlServletWebServerApplicationContext.java b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/context/XmlServletWebServerApplicationContext.java index 1d29dae5791..385204b12a6 100644 --- a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/context/XmlServletWebServerApplicationContext.java +++ b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/context/XmlServletWebServerApplicationContext.java @@ -32,7 +32,7 @@ import org.springframework.web.context.support.XmlWebApplicationContext; * bean definitions through an extra XML file. * * @author Phillip Webb - * @since 1.0.0 + * @since 4.0.0 * @see #setNamespace * @see #setConfigLocations * @see ServletWebServerApplicationContext diff --git a/module/spring-boot-webclient/src/main/java/org/springframework/boot/webclient/WebClientCustomizer.java b/module/spring-boot-webclient/src/main/java/org/springframework/boot/webclient/WebClientCustomizer.java index 6bf7adb0697..bda187bc6c2 100644 --- a/module/spring-boot-webclient/src/main/java/org/springframework/boot/webclient/WebClientCustomizer.java +++ b/module/spring-boot-webclient/src/main/java/org/springframework/boot/webclient/WebClientCustomizer.java @@ -24,7 +24,7 @@ import org.springframework.web.reactive.function.client.WebClient; * WebClient.Builder}. * * @author Brian Clozel - * @since 2.0.0 + * @since 4.0.0 */ @FunctionalInterface public interface WebClientCustomizer { diff --git a/module/spring-boot-webflux-test/src/main/java/org/springframework/boot/webflux/test/autoconfigure/WebFluxTest.java b/module/spring-boot-webflux-test/src/main/java/org/springframework/boot/webflux/test/autoconfigure/WebFluxTest.java index 95303628468..6762e02f816 100644 --- a/module/spring-boot-webflux-test/src/main/java/org/springframework/boot/webflux/test/autoconfigure/WebFluxTest.java +++ b/module/spring-boot-webflux-test/src/main/java/org/springframework/boot/webflux/test/autoconfigure/WebFluxTest.java @@ -104,7 +104,6 @@ public @interface WebFluxTest { * Properties in form {@literal key=value} that should be added to the Spring * {@link Environment} before the test runs. * @return the properties to add - * @since 2.1.0 */ String[] properties() default {}; diff --git a/module/spring-boot-webmvc-test/src/main/java/org/springframework/boot/webmvc/test/autoconfigure/WebMvcTest.java b/module/spring-boot-webmvc-test/src/main/java/org/springframework/boot/webmvc/test/autoconfigure/WebMvcTest.java index a9a56406d43..8eef6d4b717 100644 --- a/module/spring-boot-webmvc-test/src/main/java/org/springframework/boot/webmvc/test/autoconfigure/WebMvcTest.java +++ b/module/spring-boot-webmvc-test/src/main/java/org/springframework/boot/webmvc/test/autoconfigure/WebMvcTest.java @@ -109,7 +109,6 @@ public @interface WebMvcTest { * Properties in form {@literal key=value} that should be added to the Spring * {@link Environment} before the test runs. * @return the properties to add - * @since 2.1.0 */ String[] properties() default {}; diff --git a/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/server/AutoConfigureMockWebServiceClient.java b/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/server/AutoConfigureMockWebServiceClient.java index ee505c354ca..5aeab4b053a 100644 --- a/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/server/AutoConfigureMockWebServiceClient.java +++ b/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/server/AutoConfigureMockWebServiceClient.java @@ -31,7 +31,7 @@ import org.springframework.ws.test.server.MockWebServiceClient; * {@link MockWebServiceClient}. * * @author Daniil Razorenov - * @since 2.6.0 + * @since 4.0.0 */ @Target({ ElementType.TYPE, ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/server/AutoConfigureWebServiceServer.java b/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/server/AutoConfigureWebServiceServer.java index 2616fcdec19..60b7d5b1183 100644 --- a/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/server/AutoConfigureWebServiceServer.java +++ b/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/server/AutoConfigureWebServiceServer.java @@ -30,7 +30,7 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration; * auto-configuration of web service servers endpoints. * * @author Daniil Razorenov - * @since 2.6.0 + * @since 4.0.0 */ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) diff --git a/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/server/MockWebServiceClientAutoConfiguration.java b/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/server/MockWebServiceClientAutoConfiguration.java index 525209c2709..41fd402ecf9 100644 --- a/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/server/MockWebServiceClientAutoConfiguration.java +++ b/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/server/MockWebServiceClientAutoConfiguration.java @@ -26,7 +26,7 @@ import org.springframework.ws.test.server.MockWebServiceClient; * Auto-configuration for {@link MockWebServiceClient} support. * * @author Daniil Razorenov - * @since 2.6.0 + * @since 4.0.0 * @see AutoConfigureMockWebServiceClient */ @AutoConfiguration diff --git a/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/server/WebServiceServerTest.java b/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/server/WebServiceServerTest.java index 1483d51dc20..c617b21bd2a 100644 --- a/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/server/WebServiceServerTest.java +++ b/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/server/WebServiceServerTest.java @@ -62,7 +62,7 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; * rather than this annotation. * * @author Daniil Razorenov - * @since 2.6.0 + * @since 4.0.0 * @see AutoConfigureMockWebServiceClient * @see AutoConfigureWebServiceServer */