Merge branch '2.6.x' into 2.7.x

Closes gh-29016
spring-projects · Dec 14, 2021 · 9ca1cff · 9ca1cff
2 parents 4f22c0b + ba60e3d
commit 9ca1cff
Show file tree

Hide file tree

Showing 22 changed files with 535 additions and 20 deletions.
diff --git a/...rc/main/java/org/springframework/boot/autoconfigure/batch/BatchDataSourceInitializer.java b/...rc/main/java/org/springframework/boot/autoconfigure/batch/BatchDataSourceInitializer.java
@@ -22,6 +22,7 @@
 import org.springframework.boot.sql.init.DatabaseInitializationMode;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 /**
  * Initialize the Spring Batch schema (ignoring errors, so it should be idempotent).
@@ -65,6 +66,10 @@ protected String getSchemaLocation() {
 
 	@Override
 	protected String getDatabaseName() {
+		String platform = this.jdbcProperties.getPlatform();
+		if (StringUtils.hasText(platform)) {
+			return platform;
+		}
 		String databaseName = super.getDatabaseName();
 		if ("oracle".equals(databaseName)) {
 			return "oracle10g";

diff --git a/...rg/springframework/boot/autoconfigure/batch/BatchDataSourceScriptDatabaseInitializer.java b/...rg/springframework/boot/autoconfigure/batch/BatchDataSourceScriptDatabaseInitializer.java
@@ -16,12 +16,15 @@
 
 package org.springframework.boot.autoconfigure.batch;
 
+import java.util.List;
+
 import javax.sql.DataSource;
 
 import org.springframework.boot.jdbc.DatabaseDriver;
 import org.springframework.boot.jdbc.init.DataSourceScriptDatabaseInitializer;
 import org.springframework.boot.jdbc.init.PlatformPlaceholderDatabaseDriverResolver;
 import org.springframework.boot.sql.init.DatabaseInitializationSettings;
+import org.springframework.util.StringUtils;
 
 /**
  * {@link DataSourceScriptDatabaseInitializer} for the Spring Batch database. May be
@@ -67,13 +70,20 @@ public BatchDataSourceScriptDatabaseInitializer(DataSource dataSource, DatabaseI
 	 */
 	public static DatabaseInitializationSettings getSettings(DataSource dataSource, BatchProperties.Jdbc properties) {
 		DatabaseInitializationSettings settings = new DatabaseInitializationSettings();
-		PlatformPlaceholderDatabaseDriverResolver platformResolver = new PlatformPlaceholderDatabaseDriverResolver();
-		platformResolver = platformResolver.withDriverPlatform(DatabaseDriver.ORACLE, "oracle10g");
-		platformResolver = platformResolver.withDriverPlatform(DatabaseDriver.MARIADB, "mysql");
-		settings.setSchemaLocations(platformResolver.resolveAll(dataSource, properties.getSchema()));
+		settings.setSchemaLocations(resolveSchemaLocations(dataSource, properties));
 		settings.setMode(properties.getInitializeSchema());
 		settings.setContinueOnError(true);
 		return settings;
 	}
 
+	private static List<String> resolveSchemaLocations(DataSource dataSource, BatchProperties.Jdbc properties) {
+		PlatformPlaceholderDatabaseDriverResolver platformResolver = new PlatformPlaceholderDatabaseDriverResolver();
+		platformResolver = platformResolver.withDriverPlatform(DatabaseDriver.ORACLE, "oracle10g");
+		platformResolver = platformResolver.withDriverPlatform(DatabaseDriver.MARIADB, "mysql");
+		if (StringUtils.hasText(properties.getPlatform())) {
+			return platformResolver.resolveAll(properties.getPlatform(), properties.getSchema());
+		}
+		return platformResolver.resolveAll(dataSource, properties.getSchema());
+	}
+
 }
