Update spring-javaformat to 0.0.39

Closes gh-2528

spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/AbstractClassLoaderTest.java

@@ -48,7 +48,7 @@ public abstract class AbstractClassLoaderTest<T> extends AbstractITest {
 				"mongoSessionConverter");
 		ReflectionUtils.makeAccessible(mongoSessionConverterField);
 		AbstractMongoSessionConverter sessionConverter = (AbstractMongoSessionConverter) ReflectionUtils
-				.getField(mongoSessionConverterField, this.sessionRepository);
+			.getField(mongoSessionConverterField, this.sessionRepository);
 
 		AssertionsForClassTypes.assertThat(sessionConverter).isInstanceOf(JdkMongoSessionConverter.class);
 

spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/AbstractMongoRepositoryITest.java

@@ -79,7 +79,7 @@ public abstract class AbstractMongoRepositoryITest extends AbstractITest {
 		assertThat(session.getId()).isEqualTo(toSave.getId());
 		assertThat(session.getAttributeNames()).isEqualTo(toSave.getAttributeNames());
 		assertThat(session.<String>getAttribute(expectedAttributeName))
-				.isEqualTo(toSave.getAttribute(expectedAttributeName));
+			.isEqualTo(toSave.getAttribute(expectedAttributeName));
 
 		this.repository.deleteById(toSave.getId());
 
@@ -400,7 +400,7 @@ public abstract class AbstractMongoRepositoryITest extends AbstractITest {
 		public MongoOperations mongoOperations(MongoDBContainer mongoContainer) {
 
 			MongoClient mongo = MongoClients
-					.create("mongodb://" + mongoContainer.getHost() + ":" + mongoContainer.getFirstMappedPort());
+				.create("mongodb://" + mongoContainer.getHost() + ":" + mongoContainer.getFirstMappedPort());
 			return new MongoTemplate(mongo, "test");
 		}
 

spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/MongoDbDeleteJacksonSessionVerificationTest.java

@@ -73,13 +73,14 @@ public class MongoDbDeleteJacksonSessionVerificationTest {
 
 		// 1. Login and capture the SESSION cookie value.
 
-		FluxExchangeResult<String> loginResult = this.client.post().uri("/login")
-				.contentType(MediaType.APPLICATION_FORM_URLENCODED) //
-				.body(BodyInserters //
-						.fromFormData("username", "admin") //
-						.with("password", "password")) //
-				.exchange() //
-				.returnResult(String.class);
+		FluxExchangeResult<String> loginResult = this.client.post()
+			.uri("/login")
+			.contentType(MediaType.APPLICATION_FORM_URLENCODED) //
+			.body(BodyInserters //
+				.fromFormData("username", "admin") //
+				.with("password", "password")) //
+			.exchange() //
+			.returnResult(String.class);
 
 		AssertionsForClassTypes.assertThat(loginResult.getResponseHeaders().getLocation()).isEqualTo(URI.create("/"));
 
@@ -87,42 +88,54 @@ public class MongoDbDeleteJacksonSessionVerificationTest {
 
 		// 2. Fetch a protected resource using the SESSION cookie.
 
-		this.client.get().uri("/hello") //
-				.cookie("SESSION", originalSessionId) //
-				.exchange() //
-				.expectStatus().isOk() //
-				.returnResult(String.class).getResponseBody() //
-				.as(StepVerifier::create) //
-				.expectNext("HelloWorld") //
-				.verifyComplete();
+		this.client.get()
+			.uri("/hello") //
+			.cookie("SESSION", originalSessionId) //
+			.exchange() //
+			.expectStatus()
+			.isOk() //
+			.returnResult(String.class)
+			.getResponseBody() //
+			.as(StepVerifier::create) //
+			.expectNext("HelloWorld") //
+			.verifyComplete();
 
 		// 3. Logout using the SESSION cookie, and capture the new SESSION cookie.
 
-		String newSessionId = this.client.post().uri("/logout") //
-				.cookie("SESSION", originalSessionId) //
-				.exchange() //
-				.expectStatus().isFound() //
-				.returnResult(String.class).getResponseCookies().getFirst("SESSION").getValue();
+		String newSessionId = this.client.post()
+			.uri("/logout") //
+			.cookie("SESSION", originalSessionId) //
+			.exchange() //
+			.expectStatus()
+			.isFound() //
+			.returnResult(String.class)
+			.getResponseCookies()
+			.getFirst("SESSION")
+			.getValue();
 
 		AssertionsForClassTypes.assertThat(newSessionId).isNotEqualTo(originalSessionId);
 
 		// 4. Verify the new SESSION cookie is not yet authorized.
 
-		this.client.get().uri("/hello") //
-				.cookie("SESSION", newSessionId) //
-				.exchange() //
-				.expectStatus().isFound() //
-				.expectHeader()
-				.value(HttpHeaders.LOCATION, (value) -> AssertionsForClassTypes.assertThat(value).isEqualTo("/login"));
+		this.client.get()
+			.uri("/hello") //
+			.cookie("SESSION", newSessionId) //
+			.exchange() //
+			.expectStatus()
+			.isFound() //
+			.expectHeader()
+			.value(HttpHeaders.LOCATION, (value) -> AssertionsForClassTypes.assertThat(value).isEqualTo("/login"));
 
 		// 5. Verify the original SESSION cookie no longer works.
 
-		this.client.get().uri("/hello") //
-				.cookie("SESSION", originalSessionId) //
-				.exchange() //
-				.expectStatus().isFound() //
-				.expectHeader()
-				.value(HttpHeaders.LOCATION, (value) -> AssertionsForClassTypes.assertThat(value).isEqualTo("/login"));
+		this.client.get()
+			.uri("/hello") //
+			.cookie("SESSION", originalSessionId) //
+			.exchange() //
+			.expectStatus()
+			.isFound() //
+			.expectHeader()
+			.value(HttpHeaders.LOCATION, (value) -> AssertionsForClassTypes.assertThat(value).isEqualTo("/login"));
 	}
 
 	@RestController
@@ -142,23 +155,25 @@ public class MongoDbDeleteJacksonSessionVerificationTest {
 		@Bean
 		SecurityWebFilterChain securityWebFilterChain(ServerHttpSecurity http) {
 			return http //
-					.logout()//
-					/**/.and() //
-					.formLogin() //
-					/**/.and() //
-					.csrf().disable() //
-					.authorizeExchange() //
-					.anyExchange().authenticated() //
-					/**/.and() //
-					.build();
+				.logout()//
+				/**/.and() //
+				.formLogin() //
+				/**/.and() //
+				.csrf()
+				.disable() //
+				.authorizeExchange() //
+				.anyExchange()
+				.authenticated() //
+				/**/.and() //
+				.build();
 		}
 
 		@Bean
 		MapReactiveUserDetailsService userDetailsService() {
 			return new MapReactiveUserDetailsService(User.withUsername("admin") //
-					.password("{noop}password") //
-					.roles("USER,ADMIN") //
-					.build());
+				.password("{noop}password") //
+				.roles("USER,ADMIN") //
+				.build());
 		}
 
 		@Bean
@@ -186,7 +201,7 @@ public class MongoDbDeleteJacksonSessionVerificationTest {
 		ReactiveMongoOperations mongoOperations(MongoDBContainer mongoContainer) {
 
 			MongoClient mongo = MongoClients
-					.create("mongodb://" + mongoContainer.getHost() + ":" + mongoContainer.getFirstMappedPort());
+				.create("mongodb://" + mongoContainer.getHost() + ":" + mongoContainer.getFirstMappedPort());
 			return new ReactiveMongoTemplate(mongo, "DB_Name_DeleteJacksonSessionVerificationTest");
 		}
 

spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/MongoDbLogoutVerificationTest.java

@@ -73,13 +73,14 @@ public class MongoDbLogoutVerificationTest {
 
 		// 1. Login and capture the SESSION cookie value.
 
-		FluxExchangeResult<String> loginResult = this.client.post().uri("/login")
-				.contentType(MediaType.APPLICATION_FORM_URLENCODED) //
-				.body(BodyInserters //
-						.fromFormData("username", "admin") //
-						.with("password", "password")) //
-				.exchange() //
-				.returnResult(String.class);
+		FluxExchangeResult<String> loginResult = this.client.post()
+			.uri("/login")
+			.contentType(MediaType.APPLICATION_FORM_URLENCODED) //
+			.body(BodyInserters //
+				.fromFormData("username", "admin") //
+				.with("password", "password")) //
+			.exchange() //
+			.returnResult(String.class);
 
 		AssertionsForClassTypes.assertThat(loginResult.getResponseHeaders().getLocation()).isEqualTo(URI.create("/"));
 
@@ -87,42 +88,54 @@ public class MongoDbLogoutVerificationTest {
 
 		// 2. Fetch a protected resource using the SESSION cookie.
 
-		this.client.get().uri("/hello") //
-				.cookie("SESSION", originalSessionId) //
-				.exchange() //
-				.expectStatus().isOk() //
-				.returnResult(String.class).getResponseBody() //
-				.as(StepVerifier::create) //
-				.expectNext("HelloWorld") //
-				.verifyComplete();
+		this.client.get()
+			.uri("/hello") //
+			.cookie("SESSION", originalSessionId) //
+			.exchange() //
+			.expectStatus()
+			.isOk() //
+			.returnResult(String.class)
+			.getResponseBody() //
+			.as(StepVerifier::create) //
+			.expectNext("HelloWorld") //
+			.verifyComplete();
 
 		// 3. Logout using the SESSION cookie, and capture the new SESSION cookie.
 
-		String newSessionId = this.client.post().uri("/logout") //
-				.cookie("SESSION", originalSessionId) //
-				.exchange() //
-				.expectStatus().isFound() //
-				.returnResult(String.class).getResponseCookies().getFirst("SESSION").getValue();
+		String newSessionId = this.client.post()
+			.uri("/logout") //
+			.cookie("SESSION", originalSessionId) //
+			.exchange() //
+			.expectStatus()
+			.isFound() //
+			.returnResult(String.class)
+			.getResponseCookies()
+			.getFirst("SESSION")
+			.getValue();
 
 		AssertionsForClassTypes.assertThat(newSessionId).isNotEqualTo(originalSessionId);
 
 		// 4. Verify the new SESSION cookie is not yet authorized.
 
-		this.client.get().uri("/hello") //
-				.cookie("SESSION", newSessionId) //
-				.exchange() //
-				.expectStatus().isFound() //
-				.expectHeader()
-				.value(HttpHeaders.LOCATION, (value) -> AssertionsForClassTypes.assertThat(value).isEqualTo("/login"));
+		this.client.get()
+			.uri("/hello") //
+			.cookie("SESSION", newSessionId) //
+			.exchange() //
+			.expectStatus()
+			.isFound() //
+			.expectHeader()
+			.value(HttpHeaders.LOCATION, (value) -> AssertionsForClassTypes.assertThat(value).isEqualTo("/login"));
 
 		// 5. Verify the original SESSION cookie no longer works.
 
-		this.client.get().uri("/hello") //
-				.cookie("SESSION", originalSessionId) //
-				.exchange() //
-				.expectStatus().isFound() //
-				.expectHeader()
-				.value(HttpHeaders.LOCATION, (value) -> AssertionsForClassTypes.assertThat(value).isEqualTo("/login"));
+		this.client.get()
+			.uri("/hello") //
+			.cookie("SESSION", originalSessionId) //
+			.exchange() //
+			.expectStatus()
+			.isFound() //
+			.expectHeader()
+			.value(HttpHeaders.LOCATION, (value) -> AssertionsForClassTypes.assertThat(value).isEqualTo("/login"));
 	}
 
 	@RestController
@@ -143,24 +156,26 @@ public class MongoDbLogoutVerificationTest {
 		SecurityWebFilterChain securityWebFilterChain(ServerHttpSecurity http) {
 
 			return http //
-					.logout()//
-					/**/.and() //
-					.formLogin() //
-					/**/.and() //
-					.csrf().disable() //
-					.authorizeExchange() //
-					.anyExchange().authenticated() //
-					/**/.and() //
-					.build();
+				.logout()//
+				/**/.and() //
+				.formLogin() //
+				/**/.and() //
+				.csrf()
+				.disable() //
+				.authorizeExchange() //
+				.anyExchange()
+				.authenticated() //
+				/**/.and() //
+				.build();
 		}
 
 		@Bean
 		MapReactiveUserDetailsService userDetailsService() {
 
 			return new MapReactiveUserDetailsService(User.withUsername("admin") //
-					.password("{noop}password") //
-					.roles("USER,ADMIN") //
-					.build());
+				.password("{noop}password") //
+				.roles("USER,ADMIN") //
+				.build());
 		}
 
 	}
@@ -183,7 +198,7 @@ public class MongoDbLogoutVerificationTest {
 		ReactiveMongoOperations mongoOperations(MongoDBContainer mongoContainer) {
 
 			MongoClient mongo = MongoClients
-					.create("mongodb://" + mongoContainer.getHost() + ":" + mongoContainer.getFirstMappedPort());
+				.create("mongodb://" + mongoContainer.getHost() + ":" + mongoContainer.getFirstMappedPort());
 			return new ReactiveMongoTemplate(mongo, "test");
 		}
 

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

@@ -86,13 +86,13 @@ public abstract class AbstractMongoSessionConverter implements GenericConverter
 		LOG.info("Creating TTL index on field " + EXPIRE_AT_FIELD_NAME);
 
 		sessionCollectionIndexes
-				.ensureIndex(new Index(EXPIRE_AT_FIELD_NAME, Sort.Direction.ASC).named(EXPIRE_AT_FIELD_NAME).expire(0));
+			.ensureIndex(new Index(EXPIRE_AT_FIELD_NAME, Sort.Direction.ASC).named(EXPIRE_AT_FIELD_NAME).expire(0));
 	}
 
 	protected String extractPrincipal(MongoSession expiringSession) {
 
 		return this.indexResolver.resolveIndexesFor(expiringSession)
-				.get(FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME);
+			.get(FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME);
 	}
 
 	public Set<ConvertiblePair> getConvertibleTypes() {

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

@@ -137,10 +137,11 @@ public class MongoIndexedSessionRepository
 	public Map<String, MongoSession> findByIndexNameAndIndexValue(String indexName, String indexValue) {
 
 		return Optional.ofNullable(this.mongoSessionConverter.getQueryForIndex(indexName, indexValue))
-				.map((query) -> this.mongoOperations.find(query, Document.class, this.collectionName))
-				.orElse(Collections.emptyList()).stream()
-				.map((dbSession) -> MongoSessionUtils.convertToSession(this.mongoSessionConverter, dbSession))
-				.collect(Collectors.toMap(MongoSession::getId, (mapSession) -> mapSession));
+			.map((query) -> this.mongoOperations.find(query, Document.class, this.collectionName))
+			.orElse(Collections.emptyList())
+			.stream()
+			.map((dbSession) -> MongoSessionUtils.convertToSession(this.mongoSessionConverter, dbSession))
+			.collect(Collectors.toMap(MongoSession::getId, (mapSession) -> mapSession));
 	}
 
 	@Override

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

@@ -95,50 +95,50 @@ public class ReactiveMongoSessionRepository
 	public Mono<MongoSession> createSession() {
 
 		return Mono.justOrEmpty(this.defaultMaxInactiveInterval.toSeconds()) //
-				.map(MongoSession::new) //
-				.doOnNext((mongoSession) -> publishEvent(new SessionCreatedEvent(this, mongoSession))) //
-				.switchIfEmpty(Mono.just(new MongoSession()));
+			.map(MongoSession::new) //
+			.doOnNext((mongoSession) -> publishEvent(new SessionCreatedEvent(this, mongoSession))) //
+			.switchIfEmpty(Mono.just(new MongoSession()));
 	}
 
 	@Override
 	public Mono<Void> save(MongoSession session) {
 
 		return Mono //
-				.justOrEmpty(MongoSessionUtils.convertToDBObject(this.mongoSessionConverter, session)) //
-				.flatMap((dbObject) -> {
-					if (session.hasChangedSessionId()) {
+			.justOrEmpty(MongoSessionUtils.convertToDBObject(this.mongoSessionConverter, session)) //
+			.flatMap((dbObject) -> {
+				if (session.hasChangedSessionId()) {
 
-						return this.mongoOperations
-								.remove(Query.query(Criteria.where("_id").is(session.getOriginalSessionId())),
-										this.collectionName) //
-								.then(this.mongoOperations.save(dbObject, this.collectionName));
-					}
-					else {
+					return this.mongoOperations
+						.remove(Query.query(Criteria.where("_id").is(session.getOriginalSessionId())),
+								this.collectionName) //
+						.then(this.mongoOperations.save(dbObject, this.collectionName));
+				}
+				else {
 
-						return this.mongoOperations.save(dbObject, this.collectionName);
-					}
-				}) //
-				.then();
+					return this.mongoOperations.save(dbObject, this.collectionName);
+				}
+			}) //
+			.then();
 	}
 
 	@Override
 	public Mono<MongoSession> findById(String id) {
 
 		return findSession(id) //
-				.map((document) -> MongoSessionUtils.convertToSession(this.mongoSessionConverter, document)) //
-				.filter((mongoSession) -> !mongoSession.isExpired()) //
-				.switchIfEmpty(Mono.defer(() -> this.deleteById(id).then(Mono.empty())));
+			.map((document) -> MongoSessionUtils.convertToSession(this.mongoSessionConverter, document)) //
+			.filter((mongoSession) -> !mongoSession.isExpired()) //
+			.switchIfEmpty(Mono.defer(() -> this.deleteById(id).then(Mono.empty())));
 	}
 
 	@Override
 	public Mono<Void> deleteById(String id) {
 
 		return findSession(id) //
-				.flatMap((document) -> this.mongoOperations.remove(document, this.collectionName) //
-						.then(Mono.just(document))) //
-				.map((document) -> MongoSessionUtils.convertToSession(this.mongoSessionConverter, document)) //
-				.doOnNext((mongoSession) -> publishEvent(new SessionDeletedEvent(this, mongoSession))) //
-				.then();
+			.flatMap((document) -> this.mongoOperations.remove(document, this.collectionName) //
+				.then(Mono.just(document))) //
+			.map((document) -> MongoSessionUtils.convertToSession(this.mongoSessionConverter, document)) //
+			.doOnNext((mongoSession) -> publishEvent(new SessionDeletedEvent(this, mongoSession))) //
+			.then();
 	}
 
 	/**

spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/config/annotation/web/http/MongoHttpSessionConfiguration.java

@@ -100,7 +100,7 @@ public class MongoHttpSessionConfiguration implements BeanClassLoaderAware, Embe
 		}
 
 		this.sessionRepositoryCustomizers
-				.forEach((sessionRepositoryCustomizer) -> sessionRepositoryCustomizer.customize(repository));
+			.forEach((sessionRepositoryCustomizer) -> sessionRepositoryCustomizer.customize(repository));
 
 		return repository;
 	}
@@ -121,11 +121,11 @@ public class MongoHttpSessionConfiguration implements BeanClassLoaderAware, Embe
 	public void setImportMetadata(AnnotationMetadata importMetadata) {
 
 		AnnotationAttributes attributes = AnnotationAttributes
-				.fromMap(importMetadata.getAnnotationAttributes(EnableMongoHttpSession.class.getName()));
+			.fromMap(importMetadata.getAnnotationAttributes(EnableMongoHttpSession.class.getName()));
 
 		if (attributes != null) {
 			this.maxInactiveInterval = Duration
-					.ofSeconds(attributes.<Integer>getNumber("maxInactiveIntervalInSeconds"));
+				.ofSeconds(attributes.<Integer>getNumber("maxInactiveIntervalInSeconds"));
 		}
 
 		String collectionNameValue = (attributes != null) ? attributes.getString("collectionName") : "";

spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfiguration.java

@@ -110,7 +110,7 @@ public class ReactiveMongoWebSessionConfiguration
 		}
 
 		this.sessionRepositoryCustomizers
-				.forEach((sessionRepositoryCustomizer) -> sessionRepositoryCustomizer.customize(repository));
+			.forEach((sessionRepositoryCustomizer) -> sessionRepositoryCustomizer.customize(repository));
 
 		return repository;
 	}
@@ -124,11 +124,11 @@ public class ReactiveMongoWebSessionConfiguration
 	public void setImportMetadata(AnnotationMetadata importMetadata) {
 
 		AnnotationAttributes attributes = AnnotationAttributes
-				.fromMap(importMetadata.getAnnotationAttributes(EnableMongoWebSession.class.getName()));
+			.fromMap(importMetadata.getAnnotationAttributes(EnableMongoWebSession.class.getName()));
 
 		if (attributes != null) {
 			this.maxInactiveInterval = Duration
-					.ofSeconds(attributes.<Integer>getNumber("maxInactiveIntervalInSeconds"));
+				.ofSeconds(attributes.<Integer>getNumber("maxInactiveIntervalInSeconds"));
 		}
 
 		String collectionNameValue = (attributes != null) ? attributes.getString("collectionName") : "";

spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/JacksonMongoSessionConverterTest.java

@@ -89,7 +89,7 @@ public class JacksonMongoSessionConverterTest extends AbstractMongoSessionConver
 	void shouldNotAllowNullObjectMapperToBeInjected() {
 
 		Assertions.assertThatIllegalArgumentException()
-				.isThrownBy(() -> new JacksonMongoSessionConverter((ObjectMapper) null));
+			.isThrownBy(() -> new JacksonMongoSessionConverter((ObjectMapper) null));
 	}
 
 	@Test

spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/JdkMongoSessionConverterTest.java

@@ -43,14 +43,14 @@ public class JdkMongoSessionConverterTest extends AbstractMongoSessionConverterT
 
 	@Test
 	void constructorNullSerializer() {
-		assertThatIllegalArgumentException().isThrownBy(
-				() -> new JdkMongoSessionConverter(null, new DeserializingConverter(), this.inactiveInterval));
+		assertThatIllegalArgumentException()
+			.isThrownBy(() -> new JdkMongoSessionConverter(null, new DeserializingConverter(), this.inactiveInterval));
 	}
 
 	@Test
 	void constructorNullDeserializer() {
-		assertThatIllegalArgumentException().isThrownBy(
-				() -> new JdkMongoSessionConverter(new SerializingConverter(), null, this.inactiveInterval));
+		assertThatIllegalArgumentException()
+			.isThrownBy(() -> new JdkMongoSessionConverter(new SerializingConverter(), null, this.inactiveInterval));
 	}
 
 }

spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/MongoIndexedSessionRepositoryTest.java

@@ -77,7 +77,7 @@ public class MongoIndexedSessionRepositoryTest {
 		// then
 		assertThat(session.getId()).isNotEmpty();
 		assertThat(session.getMaxInactiveInterval().getSeconds())
-				.isEqualTo(MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS);
+			.isEqualTo(MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS);
 	}
 
 	@Test
@@ -88,7 +88,8 @@ public class MongoIndexedSessionRepositoryTest {
 		BasicDBObject dbSession = new BasicDBObject();
 
 		given(this.converter.convert(session, TypeDescriptor.valueOf(MongoSession.class),
-				TypeDescriptor.valueOf(DBObject.class))).willReturn(dbSession);
+				TypeDescriptor.valueOf(DBObject.class)))
+			.willReturn(dbSession);
 		// when
 		this.repository.save(session);
 
@@ -104,12 +105,14 @@ public class MongoIndexedSessionRepositoryTest {
 		Document sessionDocument = new Document();
 
 		given(this.mongoOperations.findById(sessionId, Document.class,
-				MongoIndexedSessionRepository.DEFAULT_COLLECTION_NAME)).willReturn(sessionDocument);
+				MongoIndexedSessionRepository.DEFAULT_COLLECTION_NAME))
+			.willReturn(sessionDocument);
 
 		MongoSession session = new MongoSession();
 
 		given(this.converter.convert(sessionDocument, TypeDescriptor.valueOf(Document.class),
-				TypeDescriptor.valueOf(MongoSession.class))).willReturn(session);
+				TypeDescriptor.valueOf(MongoSession.class)))
+			.willReturn(session);
 
 		// when
 		MongoSession retrievedSession = this.repository.findById(sessionId);
@@ -126,13 +129,15 @@ public class MongoIndexedSessionRepositoryTest {
 		Document sessionDocument = new Document();
 
 		given(this.mongoOperations.findById(sessionId, Document.class,
-				MongoIndexedSessionRepository.DEFAULT_COLLECTION_NAME)).willReturn(sessionDocument);
+				MongoIndexedSessionRepository.DEFAULT_COLLECTION_NAME))
+			.willReturn(sessionDocument);
 
 		MongoSession session = mock(MongoSession.class);
 
 		given(session.isExpired()).willReturn(true);
 		given(this.converter.convert(sessionDocument, TypeDescriptor.valueOf(Document.class),
-				TypeDescriptor.valueOf(MongoSession.class))).willReturn(session);
+				TypeDescriptor.valueOf(MongoSession.class)))
+			.willReturn(session);
 		given(session.getId()).willReturn("sessionId");
 
 		// when
@@ -155,9 +160,11 @@ public class MongoIndexedSessionRepositoryTest {
 		MongoSession mongoSession = new MongoSession(sessionId, MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS);
 
 		given(this.converter.convert(sessionDocument, TypeDescriptor.valueOf(Document.class),
-				TypeDescriptor.valueOf(MongoSession.class))).willReturn(mongoSession);
+				TypeDescriptor.valueOf(MongoSession.class)))
+			.willReturn(mongoSession);
 		given(this.mongoOperations.findById(eq(sessionId), eq(Document.class),
-				eq(MongoIndexedSessionRepository.DEFAULT_COLLECTION_NAME))).willReturn(sessionDocument);
+				eq(MongoIndexedSessionRepository.DEFAULT_COLLECTION_NAME)))
+			.willReturn(sessionDocument);
 
 		// when
 		this.repository.deleteById(sessionId);
@@ -178,14 +185,15 @@ public class MongoIndexedSessionRepositoryTest {
 		given(this.converter.getQueryForIndex(anyString(), any(Object.class))).willReturn(mock(Query.class));
 		given(this.mongoOperations.find(any(Query.class), eq(Document.class),
 				eq(MongoIndexedSessionRepository.DEFAULT_COLLECTION_NAME)))
-						.willReturn(Collections.singletonList(document));
+			.willReturn(Collections.singletonList(document));
 
 		String sessionId = UUID.randomUUID().toString();
 
 		MongoSession session = new MongoSession(sessionId, 1800);
 
 		given(this.converter.convert(document, TypeDescriptor.valueOf(Document.class),
-				TypeDescriptor.valueOf(MongoSession.class))).willReturn(session);
+				TypeDescriptor.valueOf(MongoSession.class)))
+			.willReturn(session);
 
 		// when
 		Map<String, MongoSession> sessionsMap = this.repository.findByIndexNameAndIndexValue(principalNameIndexName,

spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/ReactiveMongoSessionRepositoryTest.java

@@ -83,14 +83,14 @@ public class ReactiveMongoSessionRepositoryTest {
 	void shouldCreateSession() {
 
 		this.repository.createSession() //
-				.as(StepVerifier::create) //
-				.expectNextMatches((mongoSession) -> {
-					assertThat(mongoSession.getId()).isNotEmpty();
-					assertThat(mongoSession.getMaxInactiveInterval())
-							.isEqualTo(Duration.ofSeconds(MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS));
-					return true;
-				}) //
-				.verifyComplete();
+			.as(StepVerifier::create) //
+			.expectNextMatches((mongoSession) -> {
+				assertThat(mongoSession.getId()).isNotEmpty();
+				assertThat(mongoSession.getMaxInactiveInterval())
+					.isEqualTo(Duration.ofSeconds(MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS));
+				return true;
+			}) //
+			.verifyComplete();
 	}
 
 	@Test
@@ -101,14 +101,15 @@ public class ReactiveMongoSessionRepositoryTest {
 		BasicDBObject dbSession = new BasicDBObject();
 
 		given(this.converter.convert(session, TypeDescriptor.valueOf(MongoSession.class),
-				TypeDescriptor.valueOf(DBObject.class))).willReturn(dbSession);
+				TypeDescriptor.valueOf(DBObject.class)))
+			.willReturn(dbSession);
 
 		given(this.mongoOperations.save(dbSession, "sessions")).willReturn(Mono.just(dbSession));
 
 		// when
 		this.repository.save(session) //
-				.as(StepVerifier::create) //
-				.verifyComplete();
+			.as(StepVerifier::create) //
+			.verifyComplete();
 
 		verify(this.mongoOperations).save(dbSession, ReactiveMongoSessionRepository.DEFAULT_COLLECTION_NAME);
 	}
@@ -121,18 +122,20 @@ public class ReactiveMongoSessionRepositoryTest {
 		Document sessionDocument = new Document();
 
 		given(this.mongoOperations.findById(sessionId, Document.class,
-				ReactiveMongoSessionRepository.DEFAULT_COLLECTION_NAME)).willReturn(Mono.just(sessionDocument));
+				ReactiveMongoSessionRepository.DEFAULT_COLLECTION_NAME))
+			.willReturn(Mono.just(sessionDocument));
 
 		MongoSession session = new MongoSession();
 
 		given(this.converter.convert(sessionDocument, TypeDescriptor.valueOf(Document.class),
-				TypeDescriptor.valueOf(MongoSession.class))).willReturn(session);
+				TypeDescriptor.valueOf(MongoSession.class)))
+			.willReturn(session);
 
 		// when
 		this.repository.findById(sessionId) //
-				.as(StepVerifier::create) //
-				.expectNext(session) //
-				.verifyComplete();
+			.as(StepVerifier::create) //
+			.expectNext(session) //
+			.verifyComplete();
 	}
 
 	@Test
@@ -143,21 +146,23 @@ public class ReactiveMongoSessionRepositoryTest {
 		Document sessionDocument = new Document();
 
 		given(this.mongoOperations.findById(sessionId, Document.class,
-				ReactiveMongoSessionRepository.DEFAULT_COLLECTION_NAME)).willReturn(Mono.just(sessionDocument));
+				ReactiveMongoSessionRepository.DEFAULT_COLLECTION_NAME))
+			.willReturn(Mono.just(sessionDocument));
 
 		given(this.mongoOperations.remove(sessionDocument, ReactiveMongoSessionRepository.DEFAULT_COLLECTION_NAME))
-				.willReturn(Mono.just(DeleteResult.acknowledged(1)));
+			.willReturn(Mono.just(DeleteResult.acknowledged(1)));
 
 		MongoSession session = mock(MongoSession.class);
 
 		given(session.isExpired()).willReturn(true);
 		given(this.converter.convert(sessionDocument, TypeDescriptor.valueOf(Document.class),
-				TypeDescriptor.valueOf(MongoSession.class))).willReturn(session);
+				TypeDescriptor.valueOf(MongoSession.class)))
+			.willReturn(session);
 
 		// when
 		this.repository.findById(sessionId) //
-				.as(StepVerifier::create) //
-				.verifyComplete();
+			.as(StepVerifier::create) //
+			.verifyComplete();
 
 		// then
 		verify(this.mongoOperations).remove(any(Document.class),
@@ -172,20 +177,22 @@ public class ReactiveMongoSessionRepositoryTest {
 		Document sessionDocument = new Document();
 
 		given(this.mongoOperations.findById(sessionId, Document.class,
-				ReactiveMongoSessionRepository.DEFAULT_COLLECTION_NAME)).willReturn(Mono.just(sessionDocument));
+				ReactiveMongoSessionRepository.DEFAULT_COLLECTION_NAME))
+			.willReturn(Mono.just(sessionDocument));
 
 		given(this.mongoOperations.remove(sessionDocument, "sessions"))
-				.willReturn(Mono.just(DeleteResult.acknowledged(1)));
+			.willReturn(Mono.just(DeleteResult.acknowledged(1)));
 
 		MongoSession session = mock(MongoSession.class);
 
 		given(this.converter.convert(sessionDocument, TypeDescriptor.valueOf(Document.class),
-				TypeDescriptor.valueOf(MongoSession.class))).willReturn(session);
+				TypeDescriptor.valueOf(MongoSession.class)))
+			.willReturn(session);
 
 		// when
 		this.repository.deleteById(sessionId) //
-				.as(StepVerifier::create) //
-				.verifyComplete();
+			.as(StepVerifier::create) //
+			.verifyComplete();
 
 		verify(this.mongoOperations).remove(any(Document.class),
 				eq(ReactiveMongoSessionRepository.DEFAULT_COLLECTION_NAME));

spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/config/annotation/web/http/MongoHttpSessionConfigurationTest.java

@@ -72,8 +72,8 @@ public class MongoHttpSessionConfigurationTest {
 	void noMongoOperationsConfiguration() {
 
 		assertThatExceptionOfType(UnsatisfiedDependencyException.class)
-				.isThrownBy(() -> registerAndRefresh(EmptyConfiguration.class))
-				.withMessageContaining("mongoSessionRepository");
+			.isThrownBy(() -> registerAndRefresh(EmptyConfiguration.class))
+			.withMessageContaining("mongoSessionRepository");
 	}
 
 	@Test
@@ -114,7 +114,7 @@ public class MongoHttpSessionConfigurationTest {
 		MongoIndexedSessionRepository repository = this.context.getBean(MongoIndexedSessionRepository.class);
 
 		assertThat(repository).extracting("defaultMaxInactiveInterval")
-				.isEqualTo(Duration.ofSeconds(MAX_INACTIVE_INTERVAL_IN_SECONDS));
+			.isEqualTo(Duration.ofSeconds(MAX_INACTIVE_INTERVAL_IN_SECONDS));
 	}
 
 	@Test
@@ -125,7 +125,7 @@ public class MongoHttpSessionConfigurationTest {
 		MongoIndexedSessionRepository repository = this.context.getBean(MongoIndexedSessionRepository.class);
 
 		assertThat(repository).extracting("defaultMaxInactiveInterval")
-				.isEqualTo(Duration.ofSeconds(MAX_INACTIVE_INTERVAL_IN_SECONDS));
+			.isEqualTo(Duration.ofSeconds(MAX_INACTIVE_INTERVAL_IN_SECONDS));
 	}
 
 	@Test
@@ -145,7 +145,7 @@ public class MongoHttpSessionConfigurationTest {
 	void resolveCollectionNameByPropertyPlaceholder() {
 
 		this.context
-				.setEnvironment(new MockEnvironment().withProperty("session.mongo.collectionName", COLLECTION_NAME));
+			.setEnvironment(new MockEnvironment().withProperty("session.mongo.collectionName", COLLECTION_NAME));
 		registerAndRefresh(CustomMongoJdbcSessionConfiguration.class);
 
 		MongoHttpSessionConfiguration configuration = this.context.getBean(MongoHttpSessionConfiguration.class);
@@ -174,8 +174,8 @@ public class MongoHttpSessionConfigurationTest {
 
 		assertThat(repository).isNotNull();
 		assertThat(indexResolver).isNotNull();
-		assertThat(repository).extracting("mongoSessionConverter").hasFieldOrPropertyWithValue("indexResolver",
-				indexResolver);
+		assertThat(repository).extracting("mongoSessionConverter")
+			.hasFieldOrPropertyWithValue("indexResolver", indexResolver);
 	}
 
 	@Test
@@ -189,8 +189,8 @@ public class MongoHttpSessionConfigurationTest {
 
 		assertThat(repository).isNotNull();
 		assertThat(indexResolver).isNotNull();
-		assertThat(repository).extracting("mongoSessionConverter").hasFieldOrPropertyWithValue("indexResolver",
-				indexResolver);
+		assertThat(repository).extracting("mongoSessionConverter")
+			.hasFieldOrPropertyWithValue("indexResolver", indexResolver);
 	}
 
 	@Test

spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfigurationTest.java

@@ -95,9 +95,8 @@ public class ReactiveMongoWebSessionConfigurationTest {
 		this.context.register(BadConfig.class);
 
 		assertThatExceptionOfType(UnsatisfiedDependencyException.class).isThrownBy(this.context::refresh)
-				.withMessageContaining("Error creating bean with name 'reactiveMongoSessionRepository'")
-				.withMessageContaining(
-						"No qualifying bean of type '" + ReactiveMongoOperations.class.getCanonicalName());
+			.withMessageContaining("Error creating bean with name 'reactiveMongoSessionRepository'")
+			.withMessageContaining("No qualifying bean of type '" + ReactiveMongoOperations.class.getCanonicalName());
 	}
 
 	@Test
@@ -193,8 +192,8 @@ public class ReactiveMongoWebSessionConfigurationTest {
 
 		assertThat(repository).isNotNull();
 		assertThat(indexResolver).isNotNull();
-		assertThat(repository).extracting("mongoSessionConverter").hasFieldOrPropertyWithValue("indexResolver",
-				indexResolver);
+		assertThat(repository).extracting("mongoSessionConverter")
+			.hasFieldOrPropertyWithValue("indexResolver", indexResolver);
 	}
 
 	@Test
@@ -209,8 +208,8 @@ public class ReactiveMongoWebSessionConfigurationTest {
 
 		assertThat(repository).isNotNull();
 		assertThat(indexResolver).isNotNull();
-		assertThat(repository).extracting("mongoSessionConverter").hasFieldOrPropertyWithValue("indexResolver",
-				indexResolver);
+		assertThat(repository).extracting("mongoSessionConverter")
+			.hasFieldOrPropertyWithValue("indexResolver", indexResolver);
 	}
 
 	@Test