Use spring-javaformat to format and check code

Resolves: #1450

spring-session-samples/spring-session-sample-boot-findbyusername/src/integration-test/java/sample/FindByUsernameTests.java

@@ -44,7 +44,7 @@ import org.springframework.test.web.servlet.htmlunit.webdriver.MockMvcHtmlUnitDr
 @ExtendWith(SpringExtension.class)
 @AutoConfigureMockMvc
 @SpringBootTest(webEnvironment = WebEnvironment.MOCK)
-public class FindByUsernameTests {
+class FindByUsernameTests {
 
 	private static final String DOCKER_IMAGE = "redis:5.0.5";
 
@@ -54,23 +54,23 @@ public class FindByUsernameTests {
 	private WebDriver driver;
 
 	@BeforeEach
-	public void setup() {
+	void setup() {
 		this.driver = MockMvcHtmlUnitDriverBuilder.mockMvcSetup(this.mockMvc).build();
 	}
 
 	@AfterEach
-	public void tearDown() {
+	void tearDown() {
 		this.driver.quit();
 	}
 
 	@Test
-	public void home() {
+	void home() {
 		LoginPage login = HomePage.go(this.driver);
 		login.assertAt();
 	}
 
 	@Test
-	public void login() {
+	void login() {
 		LoginPage login = HomePage.go(this.driver);
 		HomePage home = login.form().login(HomePage.class);
 		home.assertAt();
@@ -84,8 +84,7 @@ public class FindByUsernameTests {
 
 		@Bean
 		public GenericContainer redisContainer() {
-			GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE)
-					.withExposedPorts(6379);
+			GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE).withExposedPorts(6379);
 			redisContainer.start();
 			return redisContainer;
 		}

spring-session-samples/spring-session-sample-boot-findbyusername/src/integration-test/java/sample/pages/HomePage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Rob Winch
  */
 public class HomePage extends BasePage {
+
 	@FindBy(css = "input[type=\"submit\"]")
 	WebElement logout;
 
@@ -41,8 +42,7 @@ public class HomePage extends BasePage {
 	}
 
 	public void assertAt() {
-		assertThat(getDriver().getTitle())
-				.isEqualTo("Spring Session Sample - Secured Content");
+		assertThat(getDriver().getTitle()).isEqualTo("Spring Session Sample - Secured Content");
 	}
 
 	public void containCookie(String cookieName) {
@@ -76,4 +76,5 @@ public class HomePage extends BasePage {
 		get(driver, "/");
 		return PageFactory.initElements(driver, LoginPage.class);
 	}
+
 }

spring-session-samples/spring-session-sample-boot-findbyusername/src/integration-test/java/sample/pages/LoginPage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -64,5 +64,7 @@ public class LoginPage extends BasePage {
 			this.button.click();
 			return PageFactory.initElements(getDriver(), page);
 		}
+
 	}
+
 }

spring-session-samples/spring-session-sample-boot-findbyusername/src/main/java/sample/FindByUsernameApplication.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,4 +28,5 @@ public class FindByUsernameApplication {
 	public static void main(String[] args) {
 		SpringApplication.run(FindByUsernameApplication.class, args);
 	}
+
 }

spring-session-samples/spring-session-sample-boot-findbyusername/src/main/java/sample/config/GeoConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
- *
  * @author Rob Winch
  *
  */
@@ -33,9 +32,8 @@ 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();
 	}
 

spring-session-samples/spring-session-sample-boot-findbyusername/src/main/java/sample/mvc/IndexController.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,28 +37,27 @@ import org.springframework.web.bind.annotation.RequestMethod;
  */
 @Controller
 public class IndexController {
+
 	// tag::findbyusername[]
 	@Autowired
 	FindByIndexNameSessionRepository<? extends Session> sessions;
 
 	@RequestMapping("/")
 	public String index(Principal principal, Model model) {
-		Collection<? extends Session> usersSessions = this.sessions
-				.findByPrincipalName(principal.getName()).values();
+		Collection<? extends Session> usersSessions = this.sessions.findByPrincipalName(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
-				.findByPrincipalName(principal.getName()).keySet();
+	public String removeSession(Principal principal, @PathVariable String sessionIdToDelete) {
+		Set<String> usersSessionIds = this.sessions.findByPrincipalName(principal.getName()).keySet();
 		if (usersSessionIds.contains(sessionIdToDelete)) {
 			this.sessions.deleteById(sessionIdToDelete);
 		}
 
 		return "redirect:/";
 	}
+
 }

spring-session-samples/spring-session-sample-boot-findbyusername/src/main/java/sample/session/SessionDetails.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@ import java.io.Serializable;
  */
 // tag::class[]
 public class SessionDetails implements Serializable {
+
 	private String location;
 
 	private String accessType;
@@ -47,5 +48,6 @@ public class SessionDetails implements Serializable {
 	}
 
 	private static final long serialVersionUID = 8850489178248613501L;
+
 }
 // end::class[]

spring-session-samples/spring-session-sample-boot-findbyusername/src/main/java/sample/session/SessionDetailsFilter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,6 +47,7 @@ import org.springframework.web.filter.OncePerRequestFilter;
 @Component
 @Order(Ordered.HIGHEST_PRECEDENCE + 101)
 public class SessionDetailsFilter extends OncePerRequestFilter {
+
 	static final String UNKNOWN = "Unknown";
 
 	private DatabaseReader reader;
@@ -58,8 +59,8 @@ public class SessionDetailsFilter extends OncePerRequestFilter {
 
 	// tag::dofilterinternal[]
 	@Override
-	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 +109,6 @@ public class SessionDetailsFilter extends OncePerRequestFilter {
 		}
 		return remoteAddr;
 	}
+
 }
 // end::class[]

spring-session-samples/spring-session-sample-boot-findbyusername/src/test/java/sample/session/SessionDetailsFilterTests.java

@@ -34,32 +34,31 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = GeoConfig.class)
-public class SessionDetailsFilterTests {
+class SessionDetailsFilterTests {
+
 	@Autowired
 	DatabaseReader reader;
 
-	SessionDetailsFilter filter;
+	private SessionDetailsFilter filter;
 
 	@BeforeEach
-	public void setup() {
+	void setup() {
 		this.filter = new SessionDetailsFilter(this.reader);
 	}
 
 	@Test
-	public void getGeoLocationHanldesInvalidIp() {
-		assertThat(this.filter.getGeoLocation("a"))
-				.isEqualTo(SessionDetailsFilter.UNKNOWN);
+	void getGeoLocationHanldesInvalidIp() {
+		assertThat(this.filter.getGeoLocation("a")).isEqualTo(SessionDetailsFilter.UNKNOWN);
 	}
 
 	@Test
-	public void getGeoLocationNullCity() {
-		assertThat(this.filter.getGeoLocation("22.231.113.64"))
-				.isEqualTo("United States");
+	void getGeoLocationNullCity() {
+		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");
+	void getGeoLocationBoth() {
+		assertThat(this.filter.getGeoLocation("184.154.83.119")).isEqualTo("Chicago, United States");
 	}
+
 }