X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=portal-BE%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportal%2Fservice%2Frole%2FFnRoleDao.java;fp=portal-BE%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportal%2Fservice%2Frole%2FFnRoleDao.java;h=057f8731b2868593d91dd3caf3789015af07d7b8;hb=ca3d9f4b725774763f12488940033a294b778244;hp=e12391d8ab3d18f202a349b7f6db9e2180b9f794;hpb=4c6f6a443cb2e6effa995e77d56689c1c2dab4ad;p=portal.git

diff --git a/portal-BE/src/main/java/org/onap/portal/service/role/FnRoleDao.java b/portal-BE/src/main/java/org/onap/portal/service/role/FnRoleDao.java
index e12391d8..057f8731 100644
--- a/portal-BE/src/main/java/org/onap/portal/service/role/FnRoleDao.java
+++ b/portal-BE/src/main/java/org/onap/portal/service/role/FnRoleDao.java
@@ -41,6 +41,8 @@
 package org.onap.portal.service.role;
 
 import java.util.List;
+import java.util.Optional;
+import javax.swing.text.html.Option;
 import org.onap.portal.domain.db.fn.FnRole;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
@@ -52,31 +54,41 @@ import org.springframework.transaction.annotation.Transactional;
 @Transactional
 interface FnRoleDao extends JpaRepository<FnRole, Long> {
 
-  @Query
-  List<FnRole> retrieveAppRoleByAppRoleIdAndByAppId(final @Param("appId") Long appId,
-      final @Param("appRoleId") Long appRoleId);
+    @Query
+    List<FnRole> retrieveAppRoleByAppRoleIdAndByAppId(final @Param("appId") Long appId,
+        final @Param("appRoleId") Long appRoleId);
 
-  @Query
-  List<FnRole> getUserRoleOnUserIdAndAppId(final @Param("userId") Long userId, final @Param("appId") Long appId);
+    @Query
+    List<FnRole> getUserRoleOnUserIdAndAppId(final @Param("userId") Long userId, final @Param("appId") Long appId);
 
-  @Query
-  List<FnRole> retrieveAppRoleByRoleIdWhereAppIdIsNull(final @Param("roleId") Long roleId);
+    @Query
+    List<FnRole> retrieveAppRoleByRoleIdWhereAppIdIsNull(final @Param("roleId") Long roleId);
 
-  @Query
-  List<FnRole> retrieveAppRolesWhereAppIdIsNull();
+    @Query
+    List<FnRole> retrieveAppRolesWhereAppIdIsNull();
 
-  @Query
-  List<FnRole> retrieveAppRolesByAppId(final @Param("appId") Long id);
+    @Query
+    List<FnRole> retrieveAppRolesByAppId(final @Param("appId") Long id);
 
-  @Query
-  List<FnRole> retrieveActiveRolesOfApplication(final @Param("appId") Long appId);
+    @Query
+    List<FnRole> retrieveActiveRolesOfApplication(final @Param("appId") Long appId);
 
-  @Query
-  List<FnRole> retrieveAppRolesByRoleNameAndByAppId(final @Param("roleName") String roleName, final @Param("appId") Long appId);
+    @Query
+    List<FnRole> retrieveAppRolesByRoleNameAndByAppId(final @Param("roleName") String roleName,
+        final @Param("appId") Long appId);
 
-  @Query
-  List<FnRole> getGlobalRolesOfPortal();
+    @Query
+    List<FnRole> getGlobalRolesOfPortal();
 
-  @Query
-  FnRole getSysAdminRoleId();
+    @Query
+    FnRole getSysAdminRoleId();
+
+    @Query
+    Optional<List<FnRole>> retrieveAppRolesByRoleNameAndWhereAppIdIsNull(final @Param("roleName") String roleName);
+
+    @Query
+    Optional<List<FnRole>> userAppGlobalRoles(final @Param("userId") long userId, final @Param("appId") long appId);
+
+    @Query
+    Optional<List<FnRole>> retrieveActiveRolesWhereAppIdIsNull();
 }