X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-batch%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fbatch%2Fhelpers%2FBatchDataView.java;h=b5d25a435eabcc305ee5615296538e3c4cbe0149;hb=07fb3ece74a9aa1fad8e2a9fab73b4de3e36853b;hp=83945ee6e0516f85246b1d119b003dcd4d86f29c;hpb=a174f8ddbc5eb78a648fb68b33ef18cb64d81fda;p=aaf%2Fauthz.git

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/BatchDataView.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/BatchDataView.java
index 83945ee6..b5d25a43 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/BatchDataView.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/BatchDataView.java
@@ -20,7 +20,6 @@
  */
 package org.onap.aaf.auth.batch.helpers;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -34,7 +33,6 @@ import org.onap.aaf.auth.dao.cass.UserRoleDAO.Data;
 import org.onap.aaf.auth.env.AuthzTrans;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.cadi.Hash;
-import org.onap.aaf.misc.env.APIException;
 import org.onap.aaf.misc.env.TimeTaken;
 import org.onap.aaf.misc.env.Trans;
 import org.onap.aaf.misc.env.util.Chrono;
@@ -42,151 +40,147 @@ import org.onap.aaf.misc.env.util.Chrono;
 import com.datastax.driver.core.Session;
 
 public class BatchDataView implements DataView {
-	private static final String QUOTE_PAREN_SEMI = "');\n";
-	private static final String QUOTE_COMMA = "',";
-	private static final String QUOTE_COMMA_QUOTE = "','";
-	private static final String COMMA_QUOTE = ",'";
-	private final CQLBatchLoop cqlBatch;
-	private final Session session;
+    private static final String QUOTE_PAREN_SEMI = "');\n";
+    private static final String QUOTE_COMMA = "',";
+    private static final String QUOTE_COMMA_QUOTE = "','";
+    private static final String COMMA_QUOTE = ",'";
+    private final CQLBatchLoop cqlBatch;
+    private final Session session;
 
-	public BatchDataView(final AuthzTrans trans, final Session session, final boolean dryRun ) throws APIException, IOException {
-		this.session = session;
-		cqlBatch = new CQLBatchLoop(new CQLBatch(trans.info(),session),50,dryRun);
-	}
+    public BatchDataView(final AuthzTrans trans, final Session session, final boolean dryRun ){
+        this.session = session;
+        cqlBatch = new CQLBatchLoop(new CQLBatch(trans.info(),session),50,dryRun);
+    }
 
-	public Session getSession(AuthzTrans trans) throws APIException, IOException {
-		return session;
-	}
-	
-	public Result<NsDAO.Data> ns(AuthzTrans trans, String id) {
-		NS n;
-		TimeTaken tt = trans.start("Get NS by ID %s", Trans.SUB, id);
-		try {
-			n=NS.data.get(id);
-		} finally {
-			tt.done();
-		}
-		
-		if(n==null || n.ndd==null) {
-			return Result.err(Result.ERR_Backend,"Namespace '%s' does not exist", id);
-		}
-		return Result.ok(n.ndd);
-	}
+    public Session getSession(AuthzTrans trans){
+        return session;
+    }
+    
+    public Result<NsDAO.Data> ns(AuthzTrans trans, String id) {
+        NS n;
+        TimeTaken tt = trans.start("Get NS by ID %s", Trans.SUB, id);
+        try {
+            n=NS.data.get(id);
+        } finally {
+            tt.done();
+        }
+        
+        if(n==null || n.ndd==null) {
+            return Result.err(Result.ERR_Backend,"Namespace '%s' does not exist", id);
+        }
+        return Result.ok(n.ndd);
+    }
 
-	
-	@Override
-	public Result<RoleDAO.Data> roleByName(AuthzTrans trans, String name) {
-		Role r = Role.byName.get(name);
-		if(r==null || r.rdd==null) {
-			return Result.err(Result.ERR_Backend,"Role '%s' does not exist", name);
-		}
-		return Result.ok(r.rdd);
-	}
+    
+    @Override
+    public Result<RoleDAO.Data> roleByName(AuthzTrans trans, String name) {
+        Role r = Role.byName.get(name);
+        if(r==null || r.rdd==null) {
+            return Result.err(Result.ERR_Backend,"Role '%s' does not exist", name);
+        }
+        return Result.ok(r.rdd);
+    }
 
-	@Override
-	public Result<List<UserRoleDAO.Data>> ursByRole(AuthzTrans trans, String role) {
-		List<UserRole> urs = UserRole.getByRole().get(role);
-		if(urs==null) {
-			return Result.err(Result.ERR_Backend, "UserRoles for Role '%s' does not exist", role);
-		}
-		return toLURDD(urs);
-	}
+    @Override
+    public Result<List<UserRoleDAO.Data>> ursByRole(AuthzTrans trans, String role) {
+        List<UserRole> urs = UserRole.getByRole().get(role);
+        if(urs==null) {
+            return Result.err(Result.ERR_Backend, "UserRoles for Role '%s' does not exist", role);
+        }
+        return toLURDD(urs);
+    }
 
-	private Result<List<Data>> toLURDD(List<UserRole> urs) {
-		List<UserRoleDAO.Data> rv = new ArrayList<>();
-		if(urs!=null) {
-			for(UserRole ur : urs) {
-				rv.add(ur.urdd());
-			}
-		}
-		return Result.ok(rv);
-	}
+    private Result<List<Data>> toLURDD(List<UserRole> urs) {
+        List<UserRoleDAO.Data> rv = new ArrayList<>();
+        if(urs!=null) {
+            for(UserRole ur : urs) {
+                rv.add(ur.urdd());
+            }
+        }
+        return Result.ok(rv);
+    }
 
-	@Override
-	public Result<List<UserRoleDAO.Data>> ursByUser(AuthzTrans trans, String user) {
-		List<UserRole> urs = UserRole.getByUser().get(user);
-		if(urs==null) {
-			return Result.err(Result.ERR_Backend, "UserRoles for User '%s' does not exist", user);
-		}
-		return toLURDD(urs);
-	}
+    @Override
+    public Result<List<UserRoleDAO.Data>> ursByUser(AuthzTrans trans, String user) {
+        List<UserRole> urs = UserRole.getByUser().get(user);
+        if(urs==null) {
+            return Result.err(Result.ERR_Backend, "UserRoles for User '%s' does not exist", user);
+        }
+        return toLURDD(urs);
+    }
 
-	@Override
-	public Result<FutureDAO.Data> delete(AuthzTrans trans, FutureDAO.Data fdd) {
-		cqlBatch.preLoop();
-		StringBuilder sb = cqlBatch.inc();
-		sb.append("DELETE from authz.future WHERE id = ");
-		sb.append(fdd.id.toString());
-		return Result.ok(fdd);		
-	}
-	
-	@Override
-	public Result<ApprovalDAO.Data> delete(AuthzTrans trans, ApprovalDAO.Data add) {
-		cqlBatch.preLoop();
-		StringBuilder sb = cqlBatch.inc();
-		sb.append("DELETE from authz.approval WHERE id = ");
-		sb.append(add.id.toString());
-		return Result.ok(add);		
-	}
+    @Override
+    public Result<FutureDAO.Data> delete(AuthzTrans trans, FutureDAO.Data fdd) {
+        StringBuilder sb = cqlBatch.inc();
+        sb.append("DELETE from authz.future WHERE id = ");
+        sb.append(fdd.id.toString());
+        return Result.ok(fdd);        
+    }
+    
+    @Override
+    public Result<ApprovalDAO.Data> delete(AuthzTrans trans, ApprovalDAO.Data add) {
+        StringBuilder sb = cqlBatch.inc();
+        sb.append("DELETE from authz.approval WHERE id = ");
+        sb.append(add.id.toString());
+        return Result.ok(add);        
+    }
 
 
-	@Override
-	public Result<ApprovalDAO.Data> insert(AuthzTrans trans, ApprovalDAO.Data add) {
-		cqlBatch.preLoop();
-		StringBuilder sb = cqlBatch.inc();
-		sb.append("INSERT INTO authz.approval (id,approver,memo,operation,status,ticket,type,user) VALUES ("); 
-		sb.append(add.id.toString());
-		sb.append(COMMA_QUOTE);
-		sb.append(add.approver);
-//		sb.append(QUOTE_COMMA_QUOTE);
-//		sb.append(Chrono.utcStamp(add.last_notified));
-		sb.append(QUOTE_COMMA_QUOTE);
-		sb.append(add.memo.replace("'", "''"));
-		sb.append(QUOTE_COMMA_QUOTE);
-		sb.append(add.operation);
-		sb.append(QUOTE_COMMA_QUOTE);
-		sb.append(add.status);
-		sb.append(QUOTE_COMMA);
-		sb.append(add.ticket.toString());
-		sb.append(COMMA_QUOTE);
-		sb.append(add.type);
-		sb.append(QUOTE_COMMA_QUOTE);
-		sb.append(add.user);
-		sb.append(QUOTE_PAREN_SEMI);
-		return Result.ok(add);
-	}
+    @Override
+    public Result<ApprovalDAO.Data> insert(AuthzTrans trans, ApprovalDAO.Data add) {
+        StringBuilder sb = cqlBatch.inc();
+        sb.append("INSERT INTO authz.approval (id,approver,memo,operation,status,ticket,type,user) VALUES ("); 
+        sb.append(add.id.toString());
+        sb.append(COMMA_QUOTE);
+        sb.append(add.approver);
+//        sb.append(QUOTE_COMMA_QUOTE);
+//        sb.append(Chrono.utcStamp(add.last_notified));
+        sb.append(QUOTE_COMMA_QUOTE);
+        sb.append(add.memo.replace("'", "''"));
+        sb.append(QUOTE_COMMA_QUOTE);
+        sb.append(add.operation);
+        sb.append(QUOTE_COMMA_QUOTE);
+        sb.append(add.status);
+        sb.append(QUOTE_COMMA);
+        sb.append(add.ticket.toString());
+        sb.append(COMMA_QUOTE);
+        sb.append(add.type);
+        sb.append(QUOTE_COMMA_QUOTE);
+        sb.append(add.user);
+        sb.append(QUOTE_PAREN_SEMI);
+        return Result.ok(add);
+    }
 
-	@Override
-	public Result<FutureDAO.Data> insert(AuthzTrans trans, FutureDAO.Data fdd) {
-		cqlBatch.preLoop();
-		StringBuilder sb = cqlBatch.inc();
-		sb.append("INSERT INTO authz.future (id,construct,expires,memo,start,target,target_key,target_date) VALUES ("); 
-		sb.append(fdd.id.toString());
-		sb.append(',');
-		fdd.construct.hasArray();
-		sb.append(Hash.toHex(fdd.construct.array()));
-		sb.append(COMMA_QUOTE);
-		sb.append(Chrono.utcStamp(fdd.expires));
-		sb.append(QUOTE_COMMA_QUOTE);
-		sb.append(fdd.memo.replace("'", "''"));
-		sb.append(QUOTE_COMMA_QUOTE);
-		sb.append(Chrono.utcStamp(fdd.expires));
-		sb.append(QUOTE_COMMA_QUOTE);
-		sb.append(fdd.target);
-		if(fdd.target_key==null) {
-			sb.append("',,'");
-		} else {
-			sb.append(QUOTE_COMMA_QUOTE);
-			sb.append(fdd.target_key==null?"":fdd.target_key);
-			sb.append(QUOTE_COMMA_QUOTE);
-		}
-		sb.append(Chrono.utcStamp(fdd.target_date));
-		sb.append(QUOTE_PAREN_SEMI);
-		return Result.ok(fdd);
-	}
-	
-	@Override
-	public void flush() {
-		cqlBatch.flush();
-	}
+    @Override
+    public Result<FutureDAO.Data> insert(AuthzTrans trans, FutureDAO.Data fdd) {
+        StringBuilder sb = cqlBatch.inc();
+        sb.append("INSERT INTO authz.future (id,construct,expires,memo,start,target,target_key,target_date) VALUES ("); 
+        sb.append(fdd.id.toString());
+        sb.append(',');
+        fdd.construct.hasArray();
+        sb.append(Hash.toHex(fdd.construct.array()));
+        sb.append(COMMA_QUOTE);
+        sb.append(Chrono.utcStamp(fdd.expires));
+        sb.append(QUOTE_COMMA_QUOTE);
+        sb.append(fdd.memo.replace("'", "''"));
+        sb.append(QUOTE_COMMA_QUOTE);
+        sb.append(Chrono.utcStamp(fdd.expires));
+        sb.append(QUOTE_COMMA_QUOTE);
+        sb.append(fdd.target);
+        if(fdd.target_key==null) {
+            sb.append("',,'");
+        } else {
+            sb.append(QUOTE_COMMA_QUOTE);
+            sb.append(fdd.target_key==null?"":fdd.target_key);
+            sb.append(QUOTE_COMMA_QUOTE);
+        }
+        sb.append(Chrono.utcStamp(fdd.target_date));
+        sb.append(QUOTE_PAREN_SEMI);
+        return Result.ok(fdd);
+    }
+    
+    @Override
+    public void flush() {
+        cqlBatch.flush();
+    }
 }