Merge branch '6.2.x'

# Conflicts:
#	spring-context-indexer/src/main/java/org/springframework/context/index/processor/StandardStereotypesProvider.java
#	spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java
#	spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java

Author: jhoeller

spring-aop/src/test/java/org/springframework/aop/interceptor/AsyncExecutionInterceptorTests.java

@@ -37,7 +37,6 @@
  * Tests for {@link AsyncExecutionInterceptor}.
  *
  * @author Bao Ngo
- * @since 7.0
  */
 class AsyncExecutionInterceptorTests {
 
@@ -62,11 +61,13 @@ interface GenericRunner<O> {
 		O run();
 	}
 
+
 	static class FutureRunner implements GenericRunner<Future<Void>> {
+
 		@Override
 		public Future<Void> run() {
-			return CompletableFuture.runAsync(() -> {
-			});
+			return CompletableFuture.runAsync(() -> {});
 		}
 	}
+
 }

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,
 

spring-context/src/main/java/org/springframework/context/aot/AotApplicationContextInitializer.java

@@ -63,13 +63,13 @@ static <C extends ConfigurableApplicationContext> AotApplicationContextInitializ
 
 	private static <C extends ConfigurableApplicationContext> 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);
 		}
 	}
 

spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/MySQLTableMetaDataProvider.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2002-present 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.jdbc.core.metadata;
+
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
+
+/**
+ * The MySQL/MariaDB specific implementation of {@link TableMetaDataProvider}.
+ * Sets {@link #setGeneratedKeysColumnNameArraySupported} to {@code false}.
+ *
+ * @author Juergen Hoeller
+ * @since 6.2.12
+ */
+public class MySQLTableMetaDataProvider extends GenericTableMetaDataProvider {
+
+	public MySQLTableMetaDataProvider(DatabaseMetaData databaseMetaData) throws SQLException {
+		super(databaseMetaData);
+		setGeneratedKeysColumnNameArraySupported(false);
+	}
+
+}

spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java

@@ -409,8 +409,7 @@ public boolean isGetGeneratedKeysSimulated() {
 	}
 
 	/**
-	 * 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() {

spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProvider.java

@@ -129,16 +129,14 @@ void initializeWithTableColumnMetaData(DatabaseMetaData databaseMetaData, @Nulla
 	@Nullable 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.
-	 * <p>This method returns a space ({@code " "}) if identifier quoting is not
-	 * supported.
+	 * <p>This method returns a space ({@code " "}) if identifier quoting is not supported.
 	 * @return database identifier quote string
 	 * @since 6.1
 	 * @see DatabaseMetaData#getIdentifierQuoteString()

spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProviderFactory.java

@@ -66,6 +66,9 @@ else if ("Apache Derby".equals(databaseProductName)) {
 				else if ("HSQL Database Engine".equals(databaseProductName)) {
 					provider = new HsqlTableMetaDataProvider(databaseMetaData);
 				}
+				else if ("MySQL".equals(databaseProductName) || "MariaDB".equals(databaseProductName)) {
+					provider = new MySQLTableMetaDataProvider(databaseMetaData);
+				}
 				else {
 					provider = new GenericTableMetaDataProvider(databaseMetaData);
 				}

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityReturnValueHandler.java

@@ -39,7 +39,7 @@
  * provide enough information to decide via {@link #supportsReturnType}.
  *
  * @author Rossen Stoyanchev
- * @since 7.0
+ * @since 6.2.9
  */
 public class ResponseEntityReturnValueHandler implements HandlerMethodReturnValueHandler {