diff --git a/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/controller/MyController.java b/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/controller/MyController.java index bf3da5045d..51202225ee 100644 --- a/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/controller/MyController.java +++ b/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/controller/MyController.java @@ -13,23 +13,21 @@ import org.springframework.web.servlet.ModelAndView; @Controller public class MyController { - /** - * Build the view model for the login page (add authentication error - * information in the event of an unsuccessful login attempt). - */ - @RequestMapping(value = "/login", method = RequestMethod.GET) - public ModelAndView login( - @RequestParam(value = "error", required = false) String error) { + /** + * Build the view model for the login page (add authentication error + * information in the event of an unsuccessful login attempt). + */ + @RequestMapping(value = "/login", method = RequestMethod.GET) + public ModelAndView login(@RequestParam(value = "error", required = false) String error) { - ModelAndView model = new ModelAndView(); - if (error != null) { - model.addObject("message", - "Username or password not recognised - please try again."); - } + ModelAndView model = new ModelAndView(); + if (error != null) { + model.addObject("message", "Username or password not recognised - please try again."); + } - model.setViewName("login"); - return model; + model.setViewName("login"); + return model; - } + } } diff --git a/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java b/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java index becc321e25..22fd2cdcb6 100644 --- a/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java +++ b/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java @@ -17,9 +17,9 @@ import org.springframework.security.web.WebAttributes; import org.springframework.security.web.authentication.AuthenticationSuccessHandler; import org.springframework.stereotype.Component; -@Component(value="mySimpleUrlAuthenticationSuccessHandler") +@Component(value = "mySimpleUrlAuthenticationSuccessHandler") public class MySimpleUrlAuthenticationSuccessHandler implements AuthenticationSuccessHandler { - + private final Log logger = LogFactory.getLog(this.getClass()); private RedirectStrategy redirectStrategy = new DefaultRedirectStrategy(); diff --git a/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/security/SecurityRole.java b/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/security/SecurityRole.java index 750f672ba9..e41e7a4c4f 100644 --- a/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/security/SecurityRole.java +++ b/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/security/SecurityRole.java @@ -6,7 +6,6 @@ package org.baeldung.security; */ public enum SecurityRole { - ROLE_USER, - ROLE_ADMIN; - + ROLE_USER, ROLE_ADMIN; + } diff --git a/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/security/SecurityWebApplicationInitializer.java b/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/security/SecurityWebApplicationInitializer.java index c4c4b0bb98..75f782e7dc 100644 --- a/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/security/SecurityWebApplicationInitializer.java +++ b/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/security/SecurityWebApplicationInitializer.java @@ -6,6 +6,6 @@ import org.springframework.security.web.context.AbstractSecurityWebApplicationIn * Registers the springSecurityFilterChain Filter for every URL in the application. * */ -public class SecurityWebApplicationInitializer extends AbstractSecurityWebApplicationInitializer{ +public class SecurityWebApplicationInitializer extends AbstractSecurityWebApplicationInitializer { } diff --git a/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/service/MyUserDetailsService.java b/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/service/MyUserDetailsService.java index 017f6eeb81..ac2aa6beb6 100644 --- a/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/service/MyUserDetailsService.java +++ b/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/service/MyUserDetailsService.java @@ -23,65 +23,61 @@ import org.springframework.stereotype.Service; @Service public class MyUserDetailsService implements UserDetailsService { - private final Log logger = LogFactory.getLog(this.getClass()); + private final Log logger = LogFactory.getLog(this.getClass()); - private Map availableUsers = new HashMap(); + private Map availableUsers = new HashMap(); - public MyUserDetailsService() { + public MyUserDetailsService() { - populateDemoUsers(); - - } + populateDemoUsers(); - @Override - public UserDetails loadUserByUsername(String username) - throws UsernameNotFoundException { + } - logger.info("Load user by username " + username); + @Override + public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { - UserDetails user = availableUsers.get(username); - if (user == null) { - throw new UsernameNotFoundException("Username not found"); - } else { - return availableUsers.get(username); - } + logger.info("Load user by username " + username); - } + UserDetails user = availableUsers.get(username); + if (user == null) { + throw new UsernameNotFoundException("Username not found"); + } else { + return availableUsers.get(username); + } - /** - * Create demo users (note: obviously in a real system these would be persisted - * in database or retrieved from another system). - */ - private void populateDemoUsers(){ - - logger.info("Populate demo users"); - - availableUsers.put("user", - createUser("user", "password", Arrays.asList(SecurityRole.ROLE_USER))); - availableUsers.put("admin", - createUser("admin", "password", Arrays.asList(SecurityRole.ROLE_ADMIN))); - } - - - /** - * Create a demo User. - * - * @param username - * Username - * @param password - * Password - * @param roles - * Role names user is assigned to - * @return User - */ - private User createUser(String username, String password, List roles) { + } - logger.info("Create user " + username); + /** + * Create demo users (note: obviously in a real system these would be persisted + * in database or retrieved from another system). + */ + private void populateDemoUsers() { - List authorities = new ArrayList(); - for (SecurityRole role : roles) { - authorities.add(new SimpleGrantedAuthority(role.toString())); - } - return new User(username, password, true, true, true, true, authorities); - } + logger.info("Populate demo users"); + + availableUsers.put("user", createUser("user", "password", Arrays.asList(SecurityRole.ROLE_USER))); + availableUsers.put("admin", createUser("admin", "password", Arrays.asList(SecurityRole.ROLE_ADMIN))); + } + + /** + * Create a demo User. + * + * @param username + * Username + * @param password + * Password + * @param roles + * Role names user is assigned to + * @return User + */ + private User createUser(String username, String password, List roles) { + + logger.info("Create user " + username); + + List authorities = new ArrayList(); + for (SecurityRole role : roles) { + authorities.add(new SimpleGrantedAuthority(role.toString())); + } + return new User(username, password, true, true, true, true, authorities); + } } diff --git a/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/spring/DatabaseConfig.java b/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/spring/DatabaseConfig.java index 4fbcca7886..7f0428df77 100644 --- a/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/spring/DatabaseConfig.java +++ b/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/spring/DatabaseConfig.java @@ -20,10 +20,10 @@ import com.google.common.base.Preconditions; @PropertySource({ "classpath:persistence-h2.properties" }) public class DatabaseConfig { - @Autowired + @Autowired private Environment env; - @Bean + @Bean public DataSource dataSource() { final DriverManagerDataSource dataSource = new DriverManagerDataSource(); dataSource.setDriverClassName(Preconditions.checkNotNull(env.getProperty("jdbc.driverClassName"))); diff --git a/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/spring/SecurityConfig.java b/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/spring/SecurityConfig.java index 6d8584ff26..b3549511fc 100644 --- a/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/spring/SecurityConfig.java +++ b/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/spring/SecurityConfig.java @@ -15,13 +15,11 @@ import org.springframework.security.web.authentication.AuthenticationSuccessHand @ImportResource({ "classpath:webSecurityConfig.xml" }) public class SecurityConfig extends WebSecurityConfigurerAdapter { - @Autowired - private AuthenticationSuccessHandler mySimpleUrlAuthenticationSuccessHandler; + @Autowired + private AuthenticationSuccessHandler mySimpleUrlAuthenticationSuccessHandler; + + public SecurityConfig() { + super(); + } - public SecurityConfig() { - super(); - } - } - -