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=8c5806eade70562b9c6f2d51c82dc1cc3e18fdb1;hpb=2c5ca045a19a247f240c13fc1ffff8df577b4c46;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 8c5806ea..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,13 +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 java.util.stream.Collectors;
 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;
@@ -59,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
@@ -66,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);
        }
 
@@ -84,25 +85,28 @@ public class FnUserService implements UserDetailsService {
               return Optional.of(fnUserDao.getOne(id));
        }
 
-       List<FnUser> getUserWithOrgUserId(final String orgUserIdValue){
+       public List<FnUser> getUserWithOrgUserId(final String orgUserIdValue) {
               return fnUserDao.getUserWithOrgUserId(orgUserIdValue).orElse(new ArrayList<>());
        }
 
-       List<FnUser> getUsersByOrgIds(final List<String> orgIds){
-              String ids = "(" + orgIds.stream().map(s -> "'" + s + "'").collect(Collectors.joining()) + ")";
+       List<FnUser> getUsersByOrgIds(final List<String> orgIds) {
               return fnUserDao.getUsersByOrgIds(orgIds).orElse(new ArrayList<>());
        }
 
 
-       List<FnUser> getActiveUsers(){
+       List<FnUser> getActiveUsers() {
               return fnUserDao.getActiveUsers().orElse(new ArrayList<>());
        }
 
-       public void deleteUser(final FnUser fnUser){
+       public void deleteUser(final FnUser fnUser) {
               fnUserDao.delete(fnUser);
        }
 
        public boolean existById(final Long userId) {
               return fnUserDao.existsById(userId);
        }
-}
+
+       public List<FnUser> findAll() {
+              return fnUserDao.findAll();
+       }
+       }
\ No newline at end of file