Use spring-javaformat to format and check code

Resolves: #1450

spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/AbstractContainerJdbcOperationsSessionRepositoryITests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -31,7 +31,7 @@ import org.springframework.jdbc.datasource.init.DatabasePopulator;
  *
  * @author Vedran Pavic
  */
-public abstract class AbstractContainerJdbcOperationsSessionRepositoryITests
+abstract class AbstractContainerJdbcOperationsSessionRepositoryITests
 		extends AbstractJdbcOperationsSessionRepositoryITests {
 
 	static class BaseContainerConfig extends BaseConfig {
@@ -46,8 +46,7 @@ public abstract class AbstractContainerJdbcOperationsSessionRepositoryITests
 		}
 
 		@Bean
-		public DataSourceInitializer dataSourceInitializer(DataSource dataSource,
-				DatabasePopulator databasePopulator) {
+		public DataSourceInitializer dataSourceInitializer(DataSource dataSource, DatabasePopulator databasePopulator) {
 			DataSourceInitializer initializer = new DataSourceInitializer();
 			initializer.setDataSource(dataSource);
 			initializer.setDatabasePopulator(databasePopulator);

spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/AbstractJdbcOperationsSessionRepositoryITests.java

@@ -50,7 +50,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  *
  * @author Vedran Pavic
  */
-public abstract class AbstractJdbcOperationsSessionRepositoryITests {
+abstract class AbstractJdbcOperationsSessionRepositoryITests {
 
 	private static final String SPRING_SECURITY_CONTEXT = "SPRING_SECURITY_CONTEXT";
 
@@ -64,26 +64,22 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 	private SecurityContext changedContext;
 
 	@BeforeEach
-	public void setUp() {
+	void setUp() {
 		this.context = SecurityContextHolder.createEmptyContext();
-		this.context.setAuthentication(
-				new UsernamePasswordAuthenticationToken("username-" + UUID.randomUUID(),
-						"na", AuthorityUtils.createAuthorityList("ROLE_USER")));
+		this.context.setAuthentication(new UsernamePasswordAuthenticationToken("username-" + UUID.randomUUID(), "na",
+				AuthorityUtils.createAuthorityList("ROLE_USER")));
 
 		this.changedContext = SecurityContextHolder.createEmptyContext();
 		this.changedContext.setAuthentication(new UsernamePasswordAuthenticationToken(
-				"changedContext-" + UUID.randomUUID(), "na",
-				AuthorityUtils.createAuthorityList("ROLE_USER")));
+				"changedContext-" + UUID.randomUUID(), "na", AuthorityUtils.createAuthorityList("ROLE_USER")));
 	}
 
 	@Test
-	public void saveWhenNoAttributesThenCanBeFound() {
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
-				.createSession();
+	void saveWhenNoAttributesThenCanBeFound() {
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
 
 		this.repository.save(toSave);
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository
-				.findById(toSave.getId());
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.findById(toSave.getId());
 
 		assertThat(session).isNotNull();
 		assertThat(session.isChanged()).isFalse();
@@ -91,16 +87,15 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 	}
 
 	@Test
-	public void saves() {
+	void saves() {
 		String username = "saves-" + System.currentTimeMillis();
 
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
-				.createSession();
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
 		String expectedAttributeName = "a";
 		String expectedAttributeValue = "b";
 		toSave.setAttribute(expectedAttributeName, expectedAttributeValue);
-		Authentication toSaveToken = new UsernamePasswordAuthenticationToken(username,
-				"password", AuthorityUtils.createAuthorityList("ROLE_USER"));
+		Authentication toSaveToken = new UsernamePasswordAuthenticationToken(username, "password",
+				AuthorityUtils.createAuthorityList("ROLE_USER"));
 		SecurityContext toSaveContext = SecurityContextHolder.createEmptyContext();
 		toSaveContext.setAuthentication(toSaveToken);
 		toSave.setAttribute(SPRING_SECURITY_CONTEXT, toSaveContext);
@@ -108,8 +103,7 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 
 		this.repository.save(toSave);
 
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository
-				.findById(toSave.getId());
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.findById(toSave.getId());
 
 		assertThat(session.getId()).isEqualTo(toSave.getId());
 		assertThat(session.isChanged()).isFalse();
@@ -125,17 +119,15 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 
 	@Test
 	@Transactional(readOnly = true)
-	public void savesInReadOnlyTransaction() {
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
-				.createSession();
+	void savesInReadOnlyTransaction() {
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
 
 		this.repository.save(toSave);
 	}
 
 	@Test
-	public void putAllOnSingleAttrDoesNotRemoveOld() {
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
-				.createSession();
+	void putAllOnSingleAttrDoesNotRemoveOld() {
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
 		toSave.setAttribute("a", "b");
 
 		this.repository.save(toSave);
@@ -146,8 +138,7 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 		this.repository.save(toSave);
 		toSave = this.repository.findById(toSave.getId());
 
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository
-				.findById(toSave.getId());
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.findById(toSave.getId());
 		assertThat(session.isChanged()).isFalse();
 		assertThat(session.getDelta()).isEmpty();
 		assertThat(session.getAttributeNames().size()).isEqualTo(2);
@@ -158,11 +149,9 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 	}
 
 	@Test
-	public void updateLastAccessedTime() {
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
-				.createSession();
-		toSave.setLastAccessedTime(Instant.now()
-				.minusSeconds(MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS + 1));
+	void updateLastAccessedTime() {
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
+		toSave.setLastAccessedTime(Instant.now().minusSeconds(MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS + 1));
 
 		this.repository.save(toSave);
 
@@ -170,8 +159,7 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 		toSave.setLastAccessedTime(lastAccessedTime);
 		this.repository.save(toSave);
 
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository
-				.findById(toSave.getId());
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.findById(toSave.getId());
 
 		assertThat(session).isNotNull();
 		assertThat(session.isChanged()).isFalse();
@@ -182,10 +170,9 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 	}
 
 	@Test
-	public void findByPrincipalName() {
+	void findByPrincipalName() {
 		String principalName = "findByPrincipalName" + UUID.randomUUID();
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
-				.createSession();
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
 		toSave.setAttribute(INDEX_NAME, principalName);
 
 		this.repository.save(toSave);
@@ -198,22 +185,18 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 
 		this.repository.deleteById(toSave.getId());
 
-		findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				principalName);
+		findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
 
 		assertThat(findByPrincipalName).hasSize(0);
 		assertThat(findByPrincipalName.keySet()).doesNotContain(toSave.getId());
 	}
 
 	@Test
-	public void findByPrincipalNameExpireRemovesIndex() {
-		String principalName = "findByPrincipalNameExpireRemovesIndex"
-				+ UUID.randomUUID();
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
-				.createSession();
+	void findByPrincipalNameExpireRemovesIndex() {
+		String principalName = "findByPrincipalNameExpireRemovesIndex" + UUID.randomUUID();
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
 		toSave.setAttribute(INDEX_NAME, principalName);
-		toSave.setLastAccessedTime(Instant.now()
-				.minusSeconds(MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS + 1));
+		toSave.setLastAccessedTime(Instant.now().minusSeconds(MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS + 1));
 
 		this.repository.save(toSave);
 		this.repository.cleanUpExpiredSessions();
@@ -226,11 +209,9 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 	}
 
 	@Test
-	public void findByPrincipalNameNoPrincipalNameChange() {
-		String principalName = "findByPrincipalNameNoPrincipalNameChange"
-				+ UUID.randomUUID();
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
-				.createSession();
+	void findByPrincipalNameNoPrincipalNameChange() {
+		String principalName = "findByPrincipalNameNoPrincipalNameChange" + UUID.randomUUID();
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
 		toSave.setAttribute(INDEX_NAME, principalName);
 
 		this.repository.save(toSave);
@@ -250,11 +231,9 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 	}
 
 	@Test
-	public void findByPrincipalNameNoPrincipalNameChangeReload() {
-		String principalName = "findByPrincipalNameNoPrincipalNameChangeReload"
-				+ UUID.randomUUID();
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
-				.createSession();
+	void findByPrincipalNameNoPrincipalNameChangeReload() {
+		String principalName = "findByPrincipalNameNoPrincipalNameChangeReload" + UUID.randomUUID();
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
 		toSave.setAttribute(INDEX_NAME, principalName);
 
 		this.repository.save(toSave);
@@ -276,10 +255,9 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 	}
 
 	@Test
-	public void findByDeletedPrincipalName() {
+	void findByDeletedPrincipalName() {
 		String principalName = "findByDeletedPrincipalName" + UUID.randomUUID();
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
-				.createSession();
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
 		toSave.setAttribute(INDEX_NAME, principalName);
 
 		this.repository.save(toSave);
@@ -294,11 +272,10 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 	}
 
 	@Test
-	public void findByChangedPrincipalName() {
+	void findByChangedPrincipalName() {
 		String principalName = "findByChangedPrincipalName" + UUID.randomUUID();
 		String principalNameChanged = "findByChangedPrincipalName" + UUID.randomUUID();
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
-				.createSession();
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
 		toSave.setAttribute(INDEX_NAME, principalName);
 
 		this.repository.save(toSave);
@@ -310,8 +287,7 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 				.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
 		assertThat(findByPrincipalName).isEmpty();
 
-		findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				principalNameChanged);
+		findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME, principalNameChanged);
 
 		assertThat(findByPrincipalName).hasSize(1);
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
@@ -322,16 +298,14 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 	}
 
 	@Test
-	public void findByDeletedPrincipalNameReload() {
+	void findByDeletedPrincipalNameReload() {
 		String principalName = "findByDeletedPrincipalName" + UUID.randomUUID();
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
-				.createSession();
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
 		toSave.setAttribute(INDEX_NAME, principalName);
 
 		this.repository.save(toSave);
 
-		JdbcOperationsSessionRepository.JdbcSession getSession = this.repository
-				.findById(toSave.getId());
+		JdbcOperationsSessionRepository.JdbcSession getSession = this.repository.findById(toSave.getId());
 		getSession.setAttribute(INDEX_NAME, null);
 		this.repository.save(getSession);
 
@@ -342,17 +316,15 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 	}
 
 	@Test
-	public void findByChangedPrincipalNameReload() {
+	void findByChangedPrincipalNameReload() {
 		String principalName = "findByChangedPrincipalName" + UUID.randomUUID();
 		String principalNameChanged = "findByChangedPrincipalName" + UUID.randomUUID();
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
-				.createSession();
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
 		toSave.setAttribute(INDEX_NAME, principalName);
 
 		this.repository.save(toSave);
 
-		JdbcOperationsSessionRepository.JdbcSession getSession = this.repository
-				.findById(toSave.getId());
+		JdbcOperationsSessionRepository.JdbcSession getSession = this.repository.findById(toSave.getId());
 
 		getSession.setAttribute(INDEX_NAME, principalNameChanged);
 		this.repository.save(getSession);
@@ -361,8 +333,7 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 				.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
 		assertThat(findByPrincipalName).isEmpty();
 
-		findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				principalNameChanged);
+		findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME, principalNameChanged);
 
 		assertThat(findByPrincipalName).hasSize(1);
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
@@ -373,9 +344,8 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 	}
 
 	@Test
-	public void findBySecurityPrincipalName() {
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
-				.createSession();
+	void findBySecurityPrincipalName() {
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
 		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
 
 		this.repository.save(toSave);
@@ -388,20 +358,17 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 
 		this.repository.deleteById(toSave.getId());
 
-		findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				getSecurityName());
+		findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
 
 		assertThat(findByPrincipalName).hasSize(0);
 		assertThat(findByPrincipalName.keySet()).doesNotContain(toSave.getId());
 	}
 
 	@Test
-	public void findBySecurityPrincipalNameExpireRemovesIndex() {
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
-				.createSession();
+	void findBySecurityPrincipalNameExpireRemovesIndex() {
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
 		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
-		toSave.setLastAccessedTime(Instant.now()
-				.minusSeconds(MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS + 1));
+		toSave.setLastAccessedTime(Instant.now().minusSeconds(MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS + 1));
 
 		this.repository.save(toSave);
 		this.repository.cleanUpExpiredSessions();
@@ -414,9 +381,8 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 	}
 
 	@Test
-	public void findByPrincipalNameNoSecurityPrincipalNameChange() {
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
-				.createSession();
+	void findByPrincipalNameNoSecurityPrincipalNameChange() {
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
 		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
 
 		this.repository.save(toSave);
@@ -436,9 +402,8 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 	}
 
 	@Test
-	public void findByPrincipalNameNoSecurityPrincipalNameChangeReload() {
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
-				.createSession();
+	void findByPrincipalNameNoSecurityPrincipalNameChangeReload() {
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
 		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
 
 		this.repository.save(toSave);
@@ -460,9 +425,8 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 	}
 
 	@Test
-	public void findByDeletedSecurityPrincipalName() {
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
-				.createSession();
+	void findByDeletedSecurityPrincipalName() {
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
 		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
 
 		this.repository.save(toSave);
@@ -477,9 +441,8 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 	}
 
 	@Test
-	public void findByChangedSecurityPrincipalName() {
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
-				.createSession();
+	void findByChangedSecurityPrincipalName() {
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
 		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
 
 		this.repository.save(toSave);
@@ -491,8 +454,7 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 				.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
 		assertThat(findByPrincipalName).isEmpty();
 
-		findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				getChangedSecurityName());
+		findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME, getChangedSecurityName());
 
 		assertThat(findByPrincipalName).hasSize(1);
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
@@ -503,15 +465,13 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 	}
 
 	@Test
-	public void findByDeletedSecurityPrincipalNameReload() {
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
-				.createSession();
+	void findByDeletedSecurityPrincipalNameReload() {
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
 		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
 
 		this.repository.save(toSave);
 
-		JdbcOperationsSessionRepository.JdbcSession getSession = this.repository
-				.findById(toSave.getId());
+		JdbcOperationsSessionRepository.JdbcSession getSession = this.repository.findById(toSave.getId());
 		getSession.setAttribute(INDEX_NAME, null);
 		this.repository.save(getSession);
 
@@ -522,15 +482,13 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 	}
 
 	@Test
-	public void findByChangedSecurityPrincipalNameReload() {
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
-				.createSession();
+	void findByChangedSecurityPrincipalNameReload() {
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
 		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
 
 		this.repository.save(toSave);
 
-		JdbcOperationsSessionRepository.JdbcSession getSession = this.repository
-				.findById(toSave.getId());
+		JdbcOperationsSessionRepository.JdbcSession getSession = this.repository.findById(toSave.getId());
 
 		getSession.setAttribute(SPRING_SECURITY_CONTEXT, this.changedContext);
 		this.repository.save(getSession);
@@ -539,8 +497,7 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 				.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
 		assertThat(findByPrincipalName).isEmpty();
 
-		findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				getChangedSecurityName());
+		findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME, getChangedSecurityName());
 
 		assertThat(findByPrincipalName).hasSize(1);
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
@@ -551,9 +508,8 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 	}
 
 	@Test
-	public void cleanupInactiveSessionsUsingRepositoryDefinedInterval() {
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository
-				.createSession();
+	void cleanupInactiveSessionsUsingRepositoryDefinedInterval() {
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.createSession();
 
 		this.repository.save(session);
 
@@ -580,9 +536,8 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 
 	// gh-580
 	@Test
-	public void cleanupInactiveSessionsUsingSessionDefinedInterval() {
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository
-				.createSession();
+	void cleanupInactiveSessionsUsingSessionDefinedInterval() {
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.createSession();
 		session.setMaxInactiveInterval(Duration.ofMinutes(45));
 
 		this.repository.save(session);
@@ -609,17 +564,15 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 	}
 
 	@Test
-	public void changeSessionIdWhenOnlyChangeId() {
+	void changeSessionIdWhenOnlyChangeId() {
 		String attrName = "changeSessionId";
 		String attrValue = "changeSessionId-value";
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
-				.createSession();
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
 		toSave.setAttribute(attrName, attrValue);
 
 		this.repository.save(toSave);
 
-		JdbcOperationsSessionRepository.JdbcSession findById = this.repository
-				.findById(toSave.getId());
+		JdbcOperationsSessionRepository.JdbcSession findById = this.repository.findById(toSave.getId());
 
 		assertThat(findById.<String>getAttribute(attrName)).isEqualTo(attrValue);
 
@@ -630,19 +583,16 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 
 		assertThat(this.repository.findById(originalFindById)).isNull();
 
-		JdbcOperationsSessionRepository.JdbcSession findByChangeSessionId = this.repository
-				.findById(changeSessionId);
+		JdbcOperationsSessionRepository.JdbcSession findByChangeSessionId = this.repository.findById(changeSessionId);
 
 		assertThat(findByChangeSessionId.isChanged()).isFalse();
 		assertThat(findByChangeSessionId.getDelta()).isEmpty();
-		assertThat(findByChangeSessionId.<String>getAttribute(attrName))
-				.isEqualTo(attrValue);
+		assertThat(findByChangeSessionId.<String>getAttribute(attrName)).isEqualTo(attrValue);
 	}
 
 	@Test
-	public void changeSessionIdWhenChangeTwice() {
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
-				.createSession();
+	void changeSessionIdWhenChangeTwice() {
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
 
 		this.repository.save(toSave);
 
@@ -658,17 +608,15 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 	}
 
 	@Test
-	public void changeSessionIdWhenSetAttributeOnChangedSession() {
+	void changeSessionIdWhenSetAttributeOnChangedSession() {
 		String attrName = "changeSessionId";
 		String attrValue = "changeSessionId-value";
 
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
-				.createSession();
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
 
 		this.repository.save(toSave);
 
-		JdbcOperationsSessionRepository.JdbcSession findById = this.repository
-				.findById(toSave.getId());
+		JdbcOperationsSessionRepository.JdbcSession findById = this.repository.findById(toSave.getId());
 
 		findById.setAttribute(attrName, attrValue);
 
@@ -679,19 +627,16 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 
 		assertThat(this.repository.findById(originalFindById)).isNull();
 
-		JdbcOperationsSessionRepository.JdbcSession findByChangeSessionId = this.repository
-				.findById(changeSessionId);
+		JdbcOperationsSessionRepository.JdbcSession findByChangeSessionId = this.repository.findById(changeSessionId);
 
 		assertThat(findByChangeSessionId.isChanged()).isFalse();
 		assertThat(findByChangeSessionId.getDelta()).isEmpty();
-		assertThat(findByChangeSessionId.<String>getAttribute(attrName))
-				.isEqualTo(attrValue);
+		assertThat(findByChangeSessionId.<String>getAttribute(attrName)).isEqualTo(attrValue);
 	}
 
 	@Test
-	public void changeSessionIdWhenHasNotSaved() {
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
-				.createSession();
+	void changeSessionIdWhenHasNotSaved() {
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
 		String originalId = toSave.getId();
 		toSave.changeSessionId();
 
@@ -702,9 +647,8 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 	}
 
 	@Test // gh-1070
-	public void saveUpdatedAddAndModifyAttribute() {
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository
-				.createSession();
+	void saveUpdatedAddAndModifyAttribute() {
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.createSession();
 		this.repository.save(session);
 		session = this.repository.findById(session.getId());
 		session.setAttribute("testName", "testValue1");
@@ -716,9 +660,8 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 	}
 
 	@Test // gh-1070
-	public void saveUpdatedAddAndRemoveAttribute() {
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository
-				.createSession();
+	void saveUpdatedAddAndRemoveAttribute() {
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.createSession();
 		this.repository.save(session);
 		session = this.repository.findById(session.getId());
 		session.setAttribute("testName", "testValue");
@@ -730,9 +673,8 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 	}
 
 	@Test // gh-1070
-	public void saveUpdatedModifyAndRemoveAttribute() {
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository
-				.createSession();
+	void saveUpdatedModifyAndRemoveAttribute() {
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.createSession();
 		session.setAttribute("testName", "testValue1");
 		this.repository.save(session);
 		session = this.repository.findById(session.getId());
@@ -745,9 +687,8 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 	}
 
 	@Test // gh-1070
-	public void saveUpdatedRemoveAndAddAttribute() {
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository
-				.createSession();
+	void saveUpdatedRemoveAndAddAttribute() {
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.createSession();
 		session.setAttribute("testName", "testValue1");
 		this.repository.save(session);
 		session = this.repository.findById(session.getId());
@@ -760,9 +701,8 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 	}
 
 	@Test // gh-1031
-	public void saveDeleted() {
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository
-				.createSession();
+	void saveDeleted() {
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.createSession();
 		this.repository.save(session);
 		session = this.repository.findById(session.getId());
 		this.repository.deleteById(session.getId());
@@ -773,9 +713,8 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 	}
 
 	@Test // gh-1031
-	public void saveDeletedAddAttribute() {
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository
-				.createSession();
+	void saveDeletedAddAttribute() {
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.createSession();
 		this.repository.save(session);
 		session = this.repository.findById(session.getId());
 		this.repository.deleteById(session.getId());
@@ -787,15 +726,13 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 	}
 
 	@Test // gh-1133
-	public void sessionFromStoreResolvesAttributesLazily() {
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository
-				.createSession();
+	void sessionFromStoreResolvesAttributesLazily() {
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.createSession();
 		session.setAttribute("attribute1", "value1");
 		session.setAttribute("attribute2", "value2");
 		this.repository.save(session);
 		session = this.repository.findById(session.getId());
-		MapSession delegate = (MapSession) ReflectionTestUtils.getField(session,
-				"delegate");
+		MapSession delegate = (MapSession) ReflectionTestUtils.getField(session, "delegate");
 
 		Supplier attribute1 = delegate.getAttribute("attribute1");
 		assertThat(ReflectionTestUtils.getField(attribute1, "value")).isNull();
@@ -808,12 +745,11 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests {
 	}
 
 	@Test // gh-1203
-	public void saveWithLargeAttribute() {
+	void saveWithLargeAttribute() {
 		String attributeName = "largeAttribute";
 		int arraySize = 4000;
 
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository
-				.createSession();
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.createSession();
 		session.setAttribute(attributeName, new byte[arraySize]);
 		this.repository.save(session);
 		session = this.repository.findById(session.getId());

spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/DatabaseContainers.java

@@ -78,9 +78,8 @@ final class DatabaseContainers {
 		@Override
 		protected void configure() {
 			super.configure();
-			setCommand("mysqld", "--character-set-server=utf8mb4",
-					"--collation-server=utf8mb4_unicode_ci", "--innodb_large_prefix",
-					"--innodb_file_format=barracuda", "--innodb-file-per-table");
+			setCommand("mysqld", "--character-set-server=utf8mb4", "--collation-server=utf8mb4_unicode_ci",
+					"--innodb_large_prefix", "--innodb_file_format=barracuda", "--innodb-file-per-table");
 		}
 
 	}
@@ -94,8 +93,7 @@ final class DatabaseContainers {
 		@Override
 		protected void configure() {
 			super.configure();
-			setCommand("mysqld", "--character-set-server=utf8mb4",
-					"--collation-server=utf8mb4_unicode_ci");
+			setCommand("mysqld", "--character-set-server=utf8mb4", "--collation-server=utf8mb4_unicode_ci");
 		}
 
 	}
@@ -109,8 +107,7 @@ final class DatabaseContainers {
 		@Override
 		protected void configure() {
 			super.configure();
-			setCommand("mysqld", "--character-set-server=utf8mb4",
-					"--collation-server=utf8mb4_unicode_ci");
+			setCommand("mysqld", "--character-set-server=utf8mb4", "--collation-server=utf8mb4_unicode_ci");
 		}
 
 		@Override
@@ -139,8 +136,7 @@ final class DatabaseContainers {
 
 	}
 
-	private static class PostgreSql9Container
-			extends PostgreSQLContainer<PostgreSql9Container> {
+	private static class PostgreSql9Container extends PostgreSQLContainer<PostgreSql9Container> {
 
 		PostgreSql9Container() {
 			super("postgres:9.6.13");
@@ -148,8 +144,7 @@ final class DatabaseContainers {
 
 	}
 
-	private static class PostgreSql10Container
-			extends PostgreSQLContainer<PostgreSql10Container> {
+	private static class PostgreSql10Container extends PostgreSQLContainer<PostgreSql10Container> {
 
 		PostgreSql10Container() {
 			super("postgres:10.8");
@@ -157,8 +152,7 @@ final class DatabaseContainers {
 
 	}
 
-	private static class PostgreSql11Container
-			extends PostgreSQLContainer<PostgreSql11Container> {
+	private static class PostgreSql11Container extends PostgreSQLContainer<PostgreSql11Container> {
 
 		PostgreSql11Container() {
 			super("postgres:11.3");
@@ -166,8 +160,7 @@ final class DatabaseContainers {
 
 	}
 
-	private static class SqlServer2017Container
-			extends MSSQLServerContainer<SqlServer2017Container> {
+	private static class SqlServer2017Container extends MSSQLServerContainer<SqlServer2017Container> {
 
 		SqlServer2017Container() {
 			super("mcr.microsoft.com/mssql/server:2017-CU15");

spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/DatabasePopulators.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -31,23 +31,23 @@ final class DatabasePopulators {
 	}
 
 	static ResourceDatabasePopulator mySql() {
-		return new ResourceDatabasePopulator(new ClassPathResource(
-				"org/springframework/session/jdbc/schema-mysql.sql"));
+		return new ResourceDatabasePopulator(
+				new ClassPathResource("org/springframework/session/jdbc/schema-mysql.sql"));
 	}
 
 	static ResourceDatabasePopulator oracle() {
-		return new ResourceDatabasePopulator(new ClassPathResource(
-				"org/springframework/session/jdbc/schema-oracle.sql"));
+		return new ResourceDatabasePopulator(
+				new ClassPathResource("org/springframework/session/jdbc/schema-oracle.sql"));
 	}
 
 	static ResourceDatabasePopulator postgreSql() {
-		return new ResourceDatabasePopulator(new ClassPathResource(
-				"org/springframework/session/jdbc/schema-postgresql.sql"));
+		return new ResourceDatabasePopulator(
+				new ClassPathResource("org/springframework/session/jdbc/schema-postgresql.sql"));
 	}
 
 	static ResourceDatabasePopulator sqlServer() {
-		return new ResourceDatabasePopulator(new ClassPathResource(
-				"org/springframework/session/jdbc/schema-sqlserver.sql"));
+		return new ResourceDatabasePopulator(
+				new ClassPathResource("org/springframework/session/jdbc/schema-sqlserver.sql"));
 	}
 
 }

spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/DerbyJdbcOperationsSessionRepositoryITests.java

@@ -35,18 +35,15 @@ import org.springframework.test.context.web.WebAppConfiguration;
 @ExtendWith(SpringExtension.class)
 @WebAppConfiguration
 @ContextConfiguration
-public class DerbyJdbcOperationsSessionRepositoryITests
-		extends AbstractJdbcOperationsSessionRepositoryITests {
+class DerbyJdbcOperationsSessionRepositoryITests extends AbstractJdbcOperationsSessionRepositoryITests {
 
 	@Configuration
 	static class Config extends BaseConfig {
 
 		@Bean
 		public EmbeddedDatabase dataSource() {
-			return new EmbeddedDatabaseBuilder()
-					.setType(EmbeddedDatabaseType.DERBY)
-					.addScript("org/springframework/session/jdbc/schema-derby.sql")
-					.build();
+			return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.DERBY)
+					.addScript("org/springframework/session/jdbc/schema-derby.sql").build();
 		}
 
 	}

spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/H2JdbcOperationsSessionRepositoryITests.java

@@ -35,18 +35,15 @@ import org.springframework.test.context.web.WebAppConfiguration;
 @ExtendWith(SpringExtension.class)
 @WebAppConfiguration
 @ContextConfiguration
-public class H2JdbcOperationsSessionRepositoryITests
-		extends AbstractJdbcOperationsSessionRepositoryITests {
+class H2JdbcOperationsSessionRepositoryITests extends AbstractJdbcOperationsSessionRepositoryITests {
 
 	@Configuration
 	static class Config extends BaseConfig {
 
 		@Bean
 		public EmbeddedDatabase dataSource() {
-			return new EmbeddedDatabaseBuilder()
-					.setType(EmbeddedDatabaseType.H2)
-					.addScript("org/springframework/session/jdbc/schema-h2.sql")
-					.build();
+			return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.H2)
+					.addScript("org/springframework/session/jdbc/schema-h2.sql").build();
 		}
 
 	}

spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/HsqldbJdbcOperationsSessionRepositoryITests.java

@@ -35,18 +35,15 @@ import org.springframework.test.context.web.WebAppConfiguration;
 @ExtendWith(SpringExtension.class)
 @WebAppConfiguration
 @ContextConfiguration
-public class HsqldbJdbcOperationsSessionRepositoryITests
-		extends AbstractJdbcOperationsSessionRepositoryITests {
+class HsqldbJdbcOperationsSessionRepositoryITests extends AbstractJdbcOperationsSessionRepositoryITests {
 
 	@Configuration
 	static class Config extends BaseConfig {
 
 		@Bean
 		public EmbeddedDatabase dataSource() {
-			return new EmbeddedDatabaseBuilder()
-					.setType(EmbeddedDatabaseType.HSQL)
-					.addScript("org/springframework/session/jdbc/schema-hsqldb.sql")
-					.build();
+			return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL)
+					.addScript("org/springframework/session/jdbc/schema-hsqldb.sql").build();
 		}
 
 	}

spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MariaDb10JdbcOperationsSessionRepositoryITests.java

@@ -35,8 +35,7 @@ import org.springframework.test.context.web.WebAppConfiguration;
 @ExtendWith(SpringExtension.class)
 @WebAppConfiguration
 @ContextConfiguration
-public class MariaDb10JdbcOperationsSessionRepositoryITests
-		extends AbstractContainerJdbcOperationsSessionRepositoryITests {
+class MariaDb10JdbcOperationsSessionRepositoryITests extends AbstractContainerJdbcOperationsSessionRepositoryITests {
 
 	@Configuration
 	static class Config extends BaseContainerConfig {

spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MariaDb5JdbcOperationsSessionRepositoryITests.java

@@ -35,8 +35,7 @@ import org.springframework.test.context.web.WebAppConfiguration;
 @ExtendWith(SpringExtension.class)
 @WebAppConfiguration
 @ContextConfiguration
-public class MariaDb5JdbcOperationsSessionRepositoryITests
-		extends AbstractContainerJdbcOperationsSessionRepositoryITests {
+class MariaDb5JdbcOperationsSessionRepositoryITests extends AbstractContainerJdbcOperationsSessionRepositoryITests {
 
 	@Configuration
 	static class Config extends BaseContainerConfig {

spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MySql5JdbcOperationsSessionRepositoryITests.java

@@ -34,8 +34,7 @@ import org.springframework.test.context.web.WebAppConfiguration;
 @ExtendWith(SpringExtension.class)
 @WebAppConfiguration
 @ContextConfiguration
-public class MySql5JdbcOperationsSessionRepositoryITests
-		extends AbstractContainerJdbcOperationsSessionRepositoryITests {
+class MySql5JdbcOperationsSessionRepositoryITests extends AbstractContainerJdbcOperationsSessionRepositoryITests {
 
 	@Configuration
 	static class Config extends BaseContainerConfig {

spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MySql8JdbcOperationsSessionRepositoryITests.java

@@ -34,8 +34,7 @@ import org.springframework.test.context.web.WebAppConfiguration;
 @ExtendWith(SpringExtension.class)
 @WebAppConfiguration
 @ContextConfiguration
-public class MySql8JdbcOperationsSessionRepositoryITests
-		extends AbstractContainerJdbcOperationsSessionRepositoryITests {
+class MySql8JdbcOperationsSessionRepositoryITests extends AbstractContainerJdbcOperationsSessionRepositoryITests {
 
 	@Configuration
 	static class Config extends BaseContainerConfig {

spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/OracleJdbcOperationsSessionRepositoryITests.java

@@ -41,16 +41,14 @@ import org.springframework.util.ClassUtils;
 @ExtendWith(SpringExtension.class)
 @WebAppConfiguration
 @ContextConfiguration
-public class OracleJdbcOperationsSessionRepositoryITests
-		extends AbstractContainerJdbcOperationsSessionRepositoryITests {
+class OracleJdbcOperationsSessionRepositoryITests extends AbstractContainerJdbcOperationsSessionRepositoryITests {
 
 	@BeforeAll
-	public static void setUpClass() {
+	static void setUpClass() {
 		Assumptions.assumeTrue(ClassUtils.isPresent("oracle.jdbc.OracleDriver", null),
 				"Oracle JDBC driver is present on the classpath");
 		Assumptions.assumeTrue(
-				TestcontainersConfiguration.getInstance().getProperties()
-						.getProperty("oracle.container.image") != null,
+				TestcontainersConfiguration.getInstance().getProperties().getProperty("oracle.container.image") != null,
 				"Testcontainers property `oracle.container.image` is set");
 	}
 

spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/PostgreSql10JdbcOperationsSessionRepositoryITests.java

@@ -35,8 +35,7 @@ import org.springframework.test.context.web.WebAppConfiguration;
 @ExtendWith(SpringExtension.class)
 @WebAppConfiguration
 @ContextConfiguration
-public class PostgreSql10JdbcOperationsSessionRepositoryITests
-		extends AbstractContainerJdbcOperationsSessionRepositoryITests {
+class PostgreSql10JdbcOperationsSessionRepositoryITests extends AbstractContainerJdbcOperationsSessionRepositoryITests {
 
 	@Configuration
 	static class Config extends BaseContainerConfig {

spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/PostgreSql11JdbcOperationsSessionRepositoryITests.java

@@ -35,8 +35,7 @@ import org.springframework.test.context.web.WebAppConfiguration;
 @ExtendWith(SpringExtension.class)
 @WebAppConfiguration
 @ContextConfiguration
-public class PostgreSql11JdbcOperationsSessionRepositoryITests
-		extends AbstractContainerJdbcOperationsSessionRepositoryITests {
+class PostgreSql11JdbcOperationsSessionRepositoryITests extends AbstractContainerJdbcOperationsSessionRepositoryITests {
 
 	@Configuration
 	static class Config extends BaseContainerConfig {

spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/PostgreSql9JdbcOperationsSessionRepositoryITests.java

@@ -35,8 +35,7 @@ import org.springframework.test.context.web.WebAppConfiguration;
 @ExtendWith(SpringExtension.class)
 @WebAppConfiguration
 @ContextConfiguration
-public class PostgreSql9JdbcOperationsSessionRepositoryITests
-		extends AbstractContainerJdbcOperationsSessionRepositoryITests {
+class PostgreSql9JdbcOperationsSessionRepositoryITests extends AbstractContainerJdbcOperationsSessionRepositoryITests {
 
 	@Configuration
 	static class Config extends BaseContainerConfig {

spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/SqlServerJdbcOperationsSessionRepositoryITests.java

@@ -35,8 +35,7 @@ import org.springframework.test.context.web.WebAppConfiguration;
 @ExtendWith(SpringExtension.class)
 @WebAppConfiguration
 @ContextConfiguration
-public class SqlServerJdbcOperationsSessionRepositoryITests
-		extends AbstractContainerJdbcOperationsSessionRepositoryITests {
+class SqlServerJdbcOperationsSessionRepositoryITests extends AbstractContainerJdbcOperationsSessionRepositoryITests {
 
 	@Configuration
 	static class Config extends BaseContainerConfig {

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

@@ -83,8 +83,8 @@ import org.springframework.util.StringUtils;
  * </pre>
  *
  * For additional information on how to create and configure {@link JdbcTemplate} and
- * {@link PlatformTransactionManager}, refer to the
- * <a href="https://docs.spring.io/spring/docs/current/spring-framework-reference/html/spring-data-tier.html">
+ * {@link PlatformTransactionManager}, refer to the <a href=
+ * "https://docs.spring.io/spring/docs/current/spring-framework-reference/html/spring-data-tier.html">
  * Spring Framework Reference Documentation</a>.
  * <p>
  * By default, this implementation uses <code>SPRING_SESSION</code> and
@@ -132,8 +132,8 @@ import org.springframework.util.StringUtils;
  * @author Craig Andrews
  * @since 1.2.0
  */
-public class JdbcOperationsSessionRepository implements
-		FindByIndexNameSessionRepository<JdbcOperationsSessionRepository.JdbcSession> {
+public class JdbcOperationsSessionRepository
+		implements FindByIndexNameSessionRepository<JdbcOperationsSessionRepository.JdbcSession> {
 
 	/**
 	 * The default name of database table used by Spring Session to store sessions.
@@ -142,52 +142,60 @@ public class JdbcOperationsSessionRepository implements
 
 	private static final String SPRING_SECURITY_CONTEXT = "SPRING_SECURITY_CONTEXT";
 
-	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: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
 
-	private static final String CREATE_SESSION_ATTRIBUTE_QUERY =
-			"INSERT INTO %TABLE_NAME%_ATTRIBUTES(SESSION_PRIMARY_ID, ATTRIBUTE_NAME, ATTRIBUTE_BYTES) " +
-					"SELECT PRIMARY_ID, ?, ? " +
-					"FROM %TABLE_NAME% " +
-					"WHERE SESSION_ID = ?";
+	// @formatter:off
+	private static final String CREATE_SESSION_ATTRIBUTE_QUERY = "INSERT INTO %TABLE_NAME%_ATTRIBUTES(SESSION_PRIMARY_ID, ATTRIBUTE_NAME, ATTRIBUTE_BYTES) "
+			+ "SELECT PRIMARY_ID, ?, ? "
+			+ "FROM %TABLE_NAME% "
+			+ "WHERE SESSION_ID = ?";
+	// @formatter:on
 
-	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 OUTER JOIN %TABLE_NAME%_ATTRIBUTES SA ON S.PRIMARY_ID = SA.SESSION_PRIMARY_ID " +
-					"WHERE S.SESSION_ID = ?";
+	// @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 OUTER JOIN %TABLE_NAME%_ATTRIBUTES SA ON S.PRIMARY_ID = SA.SESSION_PRIMARY_ID "
+			+ "WHERE S.SESSION_ID = ?";
+	// @formatter:on
 
-	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: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
 
-	private static final String UPDATE_SESSION_ATTRIBUTE_QUERY =
-			"UPDATE %TABLE_NAME%_ATTRIBUTES SET ATTRIBUTE_BYTES = ? " +
-					"WHERE SESSION_PRIMARY_ID = ? " +
-					"AND ATTRIBUTE_NAME = ?";
+	// @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
 
-	private static final String DELETE_SESSION_ATTRIBUTE_QUERY =
-			"DELETE FROM %TABLE_NAME%_ATTRIBUTES " +
-					"WHERE SESSION_PRIMARY_ID = ? " +
-					"AND ATTRIBUTE_NAME = ?";
+	// @formatter:off
+	private static final String DELETE_SESSION_ATTRIBUTE_QUERY = "DELETE FROM %TABLE_NAME%_ATTRIBUTES "
+			+ "WHERE SESSION_PRIMARY_ID = ? "
+			+ "AND ATTRIBUTE_NAME = ?";
+	// @formatter:on
 
-	private static final String DELETE_SESSION_QUERY =
-			"DELETE FROM %TABLE_NAME% " +
-					"WHERE SESSION_ID = ?";
+	// @formatter:off
+	private static final String DELETE_SESSION_QUERY = "DELETE FROM %TABLE_NAME% "
+			+ "WHERE SESSION_ID = ?";
+	// @formatter:on
 
-	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 OUTER JOIN %TABLE_NAME%_ATTRIBUTES SA ON S.PRIMARY_ID = SA.SESSION_PRIMARY_ID " +
-					"WHERE S.PRINCIPAL_NAME = ?";
+	// @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 OUTER JOIN %TABLE_NAME%_ATTRIBUTES SA ON S.PRIMARY_ID = SA.SESSION_PRIMARY_ID "
+			+ "WHERE S.PRINCIPAL_NAME = ?";
+	// @formatter:on
 
-	private static final String DELETE_SESSIONS_BY_EXPIRY_TIME_QUERY =
-			"DELETE FROM %TABLE_NAME% " +
-					"WHERE EXPIRY_TIME < ?";
+	// @formatter:off
+	private static final String DELETE_SESSIONS_BY_EXPIRY_TIME_QUERY = "DELETE FROM %TABLE_NAME% "
+			+ "WHERE EXPIRY_TIME < ?";
+	// @formatter:on
 
-	private static final Log logger = LogFactory
-			.getLog(JdbcOperationsSessionRepository.class);
+	private static final Log logger = LogFactory.getLog(JdbcOperationsSessionRepository.class);
 
 	private static final PrincipalNameResolver PRINCIPAL_NAME_RESOLVER = new PrincipalNameResolver();
 
@@ -398,9 +406,8 @@ public class JdbcOperationsSessionRepository implements
 
 				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
-					JdbcOperationsSessionRepository.this.jdbcOperations.update(
-							JdbcOperationsSessionRepository.this.createSessionQuery,
-							(ps) -> {
+					JdbcOperationsSessionRepository.this.jdbcOperations
+							.update(JdbcOperationsSessionRepository.this.createSessionQuery, (ps) -> {
 								ps.setString(1, session.primaryKey);
 								ps.setString(2, session.getId());
 								ps.setLong(3, session.getCreationTime().toEpochMilli());
@@ -423,9 +430,8 @@ public class JdbcOperationsSessionRepository implements
 				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 					if (session.isChanged()) {
-						JdbcOperationsSessionRepository.this.jdbcOperations.update(
-								JdbcOperationsSessionRepository.this.updateSessionQuery,
-								(ps) -> {
+						JdbcOperationsSessionRepository.this.jdbcOperations
+								.update(JdbcOperationsSessionRepository.this.updateSessionQuery, (ps) -> {
 									ps.setString(1, session.getId());
 									ps.setLong(2, session.getLastAccessedTime().toEpochMilli());
 									ps.setInt(3, (int) session.getMaxInactiveInterval().getSeconds());
@@ -435,22 +441,19 @@ public class JdbcOperationsSessionRepository implements
 								});
 					}
 					List<String> addedAttributeNames = session.delta.entrySet().stream()
-							.filter((entry) -> entry.getValue() == DeltaValue.ADDED)
-							.map(Map.Entry::getKey)
+							.filter((entry) -> entry.getValue() == DeltaValue.ADDED).map(Map.Entry::getKey)
 							.collect(Collectors.toList());
 					if (!addedAttributeNames.isEmpty()) {
 						insertSessionAttributes(session, addedAttributeNames);
 					}
 					List<String> updatedAttributeNames = session.delta.entrySet().stream()
-							.filter((entry) -> entry.getValue() == DeltaValue.UPDATED)
-							.map(Map.Entry::getKey)
+							.filter((entry) -> entry.getValue() == DeltaValue.UPDATED).map(Map.Entry::getKey)
 							.collect(Collectors.toList());
 					if (!updatedAttributeNames.isEmpty()) {
 						updateSessionAttributes(session, updatedAttributeNames);
 					}
 					List<String> removedAttributeNames = session.delta.entrySet().stream()
-							.filter((entry) -> entry.getValue() == DeltaValue.REMOVED)
-							.map(Map.Entry::getKey)
+							.filter((entry) -> entry.getValue() == DeltaValue.REMOVED).map(Map.Entry::getKey)
 							.collect(Collectors.toList());
 					if (!removedAttributeNames.isEmpty()) {
 						deleteSessionAttributes(session, removedAttributeNames);
@@ -466,10 +469,8 @@ public class JdbcOperationsSessionRepository implements
 	public JdbcSession findById(final String id) {
 		final JdbcSession session = this.transactionOperations.execute((status) -> {
 			List<JdbcSession> sessions = JdbcOperationsSessionRepository.this.jdbcOperations.query(
-					JdbcOperationsSessionRepository.this.getSessionQuery,
-					(ps) -> ps.setString(1, id),
-					JdbcOperationsSessionRepository.this.extractor
-			);
+					JdbcOperationsSessionRepository.this.getSessionQuery, (ps) -> ps.setString(1, id),
+					JdbcOperationsSessionRepository.this.extractor);
 			if (sessions.isEmpty()) {
 				return null;
 			}
@@ -493,28 +494,25 @@ public class JdbcOperationsSessionRepository implements
 
 			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
-				JdbcOperationsSessionRepository.this.jdbcOperations.update(
-						JdbcOperationsSessionRepository.this.deleteSessionQuery, id);
+				JdbcOperationsSessionRepository.this.jdbcOperations
+						.update(JdbcOperationsSessionRepository.this.deleteSessionQuery, id);
 			}
 
 		});
 	}
 
 	@Override
-	public Map<String, JdbcSession> findByIndexNameAndIndexValue(String indexName,
-			final String indexValue) {
+	public Map<String, JdbcSession> findByIndexNameAndIndexValue(String indexName, final String indexValue) {
 		if (!PRINCIPAL_NAME_INDEX_NAME.equals(indexName)) {
 			return Collections.emptyMap();
 		}
 
-		List<JdbcSession> sessions = this.transactionOperations.execute((status) ->
-				JdbcOperationsSessionRepository.this.jdbcOperations.query(
+		List<JdbcSession> sessions = this.transactionOperations
+				.execute((status) -> JdbcOperationsSessionRepository.this.jdbcOperations.query(
 						JdbcOperationsSessionRepository.this.listSessionsByPrincipalNameQuery,
-						(ps) -> ps.setString(1, indexValue),
-						JdbcOperationsSessionRepository.this.extractor));
+						(ps) -> ps.setString(1, indexValue), JdbcOperationsSessionRepository.this.extractor));
 
-		Map<String, JdbcSession> sessionMap = new HashMap<>(
-				sessions.size());
+		Map<String, JdbcSession> sessionMap = new HashMap<>(sessions.size());
 
 		for (JdbcSession session : sessions) {
 			sessionMap.put(session.getId(), session);
@@ -528,19 +526,19 @@ public class JdbcOperationsSessionRepository implements
 		if (attributeNames.size() > 1) {
 			this.jdbcOperations.batchUpdate(this.createSessionAttributeQuery, new BatchPreparedStatementSetter() {
 
-						@Override
-						public void setValues(PreparedStatement ps, int i) throws SQLException {
-							String attributeName = attributeNames.get(i);
-							ps.setString(1, attributeName);
-							getLobHandler().getLobCreator().setBlobAsBytes(ps, 2,
-									serialize(session.getAttribute(attributeName)));
-							ps.setString(3, session.getId());
-						}
+				@Override
+				public void setValues(PreparedStatement ps, int i) throws SQLException {
+					String attributeName = attributeNames.get(i);
+					ps.setString(1, attributeName);
+					getLobHandler().getLobCreator().setBlobAsBytes(ps, 2,
+							serialize(session.getAttribute(attributeName)));
+					ps.setString(3, session.getId());
+				}
 
-						@Override
-						public int getBatchSize() {
-							return attributeNames.size();
-						}
+				@Override
+				public int getBatchSize() {
+					return attributeNames.size();
+				}
 
 			});
 		}
@@ -548,8 +546,7 @@ public class JdbcOperationsSessionRepository implements
 			this.jdbcOperations.update(this.createSessionAttributeQuery, (ps) -> {
 				String attributeName = attributeNames.get(0);
 				ps.setString(1, attributeName);
-				getLobHandler().getLobCreator().setBlobAsBytes(ps, 2,
-						serialize(session.getAttribute(attributeName)));
+				getLobHandler().getLobCreator().setBlobAsBytes(ps, 2, serialize(session.getAttribute(attributeName)));
 				ps.setString(3, session.getId());
 			});
 		}
@@ -560,27 +557,26 @@ public class JdbcOperationsSessionRepository implements
 		if (attributeNames.size() > 1) {
 			this.jdbcOperations.batchUpdate(this.updateSessionAttributeQuery, new BatchPreparedStatementSetter() {
 
-						@Override
-						public void setValues(PreparedStatement ps, int i) throws SQLException {
-							String attributeName = attributeNames.get(i);
-							getLobHandler().getLobCreator().setBlobAsBytes(ps, 1,
-									serialize(session.getAttribute(attributeName)));
-							ps.setString(2, session.primaryKey);
-							ps.setString(3, attributeName);
-						}
+				@Override
+				public void setValues(PreparedStatement ps, int i) throws SQLException {
+					String attributeName = attributeNames.get(i);
+					getLobHandler().getLobCreator().setBlobAsBytes(ps, 1,
+							serialize(session.getAttribute(attributeName)));
+					ps.setString(2, session.primaryKey);
+					ps.setString(3, attributeName);
+				}
 
-						@Override
-						public int getBatchSize() {
-							return attributeNames.size();
-						}
+				@Override
+				public int getBatchSize() {
+					return attributeNames.size();
+				}
 
 			});
 		}
 		else {
 			this.jdbcOperations.update(this.updateSessionAttributeQuery, (ps) -> {
 				String attributeName = attributeNames.get(0);
-				getLobHandler().getLobCreator().setBlobAsBytes(ps, 1,
-						serialize(session.getAttribute(attributeName)));
+				getLobHandler().getLobCreator().setBlobAsBytes(ps, 1, serialize(session.getAttribute(attributeName)));
 				ps.setString(2, session.primaryKey);
 				ps.setString(3, attributeName);
 			});
@@ -592,17 +588,17 @@ public class JdbcOperationsSessionRepository implements
 		if (attributeNames.size() > 1) {
 			this.jdbcOperations.batchUpdate(this.deleteSessionAttributeQuery, new BatchPreparedStatementSetter() {
 
-						@Override
-						public void setValues(PreparedStatement ps, int i) throws SQLException {
-							String attributeName = attributeNames.get(i);
-							ps.setString(1, session.primaryKey);
-							ps.setString(2, attributeName);
-						}
+				@Override
+				public void setValues(PreparedStatement ps, int i) throws SQLException {
+					String attributeName = attributeNames.get(i);
+					ps.setString(1, session.primaryKey);
+					ps.setString(2, attributeName);
+				}
 
-						@Override
-						public int getBatchSize() {
-							return attributeNames.size();
-						}
+				@Override
+				public int getBatchSize() {
+					return attributeNames.size();
+				}
 
 			});
 		}
@@ -616,8 +612,8 @@ public class JdbcOperationsSessionRepository implements
 	}
 
 	public void cleanUpExpiredSessions() {
-		Integer deletedCount = this.transactionOperations.execute((status) ->
-				JdbcOperationsSessionRepository.this.jdbcOperations.update(
+		Integer deletedCount = this.transactionOperations
+				.execute((status) -> JdbcOperationsSessionRepository.this.jdbcOperations.update(
 						JdbcOperationsSessionRepository.this.deleteSessionsByExpiryTimeQuery,
 						System.currentTimeMillis()));
 
@@ -626,22 +622,17 @@ public class JdbcOperationsSessionRepository implements
 		}
 	}
 
-	private static TransactionTemplate createTransactionTemplate(
-			PlatformTransactionManager transactionManager) {
-		TransactionTemplate transactionTemplate = new TransactionTemplate(
-				transactionManager);
-		transactionTemplate.setPropagationBehavior(
-				TransactionDefinition.PROPAGATION_REQUIRES_NEW);
+	private static TransactionTemplate createTransactionTemplate(PlatformTransactionManager transactionManager) {
+		TransactionTemplate transactionTemplate = new TransactionTemplate(transactionManager);
+		transactionTemplate.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
 		transactionTemplate.afterPropertiesSet();
 		return transactionTemplate;
 	}
 
 	private static GenericConversionService createDefaultConversionService() {
 		GenericConversionService converter = new GenericConversionService();
-		converter.addConverter(Object.class, byte[].class,
-				new SerializingConverter());
-		converter.addConverter(byte[].class, Object.class,
-				new DeserializingConverter());
+		converter.addConverter(Object.class, byte[].class, new SerializingConverter());
+		converter.addConverter(byte[].class, Object.class, new DeserializingConverter());
 		return converter;
 	}
 
@@ -657,10 +648,8 @@ public class JdbcOperationsSessionRepository implements
 		this.updateSessionAttributeQuery = getQuery(UPDATE_SESSION_ATTRIBUTE_QUERY);
 		this.deleteSessionAttributeQuery = getQuery(DELETE_SESSION_ATTRIBUTE_QUERY);
 		this.deleteSessionQuery = getQuery(DELETE_SESSION_QUERY);
-		this.listSessionsByPrincipalNameQuery =
-				getQuery(LIST_SESSIONS_BY_PRINCIPAL_NAME_QUERY);
-		this.deleteSessionsByExpiryTimeQuery =
-				getQuery(DELETE_SESSIONS_BY_EXPIRY_TIME_QUERY);
+		this.listSessionsByPrincipalNameQuery = getQuery(LIST_SESSIONS_BY_PRINCIPAL_NAME_QUERY);
+		this.deleteSessionsByExpiryTimeQuery = getQuery(DELETE_SESSIONS_BY_EXPIRY_TIME_QUERY);
 	}
 
 	private LobHandler getLobHandler() {
@@ -668,8 +657,7 @@ public class JdbcOperationsSessionRepository implements
 	}
 
 	private byte[] serialize(Object object) {
-		return (byte[]) this.conversionService.convert(object,
-				TypeDescriptor.valueOf(Object.class),
+		return (byte[]) this.conversionService.convert(object, TypeDescriptor.valueOf(Object.class),
 				TypeDescriptor.valueOf(byte[].class));
 	}
 
@@ -793,27 +781,20 @@ public class JdbcOperationsSessionRepository implements
 			}
 			if (attributeExists) {
 				if (attributeRemoved) {
-					this.delta.merge(attributeName, DeltaValue.REMOVED, (oldDeltaValue,
-							deltaValue) -> (oldDeltaValue == DeltaValue.ADDED) ? null
-									: deltaValue);
+					this.delta.merge(attributeName, DeltaValue.REMOVED,
+							(oldDeltaValue, deltaValue) -> (oldDeltaValue == DeltaValue.ADDED) ? null : deltaValue);
 				}
 				else {
-					this.delta.merge(attributeName, DeltaValue.UPDATED,
-							(oldDeltaValue,
-									deltaValue) -> (oldDeltaValue == DeltaValue.ADDED)
-											? oldDeltaValue
-											: deltaValue);
+					this.delta.merge(attributeName, DeltaValue.UPDATED, (oldDeltaValue,
+							deltaValue) -> (oldDeltaValue == DeltaValue.ADDED) ? oldDeltaValue : deltaValue);
 				}
 			}
 			else {
-				this.delta.merge(attributeName, DeltaValue.ADDED,
-						(oldDeltaValue, deltaValue) -> (oldDeltaValue == DeltaValue.ADDED)
-								? oldDeltaValue
-								: DeltaValue.UPDATED);
+				this.delta.merge(attributeName, DeltaValue.ADDED, (oldDeltaValue,
+						deltaValue) -> (oldDeltaValue == DeltaValue.ADDED) ? oldDeltaValue : DeltaValue.UPDATED);
 			}
 			this.delegate.setAttribute(attributeName, value(attributeValue));
-			if (PRINCIPAL_NAME_INDEX_NAME.equals(attributeName) ||
-					SPRING_SECURITY_CONTEXT.equals(attributeName)) {
+			if (PRINCIPAL_NAME_INDEX_NAME.equals(attributeName) || SPRING_SECURITY_CONTEXT.equals(attributeName)) {
 				this.changed = true;
 			}
 		}
@@ -873,8 +854,7 @@ public class JdbcOperationsSessionRepository implements
 			}
 			Object authentication = session.getAttribute(SPRING_SECURITY_CONTEXT);
 			if (authentication != null) {
-				Expression expression = this.parser
-						.parseExpression("authentication?.name");
+				Expression expression = this.parser.parseExpression("authentication?.name");
 				return expression.getValue(authentication, String.class);
 			}
 			return null;
@@ -904,8 +884,7 @@ public class JdbcOperationsSessionRepository implements
 				String attributeName = rs.getString("ATTRIBUTE_NAME");
 				if (attributeName != null) {
 					byte[] bytes = getLobHandler().getBlobAsBytes(rs, "ATTRIBUTE_BYTES");
-					session.delegate.setAttribute(attributeName,
-							lazily(() -> deserialize(bytes)));
+					session.delegate.setAttribute(attributeName, lazily(() -> deserialize(bytes)));
 				}
 				sessions.add(session);
 			}

spring-session-jdbc/src/main/java/org/springframework/session/jdbc/config/annotation/SpringSessionDataSource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -34,8 +34,7 @@ import org.springframework.session.jdbc.JdbcOperationsSessionRepository;
  * @author Vedran Pavic
  * @since 2.0.0
  */
-@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE,
-		ElementType.ANNOTATION_TYPE })
+@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE, ElementType.ANNOTATION_TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @Qualifier

spring-session-jdbc/src/main/java/org/springframework/session/jdbc/config/annotation/web/http/JdbcHttpSessionConfiguration.java

@@ -67,8 +67,7 @@ import org.springframework.util.StringValueResolver;
 @Configuration(proxyBeanMethods = false)
 @EnableScheduling
 public class JdbcHttpSessionConfiguration extends SpringHttpSessionConfiguration
-		implements BeanClassLoaderAware, EmbeddedValueResolverAware, ImportAware,
-		SchedulingConfigurer {
+		implements BeanClassLoaderAware, EmbeddedValueResolverAware, ImportAware, SchedulingConfigurer {
 
 	static final String DEFAULT_CLEANUP_CRON = "0 * * * * *";
 
@@ -95,13 +94,12 @@ public class JdbcHttpSessionConfiguration extends SpringHttpSessionConfiguration
 	@Bean
 	public JdbcOperationsSessionRepository sessionRepository() {
 		JdbcTemplate jdbcTemplate = createJdbcTemplate(this.dataSource);
-		JdbcOperationsSessionRepository sessionRepository = new JdbcOperationsSessionRepository(
-				jdbcTemplate, this.transactionManager);
+		JdbcOperationsSessionRepository sessionRepository = new JdbcOperationsSessionRepository(jdbcTemplate,
+				this.transactionManager);
 		if (StringUtils.hasText(this.tableName)) {
 			sessionRepository.setTableName(this.tableName);
 		}
-		sessionRepository
-				.setDefaultMaxInactiveInterval(this.maxInactiveIntervalInSeconds);
+		sessionRepository.setDefaultMaxInactiveInterval(this.maxInactiveIntervalInSeconds);
 		if (this.lobHandler != null) {
 			sessionRepository.setLobHandler(this.lobHandler);
 		}
@@ -117,16 +115,14 @@ public class JdbcHttpSessionConfiguration extends SpringHttpSessionConfiguration
 			sessionRepository.setConversionService(this.conversionService);
 		}
 		else {
-			sessionRepository
-					.setConversionService(createConversionServiceWithBeanClassLoader());
+			sessionRepository.setConversionService(createConversionServiceWithBeanClassLoader());
 		}
 		return sessionRepository;
 	}
 
 	private static boolean requiresTemporaryLob(DataSource dataSource) {
 		try {
-			String productName = JdbcUtils.extractDatabaseMetaData(dataSource,
-					"getDatabaseProductName");
+			String productName = JdbcUtils.extractDatabaseMetaData(dataSource, "getDatabaseProductName");
 			return "Oracle".equalsIgnoreCase(JdbcUtils.commonDatabaseName(productName));
 		}
 		catch (MetaDataAccessException ex) {
@@ -147,8 +143,7 @@ public class JdbcHttpSessionConfiguration extends SpringHttpSessionConfiguration
 	}
 
 	@Autowired
-	public void setDataSource(
-			@SpringSessionDataSource ObjectProvider<DataSource> springSessionDataSource,
+	public void setDataSource(@SpringSessionDataSource ObjectProvider<DataSource> springSessionDataSource,
 			ObjectProvider<DataSource> dataSource) {
 		DataSource dataSourceToUse = springSessionDataSource.getIfAvailable();
 		if (dataSourceToUse == null) {
@@ -195,12 +190,10 @@ public class JdbcHttpSessionConfiguration extends SpringHttpSessionConfiguration
 		Map<String, Object> attributeMap = importMetadata
 				.getAnnotationAttributes(EnableJdbcHttpSession.class.getName());
 		AnnotationAttributes attributes = AnnotationAttributes.fromMap(attributeMap);
-		this.maxInactiveIntervalInSeconds = attributes
-				.getNumber("maxInactiveIntervalInSeconds");
+		this.maxInactiveIntervalInSeconds = attributes.getNumber("maxInactiveIntervalInSeconds");
 		String tableNameValue = attributes.getString("tableName");
 		if (StringUtils.hasText(tableNameValue)) {
-			this.tableName = this.embeddedValueResolver
-					.resolveStringValue(tableNameValue);
+			this.tableName = this.embeddedValueResolver.resolveStringValue(tableNameValue);
 		}
 		String cleanupCron = attributes.getString("cleanupCron");
 		if (StringUtils.hasText(cleanupCron)) {
@@ -210,8 +203,7 @@ public class JdbcHttpSessionConfiguration extends SpringHttpSessionConfiguration
 
 	@Override
 	public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
-		taskRegistrar.addCronTask(() -> sessionRepository().cleanUpExpiredSessions(),
-				this.cleanupCron);
+		taskRegistrar.addCronTask(() -> sessionRepository().cleanUpExpiredSessions(), this.cleanupCron);
 	}
 
 	private static JdbcTemplate createJdbcTemplate(DataSource dataSource) {
@@ -222,10 +214,8 @@ public class JdbcHttpSessionConfiguration extends SpringHttpSessionConfiguration
 
 	private GenericConversionService createConversionServiceWithBeanClassLoader() {
 		GenericConversionService conversionService = new GenericConversionService();
-		conversionService.addConverter(Object.class, byte[].class,
-				new SerializingConverter());
-		conversionService.addConverter(byte[].class, Object.class,
-				new DeserializingConverter(this.classLoader));
+		conversionService.addConverter(Object.class, byte[].class, new SerializingConverter());
+		conversionService.addConverter(byte[].class, Object.class, new DeserializingConverter(this.classLoader));
 		return conversionService;
 	}
 

spring-session-jdbc/src/test/java/org/springframework/session/jdbc/JdbcOperationsSessionRepositoryTests.java

@@ -63,256 +63,219 @@ import static org.mockito.Mockito.verifyZeroInteractions;
  * @author Craig Andrews
  * @since 1.2.0
  */
-public class JdbcOperationsSessionRepositoryTests {
+class JdbcOperationsSessionRepositoryTests {
 
 	private static final String SPRING_SECURITY_CONTEXT = "SPRING_SECURITY_CONTEXT";
 
 	private JdbcOperations jdbcOperations = mock(JdbcOperations.class);
 
-	private PlatformTransactionManager transactionManager = mock(
-			PlatformTransactionManager.class);
+	private PlatformTransactionManager transactionManager = mock(PlatformTransactionManager.class);
 
 	private JdbcOperationsSessionRepository repository;
 
 	@BeforeEach
-	public void setUp() {
-		this.repository = new JdbcOperationsSessionRepository(this.jdbcOperations,
-				this.transactionManager);
+	void setUp() {
+		this.repository = new JdbcOperationsSessionRepository(this.jdbcOperations, this.transactionManager);
 	}
 
 	@Test
-	public void constructorNullJdbcOperations() {
-		assertThatIllegalArgumentException().isThrownBy(
-				() -> new JdbcOperationsSessionRepository(null, this.transactionManager))
+	void constructorNullJdbcOperations() {
+		assertThatIllegalArgumentException()
+				.isThrownBy(() -> new JdbcOperationsSessionRepository(null, this.transactionManager))
 				.withMessage("JdbcOperations must not be null");
 	}
 
 	@Test
-	public void constructorNullTransactionManager() {
-		assertThatIllegalArgumentException().isThrownBy(
-				() -> new JdbcOperationsSessionRepository(this.jdbcOperations, null))
+	void constructorNullTransactionManager() {
+		assertThatIllegalArgumentException()
+				.isThrownBy(() -> new JdbcOperationsSessionRepository(this.jdbcOperations, null))
 				.withMessage("TransactionManager must not be null");
 	}
 
 	@Test
-	public void setTableNameNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.repository.setTableName(null))
+	void setTableNameNull() {
+		assertThatIllegalArgumentException().isThrownBy(() -> this.repository.setTableName(null))
 				.withMessage("Table name must not be empty");
 	}
 
 	@Test
-	public void setTableNameEmpty() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.repository.setTableName(" "))
+	void setTableNameEmpty() {
+		assertThatIllegalArgumentException().isThrownBy(() -> this.repository.setTableName(" "))
 				.withMessage("Table name must not be empty");
 	}
 
 	@Test
-	public void setCreateSessionQueryNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.repository.setCreateSessionQuery(null))
+	void setCreateSessionQueryNull() {
+		assertThatIllegalArgumentException().isThrownBy(() -> this.repository.setCreateSessionQuery(null))
 				.withMessage("Query must not be empty");
 	}
 
 	@Test
-	public void setCreateSessionQueryEmpty() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.repository.setCreateSessionQuery(" "))
+	void setCreateSessionQueryEmpty() {
+		assertThatIllegalArgumentException().isThrownBy(() -> this.repository.setCreateSessionQuery(" "))
 				.withMessage("Query must not be empty");
 	}
 
 	@Test
-	public void setCreateSessionAttributeQueryNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.repository.setCreateSessionAttributeQuery(null))
+	void setCreateSessionAttributeQueryNull() {
+		assertThatIllegalArgumentException().isThrownBy(() -> this.repository.setCreateSessionAttributeQuery(null))
 				.withMessage("Query must not be empty");
 	}
 
 	@Test
-	public void setCreateSessionAttributeQueryEmpty() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.repository.setCreateSessionAttributeQuery(" "))
+	void setCreateSessionAttributeQueryEmpty() {
+		assertThatIllegalArgumentException().isThrownBy(() -> this.repository.setCreateSessionAttributeQuery(" "))
 				.withMessage("Query must not be empty");
 	}
 
 	@Test
-	public void setGetSessionQueryNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.repository.setGetSessionQuery(null))
+	void setGetSessionQueryNull() {
+		assertThatIllegalArgumentException().isThrownBy(() -> this.repository.setGetSessionQuery(null))
 				.withMessage("Query must not be empty");
 	}
 
 	@Test
-	public void setGetSessionQueryEmpty() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.repository.setGetSessionQuery(" "))
+	void setGetSessionQueryEmpty() {
+		assertThatIllegalArgumentException().isThrownBy(() -> this.repository.setGetSessionQuery(" "))
 				.withMessage("Query must not be empty");
 	}
 
 	@Test
-	public void setUpdateSessionQueryNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.repository.setUpdateSessionQuery(null))
+	void setUpdateSessionQueryNull() {
+		assertThatIllegalArgumentException().isThrownBy(() -> this.repository.setUpdateSessionQuery(null))
 				.withMessage("Query must not be empty");
 	}
 
 	@Test
-	public void setUpdateSessionQueryEmpty() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.repository.setUpdateSessionQuery(" "))
+	void setUpdateSessionQueryEmpty() {
+		assertThatIllegalArgumentException().isThrownBy(() -> this.repository.setUpdateSessionQuery(" "))
 				.withMessage("Query must not be empty");
 	}
 
 	@Test
-	public void setUpdateSessionAttributeQueryNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.repository.setUpdateSessionAttributeQuery(null))
+	void setUpdateSessionAttributeQueryNull() {
+		assertThatIllegalArgumentException().isThrownBy(() -> this.repository.setUpdateSessionAttributeQuery(null))
 				.withMessage("Query must not be empty");
 	}
 
 	@Test
-	public void setUpdateSessionAttributeQueryEmpty() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.repository.setUpdateSessionAttributeQuery(" "))
+	void setUpdateSessionAttributeQueryEmpty() {
+		assertThatIllegalArgumentException().isThrownBy(() -> this.repository.setUpdateSessionAttributeQuery(" "))
 				.withMessage("Query must not be empty");
 	}
 
 	@Test
-	public void setDeleteSessionAttributeQueryNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.repository.setDeleteSessionAttributeQuery(null))
+	void setDeleteSessionAttributeQueryNull() {
+		assertThatIllegalArgumentException().isThrownBy(() -> this.repository.setDeleteSessionAttributeQuery(null))
 				.withMessage("Query must not be empty");
 	}
 
 	@Test
-	public void setDeleteSessionAttributeQueryEmpty() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.repository.setDeleteSessionAttributeQuery(" "))
+	void setDeleteSessionAttributeQueryEmpty() {
+		assertThatIllegalArgumentException().isThrownBy(() -> this.repository.setDeleteSessionAttributeQuery(" "))
 				.withMessage("Query must not be empty");
 	}
 
 	@Test
-	public void setDeleteSessionQueryNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.repository.setDeleteSessionQuery(null))
+	void setDeleteSessionQueryNull() {
+		assertThatIllegalArgumentException().isThrownBy(() -> this.repository.setDeleteSessionQuery(null))
 				.withMessage("Query must not be empty");
 	}
 
 	@Test
-	public void setDeleteSessionQueryEmpty() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.repository.setDeleteSessionQuery(" "))
+	void setDeleteSessionQueryEmpty() {
+		assertThatIllegalArgumentException().isThrownBy(() -> this.repository.setDeleteSessionQuery(" "))
 				.withMessage("Query must not be empty");
 	}
 
 	@Test
-	public void setListSessionsByPrincipalNameQueryNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(
-						() -> this.repository.setListSessionsByPrincipalNameQuery(null))
+	void setListSessionsByPrincipalNameQueryNull() {
+		assertThatIllegalArgumentException().isThrownBy(() -> this.repository.setListSessionsByPrincipalNameQuery(null))
 				.withMessage("Query must not be empty");
 	}
 
 	@Test
-	public void setListSessionsByPrincipalNameQueryEmpty() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(
-						() -> this.repository.setListSessionsByPrincipalNameQuery(" "))
+	void setListSessionsByPrincipalNameQueryEmpty() {
+		assertThatIllegalArgumentException().isThrownBy(() -> this.repository.setListSessionsByPrincipalNameQuery(" "))
 				.withMessage("Query must not be empty");
 	}
 
 	@Test
-	public void setDeleteSessionsByLastAccessTimeQueryNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(
-						() -> this.repository.setDeleteSessionsByExpiryTimeQuery(null))
+	void setDeleteSessionsByLastAccessTimeQueryNull() {
+		assertThatIllegalArgumentException().isThrownBy(() -> this.repository.setDeleteSessionsByExpiryTimeQuery(null))
 				.withMessage("Query must not be empty");
 	}
 
 	@Test
-	public void setDeleteSessionsByLastAccessTimeQueryEmpty() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.repository.setDeleteSessionsByExpiryTimeQuery(" "))
+	void setDeleteSessionsByLastAccessTimeQueryEmpty() {
+		assertThatIllegalArgumentException().isThrownBy(() -> this.repository.setDeleteSessionsByExpiryTimeQuery(" "))
 				.withMessage("Query must not be empty");
 	}
 
 	@Test
-	public void setLobHandlerNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.repository.setLobHandler(null))
+	void setLobHandlerNull() {
+		assertThatIllegalArgumentException().isThrownBy(() -> this.repository.setLobHandler(null))
 				.withMessage("LobHandler must not be null");
 	}
 
 	@Test
-	public void setConversionServiceNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.repository.setConversionService(null))
+	void setConversionServiceNull() {
+		assertThatIllegalArgumentException().isThrownBy(() -> this.repository.setConversionService(null))
 				.withMessage("conversionService must not be null");
 	}
 
 	@Test
-	public void createSessionDefaultMaxInactiveInterval() {
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository
-				.createSession();
+	void createSessionDefaultMaxInactiveInterval() {
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.createSession();
 
 		assertThat(session.isNew()).isTrue();
-		assertThat(session.getMaxInactiveInterval())
-				.isEqualTo(new MapSession().getMaxInactiveInterval());
+		assertThat(session.getMaxInactiveInterval()).isEqualTo(new MapSession().getMaxInactiveInterval());
 		verifyZeroInteractions(this.jdbcOperations);
 	}
 
 	@Test
-	public void createSessionCustomMaxInactiveInterval() {
+	void createSessionCustomMaxInactiveInterval() {
 		int interval = 1;
 		this.repository.setDefaultMaxInactiveInterval(interval);
 
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository
-				.createSession();
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.createSession();
 
 		assertThat(session.isNew()).isTrue();
-		assertThat(session.getMaxInactiveInterval())
-				.isEqualTo(Duration.ofSeconds(interval));
+		assertThat(session.getMaxInactiveInterval()).isEqualTo(Duration.ofSeconds(interval));
 		verifyZeroInteractions(this.jdbcOperations);
 	}
 
 	@Test
-	public void saveNewWithoutAttributes() {
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository
-				.createSession();
+	void saveNewWithoutAttributes() {
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.createSession();
 
 		this.repository.save(session);
 
 		assertThat(session.isNew()).isFalse();
 		assertPropagationRequiresNew();
-		verify(this.jdbcOperations, times(1)).update(startsWith("INSERT"),
-				isA(PreparedStatementSetter.class));
+		verify(this.jdbcOperations, times(1)).update(startsWith("INSERT"), isA(PreparedStatementSetter.class));
 		verifyZeroInteractions(this.jdbcOperations);
 	}
 
 	@Test
-	public void saveNewWithSingleAttribute() {
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository
-				.createSession();
+	void saveNewWithSingleAttribute() {
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.createSession();
 		session.setAttribute("testName", "testValue");
 
 		this.repository.save(session);
 
 		assertThat(session.isNew()).isFalse();
 		assertPropagationRequiresNew();
-		verify(this.jdbcOperations, times(1)).update(
-				startsWith("INSERT INTO SPRING_SESSION("),
+		verify(this.jdbcOperations, times(1)).update(startsWith("INSERT INTO SPRING_SESSION("),
 				isA(PreparedStatementSetter.class));
-		verify(this.jdbcOperations, times(1)).update(
-				startsWith("INSERT INTO SPRING_SESSION_ATTRIBUTES("),
+		verify(this.jdbcOperations, times(1)).update(startsWith("INSERT INTO SPRING_SESSION_ATTRIBUTES("),
 				isA(PreparedStatementSetter.class));
 		verifyZeroInteractions(this.jdbcOperations);
 	}
 
 	@Test
-	public void saveNewWithMultipleAttributes() {
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository
-				.createSession();
+	void saveNewWithMultipleAttributes() {
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.createSession();
 		session.setAttribute("testName1", "testValue1");
 		session.setAttribute("testName2", "testValue2");
 
@@ -320,35 +283,32 @@ public class JdbcOperationsSessionRepositoryTests {
 
 		assertThat(session.isNew()).isFalse();
 		assertPropagationRequiresNew();
-		verify(this.jdbcOperations, times(1)).update(
-				startsWith("INSERT INTO SPRING_SESSION("),
+		verify(this.jdbcOperations, times(1)).update(startsWith("INSERT INTO SPRING_SESSION("),
 				isA(PreparedStatementSetter.class));
-		verify(this.jdbcOperations, times(1)).batchUpdate(
-				startsWith("INSERT INTO SPRING_SESSION_ATTRIBUTES("),
+		verify(this.jdbcOperations, times(1)).batchUpdate(startsWith("INSERT INTO SPRING_SESSION_ATTRIBUTES("),
 				isA(BatchPreparedStatementSetter.class));
 		verifyZeroInteractions(this.jdbcOperations);
 	}
 
 	@Test
-	public void saveUpdatedAddSingleAttribute() {
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository.new JdbcSession(
-				"primaryKey", new MapSession());
+	void saveUpdatedAddSingleAttribute() {
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.new JdbcSession("primaryKey",
+				new MapSession());
 		session.setAttribute("testName", "testValue");
 
 		this.repository.save(session);
 
 		assertThat(session.isNew()).isFalse();
 		assertPropagationRequiresNew();
-		verify(this.jdbcOperations, times(1)).update(
-				startsWith("INSERT INTO SPRING_SESSION_ATTRIBUTES("),
+		verify(this.jdbcOperations, times(1)).update(startsWith("INSERT INTO SPRING_SESSION_ATTRIBUTES("),
 				isA(PreparedStatementSetter.class));
 		verifyZeroInteractions(this.jdbcOperations);
 	}
 
 	@Test
-	public void saveUpdatedAddMultipleAttributes() {
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository.new JdbcSession(
-				"primaryKey", new MapSession());
+	void saveUpdatedAddMultipleAttributes() {
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.new JdbcSession("primaryKey",
+				new MapSession());
 		session.setAttribute("testName1", "testValue1");
 		session.setAttribute("testName2", "testValue2");
 
@@ -356,16 +316,15 @@ public class JdbcOperationsSessionRepositoryTests {
 
 		assertThat(session.isNew()).isFalse();
 		assertPropagationRequiresNew();
-		verify(this.jdbcOperations, times(1)).batchUpdate(
-				startsWith("INSERT INTO SPRING_SESSION_ATTRIBUTES("),
+		verify(this.jdbcOperations, times(1)).batchUpdate(startsWith("INSERT INTO SPRING_SESSION_ATTRIBUTES("),
 				isA(BatchPreparedStatementSetter.class));
 		verifyZeroInteractions(this.jdbcOperations);
 	}
 
 	@Test
-	public void saveUpdatedModifySingleAttribute() {
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository.new JdbcSession(
-				"primaryKey", new MapSession());
+	void saveUpdatedModifySingleAttribute() {
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.new JdbcSession("primaryKey",
+				new MapSession());
 		session.setAttribute("testName", "testValue");
 		session.clearChangeFlags();
 		session.setAttribute("testName", "testValue");
@@ -374,16 +333,15 @@ public class JdbcOperationsSessionRepositoryTests {
 
 		assertThat(session.isNew()).isFalse();
 		assertPropagationRequiresNew();
-		verify(this.jdbcOperations, times(1)).update(
-				startsWith("UPDATE SPRING_SESSION_ATTRIBUTES SET"),
+		verify(this.jdbcOperations, times(1)).update(startsWith("UPDATE SPRING_SESSION_ATTRIBUTES SET"),
 				isA(PreparedStatementSetter.class));
 		verifyZeroInteractions(this.jdbcOperations);
 	}
 
 	@Test
-	public void saveUpdatedModifyMultipleAttributes() {
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository.new JdbcSession(
-				"primaryKey", new MapSession());
+	void saveUpdatedModifyMultipleAttributes() {
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.new JdbcSession("primaryKey",
+				new MapSession());
 		session.setAttribute("testName1", "testValue1");
 		session.setAttribute("testName2", "testValue2");
 		session.clearChangeFlags();
@@ -394,16 +352,15 @@ public class JdbcOperationsSessionRepositoryTests {
 
 		assertThat(session.isNew()).isFalse();
 		assertPropagationRequiresNew();
-		verify(this.jdbcOperations, times(1)).batchUpdate(
-				startsWith("UPDATE SPRING_SESSION_ATTRIBUTES SET"),
+		verify(this.jdbcOperations, times(1)).batchUpdate(startsWith("UPDATE SPRING_SESSION_ATTRIBUTES SET"),
 				isA(BatchPreparedStatementSetter.class));
 		verifyZeroInteractions(this.jdbcOperations);
 	}
 
 	@Test
-	public void saveUpdatedRemoveSingleAttribute() {
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository.new JdbcSession(
-				"primaryKey", new MapSession());
+	void saveUpdatedRemoveSingleAttribute() {
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.new JdbcSession("primaryKey",
+				new MapSession());
 		session.setAttribute("testName", "testValue");
 		session.clearChangeFlags();
 		session.removeAttribute("testName");
@@ -412,16 +369,15 @@ public class JdbcOperationsSessionRepositoryTests {
 
 		assertThat(session.isNew()).isFalse();
 		assertPropagationRequiresNew();
-		verify(this.jdbcOperations, times(1)).update(
-				startsWith("DELETE FROM SPRING_SESSION_ATTRIBUTES WHERE"),
+		verify(this.jdbcOperations, times(1)).update(startsWith("DELETE FROM SPRING_SESSION_ATTRIBUTES WHERE"),
 				isA(PreparedStatementSetter.class));
 		verifyZeroInteractions(this.jdbcOperations);
 	}
 
 	@Test
-	public void saveUpdatedRemoveNonExistingAttribute() {
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository.new JdbcSession(
-				"primaryKey", new MapSession());
+	void saveUpdatedRemoveNonExistingAttribute() {
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.new JdbcSession("primaryKey",
+				new MapSession());
 		session.removeAttribute("testName");
 
 		this.repository.save(session);
@@ -432,9 +388,9 @@ public class JdbcOperationsSessionRepositoryTests {
 	}
 
 	@Test
-	public void saveUpdatedRemoveMultipleAttributes() {
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository.new JdbcSession(
-				"primaryKey", new MapSession());
+	void saveUpdatedRemoveMultipleAttributes() {
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.new JdbcSession("primaryKey",
+				new MapSession());
 		session.setAttribute("testName1", "testValue1");
 		session.setAttribute("testName2", "testValue2");
 		session.clearChangeFlags();
@@ -445,16 +401,15 @@ public class JdbcOperationsSessionRepositoryTests {
 
 		assertThat(session.isNew()).isFalse();
 		assertPropagationRequiresNew();
-		verify(this.jdbcOperations, times(1)).batchUpdate(
-				startsWith("DELETE FROM SPRING_SESSION_ATTRIBUTES WHERE"),
+		verify(this.jdbcOperations, times(1)).batchUpdate(startsWith("DELETE FROM SPRING_SESSION_ATTRIBUTES WHERE"),
 				isA(BatchPreparedStatementSetter.class));
 		verifyZeroInteractions(this.jdbcOperations);
 	}
 
 	@Test // gh-1070
-	public void saveUpdatedAddAndModifyAttribute() {
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository.new JdbcSession(
-				"primaryKey", new MapSession());
+	void saveUpdatedAddAndModifyAttribute() {
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.new JdbcSession("primaryKey",
+				new MapSession());
 		session.setAttribute("testName", "testValue1");
 		session.setAttribute("testName", "testValue2");
 
@@ -462,16 +417,15 @@ public class JdbcOperationsSessionRepositoryTests {
 
 		assertThat(session.isNew()).isFalse();
 		assertPropagationRequiresNew();
-		verify(this.jdbcOperations).update(
-				startsWith("INSERT INTO SPRING_SESSION_ATTRIBUTES("),
+		verify(this.jdbcOperations).update(startsWith("INSERT INTO SPRING_SESSION_ATTRIBUTES("),
 				isA(PreparedStatementSetter.class));
 		verifyZeroInteractions(this.jdbcOperations);
 	}
 
 	@Test // gh-1070
-	public void saveUpdatedAddAndRemoveAttribute() {
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository.new JdbcSession(
-				"primaryKey", new MapSession());
+	void saveUpdatedAddAndRemoveAttribute() {
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.new JdbcSession("primaryKey",
+				new MapSession());
 		session.setAttribute("testName", "testValue");
 		session.removeAttribute("testName");
 
@@ -483,9 +437,9 @@ public class JdbcOperationsSessionRepositoryTests {
 	}
 
 	@Test // gh-1070
-	public void saveUpdatedModifyAndRemoveAttribute() {
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository.new JdbcSession(
-				"primaryKey", new MapSession());
+	void saveUpdatedModifyAndRemoveAttribute() {
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.new JdbcSession("primaryKey",
+				new MapSession());
 		session.setAttribute("testName", "testValue1");
 		session.clearChangeFlags();
 		session.setAttribute("testName", "testValue2");
@@ -495,16 +449,15 @@ public class JdbcOperationsSessionRepositoryTests {
 
 		assertThat(session.isNew()).isFalse();
 		assertPropagationRequiresNew();
-		verify(this.jdbcOperations).update(
-				startsWith("DELETE FROM SPRING_SESSION_ATTRIBUTES WHERE"),
+		verify(this.jdbcOperations).update(startsWith("DELETE FROM SPRING_SESSION_ATTRIBUTES WHERE"),
 				isA(PreparedStatementSetter.class));
 		verifyZeroInteractions(this.jdbcOperations);
 	}
 
 	@Test // gh-1070
-	public void saveUpdatedRemoveAndAddAttribute() {
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository.new JdbcSession(
-				"primaryKey", new MapSession());
+	void saveUpdatedRemoveAndAddAttribute() {
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.new JdbcSession("primaryKey",
+				new MapSession());
 		session.setAttribute("testName", "testValue1");
 		session.clearChangeFlags();
 		session.removeAttribute("testName");
@@ -514,32 +467,30 @@ public class JdbcOperationsSessionRepositoryTests {
 
 		assertThat(session.isNew()).isFalse();
 		assertPropagationRequiresNew();
-		verify(this.jdbcOperations).update(
-				startsWith("UPDATE SPRING_SESSION_ATTRIBUTES SET"),
+		verify(this.jdbcOperations).update(startsWith("UPDATE SPRING_SESSION_ATTRIBUTES SET"),
 				isA(PreparedStatementSetter.class));
 		verifyZeroInteractions(this.jdbcOperations);
 	}
 
 	@Test
-	public void saveUpdatedLastAccessedTime() {
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository.new JdbcSession(
-				"primaryKey", new MapSession());
+	void saveUpdatedLastAccessedTime() {
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.new JdbcSession("primaryKey",
+				new MapSession());
 		session.setLastAccessedTime(Instant.now());
 
 		this.repository.save(session);
 
 		assertThat(session.isNew()).isFalse();
 		assertPropagationRequiresNew();
-		verify(this.jdbcOperations, times(1)).update(
-				startsWith("UPDATE SPRING_SESSION SET"),
+		verify(this.jdbcOperations, times(1)).update(startsWith("UPDATE SPRING_SESSION SET"),
 				isA(PreparedStatementSetter.class));
 		verifyZeroInteractions(this.jdbcOperations);
 	}
 
 	@Test
-	public void saveUnchanged() {
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository.new JdbcSession(
-				"primaryKey", new MapSession());
+	void saveUnchanged() {
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.new JdbcSession("primaryKey",
+				new MapSession());
 
 		this.repository.save(session);
 
@@ -549,64 +500,56 @@ public class JdbcOperationsSessionRepositoryTests {
 
 	@Test
 	@SuppressWarnings("unchecked")
-	public void getSessionNotFound() {
+	void getSessionNotFound() {
 		String sessionId = "testSessionId";
-		given(this.jdbcOperations.query(isA(String.class),
-				isA(PreparedStatementSetter.class), isA(ResultSetExtractor.class)))
-						.willReturn(Collections.emptyList());
+		given(this.jdbcOperations.query(isA(String.class), isA(PreparedStatementSetter.class),
+				isA(ResultSetExtractor.class))).willReturn(Collections.emptyList());
 
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository
-				.findById(sessionId);
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.findById(sessionId);
 
 		assertThat(session).isNull();
 		assertPropagationRequiresNew();
-		verify(this.jdbcOperations, times(1)).query(isA(String.class),
-				isA(PreparedStatementSetter.class), isA(ResultSetExtractor.class));
+		verify(this.jdbcOperations, times(1)).query(isA(String.class), isA(PreparedStatementSetter.class),
+				isA(ResultSetExtractor.class));
 	}
 
 	@Test
 	@SuppressWarnings("unchecked")
-	public void getSessionExpired() {
+	void getSessionExpired() {
 		Session expired = this.repository.new JdbcSession();
-		expired.setLastAccessedTime(Instant.now()
-				.minusSeconds(MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS + 1));
-		given(this.jdbcOperations.query(isA(String.class),
-				isA(PreparedStatementSetter.class), isA(ResultSetExtractor.class)))
-						.willReturn(Collections.singletonList(expired));
+		expired.setLastAccessedTime(Instant.now().minusSeconds(MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS + 1));
+		given(this.jdbcOperations.query(isA(String.class), isA(PreparedStatementSetter.class),
+				isA(ResultSetExtractor.class))).willReturn(Collections.singletonList(expired));
 
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository
-				.findById(expired.getId());
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.findById(expired.getId());
 
 		assertThat(session).isNull();
 		assertPropagationRequiresNew();
-		verify(this.jdbcOperations, times(1)).query(isA(String.class),
-				isA(PreparedStatementSetter.class), isA(ResultSetExtractor.class));
-		verify(this.jdbcOperations, times(1)).update(startsWith("DELETE"),
-				eq(expired.getId()));
+		verify(this.jdbcOperations, times(1)).query(isA(String.class), isA(PreparedStatementSetter.class),
+				isA(ResultSetExtractor.class));
+		verify(this.jdbcOperations, times(1)).update(startsWith("DELETE"), eq(expired.getId()));
 	}
 
 	@Test
 	@SuppressWarnings("unchecked")
-	public void getSessionFound() {
+	void getSessionFound() {
 		Session saved = this.repository.new JdbcSession("primaryKey", new MapSession());
 		saved.setAttribute("savedName", "savedValue");
-		given(this.jdbcOperations.query(isA(String.class),
-				isA(PreparedStatementSetter.class), isA(ResultSetExtractor.class)))
-						.willReturn(Collections.singletonList(saved));
+		given(this.jdbcOperations.query(isA(String.class), isA(PreparedStatementSetter.class),
+				isA(ResultSetExtractor.class))).willReturn(Collections.singletonList(saved));
 
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository
-				.findById(saved.getId());
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.findById(saved.getId());
 
 		assertThat(session.getId()).isEqualTo(saved.getId());
 		assertThat(session.isNew()).isFalse();
 		assertThat(session.<String>getAttribute("savedName")).isEqualTo("savedValue");
 		assertPropagationRequiresNew();
-		verify(this.jdbcOperations, times(1)).query(isA(String.class),
-				isA(PreparedStatementSetter.class), isA(ResultSetExtractor.class));
+		verify(this.jdbcOperations, times(1)).query(isA(String.class), isA(PreparedStatementSetter.class),
+				isA(ResultSetExtractor.class));
 	}
 
 	@Test
-	public void delete() {
+	void delete() {
 		String sessionId = "testSessionId";
 
 		this.repository.deleteById(sessionId);
@@ -616,7 +559,7 @@ public class JdbcOperationsSessionRepositoryTests {
 	}
 
 	@Test
-	public void findByIndexNameAndIndexValueUnknownIndexName() {
+	void findByIndexNameAndIndexValueUnknownIndexName() {
 		String indexValue = "testIndexValue";
 
 		Map<String, JdbcOperationsSessionRepository.JdbcSession> sessions = this.repository
@@ -628,29 +571,26 @@ public class JdbcOperationsSessionRepositoryTests {
 
 	@Test
 	@SuppressWarnings("unchecked")
-	public void findByIndexNameAndIndexValuePrincipalIndexNameNotFound() {
+	void findByIndexNameAndIndexValuePrincipalIndexNameNotFound() {
 		String principal = "username";
-		given(this.jdbcOperations.query(isA(String.class),
-				isA(PreparedStatementSetter.class), isA(ResultSetExtractor.class)))
-						.willReturn(Collections.emptyList());
+		given(this.jdbcOperations.query(isA(String.class), isA(PreparedStatementSetter.class),
+				isA(ResultSetExtractor.class))).willReturn(Collections.emptyList());
 
 		Map<String, JdbcOperationsSessionRepository.JdbcSession> sessions = this.repository
-				.findByIndexNameAndIndexValue(
-						FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME,
-						principal);
+				.findByIndexNameAndIndexValue(FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME, principal);
 
 		assertThat(sessions).isEmpty();
 		assertPropagationRequiresNew();
-		verify(this.jdbcOperations, times(1)).query(isA(String.class),
-				isA(PreparedStatementSetter.class), isA(ResultSetExtractor.class));
+		verify(this.jdbcOperations, times(1)).query(isA(String.class), isA(PreparedStatementSetter.class),
+				isA(ResultSetExtractor.class));
 	}
 
 	@Test
 	@SuppressWarnings("unchecked")
-	public void findByIndexNameAndIndexValuePrincipalIndexNameFound() {
+	void findByIndexNameAndIndexValuePrincipalIndexNameFound() {
 		String principal = "username";
-		Authentication authentication = new UsernamePasswordAuthenticationToken(principal,
-				"notused", AuthorityUtils.createAuthorityList("ROLE_USER"));
+		Authentication authentication = new UsernamePasswordAuthenticationToken(principal, "notused",
+				AuthorityUtils.createAuthorityList("ROLE_USER"));
 		List<Session> saved = new ArrayList<>(2);
 		Session saved1 = this.repository.new JdbcSession();
 		saved1.setAttribute(SPRING_SECURITY_CONTEXT, authentication);
@@ -658,23 +598,20 @@ public class JdbcOperationsSessionRepositoryTests {
 		Session saved2 = this.repository.new JdbcSession();
 		saved2.setAttribute(SPRING_SECURITY_CONTEXT, authentication);
 		saved.add(saved2);
-		given(this.jdbcOperations.query(isA(String.class),
-				isA(PreparedStatementSetter.class), isA(ResultSetExtractor.class)))
-						.willReturn(saved);
+		given(this.jdbcOperations.query(isA(String.class), isA(PreparedStatementSetter.class),
+				isA(ResultSetExtractor.class))).willReturn(saved);
 
 		Map<String, JdbcOperationsSessionRepository.JdbcSession> sessions = this.repository
-				.findByIndexNameAndIndexValue(
-						FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME,
-						principal);
+				.findByIndexNameAndIndexValue(FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME, principal);
 
 		assertThat(sessions).hasSize(2);
 		assertPropagationRequiresNew();
-		verify(this.jdbcOperations, times(1)).query(isA(String.class),
-				isA(PreparedStatementSetter.class), isA(ResultSetExtractor.class));
+		verify(this.jdbcOperations, times(1)).query(isA(String.class), isA(PreparedStatementSetter.class),
+				isA(ResultSetExtractor.class));
 	}
 
 	@Test
-	public void cleanupExpiredSessions() {
+	void cleanupExpiredSessions() {
 		this.repository.cleanUpExpiredSessions();
 
 		assertPropagationRequiresNew();
@@ -682,9 +619,8 @@ public class JdbcOperationsSessionRepositoryTests {
 	}
 
 	@Test // gh-1120
-	public void getAttributeNamesAndRemove() {
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository
-				.createSession();
+	void getAttributeNamesAndRemove() {
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.createSession();
 		session.setAttribute("attribute1", "value1");
 		session.setAttribute("attribute2", "value2");
 
@@ -696,25 +632,23 @@ public class JdbcOperationsSessionRepositoryTests {
 	}
 
 	@Test
-	public void saveNewWithoutTransaction() {
+	void saveNewWithoutTransaction() {
 		this.repository = new JdbcOperationsSessionRepository(this.jdbcOperations);
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository
-				.createSession();
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.createSession();
 
 		this.repository.save(session);
 
-		verify(this.jdbcOperations, times(1)).update(
-				startsWith("INSERT INTO SPRING_SESSION"),
+		verify(this.jdbcOperations, times(1)).update(startsWith("INSERT INTO SPRING_SESSION"),
 				isA(PreparedStatementSetter.class));
 		verifyZeroInteractions(this.jdbcOperations);
 		verifyZeroInteractions(this.transactionManager);
 	}
 
 	@Test
-	public void saveUpdatedWithoutTransaction() {
+	void saveUpdatedWithoutTransaction() {
 		this.repository = new JdbcOperationsSessionRepository(this.jdbcOperations);
-		JdbcOperationsSessionRepository.JdbcSession session = this.repository.new JdbcSession(
-				"primaryKey", new MapSession());
+		JdbcOperationsSessionRepository.JdbcSession session = this.repository.new JdbcSession("primaryKey",
+				new MapSession());
 		session.setLastAccessedTime(Instant.now());
 
 		this.repository.save(session);
@@ -727,9 +661,9 @@ public class JdbcOperationsSessionRepositoryTests {
 
 	@Test
 	@SuppressWarnings("unchecked")
-	public void findByIdWithoutTransaction() {
-		given(this.jdbcOperations.query(anyString(), any(PreparedStatementSetter.class),
-				any(ResultSetExtractor.class))).willReturn(Collections.emptyList());
+	void findByIdWithoutTransaction() {
+		given(this.jdbcOperations.query(anyString(), any(PreparedStatementSetter.class), any(ResultSetExtractor.class)))
+				.willReturn(Collections.emptyList());
 		this.repository = new JdbcOperationsSessionRepository(this.jdbcOperations);
 		this.repository.findById("testSessionId");
 
@@ -740,47 +674,43 @@ public class JdbcOperationsSessionRepositoryTests {
 	}
 
 	@Test
-	public void deleteByIdWithoutTransaction() {
+	void deleteByIdWithoutTransaction() {
 		this.repository = new JdbcOperationsSessionRepository(this.jdbcOperations);
 		this.repository.deleteById("testSessionId");
 
-		verify(this.jdbcOperations, times(1)).update(
-				eq("DELETE FROM SPRING_SESSION WHERE SESSION_ID = ?"), anyString());
+		verify(this.jdbcOperations, times(1)).update(eq("DELETE FROM SPRING_SESSION WHERE SESSION_ID = ?"),
+				anyString());
 		verifyZeroInteractions(this.jdbcOperations);
 		verifyZeroInteractions(this.transactionManager);
 	}
 
 	@Test
 	@SuppressWarnings("unchecked")
-	public void findByIndexNameAndIndexValueWithoutTransaction() {
-		given(this.jdbcOperations.query(anyString(), any(PreparedStatementSetter.class),
-				any(ResultSetExtractor.class))).willReturn(Collections.emptyList());
+	void findByIndexNameAndIndexValueWithoutTransaction() {
+		given(this.jdbcOperations.query(anyString(), any(PreparedStatementSetter.class), any(ResultSetExtractor.class)))
+				.willReturn(Collections.emptyList());
 		this.repository = new JdbcOperationsSessionRepository(this.jdbcOperations);
-		this.repository.findByIndexNameAndIndexValue(
-				FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME,
+		this.repository.findByIndexNameAndIndexValue(FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME,
 				"testIndexValue");
 
-		verify(this.jdbcOperations, times(1)).query(
-				endsWith("WHERE S.PRINCIPAL_NAME = ?"),
+		verify(this.jdbcOperations, times(1)).query(endsWith("WHERE S.PRINCIPAL_NAME = ?"),
 				isA(PreparedStatementSetter.class), isA(ResultSetExtractor.class));
 		verifyZeroInteractions(this.jdbcOperations);
 		verifyZeroInteractions(this.transactionManager);
 	}
 
 	@Test
-	public void cleanUpExpiredSessionsWithoutTransaction() {
+	void cleanUpExpiredSessionsWithoutTransaction() {
 		this.repository = new JdbcOperationsSessionRepository(this.jdbcOperations);
 		this.repository.cleanUpExpiredSessions();
 
-		verify(this.jdbcOperations, times(1)).update(
-				eq("DELETE FROM SPRING_SESSION WHERE EXPIRY_TIME < ?"), anyLong());
+		verify(this.jdbcOperations, times(1)).update(eq("DELETE FROM SPRING_SESSION WHERE EXPIRY_TIME < ?"), anyLong());
 		verifyZeroInteractions(this.jdbcOperations);
 		verifyZeroInteractions(this.transactionManager);
 	}
 
 	private void assertPropagationRequiresNew() {
-		ArgumentCaptor<TransactionDefinition> argument = ArgumentCaptor
-				.forClass(TransactionDefinition.class);
+		ArgumentCaptor<TransactionDefinition> argument = ArgumentCaptor.forClass(TransactionDefinition.class);
 		verify(this.transactionManager, atLeastOnce()).getTransaction(argument.capture());
 		assertThat(argument.getValue().getPropagationBehavior())
 				.isEqualTo(TransactionDefinition.PROPAGATION_REQUIRES_NEW);

spring-session-jdbc/src/test/java/org/springframework/session/jdbc/config/annotation/web/http/JdbcHttpSessionConfigurationTests.java

@@ -47,7 +47,7 @@ import static org.mockito.Mockito.mock;
  * @author Eddú Meléndez
  * @since 1.2.0
  */
-public class JdbcHttpSessionConfigurationTests {
+class JdbcHttpSessionConfigurationTests {
 
 	private static final String TABLE_NAME = "TEST_SESSION";
 
@@ -58,219 +58,174 @@ public class JdbcHttpSessionConfigurationTests {
 	private AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
 
 	@AfterEach
-	public void closeContext() {
+	void closeContext() {
 		if (this.context != null) {
 			this.context.close();
 		}
 	}
 
 	@Test
-	public void noDataSourceConfiguration() {
+	void noDataSourceConfiguration() {
 		assertThatExceptionOfType(BeanCreationException.class)
 				.isThrownBy(() -> registerAndRefresh(NoDataSourceConfiguration.class))
-				.withMessageContaining(
-						"expected at least 1 bean which qualifies as autowire candidate");
+				.withMessageContaining("expected at least 1 bean which qualifies as autowire candidate");
 	}
 
 	@Test
-	public void defaultConfiguration() {
+	void defaultConfiguration() {
 		registerAndRefresh(DataSourceConfiguration.class, DefaultConfiguration.class);
 
-		assertThat(this.context.getBean(JdbcOperationsSessionRepository.class))
-				.isNotNull();
+		assertThat(this.context.getBean(JdbcOperationsSessionRepository.class)).isNotNull();
 	}
 
 	@Test
-	public void customTableNameAnnotation() {
-		registerAndRefresh(DataSourceConfiguration.class,
-				CustomTableNameAnnotationConfiguration.class);
+	void customTableNameAnnotation() {
+		registerAndRefresh(DataSourceConfiguration.class, CustomTableNameAnnotationConfiguration.class);
 
-		JdbcOperationsSessionRepository repository = this.context
-				.getBean(JdbcOperationsSessionRepository.class);
+		JdbcOperationsSessionRepository repository = this.context.getBean(JdbcOperationsSessionRepository.class);
 		assertThat(repository).isNotNull();
-		assertThat(ReflectionTestUtils.getField(repository, "tableName"))
-				.isEqualTo(TABLE_NAME);
+		assertThat(ReflectionTestUtils.getField(repository, "tableName")).isEqualTo(TABLE_NAME);
 	}
 
 	@Test
-	public void customTableNameSetter() {
-		registerAndRefresh(DataSourceConfiguration.class,
-				CustomTableNameSetterConfiguration.class);
+	void customTableNameSetter() {
+		registerAndRefresh(DataSourceConfiguration.class, CustomTableNameSetterConfiguration.class);
 
-		JdbcOperationsSessionRepository repository = this.context
-				.getBean(JdbcOperationsSessionRepository.class);
+		JdbcOperationsSessionRepository repository = this.context.getBean(JdbcOperationsSessionRepository.class);
 		assertThat(repository).isNotNull();
-		assertThat(ReflectionTestUtils.getField(repository, "tableName"))
-				.isEqualTo(TABLE_NAME);
+		assertThat(ReflectionTestUtils.getField(repository, "tableName")).isEqualTo(TABLE_NAME);
 	}
 
 	@Test
-	public void customMaxInactiveIntervalInSecondsAnnotation() {
+	void customMaxInactiveIntervalInSecondsAnnotation() {
 		registerAndRefresh(DataSourceConfiguration.class,
 				CustomMaxInactiveIntervalInSecondsAnnotationConfiguration.class);
 
-		JdbcOperationsSessionRepository repository = this.context
-				.getBean(JdbcOperationsSessionRepository.class);
+		JdbcOperationsSessionRepository repository = this.context.getBean(JdbcOperationsSessionRepository.class);
 		assertThat(repository).isNotNull();
 		assertThat(ReflectionTestUtils.getField(repository, "defaultMaxInactiveInterval"))
 				.isEqualTo(MAX_INACTIVE_INTERVAL_IN_SECONDS);
 	}
 
 	@Test
-	public void customMaxInactiveIntervalInSecondsSetter() {
-		registerAndRefresh(DataSourceConfiguration.class,
-				CustomMaxInactiveIntervalInSecondsSetterConfiguration.class);
+	void customMaxInactiveIntervalInSecondsSetter() {
+		registerAndRefresh(DataSourceConfiguration.class, CustomMaxInactiveIntervalInSecondsSetterConfiguration.class);
 
-		JdbcOperationsSessionRepository repository = this.context
-				.getBean(JdbcOperationsSessionRepository.class);
+		JdbcOperationsSessionRepository repository = this.context.getBean(JdbcOperationsSessionRepository.class);
 		assertThat(repository).isNotNull();
 		assertThat(ReflectionTestUtils.getField(repository, "defaultMaxInactiveInterval"))
 				.isEqualTo(MAX_INACTIVE_INTERVAL_IN_SECONDS);
 	}
 
 	@Test
-	public void customCleanupCronAnnotation() {
-		registerAndRefresh(DataSourceConfiguration.class,
-				CustomCleanupCronExpressionAnnotationConfiguration.class);
+	void customCleanupCronAnnotation() {
+		registerAndRefresh(DataSourceConfiguration.class, CustomCleanupCronExpressionAnnotationConfiguration.class);
 
-		JdbcHttpSessionConfiguration configuration = this.context
-				.getBean(JdbcHttpSessionConfiguration.class);
+		JdbcHttpSessionConfiguration configuration = this.context.getBean(JdbcHttpSessionConfiguration.class);
 		assertThat(configuration).isNotNull();
-		assertThat(ReflectionTestUtils.getField(configuration, "cleanupCron"))
-				.isEqualTo(CLEANUP_CRON_EXPRESSION);
+		assertThat(ReflectionTestUtils.getField(configuration, "cleanupCron")).isEqualTo(CLEANUP_CRON_EXPRESSION);
 	}
 
 	@Test
-	public void customCleanupCronSetter() {
-		registerAndRefresh(DataSourceConfiguration.class,
-				CustomCleanupCronExpressionSetterConfiguration.class);
+	void customCleanupCronSetter() {
+		registerAndRefresh(DataSourceConfiguration.class, CustomCleanupCronExpressionSetterConfiguration.class);
 
-		JdbcHttpSessionConfiguration configuration = this.context
-				.getBean(JdbcHttpSessionConfiguration.class);
+		JdbcHttpSessionConfiguration configuration = this.context.getBean(JdbcHttpSessionConfiguration.class);
 		assertThat(configuration).isNotNull();
-		assertThat(ReflectionTestUtils.getField(configuration, "cleanupCron"))
-				.isEqualTo(CLEANUP_CRON_EXPRESSION);
+		assertThat(ReflectionTestUtils.getField(configuration, "cleanupCron")).isEqualTo(CLEANUP_CRON_EXPRESSION);
 	}
 
 	@Test
-	public void qualifiedDataSourceConfiguration() {
-		registerAndRefresh(DataSourceConfiguration.class,
-				QualifiedDataSourceConfiguration.class);
+	void qualifiedDataSourceConfiguration() {
+		registerAndRefresh(DataSourceConfiguration.class, QualifiedDataSourceConfiguration.class);
 
-		JdbcOperationsSessionRepository repository = this.context
-				.getBean(JdbcOperationsSessionRepository.class);
-		DataSource dataSource = this.context.getBean("qualifiedDataSource",
-				DataSource.class);
+		JdbcOperationsSessionRepository repository = this.context.getBean(JdbcOperationsSessionRepository.class);
+		DataSource dataSource = this.context.getBean("qualifiedDataSource", DataSource.class);
 		assertThat(repository).isNotNull();
 		assertThat(dataSource).isNotNull();
-		JdbcOperations jdbcOperations = (JdbcOperations) ReflectionTestUtils
-				.getField(repository, "jdbcOperations");
+		JdbcOperations jdbcOperations = (JdbcOperations) ReflectionTestUtils.getField(repository, "jdbcOperations");
 		assertThat(jdbcOperations).isNotNull();
-		assertThat(ReflectionTestUtils.getField(jdbcOperations, "dataSource"))
-				.isEqualTo(dataSource);
+		assertThat(ReflectionTestUtils.getField(jdbcOperations, "dataSource")).isEqualTo(dataSource);
 	}
 
 	@Test
-	public void primaryDataSourceConfiguration() {
-		registerAndRefresh(DataSourceConfiguration.class,
-				PrimaryDataSourceConfiguration.class);
+	void primaryDataSourceConfiguration() {
+		registerAndRefresh(DataSourceConfiguration.class, PrimaryDataSourceConfiguration.class);
 
-		JdbcOperationsSessionRepository repository = this.context
-				.getBean(JdbcOperationsSessionRepository.class);
-		DataSource dataSource = this.context.getBean("primaryDataSource",
-				DataSource.class);
+		JdbcOperationsSessionRepository repository = this.context.getBean(JdbcOperationsSessionRepository.class);
+		DataSource dataSource = this.context.getBean("primaryDataSource", DataSource.class);
 		assertThat(repository).isNotNull();
 		assertThat(dataSource).isNotNull();
-		JdbcOperations jdbcOperations = (JdbcOperations) ReflectionTestUtils
-				.getField(repository, "jdbcOperations");
+		JdbcOperations jdbcOperations = (JdbcOperations) ReflectionTestUtils.getField(repository, "jdbcOperations");
 		assertThat(jdbcOperations).isNotNull();
-		assertThat(ReflectionTestUtils.getField(jdbcOperations, "dataSource"))
-				.isEqualTo(dataSource);
+		assertThat(ReflectionTestUtils.getField(jdbcOperations, "dataSource")).isEqualTo(dataSource);
 	}
 
 	@Test
-	public void qualifiedAndPrimaryDataSourceConfiguration() {
-		registerAndRefresh(DataSourceConfiguration.class,
-				QualifiedAndPrimaryDataSourceConfiguration.class);
+	void qualifiedAndPrimaryDataSourceConfiguration() {
+		registerAndRefresh(DataSourceConfiguration.class, QualifiedAndPrimaryDataSourceConfiguration.class);
 
-		JdbcOperationsSessionRepository repository = this.context
-				.getBean(JdbcOperationsSessionRepository.class);
-		DataSource dataSource = this.context.getBean("qualifiedDataSource",
-				DataSource.class);
+		JdbcOperationsSessionRepository repository = this.context.getBean(JdbcOperationsSessionRepository.class);
+		DataSource dataSource = this.context.getBean("qualifiedDataSource", DataSource.class);
 		assertThat(repository).isNotNull();
 		assertThat(dataSource).isNotNull();
-		JdbcOperations jdbcOperations = (JdbcOperations) ReflectionTestUtils
-				.getField(repository, "jdbcOperations");
+		JdbcOperations jdbcOperations = (JdbcOperations) ReflectionTestUtils.getField(repository, "jdbcOperations");
 		assertThat(jdbcOperations).isNotNull();
-		assertThat(ReflectionTestUtils.getField(jdbcOperations, "dataSource"))
-				.isEqualTo(dataSource);
+		assertThat(ReflectionTestUtils.getField(jdbcOperations, "dataSource")).isEqualTo(dataSource);
 	}
 
 	@Test
-	public void namedDataSourceConfiguration() {
-		registerAndRefresh(DataSourceConfiguration.class,
-				NamedDataSourceConfiguration.class);
+	void namedDataSourceConfiguration() {
+		registerAndRefresh(DataSourceConfiguration.class, NamedDataSourceConfiguration.class);
 
-		JdbcOperationsSessionRepository repository = this.context
-				.getBean(JdbcOperationsSessionRepository.class);
+		JdbcOperationsSessionRepository repository = this.context.getBean(JdbcOperationsSessionRepository.class);
 		DataSource dataSource = this.context.getBean("dataSource", DataSource.class);
 		assertThat(repository).isNotNull();
 		assertThat(dataSource).isNotNull();
-		JdbcOperations jdbcOperations = (JdbcOperations) ReflectionTestUtils
-				.getField(repository, "jdbcOperations");
+		JdbcOperations jdbcOperations = (JdbcOperations) ReflectionTestUtils.getField(repository, "jdbcOperations");
 		assertThat(jdbcOperations).isNotNull();
-		assertThat(ReflectionTestUtils.getField(jdbcOperations, "dataSource"))
-				.isEqualTo(dataSource);
+		assertThat(ReflectionTestUtils.getField(jdbcOperations, "dataSource")).isEqualTo(dataSource);
 	}
 
 	@Test
-	public void multipleDataSourceConfiguration() {
+	void multipleDataSourceConfiguration() {
 		assertThatExceptionOfType(BeanCreationException.class)
-				.isThrownBy(() -> registerAndRefresh(DataSourceConfiguration.class,
-						MultipleDataSourceConfiguration.class))
+				.isThrownBy(
+						() -> registerAndRefresh(DataSourceConfiguration.class, MultipleDataSourceConfiguration.class))
 				.withMessageContaining("expected single matching bean but found 2");
 	}
 
 	@Test
-	public void customLobHandlerConfiguration() {
-		registerAndRefresh(DataSourceConfiguration.class,
-				CustomLobHandlerConfiguration.class);
+	void customLobHandlerConfiguration() {
+		registerAndRefresh(DataSourceConfiguration.class, CustomLobHandlerConfiguration.class);
 
-		JdbcOperationsSessionRepository repository = this.context
-				.getBean(JdbcOperationsSessionRepository.class);
+		JdbcOperationsSessionRepository repository = this.context.getBean(JdbcOperationsSessionRepository.class);
 		LobHandler lobHandler = this.context.getBean(LobHandler.class);
 		assertThat(repository).isNotNull();
 		assertThat(lobHandler).isNotNull();
-		assertThat(ReflectionTestUtils.getField(repository, "lobHandler"))
-				.isEqualTo(lobHandler);
+		assertThat(ReflectionTestUtils.getField(repository, "lobHandler")).isEqualTo(lobHandler);
 	}
 
 	@Test
-	public void customConversionServiceConfiguration() {
-		registerAndRefresh(DataSourceConfiguration.class,
-				CustomConversionServiceConfiguration.class);
+	void customConversionServiceConfiguration() {
+		registerAndRefresh(DataSourceConfiguration.class, CustomConversionServiceConfiguration.class);
 
-		JdbcOperationsSessionRepository repository = this.context
-				.getBean(JdbcOperationsSessionRepository.class);
-		ConversionService conversionService = this.context
-				.getBean("springSessionConversionService", ConversionService.class);
+		JdbcOperationsSessionRepository repository = this.context.getBean(JdbcOperationsSessionRepository.class);
+		ConversionService conversionService = this.context.getBean("springSessionConversionService",
+				ConversionService.class);
 		assertThat(repository).isNotNull();
 		assertThat(conversionService).isNotNull();
-		Object repositoryConversionService = ReflectionTestUtils.getField(repository,
-				"conversionService");
+		Object repositoryConversionService = ReflectionTestUtils.getField(repository, "conversionService");
 		assertThat(repositoryConversionService).isEqualTo(conversionService);
 	}
 
 	@Test
-	public void resolveTableNameByPropertyPlaceholder() {
-		this.context.setEnvironment(new MockEnvironment()
-				.withProperty("session.jdbc.tableName", "custom_session_table"));
-		registerAndRefresh(DataSourceConfiguration.class,
-				CustomJdbcHttpSessionConfiguration.class);
-		JdbcHttpSessionConfiguration configuration = this.context
-				.getBean(JdbcHttpSessionConfiguration.class);
-		assertThat(ReflectionTestUtils.getField(configuration, "tableName"))
-				.isEqualTo("custom_session_table");
+	void resolveTableNameByPropertyPlaceholder() {
+		this.context
+				.setEnvironment(new MockEnvironment().withProperty("session.jdbc.tableName", "custom_session_table"));
+		registerAndRefresh(DataSourceConfiguration.class, CustomJdbcHttpSessionConfiguration.class);
+		JdbcHttpSessionConfiguration configuration = this.context.getBean(JdbcHttpSessionConfiguration.class);
+		assertThat(ReflectionTestUtils.getField(configuration, "tableName")).isEqualTo("custom_session_table");
 	}
 
 	private void registerAndRefresh(Class<?>... annotatedClasses) {
@@ -323,8 +278,7 @@ public class JdbcHttpSessionConfigurationTests {
 	}
 
 	@Configuration
-	static class CustomMaxInactiveIntervalInSecondsSetterConfiguration
-			extends JdbcHttpSessionConfiguration {
+	static class CustomMaxInactiveIntervalInSecondsSetterConfiguration extends JdbcHttpSessionConfiguration {
 
 		CustomMaxInactiveIntervalInSecondsSetterConfiguration() {
 			setMaxInactiveIntervalInSeconds(MAX_INACTIVE_INTERVAL_IN_SECONDS);
@@ -338,8 +292,7 @@ public class JdbcHttpSessionConfigurationTests {
 	}
 
 	@Configuration
-	static class CustomCleanupCronExpressionSetterConfiguration
-			extends JdbcHttpSessionConfiguration {
+	static class CustomCleanupCronExpressionSetterConfiguration extends JdbcHttpSessionConfiguration {
 
 		CustomCleanupCronExpressionSetterConfiguration() {
 			setCleanupCron(CLEANUP_CRON_EXPRESSION);