From ea227f8a981e3758aab2213fb9574404766f2b1e Mon Sep 17 00:00:00 2001 From: eugenp Date: Sat, 1 Aug 2015 13:57:52 +0300 Subject: [PATCH] formatting work and session fix --- .../dao/PasswordResetTokenRepository.java | 5 +- .../persistence/dao/PrivilegeRepository.java | 7 ++- .../persistence/dao/RoleRepository.java | 7 ++- .../persistence/dao/UserRepository.java | 7 +-- .../dao/VerificationTokenRepository.java | 5 +- .../persistence/model/PasswordResetToken.java | 49 ++++++++++++------- .../baeldung/persistence/model/Privilege.java | 23 ++++++--- .../org/baeldung/persistence/model/Role.java | 26 ++++++---- .../org/baeldung/persistence/model/User.java | 30 +++++++----- .../persistence/model/VerificationToken.java | 47 +++++++++++------- .../persistence/service/IUserService.java | 1 + .../OnRegistrationCompleteEvent.java | 5 +- .../listener/RegistrationListener.java | 8 +-- .../AuthenticationFailureListener.java | 6 ++- .../AuthenticationSuccessEventListener.java | 6 ++- .../security/LoginAttemptService.java | 15 +++--- ...SimpleUrlAuthenticationSuccessHandler.java | 23 ++++----- .../security/MyUserDetailsService.java | 12 ++--- .../java/org/baeldung/spring/AppConfig.java | 4 +- .../java/org/baeldung/spring/MvcConfig.java | 10 ++-- .../baeldung/spring/PersistenceJPAConfig.java | 2 + .../baeldung/spring/SecSecurityConfig.java | 4 +- .../validation/EmailExistsException.java | 3 +- .../baeldung/validation/EmailValidator.java | 6 +-- .../baeldung/validation/PasswordMatches.java | 12 +++-- .../validation/PasswordMatchesValidator.java | 8 +-- .../baeldung/validation/UserValidator.java | 4 +- .../org/baeldung/validation/ValidEmail.java | 14 +++--- .../controller/OldRegistrationController.java | 2 +- .../controller/RegistrationController.java | 2 +- .../baeldung/web/util/GenericResponse.java | 8 +-- .../src/main/webapp/WEB-INF/mvc-servlet.xml | 3 +- 32 files changed, 215 insertions(+), 149 deletions(-) diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/dao/PasswordResetTokenRepository.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/dao/PasswordResetTokenRepository.java index 9ef80fe8b1..a1c22998de 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/dao/PasswordResetTokenRepository.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/dao/PasswordResetTokenRepository.java @@ -6,7 +6,8 @@ import org.springframework.data.jpa.repository.JpaRepository; public interface PasswordResetTokenRepository extends JpaRepository { - public PasswordResetToken findByToken(String token); + PasswordResetToken findByToken(String token); + + PasswordResetToken findByUser(User user); - public PasswordResetToken findByUser(User user); } diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/dao/PrivilegeRepository.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/dao/PrivilegeRepository.java index 3f8016f314..f728e171df 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/dao/PrivilegeRepository.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/dao/PrivilegeRepository.java @@ -4,7 +4,10 @@ import org.baeldung.persistence.model.Privilege; import org.springframework.data.jpa.repository.JpaRepository; public interface PrivilegeRepository extends JpaRepository { - public Privilege findByName(String name); - public void delete(Privilege privilege); + Privilege findByName(String name); + + @Override + void delete(Privilege privilege); + } diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/dao/RoleRepository.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/dao/RoleRepository.java index 90d6de60f2..3d6ba16d0f 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/dao/RoleRepository.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/dao/RoleRepository.java @@ -4,7 +4,10 @@ import org.baeldung.persistence.model.Role; import org.springframework.data.jpa.repository.JpaRepository; public interface RoleRepository extends JpaRepository { - public Role findByName(String name); - public void delete(Role role); + Role findByName(String name); + + @Override + void delete(Role role); + } diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/dao/UserRepository.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/dao/UserRepository.java index 12f07d8692..680b6973fa 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/dao/UserRepository.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/dao/UserRepository.java @@ -1,11 +1,12 @@ package org.baeldung.persistence.dao; -import org.springframework.data.jpa.repository.JpaRepository; import org.baeldung.persistence.model.User; +import org.springframework.data.jpa.repository.JpaRepository; public interface UserRepository extends JpaRepository { - public User findByEmail(String email); + User findByEmail(String email); - public void delete(User user); + @Override + void delete(User user); } diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/dao/VerificationTokenRepository.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/dao/VerificationTokenRepository.java index f9fc850d41..d40a843e88 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/dao/VerificationTokenRepository.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/dao/VerificationTokenRepository.java @@ -6,7 +6,8 @@ import org.springframework.data.jpa.repository.JpaRepository; public interface VerificationTokenRepository extends JpaRepository { - public VerificationToken findByToken(String token); + VerificationToken findByToken(String token); + + VerificationToken findByUser(User user); - public VerificationToken findByUser(User user); } diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/PasswordResetToken.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/PasswordResetToken.java index cfff0135da..fdf5473764 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/PasswordResetToken.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/PasswordResetToken.java @@ -32,14 +32,14 @@ public class PasswordResetToken { super(); } - public PasswordResetToken(String token) { + public PasswordResetToken(final String token) { super(); this.token = token; this.expiryDate = calculateExpiryDate(EXPIRATION); } - public PasswordResetToken(String token, User user) { + public PasswordResetToken(final String token, final User user) { super(); this.token = token; @@ -47,11 +47,13 @@ public class PasswordResetToken { this.expiryDate = calculateExpiryDate(EXPIRATION); } + // + public String getToken() { return token; } - public void setToken(String token) { + public void setToken(final String token) { this.token = token; } @@ -59,7 +61,7 @@ public class PasswordResetToken { return user; } - public void setUser(User user) { + public void setUser(final User user) { this.user = user; } @@ -67,18 +69,18 @@ public class PasswordResetToken { return expiryDate; } - public void setExpiryDate(Date expiryDate) { + public void setExpiryDate(final Date expiryDate) { this.expiryDate = expiryDate; } - private Date calculateExpiryDate(int expiryTimeInMinutes) { - Calendar cal = Calendar.getInstance(); + private Date calculateExpiryDate(final int expiryTimeInMinutes) { + final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(new Date().getTime()); cal.add(Calendar.MINUTE, expiryTimeInMinutes); return new Date(cal.getTime().getTime()); } - public void updateToken(String token) { + public void updateToken(final String token) { this.token = token; this.expiryDate = calculateExpiryDate(EXPIRATION); } @@ -96,29 +98,38 @@ public class PasswordResetToken { } @Override - public boolean equals(Object obj) { - if (this == obj) + public boolean equals(final Object obj) { + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; - PasswordResetToken other = (PasswordResetToken) obj; + } + final PasswordResetToken other = (PasswordResetToken) obj; if (expiryDate == null) { - if (other.expiryDate != null) + if (other.expiryDate != null) { return false; - } else if (!expiryDate.equals(other.expiryDate)) + } + } else if (!expiryDate.equals(other.expiryDate)) { return false; + } if (token == null) { - if (other.token != null) + if (other.token != null) { return false; - } else if (!token.equals(other.token)) + } + } else if (!token.equals(other.token)) { return false; + } if (user == null) { - if (other.user != null) + if (other.user != null) { return false; - } else if (!user.equals(other.user)) + } + } else if (!user.equals(other.user)) { return false; + } return true; } diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/Privilege.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/Privilege.java index c403ffb7a2..1331b1985d 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/Privilege.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/Privilege.java @@ -10,6 +10,7 @@ import javax.persistence.ManyToMany; @Entity public class Privilege { + @Id @GeneratedValue(strategy = GenerationType.AUTO) private Long id; @@ -23,16 +24,18 @@ public class Privilege { super(); } - public Privilege(String name) { + public Privilege(final String name) { super(); this.name = name; } + // + public Long getId() { return id; } - public void setId(Long id) { + public void setId(final Long id) { this.id = id; } @@ -40,7 +43,7 @@ public class Privilege { return name; } - public void setName(String name) { + public void setName(final String name) { this.name = name; } @@ -48,7 +51,7 @@ public class Privilege { return roles; } - public void setRoles(Collection roles) { + public void setRoles(final Collection roles) { this.roles = roles; } @@ -62,15 +65,19 @@ public class Privilege { @Override public boolean equals(final Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } final Privilege privilege = (Privilege) obj; - if (!privilege.equals(privilege.name)) + if (!privilege.equals(privilege.name)) { return false; + } return true; } diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/Role.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/Role.java index c7053fc56a..86680252d2 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/Role.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/Role.java @@ -6,9 +6,9 @@ import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.JoinColumn; import javax.persistence.JoinTable; import javax.persistence.ManyToMany; -import javax.persistence.JoinColumn; @Entity public class Role { @@ -30,16 +30,18 @@ public class Role { super(); } - public Role(String name) { + public Role(final String name) { super(); this.name = name; } + // + public Long getId() { return id; } - public void setId(Long id) { + public void setId(final Long id) { this.id = id; } @@ -47,7 +49,7 @@ public class Role { return name; } - public void setName(String name) { + public void setName(final String name) { this.name = name; } @@ -55,7 +57,7 @@ public class Role { return users; } - public void setUsers(Collection users) { + public void setUsers(final Collection users) { this.users = users; } @@ -63,7 +65,7 @@ public class Role { return privileges; } - public void setPrivileges(Collection privileges) { + public void setPrivileges(final Collection privileges) { this.privileges = privileges; } @@ -77,15 +79,19 @@ public class Role { @Override public boolean equals(final Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } final Role role = (Role) obj; - if (!role.equals(role.name)) + if (!role.equals(role.name)) { return false; + } return true; } diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/User.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/User.java index 277ddef1dc..9640ba079b 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/User.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/User.java @@ -31,6 +31,8 @@ public class User { private boolean tokenExpired; + // + @ManyToMany @JoinTable(name = "users_roles", joinColumns = @JoinColumn(name = "user_id", referencedColumnName = "id") , inverseJoinColumns = @JoinColumn(name = "role_id", referencedColumnName = "id") ) private Collection roles; @@ -45,7 +47,7 @@ public class User { return id; } - public void setId(Long id) { + public void setId(final Long id) { this.id = id; } @@ -53,7 +55,7 @@ public class User { return firstName; } - public void setFirstName(String firstName) { + public void setFirstName(final String firstName) { this.firstName = firstName; } @@ -61,7 +63,7 @@ public class User { return lastName; } - public void setLastName(String lastName) { + public void setLastName(final String lastName) { this.lastName = lastName; } @@ -69,7 +71,7 @@ public class User { return email; } - public void setEmail(String username) { + public void setEmail(final String username) { this.email = username; } @@ -77,7 +79,7 @@ public class User { return password; } - public void setPassword(String password) { + public void setPassword(final String password) { this.password = password; } @@ -85,7 +87,7 @@ public class User { return roles; } - public void setRoles(Collection roles) { + public void setRoles(final Collection roles) { this.roles = roles; } @@ -93,7 +95,7 @@ public class User { return enabled; } - public void setEnabled(boolean enabled) { + public void setEnabled(final boolean enabled) { this.enabled = enabled; } @@ -101,7 +103,7 @@ public class User { return tokenExpired; } - public void setTokenExpired(boolean expired) { + public void setTokenExpired(final boolean expired) { this.tokenExpired = expired; } @@ -115,15 +117,19 @@ public class User { @Override public boolean equals(final Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } final User user = (User) obj; - if (!email.equals(user.email)) + if (!email.equals(user.email)) { return false; + } return true; } diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/VerificationToken.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/VerificationToken.java index a25750d3d0..a8eb49f672 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/VerificationToken.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/VerificationToken.java @@ -32,14 +32,14 @@ public class VerificationToken { super(); } - public VerificationToken(String token) { + public VerificationToken(final String token) { super(); this.token = token; this.expiryDate = calculateExpiryDate(EXPIRATION); } - public VerificationToken(String token, User user) { + public VerificationToken(final String token, final User user) { super(); this.token = token; @@ -51,7 +51,7 @@ public class VerificationToken { return token; } - public void setToken(String token) { + public void setToken(final String token) { this.token = token; } @@ -59,7 +59,7 @@ public class VerificationToken { return user; } - public void setUser(User user) { + public void setUser(final User user) { this.user = user; } @@ -67,18 +67,18 @@ public class VerificationToken { return expiryDate; } - public void setExpiryDate(Date expiryDate) { + public void setExpiryDate(final Date expiryDate) { this.expiryDate = expiryDate; } - private Date calculateExpiryDate(int expiryTimeInMinutes) { - Calendar cal = Calendar.getInstance(); + private Date calculateExpiryDate(final int expiryTimeInMinutes) { + final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(new Date().getTime()); cal.add(Calendar.MINUTE, expiryTimeInMinutes); return new Date(cal.getTime().getTime()); } - public void updateToken(String token) { + public void updateToken(final String token) { this.token = token; this.expiryDate = calculateExpiryDate(EXPIRATION); } @@ -96,29 +96,38 @@ public class VerificationToken { } @Override - public boolean equals(Object obj) { - if (this == obj) + public boolean equals(final Object obj) { + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; - VerificationToken other = (VerificationToken) obj; + } + final VerificationToken other = (VerificationToken) obj; if (expiryDate == null) { - if (other.expiryDate != null) + if (other.expiryDate != null) { return false; - } else if (!expiryDate.equals(other.expiryDate)) + } + } else if (!expiryDate.equals(other.expiryDate)) { return false; + } if (token == null) { - if (other.token != null) + if (other.token != null) { return false; - } else if (!token.equals(other.token)) + } + } else if (!token.equals(other.token)) { return false; + } if (user == null) { - if (other.user != null) + if (other.user != null) { return false; - } else if (!user.equals(other.user)) + } + } else if (!user.equals(other.user)) { return false; + } return true; } diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/IUserService.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/IUserService.java index 7ec07e9488..9fa97395fa 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/IUserService.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/IUserService.java @@ -34,4 +34,5 @@ public interface IUserService { void changeUserPassword(User user, String password); boolean checkIfValidOldPassword(User user, String password); + } diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/registration/OnRegistrationCompleteEvent.java b/spring-security-login-and-registration/src/main/java/org/baeldung/registration/OnRegistrationCompleteEvent.java index ede14537e8..75433f1286 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/registration/OnRegistrationCompleteEvent.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/registration/OnRegistrationCompleteEvent.java @@ -12,13 +12,15 @@ public class OnRegistrationCompleteEvent extends ApplicationEvent { private final Locale locale; private final User user; - public OnRegistrationCompleteEvent(User user, Locale locale, String appUrl) { + public OnRegistrationCompleteEvent(final User user, final Locale locale, final String appUrl) { super(user); this.user = user; this.locale = locale; this.appUrl = appUrl; } + // + public String getAppUrl() { return appUrl; } @@ -30,4 +32,5 @@ public class OnRegistrationCompleteEvent extends ApplicationEvent { public User getUser() { return user; } + } diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/registration/listener/RegistrationListener.java b/spring-security-login-and-registration/src/main/java/org/baeldung/registration/listener/RegistrationListener.java index 16eb2177d5..0a3689f670 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/registration/listener/RegistrationListener.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/registration/listener/RegistrationListener.java @@ -30,13 +30,13 @@ public class RegistrationListener implements ApplicationListener() { - public Integer load(String key) { + @Override + public Integer load(final String key) { return 0; } }); } - public void loginSucceeded(String key) { + // + + public void loginSucceeded(final String key) { attemptsCache.invalidate(key); } - public void loginFailed(String key) { + public void loginFailed(final String key) { int attempts = 0; try { attempts = attemptsCache.get(key); - } catch (ExecutionException e) { + } catch (final ExecutionException e) { attempts = 0; } attempts++; attemptsCache.put(key, attempts); } - public boolean isBlocked(String key) { + public boolean isBlocked(final String key) { try { return attemptsCache.get(key) >= MAX_ATTEMPT; - } catch (ExecutionException e) { + } catch (final ExecutionException e) { return false; } } diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java b/spring-security-login-and-registration/src/main/java/org/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java index 09b22064b7..37703d9a09 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java @@ -23,17 +23,18 @@ public class MySimpleUrlAuthenticationSuccessHandler implements AuthenticationSu private RedirectStrategy redirectStrategy = new DefaultRedirectStrategy(); - public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException { + @Override + public void onAuthenticationSuccess(final HttpServletRequest request, final HttpServletResponse response, final Authentication authentication) throws IOException { handle(request, response, authentication); - HttpSession session = request.getSession(false); + final HttpSession session = request.getSession(false); if (session != null) { - session.setMaxInactiveInterval(30); + session.setMaxInactiveInterval(30 * 60); } clearAuthenticationAttributes(request); } - protected void handle(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException { - String targetUrl = determineTargetUrl(authentication); + protected void handle(final HttpServletRequest request, final HttpServletResponse response, final Authentication authentication) throws IOException { + final String targetUrl = determineTargetUrl(authentication); if (response.isCommitted()) { logger.debug("Response has already been committed. Unable to redirect to " + targetUrl); @@ -43,11 +44,11 @@ public class MySimpleUrlAuthenticationSuccessHandler implements AuthenticationSu redirectStrategy.sendRedirect(request, response, targetUrl); } - protected String determineTargetUrl(Authentication authentication) { + protected String determineTargetUrl(final Authentication authentication) { boolean isUser = false; boolean isAdmin = false; - Collection authorities = authentication.getAuthorities(); - for (GrantedAuthority grantedAuthority : authorities) { + final Collection authorities = authentication.getAuthorities(); + for (final GrantedAuthority grantedAuthority : authorities) { if (grantedAuthority.getAuthority().equals("READ_PRIVILEGE")) { isUser = true; } else if (grantedAuthority.getAuthority().equals("WRITE_PRIVILEGE")) { @@ -65,15 +66,15 @@ public class MySimpleUrlAuthenticationSuccessHandler implements AuthenticationSu } } - protected void clearAuthenticationAttributes(HttpServletRequest request) { - HttpSession session = request.getSession(false); + protected void clearAuthenticationAttributes(final HttpServletRequest request) { + final HttpSession session = request.getSession(false); if (session == null) { return; } session.removeAttribute(WebAttributes.AUTHENTICATION_EXCEPTION); } - public void setRedirectStrategy(RedirectStrategy redirectStrategy) { + public void setRedirectStrategy(final RedirectStrategy redirectStrategy) { this.redirectStrategy = redirectStrategy; } diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/security/MyUserDetailsService.java b/spring-security-login-and-registration/src/main/java/org/baeldung/security/MyUserDetailsService.java index 0de7fadd46..d9c3e586b1 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/security/MyUserDetailsService.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/security/MyUserDetailsService.java @@ -12,9 +12,7 @@ import org.baeldung.persistence.dao.UserRepository; import org.baeldung.persistence.model.Privilege; import org.baeldung.persistence.model.Role; import org.baeldung.persistence.model.User; -import org.baeldung.persistence.service.IUserService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.MessageSource; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; @@ -29,10 +27,7 @@ public class MyUserDetailsService implements UserDetailsService { @Autowired private UserRepository userRepository; - @Autowired - private IUserService service; - @Autowired - private MessageSource messages; + @Autowired private RoleRepository roleRepository; @@ -50,7 +45,7 @@ public class MyUserDetailsService implements UserDetailsService { @Override public UserDetails loadUserByUsername(final String email) throws UsernameNotFoundException { - String ip = request.getRemoteAddr(); + final String ip = request.getRemoteAddr(); if (loginAttemptService.isBlocked(ip)) { throw new RuntimeException("blocked"); } @@ -76,7 +71,7 @@ public class MyUserDetailsService implements UserDetailsService { private final List getPrivileges(final Collection roles) { final List privileges = new ArrayList(); final List collection = new ArrayList(); - for (Role role : roles) { + for (final Role role : roles) { collection.addAll(role.getPrivileges()); } for (final Privilege item : collection) { @@ -92,4 +87,5 @@ public class MyUserDetailsService implements UserDetailsService { } return authorities; } + } diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/spring/AppConfig.java b/spring-security-login-and-registration/src/main/java/org/baeldung/spring/AppConfig.java index 219fcb729e..cba2b25285 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/spring/AppConfig.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/spring/AppConfig.java @@ -28,13 +28,13 @@ public class AppConfig { @Bean public JavaMailSenderImpl javaMailSenderImpl() { - JavaMailSenderImpl mailSenderImpl = new JavaMailSenderImpl(); + final JavaMailSenderImpl mailSenderImpl = new JavaMailSenderImpl(); mailSenderImpl.setHost(env.getProperty("smtp.host")); mailSenderImpl.setPort(env.getProperty("smtp.port", Integer.class)); mailSenderImpl.setProtocol(env.getProperty("smtp.protocol")); mailSenderImpl.setUsername(env.getProperty("smtp.username")); mailSenderImpl.setPassword(env.getProperty("smtp.password")); - Properties javaMailProps = new Properties(); + final Properties javaMailProps = new Properties(); javaMailProps.put("mail.smtp.auth", true); javaMailProps.put("mail.smtp.starttls.enable", true); mailSenderImpl.setJavaMailProperties(javaMailProps); diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/spring/MvcConfig.java b/spring-security-login-and-registration/src/main/java/org/baeldung/spring/MvcConfig.java index d5adf74992..56141d8f33 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/spring/MvcConfig.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/spring/MvcConfig.java @@ -53,13 +53,13 @@ public class MvcConfig extends WebMvcConfigurerAdapter { } @Override - public void addResourceHandlers(ResourceHandlerRegistry registry) { + public void addResourceHandlers(final ResourceHandlerRegistry registry) { registry.addResourceHandler("/resources/**").addResourceLocations("/", "/resources/"); } @Override - public void addInterceptors(InterceptorRegistry registry) { - LocaleChangeInterceptor localeChangeInterceptor = new LocaleChangeInterceptor(); + public void addInterceptors(final InterceptorRegistry registry) { + final LocaleChangeInterceptor localeChangeInterceptor = new LocaleChangeInterceptor(); localeChangeInterceptor.setParamName("lang"); registry.addInterceptor(localeChangeInterceptor); } @@ -77,14 +77,14 @@ public class MvcConfig extends WebMvcConfigurerAdapter { @Bean public LocaleResolver localeResolver() { - CookieLocaleResolver cookieLocaleResolver = new CookieLocaleResolver(); + final CookieLocaleResolver cookieLocaleResolver = new CookieLocaleResolver(); cookieLocaleResolver.setDefaultLocale(Locale.ENGLISH); return cookieLocaleResolver; } @Bean public MessageSource messageSource() { - ReloadableResourceBundleMessageSource messageSource = new ReloadableResourceBundleMessageSource(); + final ReloadableResourceBundleMessageSource messageSource = new ReloadableResourceBundleMessageSource(); messageSource.setBasename("classpath:messages"); messageSource.setUseCodeAsDefaultMessage(true); messageSource.setDefaultEncoding("UTF-8"); diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/spring/PersistenceJPAConfig.java b/spring-security-login-and-registration/src/main/java/org/baeldung/spring/PersistenceJPAConfig.java index d2465af345..cb00353fe8 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/spring/PersistenceJPAConfig.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/spring/PersistenceJPAConfig.java @@ -32,6 +32,8 @@ public class PersistenceJPAConfig { super(); } + // + @Bean public LocalContainerEntityManagerFactoryBean entityManagerFactory() { final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean(); diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/spring/SecSecurityConfig.java b/spring-security-login-and-registration/src/main/java/org/baeldung/spring/SecSecurityConfig.java index af75a6e73c..814ed92b33 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/spring/SecSecurityConfig.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/spring/SecSecurityConfig.java @@ -47,8 +47,8 @@ public class SecSecurityConfig extends WebSecurityConfigurerAdapter { .csrf().disable() .authorizeRequests() .antMatchers("/j_spring_security_check*","/login*", "/logout*", "/signin/**", "/signup/**", - "/user/registration*", "/regitrationConfirm*", "/expiredAccount*", "/registration*", - "/badUser*", "/user/resendRegistrationToken*" ,"/forgetPassword*", "/user/resetPassword*", + "/user/registration*", "/regitrationConfirm*", "/expiredAccount*", "/registration*", + "/badUser*", "/user/resendRegistrationToken*" ,"/forgetPassword*", "/user/resetPassword*", "/user/changePassword*", "/emailError*", "/resources/**","/old/user/registration*","/successRegister*").permitAll() .antMatchers("/invalidSession*").anonymous() .anyRequest().authenticated() diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/EmailExistsException.java b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/EmailExistsException.java index 952931bcff..554dfe7cbc 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/EmailExistsException.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/EmailExistsException.java @@ -3,7 +3,8 @@ package org.baeldung.validation; @SuppressWarnings("serial") public class EmailExistsException extends Throwable { - public EmailExistsException(String message) { + public EmailExistsException(final String message) { super(message); } + } diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/EmailValidator.java b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/EmailValidator.java index bd69c7d550..ee2801eba0 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/EmailValidator.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/EmailValidator.java @@ -12,15 +12,15 @@ public class EmailValidator implements ConstraintValidator { private static final String EMAIL_PATTERN = "^[_A-Za-z0-9-\\+]+(\\.[_A-Za-z0-9-]+)*@" + "[A-Za-z0-9-]+(\\.[A-Za-z0-9]+)*(\\.[A-Za-z]{2,})$"; @Override - public void initialize(ValidEmail constraintAnnotation) { + public void initialize(final ValidEmail constraintAnnotation) { } @Override - public boolean isValid(String username, ConstraintValidatorContext context) { + public boolean isValid(final String username, final ConstraintValidatorContext context) { return (validateEmail(username)); } - private boolean validateEmail(String email) { + private boolean validateEmail(final String email) { pattern = Pattern.compile(EMAIL_PATTERN); matcher = pattern.matcher(email); return matcher.matches(); diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/PasswordMatches.java b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/PasswordMatches.java index 6a9b906b36..1e3193b7b5 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/PasswordMatches.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/PasswordMatches.java @@ -1,14 +1,15 @@ package org.baeldung.validation; -import javax.validation.Constraint; -import javax.validation.Payload; +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import javax.validation.Constraint; +import javax.validation.Payload; @Target({ TYPE, ANNOTATION_TYPE }) @Retention(RUNTIME) @@ -21,4 +22,5 @@ public @interface PasswordMatches { Class[]groups() default {}; Class[]payload() default {}; + } diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/PasswordMatchesValidator.java b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/PasswordMatchesValidator.java index e8ec952fa8..a103b91e90 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/PasswordMatchesValidator.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/PasswordMatchesValidator.java @@ -8,12 +8,14 @@ import org.baeldung.persistence.service.UserDto; public class PasswordMatchesValidator implements ConstraintValidator { @Override - public void initialize(PasswordMatches constraintAnnotation) { + public void initialize(final PasswordMatches constraintAnnotation) { + // } @Override - public boolean isValid(Object obj, ConstraintValidatorContext context) { - UserDto user = (UserDto) obj; + public boolean isValid(final Object obj, final ConstraintValidatorContext context) { + final UserDto user = (UserDto) obj; return user.getPassword().equals(user.getMatchingPassword()); } + } diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/UserValidator.java b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/UserValidator.java index cfd3a78f81..76348bee7e 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/UserValidator.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/UserValidator.java @@ -8,12 +8,12 @@ import org.springframework.validation.Validator; public class UserValidator implements Validator { @Override - public boolean supports(Class clazz) { + public boolean supports(final Class clazz) { return UserDto.class.isAssignableFrom(clazz); } @Override - public void validate(Object obj, Errors errors) { + public void validate(final Object obj, final Errors errors) { ValidationUtils.rejectIfEmptyOrWhitespace(errors, "firstName", "message.firstName", "Firstname is required."); ValidationUtils.rejectIfEmptyOrWhitespace(errors, "lastName", "message.lastName", "LastName is required."); ValidationUtils.rejectIfEmptyOrWhitespace(errors, "password", "message.password", "LastName is required."); diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidEmail.java b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidEmail.java index 1d5795ce16..b5dc4f0f46 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidEmail.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidEmail.java @@ -1,14 +1,16 @@ package org.baeldung.validation; -import javax.validation.Constraint; -import javax.validation.Payload; +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import javax.validation.Constraint; +import javax.validation.Payload; @Target({ TYPE, FIELD, ANNOTATION_TYPE }) @Retention(RUNTIME) diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/OldRegistrationController.java b/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/OldRegistrationController.java index c4471f2642..dc14ad70a1 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/OldRegistrationController.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/OldRegistrationController.java @@ -61,7 +61,7 @@ public class OldRegistrationController { private Environment env; public OldRegistrationController() { - + super(); } // API diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java b/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java index f3520d052f..ca13d7f21e 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java @@ -61,7 +61,7 @@ public class RegistrationController { private Environment env; public RegistrationController() { - + super(); } // Registration diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/web/util/GenericResponse.java b/spring-security-login-and-registration/src/main/java/org/baeldung/web/util/GenericResponse.java index 384bb51589..076c481580 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/web/util/GenericResponse.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/web/util/GenericResponse.java @@ -12,12 +12,12 @@ public class GenericResponse { private String message; private String error; - public GenericResponse(String message) { + public GenericResponse(final String message) { super(); this.message = message; } - public GenericResponse(String message, String error) { + public GenericResponse(final String message, final String error) { super(); this.message = message; this.error = error; @@ -39,7 +39,7 @@ public class GenericResponse { return message; } - public void setMessage(String message) { + public void setMessage(final String message) { this.message = message; } @@ -47,7 +47,7 @@ public class GenericResponse { return error; } - public void setError(String error) { + public void setError(final String error) { this.error = error; } diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/mvc-servlet.xml b/spring-security-login-and-registration/src/main/webapp/WEB-INF/mvc-servlet.xml index 7862ca24c0..fe527bd4e8 100644 --- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/mvc-servlet.xml +++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/mvc-servlet.xml @@ -1,5 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd" +> \ No newline at end of file