code cleanup

1 files changed, 5 insertions, 8 deletions

diff --git a/src/main/java/com/blog/web/security/CustomUserDetailsService.java b/src/main/java/com/blog/web/security/CustomUserDetailsService.java
index f221c9e..ee3e950 100644
--- a/src/main/java/com/blog/web/security/CustomUserDetailsService.java
+++ b/src/main/java/com/blog/web/security/CustomUserDetailsService.java
@@ -2,8 +2,6 @@ package com.blog.web.security;
 
 import com.blog.web.models.UserEntity;
 import com.blog.web.repository.UserRepository;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
@@ -13,7 +11,7 @@ import java.util.stream.Collectors;
 
 @Service
 public class CustomUserDetailsService implements UserDetailsService {
-    private UserRepository userRepository;
+    private final UserRepository userRepository;
 
     public CustomUserDetailsService(UserRepository userRepository) {
         this.userRepository = userRepository;
@@ -21,12 +19,11 @@ public class CustomUserDetailsService implements UserDetailsService {
 
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-        UserEntity userEntity = userRepository.findFirstByUsername(username);
-        if(userEntity != null) {
+        UserEntity userEntity = userRepository.findFirstByUsername(username).orElse(new UserEntity());
+        if (userEntity.getUsername() != null) {
             return userEntity.toSecurityUser();
-        }
-        else {
-            throw new UsernameNotFoundException("Invalid username or password");
+        } else {
+            throw new UsernameNotFoundException("Invalid username");
         }
     }
 }