From 94421b7d388cea17a3d1fb7da8e87960c9dcc082 Mon Sep 17 00:00:00 2001
From: kwandzel <korneliusz.wandzel@gmail.com>
Date: Mon, 19 Feb 2018 22:45:40 +0100
Subject: [PATCH] [BAEL-1556]:fixes according to a review

---
 .../SecurityConfiguration.java                | 34 +++++++++++--------
 .../SpringSecurityThymeleafApplication.java   |  6 ++--
 .../ViewController.java                       | 22 +++++-------
 .../src/main/resources/templates/index.html   |  9 +++--
 .../src/main/resources/templates/login.html   |  4 +--
 .../main/resources/templates/loginError.html  |  9 -----
 6 files changed, 39 insertions(+), 45 deletions(-)
 delete mode 100644 spring-security-thymeleaf/src/main/resources/templates/loginError.html

diff --git a/spring-security-thymeleaf/src/main/java/com/baeldung/springsecuritythymeleaf/SecurityConfiguration.java b/spring-security-thymeleaf/src/main/java/com/baeldung/springsecuritythymeleaf/SecurityConfiguration.java
index 9c734a6b2d..687c0c2e39 100644
--- a/spring-security-thymeleaf/src/main/java/com/baeldung/springsecuritythymeleaf/SecurityConfiguration.java
+++ b/spring-security-thymeleaf/src/main/java/com/baeldung/springsecuritythymeleaf/SecurityConfiguration.java
@@ -12,26 +12,32 @@ import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 @EnableWebSecurity
 public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
 
-	@Override
+    @Override
     protected void configure(HttpSecurity http) throws Exception {
-        http
-            .authorizeRequests()
-                .anyRequest().authenticated()
-                .and()
+        http.authorizeRequests()
+            .anyRequest()
+            .authenticated()
+            .and()
             .formLogin()
-                .loginPage("/login")
-                .permitAll().failureUrl("/loginError").successForwardUrl("/index")
-                .and()
+            .loginPage("/login")
+            .permitAll()
+            .successForwardUrl("/index")
+            .and()
             .logout()
-                .permitAll()
-                .logoutRequestMatcher(new AntPathRequestMatcher("/logout"))
-                .logoutSuccessUrl("/login");
+            .permitAll()
+            .logoutRequestMatcher(new AntPathRequestMatcher("/logout"))
+            .logoutSuccessUrl("/login");
     }
 
     @Autowired
-	public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
+    public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
         auth.inMemoryAuthentication()
-        .withUser("user").password("password").roles("USER").and()
-        .withUser("admin").password("admin").roles("ADMIN");
+            .withUser("user")
+            .password("password")
+            .roles("USER")
+            .and()
+            .withUser("admin")
+            .password("admin")
+            .roles("ADMIN");
     }
 }
diff --git a/spring-security-thymeleaf/src/main/java/com/baeldung/springsecuritythymeleaf/SpringSecurityThymeleafApplication.java b/spring-security-thymeleaf/src/main/java/com/baeldung/springsecuritythymeleaf/SpringSecurityThymeleafApplication.java
index c6e4dc1469..09a4e74988 100644
--- a/spring-security-thymeleaf/src/main/java/com/baeldung/springsecuritythymeleaf/SpringSecurityThymeleafApplication.java
+++ b/spring-security-thymeleaf/src/main/java/com/baeldung/springsecuritythymeleaf/SpringSecurityThymeleafApplication.java
@@ -6,7 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 @SpringBootApplication
 public class SpringSecurityThymeleafApplication {
 
-	public static void main(String[] args) {
-		SpringApplication.run(SpringSecurityThymeleafApplication.class, args);
-	}
+    public static void main(String[] args) {
+        SpringApplication.run(SpringSecurityThymeleafApplication.class, args);
+    }
 }
diff --git a/spring-security-thymeleaf/src/main/java/com/baeldung/springsecuritythymeleaf/ViewController.java b/spring-security-thymeleaf/src/main/java/com/baeldung/springsecuritythymeleaf/ViewController.java
index 81b891dad8..a2337f9db5 100644
--- a/spring-security-thymeleaf/src/main/java/com/baeldung/springsecuritythymeleaf/ViewController.java
+++ b/spring-security-thymeleaf/src/main/java/com/baeldung/springsecuritythymeleaf/ViewController.java
@@ -6,19 +6,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 @Controller
 public class ViewController {
 
-	@RequestMapping("/login")
-	public String login() {
-		return "login";
-	}
-
-	@RequestMapping({ "/index", "/" })
-	public String index() {
-		return "index";
-	}
-
-	@RequestMapping("/loginError")
-	public String loginError() {
-		return "loginError";
-	}
+    @RequestMapping("/login")
+    public String login() {
+        return "login";
+    }
 
+    @RequestMapping({ "/index", "/" })
+    public String index() {
+        return "index";
+    }
 }
diff --git a/spring-security-thymeleaf/src/main/resources/templates/index.html b/spring-security-thymeleaf/src/main/resources/templates/index.html
index c127f7c663..27426ec496 100644
--- a/spring-security-thymeleaf/src/main/resources/templates/index.html
+++ b/spring-security-thymeleaf/src/main/resources/templates/index.html
@@ -8,8 +8,11 @@
 	<p>Spring Security Thymeleaf tutorial</p>
 	<div sec:authorize="hasRole('USER')">Text visible to user.</div>
 	<div sec:authorize="hasRole('ADMIN')">Text visible to admin.</div>
-	<div sec:authorize="isAuthenticated()">Text visible only to authenticated users.</div>
-	Authenticated username: <div sec:authentication="name"></div>
-	Authenticated user roles: <div sec:authentication="principal.authorities"></div>
+	<div sec:authorize="isAuthenticated()">Text visible only to
+		authenticated users.</div>
+	Authenticated username:
+	<div sec:authentication="name"></div>
+	Authenticated user roles:
+	<div sec:authentication="principal.authorities"></div>
 </body>
 </html>
\ No newline at end of file
diff --git a/spring-security-thymeleaf/src/main/resources/templates/login.html b/spring-security-thymeleaf/src/main/resources/templates/login.html
index 92cade03ec..0177f7d8e8 100644
--- a/spring-security-thymeleaf/src/main/resources/templates/login.html
+++ b/spring-security-thymeleaf/src/main/resources/templates/login.html
@@ -7,9 +7,9 @@
 	<h2>Custom Login Page</h2>
 	<form th:action="@{/login}" method="post">
 		<label for="username">Username</label>: <input type="text"
-			id="username" name="username" autofocus="autofocus" /> <br /> <label
+			id="username" name="username" autofocus="autofocus" /> <label
 			for="password">Password</label>: <input type="password" id="password"
-			name="password" /> <br /> <input type="submit" value="Log in" />
+			name="password" /><input type="submit" value="Log in" />
 	</form>
 </body>
 </html>
\ No newline at end of file
diff --git a/spring-security-thymeleaf/src/main/resources/templates/loginError.html b/spring-security-thymeleaf/src/main/resources/templates/loginError.html
deleted file mode 100644
index 1e05cb4a87..0000000000
--- a/spring-security-thymeleaf/src/main/resources/templates/loginError.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-<title>Login error page</title>
-</head>
-<body>
-	<h2>Login Error Page</h2>
-</body>
-</html>
\ No newline at end of file