Update Batch from Testing

[aaf/authz.git] / auth / auth-batch / src / main / java / org / onap / aaf / auth / batch / actions / URFutureApproveExec.java

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URFutureApproveExec.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URFutureApproveExec.java
index 631a811..9c44a62 100644 (file)
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URFutureApproveExec.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URFutureApproveExec.java
@@ -30,9 +30,7 @@ import org.onap.aaf.auth.batch.helpers.Future;
 import org.onap.aaf.auth.batch.helpers.UserRole;
 import org.onap.aaf.auth.dao.cass.ApprovalDAO;
 import org.onap.aaf.auth.dao.cass.UserRoleDAO;
-import org.onap.aaf.auth.dao.cass.ApprovalDAO.Data;
 import org.onap.aaf.auth.dao.hl.Function.FUTURE_OP;
-import org.onap.aaf.auth.dao.hl.Function.Lookup;
 import org.onap.aaf.auth.dao.hl.Function.OP_STATUS;
 import org.onap.aaf.auth.env.AuthzTrans;
 import org.onap.aaf.auth.layer.Result;
@@ -66,15 +64,8 @@ public class URFutureApproveExec extends ActionDAO<List<Approval>, OP_STATUS, Fu
                 }
             }
             Result<OP_STATUS> rv = f.performFutureOp(trans, FUTURE_OP.A, future.fdd,
-                new Lookup<List<ApprovalDAO.Data>>() {
-                    @Override
-                    public List<Data> get(AuthzTrans trans, Object ... noop) {
-                        return apprs;
-                    }
-                },
-                new Lookup<UserRoleDAO.Data>() {
-                    @Override
-                    public UserRoleDAO.Data get(AuthzTrans trans, Object ... keys) {
+                    (trans1, noop) -> apprs,
+                    (trans12, keys) -> {
                         List<UserRole> lur = UserRole.getByUser().get(keys[0]);
                         if (lur!=null) {
                             for (UserRole ur : lur) {
@@ -84,8 +75,7 @@ public class URFutureApproveExec extends ActionDAO<List<Approval>, OP_STATUS, Fu
                             }
                         }
                         return null;
-                    }
-                });
+                    });
             if (rv.isOK()) {
                 switch(rv.value) {
                     case D: