PersUserWidgetServiceAOP and tests up

[portal.git] / portal-BE / src / main / java / org / onap / portal / service / user / FnUserService.java

diff --git a/portal-BE/src/main/java/org/onap/portal/service/user/FnUserService.java b/portal-BE/src/main/java/org/onap/portal/service/user/FnUserService.java
index 975bd21..23732d6 100644 (file)
--- a/portal-BE/src/main/java/org/onap/portal/service/user/FnUserService.java
+++ b/portal-BE/src/main/java/org/onap/portal/service/user/FnUserService.java
@@ -43,22 +43,19 @@ package org.onap.portal.service.user;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-
 import org.onap.portal.domain.db.fn.FnUser;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 @Service
-@EnableAspectJAutoProxy
 @Transactional
 public class FnUserService implements UserDetailsService {
 
-       private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(FnUserService.class);
+       private final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(FnUserService.class);
 
        private final FnUserDao fnUserDao;
 
@@ -67,10 +64,6 @@ public class FnUserService implements UserDetailsService {
               this.fnUserDao = fnUserDao;
        }
 
-       public FnUser saveFnUser(final FnUser fnUser) {
-              return fnUserDao.save(fnUser);
-       }
-
        @Override
        public FnUser loadUserByUsername(final String username) throws UsernameNotFoundException {
               Optional<FnUser> fnUser = fnUserDao.findByLoginId(username);
@@ -81,6 +74,10 @@ public class FnUserService implements UserDetailsService {
               }
        }
 
+       public FnUser saveFnUser(final FnUser fnUser) {
+              return fnUserDao.save(fnUser);
+       }
+
        public Optional<FnUser> getUser(final Long id) {
               return Optional.of(fnUserDao.getOne(id));
        }
@@ -93,7 +90,6 @@ public class FnUserService implements UserDetailsService {
               return fnUserDao.getUsersByOrgIds(orgIds).orElse(new ArrayList<>());
        }
 
-
        public List<FnUser> getActiveUsers() {
               return fnUserDao.getActiveUsers().orElse(new ArrayList<>());
        }
@@ -110,15 +106,15 @@ public class FnUserService implements UserDetailsService {
               return fnUserDao.findAll();
        }
 
-       public List<FnUser> saveAll(List<FnUser> fnUsers) {
+       public List<FnUser> saveAll(final List<FnUser> fnUsers) {
               return fnUserDao.saveAll(fnUsers);
        }
 
-       public FnUser save(FnUser user) {
+       public FnUser save(final FnUser user) {
               return fnUserDao.save(user);
        }
 
-       public void delete(FnUser user) {
+       public void delete(final FnUser user) {
               fnUserDao.delete(user);
        }
-}
\ No newline at end of file
+}