URL PATH of Actions - Controller Methods Refactoring

Author: thomaswoehlke

etc/serialversions/getserialversionid.cmd

@@ -21,7 +21,7 @@ serialver org.woehlke.simpleworklist.taskstate.TaskState >> ..\..\etc\serialvers
 serialver org.woehlke.simpleworklist.task.TaskTime >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecoveryStatus >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.register.UserRegistrationStatus >> ..\..\etc\serialversions.txt
-serialver org.woehlke.simpleworklist.user.UserRole >> ..\..\etc\serialversions.txt
+serialver org.woehlke.simpleworklist.user.account.UserRole >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.common.AuditModel >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.context.Context  >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.project.Project  >> ..\..\etc\serialversions.txt
@@ -34,7 +34,7 @@ serialver org.woehlke.simpleworklist.breadcrumb.BreadcrumbItem  >> ..\..\etc\ser
 serialver org.woehlke.simpleworklist.breadcrumb.Breadcrumb  >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.login.LoginForm >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.context.NewContextForm >> ..\..\etc\serialversions.txt
-serialver org.woehlke.simpleworklist.user.messages.NewUser2UserMessage >> ..\..\etc\serialversions.txt
+serialver org.woehlke.simpleworklist.user.messages.User2UserMessageFormBean >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.search.SearchResult >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.account.UserAccountForm  >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.context.UserChangeDefaultContextForm >> ..\..\etc\serialversions.txt

etc/serialversions/getserialversionid.sh

@@ -33,7 +33,7 @@ serialver org.woehlke.simpleworklist.taskstate.TaskState >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.task.TaskTime >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecoveryStatus >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.user.register.UserRegistrationStatus >> $SERIALVERSIONS_FILE
-serialver org.woehlke.simpleworklist.user.UserRole >> $SERIALVERSIONS_FILE
+serialver org.woehlke.simpleworklist.user.account.UserRole >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.common.AuditModel >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.context.Context  >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.project.Project  >> $SERIALVERSIONS_FILE
@@ -46,7 +46,7 @@ serialver org.woehlke.simpleworklist.breadcrumb.BreadcrumbItem  >> $SERIALVERSIO
 serialver org.woehlke.simpleworklist.breadcrumb.Breadcrumb  >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.user.login.LoginForm >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.context.NewContextForm >> $SERIALVERSIONS_FILE
-serialver org.woehlke.simpleworklist.user.messages.NewUser2UserMessage >> $SERIALVERSIONS_FILE
+serialver org.woehlke.simpleworklist.user.messages.User2UserMessageFormBean >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.search.SearchResult >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.user.account.UserAccountForm  >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.context.UserChangeDefaultContextForm >> $SERIALVERSIONS_FILE

etc/serialversions/serialversions.txt

@@ -4,7 +4,7 @@ org.woehlke.simpleworklist.taskstate.TaskState:    private static final long ser
 org.woehlke.simpleworklist.task.TaskTime:    private static final long serialVersionUID = 0L;
 org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecoveryStatus:    private static final long serialVersionUID = 0L;
 org.woehlke.simpleworklist.user.register.UserRegistrationStatus:    private static final long serialVersionUID = 0L;
-org.woehlke.simpleworklist.user.UserRole:    private static final long serialVersionUID = 0L;
+org.woehlke.simpleworklist.user.account.UserRole:    private static final long serialVersionUID = 0L;
 org.woehlke.simpleworklist.common.AuditModel:    private static final long serialVersionUID = 4399373914714726911L;
 org.woehlke.simpleworklist.context.Context:    private static final long serialVersionUID = -5035732370606951871L;
 org.woehlke.simpleworklist.project.Project:    private static final long serialVersionUID = 4566653175832872422L;
@@ -17,7 +17,7 @@ org.woehlke.simpleworklist.breadcrumb.BreadcrumbItem:    private static final lo
 org.woehlke.simpleworklist.breadcrumb.Breadcrumb:    private static final long serialVersionUID = 7932703111140692689L;
 org.woehlke.simpleworklist.user.login.LoginForm:    private static final long serialVersionUID = 5936886560348238355L;
 org.woehlke.simpleworklist.context.NewContextForm:    private static final long serialVersionUID = -937143305653156981L;
