work

Author: thomaswoehlke

src/main/java/org/woehlke/java/simpleworklist/domain/db/user/account/UserAccountServiceImpl.java

@@ -20,8 +20,8 @@
 import org.woehlke.java.simpleworklist.domain.db.data.context.ContextRepository;
 
 @Slf4j
-@Service("userAccountService")
-//@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
+@Service
+@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
 public class UserAccountServiceImpl implements UserAccountService {
 
     private final UserAccountRepository userAccountRepository;
@@ -30,7 +30,11 @@ public class UserAccountServiceImpl implements UserAccountService {
     private final PasswordEncoder encoder;
 
     @Autowired
-    public UserAccountServiceImpl(UserAccountRepository userAccountRepository, ChatMessageRepository userMessageRepository, ContextRepository contextRepository) {
+    public UserAccountServiceImpl(
+        UserAccountRepository userAccountRepository,
+        ChatMessageRepository userMessageRepository,
+        ContextRepository contextRepository
+    ) {
         this.userAccountRepository = userAccountRepository;
         this.userMessageRepository = userMessageRepository;
         this.contextRepository = contextRepository;
@@ -64,7 +68,7 @@ public void createUser(UserAccountForm userAccountForm) {
     }
 
     @Override
-    //@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
+    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
     public UserAccount saveAndFlush(UserAccount u) {
         return userAccountRepository.saveAndFlush(u);
     }
@@ -80,7 +84,7 @@ public Page<UserAccount> findAll(Pageable request) {
     }
 
     @Override
-    //@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
+    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
     public void changeUsersPassword(UserAccountForm userAccount) {
         UserAccount ua = userAccountRepository.findByUserEmail(userAccount.getUserEmail());
         if(ua != null) {
@@ -103,7 +107,8 @@ public Map<Long, Integer> getNewIncomingMessagesForEachOtherUser(UserAccount rec
             if(receiver.getId().longValue() == sender.getId().longValue()){
                 newIncomingMessagesForEachOtherUser.put(sender.getId(),0);
             } else {
-                List<UserAccountChatMessage> userAccountChatMessages = userMessageRepository.findBySenderAndReceiverAndReadByReceiver(sender,receiver,false);
+                List<UserAccountChatMessage> userAccountChatMessages =
+                    userMessageRepository.findBySenderAndReceiverAndReadByReceiver(sender,receiver,false);
                 newIncomingMessagesForEachOtherUser.put(sender.getId(), userAccountChatMessages.size());
             }
         }

src/main/java/org/woehlke/java/simpleworklist/domain/db/user/accountpassword/UserAccountPasswordServiceImpl.java

@@ -2,7 +2,6 @@
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
@@ -23,25 +22,24 @@ public class UserAccountPasswordServiceImpl implements UserAccountPasswordServic
 
     private final UserAccountRepository userAccountRepository;
     private final PasswordEncoder encoder;
-    //private final AuthenticationManager authenticationManager;
     private final AuthenticationProvider authenticationProvider;
 
     @Autowired
     public UserAccountPasswordServiceImpl(
         UserAccountRepository userAccountRepository,
-        //AuthenticationManager authenticationManager,
         AuthenticationProvider authenticationProvider
     ) {
         this.userAccountRepository = userAccountRepository;
         this.authenticationProvider = authenticationProvider;
         int strength = 10;
         this.encoder = new BCryptPasswordEncoder(strength);
-        //this.authenticationManager = authenticationManager;
     }
 
     @Override
     public UserDetails updatePassword(UserDetails user, String newPassword) {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(user.getUsername(), user.getPassword());
+        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+            user.getUsername(), user.getPassword()
+        );
         Authentication authenticationResult = authenticationProvider.authenticate(token);
         if (authenticationResult.isAuthenticated()) {
             UserAccount ua = userAccountRepository.findByUserEmail(user.getUsername());