Approval Batch, prep better JUnit

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

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/RoleCreate.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/RoleCreate.java
index 512d4a3..729d5c1 100644 (file)
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/RoleCreate.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/RoleCreate.java
@@ -24,7 +24,6 @@ package org.onap.aaf.auth.batch.actions;
 import java.io.IOException;
 
 import org.onap.aaf.auth.batch.helpers.Role;
-import org.onap.aaf.auth.dao.cass.RoleDAO;
 import org.onap.aaf.auth.dao.cass.RoleDAO.Data;
 import org.onap.aaf.auth.env.AuthzTrans;
 import org.onap.aaf.auth.layer.Result;
@@ -43,17 +42,11 @@ public class RoleCreate extends ActionDAO<Role,Data,String> {
 
     @Override
     public Result<Data> exec(AuthzTrans trans, Role r,String text) {
-        RoleDAO.Data rdd = new RoleDAO.Data();
-        rdd.ns = r.ns;
-        rdd.name = r.name;
-        rdd.description = r.description;
-        rdd.perms = r.perms;
-        
         if (dryRun) {
             trans.info().log("Would Create Role:",text,r.fullName());
-            return Result.ok(rdd);
+            return Result.ok(r.rdd);
         } else {
-            Result<Data> rv = q.roleDAO.create(trans, rdd); // need to read for undelete
+            Result<Data> rv = q.roleDAO.create(trans, r.rdd); // need to read for undelete
             if (rv.isOK()) {
                 trans.info().log("Created Role:",text,r.fullName());
             } else {