diff --git a/...configure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java b/...configure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java
@@ -122,6 +122,12 @@ public static class Jdbc {
 		 */
 		private String schema = DEFAULT_SCHEMA_LOCATION;
 
+		/**
+		 * Platform to use in initialization scripts if the @@platform@@ placeholder is
+		 * used. Auto-detected by default.
+		 */
+		private String platform;
+
 		/**
 		 * Table prefix for all the batch meta-data tables.
 		 */
@@ -140,6 +146,14 @@ public void setSchema(String schema) {
 			this.schema = schema;
 		}
 
+		public String getPlatform() {
+			return this.platform;
+		}
+
+		public void setPlatform(String platform) {
+			this.platform = platform;
+		}
+
 		public String getTablePrefix() {
 			return this.tablePrefix;
 		}

diff --git a/.../org/springframework/boot/autoconfigure/integration/IntegrationDataSourceInitializer.java b/.../org/springframework/boot/autoconfigure/integration/IntegrationDataSourceInitializer.java
@@ -21,6 +21,7 @@
 import org.springframework.boot.sql.init.DatabaseInitializationMode;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 /**
  * Initializer for Spring Integration schema.
@@ -61,4 +62,13 @@ protected String getSchemaLocation() {
 		return this.properties.getSchema();
 	}
 
+	@Override
+	protected String getDatabaseName() {
+		String platform = this.properties.getPlatform();
+		if (StringUtils.hasText(platform)) {
+			return platform;
+		}
+		return super.getDatabaseName();
+	}
+
 }
diff --git a/...mework/boot/autoconfigure/integration/IntegrationDataSourceScriptDatabaseInitializer.java b/...mework/boot/autoconfigure/integration/IntegrationDataSourceScriptDatabaseInitializer.java
@@ -16,11 +16,14 @@
 
 package org.springframework.boot.autoconfigure.integration;
 
+import java.util.List;
+
 import javax.sql.DataSource;
 
 import org.springframework.boot.jdbc.init.DataSourceScriptDatabaseInitializer;
 import org.springframework.boot.jdbc.init.PlatformPlaceholderDatabaseDriverResolver;
 import org.springframework.boot.sql.init.DatabaseInitializationSettings;
+import org.springframework.util.StringUtils;
 
 /**
  * {@link DataSourceScriptDatabaseInitializer} for the Spring Integration database. May be
@@ -66,11 +69,18 @@ public IntegrationDataSourceScriptDatabaseInitializer(DataSource dataSource,
 	 */
 	static DatabaseInitializationSettings getSettings(DataSource dataSource, IntegrationProperties.Jdbc properties) {
 		DatabaseInitializationSettings settings = new DatabaseInitializationSettings();
-		PlatformPlaceholderDatabaseDriverResolver platformResolver = new PlatformPlaceholderDatabaseDriverResolver();
-		settings.setSchemaLocations(platformResolver.resolveAll(dataSource, properties.getSchema()));
+		settings.setSchemaLocations(resolveSchemaLocations(dataSource, properties));
 		settings.setMode(properties.getInitializeSchema());
 		settings.setContinueOnError(true);
 		return settings;
 	}
 
+	private static List<String> resolveSchemaLocations(DataSource dataSource, IntegrationProperties.Jdbc properties) {
+		PlatformPlaceholderDatabaseDriverResolver platformResolver = new PlatformPlaceholderDatabaseDriverResolver();
+		if (StringUtils.hasText(properties.getPlatform())) {
+			return platformResolver.resolveAll(properties.getPlatform(), properties.getSchema());
+		}
+		return platformResolver.resolveAll(dataSource, properties.getSchema());
+	}
+
 }
