Merge "Dao object moved from dao packege to package by component in service folder"

[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/fn/FnUserService.java b/portal-BE/src/main/java/org/onap/portal/service/user/FnUserService.java
similarity index 89%
rename from portal-BE/src/main/java/org/onap/portal/service/fn/FnUserService.java
rename to portal-BE/src/main/java/org/onap/portal/service/user/FnUserService.java
index 16d32a6..975bd21 100644 (file)
--- a/portal-BE/src/main/java/org/onap/portal/service/fn/FnUserService.java
+++ b/portal-BE/src/main/java/org/onap/portal/service/user/FnUserService.java
@@ -38,12 +38,12 @@
  *
  */
 
-package org.onap.portal.service.fn;
+package org.onap.portal.service.user;
 
 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;
@@ -89,12 +89,12 @@ public class FnUserService implements UserDetailsService {
               return fnUserDao.getUserWithOrgUserId(orgUserIdValue).orElse(new ArrayList<>());
        }
 
-       List<FnUser> getUsersByOrgIds(final List<String> orgIds) {
+       public List<FnUser> getUsersByOrgIds(final List<String> orgIds) {
               return fnUserDao.getUsersByOrgIds(orgIds).orElse(new ArrayList<>());
        }
 
 
-       List<FnUser> getActiveUsers() {
+       public List<FnUser> getActiveUsers() {
               return fnUserDao.getActiveUsers().orElse(new ArrayList<>());
        }
 
@@ -109,4 +109,16 @@ public class FnUserService implements UserDetailsService {
        public List<FnUser> findAll() {
               return fnUserDao.findAll();
        }
-       }
\ No newline at end of file
+
+       public List<FnUser> saveAll(List<FnUser> fnUsers) {
+              return fnUserDao.saveAll(fnUsers);
+       }
+
+       public FnUser save(FnUser user) {
+              return fnUserDao.save(user);
+       }
+
+       public void delete(FnUser user) {
+              fnUserDao.delete(user);
+       }
+}
\ No newline at end of file