diff options
author | Vitaly Takmazov | 2018-08-29 15:10:51 +0300 |
---|---|---|
committer | Vitaly Takmazov | 2018-08-29 15:10:51 +0300 |
commit | 61a28570ca25ae789cca09736ddc427e172ac213 (patch) | |
tree | b1f490597d5f2999121310ae479b38e33eb5fb71 /juick-common/src/main/java/com/juick/service | |
parent | 22514aa83e418770c8f60ea1b5ce943daa2383ef (diff) |
getUserByName is non nullable
Diffstat (limited to 'juick-common/src/main/java/com/juick/service')
-rw-r--r-- | juick-common/src/main/java/com/juick/service/UserService.java | 2 | ||||
-rw-r--r-- | juick-common/src/main/java/com/juick/service/security/JuickUserDetailsService.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/juick-common/src/main/java/com/juick/service/UserService.java b/juick-common/src/main/java/com/juick/service/UserService.java index ef49a8ab..cfeaaa51 100644 --- a/juick-common/src/main/java/com/juick/service/UserService.java +++ b/juick-common/src/main/java/com/juick/service/UserService.java @@ -44,7 +44,7 @@ public interface UserService { Optional<User> getUserByUID(int uid); - User getUserByName(String username); + @Nonnull User getUserByName(String username); User getUserByEmail(String email); diff --git a/juick-common/src/main/java/com/juick/service/security/JuickUserDetailsService.java b/juick-common/src/main/java/com/juick/service/security/JuickUserDetailsService.java index adb0ab44..59425fab 100644 --- a/juick-common/src/main/java/com/juick/service/security/JuickUserDetailsService.java +++ b/juick-common/src/main/java/com/juick/service/security/JuickUserDetailsService.java @@ -43,7 +43,7 @@ public class JuickUserDetailsService implements UserDetailsService { com.juick.User user = userService.getUserByName(username); - if (user != null) { + if (!user.isAnonymous()) { user.setAuthHash(userService.getHashByUID(user.getUid())); return new JuickUser(user); } |