diff --git a/...c/main/java/org/springframework/boot/autoconfigure/integration/IntegrationProperties.java b/...c/main/java/org/springframework/boot/autoconfigure/integration/IntegrationProperties.java
@@ -209,6 +209,12 @@ public static class Jdbc {
 		 */
 		private String schema = DEFAULT_SCHEMA_LOCATION;
 
+		/**
+		 * Platform to use in initialization scripts if the @@platform@@ placeholder is
+		 * used. Auto-detected by default.
+		 */
+		private String platform;
+
 		/**
 		 * Database schema initialization mode.
 		 */
@@ -222,6 +228,14 @@ public void setSchema(String schema) {
 			this.schema = schema;
 		}
 
+		public String getPlatform() {
+			return this.platform;
+		}
+
+		public void setPlatform(String platform) {
+			this.platform = platform;
+		}
+
 		public DatabaseInitializationMode getInitializeSchema() {
 			return this.initializeSchema;
 		}

diff --git a/.../main/java/org/springframework/boot/autoconfigure/quartz/QuartzDataSourceInitializer.java b/.../main/java/org/springframework/boot/autoconfigure/quartz/QuartzDataSourceInitializer.java
@@ -22,6 +22,7 @@
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 /**
  * Initialize the Quartz Scheduler schema.
@@ -69,6 +70,10 @@ protected String getSchemaLocation() {
 
 	@Override
 	protected String getDatabaseName() {
+		String platform = this.properties.getJdbc().getPlatform();
+		if (StringUtils.hasText(platform)) {
+			return platform;
+		}
 		String databaseName = super.getDatabaseName();
 		if ("db2".equals(databaseName)) {
 			return "db2_v95";

diff --git a/.../springframework/boot/autoconfigure/quartz/QuartzDataSourceScriptDatabaseInitializer.java b/.../springframework/boot/autoconfigure/quartz/QuartzDataSourceScriptDatabaseInitializer.java
@@ -16,12 +16,15 @@
 
 package org.springframework.boot.autoconfigure.quartz;
 
+import java.util.List;
+
 import javax.sql.DataSource;
 
 import org.springframework.boot.jdbc.DatabaseDriver;
 import org.springframework.boot.jdbc.init.DataSourceScriptDatabaseInitializer;
 import org.springframework.boot.jdbc.init.PlatformPlaceholderDatabaseDriverResolver;
 import org.springframework.boot.sql.init.DatabaseInitializationSettings;
+import org.springframework.util.StringUtils;
 
 /**
  * {@link DataSourceScriptDatabaseInitializer} for the Quartz Scheduler database. May be
@@ -66,16 +69,23 @@ public QuartzDataSourceScriptDatabaseInitializer(DataSource dataSource, Database
 	 */
 	public static DatabaseInitializationSettings getSettings(DataSource dataSource, QuartzProperties properties) {
 		DatabaseInitializationSettings settings = new DatabaseInitializationSettings();
+		settings.setSchemaLocations(resolveSchemaLocations(dataSource, properties.getJdbc()));
+		settings.setMode(properties.getJdbc().getInitializeSchema());
+		settings.setContinueOnError(true);
+		return settings;
+	}
+
+	private static List<String> resolveSchemaLocations(DataSource dataSource, QuartzProperties.Jdbc properties) {
 		PlatformPlaceholderDatabaseDriverResolver platformResolver = new PlatformPlaceholderDatabaseDriverResolver();
 		platformResolver = platformResolver.withDriverPlatform(DatabaseDriver.DB2, "db2_v95");
 		platformResolver = platformResolver.withDriverPlatform(DatabaseDriver.MYSQL, "mysql_innodb");
 		platformResolver = platformResolver.withDriverPlatform(DatabaseDriver.MARIADB, "mysql_innodb");
 		platformResolver = platformResolver.withDriverPlatform(DatabaseDriver.POSTGRESQL, "postgres");
 		platformResolver = platformResolver.withDriverPlatform(DatabaseDriver.SQLSERVER, "sqlServer");
-		settings.setSchemaLocations(platformResolver.resolveAll(dataSource, properties.getJdbc().getSchema()));
-		settings.setMode(properties.getJdbc().getInitializeSchema());
-		settings.setContinueOnError(true);
-		return settings;
+		if (StringUtils.hasText(properties.getPlatform())) {
+			return platformResolver.resolveAll(properties.getPlatform(), properties.getSchema());
+		}
+		return platformResolver.resolveAll(dataSource, properties.getSchema());
 	}
 
 }
