Release 3.1.0-M1

Closes gh-2272

gradle.properties

@@ -1,3 +1,3 @@
 org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 org.gradle.parallel=true
-version=3.0.1
+version=3.1.0-M1

gradle/dependency-management.gradle

@@ -2,12 +2,12 @@ dependencyManagement {
 	imports {
 		mavenBom 'io.projectreactor:reactor-bom:2022.0.5'
 		mavenBom 'com.fasterxml.jackson:jackson-bom:2.14.2'
-		mavenBom 'org.junit:junit-bom:5.9.2'
+		mavenBom 'org.junit:junit-bom:5.9.1'
 		mavenBom 'org.mockito:mockito-bom:4.8.1'
-		mavenBom 'org.springframework:spring-framework-bom:6.0.6'
-		mavenBom 'org.springframework.data:spring-data-bom:2022.0.3'
+		mavenBom 'org.springframework:spring-framework-bom:6.0.7'
+		mavenBom 'org.springframework.data:spring-data-bom:2022.0.4'
 		mavenBom 'org.springframework.security:spring-security-bom:6.0.2'
-		mavenBom 'org.testcontainers:testcontainers-bom:1.17.3'
+		mavenBom 'org.testcontainers:testcontainers-bom:1.17.6'
 	}
 
 	dependencies {
@@ -34,7 +34,7 @@ dependencyManagement {
 		dependency 'org.hamcrest:hamcrest:2.2'
 		dependency 'org.hsqldb:hsqldb:2.7.0'
 		dependency 'org.mariadb.jdbc:mariadb-java-client:3.0.7'
-		dependencySet(group: 'org.mongodb', version: '4.8.2') {
+		dependencySet(group: 'org.mongodb', version: '4.8.0-beta0') {
 			entry 'mongodb-driver-core'
 			entry 'mongodb-driver-sync'
 			entry 'mongodb-driver-reactivestreams'

spring-session-jdbc/src/main/java/org/springframework/session/jdbc/util/JdbcSchemaUtils.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2014-2023 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.session.jdbc.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.core.io.Resource;
+import org.springframework.session.jdbc.JdbcIndexedSessionRepository;
+
+/**
+ * Utility class for schema files.
+ *
+ * @author Marcus da Coregio
+ * @since 3.1
+ */
+public final class JdbcSchemaUtils {
+
+	private JdbcSchemaUtils() {
+	}
+
+	/**
+	 * Loads the content of the provided schema resource and replaces the
+	 * {@link JdbcIndexedSessionRepository#DEFAULT_TABLE_NAME} by the provided table name.
+	 * @param schemaResource the schema resource
+	 * @param tableName the table name to replace
+	 * @return the schema resource with the table name replaced
+	 */
+	public static Resource replaceDefaultTableName(Resource schemaResource, String tableName) throws IOException {
+		try (InputStream inputStream = schemaResource.getInputStream()) {
+			String schemaScript = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8);
+			String newSchema = schemaScript.replace(JdbcIndexedSessionRepository.DEFAULT_TABLE_NAME, tableName);
+			return new ByteArrayResource(newSchema.getBytes(StandardCharsets.UTF_8));
+		}
+	}
+
+}

spring-session-jdbc/src/test/java/org/springframework/session/jdbc/util/JdbcSchemaUtilsTests.java

@@ -0,0 +1,71 @@
+/*
+ * Copyright 2014-2023 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.session.jdbc.util;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link JdbcSchemaUtils}.
+ *
+ * @author Marcus da Coregio
+ */
+class JdbcSchemaUtilsTests {
+
+	@ParameterizedTest
+	@MethodSource("getCreateSchemaFiles")
+	void replaceCreateSchemaTableName(Resource schema) throws IOException {
+		Resource newTableNameSchema = JdbcSchemaUtils.replaceDefaultTableName(schema, "NEW_TABLE_NAME");
+		String schemaScript = new String(newTableNameSchema.getInputStream().readAllBytes());
+		assertThat(schemaScript).doesNotContain("SPRING_SESSION", "SPRING_SESSION_ATTRIBUTES", "SPRING_SESSION_IX1",
+				"SPRING_SESSION_IX2", "SPRING_SESSION_IX3");
+		assertThat(schemaScript).contains("NEW_TABLE_NAME", "NEW_TABLE_NAME_ATTRIBUTES", "NEW_TABLE_NAME_IX1",
+				"NEW_TABLE_NAME_IX2", "NEW_TABLE_NAME_IX3");
+	}
+
+	@ParameterizedTest
+	@MethodSource("getDropSchemaFiles")
+	void replaceDropSchemaTableName(Resource schema) throws IOException {
+		Resource newTableNameSchema = JdbcSchemaUtils.replaceDefaultTableName(schema, "NEW_TABLE_NAME");
+		String schemaScript = new String(newTableNameSchema.getInputStream().readAllBytes());
+		assertThat(schemaScript).doesNotContain("SPRING_SESSION", "SPRING_SESSION_ATTRIBUTES");
+		assertThat(schemaScript).contains("NEW_TABLE_NAME", "NEW_TABLE_NAME_ATTRIBUTES");
+	}
+
+	private static Stream<Resource> getCreateSchemaFiles() throws IOException {
+		return getSchemaFiles().filter((resource) -> !resource.getFilename().contains("drop"));
+	}
+
+	private static Stream<Resource> getDropSchemaFiles() throws IOException {
+		return getSchemaFiles().filter((resource) -> resource.getFilename().contains("drop"));
+	}
+
+	private static Stream<Resource> getSchemaFiles() throws IOException {
+		return Arrays.stream(new PathMatchingResourcePatternResolver()
+				.getResources("classpath*:org/springframework/session/jdbc/schema-*.sql"));
+	}
+
+}