X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=portal-BE%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportal%2Fservice%2Ffn%2FFnUserService.java;h=01da50deb7842b749e9f8d9111e2d3d1e5d69bef;hb=refs%2Fchanges%2F01%2F98501%2F2;hp=0565fc5d2440f5070988a56eb3eff73685269969;hpb=009040bc056dee5e26e43244422e8e0b9c47144a;p=portal.git diff --git a/portal-BE/src/main/java/org/onap/portal/service/fn/FnUserService.java b/portal-BE/src/main/java/org/onap/portal/service/fn/FnUserService.java index 0565fc5d..01da50de 100644 --- a/portal-BE/src/main/java/org/onap/portal/service/fn/FnUserService.java +++ b/portal-BE/src/main/java/org/onap/portal/service/fn/FnUserService.java @@ -40,12 +40,12 @@ package org.onap.portal.service.fn; -import java.security.Principal; import java.util.ArrayList; import java.util.List; import java.util.Optional; import org.onap.portal.dao.fn.FnUserDao; 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; @@ -58,6 +58,8 @@ import org.springframework.transaction.annotation.Transactional; @Transactional public class FnUserService implements UserDetailsService { + private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(FnUserService.class); + private FnUserDao fnUserDao; @Autowired @@ -65,7 +67,7 @@ public class FnUserService implements UserDetailsService { this.fnUserDao = fnUserDao; } - public FnUser saveFnUser(final Principal principal, final FnUser fnUser) { + public FnUser saveFnUser(final FnUser fnUser) { return fnUserDao.save(fnUser); } @@ -83,20 +85,20 @@ public class FnUserService implements UserDetailsService { return Optional.of(fnUserDao.getOne(id)); } - List getUserWithOrgUserId(final String orgUserIdValue){ + public List getUserWithOrgUserId(final String orgUserIdValue) { return fnUserDao.getUserWithOrgUserId(orgUserIdValue).orElse(new ArrayList<>()); } - List getUsersByOrgIds(final List orgIds){ + List getUsersByOrgIds(final List orgIds) { return fnUserDao.getUsersByOrgIds(orgIds).orElse(new ArrayList<>()); } - List getActiveUsers(){ + List getActiveUsers() { return fnUserDao.getActiveUsers().orElse(new ArrayList<>()); } - public void deleteUser(final FnUser fnUser){ + public void deleteUser(final FnUser fnUser) { fnUserDao.delete(fnUser); } @@ -104,7 +106,7 @@ public class FnUserService implements UserDetailsService { return fnUserDao.existsById(userId); } - public List findAll(){ + public List findAll() { return fnUserDao.findAll(); } -} + } \ No newline at end of file