root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.2.x' into 2.3.x 

See gh-23183
This commit is contained in:
Stephane Nicoll 2020-09-07 09:17:51 +02:00
parent de671035a8 4b5a3f4ff9
commit d2eeb9524f
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -16,6 +16,8 @@
package org.springframework.boot.autoconfigure.jooq; package org.springframework.boot.autoconfigure.jooq;
import java.sql.DatabaseMetaData;
import javax.sql.DataSource; import javax.sql.DataSource;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -49,7 +51,7 @@ final class SqlDialectLookup {
return SQLDialect.DEFAULT; return SQLDialect.DEFAULT;
} }
try { try {
String url = JdbcUtils.extractDatabaseMetaData(dataSource, "getURL"); String url = JdbcUtils.extractDatabaseMetaData(dataSource, DatabaseMetaData::getURL);
SQLDialect sqlDialect = JDBCUtils.dialect(url); SQLDialect sqlDialect = JDBCUtils.dialect(url);
if (sqlDialect != null) { if (sqlDialect != null) {
return sqlDialect; return sqlDialect;

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

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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; package org.springframework.boot.autoconfigure.orm.jpa;
import java.sql.DatabaseMetaData;
import java.util.Collections; import java.util.Collections;
import java.util.EnumMap; import java.util.EnumMap;
import java.util.Map; import java.util.Map;
@ -70,7 +71,7 @@ final class DatabaseLookup {
return Database.DEFAULT; return Database.DEFAULT;
} }
try { try {
String url = JdbcUtils.extractDatabaseMetaData(dataSource, "getURL"); String url = JdbcUtils.extractDatabaseMetaData(dataSource, DatabaseMetaData::getURL);
DatabaseDriver driver = DatabaseDriver.fromJdbcUrl(url); DatabaseDriver driver = DatabaseDriver.fromJdbcUrl(url);
Database database = LOOKUP.get(driver); Database database = LOOKUP.get(driver);
if (database != null) { if (database != null) {

2
spring-boot-project/spring-boot-dependencies/build.gradle
View File

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

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

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -16,6 +16,8 @@
package org.springframework.boot.jdbc; package org.springframework.boot.jdbc;
import java.sql.DatabaseMetaData;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import javax.sql.DataSource; import javax.sql.DataSource;
@ -87,7 +89,7 @@ public abstract class AbstractDataSourceInitializer {
protected String getDatabaseName() { protected String getDatabaseName() {
try { try {
String productName = JdbcUtils.commonDatabaseName( String productName = JdbcUtils.commonDatabaseName(
JdbcUtils.extractDatabaseMetaData(this.dataSource, "getDatabaseProductName").toString()); JdbcUtils.extractDatabaseMetaData(this.dataSource, DatabaseMetaData::getDatabaseProductName));
DatabaseDriver databaseDriver = DatabaseDriver.fromProductName(productName); DatabaseDriver databaseDriver = DatabaseDriver.fromProductName(productName);
if (databaseDriver == DatabaseDriver.UNKNOWN) { if (databaseDriver == DatabaseDriver.UNKNOWN) {
throw new IllegalStateException("Unable to detect database type"); throw new IllegalStateException("Unable to detect database type");