diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java index 3d77f5175a..ba4897d970 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java +++ b/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; @@ -385,7 +386,7 @@ public class FlywayAutoConfiguration { 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) { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/SqlDialectLookup.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/SqlDialectLookup.java index 5c03f0bde9..d3c81f88fe 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/SqlDialectLookup.java +++ b/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 @@ final class SqlDialectLookup { 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; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookup.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookup.java index 6cc0743eea..4efbafe263 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookup.java +++ b/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 @@ final class DatabaseLookup { 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) { diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 3eb6771d2c..632b9901cf 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -191,7 +191,7 @@ 4.2.4.RELEASE 2.0.7.RELEASE Moore-SR9 - 5.2.8.RELEASE + 5.2.9.BUILD-SNAPSHOT 1.0.5.RELEASE 5.2.8.RELEASE 2.3.10.RELEASE diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/AbstractDataSourceInitializer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/AbstractDataSourceInitializer.java index 9696260a97..07195ff874 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/AbstractDataSourceInitializer.java +++ b/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 @@ public abstract class AbstractDataSourceInitializer { 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");