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=855e827d6c693a9d39c9e0384baeb2e56c3668b7;hb=9e4e70f058ee09ae2933e4438f75fea5289f147a;hp=aedac493fa92989a94c919aae43b7f19b83929f2;hpb=a738f3360784e22b7631fb241668aba552e1877e;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 aedac493..855e827d 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
@@ -44,7 +44,6 @@ 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.springframework.beans.factory.annotation.Autowired;
@@ -59,7 +58,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Transactional
 public class FnUserService implements UserDetailsService {
 
-       private final FnUserDao fnUserDao;
+       private FnUserDao fnUserDao;
 
        @Autowired
        public FnUserService(FnUserDao fnUserDao) {
@@ -71,7 +70,7 @@ public class FnUserService implements UserDetailsService {
        }
 
        @Override
-       public FnUser loadUserByUsername(String username) throws UsernameNotFoundException {
+       public FnUser loadUserByUsername(final String username) throws UsernameNotFoundException {
               Optional<FnUser> fnUser = fnUserDao.findByLoginId(username);
               if (fnUser.isPresent()) {
                      return fnUser.get();
@@ -80,36 +79,28 @@ public class FnUserService implements UserDetailsService {
               }
        }
 
-       public Optional<FnUser> getUser(Long id) {
+       public Optional<FnUser> getUser(final Long id) {
               return Optional.of(fnUserDao.getOne(id));
        }
 
        List<FnUser> getUserWithOrgUserId(final String orgUserIdValue){
-              Optional<List<FnUser>> fnUsers =  Optional.of(fnUserDao.findAll()
-                      .stream()
-                      .filter(fnUser -> orgUserIdValue.equals(fnUser.getOrgUserId()))
-                      .collect(Collectors.toList()));
-              return fnUsers.orElse(new ArrayList<>());
+              return fnUserDao.getUserWithOrgUserId(orgUserIdValue).orElse(new ArrayList<>());
        }
 
-       List<FnUser> getUsersByOrgIdsNotificationsResult(List<String> orgIds){
-              String ids = "(" + orgIds.stream().map(s -> "'" + s + "'").collect(Collectors.joining()) + ")";
-              return fnUserDao.getUsersByOrgUserId(ids).orElse(new ArrayList<>());
+       List<FnUser> getUsersByOrgIds(final List<String> orgIds){
+              return fnUserDao.getUsersByOrgIds(orgIds).orElse(new ArrayList<>());
        }
 
-       List<FnUser> getUsersByOrgIdsNotificationsResult(String orgIds){
-              return fnUserDao.getUsersByOrgUserId(orgIds).orElse(new ArrayList<>());
-       }
 
        List<FnUser> getActiveUsers(){
-              return fnUserDao.findAll().stream().filter(fnUser -> "Y".equals(fnUser.getActiveYn())).collect(Collectors.toList());
+              return fnUserDao.getActiveUsers().orElse(new ArrayList<>());
        }
 
-       public void deleteUser(FnUser fnUser){
+       public void deleteUser(final FnUser fnUser){
               fnUserDao.delete(fnUser);
        }
 
-       public boolean existById(Long userId) {
+       public boolean existById(final Long userId) {
               return fnUserDao.existsById(userId);
        }
 }