diff --git a/...nfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzProperties.java b/...nfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzProperties.java
@@ -141,6 +141,12 @@ public static class Jdbc {
 		 */
 		private String schema = DEFAULT_SCHEMA_LOCATION;
 
+		/**
+		 * Platform to use in initialization scripts if the @@platform@@ placeholder is
+		 * used. Auto-detected by default.
+		 */
+		private String platform;
+
 		/**
 		 * Database schema initialization mode.
 		 */
@@ -159,6 +165,14 @@ public void setSchema(String schema) {
 			this.schema = schema;
 		}
 
+		public String getPlatform() {
+			return this.platform;
+		}
+
+		public void setPlatform(String platform) {
+			this.platform = platform;
+		}
+
 		public DatabaseInitializationMode getInitializeSchema() {
 			return this.initializeSchema;
 		}

diff --git a/...java/org/springframework/boot/autoconfigure/session/JdbcSessionDataSourceInitializer.java b/...java/org/springframework/boot/autoconfigure/session/JdbcSessionDataSourceInitializer.java
@@ -21,6 +21,7 @@
 import org.springframework.boot.sql.init.DatabaseInitializationMode;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 /**
  * Initializer for Spring Session schema.
@@ -61,4 +62,13 @@ protected String getSchemaLocation() {
 		return this.properties.getSchema();
 	}
 
+	@Override
+	protected String getDatabaseName() {
+		String platform = this.properties.getPlatform();
+		if (StringUtils.hasText(platform)) {
+			return platform;
+		}
+		return super.getDatabaseName();
+	}
+
 }
diff --git a/...gframework/boot/autoconfigure/session/JdbcSessionDataSourceScriptDatabaseInitializer.java b/...gframework/boot/autoconfigure/session/JdbcSessionDataSourceScriptDatabaseInitializer.java
@@ -16,11 +16,14 @@
 
 package org.springframework.boot.autoconfigure.session;
 
+import java.util.List;
+
 import javax.sql.DataSource;
 
 import org.springframework.boot.jdbc.init.DataSourceScriptDatabaseInitializer;
 import org.springframework.boot.jdbc.init.PlatformPlaceholderDatabaseDriverResolver;
 import org.springframework.boot.sql.init.DatabaseInitializationSettings;
+import org.springframework.util.StringUtils;
 
 /**
  * {@link DataSourceScriptDatabaseInitializer} for the Spring Session JDBC database. May
@@ -67,11 +70,18 @@ public JdbcSessionDataSourceScriptDatabaseInitializer(DataSource dataSource,
 	 */
 	static DatabaseInitializationSettings getSettings(DataSource dataSource, JdbcSessionProperties properties) {
 		DatabaseInitializationSettings settings = new DatabaseInitializationSettings();
-		PlatformPlaceholderDatabaseDriverResolver platformResolver = new PlatformPlaceholderDatabaseDriverResolver();
-		settings.setSchemaLocations(platformResolver.resolveAll(dataSource, properties.getSchema()));
+		settings.setSchemaLocations(resolveSchemaLocations(dataSource, properties));
 		settings.setMode(properties.getInitializeSchema());
 		settings.setContinueOnError(true);
 		return settings;
 	}
 
+	private static List<String> resolveSchemaLocations(DataSource dataSource, JdbcSessionProperties properties) {
+		PlatformPlaceholderDatabaseDriverResolver platformResolver = new PlatformPlaceholderDatabaseDriverResolver();
+		if (StringUtils.hasText(properties.getPlatform())) {
+			return platformResolver.resolveAll(properties.getPlatform(), properties.getSchema());
+		}
+		return platformResolver.resolveAll(dataSource, properties.getSchema());
+	}
+
 }
diff --git a/...e/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionProperties.java b/...e/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionProperties.java
@@ -42,6 +42,12 @@ public class JdbcSessionProperties {
 	 */
 	private String schema = DEFAULT_SCHEMA_LOCATION;
 
+	/**
+	 * Platform to use in initialization scripts if the @@platform@@ placeholder is used.
+	 * Auto-detected by default.
+	 */
+	private String platform;
+
 	/**
 	 * Name of the database table used to store sessions.
 	 */
@@ -77,6 +83,14 @@ public void setSchema(String schema) {
 		this.schema = schema;
 	}
 
+	public String getPlatform() {
+		return this.platform;
+	}
+
+	public void setPlatform(String platform) {
+		this.platform = platform;
+	}
+
 	public String getTableName() {
 		return this.tableName;
 	}

diff --git a/...st/java/org/springframework/boot/autoconfigure/batch/BatchDataSourceInitializerTests.java b/...st/java/org/springframework/boot/autoconfigure/batch/BatchDataSourceInitializerTests.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2012-2021 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.boot.autoconfigure.batch;
+
+import javax.sql.DataSource;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.core.io.DefaultResourceLoader;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verifyNoInteractions;
+
+/**
+ * Tests for {@link BatchDataSourceInitializer}.
+ *
+ * @author Stephane Nicoll
+ */
+@Deprecated
+class BatchDataSourceInitializerTests {
+
+	@Test
+	void getDatabaseNameWithPlatformDoesNotTouchDataSource() {
+		DataSource dataSource = mock(DataSource.class);
+		BatchProperties properties = new BatchProperties();
+		properties.getJdbc().setPlatform("test");
+		BatchDataSourceInitializer initializer = new BatchDataSourceInitializer(dataSource, new DefaultResourceLoader(),
+				properties);
+		assertThat(initializer.getDatabaseName()).isEqualTo("test");
+		verifyNoInteractions(dataSource);
+	}
+
+}