Additional Checkstyle Fixes

Issue gh-393

docs/src/integration-test/java/docs/AbstractGemFireIntegrationTests.java

@@ -48,8 +48,8 @@ import org.springframework.session.events.AbstractSessionEvent;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * AbstractGemFireIntegrationTests is an abstract base class encapsulating common operations for writing
- * Spring Session GemFire integration tests.
+ * AbstractGemFireIntegrationTests is an abstract base class encapsulating common
+ * operations for writing Spring Session GemFire integration tests.
  *
  * @author John Blum
  * @since 1.1.0
@@ -64,24 +64,25 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @see com.gemstone.gemfire.cache.server.CacheServer
  */
 public class AbstractGemFireIntegrationTests {
-	public static final String GEMFIRE_LOG_LEVEL = System.getProperty(
-			"spring.session.data.gemfire.log-level", "warning");
+	public static final String GEMFIRE_LOG_LEVEL = System
+			.getProperty("spring.session.data.gemfire.log-level", "warning");
 
 	protected static final boolean DEFAULT_ENABLE_QUERY_DEBUGGING = false;
-	protected static final boolean GEMFIRE_QUERY_DEBUG = Boolean.getBoolean("spring.session.data.gemfire.query.debug");
+	protected static final boolean GEMFIRE_QUERY_DEBUG = Boolean
+			.getBoolean("spring.session.data.gemfire.query.debug");
 
 	protected static final int DEFAULT_GEMFIRE_SERVER_PORT = CacheServer.DEFAULT_PORT;
 
 	protected static final long DEFAULT_WAIT_DURATION = TimeUnit.SECONDS.toMillis(20);
 	protected static final long DEFAULT_WAIT_INTERVAL = 500L;
 
-	protected static final File WORKING_DIRECTORY = new File(System.getProperty("user.dir"));
+	protected static final File WORKING_DIRECTORY = new File(
+			System.getProperty("user.dir"));
 
 	protected static final String DEFAULT_PROCESS_CONTROL_FILENAME = "process.ctl";
 
-	protected static final String GEMFIRE_LOG_FILE_NAME = System.getProperty(
-		"spring.session.data.gemfire.log-file", "server.log");
-
+	protected static final String GEMFIRE_LOG_FILE_NAME = System
+			.getProperty("spring.session.data.gemfire.log-file", "server.log");
 
 	@Autowired
 	protected Cache gemfireCache;
@@ -91,15 +92,17 @@ public class AbstractGemFireIntegrationTests {
 
 	@Before
 	public void setup() {
-		System.setProperty("gemfire.Query.VERBOSE", String.valueOf(isQueryDebuggingEnabled()));
+		System.setProperty("gemfire.Query.VERBOSE",
+				String.valueOf(isQueryDebuggingEnabled()));
 	}
 
 	/* (non-Javadoc) */
 	protected static File createDirectory(String pathname) {
 		File directory = new File(WORKING_DIRECTORY, pathname);
 
-		assertThat(directory.isDirectory() || directory.mkdirs()).as(
-			String.format("Failed to create directory (%1$s)", directory)).isTrue();
+		assertThat(directory.isDirectory() || directory.mkdirs())
+				.as(String.format("Failed to create directory (%1$s)", directory))
+				.isTrue();
 
 		directory.deleteOnExit();
 
@@ -107,7 +110,8 @@ public class AbstractGemFireIntegrationTests {
 	}
 
 	/* (non-Javadoc) */
-	protected static List<String> createJavaProcessCommandLine(Class<?> type, String... args) {
+	protected static List<String> createJavaProcessCommandLine(Class<?> type,
+			String... args) {
 		List<String> commandLine = new ArrayList<String>();
 
 		String javaHome = System.getProperty("java.home");
@@ -118,7 +122,8 @@ public class AbstractGemFireIntegrationTests {
 		commandLine.add("-ea");
 		commandLine.add(String.format("-Dgemfire.log-file=%1$s", GEMFIRE_LOG_FILE_NAME));
 		commandLine.add(String.format("-Dgemfire.log-level=%1$s", GEMFIRE_LOG_LEVEL));
-		commandLine.add(String.format("-Dgemfire.Query.VERBOSE=%1$s", GEMFIRE_QUERY_DEBUG));
+		commandLine
+				.add(String.format("-Dgemfire.Query.VERBOSE=%1$s", GEMFIRE_QUERY_DEBUG));
 		commandLine.addAll(extractJvmArguments(args));
 		commandLine.add("-classpath");
 		commandLine.add(System.getProperty("java.class.path"));
@@ -157,11 +162,10 @@ public class AbstractGemFireIntegrationTests {
 	}
 
 	/* (non-Javadoc) */
-	protected static Process run(Class<?> type, File directory, String... args) throws IOException {
-		return new ProcessBuilder()
-			.command(createJavaProcessCommandLine(type, args))
-			.directory(directory)
-			.start();
+	protected static Process run(Class<?> type, File directory, String... args)
+			throws IOException {
+		return new ProcessBuilder().command(createJavaProcessCommandLine(type, args))
+				.directory(directory).start();
 	}
 
 	/* (non-Javadoc) */
@@ -170,8 +174,10 @@ public class AbstractGemFireIntegrationTests {
 	}
 
 	/* (non-Javadoc) */
-	protected static boolean waitForCacheServerToStart(CacheServer cacheServer, long duration) {
-		return waitForCacheServerToStart(cacheServer.getBindAddress(), cacheServer.getPort(), duration);
+	protected static boolean waitForCacheServerToStart(CacheServer cacheServer,
+			long duration) {
+		return waitForCacheServerToStart(cacheServer.getBindAddress(),
+				cacheServer.getPort(), duration);
 	}
 
 	/* (non-Javadoc) */
@@ -180,7 +186,8 @@ public class AbstractGemFireIntegrationTests {
 	}
 
 	/* (non-Javadoc) */
-	protected static boolean waitForCacheServerToStart(final String host, final int port, long duration) {
+	protected static boolean waitForCacheServerToStart(final String host, final int port,
+			long duration) {
 		return waitOnCondition(new Condition() {
 			AtomicBoolean connected = new AtomicBoolean(false);
 
@@ -204,7 +211,8 @@ public class AbstractGemFireIntegrationTests {
 		}, duration);
 	}
 
-	// NOTE this method would not be necessary except Spring Sessions' build does not fork the test JVM
+	// NOTE this method would not be necessary except Spring Sessions' build does not fork
+	// the test JVM
 	// for every test class.
 	/* (non-Javadoc) */
 	protected static boolean waitForClientCacheToClose() {
@@ -239,7 +247,8 @@ public class AbstractGemFireIntegrationTests {
 
 	/* (non-Javadoc) */
 	@SuppressWarnings("all")
-	protected static boolean waitForProcessToStart(Process process, File directory, long duration) {
+	protected static boolean waitForProcessToStart(Process process, File directory,
+			long duration) {
 		final File processControl = new File(directory, DEFAULT_PROCESS_CONTROL_FILENAME);
 
 		waitOnCondition(new Condition() {
@@ -257,7 +266,8 @@ public class AbstractGemFireIntegrationTests {
 	}
 
 	/* (non-Javadoc) */
-	protected static int waitForProcessToStop(Process process, File directory, long duration) {
+	protected static int waitForProcessToStop(Process process, File directory,
+			long duration) {
 		final long timeout = (System.currentTimeMillis() + duration);
 
 		try {
@@ -312,24 +322,30 @@ public class AbstractGemFireIntegrationTests {
 	}
 
 	/* (non-Javadoc) */
-	protected void assertRegion(Region<?, ?> actualRegion, String expectedName, DataPolicy expectedDataPolicy) {
+	protected void assertRegion(Region<?, ?> actualRegion, String expectedName,
+			DataPolicy expectedDataPolicy) {
 		assertThat(actualRegion).isNotNull();
 		assertThat(actualRegion.getName()).isEqualTo(expectedName);
-		assertThat(actualRegion.getFullPath()).isEqualTo(GemFireUtils.toRegionPath(expectedName));
+		assertThat(actualRegion.getFullPath())
+				.isEqualTo(GemFireUtils.toRegionPath(expectedName));
 		assertThat(actualRegion.getAttributes()).isNotNull();
-		assertThat(actualRegion.getAttributes().getDataPolicy()).isEqualTo(expectedDataPolicy);
+		assertThat(actualRegion.getAttributes().getDataPolicy())
+				.isEqualTo(expectedDataPolicy);
 	}
 
 	/* (non-Javadoc) */
-	protected void assertIndex(Index index, String expectedExpression, String expectedFromClause) {
+	protected void assertIndex(Index index, String expectedExpression,
+			String expectedFromClause) {
 		assertThat(index).isNotNull();
 		assertThat(index.getIndexedExpression()).isEqualTo(expectedExpression);
 		assertThat(index.getFromClause()).isEqualTo(expectedFromClause);
 	}
 
 	/* (non-Javadoc) */
-	protected void assertEntryIdleTimeout(Region<?, ?> region, ExpirationAction expectedAction, int expectedTimeout) {
-		assertEntryIdleTimeout(region.getAttributes().getEntryIdleTimeout(), expectedAction, expectedTimeout);
+	protected void assertEntryIdleTimeout(Region<?, ?> region,
+			ExpirationAction expectedAction, int expectedTimeout) {
+		assertEntryIdleTimeout(region.getAttributes().getEntryIdleTimeout(),
+				expectedAction, expectedTimeout);
 	}
 
 	/* (non-Javadoc) */
@@ -404,13 +420,14 @@ public class AbstractGemFireIntegrationTests {
 	}
 
 	/**
-	 * The SessionEventListener class is a Spring {@link ApplicationListener} listening for Spring HTTP Session
-	 * application events.
+	 * The SessionEventListener class is a Spring {@link ApplicationListener} listening
+	 * for Spring HTTP Session application events.
 	 *
 	 * @see org.springframework.context.ApplicationListener
 	 * @see org.springframework.session.events.AbstractSessionEvent
 	 */
-	public static class SessionEventListener implements ApplicationListener<AbstractSessionEvent> {
+	public static class SessionEventListener
+			implements ApplicationListener<AbstractSessionEvent> {
 
 		private volatile AbstractSessionEvent sessionEvent;
 
@@ -440,7 +457,8 @@ public class AbstractGemFireIntegrationTests {
 	}
 
 	/**
-	 * The Condition interface defines a logical condition that must be satisfied before it is safe to proceed.
+	 * The Condition interface defines a logical condition that must be satisfied before
+	 * it is safe to proceed.
 	 */
 	protected interface Condition {
 		boolean evaluate();

docs/src/integration-test/java/docs/http/HttpSessionGemFireIndexingITests.java

@@ -60,7 +60,8 @@ public class HttpSessionGemFireIndexingITests extends AbstractGemFireIntegration
 		sessionRepository.save(session);
 
 		// tag::findbyindexname-get[]
-		Map<String, ExpiringSession> idToSessions = sessionRepository.findByIndexNameAndIndexValue(indexName, username);
+		Map<String, ExpiringSession> idToSessions = sessionRepository
+				.findByIndexNameAndIndexValue(indexName, username);
 		// end::findbyindexname-get[]
 
 		assertThat(idToSessions.keySet()).containsOnly(session.getId());
@@ -78,12 +79,15 @@ public class HttpSessionGemFireIndexingITests extends AbstractGemFireIntegration
 		Authentication authentication = context.getAuthentication();
 		// end::findbyspringsecurityindexname-context[]
 
-		session.setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY, context);
+		session.setAttribute(
+				HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY,
+				context);
 		sessionRepository.save(session);
 
 		// tag::findbyspringsecurityindexname-get[]
 		String indexName = FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME;
-		Map<String, ExpiringSession> idToSessions = sessionRepository.findByIndexNameAndIndexValue(indexName, authentication.getName());
+		Map<String, ExpiringSession> idToSessions = sessionRepository
+				.findByIndexNameAndIndexValue(indexName, authentication.getName());
 		// end::findbyspringsecurityindexname-get[]
 
 		assertThat(idToSessions.keySet()).containsOnly(session.getId());

docs/src/integration-test/java/docs/http/gemfire/indexablesessionattributes/GemFireHttpSessionConfig.java

@@ -31,7 +31,7 @@ import org.springframework.session.data.gemfire.config.annotation.web.http.Enabl
 // tag::class-start[]
 @EnableGemFireHttpSession(indexableSessionAttributes = { "name1", "name2", "name3" })
 public class GemFireHttpSessionConfig {
-// end::class-start[]
+	// end::class-start[]
 
 	@Bean
 	Properties gemfireProperties() {
@@ -39,7 +39,8 @@ public class GemFireHttpSessionConfig {
 
 		gemfireProperties.setProperty("name", GemFireHttpSessionConfig.class.getName());
 		gemfireProperties.setProperty("mcast-port", "0");
-		gemfireProperties.setProperty("log-level", AbstractGemFireIntegrationTests.GEMFIRE_LOG_LEVEL);
+		gemfireProperties.setProperty("log-level",
+				AbstractGemFireIntegrationTests.GEMFIRE_LOG_LEVEL);
 
 		return gemfireProperties;
 	}

docs/src/integration-test/java/docs/http/gemfire/indexablesessionattributes/HttpSessionGemFireIndexingCustomITests.java

@@ -34,7 +34,8 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = GemFireHttpSessionConfig.class)
-public class HttpSessionGemFireIndexingCustomITests extends AbstractGemFireIntegrationTests {
+public class HttpSessionGemFireIndexingCustomITests
+		extends AbstractGemFireIntegrationTests {
 
 	@Test
 	public void findByIndexName() {
@@ -49,7 +50,8 @@ public class HttpSessionGemFireIndexingCustomITests extends AbstractGemFireInteg
 		sessionRepository.save(session);
 
 		// tag::findbyindexname-get[]
-		Map<String, ExpiringSession> idToSessions = sessionRepository.findByIndexNameAndIndexValue(indexName, attrValue);
+		Map<String, ExpiringSession> idToSessions = sessionRepository
+				.findByIndexNameAndIndexValue(indexName, attrValue);
 		// end::findbyindexname-get[]
 
 		assertThat(idToSessions.keySet()).containsOnly(session.getId());

docs/src/test/java/docs/FindByIndexNameSessionRepositoryTests.java

@@ -41,7 +41,8 @@ public class FindByIndexNameSessionRepositoryTests {
 	public void setUsername() {
 		// tag::set-username[]
 		String username = "username";
-		this.session.setAttribute(FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME, username);
+		this.session.setAttribute(
+				FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME, username);
 		// end::set-username[]
 	}
 
@@ -50,8 +51,10 @@ public class FindByIndexNameSessionRepositoryTests {
 	public void findByUsername() {
 		// tag::findby-username[]
 		String username = "username";
-		Map<String, Session> sessionIdToSession =
-				this.sessionRepository.findByIndexNameAndIndexValue(FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME, username);
+		Map<String, Session> sessionIdToSession = this.sessionRepository
+				.findByIndexNameAndIndexValue(
+						FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME,
+						username);
 		// end::findby-username[]
 	}
 }

docs/src/test/java/docs/HttpSessionConfigurationNoOpConfigureRedisActionXmlTests.java

@@ -45,7 +45,6 @@ public class HttpSessionConfigurationNoOpConfigureRedisActionXmlTests {
 		assertThat(this.filter).isNotNull();
 	}
 
-
 	static RedisConnectionFactory connectionFactory() {
 		return mock(RedisConnectionFactory.class);
 	}

docs/src/test/java/docs/IndexDocTests.java

@@ -68,7 +68,6 @@ public class IndexDocTests {
 	}
 	// end::repository-demo[]
 
-
 	@Test
 	public void expireRepositoryDemo() {
 		ExpiringRepositoryDemo<ExpiringSession> demo = new ExpiringRepositoryDemo<ExpiringSession>();
@@ -102,8 +101,8 @@ public class IndexDocTests {
 	public void newRedisOperationsSessionRepository() {
 		// tag::new-redisoperationssessionrepository[]
 		JedisConnectionFactory factory = new JedisConnectionFactory();
-		SessionRepository<? extends ExpiringSession> repository =
-				new RedisOperationsSessionRepository(factory);
+		SessionRepository<? extends ExpiringSession> repository = new RedisOperationsSessionRepository(
+				factory);
 		// end::new-redisoperationssessionrepository[]
 	}
 

docs/src/test/java/docs/http/AbstractHttpSessionListenerTests.java

@@ -51,7 +51,9 @@ public abstract class AbstractHttpSessionListenerTests {
 	public void springSessionDestroyedTranslatedToSpringSecurityDestroyed() {
 		Session session = new MapSession();
 
-		this.publisher.publishEvent(new org.springframework.session.events.SessionDestroyedEvent(this, session));
+		this.publisher.publishEvent(
+				new org.springframework.session.events.SessionDestroyedEvent(this,
+						session));
 
 		assertThat(this.listener.getEvent().getId()).isEqualTo(session.getId());
 	}
@@ -64,12 +66,16 @@ public abstract class AbstractHttpSessionListenerTests {
 		return factory;
 	}
 
-	static class SecuritySessionDestroyedListener implements ApplicationListener<SessionDestroyedEvent> {
+	static class SecuritySessionDestroyedListener
+			implements ApplicationListener<SessionDestroyedEvent> {
 
 		private SessionDestroyedEvent event;
 
-		/* (non-Javadoc)
-		 * @see org.springframework.context.ApplicationListener#onApplicationEvent(org.springframework.context.ApplicationEvent)
+		/*
+		 * (non-Javadoc)
+		 *
+		 * @see org.springframework.context.ApplicationListener#onApplicationEvent(org.
+		 * springframework.context.ApplicationEvent)
 		 */
 		public void onApplicationEvent(SessionDestroyedEvent event) {
 			this.event = event;

docs/src/test/java/docs/websocket/WebSocketConfig.java

@@ -24,18 +24,16 @@ import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBr
 import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
 
 /**
-* @author Rob Winch
-*/
+ * @author Rob Winch
+ */
 // tag::class[]
 @Configuration
 @EnableScheduling
 @EnableWebSocketMessageBroker
-public class WebSocketConfig
-		extends AbstractWebSocketMessageBrokerConfigurer {
+public class WebSocketConfig extends AbstractWebSocketMessageBrokerConfigurer {
 
 	public void registerStompEndpoints(StompEndpointRegistry registry) {
-		registry.addEndpoint("/messages")
-				.withSockJS();
+		registry.addEndpoint("/messages").withSockJS();
 	}
 
 	@Override

docs/src/test/resources/docs/HttpSessionConfigurationNoOpConfigureRedisActionXmlTests-context.xml

@@ -19,4 +19,4 @@
 
 	<bean class="docs.HttpSessionConfigurationNoOpConfigureRedisActionXmlTests"
 		factory-method="connectionFactory"/>
-</beans>
+</beans>

docs/src/test/resources/docs/http/HttpSessionListenerXmlTests-context.xml

@@ -19,4 +19,4 @@
 	<bean class="docs.http.AbstractHttpSessionListenerTests"
 		factory-method="createMockRedisConnection"/>
 	<bean class="docs.http.AbstractHttpSessionListenerTests$SecuritySessionDestroyedListener"/>
-</beans>
+</beans>

samples/boot/src/main/java/sample/config/HttpSessionConfig.java

@@ -18,8 +18,8 @@ package sample.config;
 
 import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
 
-
 // tag::class[]
 @EnableRedisHttpSession // <1>
-public class HttpSessionConfig { }
+public class HttpSessionConfig {
+}
 // end::class[]

samples/boot/src/main/java/sample/config/SecurityConfig.java

@@ -29,8 +29,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 
 	@Autowired
 	public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-		auth
-			.inMemoryAuthentication()
-				.withUser("user").password("password").roles("USER");
+		auth.inMemoryAuthentication().withUser("user").password("password").roles("USER");
 	}
 }

samples/boot/src/main/resources/application.properties

@@ -1,2 +1,2 @@
 spring.thymeleaf.cache=false
-spring.template.cache=false
+spring.template.cache=false

samples/boot/src/main/resources/templates/index.html

@@ -8,4 +8,4 @@
 		<p>This page is secured using Spring Boot, Spring Session, and Spring Security.</p>
 	</div>
 </body>
-</html>
+</html>

samples/boot/src/main/resources/templates/layout.html

@@ -82,7 +82,7 @@
 						<a class="brand" th:href="@{/}"><img th:src="@{/resources/img/logo.png}" alt="Spring Security Sample"/></a>
 
 <div class="nav-collapse collapse"
-		 th:with="currentUser=${#httpServletRequest.userPrincipal?.principal}">
+		th:with="currentUser=${#httpServletRequest.userPrincipal?.principal}">
 	<div th:if="${currentUser != null}">
 			<form class="navbar-form pull-right" th:action="@{/logout}" method="post">
 					<input type="submit" value="Log out" />
@@ -119,4 +119,4 @@
 			</div>
 		</div>
 	</body>
-</html>
+</html>

samples/custom-cookie/src/main/java/sample/Config.java

@@ -22,7 +22,6 @@ import org.springframework.session.data.redis.config.annotation.web.http.EnableR
 import org.springframework.session.web.http.CookieSerializer;
 import org.springframework.session.web.http.DefaultCookieSerializer;
 
-
 @EnableRedisHttpSession
 public class Config {
 

samples/custom-cookie/src/main/java/sample/Initializer.java

@@ -19,8 +19,7 @@ package sample;
 import org.springframework.session.web.context.AbstractHttpSessionApplicationInitializer;
 
 // tag::class[]
-public class Initializer
-		extends AbstractHttpSessionApplicationInitializer { // <1>
+public class Initializer extends AbstractHttpSessionApplicationInitializer { // <1>
 
 	public Initializer() {
 		super(Config.class); // <2>

samples/custom-cookie/src/main/java/sample/SessionServlet.java

@@ -29,7 +29,8 @@ import javax.servlet.http.HttpServletResponse;
 public class SessionServlet extends HttpServlet {
 
 	@Override
-	protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+	protected void doPost(HttpServletRequest req, HttpServletResponse resp)
+			throws ServletException, IOException {
 		String attributeName = req.getParameter("attributeName");
 		String attributeValue = req.getParameter("attributeValue");
 		req.getSession().setAttribute(attributeName, attributeValue);

samples/findbyusername/src/main/java/sample/config/GeoConfig.java

@@ -33,7 +33,9 @@ import org.springframework.context.annotation.Configuration;
 public class GeoConfig {
 
 	@Bean
-	public DatabaseReader geoDatabaseReader(@Value("classpath:GeoLite2-City.mmdb") InputStream geoInputStream) throws Exception {
+	public DatabaseReader geoDatabaseReader(
+			@Value("classpath:GeoLite2-City.mmdb") InputStream geoInputStream)
+					throws Exception {
 		return new DatabaseReader.Builder(geoInputStream).build();
 	}
 

samples/findbyusername/src/main/java/sample/config/HttpSessionConfig.java

@@ -25,5 +25,6 @@ import org.springframework.session.data.redis.config.annotation.web.http.EnableR
  */
 // tag::class[]
 @EnableRedisHttpSession // <1>
-public class HttpSessionConfig { }
+public class HttpSessionConfig {
+}
 // end::class[]

samples/findbyusername/src/main/java/sample/config/SecurityConfig.java

@@ -31,24 +31,14 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 	// tag::config[]
 	@Override
 	protected void configure(HttpSecurity http) throws Exception {
-		http
-			.formLogin()
-				.loginPage("/login")
-				.permitAll()
-				.and()
-			.authorizeRequests()
-				.antMatchers("/resources/**").permitAll()
-				.anyRequest().authenticated()
-				.and()
-			.logout()
-				.permitAll();
+		http.formLogin().loginPage("/login").permitAll().and().authorizeRequests()
+				.antMatchers("/resources/**").permitAll().anyRequest().authenticated()
+				.and().logout().permitAll();
 	}
 	// end::config[]
 
 	@Autowired
 	public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-		auth
-			.inMemoryAuthentication()
-				.withUser("user").password("password").roles("USER");
+		auth.inMemoryAuthentication().withUser("user").password("password").roles("USER");
 	}
 }

samples/findbyusername/src/main/java/sample/mvc/IndexController.java

@@ -43,17 +43,21 @@ public class IndexController {
 
 	@RequestMapping("/")
 	public String index(Principal principal, Model model) {
-		Collection<? extends ExpiringSession> usersSessions =
-				this.sessions.findByIndexNameAndIndexValue(FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME,
-						principal.getName()).values();
+		Collection<? extends ExpiringSession> usersSessions = this.sessions
+				.findByIndexNameAndIndexValue(
+						FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME,
+						principal.getName())
+				.values();
 		model.addAttribute("sessions", usersSessions);
 		return "index";
 	}
 	// end::findbyusername[]
 
 	@RequestMapping(value = "/sessions/{sessionIdToDelete}", method = RequestMethod.DELETE)
-	public String removeSession(Principal principal, @PathVariable String sessionIdToDelete) {
-		Set<String> usersSessionIds = this.sessions.findByIndexNameAndIndexValue(FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME,
+	public String removeSession(Principal principal,
+			@PathVariable String sessionIdToDelete) {
+		Set<String> usersSessionIds = this.sessions.findByIndexNameAndIndexValue(
+				FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME,
 				principal.getName()).keySet();
 		if (usersSessionIds.contains(sessionIdToDelete)) {
 			this.sessions.delete(sessionIdToDelete);

samples/findbyusername/src/main/java/sample/session/SessionDetailsFilter.java

@@ -35,10 +35,10 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 
 /**
- * Inserts the session details into the session for every request. Some users
- * may prefer to insert session details only after authentication. This is fine,
- * but it may be valuable to the most up to date information so that if someone
- * stole the user's session id it can be observed.
+ * Inserts the session details into the session for every request. Some users may prefer
+ * to insert session details only after authentication. This is fine, but it may be
+ * valuable to the most up to date information so that if someone stole the user's session
+ * id it can be observed.
  *
  * @author Rob Winch
  *
@@ -57,8 +57,8 @@ public class SessionDetailsFilter extends OncePerRequestFilter {
 	}
 
 	// tag::dofilterinternal[]
-	public void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
-			throws IOException, ServletException {
+	public void doFilterInternal(HttpServletRequest request, HttpServletResponse response,
+			FilterChain chain) throws IOException, ServletException {
 		chain.doFilter(request, response);
 
 		HttpSession session = request.getSession(false);
@@ -108,5 +108,4 @@ public class SessionDetailsFilter extends OncePerRequestFilter {
 		return remoteAddr;
 	}
 }
-//end::class[]
-
+// end::class[]

samples/findbyusername/src/test/java/sample/session/SessionDetailsFilterTests.java

@@ -48,16 +48,19 @@ public class SessionDetailsFilterTests {
 
 	@Test
 	public void getGeoLocationHanldesInvalidIp() {
-		assertThat(this.filter.getGeoLocation("a")).isEqualTo(SessionDetailsFilter.UNKNOWN);
+		assertThat(this.filter.getGeoLocation("a"))
+				.isEqualTo(SessionDetailsFilter.UNKNOWN);
 	}
 
 	@Test
 	public void getGeoLocationNullCity() {
-		assertThat(this.filter.getGeoLocation("22.231.113.64")).isEqualTo("United States");
+		assertThat(this.filter.getGeoLocation("22.231.113.64"))
+				.isEqualTo("United States");
 	}
 
 	@Test
 	public void getGeoLocationBoth() {
-		assertThat(this.filter.getGeoLocation("184.154.83.119")).isEqualTo("Chicago, United States");
+		assertThat(this.filter.getGeoLocation("184.154.83.119"))
+				.isEqualTo("Chicago, United States");
 	}
 }

samples/hazelcast-spring/src/main/java/sample/Config.java

@@ -38,8 +38,8 @@ public class Config {
 		netConfig.setPort(SocketUtils.findAvailableTcpPort());
 		System.out.println("Hazelcast port #: " + netConfig.getPort());
 		cfg.setNetworkConfig(netConfig);
-		SerializerConfig serializer = new SerializerConfig().setTypeClass(
-				Object.class).setImplementation(new ObjectStreamSerializer());
+		SerializerConfig serializer = new SerializerConfig().setTypeClass(Object.class)
+				.setImplementation(new ObjectStreamSerializer());
 		cfg.getSerializationConfig().addSerializerConfig(serializer);
 
 		return Hazelcast.newHazelcastInstance(cfg);

samples/hazelcast-spring/src/main/java/sample/ObjectStreamSerializer.java

@@ -27,11 +27,10 @@ import com.hazelcast.nio.ObjectDataOutput;
 import com.hazelcast.nio.serialization.StreamSerializer;
 
 /**
- * A {@link StreamSerializer} that uses Java serialization to persist the
- * session. This is certainly not the most efficient way to persist sessions,
- * but the example is intended to demonstrate using minimal dependencies. For
- * better serialization methods try using <a
- * href="https://github.com/EsotericSoftware/kryo">Kryo</a>.
+ * A {@link StreamSerializer} that uses Java serialization to persist the session. This is
+ * certainly not the most efficient way to persist sessions, but the example is intended
+ * to demonstrate using minimal dependencies. For better serialization methods try using
+ * <a href="https://github.com/EsotericSoftware/kryo">Kryo</a>.
  *
  * @author Rob Winch
  *
@@ -48,8 +47,7 @@ public class ObjectStreamSerializer implements StreamSerializer<Object> {
 		out.flush();
 	}
 
-	public Object read(ObjectDataInput objectDataInput)
-			throws IOException {
+	public Object read(ObjectDataInput objectDataInput) throws IOException {
 		ObjectInputStream in = new ObjectInputStream((InputStream) objectDataInput);
 		try {
 			return in.readObject();

samples/hazelcast-spring/src/main/java/sample/SecurityConfig.java

@@ -28,8 +28,6 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe
 public class SecurityConfig {
 	@Autowired
 	public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-		auth
-			.inMemoryAuthentication()
-				.withUser("user").password("password").roles("USER");
+		auth.inMemoryAuthentication().withUser("user").password("password").roles("USER");
 	}
 }

samples/hazelcast-spring/src/main/java/sample/SecurityInitializer.java

@@ -19,8 +19,7 @@ package sample;
 import org.springframework.security.web.context.AbstractSecurityWebApplicationInitializer;
 
 // tag::class[]
-public class SecurityInitializer extends
-		AbstractSecurityWebApplicationInitializer {
+public class SecurityInitializer extends AbstractSecurityWebApplicationInitializer {
 
 	public SecurityInitializer() {
 		super(SecurityConfig.class, Config.class);

samples/hazelcast-spring/src/main/java/sample/SessionServlet.java

@@ -28,7 +28,8 @@ import javax.servlet.http.HttpServletResponse;
 public class SessionServlet extends HttpServlet {
 
 	@Override
-	protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+	protected void doPost(HttpServletRequest req, HttpServletResponse resp)
+			throws ServletException, IOException {
 		String attributeName = req.getParameter("attributeName");
 		String attributeValue = req.getParameter("attributeValue");
 		req.getSession().setAttribute(attributeName, attributeValue);

samples/hazelcast/src/main/java/sample/Initializer.java

@@ -53,9 +53,8 @@ public class Initializer implements ServletContextListener {
 		NetworkConfig netConfig = new NetworkConfig();
 		netConfig.setPort(getAvailablePort());
 		cfg.setNetworkConfig(netConfig);
-		SerializerConfig serializer = new SerializerConfig()
-			.setTypeClass(Object.class)
-			.setImplementation(new ObjectStreamSerializer());
+		SerializerConfig serializer = new SerializerConfig().setTypeClass(Object.class)
+				.setImplementation(new ObjectStreamSerializer());
 		cfg.getSerializationConfig().addSerializerConfig(serializer);
 		MapConfig mc = new MapConfig();
 		mc.setName(sessionMapName);
@@ -65,10 +64,10 @@ public class Initializer implements ServletContextListener {
 		this.instance = Hazelcast.newHazelcastInstance(cfg);
 		Map<String, ExpiringSession> sessions = this.instance.getMap(sessionMapName);
 
-		SessionRepository<ExpiringSession> sessionRepository =
-				new MapSessionRepository(sessions);
-		SessionRepositoryFilter<ExpiringSession> filter =
-				new SessionRepositoryFilter<ExpiringSession>(sessionRepository);
+		SessionRepository<ExpiringSession> sessionRepository = new MapSessionRepository(
+				sessions);
+		SessionRepositoryFilter<ExpiringSession> filter = new SessionRepositoryFilter<ExpiringSession>(
+				sessionRepository);
 		Dynamic fr = sc.addFilter("springSessionFilter", filter);
 		fr.addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST), true, "/*");
 	}

samples/hazelcast/src/main/java/sample/ObjectStreamSerializer.java

@@ -27,11 +27,10 @@ import com.hazelcast.nio.ObjectDataOutput;
 import com.hazelcast.nio.serialization.StreamSerializer;
 
 /**
- * A {@link StreamSerializer} that uses Java serialization to persist the
- * session. This is certainly not the most efficient way to persist sessions,
- * but the example is intended to demonstrate using minimal dependencies. For
- * better serialization methods try using <a
- * href="https://github.com/EsotericSoftware/kryo">Kryo</a>.
+ * A {@link StreamSerializer} that uses Java serialization to persist the session. This is
+ * certainly not the most efficient way to persist sessions, but the example is intended
+ * to demonstrate using minimal dependencies. For better serialization methods try using
+ * <a href="https://github.com/EsotericSoftware/kryo">Kryo</a>.
  *
  * @author Rob Winch
  *
@@ -48,8 +47,7 @@ public class ObjectStreamSerializer implements StreamSerializer<Object> {
 		out.flush();
 	}
 
-	public Object read(ObjectDataInput objectDataInput)
-			throws IOException {
+	public Object read(ObjectDataInput objectDataInput) throws IOException {
 		ObjectInputStream in = new ObjectInputStream((InputStream) objectDataInput);
 		try {
 			return in.readObject();

samples/hazelcast/src/main/java/sample/SessionServlet.java

@@ -31,7 +31,8 @@ import javax.servlet.http.HttpServletResponse;
 public class SessionServlet extends HttpServlet {
 
 	@Override
-	protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+	protected void doPost(HttpServletRequest req, HttpServletResponse resp)
+			throws ServletException, IOException {
 		String attributeName = req.getParameter("attributeName");
 		String attributeValue = req.getParameter("attributeValue");
 		req.getSession().setAttribute(attributeName, attributeValue);

samples/httpsession-gemfire-clientserver-xml/src/main/java/sample/Application.java

@@ -27,7 +27,8 @@ import org.springframework.context.annotation.ImportResource;
 public class Application {
 
 	public static void main(final String[] args) {
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(Application.class);
+		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
+				Application.class);
 		context.registerShutdownHook();
 	}
 }

samples/httpsession-gemfire-clientserver-xml/src/main/java/sample/GemFireCacheServerReadyBeanPostProcessor.java

@@ -49,32 +49,37 @@ public class GemFireCacheServerReadyBeanPostProcessor implements BeanPostProcess
 	@Value("${spring.session.data.gemfire.port:${application.gemfire.client-server.port}}")
 	int port;
 
-// tag::class[]
+	// tag::class[]
 	static {
-		ClientMembership.registerClientMembershipListener(new ClientMembershipListenerAdapter() {
-			public void memberJoined(final ClientMembershipEvent event) {
-				if (!event.isClient()) {
-					latch.countDown();
-				}
-			}
-		});
+		ClientMembership
+				.registerClientMembershipListener(new ClientMembershipListenerAdapter() {
+					public void memberJoined(final ClientMembershipEvent event) {
+						if (!event.isClient()) {
+							latch.countDown();
+						}
+					}
+				});
 	}
 
 	@SuppressWarnings("all")
 	@Resource(name = "applicationProperties")
 	private Properties applicationProperties;
 
-	public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
+	public Object postProcessBeforeInitialization(Object bean, String beanName)
+			throws BeansException {
 		if (bean instanceof PoolFactoryBean || bean instanceof Pool) {
 			String host = getServerHost(DEFAULT_SERVER_HOST);
-			Assert.isTrue(waitForCacheServerToStart(host, this.port), String.format(
-				"GemFire Server failed to start [host: '%1$s', port: %2$d]%n", host, this.port));
+			Assert.isTrue(waitForCacheServerToStart(host, this.port),
+					String.format(
+							"GemFire Server failed to start [host: '%1$s', port: %2$d]%n",
+							host, this.port));
 		}
 
 		return bean;
 	}
 
-	public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
+	public Object postProcessAfterInitialization(Object bean, String beanName)
+			throws BeansException {
 		if (bean instanceof PoolFactoryBean || bean instanceof Pool) {
 			try {
 				latch.await(DEFAULT_WAIT_DURATION, TimeUnit.MILLISECONDS);
@@ -86,14 +91,15 @@ public class GemFireCacheServerReadyBeanPostProcessor implements BeanPostProcess
 
 		return bean;
 	}
-// tag::end[]
+	// tag::end[]
 
 	interface Condition {
 		boolean evaluate();
 	}
 
 	String getServerHost(String defaultServerHost) {
-		return this.applicationProperties.getProperty("application.gemfire.client-server.host", defaultServerHost);
+		return this.applicationProperties
+				.getProperty("application.gemfire.client-server.host", defaultServerHost);
 	}
 
 	boolean waitForCacheServerToStart(String host, int port) {
@@ -109,8 +115,10 @@ public class GemFireCacheServerReadyBeanPostProcessor implements BeanPostProcess
 				Socket socket = null;
 
 				try {
-					// NOTE: this code is not intended to be an atomic, compound action (a possible race condition);
-					// opening another connection (at the expense of using system resources) after connectivity
+					// NOTE: this code is not intended to be an atomic, compound action (a
+					// possible race condition);
+					// opening another connection (at the expense of using system
+					// resources) after connectivity
 					// has already been established is not detrimental in this use case
 					if (!connected.get()) {
 						socket = new Socket(host, port);

samples/httpsession-gemfire-clientserver/src/main/java/sample/ClientConfig.java

@@ -53,16 +53,16 @@ public class ClientConfig {
 
 	static {
 		System.setProperty("gemfire.log-level",
-			System.getProperty("sample.httpsession.gemfire.log-level", "warning"));
+				System.getProperty("sample.httpsession.gemfire.log-level", "warning"));
 
-		ClientMembership.registerClientMembershipListener(
-			new ClientMembershipListenerAdapter() {
-				public void memberJoined(ClientMembershipEvent event) {
-					if (!event.isClient()) {
-						latch.countDown();
+		ClientMembership
+				.registerClientMembershipListener(new ClientMembershipListenerAdapter() {
+					public void memberJoined(ClientMembershipEvent event) {
+						if (!event.isClient()) {
+							latch.countDown();
+						}
 					}
-				}
-		});
+				});
 	}
 
 	@Bean
@@ -77,7 +77,8 @@ public class ClientConfig {
 
 	@Bean(name = GemfireConstants.DEFAULT_GEMFIRE_POOL_NAME)
 	PoolFactoryBean gemfirePool(// <3>
-			@Value("${spring.session.data.gemfire.port:" + ServerConfig.SERVER_PORT + "}") int port) {
+			@Value("${spring.session.data.gemfire.port:" + ServerConfig.SERVER_PORT
+					+ "}") int port) {
 
 		PoolFactoryBean poolFactory = new PoolFactoryBean();
 
@@ -91,8 +92,8 @@ public class ClientConfig {
 		poolFactory.setSubscriptionEnabled(true);
 		poolFactory.setThreadLocalConnections(false);
 
-		poolFactory.setServerEndpoints(Collections.singletonList(new ConnectionEndpoint(
-			ServerConfig.SERVER_HOSTNAME, port)));
+		poolFactory.setServerEndpoints(Collections.singletonList(
+				new ConnectionEndpoint(ServerConfig.SERVER_HOSTNAME, port)));
 
 		return poolFactory;
 	}
@@ -111,27 +112,29 @@ public class ClientConfig {
 
 	@Bean
 	BeanPostProcessor gemfireCacheServerReadyBeanPostProcessor(// <5>
-			@Value("${spring.session.data.gemfire.port:" + ServerConfig.SERVER_PORT + "}") final int port) {
+			@Value("${spring.session.data.gemfire.port:" + ServerConfig.SERVER_PORT
+					+ "}") final int port) {
 
 		return new BeanPostProcessor() {
 
-			public Object postProcessBeforeInitialization(
-					Object bean, String beanName) throws BeansException {
+			public Object postProcessBeforeInitialization(Object bean, String beanName)
+					throws BeansException {
 				if (bean instanceof PoolFactoryBean || bean instanceof Pool) {
-					Assert.isTrue(waitForCacheServerToStart(ServerConfig.SERVER_HOSTNAME, port),
-						String.format("GemFire Server failed to start [hostname: %1$s, port: %2$d]",
-							ServerConfig.SERVER_HOSTNAME, port));
+					Assert.isTrue(
+							waitForCacheServerToStart(ServerConfig.SERVER_HOSTNAME, port),
+							String.format(
+									"GemFire Server failed to start [hostname: %1$s, port: %2$d]",
+									ServerConfig.SERVER_HOSTNAME, port));
 				}
 
 				return bean;
 			}
 
-			public Object postProcessAfterInitialization(
-					Object bean, String beanName) throws BeansException {
+			public Object postProcessAfterInitialization(Object bean, String beanName)
+					throws BeansException {
 				if (bean instanceof PoolFactoryBean || bean instanceof Pool) {
 					try {
-						latch.await(DEFAULT_WAIT_DURATION,
-							TimeUnit.MILLISECONDS);
+						latch.await(DEFAULT_WAIT_DURATION, TimeUnit.MILLISECONDS);
 					}
 					catch (InterruptedException e) {
 						Thread.currentThread().interrupt();
@@ -142,7 +145,7 @@ public class ClientConfig {
 			}
 		};
 	}
-// end::class[]
+	// end::class[]
 
 	interface Condition {
 		boolean evaluate();
@@ -161,8 +164,10 @@ public class ClientConfig {
 				Socket socket = null;
 
 				try {
-					// NOTE: this code is not intended to be an atomic, compound action (a possible race condition);
-					// opening another connection (at the expense of using system resources) after connectivity
+					// NOTE: this code is not intended to be an atomic, compound action (a
+					// possible race condition);
+					// opening another connection (at the expense of using system
+					// resources) after connectivity
 					// has already been established is not detrimental in this use case
 					if (!connected.get()) {
 						socket = new Socket(host, port);

samples/httpsession-gemfire-clientserver/src/main/java/sample/Initializer.java

@@ -19,8 +19,7 @@ package sample;
 import org.springframework.session.web.context.AbstractHttpSessionApplicationInitializer;
 
 // tag::class[]
-public class Initializer
-		extends AbstractHttpSessionApplicationInitializer { // <1>
+public class Initializer extends AbstractHttpSessionApplicationInitializer { // <1>
 
 	public Initializer() {
 		super(ClientConfig.class); // <2>

samples/httpsession-gemfire-clientserver/src/main/java/sample/ServerConfig.java

@@ -30,7 +30,7 @@ import org.springframework.data.gemfire.server.CacheServerFactoryBean;
 import org.springframework.session.data.gemfire.config.annotation.web.http.EnableGemFireHttpSession;
 
 // tag::class[]
-@EnableGemFireHttpSession(maxInactiveIntervalInSeconds = 30)// <1>
+@EnableGemFireHttpSession(maxInactiveIntervalInSeconds = 30) // <1>
 public class ServerConfig {
 
 	static final int MAX_CONNECTIONS = 50;
@@ -50,7 +50,7 @@ public class ServerConfig {
 		gemfireProperties.setProperty("name", "GemFireClientServerHttpSessionSample");
 		gemfireProperties.setProperty("mcast-port", "0");
 		gemfireProperties.setProperty("log-level",
-			System.getProperty("sample.httpsession.gemfire.log-level", "warning"));
+				System.getProperty("sample.httpsession.gemfire.log-level", "warning"));
 		gemfireProperties.setProperty("jmx-manager", "true");
 		gemfireProperties.setProperty("jmx-manager-start", "true");
 
@@ -84,8 +84,7 @@ public class ServerConfig {
 
 	@SuppressWarnings("resource")
 	public static void main(final String[] args) throws IOException { // <5>
-		new AnnotationConfigApplicationContext(ServerConfig.class)
-			.registerShutdownHook();
+		new AnnotationConfigApplicationContext(ServerConfig.class).registerShutdownHook();
 	}
 }
 // end::class[]

samples/httpsession-gemfire-p2p/src/main/java/sample/Config.java

@@ -33,7 +33,7 @@ public class Config {
 		gemfireProperties.setProperty("name", "GemFireP2PHttpSessionSample");
 		gemfireProperties.setProperty("mcast-port", "0");
 		gemfireProperties.setProperty("log-level",
-			System.getProperty("sample.httpsession.gemfire.log-level", "warning"));
+				System.getProperty("sample.httpsession.gemfire.log-level", "warning"));
 		gemfireProperties.setProperty("jmx-manager", "true");
 		gemfireProperties.setProperty("jmx-manager-start", "true");
 

samples/httpsession-gemfire-p2p/src/main/java/sample/Initializer.java

@@ -19,8 +19,7 @@ package sample;
 import org.springframework.session.web.context.AbstractHttpSessionApplicationInitializer;
 
 // tag::class[]
-public class Initializer
-		extends AbstractHttpSessionApplicationInitializer { // <1>
+public class Initializer extends AbstractHttpSessionApplicationInitializer { // <1>
 
 	public Initializer() {
 		super(Config.class); // <2>

samples/httpsession-jdbc-xml/src/main/java/sample/SessionServlet.java

@@ -15,15 +15,19 @@
  */
 package sample;
 
-import javax.servlet.*;
-import javax.servlet.http.*;
 import java.io.IOException;
 
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 // tag::class[]
 public class SessionServlet extends HttpServlet {
 
 	@Override
-	protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+	protected void doPost(HttpServletRequest req, HttpServletResponse resp)
+			throws ServletException, IOException {
 		String attributeName = req.getParameter("attributeName");
 		String attributeValue = req.getParameter("attributeValue");
 		req.getSession().setAttribute(attributeName, attributeValue);

samples/httpsession-jdbc/src/main/java/sample/Config.java

@@ -34,8 +34,7 @@ public class Config {
 	public EmbeddedDatabase dataSource() {
 		return new EmbeddedDatabaseBuilder() // <2>
 				.setType(EmbeddedDatabaseType.H2)
-				.addScript("org/springframework/session/jdbc/schema-h2.sql")
-				.build();
+				.addScript("org/springframework/session/jdbc/schema-h2.sql").build();
 	}
 
 	@Bean

samples/httpsession-jdbc/src/main/java/sample/Initializer.java

@@ -18,8 +18,7 @@ package sample;
 import org.springframework.session.web.context.AbstractHttpSessionApplicationInitializer;
 
 // tag::class[]
-public class Initializer
-		extends AbstractHttpSessionApplicationInitializer { // <1>
+public class Initializer extends AbstractHttpSessionApplicationInitializer { // <1>
 
 	public Initializer() {
 		super(Config.class); // <2>

samples/httpsession-jdbc/src/main/java/sample/SessionServlet.java

@@ -15,17 +15,21 @@
  */
 package sample;
 
-import javax.servlet.*;
-import javax.servlet.annotation.*;
-import javax.servlet.http.*;
 import java.io.IOException;
 
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 // tag::class[]
 @WebServlet("/session")
 public class SessionServlet extends HttpServlet {
 
 	@Override
-	protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+	protected void doPost(HttpServletRequest req, HttpServletResponse resp)
+			throws ServletException, IOException {
 		String attributeName = req.getParameter("attributeName");
 		String attributeValue = req.getParameter("attributeValue");
 		req.getSession().setAttribute(attributeName, attributeValue);

samples/httpsession-xml/src/main/java/sample/SessionServlet.java

@@ -27,7 +27,8 @@ import javax.servlet.http.HttpServletResponse;
 public class SessionServlet extends HttpServlet {
 
 	@Override
-	protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+	protected void doPost(HttpServletRequest req, HttpServletResponse resp)
+			throws ServletException, IOException {
 		String attributeName = req.getParameter("attributeName");
 		String attributeValue = req.getParameter("attributeValue");
 		req.getSession().setAttribute(attributeName, attributeValue);

samples/httpsession/src/main/java/sample/Initializer.java

@@ -19,8 +19,7 @@ package sample;
 import org.springframework.session.web.context.AbstractHttpSessionApplicationInitializer;
 
 // tag::class[]
-public class Initializer
-		extends AbstractHttpSessionApplicationInitializer { // <1>
+public class Initializer extends AbstractHttpSessionApplicationInitializer { // <1>
 
 	public Initializer() {
 		super(Config.class); // <2>

samples/httpsession/src/main/java/sample/SessionServlet.java

@@ -29,7 +29,8 @@ import javax.servlet.http.HttpServletResponse;
 public class SessionServlet extends HttpServlet {
 
 	@Override
-	protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+	protected void doPost(HttpServletRequest req, HttpServletResponse resp)
+			throws ServletException, IOException {
 		String attributeName = req.getParameter("attributeName");
 		String attributeValue = req.getParameter("attributeValue");
 		req.getSession().setAttribute(attributeName, attributeValue);

samples/mongo/src/integration-test/groovy/sample/BootTests.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2014-2016 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.
@@ -16,16 +16,15 @@
 package sample
 
 import geb.spock.*
-import org.springframework.beans.factory.annotation.Value
-import org.springframework.boot.test.IntegrationTest
-import org.springframework.boot.test.SpringApplicationConfiguration
-import org.springframework.boot.test.SpringApplicationContextLoader
-import org.springframework.test.context.ContextConfiguration
-import org.springframework.test.context.web.WebAppConfiguration
+import pages.*
 import sample.pages.HomePage
 import sample.pages.LoginPage
 import spock.lang.Stepwise
-import pages.*
+
+import org.springframework.boot.test.IntegrationTest
+import org.springframework.boot.test.SpringApplicationContextLoader
+import org.springframework.test.context.ContextConfiguration
+import org.springframework.test.context.web.WebAppConfiguration
 
 /**
  * Tests the demo that supports multiple sessions
@@ -71,4 +70,4 @@ class BootTests extends GebReportingSpec {
 		then: 'sent to the log in page'
 		at LoginPage
 	}
-}
+}

samples/mongo/src/main/java/sample/Application.java

@@ -1,17 +1,17 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2014-2016 the original author or authors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package sample;
 

samples/mongo/src/main/java/sample/config/HttpSessionConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2014-2016 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.
@@ -17,8 +17,8 @@ package sample.config;
 
 import org.springframework.session.data.mongo.config.annotation.web.http.EnableMongoHttpSession;
 
-
 // tag::class[]
 @EnableMongoHttpSession // <1>
-public class HttpSessionConfig { }
-// end::class[]
+public class HttpSessionConfig {
+}
+// end::class[]

samples/mongo/src/main/java/sample/config/SecurityConfig.java

@@ -1,17 +1,17 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2014-2016 the original author or authors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package sample.config;
 
@@ -28,8 +28,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 
 	@Autowired
 	public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-		auth
-			.inMemoryAuthentication()
-				.withUser("user").password("password").roles("USER");
+		auth.inMemoryAuthentication().withUser("user").password("password").roles("USER");
 	}
 }

samples/mongo/src/main/java/sample/mvc/IndexController.java

@@ -1,17 +1,17 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2014-2016 the original author or authors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package sample.mvc;
 

samples/mongo/src/main/resources/application.properties

@@ -1,2 +1,2 @@
 spring.thymeleaf.cache=false
-spring.template.cache=false
+spring.template.cache=false

samples/mongo/src/main/resources/templates/index.html

@@ -8,4 +8,4 @@
 		<p>This page is secured using Spring Boot, Spring Session, and Spring Security.</p>
 	</div>
 </body>
-</html>
+</html>

samples/mongo/src/main/resources/templates/layout.html

@@ -82,7 +82,7 @@
 						<a class="brand" th:href="@{/}"><img th:src="@{/resources/img/logo.png}" alt="Spring Security Sample"/></a>
 
 <div class="nav-collapse collapse"
-		 th:with="currentUser=${#httpServletRequest.userPrincipal?.principal}">
+		th:with="currentUser=${#httpServletRequest.userPrincipal?.principal}">
 	<div th:if="${currentUser != null}">
 			<form class="navbar-form pull-right" th:action="@{/logout}" method="post">
 					<input type="submit" value="Log out" />
@@ -119,4 +119,4 @@
 			</div>
 		</div>
 	</body>
-</html>
+</html>

samples/rest/src/integration-test/java/rest/RestMockMvcTests.java

@@ -43,9 +43,9 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {HttpSessionConfig.class, SecurityConfig.class, MvcConfig.class})
+@ContextConfiguration(classes = { HttpSessionConfig.class, SecurityConfig.class,
+		MvcConfig.class })
 @WebAppConfiguration
 public class RestMockMvcTests {
 
@@ -59,32 +59,27 @@ public class RestMockMvcTests {
 
 	@Before
 	public void setup() {
-		this.mvc = MockMvcBuilders.webAppContextSetup(this.context)
-				.alwaysDo(print())
-				.addFilters(this.sessionRepositoryFilter)
-				.apply(springSecurity())
-				.build();
+		this.mvc = MockMvcBuilders.webAppContextSetup(this.context).alwaysDo(print())
+				.addFilters(this.sessionRepositoryFilter).apply(springSecurity()).build();
 	}
 
 	@Test
 	public void noSessionOnNoCredentials() throws Exception {
-		this.mvc.perform(get("/"))
-			.andExpect(header().doesNotExist("x-auth-token"))
-			.andExpect(status().isUnauthorized());
+		this.mvc.perform(get("/")).andExpect(header().doesNotExist("x-auth-token"))
+				.andExpect(status().isUnauthorized());
 	}
 
 	@WithMockUser
 	@Test
 	public void autheticatedAnnotation() throws Exception {
-		this.mvc.perform(get("/"))
-			.andExpect(content().string("{\"username\":\"user\"}"));
+		this.mvc.perform(get("/")).andExpect(content().string("{\"username\":\"user\"}"));
 
 	}
 
 	@Test
 	public void autheticatedRequestPostProcessor() throws Exception {
 		this.mvc.perform(get("/").with(user("user")))
-			.andExpect(content().string("{\"username\":\"user\"}"));
+				.andExpect(content().string("{\"username\":\"user\"}"));
 
 	}
 }

samples/rest/src/main/java/sample/HttpSessionConfig.java

@@ -30,7 +30,7 @@ public class HttpSessionConfig {
 
 	@Bean
 	public JedisConnectionFactory connectionFactory() {
-		return new JedisConnectionFactory();  // <2>
+		return new JedisConnectionFactory(); // <2>
 	}
 
 	@Bean

samples/rest/src/main/java/sample/SecurityInitializer.java

@@ -21,7 +21,6 @@ import org.springframework.security.web.context.AbstractSecurityWebApplicationIn
 /**
  * @author Rob Winch
  */
-public class SecurityInitializer extends
-		AbstractSecurityWebApplicationInitializer {
+public class SecurityInitializer extends AbstractSecurityWebApplicationInitializer {
 
 }

samples/rest/src/main/java/sample/mvc/MvcInitializer.java

@@ -28,7 +28,7 @@ public class MvcInitializer extends AbstractAnnotationConfigDispatcherServletIni
 	// tag::config[]
 	@Override
 	protected Class<?>[] getRootConfigClasses() {
-		return new Class[] {SecurityConfig.class, HttpSessionConfig.class};
+		return new Class[] { SecurityConfig.class, HttpSessionConfig.class };
 	}
 	// end::config[]
 

samples/security/src/main/java/sample/SecurityConfig.java

@@ -28,8 +28,6 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe
 public class SecurityConfig {
 	@Autowired
 	public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-		auth
-			.inMemoryAuthentication()
-				.withUser("user").password("password").roles("USER");
+		auth.inMemoryAuthentication().withUser("user").password("password").roles("USER");
 	}
 }

samples/security/src/main/java/sample/SecurityInitializer.java

@@ -19,8 +19,7 @@ package sample;
 import org.springframework.security.web.context.AbstractSecurityWebApplicationInitializer;
 
 // tag::class[]
-public class SecurityInitializer extends
-		AbstractSecurityWebApplicationInitializer {
+public class SecurityInitializer extends AbstractSecurityWebApplicationInitializer {
 
 	public SecurityInitializer() {
 		super(SecurityConfig.class, Config.class);

samples/security/src/main/java/sample/SessionServlet.java

@@ -28,7 +28,8 @@ import javax.servlet.http.HttpServletResponse;
 public class SessionServlet extends HttpServlet {
 
 	@Override
-	protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+	protected void doPost(HttpServletRequest req, HttpServletResponse resp)
+			throws ServletException, IOException {
 		String attributeName = req.getParameter("attributeName");
 		String attributeValue = req.getParameter("attributeValue");
 		req.getSession().setAttribute(attributeName, attributeValue);

samples/users/src/main/java/sample/Config.java

@@ -32,7 +32,7 @@ public class Config {
 
 	@Bean
 	public JedisConnectionFactory connectionFactory() {
-		return  new JedisConnectionFactory();
+		return new JedisConnectionFactory();
 	}
 }
 // end::class[]

samples/users/src/main/java/sample/UserAccountsFilter.java

@@ -44,11 +44,11 @@ public class UserAccountsFilter implements Filter {
 		HttpServletRequest httpRequest = (HttpServletRequest) request;
 
 		// tag::HttpSessionManager[]
-		HttpSessionManager sessionManager =
-				(HttpSessionManager) httpRequest.getAttribute(HttpSessionManager.class.getName());
+		HttpSessionManager sessionManager = (HttpSessionManager) httpRequest
+				.getAttribute(HttpSessionManager.class.getName());
 		// end::HttpSessionManager[]
-		SessionRepository<Session> repo =
-				(SessionRepository<Session>) httpRequest.getAttribute(SessionRepository.class.getName());
+		SessionRepository<Session> repo = (SessionRepository<Session>) httpRequest
+				.getAttribute(SessionRepository.class.getName());
 
 		String currentSessionAlias = sessionManager.getCurrentSessionAlias(httpRequest);
 		Map<String, String> sessionIds = sessionManager.getSessionIds(httpRequest);
@@ -85,7 +85,8 @@ public class UserAccountsFilter implements Filter {
 
 		// tag::addAccountUrl[]
 		String addAlias = unauthenticatedAlias == null ? // <1>
-				sessionManager.getNewSessionAlias(httpRequest) : // <2>
+				sessionManager.getNewSessionAlias(httpRequest)
+				: // <2>
 				unauthenticatedAlias; // <3>
 		String addAccountUrl = sessionManager.encodeURL(contextPath, addAlias); // <4>
 		// end::addAccountUrl[]

samples/websocket/src/main/java/sample/config/H2Initializer.java

@@ -23,8 +23,8 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
- * Initializes the H2 {@link WebServlet} so we can access our in memory database
- * from the URL "/h2".
+ * Initializes the H2 {@link WebServlet} so we can access our in memory database from the
+ * URL "/h2".
  *
  * @author Rob Winch
  */

samples/websocket/src/main/java/sample/config/WebSecurityConfig.java

@@ -33,10 +33,9 @@ import org.springframework.session.data.redis.config.annotation.web.http.EnableR
 @EnableWebSecurity
 @EnableGlobalMethodSecurity(prePostEnabled = true)
 // tag::enable-redis-httpsession[]
-@EnableRedisHttpSession//(maxInactiveIntervalInSeconds = 60)
-public class WebSecurityConfig
-	extends WebSecurityConfigurerAdapter {
-// end::enable-redis-httpsession[]
+@EnableRedisHttpSession // (maxInactiveIntervalInSeconds = 60)
+public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
+	// end::enable-redis-httpsession[]
 
 	// @formatter:off
 	@Override

samples/websocket/src/main/java/sample/config/WebSocketConfig.java

@@ -32,8 +32,7 @@ public class WebSocketConfig
 		extends AbstractSessionWebSocketMessageBrokerConfigurer<ExpiringSession> { // <1>
 
 	protected void configureStompEndpoints(StompEndpointRegistry registry) { // <2>
-		registry.addEndpoint("/messages")
-				.withSockJS();
+		registry.addEndpoint("/messages").withSockJS();
 	}
 
 	public void configureMessageBroker(MessageBrokerRegistry registry) {

samples/websocket/src/main/java/sample/config/WebSocketHandlersConfig.java

@@ -24,8 +24,10 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.messaging.simp.SimpMessageSendingOperations;
 import org.springframework.session.ExpiringSession;
+
 /**
- * These handlers are separated from WebSocketConfig because they are specific to this application and do not demonstrate a typical Spring Session setup.
+ * These handlers are separated from WebSocketConfig because they are specific to this
+ * application and do not demonstrate a typical Spring Session setup.
  *
  * @author Rob Winch
  */
@@ -33,12 +35,16 @@ import org.springframework.session.ExpiringSession;
 public class WebSocketHandlersConfig<S extends ExpiringSession> {
 
 	@Bean
-	public WebSocketConnectHandler<S> webSocketConnectHandler(SimpMessageSendingOperations messagingTemplate, ActiveWebSocketUserRepository repository) {
+	public WebSocketConnectHandler<S> webSocketConnectHandler(
+			SimpMessageSendingOperations messagingTemplate,
+			ActiveWebSocketUserRepository repository) {
 		return new WebSocketConnectHandler<S>(messagingTemplate, repository);
 	}
 
 	@Bean
-	public WebSocketDisconnectHandler<S> webSocketDisconnectHandler(SimpMessageSendingOperations messagingTemplate, ActiveWebSocketUserRepository repository) {
+	public WebSocketDisconnectHandler<S> webSocketDisconnectHandler(
+			SimpMessageSendingOperations messagingTemplate,
+			ActiveWebSocketUserRepository repository) {
 		return new WebSocketDisconnectHandler<S>(messagingTemplate, repository);
 	}
 }

samples/websocket/src/main/java/sample/config/WebSocketSecurityConfig.java

@@ -24,7 +24,8 @@ import org.springframework.security.config.annotation.web.socket.AbstractSecurit
  * @author Rob Winch
  */
 @Configuration
-public class WebSocketSecurityConfig extends AbstractSecurityWebSocketMessageBrokerConfigurer {
+public class WebSocketSecurityConfig
+		extends AbstractSecurityWebSocketMessageBrokerConfigurer {
 
 	// @formatter:off
 	@Override

samples/websocket/src/main/java/sample/data/ActiveWebSocketUser.java

@@ -56,5 +56,4 @@ public class ActiveWebSocketUser {
 		this.connectionTime = connectionTime;
 	}
 
-
 }

samples/websocket/src/main/java/sample/data/ActiveWebSocketUserRepository.java

@@ -21,7 +21,8 @@ import java.util.List;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 
-public interface ActiveWebSocketUserRepository extends CrudRepository<ActiveWebSocketUser, String> {
+public interface ActiveWebSocketUserRepository
+		extends CrudRepository<ActiveWebSocketUser, String> {
 
 	@Query("select DISTINCT(u.username) from ActiveWebSocketUser u where u.username != ?#{principal?.username}")
 	List<String> findAllActiveUsers();

samples/websocket/src/main/java/sample/data/InstantMessage.java

@@ -59,6 +59,4 @@ public class InstantMessage {
 		this.created = created;
 	}
 
-
-
 }

samples/websocket/src/main/java/sample/mvc/MessageController.java

@@ -44,7 +44,8 @@ public class MessageController {
 	private ActiveWebSocketUserRepository activeUserRepository;
 
 	@Autowired
-	public MessageController(ActiveWebSocketUserRepository activeUserRepository, SimpMessageSendingOperations messagingTemplate) {
+	public MessageController(ActiveWebSocketUserRepository activeUserRepository,
+			SimpMessageSendingOperations messagingTemplate) {
 		this.activeUserRepository = activeUserRepository;
 		this.messagingTemplate = messagingTemplate;
 	}

samples/websocket/src/main/java/sample/security/CurrentUser.java

@@ -27,16 +27,14 @@ import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 /**
- * Annotate Spring MVC method arguments with this annotation to indicate you
- * wish to specify the argument with the value of the current
- * {@link Authentication#getPrincipal()} found on the
- * {@link SecurityContextHolder}.
+ * Annotate Spring MVC method arguments with this annotation to indicate you wish to
+ * specify the argument with the value of the current
+ * {@link Authentication#getPrincipal()} found on the {@link SecurityContextHolder}.
  *
  * <p>
- * Creating your own annotation that uses {@link AuthenticationPrincipal} as a
- * meta annotation creates a layer of indirection between your code and Spring
- * Security's. For simplicity, you could instead use the
- * {@link AuthenticationPrincipal} directly.
+ * Creating your own annotation that uses {@link AuthenticationPrincipal} as a meta
+ * annotation creates a layer of indirection between your code and Spring Security's. For
+ * simplicity, you could instead use the {@link AuthenticationPrincipal} directly.
  * </p>
  *
  * @author Rob Winch

samples/websocket/src/main/java/sample/security/UserRepositoryUserDetailsService.java

@@ -42,8 +42,12 @@ public class UserRepositoryUserDetailsService implements UserDetailsService {
 		this.userRepository = userRepository;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.security.core.userdetails.UserDetailsService#loadUserByUsername(java.lang.String)
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see
+	 * org.springframework.security.core.userdetails.UserDetailsService#loadUserByUsername
+	 * (java.lang.String)
 	 */
 	public UserDetails loadUserByUsername(String username)
 			throws UsernameNotFoundException {

samples/websocket/src/main/java/sample/websocket/WebSocketConnectHandler.java

@@ -29,11 +29,13 @@ import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
 import org.springframework.messaging.simp.SimpMessageSendingOperations;
 import org.springframework.web.socket.messaging.SessionConnectEvent;
 
-public class WebSocketConnectHandler<S> implements ApplicationListener<SessionConnectEvent> {
+public class WebSocketConnectHandler<S>
+		implements ApplicationListener<SessionConnectEvent> {
 	private ActiveWebSocketUserRepository repository;
 	private SimpMessageSendingOperations messagingTemplate;
 
-	public WebSocketConnectHandler(SimpMessageSendingOperations messagingTemplate, ActiveWebSocketUserRepository repository) {
+	public WebSocketConnectHandler(SimpMessageSendingOperations messagingTemplate,
+			ActiveWebSocketUserRepository repository) {
 		super();
 		this.messagingTemplate = messagingTemplate;
 		this.repository = repository;
@@ -46,7 +48,9 @@ public class WebSocketConnectHandler<S> implements ApplicationListener<SessionCo
 			return;
 		}
 		String id = SimpMessageHeaderAccessor.getSessionId(headers);
-		this.repository.save(new ActiveWebSocketUser(id, user.getName(), Calendar.getInstance()));
-		this.messagingTemplate.convertAndSend("/topic/friends/signin", Arrays.asList(user.getName()));
+		this.repository.save(
+				new ActiveWebSocketUser(id, user.getName(), Calendar.getInstance()));
+		this.messagingTemplate.convertAndSend("/topic/friends/signin",
+				Arrays.asList(user.getName()));
 	}
 }

samples/websocket/src/main/java/sample/websocket/WebSocketDisconnectHandler.java

@@ -25,11 +25,13 @@ import org.springframework.context.ApplicationListener;
 import org.springframework.messaging.simp.SimpMessageSendingOperations;
 import org.springframework.web.socket.messaging.SessionDisconnectEvent;
 
-public class WebSocketDisconnectHandler<S> implements ApplicationListener<SessionDisconnectEvent> {
+public class WebSocketDisconnectHandler<S>
+		implements ApplicationListener<SessionDisconnectEvent> {
 	private ActiveWebSocketUserRepository repository;
 	private SimpMessageSendingOperations messagingTemplate;
 
-	public WebSocketDisconnectHandler(SimpMessageSendingOperations messagingTemplate, ActiveWebSocketUserRepository repository) {
+	public WebSocketDisconnectHandler(SimpMessageSendingOperations messagingTemplate,
+			ActiveWebSocketUserRepository repository) {
 		super();
 		this.messagingTemplate = messagingTemplate;
 		this.repository = repository;
@@ -46,7 +48,8 @@ public class WebSocketDisconnectHandler<S> implements ApplicationListener<Sessio
 		}
 
 		this.repository.delete(id);
-		this.messagingTemplate.convertAndSend("/topic/friends/signout", Arrays.asList(user.getUsername()));
+		this.messagingTemplate.convertAndSend("/topic/friends/signout",
+				Arrays.asList(user.getUsername()));
 
 	}
 }

samples/websocket/src/main/resources/application.properties

@@ -1,2 +1,2 @@
 spring.thymeleaf.cache=false
-spring.template.cache=false
+spring.template.cache=false

samples/websocket/src/main/resources/data.sql

@@ -2,4 +2,4 @@ insert into user(id,email,password,first_name,last_name) values (0,'rob','passwo
 insert into user(id,email,password,first_name,last_name) values (1,'luke','password','Luke','Taylor');
 insert into user(id,email,password,first_name,last_name) values (2,'eve','password','Luke','Taylor');
 
-update user set password = '$2a$10$FBAKClV1zBIOOC9XMXf3AO8RoGXYVYsfvUdoLxGkd/BnXEn4tqT3u';
+update user set password = '$2a$10$FBAKClV1zBIOOC9XMXf3AO8RoGXYVYsfvUdoLxGkd/BnXEn4tqT3u';

samples/websocket/src/main/resources/static/resources/js/bootstrap/.bower.json

@@ -1,43 +1,43 @@
 {
-  "name": "bootstrap",
-  "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development.  This is the version that should be available to bower.",
-  "version": "2.3.2",
-  "keywords": [
-    "bootstrap",
-    "css",
-    "bootstrap.js"
-  ],
-  "homepage": "http://twitter.github.com/bootstrap/",
-  "author": {
-    "name": "Twitter Inc."
-  },
-  "scripts": {
-    "test": "make test"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/bowerjs/bootstrap.git"
-  },
-  "licenses": [
-    {
-      "type": "Apache-2.0",
-      "url": "http://www.apache.org/licenses/LICENSE-2.0"
-    }
-  ],
-  "readme": "[Twitter Bootstrap](http://twitter.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap)\n=================\n\nBootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat) at Twitter.\n\nTo get started, checkout http://getbootstrap.com!\n\n\n\nQuick start\n-----------\n\nClone the repo, `git clone git://github.com/twitter/bootstrap.git`, or [download the latest release](https://github.com/twitter/bootstrap/zipball/master).\n\n\n\nVersioning\n----------\n\nFor transparency and insight into our release cycle, and for striving to maintain backward compatibility, Bootstrap will be maintained under the Semantic Versioning guidelines as much as possible.\n\nReleases will be numbered with the following format:\n\n`<major>.<minor>.<patch>`\n\nAnd constructed with the following guidelines:\n\n* Breaking backward compatibility bumps the major (and resets the minor and patch)\n* New additions without breaking backward compatibility bumps the minor (and resets the patch)\n* Bug fixes and misc changes bumps the patch\n\nFor more information on SemVer, please visit http://semver.org/.\n\n\n\nBug tracker\n-----------\n\nHave a bug? Please create an issue here on GitHub that conforms with [necolas's guidelines](https://github.com/necolas/issue-guidelines).\n\nhttps://github.com/twitter/bootstrap/issues\n\n\n\nTwitter account\n---------------\n\nKeep up to date on announcements and more by following Bootstrap on Twitter, [@TwBootstrap](http://twitter.com/TwBootstrap).\n\n\n\nBlog\n----\n\nRead more detailed announcements, discussions, and more on [The Official Twitter Bootstrap Blog](http://blog.getbootstrap.com).\n\n\n\nMailing list\n------------\n\nHave a question? Ask on our mailing list!\n\ntwitter-bootstrap@googlegroups.com\n\nhttp://groups.google.com/group/twitter-bootstrap\n\n\n\nIRC\n---\n\nServer: irc.freenode.net\n\nChannel: ##twitter-bootstrap (the double ## is not a typo)\n\n\n\nDevelopers\n----------\n\nWe have included a makefile with convenience methods for working with the Bootstrap library.\n\n+ **dependencies**\nOur makefile depends on you having recess, connect, uglify.js, and jshint installed. To install, just run the following command in npm:\n\n```\n$ npm install recess connect uglify-js jshint -g\n```\n\n+ **build** - `make`\nRuns the recess compiler to rebuild the `/less` files and compiles the docs pages. Requires recess and uglify-js. <a href=\"http://twitter.github.com/bootstrap/less.html#compiling\">Read more in our docs &raquo;</a>\n\n+ **test** - `make test`\nRuns jshint and qunit tests headlessly in [phantomjs](http://code.google.com/p/phantomjs/) (used for ci). Depends on having phantomjs installed.\n\n+ **watch** - `make watch`\nThis is a convenience method for watching just Less files and automatically building them whenever you save. Requires the Watchr gem.\n\n\n\nContributing\n------------\n\nPlease submit all pull requests against *-wip branches. If your unit test contains javascript patches or features, you must include relevant unit tests. Thanks!\n\n\n\nAuthors\n-------\n\n**Mark Otto**\n\n+ http://twitter.com/mdo\n+ http://github.com/markdotto\n\n**Jacob Thornton**\n\n+ http://twitter.com/fat\n+ http://github.com/fat\n\n\n\nCopyright and license\n---------------------\n\nCopyright 2012 Twitter, Inc.\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this work except in compliance with the License.\nYou may obtain a copy of the License in the LICENSE file, or at:\n\n   http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
-  "_id": "bootstrap@2.1.1",
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "components"
-  ],
-  "_release": "2.3.2",
-  "_resolution": {
-    "type": "version",
-    "tag": "v2.3.2",
-    "commit": "48e1111cc7fbd6a1e6b0ecab37c6f5e07c2cc3ae"
-  },
-  "_source": "git://github.com/bowerjs/bootstrap.git",
-  "_target": "~2.3",
-  "_originalSource": "git://github.com/bowerjs/bootstrap.git"
-}
+	"name": "bootstrap",
+	"description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development.  This is the version that should be available to bower.",
+	"version": "2.3.2",
+	"keywords": [
+		"bootstrap",
+		"css",
+		"bootstrap.js"
+	],
+	"homepage": "http://twitter.github.com/bootstrap/",
+	"author": {
+		"name": "Twitter Inc."
+	},
+	"scripts": {
+		"test": "make test"
+	},
+	"repository": {
+		"type": "git",
+		"url": "git://github.com/bowerjs/bootstrap.git"
+	},
+	"licenses": [
+		{
+			"type": "Apache-2.0",
+			"url": "http://www.apache.org/licenses/LICENSE-2.0"
+		}
+	],
+	"readme": "[Twitter Bootstrap](http://twitter.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap)\n=================\n\nBootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat) at Twitter.\n\nTo get started, checkout http://getbootstrap.com!\n\n\n\nQuick start\n-----------\n\nClone the repo, `git clone git://github.com/twitter/bootstrap.git`, or [download the latest release](https://github.com/twitter/bootstrap/zipball/master).\n\n\n\nVersioning\n----------\n\nFor transparency and insight into our release cycle, and for striving to maintain backward compatibility, Bootstrap will be maintained under the Semantic Versioning guidelines as much as possible.\n\nReleases will be numbered with the following format:\n\n`<major>.<minor>.<patch>`\n\nAnd constructed with the following guidelines:\n\n* Breaking backward compatibility bumps the major (and resets the minor and patch)\n* New additions without breaking backward compatibility bumps the minor (and resets the patch)\n* Bug fixes and misc changes bumps the patch\n\nFor more information on SemVer, please visit http://semver.org/.\n\n\n\nBug tracker\n-----------\n\nHave a bug? Please create an issue here on GitHub that conforms with [necolas's guidelines](https://github.com/necolas/issue-guidelines).\n\nhttps://github.com/twitter/bootstrap/issues\n\n\n\nTwitter account\n---------------\n\nKeep up to date on announcements and more by following Bootstrap on Twitter, [@TwBootstrap](http://twitter.com/TwBootstrap).\n\n\n\nBlog\n----\n\nRead more detailed announcements, discussions, and more on [The Official Twitter Bootstrap Blog](http://blog.getbootstrap.com).\n\n\n\nMailing list\n------------\n\nHave a question? Ask on our mailing list!\n\ntwitter-bootstrap@googlegroups.com\n\nhttp://groups.google.com/group/twitter-bootstrap\n\n\n\nIRC\n---\n\nServer: irc.freenode.net\n\nChannel: ##twitter-bootstrap (the double ## is not a typo)\n\n\n\nDevelopers\n----------\n\nWe have included a makefile with convenience methods for working with the Bootstrap library.\n\n+ **dependencies**\nOur makefile depends on you having recess, connect, uglify.js, and jshint installed. To install, just run the following command in npm:\n\n```\n$ npm install recess connect uglify-js jshint -g\n```\n\n+ **build** - `make`\nRuns the recess compiler to rebuild the `/less` files and compiles the docs pages. Requires recess and uglify-js. <a href=\"http://twitter.github.com/bootstrap/less.html#compiling\">Read more in our docs &raquo;</a>\n\n+ **test** - `make test`\nRuns jshint and qunit tests headlessly in [phantomjs](http://code.google.com/p/phantomjs/) (used for ci). Depends on having phantomjs installed.\n\n+ **watch** - `make watch`\nThis is a convenience method for watching just Less files and automatically building them whenever you save. Requires the Watchr gem.\n\n\n\nContributing\n------------\n\nPlease submit all pull requests against *-wip branches. If your unit test contains javascript patches or features, you must include relevant unit tests. Thanks!\n\n\n\nAuthors\n-------\n\n**Mark Otto**\n\n+ http://twitter.com/mdo\n+ http://github.com/markdotto\n\n**Jacob Thornton**\n\n+ http://twitter.com/fat\n+ http://github.com/fat\n\n\n\nCopyright and license\n---------------------\n\nCopyright 2012 Twitter, Inc.\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this work except in compliance with the License.\nYou may obtain a copy of the License in the LICENSE file, or at:\n\n   http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
+	"_id": "bootstrap@2.1.1",
+	"ignore": [
+		"**/.*",
+		"node_modules",
+		"components"
+	],
+	"_release": "2.3.2",
+	"_resolution": {
+		"type": "version",
+		"tag": "v2.3.2",
+		"commit": "48e1111cc7fbd6a1e6b0ecab37c6f5e07c2cc3ae"
+	},
+	"_source": "git://github.com/bowerjs/bootstrap.git",
+	"_target": "~2.3",
+	"_originalSource": "git://github.com/bowerjs/bootstrap.git"
+}

spring-session/src/integration-test/java/org/springframework/session/data/AbstractITests.java

@@ -1,7 +1,25 @@
+/*
+ * Copyright 2014-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.session.data;
 
+import java.util.UUID;
+
 import org.junit.Before;
 import org.junit.runner.RunWith;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.authority.AuthorityUtils;
@@ -10,8 +28,6 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
-import java.util.UUID;
-
 /**
  * Base class for repositories integration tests
  *
@@ -30,14 +46,18 @@ public abstract class AbstractITests {
 
 	@Before
 	public void setup() {
-		if (registry != null) {
-			registry.clear();
+		if (this.registry != null) {
+			this.registry.clear();
 		}
-		context = SecurityContextHolder.createEmptyContext();
-		context.setAuthentication(new UsernamePasswordAuthenticationToken("username-" + UUID.randomUUID(), "na", AuthorityUtils.createAuthorityList("ROLE_USER")));
+		this.context = SecurityContextHolder.createEmptyContext();
+		this.context.setAuthentication(
+				new UsernamePasswordAuthenticationToken("username-" + UUID.randomUUID(),
+						"na", AuthorityUtils.createAuthorityList("ROLE_USER")));
 
-		changedContext = SecurityContextHolder.createEmptyContext();
-		changedContext.setAuthentication(new UsernamePasswordAuthenticationToken("changedContext-" + UUID.randomUUID(), "na", AuthorityUtils.createAuthorityList("ROLE_USER")));
+		this.changedContext = SecurityContextHolder.createEmptyContext();
+		this.changedContext.setAuthentication(new UsernamePasswordAuthenticationToken(
+				"changedContext-" + UUID.randomUUID(), "na",
+				AuthorityUtils.createAuthorityList("ROLE_USER")));
 	}
 
 }

spring-session/src/integration-test/java/org/springframework/session/data/SessionEventRegistry.java

@@ -45,12 +45,14 @@ public class SessionEventRegistry implements ApplicationListener<AbstractSession
 	}
 
 	@SuppressWarnings("unchecked")
-	public <E extends AbstractSessionEvent> E getEvent(String sessionId) throws InterruptedException {
+	public <E extends AbstractSessionEvent> E getEvent(String sessionId)
+			throws InterruptedException {
 		return (E) waitForEvent(sessionId);
 	}
 
 	@SuppressWarnings("unchecked")
-	private <E extends AbstractSessionEvent> E waitForEvent(String sessionId) throws InterruptedException {
+	private <E extends AbstractSessionEvent> E waitForEvent(String sessionId)
+			throws InterruptedException {
 		Object lock = getLock(sessionId);
 		synchronized (lock) {
 			if (!this.events.containsKey(sessionId)) {

spring-session/src/integration-test/java/org/springframework/session/data/gemfire/AbstractGemFireIntegrationTests.java

@@ -47,8 +47,8 @@ import org.springframework.session.events.AbstractSessionEvent;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * AbstractGemFireIntegrationTests is an abstract base class encapsulating common operations for writing
- * Spring Session GemFire integration tests.
+ * AbstractGemFireIntegrationTests is an abstract base class encapsulating common
+ * operations for writing Spring Session GemFire integration tests.
  *
  * @author John Blum
  * @since 1.1.0
@@ -65,22 +65,24 @@ import static org.assertj.core.api.Assertions.assertThat;
 public abstract class AbstractGemFireIntegrationTests {
 
 	protected static final boolean DEFAULT_ENABLE_QUERY_DEBUGGING = false;
-	protected static final boolean GEMFIRE_QUERY_DEBUG = Boolean.getBoolean("spring.session.data.gemfire.query.debug");
+	protected static final boolean GEMFIRE_QUERY_DEBUG = Boolean
+			.getBoolean("spring.session.data.gemfire.query.debug");
 
 	protected static final int DEFAULT_GEMFIRE_SERVER_PORT = CacheServer.DEFAULT_PORT;
 
 	protected static final long DEFAULT_WAIT_DURATION = TimeUnit.SECONDS.toMillis(20);
 	protected static final long DEFAULT_WAIT_INTERVAL = 500L;
 
-	protected static final File WORKING_DIRECTORY = new File(System.getProperty("user.dir"));
+	protected static final File WORKING_DIRECTORY = new File(
+			System.getProperty("user.dir"));
 
 	protected static final String DEFAULT_PROCESS_CONTROL_FILENAME = "process.ctl";
 
-	protected static final String GEMFIRE_LOG_FILE_NAME = System.getProperty(
-		"spring.session.data.gemfire.log-file", "server.log");
+	protected static final String GEMFIRE_LOG_FILE_NAME = System
+			.getProperty("spring.session.data.gemfire.log-file", "server.log");
 
-	protected static final String GEMFIRE_LOG_LEVEL = System.getProperty(
-		"spring.session.data.gemfire.log-level", "warning");
+	protected static final String GEMFIRE_LOG_LEVEL = System
+			.getProperty("spring.session.data.gemfire.log-level", "warning");
 
 	@Autowired
 	protected Cache gemfireCache;
@@ -90,15 +92,17 @@ public abstract class AbstractGemFireIntegrationTests {
 
 	@Before
 	public void setup() {
-		System.setProperty("gemfire.Query.VERBOSE", String.valueOf(isQueryDebuggingEnabled()));
+		System.setProperty("gemfire.Query.VERBOSE",
+				String.valueOf(isQueryDebuggingEnabled()));
 	}
 
 	/* (non-Javadoc) */
 	protected static File createDirectory(String pathname) {
 		File directory = new File(WORKING_DIRECTORY, pathname);
 
-		assertThat(directory.isDirectory() || directory.mkdirs()).as(
-			String.format("Failed to create directory (%1$s)", directory)).isTrue();
+		assertThat(directory.isDirectory() || directory.mkdirs())
+				.as(String.format("Failed to create directory (%1$s)", directory))
+				.isTrue();
 
 		directory.deleteOnExit();
 
@@ -106,7 +110,8 @@ public abstract class AbstractGemFireIntegrationTests {
 	}
 
 	/* (non-Javadoc) */
-	protected static List<String> createJavaProcessCommandLine(Class<?> type, String... args) {
+	protected static List<String> createJavaProcessCommandLine(Class<?> type,
+			String... args) {
 		List<String> commandLine = new ArrayList<String>();
 
 		String javaHome = System.getProperty("java.home");
@@ -117,7 +122,8 @@ public abstract class AbstractGemFireIntegrationTests {
 		commandLine.add("-ea");
 		commandLine.add(String.format("-Dgemfire.log-file=%1$s", GEMFIRE_LOG_FILE_NAME));
 		commandLine.add(String.format("-Dgemfire.log-level=%1$s", GEMFIRE_LOG_LEVEL));
-		commandLine.add(String.format("-Dgemfire.Query.VERBOSE=%1$s", GEMFIRE_QUERY_DEBUG));
+		commandLine
+				.add(String.format("-Dgemfire.Query.VERBOSE=%1$s", GEMFIRE_QUERY_DEBUG));
 		commandLine.addAll(extractJvmArguments(args));
 		commandLine.add("-classpath");
 		commandLine.add(System.getProperty("java.class.path"));
@@ -156,11 +162,10 @@ public abstract class AbstractGemFireIntegrationTests {
 	}
 
 	/* (non-Javadoc) */
-	protected static Process run(Class<?> type, File directory, String... args) throws IOException {
-		return new ProcessBuilder()
-			.command(createJavaProcessCommandLine(type, args))
-			.directory(directory)
-			.start();
+	protected static Process run(Class<?> type, File directory, String... args)
+			throws IOException {
+		return new ProcessBuilder().command(createJavaProcessCommandLine(type, args))
+				.directory(directory).start();
 	}
 
 	/* (non-Javadoc) */
@@ -169,8 +174,10 @@ public abstract class AbstractGemFireIntegrationTests {
 	}
 
 	/* (non-Javadoc) */
-	protected static boolean waitForCacheServerToStart(CacheServer cacheServer, long duration) {
-		return waitForCacheServerToStart(cacheServer.getBindAddress(), cacheServer.getPort(), duration);
+	protected static boolean waitForCacheServerToStart(CacheServer cacheServer,
+			long duration) {
+		return waitForCacheServerToStart(cacheServer.getBindAddress(),
+				cacheServer.getPort(), duration);
 	}
 
 	/* (non-Javadoc) */
@@ -179,7 +186,8 @@ public abstract class AbstractGemFireIntegrationTests {
 	}
 
 	/* (non-Javadoc) */
-	protected static boolean waitForCacheServerToStart(final String host, final int port, long duration) {
+	protected static boolean waitForCacheServerToStart(final String host, final int port,
+			long duration) {
 		return waitOnCondition(new Condition() {
 			AtomicBoolean connected = new AtomicBoolean(false);
 
@@ -203,7 +211,8 @@ public abstract class AbstractGemFireIntegrationTests {
 		}, duration);
 	}
 
-	// NOTE this method would not be necessary except Spring Sessions' build does not fork the test JVM
+	// NOTE this method would not be necessary except Spring Sessions' build does not fork
+	// the test JVM
 	// for every test class.
 	/* (non-Javadoc) */
 	protected static boolean waitForClientCacheToClose() {
@@ -238,7 +247,8 @@ public abstract class AbstractGemFireIntegrationTests {
 
 	/* (non-Javadoc) */
 	@SuppressWarnings("all")
-	protected static boolean waitForProcessToStart(Process process, File directory, long duration) {
+	protected static boolean waitForProcessToStart(Process process, File directory,
+			long duration) {
 		final File processControl = new File(directory, DEFAULT_PROCESS_CONTROL_FILENAME);
 
 		waitOnCondition(new Condition() {
@@ -256,7 +266,8 @@ public abstract class AbstractGemFireIntegrationTests {
 	}
 
 	/* (non-Javadoc) */
-	protected static int waitForProcessToStop(Process process, File directory, long duration) {
+	protected static int waitForProcessToStop(Process process, File directory,
+			long duration) {
 		final long timeout = (System.currentTimeMillis() + duration);
 
 		try {
@@ -311,24 +322,30 @@ public abstract class AbstractGemFireIntegrationTests {
 	}
 
 	/* (non-Javadoc) */
-	protected void assertRegion(Region<?, ?> actualRegion, String expectedName, DataPolicy expectedDataPolicy) {
+	protected void assertRegion(Region<?, ?> actualRegion, String expectedName,
+			DataPolicy expectedDataPolicy) {
 		assertThat(actualRegion).isNotNull();
 		assertThat(actualRegion.getName()).isEqualTo(expectedName);
-		assertThat(actualRegion.getFullPath()).isEqualTo(GemFireUtils.toRegionPath(expectedName));
+		assertThat(actualRegion.getFullPath())
+				.isEqualTo(GemFireUtils.toRegionPath(expectedName));
 		assertThat(actualRegion.getAttributes()).isNotNull();
-		assertThat(actualRegion.getAttributes().getDataPolicy()).isEqualTo(expectedDataPolicy);
+		assertThat(actualRegion.getAttributes().getDataPolicy())
+				.isEqualTo(expectedDataPolicy);
 	}
 
 	/* (non-Javadoc) */
-	protected void assertIndex(Index index, String expectedExpression, String expectedFromClause) {
+	protected void assertIndex(Index index, String expectedExpression,
+			String expectedFromClause) {
 		assertThat(index).isNotNull();
 		assertThat(index.getIndexedExpression()).isEqualTo(expectedExpression);
 		assertThat(index.getFromClause()).isEqualTo(expectedFromClause);
 	}
 
 	/* (non-Javadoc) */
-	protected void assertEntryIdleTimeout(Region<?, ?> region, ExpirationAction expectedAction, int expectedTimeout) {
-		assertEntryIdleTimeout(region.getAttributes().getEntryIdleTimeout(), expectedAction, expectedTimeout);
+	protected void assertEntryIdleTimeout(Region<?, ?> region,
+			ExpirationAction expectedAction, int expectedTimeout) {
+		assertEntryIdleTimeout(region.getAttributes().getEntryIdleTimeout(),
+				expectedAction, expectedTimeout);
 	}
 
 	/* (non-Javadoc) */
@@ -403,13 +420,14 @@ public abstract class AbstractGemFireIntegrationTests {
 	}
 
 	/**
-	 * The SessionEventListener class is a Spring {@link ApplicationListener} listening for Spring HTTP Session
-	 * application events.
+	 * The SessionEventListener class is a Spring {@link ApplicationListener} listening
+	 * for Spring HTTP Session application events.
 	 *
 	 * @see org.springframework.context.ApplicationListener
 	 * @see org.springframework.session.events.AbstractSessionEvent
 	 */
-	public static class SessionEventListener implements ApplicationListener<AbstractSessionEvent> {
+	public static class SessionEventListener
+			implements ApplicationListener<AbstractSessionEvent> {
 
 		private volatile AbstractSessionEvent sessionEvent;
 
@@ -439,7 +457,8 @@ public abstract class AbstractGemFireIntegrationTests {
 	}
 
 	/**
-	 * The Condition interface defines a logical condition that must be satisfied before it is safe to proceed.
+	 * The Condition interface defines a logical condition that must be satisfied before
+	 * it is safe to proceed.
 	 */
 	protected interface Condition {
 		boolean evaluate();

spring-session/src/integration-test/java/org/springframework/session/data/gemfire/ClientServerGemFireOperationsSessionRepositoryIntegrationTests.java

@@ -69,16 +69,19 @@ import org.springframework.util.SocketUtils;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * The ClientServerGemFireOperationsSessionRepositoryIntegrationTests class is a test suite of test cases testing
- * the functionality of GemFire-backed Spring Sessions using a GemFire client-server topology.
+ * The ClientServerGemFireOperationsSessionRepositoryIntegrationTests class is a test
+ * suite of test cases testing the functionality of GemFire-backed Spring Sessions using a
+ * GemFire client-server topology.
  *
  * @author John Blum
  * @since 1.1.0
  * @see org.junit.Test
  * @see org.junit.runner.RunWith
  * @see org.springframework.session.data.gemfire.AbstractGemFireIntegrationTests
- * @see org.springframework.session.data.gemfire.config.annotation.web.http.EnableGemFireHttpSession
- * @see org.springframework.session.data.gemfire.config.annotation.web.http.GemFireHttpSessionConfiguration
+ * @see org.springframework.session.data.gemfire.config.annotation.web.http.
+ * EnableGemFireHttpSession
+ * @see org.springframework.session.data.gemfire.config.annotation.web.http.
+ * GemFireHttpSessionConfiguration
  * @see org.springframework.test.annotation.DirtiesContext
  * @see org.springframework.test.context.ContextConfiguration
  * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner
@@ -89,15 +92,16 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @see com.gemstone.gemfire.cache.server.CacheServer
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes =
-	ClientServerGemFireOperationsSessionRepositoryIntegrationTests.SpringSessionGemFireClientConfiguration.class)
+@ContextConfiguration(classes = ClientServerGemFireOperationsSessionRepositoryIntegrationTests.SpringSessionGemFireClientConfiguration.class)
 @DirtiesContext
 @WebAppConfiguration
-public class ClientServerGemFireOperationsSessionRepositoryIntegrationTests extends AbstractGemFireIntegrationTests {
+public class ClientServerGemFireOperationsSessionRepositoryIntegrationTests
+		extends AbstractGemFireIntegrationTests {
 
 	private static final int MAX_INACTIVE_INTERVAL_IN_SECONDS = 1;
 
-	private static final DateFormat TIMESTAMP = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss");
+	private static final DateFormat TIMESTAMP = new SimpleDateFormat(
+			"yyyy-MM-dd-HH-mm-ss");
 
 	private static File processWorkingDirectory;
 
@@ -114,21 +118,25 @@ public class ClientServerGemFireOperationsSessionRepositoryIntegrationTests exte
 
 		final int port = SocketUtils.findAvailableTcpPort();
 
-		System.err.printf("Starting GemFire Server running on [%1$s] listening on port [%2$d]%n",
-			InetAddress.getLocalHost().getHostName(), port);
+		System.err.printf(
+				"Starting GemFire Server running on [%1$s] listening on port [%2$d]%n",
+				InetAddress.getLocalHost().getHostName(), port);
 
 		System.setProperty("spring.session.data.gemfire.port", String.valueOf(port));
 
-		String processWorkingDirectoryPathname = String.format("gemfire-client-server-tests-%1$s",
-			TIMESTAMP.format(new Date()));
+		String processWorkingDirectoryPathname = String
+				.format("gemfire-client-server-tests-%1$s", TIMESTAMP.format(new Date()));
 
 		processWorkingDirectory = createDirectory(processWorkingDirectoryPathname);
-		gemfireServer = run(SpringSessionGemFireServerConfiguration.class, processWorkingDirectory,
-			String.format("-Dspring.session.data.gemfire.port=%1$d", port));
+		gemfireServer = run(SpringSessionGemFireServerConfiguration.class,
+				processWorkingDirectory,
+				String.format("-Dspring.session.data.gemfire.port=%1$d", port));
 
-		assertThat(waitForCacheServerToStart(SpringSessionGemFireServerConfiguration.SERVER_HOSTNAME, port)).isTrue();
+		assertThat(waitForCacheServerToStart(
+				SpringSessionGemFireServerConfiguration.SERVER_HOSTNAME, port)).isTrue();
 
-		System.err.printf("GemFire Server [startup time = %1$d ms]%n", System.currentTimeMillis() - t0);
+		System.err.printf("GemFire Server [startup time = %1$d ms]%n",
+				System.currentTimeMillis() - t0);
 	}
 
 	@AfterClass
@@ -136,10 +144,11 @@ public class ClientServerGemFireOperationsSessionRepositoryIntegrationTests exte
 		if (gemfireServer != null) {
 			gemfireServer.destroyForcibly();
 			System.err.printf("GemFire Server [exit code = %1$d]%n",
-				waitForProcessToStop(gemfireServer, processWorkingDirectory));
+					waitForProcessToStop(gemfireServer, processWorkingDirectory));
 		}
 
-		if (Boolean.valueOf(System.getProperty("spring.session.data.gemfire.fork.clean", Boolean.TRUE.toString()))) {
+		if (Boolean.valueOf(System.getProperty("spring.session.data.gemfire.fork.clean",
+				Boolean.TRUE.toString()))) {
 			FileSystemUtils.deleteRecursively(processWorkingDirectory);
 		}
 
@@ -150,16 +159,17 @@ public class ClientServerGemFireOperationsSessionRepositoryIntegrationTests exte
 	public void setup() {
 		assertThat(GemFireUtils.isClient(gemfireCache)).isTrue();
 
-		Region<Object, ExpiringSession> springSessionGemFireRegion = gemfireCache.getRegion(
-			SPRING_SESSION_GEMFIRE_REGION_NAME);
+		Region<Object, ExpiringSession> springSessionGemFireRegion = gemfireCache
+				.getRegion(SPRING_SESSION_GEMFIRE_REGION_NAME);
 
 		assertThat(springSessionGemFireRegion).isNotNull();
 
-		RegionAttributes<Object, ExpiringSession> springSessionGemFireRegionAttributes =
-			springSessionGemFireRegion.getAttributes();
+		RegionAttributes<Object, ExpiringSession> springSessionGemFireRegionAttributes = springSessionGemFireRegion
+				.getAttributes();
 
 		assertThat(springSessionGemFireRegionAttributes).isNotNull();
-		assertThat(springSessionGemFireRegionAttributes.getDataPolicy()).isEqualTo(DataPolicy.EMPTY);
+		assertThat(springSessionGemFireRegionAttributes.getDataPolicy())
+				.isEqualTo(DataPolicy.EMPTY);
 	}
 
 	@After
@@ -173,7 +183,8 @@ public class ClientServerGemFireOperationsSessionRepositoryIntegrationTests exte
 
 		ExpiringSession expectedSession = save(createSession());
 
-		AbstractSessionEvent sessionEvent = this.sessionEventListener.waitForSessionEvent(500);
+		AbstractSessionEvent sessionEvent = this.sessionEventListener
+				.waitForSessionEvent(500);
 
 		assertThat(sessionEvent).isInstanceOf(SessionCreatedEvent.class);
 
@@ -181,9 +192,12 @@ public class ClientServerGemFireOperationsSessionRepositoryIntegrationTests exte
 
 		assertThat(createdSession).isEqualTo(expectedSession);
 		assertThat(createdSession.getId()).isNotNull();
-		assertThat(createdSession.getCreationTime()).isGreaterThanOrEqualTo(beforeOrAtCreationTime);
-		assertThat(createdSession.getLastAccessedTime()).isEqualTo(createdSession.getCreationTime());
-		assertThat(createdSession.getMaxInactiveIntervalInSeconds()).isEqualTo(MAX_INACTIVE_INTERVAL_IN_SECONDS);
+		assertThat(createdSession.getCreationTime())
+				.isGreaterThanOrEqualTo(beforeOrAtCreationTime);
+		assertThat(createdSession.getLastAccessedTime())
+				.isEqualTo(createdSession.getCreationTime());
+		assertThat(createdSession.getMaxInactiveIntervalInSeconds())
+				.isEqualTo(MAX_INACTIVE_INTERVAL_IN_SECONDS);
 
 		this.gemfireSessionRepository.delete(expectedSession.getId());
 	}
@@ -192,28 +206,32 @@ public class ClientServerGemFireOperationsSessionRepositoryIntegrationTests exte
 	public void getExistingNonExpiredSessionBeforeAndAfterExpiration() {
 		ExpiringSession expectedSession = save(touch(createSession()));
 
-		AbstractSessionEvent sessionEvent = this.sessionEventListener.waitForSessionEvent(500);
+		AbstractSessionEvent sessionEvent = this.sessionEventListener
+				.waitForSessionEvent(500);
 
 		assertThat(sessionEvent).isInstanceOf(SessionCreatedEvent.class);
 		assertThat(sessionEvent.<ExpiringSession>getSession()).isEqualTo(expectedSession);
 		assertThat(this.sessionEventListener.getSessionEvent()).isNull();
 
-		ExpiringSession savedSession = this.gemfireSessionRepository.getSession(expectedSession.getId());
+		ExpiringSession savedSession = this.gemfireSessionRepository
+				.getSession(expectedSession.getId());
 
 		assertThat(savedSession).isEqualTo(expectedSession);
 
-		// NOTE for some reason or another, performing a GemFire (Client)Cache Region.get(key)
+		// NOTE for some reason or another, performing a GemFire (Client)Cache
+		// Region.get(key)
 		// causes a Region CREATE event... o.O
 		// calling sessionEventListener.getSessionEvent() here to clear the event
 		this.sessionEventListener.getSessionEvent();
 
-		sessionEvent = this.sessionEventListener.waitForSessionEvent(TimeUnit.SECONDS.toMillis(
-			MAX_INACTIVE_INTERVAL_IN_SECONDS + 1));
+		sessionEvent = this.sessionEventListener.waitForSessionEvent(
+				TimeUnit.SECONDS.toMillis(MAX_INACTIVE_INTERVAL_IN_SECONDS + 1));
 
 		assertThat(sessionEvent).isInstanceOf(SessionExpiredEvent.class);
 		assertThat(sessionEvent.getSessionId()).isEqualTo(expectedSession.getId());
 
-		ExpiringSession expiredSession = this.gemfireSessionRepository.getSession(expectedSession.getId());
+		ExpiringSession expiredSession = this.gemfireSessionRepository
+				.getSession(expectedSession.getId());
 
 		assertThat(expiredSession).isNull();
 	}
@@ -222,7 +240,8 @@ public class ClientServerGemFireOperationsSessionRepositoryIntegrationTests exte
 	public void deleteExistingNonExpiredSessionFiresSessionDeletedEventAndReturnsNullOnGet() {
 		ExpiringSession expectedSession = save(touch(createSession()));
 
-		AbstractSessionEvent sessionEvent = this.sessionEventListener.waitForSessionEvent(500);
+		AbstractSessionEvent sessionEvent = this.sessionEventListener
+				.waitForSessionEvent(500);
 
 		assertThat(sessionEvent).isInstanceOf(SessionCreatedEvent.class);
 		assertThat(sessionEvent.<ExpiringSession>getSession()).isEqualTo(expectedSession);
@@ -234,13 +253,13 @@ public class ClientServerGemFireOperationsSessionRepositoryIntegrationTests exte
 		assertThat(sessionEvent).isInstanceOf(SessionDeletedEvent.class);
 		assertThat(sessionEvent.getSessionId()).isEqualTo(expectedSession.getId());
 
-		ExpiringSession deletedSession = this.gemfireSessionRepository.getSession(expectedSession.getId());
+		ExpiringSession deletedSession = this.gemfireSessionRepository
+				.getSession(expectedSession.getId());
 
 		assertThat(deletedSession).isNull();
 	}
 
-	@EnableGemFireHttpSession(regionName =  SPRING_SESSION_GEMFIRE_REGION_NAME,
-		maxInactiveIntervalInSeconds = MAX_INACTIVE_INTERVAL_IN_SECONDS)
+	@EnableGemFireHttpSession(regionName = SPRING_SESSION_GEMFIRE_REGION_NAME, maxInactiveIntervalInSeconds = MAX_INACTIVE_INTERVAL_IN_SECONDS)
 	static class SpringSessionGemFireClientConfiguration {
 
 		@Bean
@@ -251,13 +270,16 @@ public class ClientServerGemFireOperationsSessionRepositoryIntegrationTests exte
 		@Bean
 		Properties gemfireProperties() {
 			Properties gemfireProperties = new Properties();
-			gemfireProperties.setProperty("name", ClientServerGemFireOperationsSessionRepositoryIntegrationTests.class.getName());
+			gemfireProperties.setProperty("name",
+					ClientServerGemFireOperationsSessionRepositoryIntegrationTests.class
+							.getName());
 			gemfireProperties.setProperty("log-level", GEMFIRE_LOG_LEVEL);
 			return gemfireProperties;
 		}
 
 		@Bean(name = GemfireConstants.DEFAULT_GEMFIRE_POOL_NAME)
-		PoolFactoryBean gemfirePool(@Value("${spring.session.data.gemfire.port:" + DEFAULT_GEMFIRE_SERVER_PORT + "}") int port) {
+		PoolFactoryBean gemfirePool(@Value("${spring.session.data.gemfire.port:"
+				+ DEFAULT_GEMFIRE_SERVER_PORT + "}") int port) {
 			PoolFactoryBean poolFactory = new PoolFactoryBean() {
 				@Override
 				protected Properties resolveGemfireProperties() {
@@ -268,15 +290,18 @@ public class ClientServerGemFireOperationsSessionRepositoryIntegrationTests exte
 			poolFactory.setName(GemfireConstants.DEFAULT_GEMFIRE_POOL_NAME);
 			poolFactory.setFreeConnectionTimeout(5000); // 5 seconds
 			poolFactory.setKeepAlive(false);
-			poolFactory.setMaxConnections(SpringSessionGemFireServerConfiguration.MAX_CONNECTIONS);
+			poolFactory.setMaxConnections(
+					SpringSessionGemFireServerConfiguration.MAX_CONNECTIONS);
 			poolFactory.setPingInterval(TimeUnit.SECONDS.toMillis(5));
 			poolFactory.setReadTimeout(2000); // 2 seconds
 			poolFactory.setRetryAttempts(2);
 			poolFactory.setSubscriptionEnabled(true);
 			poolFactory.setThreadLocalConnections(false);
 
-			poolFactory.setServerEndpoints(Collections.singletonList(new ConnectionEndpoint(
-				SpringSessionGemFireServerConfiguration.SERVER_HOSTNAME, port)));
+			poolFactory
+					.setServerEndpoints(Collections.singletonList(new ConnectionEndpoint(
+							SpringSessionGemFireServerConfiguration.SERVER_HOSTNAME,
+							port)));
 
 			return poolFactory;
 		}
@@ -302,7 +327,7 @@ public class ClientServerGemFireOperationsSessionRepositoryIntegrationTests exte
 		@SuppressWarnings("resource")
 		public static void main(final String[] args) {
 			ConfigurableApplicationContext applicationContext = new AnnotationConfigApplicationContext(
-				SpringSessionGemFireClientConfiguration.class);
+					SpringSessionGemFireClientConfiguration.class);
 
 			applicationContext.registerShutdownHook();
 
@@ -310,13 +335,12 @@ public class ClientServerGemFireOperationsSessionRepositoryIntegrationTests exte
 
 			for (InetSocketAddress server : clientCache.getCurrentServers()) {
 				System.err.printf("GemFire Server [host: %1$s, port: %2$d]%n",
-					server.getHostName(), server.getPort());
+						server.getHostName(), server.getPort());
 			}
 		}
 	}
 
-	@EnableGemFireHttpSession(regionName = SPRING_SESSION_GEMFIRE_REGION_NAME,
-		maxInactiveIntervalInSeconds = MAX_INACTIVE_INTERVAL_IN_SECONDS)
+	@EnableGemFireHttpSession(regionName = SPRING_SESSION_GEMFIRE_REGION_NAME, maxInactiveIntervalInSeconds = MAX_INACTIVE_INTERVAL_IN_SECONDS)
 	static class SpringSessionGemFireServerConfiguration {
 
 		static final int MAX_CONNECTIONS = 50;
@@ -331,7 +355,8 @@ public class ClientServerGemFireOperationsSessionRepositoryIntegrationTests exte
 		Properties gemfireProperties() {
 			Properties gemfireProperties = new Properties();
 
-			gemfireProperties.setProperty("name", SpringSessionGemFireServerConfiguration.class.getName());
+			gemfireProperties.setProperty("name",
+					SpringSessionGemFireServerConfiguration.class.getName());
 			gemfireProperties.setProperty("mcast-port", "0");
 			gemfireProperties.setProperty("log-file", "server.log");
 			gemfireProperties.setProperty("log-level", GEMFIRE_LOG_LEVEL);
@@ -351,7 +376,8 @@ public class ClientServerGemFireOperationsSessionRepositoryIntegrationTests exte
 
 		@Bean
 		CacheServerFactoryBean gemfireCacheServer(Cache gemfireCache,
-				@Value("${spring.session.data.gemfire.port:" + DEFAULT_GEMFIRE_SERVER_PORT + "}") int port) {
+				@Value("${spring.session.data.gemfire.port:" + DEFAULT_GEMFIRE_SERVER_PORT
+						+ "}") int port) {
 
 			CacheServerFactoryBean cacheServerFactory = new CacheServerFactoryBean();
 
@@ -366,7 +392,8 @@ public class ClientServerGemFireOperationsSessionRepositoryIntegrationTests exte
 
 		@SuppressWarnings("resource")
 		public static void main(final String[] args) throws IOException {
-			AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(SpringSessionGemFireServerConfiguration.class);
+			AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
+					SpringSessionGemFireServerConfiguration.class);
 			context.registerShutdownHook();
 			writeProcessControlFile(WORKING_DIRECTORY);
 		}

spring-session/src/integration-test/java/org/springframework/session/data/gemfire/GemFireOperationsSessionRepositoryIntegrationTests.java

@@ -55,8 +55,9 @@ import org.springframework.util.ObjectUtils;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * The GemFireOperationsSessionRepositoryIntegrationTests class is a test suite of test cases testing
- * the findByPrincipalName query method on the GemFireOpeationsSessionRepository class.
+ * The GemFireOperationsSessionRepositoryIntegrationTests class is a test suite of test
+ * cases testing the findByPrincipalName query method on the
+ * GemFireOpeationsSessionRepository class.
  *
  * @author John Blum
  * @since 1.1.0
@@ -75,7 +76,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 @ContextConfiguration
 @DirtiesContext
 @WebAppConfiguration
-public class GemFireOperationsSessionRepositoryIntegrationTests extends AbstractGemFireIntegrationTests {
+public class GemFireOperationsSessionRepositoryIntegrationTests
+		extends AbstractGemFireIntegrationTests {
 
 	private static final int MAX_INACTIVE_INTERVAL_IN_SECONDS = 300;
 
@@ -90,48 +92,63 @@ public class GemFireOperationsSessionRepositoryIntegrationTests extends Abstract
 	@Before
 	public 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")));
+		this.changedContext.setAuthentication(new UsernamePasswordAuthenticationToken(
+				"changedContext-" + UUID.randomUUID(), "na",
+				AuthorityUtils.createAuthorityList("ROLE_USER")));
 
 		assertThat(this.gemfireCache).isNotNull();
 		assertThat(this.gemfireSessionRepository).isNotNull();
-		assertThat(this.gemfireSessionRepository.getMaxInactiveIntervalInSeconds()).isEqualTo(
-			MAX_INACTIVE_INTERVAL_IN_SECONDS);
+		assertThat(this.gemfireSessionRepository.getMaxInactiveIntervalInSeconds())
+				.isEqualTo(MAX_INACTIVE_INTERVAL_IN_SECONDS);
 
-		Region<Object, ExpiringSession> sessionRegion = this.gemfireCache.getRegion(SPRING_SESSION_GEMFIRE_REGION_NAME);
+		Region<Object, ExpiringSession> sessionRegion = this.gemfireCache
+				.getRegion(SPRING_SESSION_GEMFIRE_REGION_NAME);
 
-		assertRegion(sessionRegion, SPRING_SESSION_GEMFIRE_REGION_NAME, DataPolicy.PARTITION);
-		assertEntryIdleTimeout(sessionRegion, ExpirationAction.INVALIDATE, MAX_INACTIVE_INTERVAL_IN_SECONDS);
+		assertRegion(sessionRegion, SPRING_SESSION_GEMFIRE_REGION_NAME,
+				DataPolicy.PARTITION);
+		assertEntryIdleTimeout(sessionRegion, ExpirationAction.INVALIDATE,
+				MAX_INACTIVE_INTERVAL_IN_SECONDS);
 	}
 
-	protected Map<String, ExpiringSession> doFindByIndexNameAndIndexValue(String indexName, String indexValue) {
-		return this.gemfireSessionRepository.findByIndexNameAndIndexValue(indexName, indexValue);
+	protected Map<String, ExpiringSession> doFindByIndexNameAndIndexValue(
+			String indexName, String indexValue) {
+		return this.gemfireSessionRepository.findByIndexNameAndIndexValue(indexName,
+				indexValue);
 	}
 
 	protected Map<String, ExpiringSession> doFindByPrincipalName(String principalName) {
-		return doFindByIndexNameAndIndexValue(FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME, principalName);
+		return doFindByIndexNameAndIndexValue(
+				FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME,
+				principalName);
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	protected Map<String, ExpiringSession> doFindByPrincipalName(String regionName, String principalName) {
+	protected Map<String, ExpiringSession> doFindByPrincipalName(String regionName,
+			String principalName) {
 		try {
-			Region<String, ExpiringSession> region = this.gemfireCache.getRegion(regionName);
+			Region<String, ExpiringSession> region = this.gemfireCache
+					.getRegion(regionName);
 
 			assertThat(region).isNotNull();
 
 			QueryService queryService = region.getRegionService().getQueryService();
 
-			String queryString = String.format(GemFireOperationsSessionRepository.FIND_SESSIONS_BY_PRINCIPAL_NAME_QUERY,
-				region.getFullPath());
+			String queryString = String.format(
+					GemFireOperationsSessionRepository.FIND_SESSIONS_BY_PRINCIPAL_NAME_QUERY,
+					region.getFullPath());
 
 			Query query = queryService.newQuery(queryString);
 
-			SelectResults<ExpiringSession> results = (SelectResults<ExpiringSession>) query.execute(
-				new Object[] { principalName });
+			SelectResults<ExpiringSession> results = (SelectResults<ExpiringSession>) query
+					.execute(new Object[] { principalName });
 
-			Map<String, ExpiringSession> sessions = new HashMap<String, ExpiringSession>(results.size());
+			Map<String, ExpiringSession> sessions = new HashMap<String, ExpiringSession>(
+					results.size());
 
 			for (ExpiringSession session : results.asList()) {
 				sessions.put(session.getId(), session);
@@ -149,17 +166,22 @@ public class GemFireOperationsSessionRepositoryIntegrationTests extends Abstract
 		return true;
 	}
 
-	protected ExpiringSession setAttribute(ExpiringSession session, String attributeName, Object attributeValue) {
+	protected ExpiringSession setAttribute(ExpiringSession session, String attributeName,
+			Object attributeValue) {
 		session.setAttribute(attributeName, attributeValue);
 		return session;
 	}
 
 	@Test
 	public void findSessionsByIndexedSessionAttributeNameValues() {
-		ExpiringSession johnBlumSession = save(touch(setAttribute(createSession("johnBlum"), "vip", "yes")));
-		ExpiringSession robWinchSession = save(touch(setAttribute(createSession("robWinch"), "vip", "yes")));
-		ExpiringSession jonDoeSession = save(touch(setAttribute(createSession("jonDoe"), "vip", "no")));
-		ExpiringSession pieDoeSession = save(touch(setAttribute(createSession("pieDoe"), "viper", "true")));
+		ExpiringSession johnBlumSession = save(
+				touch(setAttribute(createSession("johnBlum"), "vip", "yes")));
+		ExpiringSession robWinchSession = save(
+				touch(setAttribute(createSession("robWinch"), "vip", "yes")));
+		ExpiringSession jonDoeSession = save(
+				touch(setAttribute(createSession("jonDoe"), "vip", "no")));
+		ExpiringSession pieDoeSession = save(
+				touch(setAttribute(createSession("pieDoe"), "viper", "true")));
 		ExpiringSession sourDoeSession = save(touch(createSession("sourDoe")));
 
 		assertThat(get(johnBlumSession.getId())).isEqualTo(johnBlumSession);
@@ -173,7 +195,8 @@ public class GemFireOperationsSessionRepositoryIntegrationTests extends Abstract
 		assertThat(get(sourDoeSession.getId())).isEqualTo(sourDoeSession);
 		assertThat(sourDoeSession.getAttributeNames().contains("vip")).isFalse();
 
-		Map<String, ExpiringSession> vipSessions = doFindByIndexNameAndIndexValue("vip", "yes");
+		Map<String, ExpiringSession> vipSessions = doFindByIndexNameAndIndexValue("vip",
+				"yes");
 
 		assertThat(vipSessions).isNotNull();
 		assertThat(vipSessions.size()).isEqualTo(2);
@@ -183,7 +206,8 @@ public class GemFireOperationsSessionRepositoryIntegrationTests extends Abstract
 		assertThat(vipSessions.containsKey(pieDoeSession.getId()));
 		assertThat(vipSessions.containsKey(sourDoeSession.getId()));
 
-		Map<String, ExpiringSession> nonVipSessions = doFindByIndexNameAndIndexValue("vip", "no");
+		Map<String, ExpiringSession> nonVipSessions = doFindByIndexNameAndIndexValue(
+				"vip", "no");
 
 		assertThat(nonVipSessions).isNotNull();
 		assertThat(nonVipSessions.size()).isEqualTo(1);
@@ -193,7 +217,8 @@ public class GemFireOperationsSessionRepositoryIntegrationTests extends Abstract
 		assertThat(nonVipSessions.containsKey(pieDoeSession.getId()));
 		assertThat(nonVipSessions.containsKey(sourDoeSession.getId()));
 
-		Map<String, ExpiringSession> noSessions = doFindByIndexNameAndIndexValue("nonExistingAttribute", "test");
+		Map<String, ExpiringSession> noSessions = doFindByIndexNameAndIndexValue(
+				"nonExistingAttribute", "test");
 
 		assertThat(noSessions).isNotNull();
 		assertThat(noSessions.isEmpty()).isTrue();
@@ -241,7 +266,8 @@ public class GemFireOperationsSessionRepositoryIntegrationTests extends Abstract
 
 		save(toSave);
 
-		Map<String, ExpiringSession> findByPrincipalName = doFindByPrincipalName(getSecurityName());
+		Map<String, ExpiringSession> findByPrincipalName = doFindByPrincipalName(
+				getSecurityName());
 		assertThat(findByPrincipalName).hasSize(1);
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
 	}
@@ -255,7 +281,8 @@ public class GemFireOperationsSessionRepositoryIntegrationTests extends Abstract
 		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.changedContext);
 		save(toSave);
 
-		Map<String, ExpiringSession> findByPrincipalName = doFindByPrincipalName(getSecurityName());
+		Map<String, ExpiringSession> findByPrincipalName = doFindByPrincipalName(
+				getSecurityName());
 		assertThat(findByPrincipalName).isEmpty();
 
 		findByPrincipalName = doFindByPrincipalName(getChangedSecurityName());
@@ -264,7 +291,8 @@ public class GemFireOperationsSessionRepositoryIntegrationTests extends Abstract
 
 	@Test
 	public void findsNoSessionsByNonExistingPrincipal() {
-		Map<String, ExpiringSession> nonExistingPrincipalSessions = doFindByPrincipalName("nonExistingPrincipalName");
+		Map<String, ExpiringSession> nonExistingPrincipalSessions = doFindByPrincipalName(
+				"nonExistingPrincipalName");
 
 		assertThat(nonExistingPrincipalSessions).isNotNull();
 		assertThat(nonExistingPrincipalSessions.isEmpty()).isTrue();
@@ -274,10 +302,12 @@ public class GemFireOperationsSessionRepositoryIntegrationTests extends Abstract
 	public void findsNoSessionsAfterPrincipalIsRemoved() {
 		String username = "doesNotFindAfterPrincipalRemoved";
 		ExpiringSession session = save(touch(createSession(username)));
-		session.setAttribute(FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME, null);
+		session.setAttribute(FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME,
+				null);
 		save(session);
 
-		Map<String, ExpiringSession> nonExistingPrincipalSessions = doFindByPrincipalName(username);
+		Map<String, ExpiringSession> nonExistingPrincipalSessions = doFindByPrincipalName(
+				username);
 
 		assertThat(nonExistingPrincipalSessions).isNotNull();
 		assertThat(nonExistingPrincipalSessions.isEmpty()).isTrue();
@@ -287,12 +317,14 @@ public class GemFireOperationsSessionRepositoryIntegrationTests extends Abstract
 	public void saveAndReadSessionWithAttributes() {
 		ExpiringSession expectedSession = this.gemfireSessionRepository.createSession();
 
-		assertThat(expectedSession).isInstanceOf(AbstractGemFireOperationsSessionRepository.GemFireSession.class);
+		assertThat(expectedSession).isInstanceOf(
+				AbstractGemFireOperationsSessionRepository.GemFireSession.class);
 
-		((AbstractGemFireOperationsSessionRepository.GemFireSession) expectedSession).setPrincipalName("jblum");
+		((AbstractGemFireOperationsSessionRepository.GemFireSession) expectedSession)
+				.setPrincipalName("jblum");
 
-		List<String> expectedAttributeNames = Arrays.asList(
-			"booleanAttribute", "numericAttribute", "stringAttribute", "personAttribute");
+		List<String> expectedAttributeNames = Arrays.asList("booleanAttribute",
+				"numericAttribute", "stringAttribute", "personAttribute");
 
 		Person jonDoe = new Person("Jon", "Doe");
 
@@ -303,21 +335,32 @@ public class GemFireOperationsSessionRepositoryIntegrationTests extends Abstract
 
 		this.gemfireSessionRepository.save(touch(expectedSession));
 
-		ExpiringSession savedSession = this.gemfireSessionRepository.getSession(expectedSession.getId());
+		ExpiringSession savedSession = this.gemfireSessionRepository
+				.getSession(expectedSession.getId());
 
 		assertThat(savedSession).isEqualTo(expectedSession);
-		assertThat(savedSession).isInstanceOf(AbstractGemFireOperationsSessionRepository.GemFireSession.class);
-		assertThat(((AbstractGemFireOperationsSessionRepository.GemFireSession) savedSession).getPrincipalName()).isEqualTo("jblum");
+		assertThat(savedSession).isInstanceOf(
+				AbstractGemFireOperationsSessionRepository.GemFireSession.class);
+		assertThat(
+				((AbstractGemFireOperationsSessionRepository.GemFireSession) savedSession)
+						.getPrincipalName()).isEqualTo("jblum");
 
-		assertThat(savedSession.getAttributeNames().containsAll(expectedAttributeNames)).as(
-			String.format("Expected (%1$s); but was (%2$s)", expectedAttributeNames, savedSession.getAttributeNames()))
+		assertThat(savedSession.getAttributeNames().containsAll(expectedAttributeNames))
+				.as(String.format("Expected (%1$s); but was (%2$s)",
+						expectedAttributeNames, savedSession.getAttributeNames()))
 				.isTrue();
 
-		assertThat(Boolean.valueOf(String.valueOf(savedSession.getAttribute(expectedAttributeNames.get(0))))).isTrue();
-		assertThat(Double.valueOf(String.valueOf(savedSession.getAttribute(expectedAttributeNames.get(1)))))
-			.isEqualTo(Math.PI);
-		assertThat(String.valueOf(savedSession.getAttribute(expectedAttributeNames.get(2)))).isEqualTo("test");
-		assertThat(savedSession.getAttribute(expectedAttributeNames.get(3))).isEqualTo(jonDoe);
+		assertThat(Boolean.valueOf(
+				String.valueOf(savedSession.getAttribute(expectedAttributeNames.get(0)))))
+						.isTrue();
+		assertThat(Double.valueOf(
+				String.valueOf(savedSession.getAttribute(expectedAttributeNames.get(1)))))
+						.isEqualTo(Math.PI);
+		assertThat(
+				String.valueOf(savedSession.getAttribute(expectedAttributeNames.get(2))))
+						.isEqualTo("test");
+		assertThat(savedSession.getAttribute(expectedAttributeNames.get(3)))
+				.isEqualTo(jonDoe);
 	}
 
 	private String getSecurityName() {
@@ -328,15 +371,15 @@ public class GemFireOperationsSessionRepositoryIntegrationTests extends Abstract
 		return this.changedContext.getAuthentication().getName();
 	}
 
-	@EnableGemFireHttpSession(regionName = SPRING_SESSION_GEMFIRE_REGION_NAME,
-		maxInactiveIntervalInSeconds = MAX_INACTIVE_INTERVAL_IN_SECONDS)
+	@EnableGemFireHttpSession(regionName = SPRING_SESSION_GEMFIRE_REGION_NAME, maxInactiveIntervalInSeconds = MAX_INACTIVE_INTERVAL_IN_SECONDS)
 	static class SpringSessionGemFireConfiguration {
 
 		@Bean
 		Properties gemfireProperties() {
 			Properties gemfireProperties = new Properties();
 
-			gemfireProperties.setProperty("name", GemFireOperationsSessionRepositoryIntegrationTests.class.getName());
+			gemfireProperties.setProperty("name",
+					GemFireOperationsSessionRepositoryIntegrationTests.class.getName());
 			gemfireProperties.setProperty("mcast-port", "0");
 			gemfireProperties.setProperty("log-level", GEMFIRE_LOG_LEVEL);
 
@@ -370,7 +413,8 @@ public class GemFireOperationsSessionRepositoryIntegrationTests extends Abstract
 		}
 
 		private String validate(String value) {
-			Assert.hasText(value, String.format("The String value (%1$s) must be specified!", value));
+			Assert.hasText(value,
+					String.format("The String value (%1$s) must be specified!", value));
 			return value;
 		}
 
@@ -399,7 +443,8 @@ public class GemFireOperationsSessionRepositoryIntegrationTests extends Abstract
 		@SuppressWarnings("all")
 		public int compareTo(final Person person) {
 			int compareValue = getLastName().compareTo(person.getLastName());
-			return (compareValue != 0 ? compareValue : getFirstName().compareTo(person.getFirstName()));
+			return (compareValue != 0 ? compareValue
+					: getFirstName().compareTo(person.getFirstName()));
 		}
 
 		@Override
@@ -415,7 +460,7 @@ public class GemFireOperationsSessionRepositoryIntegrationTests extends Abstract
 			Person that = (Person) obj;
 
 			return ObjectUtils.nullSafeEquals(this.getFirstName(), that.getFirstName())
-				&& ObjectUtils.nullSafeEquals(this.getLastName(), that.getLastName());
+					&& ObjectUtils.nullSafeEquals(this.getLastName(), that.getLastName());
 		}
 
 		@Override

spring-session/src/integration-test/java/org/springframework/session/data/gemfire/config/annotation/web/http/EnableGemFireHttpSessionEventsIntegrationTests.java

@@ -47,8 +47,9 @@ import org.springframework.test.context.web.WebAppConfiguration;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * The EnableGemFireHttpSessionEventsIntegrationTests class is a test suite of test cases testing the Session Event
- * functionality and behavior of the GemFireOperationsSessionRepository and GemFire's configuration.
+ * The EnableGemFireHttpSessionEventsIntegrationTests class is a test suite of test cases
+ * testing the Session Event functionality and behavior of the
+ * GemFireOperationsSessionRepository and GemFire's configuration.
  *
  * @author John Blum
  * @since 1.1.0
@@ -70,7 +71,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 @ContextConfiguration
 @DirtiesContext
 @WebAppConfiguration
-public class EnableGemFireHttpSessionEventsIntegrationTests extends AbstractGemFireIntegrationTests {
+public class EnableGemFireHttpSessionEventsIntegrationTests
+		extends AbstractGemFireIntegrationTests {
 
 	private static final int MAX_INACTIVE_INTERVAL_IN_SECONDS = 1;
 
@@ -84,14 +86,17 @@ public class EnableGemFireHttpSessionEventsIntegrationTests extends AbstractGemF
 	public void setup() {
 		assertThat(GemFireUtils.isPeer(this.gemfireCache)).isTrue();
 		assertThat(this.gemfireSessionRepository).isNotNull();
-		assertThat(this.gemfireSessionRepository.getMaxInactiveIntervalInSeconds()).isEqualTo(
-			MAX_INACTIVE_INTERVAL_IN_SECONDS);
+		assertThat(this.gemfireSessionRepository.getMaxInactiveIntervalInSeconds())
+				.isEqualTo(MAX_INACTIVE_INTERVAL_IN_SECONDS);
 		assertThat(this.sessionEventListener).isNotNull();
 
-		Region<Object, ExpiringSession> sessionRegion = this.gemfireCache.getRegion(SPRING_SESSION_GEMFIRE_REGION_NAME);
+		Region<Object, ExpiringSession> sessionRegion = this.gemfireCache
+				.getRegion(SPRING_SESSION_GEMFIRE_REGION_NAME);
 
-		assertRegion(sessionRegion, SPRING_SESSION_GEMFIRE_REGION_NAME, DataPolicy.REPLICATE);
-		assertEntryIdleTimeout(sessionRegion, ExpirationAction.INVALIDATE, MAX_INACTIVE_INTERVAL_IN_SECONDS);
+		assertRegion(sessionRegion, SPRING_SESSION_GEMFIRE_REGION_NAME,
+				DataPolicy.REPLICATE);
+		assertEntryIdleTimeout(sessionRegion, ExpirationAction.INVALIDATE,
+				MAX_INACTIVE_INTERVAL_IN_SECONDS);
 	}
 
 	@After
@@ -113,9 +118,12 @@ public class EnableGemFireHttpSessionEventsIntegrationTests extends AbstractGemF
 
 		assertThat(createdSession).isEqualTo(expectedSession);
 		assertThat(createdSession.getId()).isNotNull();
-		assertThat(createdSession.getCreationTime()).isGreaterThanOrEqualTo(beforeOrAtCreationTime);
-		assertThat(createdSession.getLastAccessedTime()).isEqualTo(createdSession.getCreationTime());
-		assertThat(createdSession.getMaxInactiveIntervalInSeconds()).isEqualTo(MAX_INACTIVE_INTERVAL_IN_SECONDS);
+		assertThat(createdSession.getCreationTime())
+				.isGreaterThanOrEqualTo(beforeOrAtCreationTime);
+		assertThat(createdSession.getLastAccessedTime())
+				.isEqualTo(createdSession.getCreationTime());
+		assertThat(createdSession.getMaxInactiveIntervalInSeconds())
+				.isEqualTo(MAX_INACTIVE_INTERVAL_IN_SECONDS);
 		assertThat(createdSession.isExpired()).isFalse();
 	}
 
@@ -126,7 +134,8 @@ public class EnableGemFireHttpSessionEventsIntegrationTests extends AbstractGemF
 		assertThat(expectedSession.isExpired()).isFalse();
 
 		// NOTE though unlikely, a possible race condition exists between save and get...
-		ExpiringSession savedSession = this.gemfireSessionRepository.getSession(expectedSession.getId());
+		ExpiringSession savedSession = this.gemfireSessionRepository
+				.getSession(expectedSession.getId());
 
 		assertThat(savedSession).isEqualTo(expectedSession);
 	}
@@ -143,18 +152,21 @@ public class EnableGemFireHttpSessionEventsIntegrationTests extends AbstractGemF
 
 		assertThat(createdSession).isEqualTo(expectedSession);
 		assertThat(createdSession.isExpired()).isTrue();
-		assertThat(this.gemfireSessionRepository.getSession(createdSession.getId())).isNull();
+		assertThat(this.gemfireSessionRepository.getSession(createdSession.getId()))
+				.isNull();
 	}
 
 	@Test
 	public void getNonExistingSession() {
-		assertThat(this.gemfireSessionRepository.getSession(UUID.randomUUID().toString())).isNull();
+		assertThat(this.gemfireSessionRepository.getSession(UUID.randomUUID().toString()))
+				.isNull();
 	}
 
 	@Test
 	public void deleteExistingNonExpiredSession() {
 		ExpiringSession expectedSession = save(touch(createSession()));
-		ExpiringSession savedSession = this.gemfireSessionRepository.getSession(expectedSession.getId());
+		ExpiringSession savedSession = this.gemfireSessionRepository
+				.getSession(expectedSession.getId());
 
 		assertThat(savedSession).isEqualTo(expectedSession);
 		assertThat(savedSession.isExpired()).isFalse();
@@ -169,7 +181,8 @@ public class EnableGemFireHttpSessionEventsIntegrationTests extends AbstractGemF
 		ExpiringSession deletedSession = sessionEvent.getSession();
 
 		assertThat(deletedSession).isEqualTo(savedSession);
-		assertThat(this.gemfireSessionRepository.getSession(deletedSession.getId())).isNull();
+		assertThat(this.gemfireSessionRepository.getSession(deletedSession.getId()))
+				.isNull();
 	}
 
 	@Test
@@ -184,8 +197,9 @@ public class EnableGemFireHttpSessionEventsIntegrationTests extends AbstractGemF
 
 		assertThat(createdSession).isEqualTo(expectedSession);
 
-		sessionEvent = this.sessionEventListener.waitForSessionEvent(TimeUnit.SECONDS.toMillis(
-				this.gemfireSessionRepository.getMaxInactiveIntervalInSeconds() + 1));
+		sessionEvent = this.sessionEventListener.waitForSessionEvent(TimeUnit.SECONDS
+				.toMillis(this.gemfireSessionRepository.getMaxInactiveIntervalInSeconds()
+						+ 1));
 
 		assertThat(sessionEvent).isInstanceOf(SessionExpiredEvent.class);
 
@@ -201,7 +215,8 @@ public class EnableGemFireHttpSessionEventsIntegrationTests extends AbstractGemF
 		assertThat(sessionEvent).isInstanceOf(SessionDeletedEvent.class);
 		assertThat(sessionEvent.getSession()).isNull();
 		assertThat(sessionEvent.getSessionId()).isEqualTo(expiredSession.getId());
-		assertThat(this.gemfireSessionRepository.getSession(sessionEvent.getSessionId())).isNull();
+		assertThat(this.gemfireSessionRepository.getSession(sessionEvent.getSessionId()))
+				.isNull();
 	}
 
 	@Test
@@ -219,16 +234,15 @@ public class EnableGemFireHttpSessionEventsIntegrationTests extends AbstractGemF
 		assertThat(sessionEvent.getSessionId()).isEqualTo(expectedSessionId);
 	}
 
-	@EnableGemFireHttpSession(regionName = SPRING_SESSION_GEMFIRE_REGION_NAME,
-		maxInactiveIntervalInSeconds = MAX_INACTIVE_INTERVAL_IN_SECONDS,
-			serverRegionShortcut = RegionShortcut.REPLICATE)
+	@EnableGemFireHttpSession(regionName = SPRING_SESSION_GEMFIRE_REGION_NAME, maxInactiveIntervalInSeconds = MAX_INACTIVE_INTERVAL_IN_SECONDS, serverRegionShortcut = RegionShortcut.REPLICATE)
 	static class SpringSessionGemFireConfiguration {
 
 		@Bean
 		Properties gemfireProperties() {
 			Properties gemfireProperties = new Properties();
 
-			gemfireProperties.setProperty("name", EnableGemFireHttpSessionEventsIntegrationTests.class.getName());
+			gemfireProperties.setProperty("name",
+					EnableGemFireHttpSessionEventsIntegrationTests.class.getName());
 			gemfireProperties.setProperty("mcast-port", "0");
 			gemfireProperties.setProperty("log-level", GEMFIRE_LOG_LEVEL);
 

spring-session/src/integration-test/java/org/springframework/session/data/gemfire/config/annotation/web/http/GemFireHttpSessionJavaConfigurationTests.java

@@ -42,8 +42,9 @@ import org.springframework.test.context.web.WebAppConfiguration;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * The GemFireHttpSessionJavaConfigurationTests class is a test suite of test cases testing the configuration of
- * Spring Session backed by GemFire using Java-based configuration meta-data.
+ * The GemFireHttpSessionJavaConfigurationTests class is a test suite of test cases
+ * testing the configuration of Spring Session backed by GemFire using Java-based
+ * configuration meta-data.
  *
  * @author John Blum
  * @since 1.1.0
@@ -61,12 +62,14 @@ import static org.assertj.core.api.Assertions.assertThat;
 @ContextConfiguration
 @DirtiesContext
 @WebAppConfiguration
-public class GemFireHttpSessionJavaConfigurationTests extends AbstractGemFireIntegrationTests {
+public class GemFireHttpSessionJavaConfigurationTests
+		extends AbstractGemFireIntegrationTests {
 
 	@Autowired
 	private Cache gemfireCache;
 
-	protected <K, V> Region<K, V> assertCacheAndRegion(Cache gemfireCache, String regionName, DataPolicy dataPolicy) {
+	protected <K, V> Region<K, V> assertCacheAndRegion(Cache gemfireCache,
+			String regionName, DataPolicy dataPolicy) {
 		assertThat(GemFireUtils.isPeer(gemfireCache)).isTrue();
 
 		Region<K, V> region = gemfireCache.getRegion(regionName);
@@ -78,16 +81,16 @@ public class GemFireHttpSessionJavaConfigurationTests extends AbstractGemFireInt
 
 	@Test
 	public void gemfireCacheConfigurationIsValid() {
-		Region<Object, ExpiringSession> example = assertCacheAndRegion(this.gemfireCache, "JavaExample",
-			DataPolicy.REPLICATE);
+		Region<Object, ExpiringSession> example = assertCacheAndRegion(this.gemfireCache,
+				"JavaExample", DataPolicy.REPLICATE);
 
 		assertEntryIdleTimeout(example, ExpirationAction.INVALIDATE, 900);
 	}
 
 	@Test
 	public void verifyGemFireExampleCacheRegionPrincipalNameIndexWasCreatedSuccessfully() {
-		Region<Object, ExpiringSession> example = assertCacheAndRegion(this.gemfireCache, "JavaExample",
-			DataPolicy.REPLICATE);
+		Region<Object, ExpiringSession> example = assertCacheAndRegion(this.gemfireCache,
+				"JavaExample", DataPolicy.REPLICATE);
 
 		QueryService queryService = example.getRegionService().getQueryService();
 
@@ -100,26 +103,27 @@ public class GemFireHttpSessionJavaConfigurationTests extends AbstractGemFireInt
 
 	@Test
 	public void verifyGemFireExampleCacheRegionSessionAttributesIndexWasNotCreated() {
-		Region<Object, ExpiringSession> example = assertCacheAndRegion(this.gemfireCache, "JavaExample",
-			DataPolicy.REPLICATE);
+		Region<Object, ExpiringSession> example = assertCacheAndRegion(this.gemfireCache,
+				"JavaExample", DataPolicy.REPLICATE);
 
 		QueryService queryService = example.getRegionService().getQueryService();
 
 		assertThat(queryService).isNotNull();
 
-		Index sessionAttributesIndex = queryService.getIndex(example, "sessionAttributesIndex");
+		Index sessionAttributesIndex = queryService.getIndex(example,
+				"sessionAttributesIndex");
 
 		assertThat(sessionAttributesIndex).isNull();
 	}
 
-	@EnableGemFireHttpSession(indexableSessionAttributes = {}, maxInactiveIntervalInSeconds = 900,
-		regionName = "JavaExample", serverRegionShortcut = RegionShortcut.REPLICATE)
+	@EnableGemFireHttpSession(indexableSessionAttributes = {}, maxInactiveIntervalInSeconds = 900, regionName = "JavaExample", serverRegionShortcut = RegionShortcut.REPLICATE)
 	public static class GemFireConfiguration {
 
 		@Bean
 		Properties gemfireProperties() {
 			Properties gemfireProperties = new Properties();
-			gemfireProperties.setProperty("name", GemFireHttpSessionJavaConfigurationTests.class.getName());
+			gemfireProperties.setProperty("name",
+					GemFireHttpSessionJavaConfigurationTests.class.getName());
 			gemfireProperties.setProperty("mcast-port", "0");
 			gemfireProperties.setProperty("log-level", "warning");
 			return gemfireProperties;

spring-session/src/integration-test/java/org/springframework/session/data/gemfire/config/annotation/web/http/GemFireHttpSessionXmlConfigurationTests.java

@@ -37,8 +37,9 @@ import org.springframework.test.context.web.WebAppConfiguration;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * The GemFireHttpSessionXmlConfigurationTests class is a test suite of test cases testing the configuration of
- * Spring Session backed by GemFire using XML configuration meta-data.
+ * The GemFireHttpSessionXmlConfigurationTests class is a test suite of test cases testing
+ * the configuration of Spring Session backed by GemFire using XML configuration
+ * meta-data.
  *
  * @author John Blum
  * @since 1.1.0
@@ -56,12 +57,14 @@ import static org.assertj.core.api.Assertions.assertThat;
 @ContextConfiguration
 @DirtiesContext
 @WebAppConfiguration
-public class GemFireHttpSessionXmlConfigurationTests extends AbstractGemFireIntegrationTests {
+public class GemFireHttpSessionXmlConfigurationTests
+		extends AbstractGemFireIntegrationTests {
 
 	@Autowired
 	private Cache gemfireCache;
 
-	protected <K, V> Region<K, V> assertCacheAndRegion(Cache gemfireCache, String regionName, DataPolicy dataPolicy) {
+	protected <K, V> Region<K, V> assertCacheAndRegion(Cache gemfireCache,
+			String regionName, DataPolicy dataPolicy) {
 		assertThat(GemFireUtils.isPeer(gemfireCache)).isTrue();
 
 		Region<K, V> region = gemfireCache.getRegion(regionName);
@@ -73,14 +76,16 @@ public class GemFireHttpSessionXmlConfigurationTests extends AbstractGemFireInte
 
 	@Test
 	public void gemfireCacheConfigurationIsValid() {
-		Region<Object, ExpiringSession> example = assertCacheAndRegion(this.gemfireCache, "XmlExample", DataPolicy.NORMAL);
+		Region<Object, ExpiringSession> example = assertCacheAndRegion(this.gemfireCache,
+				"XmlExample", DataPolicy.NORMAL);
 
 		assertEntryIdleTimeout(example, ExpirationAction.INVALIDATE, 3600);
 	}
 
 	@Test
 	public void verifyGemFireExampleCacheRegionPrincipalNameIndexWasCreatedSuccessfully() {
-		Region<Object, ExpiringSession> example = assertCacheAndRegion(this.gemfireCache, "XmlExample", DataPolicy.NORMAL);
+		Region<Object, ExpiringSession> example = assertCacheAndRegion(this.gemfireCache,
+				"XmlExample", DataPolicy.NORMAL);
 
 		QueryService queryService = example.getRegionService().getQueryService();
 
@@ -93,16 +98,18 @@ public class GemFireHttpSessionXmlConfigurationTests extends AbstractGemFireInte
 
 	@Test
 	public void verifyGemFireExampleCacheRegionSessionAttributesIndexWasCreatedSuccessfully() {
-		Region<Object, ExpiringSession> example = assertCacheAndRegion(this.gemfireCache, "XmlExample", DataPolicy.NORMAL);
+		Region<Object, ExpiringSession> example = assertCacheAndRegion(this.gemfireCache,
+				"XmlExample", DataPolicy.NORMAL);
 
 		QueryService queryService = example.getRegionService().getQueryService();
 
 		assertThat(queryService).isNotNull();
 
-		Index sessionAttributesIndex = queryService.getIndex(example, "sessionAttributesIndex");
+		Index sessionAttributesIndex = queryService.getIndex(example,
+				"sessionAttributesIndex");
 
 		assertIndex(sessionAttributesIndex, "s.attributes['one', 'two', 'three']",
-			String.format("%1$s s", example.getFullPath()));
+				String.format("%1$s s", example.getFullPath()));
 	}
 
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2014-2016 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.
@@ -15,8 +15,14 @@
  */
 package org.springframework.session.data.mongo;
 
+import java.net.UnknownHostException;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
 import com.mongodb.MongoClient;
 import org.junit.Test;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -33,11 +39,6 @@ import org.springframework.session.data.AbstractITests;
 import org.springframework.session.data.mongo.config.annotation.web.http.EnableMongoHttpSession;
 import org.springframework.test.context.ContextConfiguration;
 
-import java.net.UnknownHostException;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -57,69 +58,71 @@ public class MongoRepositoryITests extends AbstractITests {
 	public void saves() throws InterruptedException {
 		String username = "saves-" + System.currentTimeMillis();
 
-		MongoExpiringSession toSave = repository.createSession();
+		MongoExpiringSession 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);
 		toSave.setAttribute(INDEX_NAME, username);
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		Session session = repository.getSession(toSave.getId());
+		Session session = this.repository.getSession(toSave.getId());
 
 		assertThat(session.getId()).isEqualTo(toSave.getId());
 		assertThat(session.getAttributeNames()).isEqualTo(toSave.getAttributeNames());
-		assertThat(session.getAttribute(expectedAttributeName)).isEqualTo(toSave.getAttribute(expectedAttributeName));
+		assertThat(session.getAttribute(expectedAttributeName))
+				.isEqualTo(toSave.getAttribute(expectedAttributeName));
 
-		repository.delete(toSave.getId());
+		this.repository.delete(toSave.getId());
 
 		String id = toSave.getId();
-		assertThat(repository.getSession(id)).isNull();
+		assertThat(this.repository.getSession(id)).isNull();
 	}
 
 	@Test
 	public void putAllOnSingleAttrDoesNotRemoveOld() {
-		MongoExpiringSession toSave = repository.createSession();
+		MongoExpiringSession toSave = this.repository.createSession();
 		toSave.setAttribute("a", "b");
 
-		repository.save(toSave);
-		toSave = repository.getSession(toSave.getId());
+		this.repository.save(toSave);
+		toSave = this.repository.getSession(toSave.getId());
 
 		toSave.setAttribute("1", "2");
 
-		repository.save(toSave);
-		toSave = repository.getSession(toSave.getId());
+		this.repository.save(toSave);
+		toSave = this.repository.getSession(toSave.getId());
 
-		Session session = repository.getSession(toSave.getId());
+		Session session = this.repository.getSession(toSave.getId());
 		assertThat(session.getAttributeNames().size()).isEqualTo(2);
 		assertThat(session.getAttribute("a")).isEqualTo("b");
 		assertThat(session.getAttribute("1")).isEqualTo("2");
 
-		repository.delete(toSave.getId());
+		this.repository.delete(toSave.getId());
 	}
 
 	@Test
 	public void findByPrincipalName() throws Exception {
 		String principalName = "findByPrincipalName" + UUID.randomUUID();
-		MongoExpiringSession toSave = repository.createSession();
+		MongoExpiringSession toSave = this.repository.createSession();
 		toSave.setAttribute(INDEX_NAME, principalName);
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		Map<String, MongoExpiringSession> findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				principalName);
+		Map<String, MongoExpiringSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
 
 		assertThat(findByPrincipalName).hasSize(1);
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
 
-		repository.delete(toSave.getId());
+		this.repository.delete(toSave.getId());
 
-		findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
+		findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME,
+				principalName);
 
 		assertThat(findByPrincipalName).hasSize(0);
 		assertThat(findByPrincipalName.keySet()).doesNotContain(toSave.getId());
@@ -127,17 +130,18 @@ public class MongoRepositoryITests extends AbstractITests {
 
 	@Test
 	public void findByPrincipalNameNoPrincipalNameChange() throws Exception {
-		String principalName = "findByPrincipalNameNoPrincipalNameChange" + UUID.randomUUID();
-		MongoExpiringSession toSave = repository.createSession();
+		String principalName = "findByPrincipalNameNoPrincipalNameChange"
+				+ UUID.randomUUID();
+		MongoExpiringSession toSave = this.repository.createSession();
 		toSave.setAttribute(INDEX_NAME, principalName);
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
 		toSave.setAttribute("other", "value");
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		Map<String, MongoExpiringSession> findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				principalName);
+		Map<String, MongoExpiringSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
 
 		assertThat(findByPrincipalName).hasSize(1);
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
@@ -145,19 +149,20 @@ public class MongoRepositoryITests extends AbstractITests {
 
 	@Test
 	public void findByPrincipalNameNoPrincipalNameChangeReload() throws Exception {
-		String principalName = "findByPrincipalNameNoPrincipalNameChangeReload" + UUID.randomUUID();
-		MongoExpiringSession toSave = repository.createSession();
+		String principalName = "findByPrincipalNameNoPrincipalNameChangeReload"
+				+ UUID.randomUUID();
+		MongoExpiringSession toSave = this.repository.createSession();
 		toSave.setAttribute(INDEX_NAME, principalName);
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		toSave = repository.getSession(toSave.getId());
+		toSave = this.repository.getSession(toSave.getId());
 
 		toSave.setAttribute("other", "value");
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		Map<String, MongoExpiringSession> findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				principalName);
+		Map<String, MongoExpiringSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
 
 		assertThat(findByPrincipalName).hasSize(1);
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
@@ -166,16 +171,16 @@ public class MongoRepositoryITests extends AbstractITests {
 	@Test
 	public void findByDeletedPrincipalName() throws Exception {
 		String principalName = "findByDeletedPrincipalName" + UUID.randomUUID();
-		MongoExpiringSession toSave = repository.createSession();
+		MongoExpiringSession toSave = this.repository.createSession();
 		toSave.setAttribute(INDEX_NAME, principalName);
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
 		toSave.setAttribute(INDEX_NAME, null);
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		Map<String, MongoExpiringSession> findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				principalName);
+		Map<String, MongoExpiringSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
 
 		assertThat(findByPrincipalName).isEmpty();
 	}
@@ -184,19 +189,20 @@ public class MongoRepositoryITests extends AbstractITests {
 	public void findByChangedPrincipalName() throws Exception {
 		String principalName = "findByChangedPrincipalName" + UUID.randomUUID();
 		String principalNameChanged = "findByChangedPrincipalName" + UUID.randomUUID();
-		MongoExpiringSession toSave = repository.createSession();
+		MongoExpiringSession toSave = this.repository.createSession();
 		toSave.setAttribute(INDEX_NAME, principalName);
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
 		toSave.setAttribute(INDEX_NAME, principalNameChanged);
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		Map<String, MongoExpiringSession> findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				principalName);
+		Map<String, MongoExpiringSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
 		assertThat(findByPrincipalName).isEmpty();
 
-		findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME, principalNameChanged);
+		findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME,
+				principalNameChanged);
 
 		assertThat(findByPrincipalName).hasSize(1);
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
@@ -205,17 +211,17 @@ public class MongoRepositoryITests extends AbstractITests {
 	@Test
 	public void findByDeletedPrincipalNameReload() throws Exception {
 		String principalName = "findByDeletedPrincipalName" + UUID.randomUUID();
-		MongoExpiringSession toSave = repository.createSession();
+		MongoExpiringSession toSave = this.repository.createSession();
 		toSave.setAttribute(INDEX_NAME, principalName);
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		MongoExpiringSession getSession = repository.getSession(toSave.getId());
+		MongoExpiringSession getSession = this.repository.getSession(toSave.getId());
 		getSession.setAttribute(INDEX_NAME, null);
-		repository.save(getSession);
+		this.repository.save(getSession);
 
-		Map<String, MongoExpiringSession> findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				principalName);
+		Map<String, MongoExpiringSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
 
 		assertThat(findByPrincipalName).isEmpty();
 	}
@@ -224,21 +230,22 @@ public class MongoRepositoryITests extends AbstractITests {
 	public void findByChangedPrincipalNameReload() throws Exception {
 		String principalName = "findByChangedPrincipalName" + UUID.randomUUID();
 		String principalNameChanged = "findByChangedPrincipalName" + UUID.randomUUID();
-		MongoExpiringSession toSave = repository.createSession();
+		MongoExpiringSession toSave = this.repository.createSession();
 		toSave.setAttribute(INDEX_NAME, principalName);
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		MongoExpiringSession getSession = repository.getSession(toSave.getId());
+		MongoExpiringSession getSession = this.repository.getSession(toSave.getId());
 
 		getSession.setAttribute(INDEX_NAME, principalNameChanged);
-		repository.save(getSession);
+		this.repository.save(getSession);
 
-		Map<String, MongoExpiringSession> findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				principalName);
+		Map<String, MongoExpiringSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
 		assertThat(findByPrincipalName).isEmpty();
 
-		findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME, principalNameChanged);
+		findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME,
+				principalNameChanged);
 
 		assertThat(findByPrincipalName).hasSize(1);
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
@@ -246,20 +253,21 @@ public class MongoRepositoryITests extends AbstractITests {
 
 	@Test
 	public void findBySecurityPrincipalName() throws Exception {
-		MongoExpiringSession toSave = repository.createSession();
-		toSave.setAttribute(SPRING_SECURITY_CONTEXT, context);
+		MongoExpiringSession toSave = this.repository.createSession();
+		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		Map<String, MongoExpiringSession> findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				getSecurityName());
+		Map<String, MongoExpiringSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
 
 		assertThat(findByPrincipalName).hasSize(1);
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
 
-		repository.delete(toSave.getId());
+		this.repository.delete(toSave.getId());
 
-		findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
+		findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME,
+				getSecurityName());
 
 		assertThat(findByPrincipalName).hasSize(0);
 		assertThat(findByPrincipalName.keySet()).doesNotContain(toSave.getId());
@@ -267,35 +275,36 @@ public class MongoRepositoryITests extends AbstractITests {
 
 	@Test
 	public void findByPrincipalNameNoSecurityPrincipalNameChange() throws Exception {
-		MongoExpiringSession toSave = repository.createSession();
-		toSave.setAttribute(SPRING_SECURITY_CONTEXT, context);
+		MongoExpiringSession toSave = this.repository.createSession();
+		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
 		toSave.setAttribute("other", "value");
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		Map<String, MongoExpiringSession> findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				getSecurityName());
+		Map<String, MongoExpiringSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
 
 		assertThat(findByPrincipalName).hasSize(1);
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
 	}
 
 	@Test
-	public void findByPrincipalNameNoSecurityPrincipalNameChangeReload() throws Exception {
-		MongoExpiringSession toSave = repository.createSession();
-		toSave.setAttribute(SPRING_SECURITY_CONTEXT, context);
+	public void findByPrincipalNameNoSecurityPrincipalNameChangeReload()
+			throws Exception {
+		MongoExpiringSession toSave = this.repository.createSession();
+		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		toSave = repository.getSession(toSave.getId());
+		toSave = this.repository.getSession(toSave.getId());
 
 		toSave.setAttribute("other", "value");
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		Map<String, MongoExpiringSession> findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				getSecurityName());
+		Map<String, MongoExpiringSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
 
 		assertThat(findByPrincipalName).hasSize(1);
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
@@ -303,35 +312,36 @@ public class MongoRepositoryITests extends AbstractITests {
 
 	@Test
 	public void findByDeletedSecurityPrincipalName() throws Exception {
-		MongoExpiringSession toSave = repository.createSession();
-		toSave.setAttribute(SPRING_SECURITY_CONTEXT, context);
+		MongoExpiringSession toSave = this.repository.createSession();
+		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
 		toSave.setAttribute(SPRING_SECURITY_CONTEXT, null);
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		Map<String, MongoExpiringSession> findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				getSecurityName());
+		Map<String, MongoExpiringSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
 
 		assertThat(findByPrincipalName).isEmpty();
 	}
 
 	@Test
 	public void findByChangedSecurityPrincipalName() throws Exception {
-		MongoExpiringSession toSave = repository.createSession();
-		toSave.setAttribute(SPRING_SECURITY_CONTEXT, context);
+		MongoExpiringSession toSave = this.repository.createSession();
+		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		toSave.setAttribute(SPRING_SECURITY_CONTEXT, changedContext);
-		repository.save(toSave);
+		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.changedContext);
+		this.repository.save(toSave);
 
-		Map<String, MongoExpiringSession> findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				getSecurityName());
+		Map<String, MongoExpiringSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
 		assertThat(findByPrincipalName).isEmpty();
 
-		findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME, getChangedSecurityName());
+		findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME,
+				getChangedSecurityName());
 
 		assertThat(findByPrincipalName).hasSize(1);
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
@@ -339,38 +349,39 @@ public class MongoRepositoryITests extends AbstractITests {
 
 	@Test
 	public void findByDeletedSecurityPrincipalNameReload() throws Exception {
-		MongoExpiringSession toSave = repository.createSession();
-		toSave.setAttribute(SPRING_SECURITY_CONTEXT, context);
+		MongoExpiringSession toSave = this.repository.createSession();
+		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		MongoExpiringSession getSession = repository.getSession(toSave.getId());
+		MongoExpiringSession getSession = this.repository.getSession(toSave.getId());
 		getSession.setAttribute(INDEX_NAME, null);
-		repository.save(getSession);
+		this.repository.save(getSession);
 
-		Map<String, MongoExpiringSession> findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				getChangedSecurityName());
+		Map<String, MongoExpiringSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, getChangedSecurityName());
 
 		assertThat(findByPrincipalName).isEmpty();
 	}
 
 	@Test
 	public void findByChangedSecurityPrincipalNameReload() throws Exception {
-		MongoExpiringSession toSave = repository.createSession();
-		toSave.setAttribute(SPRING_SECURITY_CONTEXT, context);
+		MongoExpiringSession toSave = this.repository.createSession();
+		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		MongoExpiringSession getSession = repository.getSession(toSave.getId());
+		MongoExpiringSession getSession = this.repository.getSession(toSave.getId());
 
-		getSession.setAttribute(SPRING_SECURITY_CONTEXT, changedContext);
-		repository.save(getSession);
+		getSession.setAttribute(SPRING_SECURITY_CONTEXT, this.changedContext);
+		this.repository.save(getSession);
 
-		Map<String, MongoExpiringSession> findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				getSecurityName());
+		Map<String, MongoExpiringSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
 		assertThat(findByPrincipalName).isEmpty();
 
-		findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME, getChangedSecurityName());
+		findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME,
+				getChangedSecurityName());
 
 		assertThat(findByPrincipalName).hasSize(1);
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
@@ -378,23 +389,25 @@ public class MongoRepositoryITests extends AbstractITests {
 
 	@Test
 	public void loadExpiredSession() throws Exception {
-		//given
-		MongoExpiringSession expiredSession = repository.createSession();
-		long thirtyOneMinutesAgo = System.currentTimeMillis() - TimeUnit.MINUTES.toMillis(31);
+		// given
+		MongoExpiringSession expiredSession = this.repository.createSession();
+		long thirtyOneMinutesAgo = System.currentTimeMillis()
+				- TimeUnit.MINUTES.toMillis(31);
 		expiredSession.setLastAccessedTime(thirtyOneMinutesAgo);
-		repository.save(expiredSession);
+		this.repository.save(expiredSession);
 
-		//then
-		MongoExpiringSession expiredSessionFromDb = repository.getSession(expiredSession.getId());
+		// then
+		MongoExpiringSession expiredSessionFromDb = this.repository
+				.getSession(expiredSession.getId());
 		assertThat(expiredSessionFromDb).isNull();
 	}
 
 	private String getSecurityName() {
-		return context.getAuthentication().getName();
+		return this.context.getAuthentication().getName();
 	}
 
 	private String getChangedSecurityName() {
-		return changedContext.getAuthentication().getName();
+		return this.changedContext.getAuthentication().getName();
 	}
 
 	@Configuration
@@ -407,4 +420,4 @@ public class MongoRepositoryITests extends AbstractITests {
 		}
 
 	}
-}
+}

spring-session/src/integration-test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryITests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2014-2015 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.
@@ -15,12 +15,11 @@
  */
 package org.springframework.session.data.redis;
 
-import static org.assertj.core.api.Assertions.*;
-
 import java.util.Map;
 import java.util.UUID;
 
 import org.junit.Test;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -42,6 +41,8 @@ import org.springframework.session.events.SessionCreatedEvent;
 import org.springframework.session.events.SessionDestroyedEvent;
 import org.springframework.test.context.ContextConfiguration;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 @ContextConfiguration
 public class RedisOperationsSessionRepositoryITests extends AbstractITests {
 	private static final String SPRING_SECURITY_CONTEXT = "SPRING_SECURITY_CONTEXT";
@@ -58,86 +59,90 @@ public class RedisOperationsSessionRepositoryITests extends AbstractITests {
 	public void saves() throws InterruptedException {
 		String username = "saves-" + System.currentTimeMillis();
 
-		String usernameSessionKey = "spring:session:RedisOperationsSessionRepositoryITests:index:" + INDEX_NAME + ":"
-				+ username;
+		String usernameSessionKey = "spring:session:RedisOperationsSessionRepositoryITests:index:"
+				+ INDEX_NAME + ":" + username;
 
-		RedisSession toSave = repository.createSession();
+		RedisSession 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);
 		toSave.setAttribute(INDEX_NAME, username);
-		registry.clear();
+		this.registry.clear();
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		assertThat(registry.receivedEvent(toSave.getId())).isTrue();
-		assertThat(registry.getEvent(toSave.getId())).isInstanceOf(SessionCreatedEvent.class);
-		assertThat(redis.boundSetOps(usernameSessionKey).members()).contains(toSave.getId());
+		assertThat(this.registry.receivedEvent(toSave.getId())).isTrue();
+		assertThat(this.registry.getEvent(toSave.getId()))
+				.isInstanceOf(SessionCreatedEvent.class);
+		assertThat(this.redis.boundSetOps(usernameSessionKey).members())
+				.contains(toSave.getId());
 
-		Session session = repository.getSession(toSave.getId());
+		Session session = this.repository.getSession(toSave.getId());
 
 		assertThat(session.getId()).isEqualTo(toSave.getId());
 		assertThat(session.getAttributeNames()).isEqualTo(toSave.getAttributeNames());
-		assertThat(session.getAttribute(expectedAttributeName)).isEqualTo(toSave.getAttribute(expectedAttributeName));
+		assertThat(session.getAttribute(expectedAttributeName))
+				.isEqualTo(toSave.getAttribute(expectedAttributeName));
 
-		registry.clear();
+		this.registry.clear();
 
-		repository.delete(toSave.getId());
+		this.repository.delete(toSave.getId());
 
-		assertThat(repository.getSession(toSave.getId())).isNull();
-		assertThat(registry.getEvent(toSave.getId())).isInstanceOf(SessionDestroyedEvent.class);
-		assertThat(redis.boundSetOps(usernameSessionKey).members()).doesNotContain(toSave.getId());
+		assertThat(this.repository.getSession(toSave.getId())).isNull();
+		assertThat(this.registry.getEvent(toSave.getId()))
+				.isInstanceOf(SessionDestroyedEvent.class);
+		assertThat(this.redis.boundSetOps(usernameSessionKey).members())
+				.doesNotContain(toSave.getId());
 
-		assertThat(registry.getEvent(toSave.getId()).getSession().getAttribute(expectedAttributeName))
-				.isEqualTo(expectedAttributeValue);
+		assertThat(this.registry.getEvent(toSave.getId()).getSession()
+				.getAttribute(expectedAttributeName)).isEqualTo(expectedAttributeValue);
 	}
 
 	@Test
 	public void putAllOnSingleAttrDoesNotRemoveOld() {
-		RedisSession toSave = repository.createSession();
+		RedisSession toSave = this.repository.createSession();
 		toSave.setAttribute("a", "b");
 
-		repository.save(toSave);
-		toSave = repository.getSession(toSave.getId());
+		this.repository.save(toSave);
+		toSave = this.repository.getSession(toSave.getId());
 
 		toSave.setAttribute("1", "2");
 
-		repository.save(toSave);
-		toSave = repository.getSession(toSave.getId());
+		this.repository.save(toSave);
+		toSave = this.repository.getSession(toSave.getId());
 
-		Session session = repository.getSession(toSave.getId());
+		Session session = this.repository.getSession(toSave.getId());
 		assertThat(session.getAttributeNames().size()).isEqualTo(2);
 		assertThat(session.getAttribute("a")).isEqualTo("b");
 		assertThat(session.getAttribute("1")).isEqualTo("2");
 
-		repository.delete(toSave.getId());
+		this.repository.delete(toSave.getId());
 	}
 
-
-
 	@Test
 	public void findByPrincipalName() throws Exception {
 		String principalName = "findByPrincipalName" + UUID.randomUUID();
-		RedisSession toSave = repository.createSession();
+		RedisSession toSave = this.repository.createSession();
 		toSave.setAttribute(INDEX_NAME, principalName);
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		Map<String, RedisSession> findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				principalName);
+		Map<String, RedisSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
 
 		assertThat(findByPrincipalName).hasSize(1);
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
 
-		repository.delete(toSave.getId());
-		assertThat(registry.receivedEvent(toSave.getId())).isTrue();
+		this.repository.delete(toSave.getId());
+		assertThat(this.registry.receivedEvent(toSave.getId())).isTrue();
 
-		findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
+		findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME,
+				principalName);
 
 		assertThat(findByPrincipalName).hasSize(0);
 		assertThat(findByPrincipalName.keySet()).doesNotContain(toSave.getId());
@@ -145,20 +150,23 @@ public class RedisOperationsSessionRepositoryITests extends AbstractITests {
 
 	@Test
 	public void findByPrincipalNameExpireRemovesIndex() throws Exception {
-		String principalName = "findByPrincipalNameExpireRemovesIndex" + UUID.randomUUID();
-		RedisSession toSave = repository.createSession();
+		String principalName = "findByPrincipalNameExpireRemovesIndex"
+				+ UUID.randomUUID();
+		RedisSession toSave = this.repository.createSession();
 		toSave.setAttribute(INDEX_NAME, principalName);
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		String body = "spring:session:RedisOperationsSessionRepositoryITests:sessions:expires:" + toSave.getId();
+		String body = "spring:session:RedisOperationsSessionRepositoryITests:sessions:expires:"
+				+ toSave.getId();
 		String channel = ":expired";
-		DefaultMessage message = new DefaultMessage(channel.getBytes("UTF-8"), body.getBytes("UTF-8"));
+		DefaultMessage message = new DefaultMessage(channel.getBytes("UTF-8"),
+				body.getBytes("UTF-8"));
 		byte[] pattern = new byte[] {};
-		repository.onMessage(message, pattern);
+		this.repository.onMessage(message, pattern);
 
-		Map<String, RedisSession> findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				principalName);
+		Map<String, RedisSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
 
 		assertThat(findByPrincipalName).hasSize(0);
 		assertThat(findByPrincipalName.keySet()).doesNotContain(toSave.getId());
@@ -166,17 +174,18 @@ public class RedisOperationsSessionRepositoryITests extends AbstractITests {
 
 	@Test
 	public void findByPrincipalNameNoPrincipalNameChange() throws Exception {
-		String principalName = "findByPrincipalNameNoPrincipalNameChange" + UUID.randomUUID();
-		RedisSession toSave = repository.createSession();
+		String principalName = "findByPrincipalNameNoPrincipalNameChange"
+				+ UUID.randomUUID();
+		RedisSession toSave = this.repository.createSession();
 		toSave.setAttribute(INDEX_NAME, principalName);
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
 		toSave.setAttribute("other", "value");
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		Map<String, RedisSession> findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				principalName);
+		Map<String, RedisSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
 
 		assertThat(findByPrincipalName).hasSize(1);
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
@@ -184,19 +193,20 @@ public class RedisOperationsSessionRepositoryITests extends AbstractITests {
 
 	@Test
 	public void findByPrincipalNameNoPrincipalNameChangeReload() throws Exception {
-		String principalName = "findByPrincipalNameNoPrincipalNameChangeReload" + UUID.randomUUID();
-		RedisSession toSave = repository.createSession();
+		String principalName = "findByPrincipalNameNoPrincipalNameChangeReload"
+				+ UUID.randomUUID();
+		RedisSession toSave = this.repository.createSession();
 		toSave.setAttribute(INDEX_NAME, principalName);
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		toSave = repository.getSession(toSave.getId());
+		toSave = this.repository.getSession(toSave.getId());
 
 		toSave.setAttribute("other", "value");
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		Map<String, RedisSession> findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				principalName);
+		Map<String, RedisSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
 
 		assertThat(findByPrincipalName).hasSize(1);
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
@@ -205,16 +215,16 @@ public class RedisOperationsSessionRepositoryITests extends AbstractITests {
 	@Test
 	public void findByDeletedPrincipalName() throws Exception {
 		String principalName = "findByDeletedPrincipalName" + UUID.randomUUID();
-		RedisSession toSave = repository.createSession();
+		RedisSession toSave = this.repository.createSession();
 		toSave.setAttribute(INDEX_NAME, principalName);
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
 		toSave.setAttribute(INDEX_NAME, null);
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		Map<String, RedisSession> findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				principalName);
+		Map<String, RedisSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
 
 		assertThat(findByPrincipalName).isEmpty();
 	}
@@ -223,19 +233,20 @@ public class RedisOperationsSessionRepositoryITests extends AbstractITests {
 	public void findByChangedPrincipalName() throws Exception {
 		String principalName = "findByChangedPrincipalName" + UUID.randomUUID();
 		String principalNameChanged = "findByChangedPrincipalName" + UUID.randomUUID();
-		RedisSession toSave = repository.createSession();
+		RedisSession toSave = this.repository.createSession();
 		toSave.setAttribute(INDEX_NAME, principalName);
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
 		toSave.setAttribute(INDEX_NAME, principalNameChanged);
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		Map<String, RedisSession> findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				principalName);
+		Map<String, RedisSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
 		assertThat(findByPrincipalName).isEmpty();
 
-		findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME, principalNameChanged);
+		findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME,
+				principalNameChanged);
 
 		assertThat(findByPrincipalName).hasSize(1);
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
@@ -244,17 +255,17 @@ public class RedisOperationsSessionRepositoryITests extends AbstractITests {
 	@Test
 	public void findByDeletedPrincipalNameReload() throws Exception {
 		String principalName = "findByDeletedPrincipalName" + UUID.randomUUID();
-		RedisSession toSave = repository.createSession();
+		RedisSession toSave = this.repository.createSession();
 		toSave.setAttribute(INDEX_NAME, principalName);
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		RedisSession getSession = repository.getSession(toSave.getId());
+		RedisSession getSession = this.repository.getSession(toSave.getId());
 		getSession.setAttribute(INDEX_NAME, null);
-		repository.save(getSession);
+		this.repository.save(getSession);
 
-		Map<String, RedisSession> findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				principalName);
+		Map<String, RedisSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
 
 		assertThat(findByPrincipalName).isEmpty();
 	}
@@ -263,21 +274,22 @@ public class RedisOperationsSessionRepositoryITests extends AbstractITests {
 	public void findByChangedPrincipalNameReload() throws Exception {
 		String principalName = "findByChangedPrincipalName" + UUID.randomUUID();
 		String principalNameChanged = "findByChangedPrincipalName" + UUID.randomUUID();
-		RedisSession toSave = repository.createSession();
+		RedisSession toSave = this.repository.createSession();
 		toSave.setAttribute(INDEX_NAME, principalName);
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		RedisSession getSession = repository.getSession(toSave.getId());
+		RedisSession getSession = this.repository.getSession(toSave.getId());
 
 		getSession.setAttribute(INDEX_NAME, principalNameChanged);
-		repository.save(getSession);
+		this.repository.save(getSession);
 
-		Map<String, RedisSession> findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				principalName);
+		Map<String, RedisSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
 		assertThat(findByPrincipalName).isEmpty();
 
-		findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME, principalNameChanged);
+		findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME,
+				principalNameChanged);
 
 		assertThat(findByPrincipalName).hasSize(1);
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
@@ -285,21 +297,22 @@ public class RedisOperationsSessionRepositoryITests extends AbstractITests {
 
 	@Test
 	public void findBySecurityPrincipalName() throws Exception {
-		RedisSession toSave = repository.createSession();
-		toSave.setAttribute(SPRING_SECURITY_CONTEXT, context);
+		RedisSession toSave = this.repository.createSession();
+		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		Map<String, RedisSession> findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				getSecurityName());
+		Map<String, RedisSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
 
 		assertThat(findByPrincipalName).hasSize(1);
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
 
-		repository.delete(toSave.getId());
-		assertThat(registry.receivedEvent(toSave.getId())).isTrue();
+		this.repository.delete(toSave.getId());
+		assertThat(this.registry.receivedEvent(toSave.getId())).isTrue();
 
-		findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
+		findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME,
+				getSecurityName());
 
 		assertThat(findByPrincipalName).hasSize(0);
 		assertThat(findByPrincipalName.keySet()).doesNotContain(toSave.getId());
@@ -307,19 +320,21 @@ public class RedisOperationsSessionRepositoryITests extends AbstractITests {
 
 	@Test
 	public void findBySecurityPrincipalNameExpireRemovesIndex() throws Exception {
-		RedisSession toSave = repository.createSession();
-		toSave.setAttribute(SPRING_SECURITY_CONTEXT, context);
+		RedisSession toSave = this.repository.createSession();
+		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		String body = "spring:session:RedisOperationsSessionRepositoryITests:sessions:expires:" + toSave.getId();
+		String body = "spring:session:RedisOperationsSessionRepositoryITests:sessions:expires:"
+				+ toSave.getId();
 		String channel = ":expired";
-		DefaultMessage message = new DefaultMessage(channel.getBytes("UTF-8"), body.getBytes("UTF-8"));
+		DefaultMessage message = new DefaultMessage(channel.getBytes("UTF-8"),
+				body.getBytes("UTF-8"));
 		byte[] pattern = new byte[] {};
-		repository.onMessage(message, pattern);
+		this.repository.onMessage(message, pattern);
 
-		Map<String, RedisSession> findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				getSecurityName());
+		Map<String, RedisSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
 
 		assertThat(findByPrincipalName).hasSize(0);
 		assertThat(findByPrincipalName.keySet()).doesNotContain(toSave.getId());
@@ -327,35 +342,36 @@ public class RedisOperationsSessionRepositoryITests extends AbstractITests {
 
 	@Test
 	public void findByPrincipalNameNoSecurityPrincipalNameChange() throws Exception {
-		RedisSession toSave = repository.createSession();
-		toSave.setAttribute(SPRING_SECURITY_CONTEXT, context);
+		RedisSession toSave = this.repository.createSession();
+		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
 		toSave.setAttribute("other", "value");
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		Map<String, RedisSession> findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				getSecurityName());
+		Map<String, RedisSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
 
 		assertThat(findByPrincipalName).hasSize(1);
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
 	}
 
 	@Test
-	public void findByPrincipalNameNoSecurityPrincipalNameChangeReload() throws Exception {
-		RedisSession toSave = repository.createSession();
-		toSave.setAttribute(SPRING_SECURITY_CONTEXT, context);
+	public void findByPrincipalNameNoSecurityPrincipalNameChangeReload()
+			throws Exception {
+		RedisSession toSave = this.repository.createSession();
+		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		toSave = repository.getSession(toSave.getId());
+		toSave = this.repository.getSession(toSave.getId());
 
 		toSave.setAttribute("other", "value");
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		Map<String, RedisSession> findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				getSecurityName());
+		Map<String, RedisSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
 
 		assertThat(findByPrincipalName).hasSize(1);
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
@@ -363,35 +379,36 @@ public class RedisOperationsSessionRepositoryITests extends AbstractITests {
 
 	@Test
 	public void findByDeletedSecurityPrincipalName() throws Exception {
-		RedisSession toSave = repository.createSession();
-		toSave.setAttribute(SPRING_SECURITY_CONTEXT, context);
+		RedisSession toSave = this.repository.createSession();
+		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
 		toSave.setAttribute(SPRING_SECURITY_CONTEXT, null);
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		Map<String, RedisSession> findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				getSecurityName());
+		Map<String, RedisSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
 
 		assertThat(findByPrincipalName).isEmpty();
 	}
 
 	@Test
 	public void findByChangedSecurityPrincipalName() throws Exception {
-		RedisSession toSave = repository.createSession();
-		toSave.setAttribute(SPRING_SECURITY_CONTEXT, context);
+		RedisSession toSave = this.repository.createSession();
+		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		toSave.setAttribute(SPRING_SECURITY_CONTEXT, changedContext);
-		repository.save(toSave);
+		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.changedContext);
+		this.repository.save(toSave);
 
-		Map<String, RedisSession> findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				getSecurityName());
+		Map<String, RedisSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
 		assertThat(findByPrincipalName).isEmpty();
 
-		findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME, getChangedSecurityName());
+		findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME,
+				getChangedSecurityName());
 
 		assertThat(findByPrincipalName).hasSize(1);
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
@@ -399,49 +416,50 @@ public class RedisOperationsSessionRepositoryITests extends AbstractITests {
 
 	@Test
 	public void findByDeletedSecurityPrincipalNameReload() throws Exception {
-		RedisSession toSave = repository.createSession();
-		toSave.setAttribute(SPRING_SECURITY_CONTEXT, context);
+		RedisSession toSave = this.repository.createSession();
+		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		RedisSession getSession = repository.getSession(toSave.getId());
+		RedisSession getSession = this.repository.getSession(toSave.getId());
 		getSession.setAttribute(INDEX_NAME, null);
-		repository.save(getSession);
+		this.repository.save(getSession);
 
-		Map<String, RedisSession> findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				getChangedSecurityName());
+		Map<String, RedisSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, getChangedSecurityName());
 
 		assertThat(findByPrincipalName).isEmpty();
 	}
 
 	@Test
 	public void findByChangedSecurityPrincipalNameReload() throws Exception {
-		RedisSession toSave = repository.createSession();
-		toSave.setAttribute(SPRING_SECURITY_CONTEXT, context);
+		RedisSession toSave = this.repository.createSession();
+		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
 
-		repository.save(toSave);
+		this.repository.save(toSave);
 
-		RedisSession getSession = repository.getSession(toSave.getId());
+		RedisSession getSession = this.repository.getSession(toSave.getId());
 
-		getSession.setAttribute(SPRING_SECURITY_CONTEXT, changedContext);
-		repository.save(getSession);
+		getSession.setAttribute(SPRING_SECURITY_CONTEXT, this.changedContext);
+		this.repository.save(getSession);
 
-		Map<String, RedisSession> findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME,
-				getSecurityName());
+		Map<String, RedisSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
 		assertThat(findByPrincipalName).isEmpty();
 
-		findByPrincipalName = repository.findByIndexNameAndIndexValue(INDEX_NAME, getChangedSecurityName());
+		findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME,
+				getChangedSecurityName());
 
 		assertThat(findByPrincipalName).hasSize(1);
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
 	}
 
 	private String getSecurityName() {
-		return context.getAuthentication().getName();
+		return this.context.getAuthentication().getName();
 	}
 
 	private String getChangedSecurityName() {
-		return changedContext.getAuthentication().getName();
+		return this.changedContext.getAuthentication().getName();
 	}
 
 	@Configuration
@@ -459,4 +477,4 @@ public class RedisOperationsSessionRepositoryITests extends AbstractITests {
 			return new SessionEventRegistry();
 		}
 	}
-}
+}

spring-session/src/integration-test/java/org/springframework/session/data/redis/config/annotation/web/http/EnableRedisHttpSessionExpireSessionDestroyedTests.java

@@ -62,7 +62,8 @@ public class EnableRedisHttpSessionExpireSessionDestroyedTests<S extends Expirin
 	public void expireFiresSessionExpiredEvent() throws InterruptedException {
 		S toSave = this.repository.createSession();
 		toSave.setAttribute("a", "b");
-		Authentication toSaveToken = new UsernamePasswordAuthenticationToken("user", "password", AuthorityUtils.createAuthorityList("ROLE_USER"));
+		Authentication toSaveToken = new UsernamePasswordAuthenticationToken("user",
+				"password", AuthorityUtils.createAuthorityList("ROLE_USER"));
 		SecurityContext toSaveContext = SecurityContextHolder.createEmptyContext();
 		toSaveContext.setAuthentication(toSaveToken);
 		toSave.setAttribute("SPRING_SECURITY_CONTEXT", toSaveContext);
@@ -86,7 +87,8 @@ public class EnableRedisHttpSessionExpireSessionDestroyedTests<S extends Expirin
 		assertThat(this.registry.receivedEvent()).isTrue();
 	}
 
-	static class SessionExpiredEventRegistry implements ApplicationListener<SessionExpiredEvent> {
+	static class SessionExpiredEventRegistry
+			implements ApplicationListener<SessionExpiredEvent> {
 		private boolean receivedEvent;
 		private Object lock;
 

spring-session/src/integration-test/java/org/springframework/session/data/redis/taskexecutor/RedisListenerContainerTaskExecutorITests.java

@@ -53,9 +53,10 @@ public class RedisListenerContainerTaskExecutorITests {
 	RedisOperations<Object, Object> redis;
 
 	@Test
-	public void testRedisDelEventsAreDispatchedInSessionTaskExecutor() throws InterruptedException {
-		BoundSetOperations<Object, Object> ops = this.redis
-				.boundSetOps("spring:session:RedisListenerContainerTaskExecutorITests:expirations:dummy");
+	public void testRedisDelEventsAreDispatchedInSessionTaskExecutor()
+			throws InterruptedException {
+		BoundSetOperations<Object, Object> ops = this.redis.boundSetOps(
+				"spring:session:RedisListenerContainerTaskExecutorITests:expirations:dummy");
 		ops.add("value");
 		ops.remove("value");
 		assertThat(this.executor.taskDispatched()).isTrue();

spring-session/src/integration-test/java/org/springframework/session/hazelcast/HazelcastClientRepositoryITests.java

@@ -33,8 +33,8 @@ import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.util.SocketUtils;
 
 /**
- * Integration tests that check the underlying data source - in this case
- * Hazelcast Client.
+ * Integration tests that check the underlying data source - in this case Hazelcast
+ * Client.
  *
  * @author Vedran Pavic
  * @author Artem Bilan
@@ -50,7 +50,6 @@ public class HazelcastClientRepositoryITests<S extends ExpiringSession>
 
 	private static HazelcastInstance hazelcastInstance;
 
-
 	@BeforeClass
 	public static void setup() {
 		hazelcastInstance = HazelcastITestUtils.embeddedHazelcastServer(PORT);
@@ -70,8 +69,7 @@ public class HazelcastClientRepositoryITests<S extends ExpiringSession>
 		@Bean
 		public HazelcastInstance embeddedHazelcastClient() {
 			ClientConfig clientConfig = new ClientConfig();
-			clientConfig.getNetworkConfig()
-					.addAddress("127.0.0.1:" + PORT);
+			clientConfig.getNetworkConfig().addAddress("127.0.0.1:" + PORT);
 			return HazelcastClient.newHazelcastClient(clientConfig);
 		}
 

spring-session/src/integration-test/java/org/springframework/session/hazelcast/HazelcastITestUtils.java

@@ -39,8 +39,7 @@ public final class HazelcastITestUtils {
 	 */
 	public static HazelcastInstance embeddedHazelcastServer(int port) {
 		Config config = new Config();
-		config.getNetworkConfig()
-				.setPort(port);
+		config.getNetworkConfig().setPort(port);
 		return Hazelcast.newHazelcastInstance(config);
 	}
 

spring-session/src/integration-test/java/org/springframework/session/hazelcast/HazelcastServerRepositoryITests.java

@@ -28,8 +28,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
 /**
- * Integration tests that check the underlying data source - in this case
- * Hazelcast Server.
+ * Integration tests that check the underlying data source - in this case Hazelcast
+ * Server.
  *
  * @author Tommy Ludwig
  * @author Vedran Pavic

spring-session/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/EnableHazelcastHttpSessionEventsTests.java

@@ -45,9 +45,9 @@ import org.springframework.test.context.web.WebAppConfiguration;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Ensure that the appropriate SessionEvents are fired at the expected times.
- * Additionally ensure that the interactions with the {@link SessionRepository}
- * abstraction behave as expected after each SessionEvent.
+ * Ensure that the appropriate SessionEvents are fired at the expected times. Additionally
+ * ensure that the interactions with the {@link SessionRepository} abstraction behave as
+ * expected after each SessionEvent.
  *
  * @author Tommy Ludwig
  */
@@ -78,22 +78,27 @@ public class EnableHazelcastHttpSessionEventsTests<S extends ExpiringSession> {
 		String expectedAttributeName = "a";
 		String expectedAttributeValue = "b";
 		sessionToSave.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);
 		sessionToSave.setAttribute("SPRING_SECURITY_CONTEXT", toSaveContext);
-		sessionToSave.setAttribute(FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME, username);
+		sessionToSave.setAttribute(
+				FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME, username);
 
 		this.repository.save(sessionToSave);
 
 		assertThat(this.registry.receivedEvent(sessionToSave.getId())).isTrue();
-		assertThat(this.registry.getEvent(sessionToSave.getId())).isInstanceOf(SessionCreatedEvent.class);
+		assertThat(this.registry.getEvent(sessionToSave.getId()))
+				.isInstanceOf(SessionCreatedEvent.class);
 
 		Session session = this.repository.getSession(sessionToSave.getId());
 
 		assertThat(session.getId()).isEqualTo(sessionToSave.getId());
-		assertThat(session.getAttributeNames()).isEqualTo(sessionToSave.getAttributeNames());
-		assertThat(session.getAttribute(expectedAttributeName)).isEqualTo(sessionToSave.getAttribute(expectedAttributeName));
+		assertThat(session.getAttributeNames())
+				.isEqualTo(sessionToSave.getAttributeNames());
+		assertThat(session.getAttribute(expectedAttributeName))
+				.isEqualTo(sessionToSave.getAttribute(expectedAttributeName));
 	}
 
 	@Test
@@ -103,13 +108,16 @@ public class EnableHazelcastHttpSessionEventsTests<S extends ExpiringSession> {
 		this.repository.save(sessionToSave);
 
 		assertThat(this.registry.receivedEvent(sessionToSave.getId())).isTrue();
-		assertThat(this.registry.getEvent(sessionToSave.getId())).isInstanceOf(SessionCreatedEvent.class);
+		assertThat(this.registry.getEvent(sessionToSave.getId()))
+				.isInstanceOf(SessionCreatedEvent.class);
 		this.registry.clear();
 
-		assertThat(sessionToSave.getMaxInactiveIntervalInSeconds()).isEqualTo(MAX_INACTIVE_INTERVAL_IN_SECONDS);
+		assertThat(sessionToSave.getMaxInactiveIntervalInSeconds())
+				.isEqualTo(MAX_INACTIVE_INTERVAL_IN_SECONDS);
 
 		assertThat(this.registry.receivedEvent(sessionToSave.getId())).isTrue();
-		assertThat(this.registry.getEvent(sessionToSave.getId())).isInstanceOf(SessionExpiredEvent.class);
+		assertThat(this.registry.getEvent(sessionToSave.getId()))
+				.isInstanceOf(SessionExpiredEvent.class);
 
 		assertThat(this.repository.getSession(sessionToSave.getId())).isNull();
 	}
@@ -121,13 +129,15 @@ public class EnableHazelcastHttpSessionEventsTests<S extends ExpiringSession> {
 		this.repository.save(sessionToSave);
 
 		assertThat(this.registry.receivedEvent(sessionToSave.getId())).isTrue();
-		assertThat(this.registry.getEvent(sessionToSave.getId())).isInstanceOf(SessionCreatedEvent.class);
+		assertThat(this.registry.getEvent(sessionToSave.getId()))
+				.isInstanceOf(SessionCreatedEvent.class);
 		this.registry.clear();
 
 		this.repository.delete(sessionToSave.getId());
 
 		assertThat(this.registry.receivedEvent(sessionToSave.getId())).isTrue();
-		assertThat(this.registry.getEvent(sessionToSave.getId())).isInstanceOf(SessionDeletedEvent.class);
+		assertThat(this.registry.getEvent(sessionToSave.getId()))
+				.isInstanceOf(SessionDeletedEvent.class);
 
 		assertThat(this.repository.getSession(sessionToSave.getId())).isNull();
 	}

spring-session/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/HazelcastHttpSessionConfigurationXmlTests.java

@@ -37,8 +37,8 @@ import org.springframework.util.SocketUtils;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Test the different configuration options for the
- * {@link EnableHazelcastHttpSession} annotation.
+ * Test the different configuration options for the {@link EnableHazelcastHttpSession}
+ * annotation.
  *
  * @author Tommy Ludwig
  */

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

@@ -73,24 +73,27 @@ public class JdbcOperationsSessionRepositoryITests {
 	@Before
 	public void setup() throws Exception {
 		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 saves() throws InterruptedException {
 		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);
@@ -102,7 +105,8 @@ public class JdbcOperationsSessionRepositoryITests {
 
 		assertThat(session.getId()).isEqualTo(toSave.getId());
 		assertThat(session.getAttributeNames()).isEqualTo(toSave.getAttributeNames());
-		assertThat(session.getAttribute(expectedAttributeName)).isEqualTo(toSave.getAttribute(expectedAttributeName));
+		assertThat(session.getAttribute(expectedAttributeName))
+				.isEqualTo(toSave.getAttribute(expectedAttributeName));
 
 		this.repository.delete(toSave.getId());
 
@@ -111,7 +115,8 @@ public class JdbcOperationsSessionRepositoryITests {
 
 	@Test
 	public void putAllOnSingleAttrDoesNotRemoveOld() {
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
+				.createSession();
 		toSave.setAttribute("a", "b");
 
 		this.repository.save(toSave);
@@ -133,20 +138,22 @@ public class JdbcOperationsSessionRepositoryITests {
 	@Test
 	public void findByPrincipalName() throws Exception {
 		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);
 
-		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName =
-				this.repository.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
+		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
 
 		assertThat(findByPrincipalName).hasSize(1);
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
 
 		this.repository.delete(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());
@@ -154,17 +161,19 @@ public class JdbcOperationsSessionRepositoryITests {
 
 	@Test
 	public void findByPrincipalNameExpireRemovesIndex() throws Exception {
-		String principalName = "findByPrincipalNameExpireRemovesIndex" + UUID.randomUUID();
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
+		String principalName = "findByPrincipalNameExpireRemovesIndex"
+				+ UUID.randomUUID();
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
+				.createSession();
 		toSave.setAttribute(INDEX_NAME, principalName);
-		toSave.setLastAccessedTime(System.currentTimeMillis() -
-				(MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS * 1000 + 1000));
+		toSave.setLastAccessedTime(System.currentTimeMillis()
+				- (MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS * 1000 + 1000));
 
 		this.repository.save(toSave);
 		this.repository.cleanUpExpiredSessions();
 
-		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName =
-				this.repository.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
+		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
 
 		assertThat(findByPrincipalName).hasSize(0);
 		assertThat(findByPrincipalName.keySet()).doesNotContain(toSave.getId());
@@ -172,8 +181,10 @@ public class JdbcOperationsSessionRepositoryITests {
 
 	@Test
 	public void findByPrincipalNameNoPrincipalNameChange() throws Exception {
-		String principalName = "findByPrincipalNameNoPrincipalNameChange" + UUID.randomUUID();
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
+		String principalName = "findByPrincipalNameNoPrincipalNameChange"
+				+ UUID.randomUUID();
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
+				.createSession();
 		toSave.setAttribute(INDEX_NAME, principalName);
 
 		this.repository.save(toSave);
@@ -181,8 +192,8 @@ public class JdbcOperationsSessionRepositoryITests {
 		toSave.setAttribute("other", "value");
 		this.repository.save(toSave);
 
-		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName =
-				this.repository.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
+		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
 
 		assertThat(findByPrincipalName).hasSize(1);
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
@@ -190,8 +201,10 @@ public class JdbcOperationsSessionRepositoryITests {
 
 	@Test
 	public void findByPrincipalNameNoPrincipalNameChangeReload() throws Exception {
-		String principalName = "findByPrincipalNameNoPrincipalNameChangeReload" + UUID.randomUUID();
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
+		String principalName = "findByPrincipalNameNoPrincipalNameChangeReload"
+				+ UUID.randomUUID();
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
+				.createSession();
 		toSave.setAttribute(INDEX_NAME, principalName);
 
 		this.repository.save(toSave);
@@ -201,8 +214,8 @@ public class JdbcOperationsSessionRepositoryITests {
 		toSave.setAttribute("other", "value");
 		this.repository.save(toSave);
 
-		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName =
-				this.repository.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
+		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
 
 		assertThat(findByPrincipalName).hasSize(1);
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
@@ -211,7 +224,8 @@ public class JdbcOperationsSessionRepositoryITests {
 	@Test
 	public void findByDeletedPrincipalName() throws Exception {
 		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);
@@ -219,8 +233,8 @@ public class JdbcOperationsSessionRepositoryITests {
 		toSave.setAttribute(INDEX_NAME, null);
 		this.repository.save(toSave);
 
-		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName =
-				this.repository.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
+		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
 
 		assertThat(findByPrincipalName).isEmpty();
 	}
@@ -229,7 +243,8 @@ public class JdbcOperationsSessionRepositoryITests {
 	public void findByChangedPrincipalName() throws Exception {
 		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);
@@ -237,11 +252,12 @@ public class JdbcOperationsSessionRepositoryITests {
 		toSave.setAttribute(INDEX_NAME, principalNameChanged);
 		this.repository.save(toSave);
 
-		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName =
-				this.repository.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
+		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName = this.repository
+				.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());
@@ -250,17 +266,19 @@ public class JdbcOperationsSessionRepositoryITests {
 	@Test
 	public void findByDeletedPrincipalNameReload() throws Exception {
 		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.getSession(toSave.getId());
+		JdbcOperationsSessionRepository.JdbcSession getSession = this.repository
+				.getSession(toSave.getId());
 		getSession.setAttribute(INDEX_NAME, null);
 		this.repository.save(getSession);
 
-		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName =
-				this.repository.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
+		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
 
 		assertThat(findByPrincipalName).isEmpty();
 	}
@@ -269,21 +287,24 @@ public class JdbcOperationsSessionRepositoryITests {
 	public void findByChangedPrincipalNameReload() throws Exception {
 		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.getSession(toSave.getId());
+		JdbcOperationsSessionRepository.JdbcSession getSession = this.repository
+				.getSession(toSave.getId());
 
 		getSession.setAttribute(INDEX_NAME, principalNameChanged);
 		this.repository.save(getSession);
 
-		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName =
-				this.repository.findByIndexNameAndIndexValue(INDEX_NAME, principalName);
+		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName = this.repository
+				.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());
@@ -291,20 +312,22 @@ public class JdbcOperationsSessionRepositoryITests {
 
 	@Test
 	public void findBySecurityPrincipalName() throws Exception {
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
+				.createSession();
 		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
 
 		this.repository.save(toSave);
 
-		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName =
-				this.repository.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
+		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
 
 		assertThat(findByPrincipalName).hasSize(1);
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
 
 		this.repository.delete(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());
@@ -312,16 +335,17 @@ public class JdbcOperationsSessionRepositoryITests {
 
 	@Test
 	public void findBySecurityPrincipalNameExpireRemovesIndex() throws Exception {
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
+				.createSession();
 		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
-		toSave.setLastAccessedTime(System.currentTimeMillis() -
-				(MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS * 1000 + 1000));
+		toSave.setLastAccessedTime(System.currentTimeMillis()
+				- (MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS * 1000 + 1000));
 
 		this.repository.save(toSave);
 		this.repository.cleanUpExpiredSessions();
 
-		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName =
-				this.repository.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
+		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
 
 		assertThat(findByPrincipalName).hasSize(0);
 		assertThat(findByPrincipalName.keySet()).doesNotContain(toSave.getId());
@@ -329,7 +353,8 @@ public class JdbcOperationsSessionRepositoryITests {
 
 	@Test
 	public void findByPrincipalNameNoSecurityPrincipalNameChange() throws Exception {
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
+				.createSession();
 		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
 
 		this.repository.save(toSave);
@@ -337,16 +362,18 @@ public class JdbcOperationsSessionRepositoryITests {
 		toSave.setAttribute("other", "value");
 		this.repository.save(toSave);
 
-		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName =
-				this.repository.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
+		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
 
 		assertThat(findByPrincipalName).hasSize(1);
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
 	}
 
 	@Test
-	public void findByPrincipalNameNoSecurityPrincipalNameChangeReload() throws Exception {
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
+	public void findByPrincipalNameNoSecurityPrincipalNameChangeReload()
+			throws Exception {
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
+				.createSession();
 		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
 
 		this.repository.save(toSave);
@@ -356,8 +383,8 @@ public class JdbcOperationsSessionRepositoryITests {
 		toSave.setAttribute("other", "value");
 		this.repository.save(toSave);
 
-		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName =
-				this.repository.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
+		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
 
 		assertThat(findByPrincipalName).hasSize(1);
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
@@ -365,7 +392,8 @@ public class JdbcOperationsSessionRepositoryITests {
 
 	@Test
 	public void findByDeletedSecurityPrincipalName() throws Exception {
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
+				.createSession();
 		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
 
 		this.repository.save(toSave);
@@ -373,15 +401,16 @@ public class JdbcOperationsSessionRepositoryITests {
 		toSave.setAttribute(SPRING_SECURITY_CONTEXT, null);
 		this.repository.save(toSave);
 
-		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName =
-				this.repository.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
+		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
 
 		assertThat(findByPrincipalName).isEmpty();
 	}
 
 	@Test
 	public void findByChangedSecurityPrincipalName() throws Exception {
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
+				.createSession();
 		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
 
 		this.repository.save(toSave);
@@ -389,11 +418,12 @@ public class JdbcOperationsSessionRepositoryITests {
 		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.changedContext);
 		this.repository.save(toSave);
 
-		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName =
-				this.repository.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
+		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName = this.repository
+				.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());
@@ -401,38 +431,43 @@ public class JdbcOperationsSessionRepositoryITests {
 
 	@Test
 	public void findByDeletedSecurityPrincipalNameReload() throws Exception {
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
+				.createSession();
 		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
 
 		this.repository.save(toSave);
 
-		JdbcOperationsSessionRepository.JdbcSession getSession = this.repository.getSession(toSave.getId());
+		JdbcOperationsSessionRepository.JdbcSession getSession = this.repository
+				.getSession(toSave.getId());
 		getSession.setAttribute(INDEX_NAME, null);
 		this.repository.save(getSession);
 
-		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName =
-				this.repository.findByIndexNameAndIndexValue(INDEX_NAME, getChangedSecurityName());
+		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, getChangedSecurityName());
 
 		assertThat(findByPrincipalName).isEmpty();
 	}
 
 	@Test
 	public void findByChangedSecurityPrincipalNameReload() throws Exception {
-		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository.createSession();
+		JdbcOperationsSessionRepository.JdbcSession toSave = this.repository
+				.createSession();
 		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
 
 		this.repository.save(toSave);
 
-		JdbcOperationsSessionRepository.JdbcSession getSession = this.repository.getSession(toSave.getId());
+		JdbcOperationsSessionRepository.JdbcSession getSession = this.repository
+				.getSession(toSave.getId());
 
 		getSession.setAttribute(SPRING_SECURITY_CONTEXT, this.changedContext);
-		repository.save(getSession);
+		this.repository.save(getSession);
 
-		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName =
-				this.repository.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
+		Map<String, JdbcOperationsSessionRepository.JdbcSession> findByPrincipalName = this.repository
+				.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());
@@ -452,10 +487,8 @@ public class JdbcOperationsSessionRepositoryITests {
 
 		@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();
 		}
 
 		@Bean

spring-session/src/main/java/org/springframework/session/ExpiringSession.java

@@ -17,7 +17,8 @@
 package org.springframework.session;
 
 /**
- * A {@link Session} that contains additional attributes that are useful for determining if a session is expired.
+ * A {@link Session} that contains additional attributes that are useful for determining
+ * if a session is expired.
  *
  * @author Rob Winch
  * @since 1.0
@@ -25,37 +26,47 @@ package org.springframework.session;
 public interface ExpiringSession extends Session {
 
 	/**
-	 * Gets the time when this session was created in milliseconds since midnight of 1/1/1970 GMT.
+	 * Gets the time when this session was created in milliseconds since midnight of
+	 * 1/1/1970 GMT.
 	 *
-	 * @return the time when this session was created in milliseconds since midnight of 1/1/1970 GMT.
+	 * @return the time when this session was created in milliseconds since midnight of
+	 * 1/1/1970 GMT.
 	 */
 	long getCreationTime();
 
 	/**
 	 * Sets the last accessed time in milliseconds since midnight of 1/1/1970 GMT.
 	 *
-	 * @param lastAccessedTime the last accessed time in milliseconds since midnight of 1/1/1970 GMT
+	 * @param lastAccessedTime the last accessed time in milliseconds since midnight of
+	 * 1/1/1970 GMT
 	 */
 	void setLastAccessedTime(long lastAccessedTime);
 
 	/**
-	 * Gets the last time this {@link Session} was accessed expressed in milliseconds since midnight of 1/1/1970 GMT.
+	 * Gets the last time this {@link Session} was accessed expressed in milliseconds
+	 * since midnight of 1/1/1970 GMT.
 	 *
-	 * @return the last time the client sent a request associated with the session expressed in milliseconds since midnight of 1/1/1970 GMT
+	 * @return the last time the client sent a request associated with the session
+	 * expressed in milliseconds since midnight of 1/1/1970 GMT
 	 */
 	long getLastAccessedTime();
 
 	/**
-	 * Sets the maximum inactive interval in seconds between requests before this session will be invalidated. A negative time indicates that the session will never timeout.
+	 * Sets the maximum inactive interval in seconds between requests before this session
+	 * will be invalidated. A negative time indicates that the session will never timeout.
 	 *
-	 * @param interval the number of seconds that the {@link Session} should be kept alive between client requests.
+	 * @param interval the number of seconds that the {@link Session} should be kept alive
+	 * between client requests.
 	 */
 	void setMaxInactiveIntervalInSeconds(int interval);
 
 	/**
-	 * Gets the maximum inactive interval in seconds between requests before this session will be invalidated. A negative time indicates that the session will never timeout.
+	 * Gets the maximum inactive interval in seconds between requests before this session
+	 * will be invalidated. A negative time indicates that the session will never timeout.
 	 *
-	 * @return the maximum inactive interval in seconds between requests before this session will be invalidated. A negative time indicates that the session will never timeout.
+	 * @return the maximum inactive interval in seconds between requests before this
+	 * session will be invalidated. A negative time indicates that the session will never
+	 * timeout.
 	 */
 	int getMaxInactiveIntervalInSeconds();
 

spring-session/src/main/java/org/springframework/session/FindByIndexNameSessionRepository.java

@@ -19,16 +19,16 @@ package org.springframework.session;
 import java.util.Map;
 
 /**
- * Extends a basic {@link SessionRepository} to allow finding a session id by
- * the principal name. The principal name is defined by the {@link Session}
- * attribute with the name {@link FindByIndexNameSessionRepository#PRINCIPAL_NAME_INDEX_NAME}.
+ * Extends a basic {@link SessionRepository} to allow finding a session id by the
+ * principal name. The principal name is defined by the {@link Session} attribute with the
+ * name {@link FindByIndexNameSessionRepository#PRINCIPAL_NAME_INDEX_NAME}.
  *
- * @param <S>
- *            the type of Session being managed by this
- *            {@link FindByIndexNameSessionRepository}
+ * @param <S> the type of Session being managed by this
+ * {@link FindByIndexNameSessionRepository}
  * @author Rob Winch
  */
-public interface FindByIndexNameSessionRepository<S extends Session> extends SessionRepository<S> {
+public interface FindByIndexNameSessionRepository<S extends Session>
+		extends SessionRepository<S> {
 
 	/**
 	 * <p>
@@ -37,28 +37,27 @@ public interface FindByIndexNameSessionRepository<S extends Session> extends Ses
 	 * </p>
 	 *
 	 * <p>
-	 * It is the responsibility of the developer to ensure the attribute
-	 * is populated since Spring Session is not aware of the authentication
-	 * mechanism being used.
+	 * It is the responsibility of the developer to ensure the attribute is populated
+	 * since Spring Session is not aware of the authentication mechanism being used.
 	 * </p>
 	 *
 	 * @since 1.1
 	 */
-	String PRINCIPAL_NAME_INDEX_NAME = FindByIndexNameSessionRepository.class.getName().concat(".PRINCIPAL_NAME_INDEX_NAME");
+	String PRINCIPAL_NAME_INDEX_NAME = FindByIndexNameSessionRepository.class.getName()
+			.concat(".PRINCIPAL_NAME_INDEX_NAME");
 
 	/**
-	 * Find a Map of the session id to the {@link Session} of all sessions that
-	 * contain the session attribute with the name
-	 * {@link FindByIndexNameSessionRepository#PRINCIPAL_NAME_INDEX_NAME} and
-	 * the value of the specified principal name.
+	 * Find a Map of the session id to the {@link Session} of all sessions that contain
+	 * the session attribute with the name
+	 * {@link FindByIndexNameSessionRepository#PRINCIPAL_NAME_INDEX_NAME} and the value of
+	 * the specified principal name.
 	 *
-	 * @param indexName
-	 *            the name if the index (i.e. {@link FindByIndexNameSessionRepository#PRINCIPAL_NAME_INDEX_NAME})
+	 * @param indexName the name if the index (i.e.
+	 * {@link FindByIndexNameSessionRepository#PRINCIPAL_NAME_INDEX_NAME})
 	 * @param indexValue the value of the index to search for.
-	 * @return a Map (never null) of the session id to the {@link Session} of
-	 *         all sessions that contain the session specified index name and
-	 *         the value of the specified index name. If no results are found,
-	 *         an empty Map is returned.
+	 * @return a Map (never null) of the session id to the {@link Session} of all sessions
+	 * that contain the session specified index name and the value of the specified index
+	 * name. If no results are found, an empty Map is returned.
 	 */
 	Map<String, S> findByIndexNameAndIndexValue(String indexName, String indexValue);
 }