Use text blocks for SQL statements

buildSrc/build.gradle

@@ -62,7 +62,7 @@ dependencies {
     implementation 'com.apollographql.apollo:apollo-runtime:2.4.5'
     implementation 'com.github.ben-manes:gradle-versions-plugin:0.38.0'
     implementation 'com.github.spullara.mustache.java:compiler:0.9.10'
-    implementation 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.15'
+    implementation 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.34'
     implementation 'io.spring.nohttp:nohttp-gradle:0.0.9'
     implementation 'net.sourceforge.htmlunit:htmlunit:2.37.0'
     implementation 'org.hidetake:gradle-ssh-plugin:2.10.1'

spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/JacksonMongoSessionConverter.java

@@ -174,12 +174,12 @@ private static class MongoIdNamingStrategy extends PropertyNamingStrategy.Proper
 		public String translate(String propertyName) {
 
 			switch (propertyName) {
-			case "id":
-				return "_id";
-			case "_id":
-				return "id";
-			default:
-				return propertyName;
+				case "id":
+					return "_id";
+				case "_id":
+					return "id";
+				default:
+					return propertyName;
 			}
 		}
 

spring-session-jdbc/src/main/java/org/springframework/session/jdbc/Db2JdbcIndexedSessionRepositoryCustomizer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2020 the original author or authors.
+ * Copyright 2014-2022 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.
@@ -28,19 +28,18 @@
 public class Db2JdbcIndexedSessionRepositoryCustomizer
 		implements SessionRepositoryCustomizer<JdbcIndexedSessionRepository> {
 
-	// @formatter:off
-	private static final String CREATE_SESSION_ATTRIBUTE_QUERY = ""
-			+ "MERGE INTO %TABLE_NAME%_ATTRIBUTES SA "
-			+ "USING ( "
-			+ "    VALUES (?, ?, ?) "
-			+ ") A (SESSION_PRIMARY_ID, ATTRIBUTE_NAME, ATTRIBUTE_BYTES) "
-			+ "ON (SA.SESSION_PRIMARY_ID = A.SESSION_PRIMARY_ID and SA.ATTRIBUTE_NAME = A.ATTRIBUTE_NAME) "
-			+ "WHEN MATCHED THEN "
-			+ "    UPDATE SET ATTRIBUTE_BYTES = A.ATTRIBUTE_BYTES "
-			+ "WHEN NOT MATCHED THEN "
-			+ "    INSERT (SESSION_PRIMARY_ID, ATTRIBUTE_NAME, ATTRIBUTE_BYTES) "
-			+ "    VALUES (A.SESSION_PRIMARY_ID, A.ATTRIBUTE_NAME, A.ATTRIBUTE_BYTES)";
-	// @formatter:on
+	private static final String CREATE_SESSION_ATTRIBUTE_QUERY = """
+			MERGE INTO %TABLE_NAME%_ATTRIBUTES SA
+			USING (
+				VALUES (?, ?, ?)
+			) A (SESSION_PRIMARY_ID, ATTRIBUTE_NAME, ATTRIBUTE_BYTES)
+			ON (SA.SESSION_PRIMARY_ID = A.SESSION_PRIMARY_ID and SA.ATTRIBUTE_NAME = A.ATTRIBUTE_NAME)
+			WHEN MATCHED THEN
+				UPDATE SET ATTRIBUTE_BYTES = A.ATTRIBUTE_BYTES
+			WHEN NOT MATCHED THEN
+				INSERT (SESSION_PRIMARY_ID, ATTRIBUTE_NAME, ATTRIBUTE_BYTES)
+				VALUES (A.SESSION_PRIMARY_ID, A.ATTRIBUTE_NAME, A.ATTRIBUTE_BYTES)
+			""";
 
 	@Override
 	public void customize(JdbcIndexedSessionRepository sessionRepository) {

spring-session-jdbc/src/main/java/org/springframework/session/jdbc/JdbcIndexedSessionRepository.java

@@ -140,68 +140,59 @@ public class JdbcIndexedSessionRepository
 
 	private static final String SPRING_SECURITY_CONTEXT = "SPRING_SECURITY_CONTEXT";
 
-	// @formatter:off
-	private static final String CREATE_SESSION_QUERY = ""
-			+ "INSERT INTO %TABLE_NAME% (PRIMARY_ID, SESSION_ID, CREATION_TIME, LAST_ACCESS_TIME, MAX_INACTIVE_INTERVAL, EXPIRY_TIME, PRINCIPAL_NAME) "
-			+ "VALUES (?, ?, ?, ?, ?, ?, ?)";
-	// @formatter:on
-
-	// @formatter:off
-	private static final String CREATE_SESSION_ATTRIBUTE_QUERY = ""
-			+ "INSERT INTO %TABLE_NAME%_ATTRIBUTES (SESSION_PRIMARY_ID, ATTRIBUTE_NAME, ATTRIBUTE_BYTES) "
-			+ "VALUES (?, ?, ?)";
-	// @formatter:on
-
-	// @formatter:off
-	private static final String GET_SESSION_QUERY = ""
-			+ "SELECT S.PRIMARY_ID, S.SESSION_ID, S.CREATION_TIME, S.LAST_ACCESS_TIME, S.MAX_INACTIVE_INTERVAL, SA.ATTRIBUTE_NAME, SA.ATTRIBUTE_BYTES "
-			+ "FROM %TABLE_NAME% S "
-			+ "LEFT JOIN %TABLE_NAME%_ATTRIBUTES SA ON S.PRIMARY_ID = SA.SESSION_PRIMARY_ID "
-			+ "WHERE S.SESSION_ID = ?";
-	// @formatter:on
-
-	// @formatter:off
-	private static final String UPDATE_SESSION_QUERY = ""
-			+ "UPDATE %TABLE_NAME% "
-			+ "SET SESSION_ID = ?, LAST_ACCESS_TIME = ?, MAX_INACTIVE_INTERVAL = ?, EXPIRY_TIME = ?, PRINCIPAL_NAME = ? "
-			+ "WHERE PRIMARY_ID = ?";
-	// @formatter:on
-
-	// @formatter:off
-	private static final String UPDATE_SESSION_ATTRIBUTE_QUERY = ""
-			+ "UPDATE %TABLE_NAME%_ATTRIBUTES "
-			+ "SET ATTRIBUTE_BYTES = ? "
-			+ "WHERE SESSION_PRIMARY_ID = ? "
-			+ "AND ATTRIBUTE_NAME = ?";
-	// @formatter:on
-
-	// @formatter:off
-	private static final String DELETE_SESSION_ATTRIBUTE_QUERY = ""
-			+ "DELETE FROM %TABLE_NAME%_ATTRIBUTES "
-			+ "WHERE SESSION_PRIMARY_ID = ? "
-			+ "AND ATTRIBUTE_NAME = ?";
-	// @formatter:on
-
-	// @formatter:off
-	private static final String DELETE_SESSION_QUERY = ""
-			+ "DELETE FROM %TABLE_NAME% "
-			+ "WHERE SESSION_ID = ? "
-			+ "AND MAX_INACTIVE_INTERVAL >= 0";
-	// @formatter:on
-
-	// @formatter:off
-	private static final String LIST_SESSIONS_BY_PRINCIPAL_NAME_QUERY = ""
-			+ "SELECT S.PRIMARY_ID, S.SESSION_ID, S.CREATION_TIME, S.LAST_ACCESS_TIME, S.MAX_INACTIVE_INTERVAL, SA.ATTRIBUTE_NAME, SA.ATTRIBUTE_BYTES "
-			+ "FROM %TABLE_NAME% S "
-			+ "LEFT JOIN %TABLE_NAME%_ATTRIBUTES SA ON S.PRIMARY_ID = SA.SESSION_PRIMARY_ID "
-			+ "WHERE S.PRINCIPAL_NAME = ?";
-	// @formatter:on
-
-	// @formatter:off
-	private static final String DELETE_SESSIONS_BY_EXPIRY_TIME_QUERY = ""
-			+ "DELETE FROM %TABLE_NAME% "
-			+ "WHERE EXPIRY_TIME < ?";
-	// @formatter:on
+	private static final String CREATE_SESSION_QUERY = """
+			INSERT INTO %TABLE_NAME% (PRIMARY_ID, SESSION_ID, CREATION_TIME, LAST_ACCESS_TIME, MAX_INACTIVE_INTERVAL, EXPIRY_TIME, PRINCIPAL_NAME)
+			VALUES (?, ?, ?, ?, ?, ?, ?)
+			""";
+
+	private static final String CREATE_SESSION_ATTRIBUTE_QUERY = """
+			INSERT INTO %TABLE_NAME%_ATTRIBUTES (SESSION_PRIMARY_ID, ATTRIBUTE_NAME, ATTRIBUTE_BYTES)
+			VALUES (?, ?, ?)
+			""";
+
+	private static final String GET_SESSION_QUERY = """
+			SELECT S.PRIMARY_ID, S.SESSION_ID, S.CREATION_TIME, S.LAST_ACCESS_TIME, S.MAX_INACTIVE_INTERVAL, SA.ATTRIBUTE_NAME, SA.ATTRIBUTE_BYTES
+			FROM %TABLE_NAME% S
+			LEFT JOIN %TABLE_NAME%_ATTRIBUTES SA ON S.PRIMARY_ID = SA.SESSION_PRIMARY_ID
+			WHERE S.SESSION_ID = ?
+			""";
+
+	private static final String UPDATE_SESSION_QUERY = """
+			UPDATE %TABLE_NAME%
+			SET SESSION_ID = ?, LAST_ACCESS_TIME = ?, MAX_INACTIVE_INTERVAL = ?, EXPIRY_TIME = ?, PRINCIPAL_NAME = ?
+			WHERE PRIMARY_ID = ?
+			""";
+
+	private static final String UPDATE_SESSION_ATTRIBUTE_QUERY = """
+			UPDATE %TABLE_NAME%_ATTRIBUTES
+			SET ATTRIBUTE_BYTES = ?
+			WHERE SESSION_PRIMARY_ID = ?
+			AND ATTRIBUTE_NAME = ?
+			""";
+
+	private static final String DELETE_SESSION_ATTRIBUTE_QUERY = """
+			DELETE FROM %TABLE_NAME%_ATTRIBUTES
+			WHERE SESSION_PRIMARY_ID = ?
+			AND ATTRIBUTE_NAME = ?
+			""";
+
+	private static final String DELETE_SESSION_QUERY = """
+			DELETE FROM %TABLE_NAME%
+			WHERE SESSION_ID = ?
+			AND MAX_INACTIVE_INTERVAL >= 0
+			""";
+
+	private static final String LIST_SESSIONS_BY_PRINCIPAL_NAME_QUERY = """
+			SELECT S.PRIMARY_ID, S.SESSION_ID, S.CREATION_TIME, S.LAST_ACCESS_TIME, S.MAX_INACTIVE_INTERVAL, SA.ATTRIBUTE_NAME, SA.ATTRIBUTE_BYTES
+			FROM %TABLE_NAME% S
+			LEFT JOIN %TABLE_NAME%_ATTRIBUTES SA ON S.PRIMARY_ID = SA.SESSION_PRIMARY_ID
+			WHERE S.PRINCIPAL_NAME = ?
+			""";
+
+	private static final String DELETE_SESSIONS_BY_EXPIRY_TIME_QUERY = """
+			DELETE FROM %TABLE_NAME%
+			WHERE EXPIRY_TIME < ?
+			""";
 
 	private static final Log logger = LogFactory.getLog(JdbcIndexedSessionRepository.class);
 

spring-session-jdbc/src/main/java/org/springframework/session/jdbc/MySqlJdbcIndexedSessionRepositoryCustomizer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2020 the original author or authors.
+ * Copyright 2014-2022 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.
@@ -28,12 +28,11 @@
 public class MySqlJdbcIndexedSessionRepositoryCustomizer
 		implements SessionRepositoryCustomizer<JdbcIndexedSessionRepository> {
 
-	// @formatter:off
-	private static final String CREATE_SESSION_ATTRIBUTE_QUERY = ""
-			+ "INSERT INTO %TABLE_NAME%_ATTRIBUTES (SESSION_PRIMARY_ID, ATTRIBUTE_NAME, ATTRIBUTE_BYTES) "
-			+ "VALUES (?, ?, ?) "
-			+ "ON DUPLICATE KEY UPDATE ATTRIBUTE_BYTES = VALUES(ATTRIBUTE_BYTES)";
-	// @formatter:on
+	private static final String CREATE_SESSION_ATTRIBUTE_QUERY = """
+			INSERT INTO %TABLE_NAME%_ATTRIBUTES (SESSION_PRIMARY_ID, ATTRIBUTE_NAME, ATTRIBUTE_BYTES)
+			VALUES (?, ?, ?)
+			ON DUPLICATE KEY UPDATE ATTRIBUTE_BYTES = VALUES(ATTRIBUTE_BYTES)
+			""";
 
 	@Override
 	public void customize(JdbcIndexedSessionRepository sessionRepository) {

spring-session-jdbc/src/main/java/org/springframework/session/jdbc/OracleJdbcIndexedSessionRepositoryCustomizer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2020 the original author or authors.
+ * Copyright 2014-2022 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.
@@ -28,20 +28,19 @@
 public class OracleJdbcIndexedSessionRepositoryCustomizer
 		implements SessionRepositoryCustomizer<JdbcIndexedSessionRepository> {
 
-	// @formatter:off
-	private static final String CREATE_SESSION_ATTRIBUTE_QUERY = ""
-			+ "MERGE INTO %TABLE_NAME%_ATTRIBUTES SA "
-			+ "USING ( "
-			+ "    SELECT ? AS SESSION_PRIMARY_ID, ? AS ATTRIBUTE_NAME, ? AS ATTRIBUTE_BYTES "
-			+ "    FROM DUAL "
-			+ ") A "
-			+ "ON (SA.SESSION_PRIMARY_ID = A.SESSION_PRIMARY_ID and SA.ATTRIBUTE_NAME = A.ATTRIBUTE_NAME) "
-			+ "WHEN MATCHED THEN "
-			+ "    UPDATE SET ATTRIBUTE_BYTES = A.ATTRIBUTE_BYTES "
-			+ "WHEN NOT MATCHED THEN "
-			+ "    INSERT (SESSION_PRIMARY_ID, ATTRIBUTE_NAME, ATTRIBUTE_BYTES) "
-			+ "    VALUES (A.SESSION_PRIMARY_ID, A.ATTRIBUTE_NAME, A.ATTRIBUTE_BYTES)";
-	// @formatter:on
+	private static final String CREATE_SESSION_ATTRIBUTE_QUERY = """
+			MERGE INTO %TABLE_NAME%_ATTRIBUTES SA
+			USING (
+				SELECT ? AS SESSION_PRIMARY_ID, ? AS ATTRIBUTE_NAME, ? AS ATTRIBUTE_BYTES
+				FROM DUAL
+			) A
+			ON (SA.SESSION_PRIMARY_ID = A.SESSION_PRIMARY_ID and SA.ATTRIBUTE_NAME = A.ATTRIBUTE_NAME)
+			WHEN MATCHED THEN
+				UPDATE SET ATTRIBUTE_BYTES = A.ATTRIBUTE_BYTES
+			WHEN NOT MATCHED THEN
+				INSERT (SESSION_PRIMARY_ID, ATTRIBUTE_NAME, ATTRIBUTE_BYTES)
+				VALUES (A.SESSION_PRIMARY_ID, A.ATTRIBUTE_NAME, A.ATTRIBUTE_BYTES)
+			""";
 
 	@Override
 	public void customize(JdbcIndexedSessionRepository sessionRepository) {

spring-session-jdbc/src/main/java/org/springframework/session/jdbc/PostgreSqlJdbcIndexedSessionRepositoryCustomizer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2020 the original author or authors.
+ * Copyright 2014-2022 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.
@@ -28,13 +28,12 @@
 public class PostgreSqlJdbcIndexedSessionRepositoryCustomizer
 		implements SessionRepositoryCustomizer<JdbcIndexedSessionRepository> {
 
-	// @formatter:off
-	private static final String CREATE_SESSION_ATTRIBUTE_QUERY = ""
-			+ "INSERT INTO %TABLE_NAME%_ATTRIBUTES (SESSION_PRIMARY_ID, ATTRIBUTE_NAME, ATTRIBUTE_BYTES) "
-			+ "VALUES (?, ?, ?) "
-			+ "ON CONFLICT (SESSION_PRIMARY_ID, ATTRIBUTE_NAME) "
-			+ "DO UPDATE SET ATTRIBUTE_BYTES = EXCLUDED.ATTRIBUTE_BYTES";
-	// @formatter:on
+	private static final String CREATE_SESSION_ATTRIBUTE_QUERY = """
+			INSERT INTO %TABLE_NAME%_ATTRIBUTES (SESSION_PRIMARY_ID, ATTRIBUTE_NAME, ATTRIBUTE_BYTES)
+			VALUES (?, ?, ?)
+			ON CONFLICT (SESSION_PRIMARY_ID, ATTRIBUTE_NAME)
+			DO UPDATE SET ATTRIBUTE_BYTES = EXCLUDED.ATTRIBUTE_BYTES
+			""";
 
 	@Override
 	public void customize(JdbcIndexedSessionRepository sessionRepository) {

spring-session-jdbc/src/main/java/org/springframework/session/jdbc/SqlServerJdbcIndexedSessionRepositoryCustomizer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2020 the original author or authors.
+ * Copyright 2014-2022 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.
@@ -28,19 +28,18 @@
 public class SqlServerJdbcIndexedSessionRepositoryCustomizer
 		implements SessionRepositoryCustomizer<JdbcIndexedSessionRepository> {
 
-	// @formatter:off
-	private static final String CREATE_SESSION_ATTRIBUTE_QUERY = ""
-			+ "MERGE INTO %TABLE_NAME%_ATTRIBUTES SA "
-			+ "USING ( "
-			+ "    VALUES (?, ?, ?) "
-			+ ") A (SESSION_PRIMARY_ID, ATTRIBUTE_NAME, ATTRIBUTE_BYTES) "
-			+ "ON (SA.SESSION_PRIMARY_ID = A.SESSION_PRIMARY_ID and SA.ATTRIBUTE_NAME = A.ATTRIBUTE_NAME) "
-			+ "WHEN MATCHED THEN "
-			+ "    UPDATE SET ATTRIBUTE_BYTES = A.ATTRIBUTE_BYTES "
-			+ "WHEN NOT MATCHED THEN "
-			+ "    INSERT (SESSION_PRIMARY_ID, ATTRIBUTE_NAME, ATTRIBUTE_BYTES) "
-			+ "    VALUES (A.SESSION_PRIMARY_ID, A.ATTRIBUTE_NAME, A.ATTRIBUTE_BYTES);";
-	// @formatter:on
+	private static final String CREATE_SESSION_ATTRIBUTE_QUERY = """
+			MERGE INTO %TABLE_NAME%_ATTRIBUTES SA
+			USING (
+				VALUES (?, ?, ?)
+			) A (SESSION_PRIMARY_ID, ATTRIBUTE_NAME, ATTRIBUTE_BYTES)
+			ON (SA.SESSION_PRIMARY_ID = A.SESSION_PRIMARY_ID and SA.ATTRIBUTE_NAME = A.ATTRIBUTE_NAME)
+			WHEN MATCHED THEN
+				UPDATE SET ATTRIBUTE_BYTES = A.ATTRIBUTE_BYTES
+			WHEN NOT MATCHED THEN
+				INSERT (SESSION_PRIMARY_ID, ATTRIBUTE_NAME, ATTRIBUTE_BYTES)
+				VALUES (A.SESSION_PRIMARY_ID, A.ATTRIBUTE_NAME, A.ATTRIBUTE_BYTES);
+			""";
 
 	@Override
 	public void customize(JdbcIndexedSessionRepository sessionRepository) {