-org.woehlke.simpleworklist.user.messages.NewUser2UserMessage:    private static final long serialVersionUID = 1576610181966480168L;
+org.woehlke.simpleworklist.user.messages.User2UserMessageFormBean:    private static final long serialVersionUID = 1576610181966480168L;
 org.woehlke.simpleworklist.search.SearchResult:    private static final long serialVersionUID = 1682809351146047764L;
 org.woehlke.simpleworklist.user.account.UserAccountForm:    private static final long serialVersionUID = 9180383385243540190L;
 org.woehlke.simpleworklist.context.UserChangeDefaultContextForm:    private static final long serialVersionUID = -8592295563275083292L;

src/main/java/org/woehlke/simpleworklist/taskstate/TaskStateServiceImpl.java

@@ -1,5 +1,6 @@
 package org.woehlke.simpleworklist.taskstate;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -14,6 +15,7 @@
 /**
  * Created by tw on 21.02.16.
  */
+@Slf4j
 @Service
 @Transactional(propagation = Propagation.REQUIRED, readOnly = true)
 public class TaskStateServiceImpl implements TaskStateService {

src/main/java/org/woehlke/simpleworklist/user/UserDetailsBean.java

@@ -1,16 +1,20 @@
 package org.woehlke.simpleworklist.user;
 
-import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
+import lombok.*;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 
-public class UserDetailsBean implements UserDetails, Serializable {
+
+@Getter
+@EqualsAndHashCode
+@ToString(exclude = {"password"})
+public class UserDetailsBean implements UserDetails {
 
     private static final long serialVersionUID = 1L;
 
@@ -42,68 +46,4 @@ public Collection<? extends GrantedAuthority> getAuthorities() {
         authorities.add(new SimpleGrantedAuthority("ROLE_USER"));
         return authorities;
     }
-
-    @Override
-    public String getPassword() {
-        return password;
-    }
-
-    @Override
-    public String getUsername() {
-        return username;
-    }
-
-    @Override
-    public boolean isAccountNonExpired() {
-        return accountNonExpired;
-    }
-
-    @Override
-    public boolean isAccountNonLocked() {
-        return accountNonLocked;
-    }
-
-    @Override
-    public boolean isCredentialsNonExpired() {
-        return credentialsNonExpired;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return enabled;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result
-                + ((password == null) ? 0 : password.hashCode());
-        result = prime * result
-                + ((username == null) ? 0 : username.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        UserDetailsBean other = (UserDetailsBean) obj;
-        if (password == null) {
-            if (other.password != null)
-                return false;
-        } else if (!password.equals(other.password))
-            return false;
-        if (username == null) {
-            if (other.username != null)
-                return false;
-        } else if (!username.equals(other.username))
-            return false;
-        return true;
-    }
-
 }

src/main/java/org/woehlke/simpleworklist/user/UserSessionBean.java

@@ -1,24 +1,28 @@
 package org.woehlke.simpleworklist.user;
 
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
 import org.woehlke.simpleworklist.taskstate.TaskState;
 
 import java.io.Serializable;
-import java.util.Objects;
 
 /**
  * Created by tw on 13.03.16.
  */
+@Getter
+@Setter
+@EqualsAndHashCode
+@ToString
 public class UserSessionBean implements Serializable {
 
     private static final long serialVersionUID = -6649686058228455825L;
 
     private Long contextId;
-
-    private String lastSearchterm;
-
     private TaskState lastTaskState;
-
     private Long lastProjectId;
+    private String lastSearchterm;
 
     public UserSessionBean(){
         lastSearchterm="";
@@ -34,61 +38,4 @@ public UserSessionBean(long contextId){
         this.contextId = contextId;
     }
 
-    public Long getContextId() {
-        return contextId;
-    }
-
-    public void setContextId(Long contextId) {
-        this.contextId = contextId;
-    }
-
-    public String getLastSearchterm() {
-        return lastSearchterm;
-    }
-
-    public void setLastSearchterm(String lastSearchterm) {
-        this.lastSearchterm = lastSearchterm;
-    }
-
-    public TaskState getLastTaskState() {
-        return lastTaskState;
-    }
-
-    public void setLastTaskState(TaskState lastTaskState) {
-        this.lastTaskState = lastTaskState;
-    }
-
-    public Long getLastProjectId() {
-        return lastProjectId;
-    }
-
-    public void setLastProjectId(Long lastProjectId) {
-        this.lastProjectId = lastProjectId;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof UserSessionBean)) return false;
-        UserSessionBean that = (UserSessionBean) o;
-        return getContextId().equals(that.getContextId()) &&
-                getLastSearchterm().equals(that.getLastSearchterm()) &&
-                getLastTaskState() == that.getLastTaskState() &&
-                getLastProjectId().equals(that.getLastProjectId());
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(getContextId(), getLastSearchterm(), getLastTaskState(), getLastProjectId());
-    }
-
-    @Override
-    public String toString() {
-        return "UserSessionBean{" +
-                "contextId=" + contextId +
-                ", lastSearchterm='" + lastSearchterm + '\'' +
-                ", lastTaskState=" + lastTaskState +
-                ", lastProjectId=" + lastProjectId +
-                '}';
-    }
 }

src/main/java/org/woehlke/simpleworklist/user/account/UserAccountAccessServiceImpl.java

@@ -1,7 +1,6 @@
 package org.woehlke.simpleworklist.user.account;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -14,31 +13,38 @@
 import org.woehlke.simpleworklist.user.login.LoginForm;
 import org.woehlke.simpleworklist.user.selfservice.UserChangePasswordForm;
 
+@Slf4j
 @Service
 @Transactional(propagation = Propagation.REQUIRED, readOnly = true)
 public class UserAccountAccessServiceImpl implements UserAccountAccessService {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(UserAccountAccessServiceImpl.class);
-
     private final UserAccountRepository userAccountRepository;
-
     private final AuthenticationManager authenticationManager;
-
     private final PasswordEncoder encoder;
 
     @Autowired
-    public UserAccountAccessServiceImpl(UserAccountRepository userAccountRepository, AuthenticationManager authenticationManager) {
+    public UserAccountAccessServiceImpl(
+        UserAccountRepository userAccountRepository,
+        AuthenticationManager authenticationManager
+    ) {
         this.userAccountRepository = userAccountRepository;
         this.authenticationManager = authenticationManager;
+        //TODO:
         int strength = 10;
         this.encoder = new BCryptPasswordEncoder(strength);
     }
 
 
     @Override
     @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
-    public void changeUsersPassword(UserChangePasswordForm userAccountFormBean, UserAccount user) {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(user.getUserEmail(), userAccountFormBean.getOldUserPassword());
+    public void changeUsersPassword(
+        UserChangePasswordForm userAccountFormBean,
+        UserAccount user
+    ) {
+        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+            user.getUserEmail(),
+            userAccountFormBean.getOldUserPassword()
+        );
         Authentication authenticationResult = authenticationManager.authenticate(token);
         if(authenticationResult.isAuthenticated()){
             UserAccount ua = userAccountRepository.findByUserEmail(user.getUserEmail());
@@ -49,17 +55,26 @@ public void changeUsersPassword(UserChangePasswordForm userAccountFormBean, User
     }
 
     @Override
-    public boolean confirmUserByLoginAndPassword(String userEmail, String oldUserPassword) {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(userEmail, oldUserPassword);
+    public boolean confirmUserByLoginAndPassword(
+        String userEmail,
+        String oldUserPassword
+    ) {
+        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+            userEmail,
+            oldUserPassword
+        );
         Authentication authenticationResult = authenticationManager.authenticate(token);
         String oldPwEncoded = this.encoder.encode(oldUserPassword);
-        LOGGER.info(userEmail+", "+oldPwEncoded);
+        log.info(userEmail+", "+oldPwEncoded);
         return authenticationResult.isAuthenticated();
     }
 
     @Override
     public boolean authorize(LoginForm loginForm) {
-        UserAccount account = userAccountRepository.findByUserEmailAndUserPassword(loginForm.getUserEmail(), loginForm.getUserPassword());
+        UserAccount account = userAccountRepository.findByUserEmailAndUserPassword(
+            loginForm.getUserEmail(),
+            loginForm.getUserPassword()
+        );
         return account != null;
     }
 }