quick formatting work

Author: eugenp

spring-security-mvc-ldap/src/main/java/org/baeldung/SampleLDAPApplication.java

@@ -15,13 +15,13 @@
 @ComponentScan("org.baeldung")
 public class SampleLDAPApplication extends WebMvcConfigurerAdapter {
 
-	public static void main(String[] args) {
-		SpringApplication.run(SampleLDAPApplication.class, args);
-	}
+    public static void main(String[] args) {
+        SpringApplication.run(SampleLDAPApplication.class, args);
+    }
 
-	@Override
-	public void addViewControllers(ViewControllerRegistry registry) {
-		registry.addViewController("/login").setViewName("login");
-	}
+    @Override
+    public void addViewControllers(ViewControllerRegistry registry) {
+        registry.addViewController("/login").setViewName("login");
+    }
 
 }

spring-security-mvc-ldap/src/main/java/org/baeldung/controller/MyController.java

@@ -4,7 +4,6 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -20,55 +19,52 @@
 @Controller
 public class MyController {
 
-	@RequestMapping("/")
-	public String init(Map<String, Object> model, Principal principal) {
-		model.put("title", "PUBLIC AREA");
-		model.put("message", "Any user can view this page");
-	    model.put("username", getUserName(principal));
-	    model.put("userroles", getUserRoles(principal));
-		return "home";
-	}
+    @RequestMapping("/")
+    public String init(Map<String, Object> model, Principal principal) {
+        model.put("title", "PUBLIC AREA");
+        model.put("message", "Any user can view this page");
+        model.put("username", getUserName(principal));
+        model.put("userroles", getUserRoles(principal));
+        return "home";
+    }
 
-	@RequestMapping("/secure")
-	public String secure(Map<String, Object> model, Principal principal) {	
-		model.put("title", "SECURE AREA");
-		model.put("message", "Only Authorised Users Can See This Page");
-		model.put("username", getUserName(principal));
-		model.put("userroles", getUserRoles(principal));
-		return "home";
-	}
-	
-	private String getUserName(Principal principal){
-		
-		if(principal == null){
-			return "anonymous";
-		}else{
-			
-			final UserDetails currentUser = (UserDetails) ((Authentication) principal).getPrincipal(); 
-			Collection<? extends GrantedAuthority> authorities = currentUser.getAuthorities();
-			for(GrantedAuthority grantedAuthority : authorities) {
-				System.out.println(grantedAuthority.getAuthority());
-			}
-			return principal.getName();
-		}
-	}
-	
-	private Collection<String> getUserRoles(Principal principal){
-		
-		if(principal == null){
-			return Arrays.asList("none");
-		}else{
-			
-			Set<String> roles = new HashSet<String>();
-			
-			final UserDetails currentUser = (UserDetails) ((Authentication) principal).getPrincipal(); 
-			Collection<? extends GrantedAuthority> authorities = currentUser.getAuthorities();
-			for(GrantedAuthority grantedAuthority : authorities) {
-				roles.add(grantedAuthority.getAuthority());
-			}
-			return roles;
-		}
-	}
-	
-}
+    @RequestMapping("/secure")
+    public String secure(Map<String, Object> model, Principal principal) {
+        model.put("title", "SECURE AREA");
+        model.put("message", "Only Authorised Users Can See This Page");
+        model.put("username", getUserName(principal));
+        model.put("userroles", getUserRoles(principal));
+        return "home";
+    }
+
+    private String getUserName(Principal principal) {
+        if (principal == null) {
+            return "anonymous";
+        } else {
+
+            final UserDetails currentUser = (UserDetails) ((Authentication) principal).getPrincipal();
+            Collection<? extends GrantedAuthority> authorities = currentUser.getAuthorities();
+            for (GrantedAuthority grantedAuthority : authorities) {
+                System.out.println(grantedAuthority.getAuthority());
+            }
+            return principal.getName();
+        }
+    }
+
+    private Collection<String> getUserRoles(Principal principal) {
+        if (principal == null) {
+            return Arrays.asList("none");
+        } else {
 
+            Set<String> roles = new HashSet<String>();
+
+            final UserDetails currentUser = (UserDetails) ((Authentication) principal).getPrincipal();
+            Collection<? extends GrantedAuthority> authorities = currentUser.getAuthorities();
+            for (GrantedAuthority grantedAuthority : authorities) {
+                roles.add(grantedAuthority.getAuthority());
+            }
+            return roles;
+        }
+    }
+
+}

spring-security-mvc-ldap/src/main/java/org/baeldung/security/SecurityConfig.java

@@ -15,37 +15,15 @@
 @Controller
 public class SecurityConfig extends WebSecurityConfigurerAdapter {
 
-	@Override
-	protected void configure(AuthenticationManagerBuilder auth)
-			throws Exception {
-		
-		auth.ldapAuthentication()
-		.userSearchBase("ou=people")
-		.userSearchFilter("(uid={0})")
-		.groupSearchBase("ou=groups")
-		.groupSearchFilter("member={0}")
-		.contextSource()
-		.root("dc=baeldung,dc=com")
-		.ldif("classpath:users.ldif");
-		
-	}
-	
-	@Override
-	protected void configure(HttpSecurity http) throws Exception {
+    @Override
+    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+        auth.ldapAuthentication().userSearchBase("ou=people").userSearchFilter("(uid={0})").groupSearchBase("ou=groups").groupSearchFilter("member={0}").contextSource().root("dc=baeldung,dc=com").ldif("classpath:users.ldif");
+    }
 
-        http
-        .authorizeRequests()
-            .antMatchers("/", "/home").permitAll()
-            .anyRequest().authenticated();
-		http
-        .formLogin()
-            .loginPage("/login")
-            .permitAll()
-            .and()
-        .logout()
-            .logoutSuccessUrl("/");
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        http.authorizeRequests().antMatchers("/", "/home").permitAll().anyRequest().authenticated();
+        http.formLogin().loginPage("/login").permitAll().and().logout().logoutSuccessUrl("/");
+    }
 
-	
-	}
-	
 }