Batch work and client

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

diff --git a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/AuthzCassServiceImpl.java b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/AuthzCassServiceImpl.java
index 789a2e6..c9730f5 100644 (file)
--- a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/AuthzCassServiceImpl.java
+++ b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/AuthzCassServiceImpl.java
@@ -33,7 +33,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
@@ -2137,13 +2136,8 @@ public class AuthzCassServiceImpl    <NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
         }
 
         Result<FutureDAO.Data> fd = mapper.future(trans,RoleDAO.TABLE,from,role,false,
-                new Mapper.Memo() {
-                    @Override
-                    public String get() {
-                        return "Delete Role [" + role.fullName() + ']' 
-                                + " and all attached user roles";
-                    }
-                },
+            () -> "Delete Role [" + role.fullName() + ']'
+                    + " and all attached user roles",
             new MayChange() {
                 private Result<NsDAO.Data> nsd;
                 @Override
@@ -2401,6 +2395,7 @@ public class AuthzCassServiceImpl    <NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
                         } catch (Exception e) {
                             trans.error().log(e, "While setting expiration to TempPassword");
                         }
+                        
                         Result<?>udr = ques.credDAO.create(trans, rcred.value);
                         if (udr.isOK()) {
                             return Result.ok();
@@ -2638,8 +2633,6 @@ public class AuthzCassServiceImpl    <NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
                         } else {
                             rcred.value.expires = org.expiration(null,exp).getTime();
                         }
-                        // Copy in other fields 10/21/2016
-                        rcred.value.notes=current.notes;
 
                         udr = ques.credDAO.create(trans, rcred.value);
                         if (udr.isOK()) {
@@ -2670,7 +2663,7 @@ public class AuthzCassServiceImpl    <NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
             String inputOption = cr.getEntry();
             if (inputOption == null) {
                 String message = selectCredFromList(lcd, false);
-                String[] variables = buildVariables(lcd);
+                Object[] variables = buildVariables(lcd);
                 return Result.err(Status.ERR_ChoiceNeeded, message, variables);
             } else {
                 entry = Integer.parseInt(inputOption) - 1;
@@ -2737,9 +2730,9 @@ public class AuthzCassServiceImpl    <NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
             cd.cred = found.cred;
             cd.other = found.other;
             cd.type = found.type;
-            cd.notes = found.notes;
             cd.ns = found.ns;
             cd.expires = org.expiration(null, Expiration.ExtendPassword,days).getTime();
+            cd.tag = found.tag;
             
             cred = ques.credDAO.create(trans, cd);
             if (cred.isOK()) {
@@ -2753,12 +2746,7 @@ public class AuthzCassServiceImpl    <NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
 
     private String[] buildVariables(List<CredDAO.Data> value) {
         // ensure credentials are sorted so we can fully automate Cred regression test
-        Collections.sort(value, new Comparator<CredDAO.Data>() {
-            @Override
-            public int compare(CredDAO.Data cred1, CredDAO.Data cred2) {
-                return cred1.expires.compareTo(cred2.expires);
-            }            
-        });
+        Collections.sort(value, (cred1, cred2) -> cred1.expires.compareTo(cred2.expires));
         String [] vars = new String[value.size()+1];
         vars[0]="Choice";
         for (int i = 0; i < value.size(); i++) {
@@ -2833,7 +2821,7 @@ public class AuthzCassServiceImpl    <NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
                 String inputOption = cr.getEntry();
                 if (inputOption == null) {
                     String message = selectCredFromList(rlcd.value, true);
-                    String[] variables = buildVariables(rlcd.value);
+                    Object[] variables = buildVariables(rlcd.value);
                     return Result.err(Status.ERR_ChoiceNeeded, message, variables);
                 } else {
                     try {
@@ -2864,15 +2852,10 @@ public class AuthzCassServiceImpl    <NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
             }
         }
         
-        Result<FutureDAO.Data> fd = mapper.future(trans,CredDAO.TABLE,from,cred.value,false, 
-            new Mapper.Memo() {
-                @Override
-                public String get() {
-                    return "Delete Credential [" + 
-                        cred.value.id + 
-                        ']';
-                }
-            },
+        Result<FutureDAO.Data> fd = mapper.future(trans,CredDAO.TABLE,from,cred.value,false,
+            () -> "Delete Credential [" +
+                cred.value.id +
+                ']',
             mc);
     
         Result<List<NsDAO.Data>> nsr = ques.nsDAO.read(trans, cred.value.ns);
@@ -3033,14 +3016,9 @@ public class AuthzCassServiceImpl    <NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
              
             // Check if user can change first
             Result<FutureDAO.Data> fd = mapper.future(trans,UserRoleDAO.TABLE,from,urr.value,true, // may request Approvals
-                new Mapper.Memo() {
-                    @Override
-                    public String get() {
-                        return "Add User [" + userRole.user + "] to Role [" + 
-                                userRole.role + 
-                                ']';
-                    }
-                },
+                () -> "Add User [" + userRole.user + "] to Role [" +
+                        userRole.role +
+                        ']',
                 new MayChange() {
                     private Result<NsDAO.Data> nsd;
                     @Override
@@ -3837,27 +3815,21 @@ public class AuthzCassServiceImpl    <NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
             return rv;
         }
         
-        Result<FutureDAO.Data> fd = mapper.future(trans,DelegateDAO.TABLE,base, dd, false, 
-            new Mapper.Memo() {
-                @Override
-                public String get() {
-                    StringBuilder sb = new StringBuilder();
-                    sb.append(access.name());
-                    sb.setCharAt(0, Character.toUpperCase(sb.charAt(0)));
-                    sb.append("Delegate ");
-                    sb.append(access==Access.create?"[":"to [");
-                    sb.append(rd.value.delegate);
-                    sb.append("] for [");
-                    sb.append(rd.value.user);
-                    sb.append(']');
-                    return sb.toString();
-                }
+        Result<FutureDAO.Data> fd = mapper.future(trans,DelegateDAO.TABLE,base, dd, false,
+            () -> {
+                StringBuilder sb = new StringBuilder();
+                sb.append(access.name());
+                sb.setCharAt(0, Character.toUpperCase(sb.charAt(0)));
+                sb.append("Delegate ");
+                sb.append(access==Access.create?"[":"to [");
+                sb.append(rd.value.delegate);
+                sb.append("] for [");
+                sb.append(rd.value.user);
+                sb.append(']');
+                return sb.toString();
             },
-            new MayChange() {
-                @Override
-                public Result<?> mayChange() {
-                    return Result.ok(); // Validate in code above
-                }
+            () -> {
+                return Result.ok(); // Validate in code above
             });
         
         switch(fd.status) {
@@ -4009,12 +3981,8 @@ public class AuthzCassServiceImpl    <NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
                 curr = ques.approvalDAO.readByTicket(trans, updt.ticket);
                 if (curr.isOKhasData()) {
                     final List<ApprovalDAO.Data> add = curr.value;
-                    apprByTicket = new Lookup<List<ApprovalDAO.Data>>() { // Store a Pre-Lookup
-                        @Override
-                        public List<ApprovalDAO.Data> get(AuthzTrans trans, Object ... noop) {
-                            return add;
-                        }
-                    };
+                    // Store a Pre-Lookup
+                    apprByTicket = (trans1, noop) -> add;
                 }
             } else if (updt.id!=null) {
                 curr = ques.approvalDAO.read(trans, updt);