From b725458a8ad8465ab41de43c874b448249013c9a Mon Sep 17 00:00:00 2001 From: Rohan Sircar Date: Mon, 20 Jul 2020 22:04:12 +0530 Subject: [PATCH] [backend] Removed obsolete user service method --- .../java/org/ros/chatto/model/ChatUser.java | 17 ++++------------- .../ros/chatto/repository/UserRepository.java | 5 +---- .../chatto/security/MyUserDetailsService.java | 13 ++++++++----- .../org/ros/chatto/service/UserService.java | 2 -- .../org/ros/chatto/service/UserServiceImpl.java | 6 ------ 5 files changed, 13 insertions(+), 30 deletions(-) diff --git a/src/main/java/org/ros/chatto/model/ChatUser.java b/src/main/java/org/ros/chatto/model/ChatUser.java index 6d3ae8f..df30c82 100644 --- a/src/main/java/org/ros/chatto/model/ChatUser.java +++ b/src/main/java/org/ros/chatto/model/ChatUser.java @@ -1,6 +1,6 @@ package org.ros.chatto.model; -import java.util.Date; +import java.time.Instant; import java.util.Set; import javax.persistence.CascadeType; @@ -12,8 +12,6 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.OneToMany; import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; import com.fasterxml.jackson.annotation.JsonBackReference; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -43,9 +41,9 @@ public class ChatUser { @Column(name = "name") private String userName; - String password; - @Temporal(TemporalType.TIMESTAMP) - private Date joinDate; + private String password; + + private Instant joinDate; @ToString.Exclude @EqualsAndHashCode.Exclude @@ -53,11 +51,4 @@ public class ChatUser { CascadeType.MERGE, CascadeType.DETACH, CascadeType.REFRESH }) @JsonBackReference private Set userRoles; - - // @ToString.Exclude - // @EqualsAndHashCode.Exclude - // @OneToMany(mappedBy = "fromUser", cascade = { CascadeType.PERSIST, - // CascadeType.MERGE, CascadeType.DETACH, - // CascadeType.REFRESH }) - // private List chatMessages; } diff --git a/src/main/java/org/ros/chatto/repository/UserRepository.java b/src/main/java/org/ros/chatto/repository/UserRepository.java index 44f1a50..4c33491 100644 --- a/src/main/java/org/ros/chatto/repository/UserRepository.java +++ b/src/main/java/org/ros/chatto/repository/UserRepository.java @@ -10,11 +10,8 @@ import org.springframework.stereotype.Repository; @Repository public interface UserRepository extends JpaRepository { - @Query("select cu from ChatUser cu where cu.userName = ?1") - public Optional findByUserName(String userName); - @Query("select cu from ChatUser cu join fetch cu.userRoles where cu.userName = ?1") - public ChatUser findByUserNameWithRole(String userName); + public Optional findByUserName(String userName); @Query("select cu.userName from ChatUser cu where cu.userName != ?1") public List findAllOtherUserNames(String userName); diff --git a/src/main/java/org/ros/chatto/security/MyUserDetailsService.java b/src/main/java/org/ros/chatto/security/MyUserDetailsService.java index 57cf606..a85f0e5 100644 --- a/src/main/java/org/ros/chatto/security/MyUserDetailsService.java +++ b/src/main/java/org/ros/chatto/security/MyUserDetailsService.java @@ -1,5 +1,6 @@ package org.ros.chatto.security; +import java.util.Optional; import java.util.Set; import org.ros.chatto.model.ChatUser; @@ -26,17 +27,19 @@ public class MyUserDetailsService implements UserDetailsService { @Override public UserDetails loadUserByUsername(final String username) { log.trace("User Details - loading with username: {}", username); - ChatUser user = userService.getUserWithRole(username); + Optional user = userService.getUser(username); - if (user == null) { + if (!user.isPresent()) { log.warn("Request for unknown user {}", username); throw new UsernameNotFoundException(username); } - Set userRoles = user.getUserRoles(); + ChatUser user2 = user.get(); - return User.withUsername(user.getUserName()) - .password(user.getPassword()) + Set userRoles = user2.getUserRoles(); + + return User.withUsername(user2.getUserName()) + .password(user2.getPassword()) .roles(userRoles.stream().map(ur -> ur.getRole().getName()) .toArray(size -> new String[size])) .build(); diff --git a/src/main/java/org/ros/chatto/service/UserService.java b/src/main/java/org/ros/chatto/service/UserService.java index 1f18a85..931aec9 100644 --- a/src/main/java/org/ros/chatto/service/UserService.java +++ b/src/main/java/org/ros/chatto/service/UserService.java @@ -25,8 +25,6 @@ public interface UserService { public List getOtherActiveUsers(String userName); - public ChatUser getUserWithRole(String userName); - public void incrementUserSession(String userName); public UserSession decrementUserSession(String userName); diff --git a/src/main/java/org/ros/chatto/service/UserServiceImpl.java b/src/main/java/org/ros/chatto/service/UserServiceImpl.java index 80ac1e5..99e5737 100644 --- a/src/main/java/org/ros/chatto/service/UserServiceImpl.java +++ b/src/main/java/org/ros/chatto/service/UserServiceImpl.java @@ -139,12 +139,6 @@ public class UserServiceImpl implements UserService { } } - @Override - @Transactional(readOnly = true) - public ChatUser getUserWithRole(final String userName) { - return userRepository.findByUserNameWithRole(userName); - } - @Override public void incrementUserSession(final String userName) { final Optional chatUser = getUser(userName);