X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=portal-BE%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportal%2Fservice%2Fuser%2FFnUserService.java;h=23732d69664c82b9181d0300b8642a2bb39a58f8;hb=f7966b9ae53834f9eb664b81ab2d0a3da3f7a9b5;hp=912453c96ef8927bdb8d8ce9ed0a0438aa347b51;hpb=500bd3b761971db9ff11d8583337799c7891185f;p=portal.git 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 912453c9..23732d69 100644 --- 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 @@ -55,7 +55,7 @@ import org.springframework.transaction.annotation.Transactional; @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; @@ -64,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 = fnUserDao.findByLoginId(username); @@ -78,6 +74,10 @@ public class FnUserService implements UserDetailsService { } } + public FnUser saveFnUser(final FnUser fnUser) { + return fnUserDao.save(fnUser); + } + public Optional getUser(final Long id) { return Optional.of(fnUserDao.getOne(id)); } @@ -90,7 +90,6 @@ public class FnUserService implements UserDetailsService { return fnUserDao.getUsersByOrgIds(orgIds).orElse(new ArrayList<>()); } - public List getActiveUsers() { return fnUserDao.getActiveUsers().orElse(new ArrayList<>()); } @@ -107,15 +106,15 @@ public class FnUserService implements UserDetailsService { return fnUserDao.findAll(); } - public List saveAll(List fnUsers) { + public List saveAll(final List 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); } }