diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/AsyncExecutionInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/AsyncExecutionInterceptorTests.java index 70b34728277..ec751f46e33 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/AsyncExecutionInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/AsyncExecutionInterceptorTests.java @@ -37,7 +37,6 @@ import static org.mockito.Mockito.verify; * Tests for {@link AsyncExecutionInterceptor}. * * @author Bao Ngo - * @since 7.0 */ class AsyncExecutionInterceptorTests { @@ -62,11 +61,13 @@ class AsyncExecutionInterceptorTests { O run(); } + static class FutureRunner implements GenericRunner> { + @Override public Future run() { - return CompletableFuture.runAsync(() -> { - }); + return CompletableFuture.runAsync(() -> {}); } } + } diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AdviceMode.java b/spring-context/src/main/java/org/springframework/context/annotation/AdviceMode.java index 2f33ebe3af2..ac06381da6a 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/AdviceMode.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/AdviceMode.java @@ -17,19 +17,18 @@ package org.springframework.context.annotation; /** - * Enumeration used to determine whether JDK proxy-based or + * Enumeration used to determine whether JDK/CGLIB proxy-based or * AspectJ weaving-based advice should be applied. * * @author Chris Beams * @since 3.1 - * @see org.springframework.scheduling.annotation.EnableAsync#mode() * @see org.springframework.scheduling.annotation.AsyncConfigurationSelector#selectImports - * @see org.springframework.transaction.annotation.EnableTransactionManagement#mode() + * @see org.springframework.scheduling.annotation.EnableAsync#mode() */ public enum AdviceMode { /** - * JDK proxy-based advice. + * JDK/CGLIB proxy-based advice. */ PROXY, diff --git a/spring-context/src/main/java/org/springframework/context/aot/AotApplicationContextInitializer.java b/spring-context/src/main/java/org/springframework/context/aot/AotApplicationContextInitializer.java index 3c98c3d9b95..f4348640af1 100644 --- a/spring-context/src/main/java/org/springframework/context/aot/AotApplicationContextInitializer.java +++ b/spring-context/src/main/java/org/springframework/context/aot/AotApplicationContextInitializer.java @@ -63,13 +63,13 @@ public interface AotApplicationContextInitializer void initialize( C applicationContext, String... initializerClassNames) { + Log logger = LogFactory.getLog(AotApplicationContextInitializer.class); ClassLoader classLoader = applicationContext.getClassLoader(); logger.debug("Initializing ApplicationContext with AOT"); for (String initializerClassName : initializerClassNames) { logger.trace(LogMessage.format("Applying %s", initializerClassName)); - instantiateInitializer(initializerClassName, classLoader) - .initialize(applicationContext); + instantiateInitializer(initializerClassName, classLoader).initialize(applicationContext); } } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java index e6ab016f6d9..40ff8fd4764 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java @@ -417,8 +417,7 @@ public class TableMetaDataContext { } /** - * Does this database support a column name String array for retrieving generated - * keys? + * Does this database support a column name String array for retrieving generated keys? * @see java.sql.Connection#createStruct(String, Object[]) */ public boolean isGeneratedKeysColumnNameArraySupported() { diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProvider.java index 12985758325..6b991a1c458 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProvider.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProvider.java @@ -136,16 +136,14 @@ public interface TableMetaDataProvider { String getSimpleQueryForGetGeneratedKey(String tableName, String keyColumnName); /** - * Does this database support a column name String array for retrieving generated - * keys? + * Does this database support a column name String array for retrieving generated keys? * @see java.sql.Connection#createStruct(String, Object[]) */ boolean isGeneratedKeysColumnNameArraySupported(); /** * Get the string used to quote SQL identifiers. - *

This method returns a space ({@code " "}) if identifier quoting is not - * supported. + *

This method returns a space ({@code " "}) if identifier quoting is not supported. * @return database identifier quote string * @since 6.1 * @see DatabaseMetaData#getIdentifierQuoteString() diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityReturnValueHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityReturnValueHandler.java index 1409a79819d..bc6e4b56baf 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityReturnValueHandler.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityReturnValueHandler.java @@ -38,7 +38,7 @@ import org.springframework.web.method.support.ModelAndViewContainer; * provide enough information to decide via {@link #supportsReturnType}. * * @author Rossen Stoyanchev - * @since 7.0 + * @since 6.2.9 */ public class ResponseEntityReturnValueHandler implements HandlerMethodReturnValueHandler {