Merge branch '2.2.x' into 2.3.x

See gh-23183

Author: snicoll

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java

@@ -16,6 +16,7 @@
 
 package org.springframework.boot.autoconfigure.flyway;
 
+import java.sql.DatabaseMetaData;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -398,7 +399,7 @@ private List<String> replaceVendorLocations(List<String> locations, DatabaseDriv
 
 		private DatabaseDriver getDatabaseDriver() {
 			try {
-				String url = JdbcUtils.extractDatabaseMetaData(this.dataSource, "getURL");
+				String url = JdbcUtils.extractDatabaseMetaData(this.dataSource, DatabaseMetaData::getURL);
 				return DatabaseDriver.fromJdbcUrl(url);
 			}
 			catch (MetaDataAccessException ex) {

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/SqlDialectLookup.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -16,6 +16,8 @@
 
 package org.springframework.boot.autoconfigure.jooq;
 
+import java.sql.DatabaseMetaData;
+
 import javax.sql.DataSource;
 
 import org.apache.commons.logging.Log;
@@ -49,7 +51,7 @@ static SQLDialect getDialect(DataSource dataSource) {
 			return SQLDialect.DEFAULT;
 		}
 		try {
-			String url = JdbcUtils.extractDatabaseMetaData(dataSource, "getURL");
+			String url = JdbcUtils.extractDatabaseMetaData(dataSource, DatabaseMetaData::getURL);
 			SQLDialect sqlDialect = JDBCUtils.dialect(url);
 			if (sqlDialect != null) {
 				return sqlDialect;

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookup.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -16,6 +16,7 @@
 
 package org.springframework.boot.autoconfigure.orm.jpa;
 
+import java.sql.DatabaseMetaData;
 import java.util.Collections;
 import java.util.EnumMap;
 import java.util.Map;
@@ -70,7 +71,7 @@ static Database getDatabase(DataSource dataSource) {
 			return Database.DEFAULT;
 		}
 		try {
-			String url = JdbcUtils.extractDatabaseMetaData(dataSource, "getURL");
+			String url = JdbcUtils.extractDatabaseMetaData(dataSource, DatabaseMetaData::getURL);
 			DatabaseDriver driver = DatabaseDriver.fromJdbcUrl(url);
 			Database database = LOOKUP.get(driver);
 			if (database != null) {

spring-boot-project/spring-boot-dependencies/build.gradle

@@ -1665,7 +1665,7 @@ bom {
 			]
 		}
 	}
-	library("Spring Framework", "5.2.8.RELEASE") {
+	library("Spring Framework", "5.2.9.BUILD-SNAPSHOT") {
 		group("org.springframework") {
 			imports = [
 				"spring-framework-bom"

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/AbstractDataSourceInitializer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -16,6 +16,8 @@
 
 package org.springframework.boot.jdbc;
 
+import java.sql.DatabaseMetaData;
+
 import javax.annotation.PostConstruct;
 import javax.sql.DataSource;
 
@@ -87,7 +89,7 @@ protected void customize(ResourceDatabasePopulator populator) {
 	protected String getDatabaseName() {
 		try {
 			String productName = JdbcUtils.commonDatabaseName(
-					JdbcUtils.extractDatabaseMetaData(this.dataSource, "getDatabaseProductName").toString());
+					JdbcUtils.extractDatabaseMetaData(this.dataSource, DatabaseMetaData::getDatabaseProductName));
 			DatabaseDriver databaseDriver = DatabaseDriver.fromProductName(productName);
 			if (databaseDriver == DatabaseDriver.UNKNOWN) {
 				throw new IllegalStateException("Unable to detect database type");