update Approvals from Testing

[aaf/authz.git] / auth / auth-service / src / main / java / org / onap / aaf / auth / service / AuthzService.java

diff --git a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/AuthzService.java b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/AuthzService.java
index 178e1aa..80d317f 100644 (file)
--- a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/AuthzService.java
+++ b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/AuthzService.java
@@ -447,7 +447,7 @@ public interface AuthzService<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DELGS,CERT
      * @param from
      * @return
      */
-    Result<Void> changeUserCred(AuthzTrans trans, REQUEST from);
+    Result<Void> resetUserCred(AuthzTrans trans, REQUEST from);
 
     /**
      * 
@@ -566,21 +566,10 @@ public interface AuthzService<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DELGS,CERT
      */
     public Result<USERROLES> getUserRolesByUser(AuthzTrans trans, String user);
 
-    /**
-     * 
-     * @param trans
-     * @param from
-     * @return
-     */
-    public Result<Void> resetRolesForUser(AuthzTrans trans, REQUEST from);
-    
-    /**
-     * 
-     * @param trans
-     * @param from
-     * @return
+    /*
+     * Note: Removed "resetRolesForUsers" because it was too dangerous, and
+     *       removed "resetUsersForRoles" because it was being misused.
      */
-    public Result<Void> resetUsersForRole(AuthzTrans trans, REQUEST from);
     
     /**
      * 
@@ -647,6 +636,16 @@ public interface AuthzService<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DELGS,CERT
      */
     public Result<HISTORY> getHistoryByNS(AuthzTrans trans, String subj, int[] yyyymm, int sort);
 
+    /**
+     * 
+     * @param trans
+     * @param target
+     * @param yyyymm
+     * @param sort
+     * @return
+     */
+       public Result<HISTORY> getHistoryBySubject(AuthzTrans trans, String subject, String target, int[] yyyymm, int sort);
+
 /***********************************
  * DELEGATE 
  ***********************************/
@@ -764,7 +763,4 @@ public interface AuthzService<NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DELGS,CERT
      */
     public void dbReset(AuthzTrans trans);
 
-
-
-
 }