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=cd81561cea936a539af6f75fd0885cf1f203f5ca;hb=78ccdcc1d1c29760e4cf833f94df62e1c5aa733f;hp=d3209a022ee3b5e3923557b9df557d919bd2c8d2;hpb=013931b3432b73eabe70238d88003a25aa261733;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 d3209a02..cd81561c 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
@@ -3,13 +3,15 @@
  * org.onap.aaf
  * ===========================================================================
  * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ *
+ * Modification Copyright (c) 2019 IBM
  * ===========================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,7 +22,6 @@
  */
 package org.onap.aaf.auth.batch.helpers;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -34,9 +35,8 @@ 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.Env;
 import org.onap.aaf.misc.env.TimeTaken;
-import org.onap.aaf.misc.env.Trans;
 import org.onap.aaf.misc.env.util.Chrono;
 
 import com.datastax.driver.core.Session;
@@ -54,26 +54,26 @@ public class BatchDataView implements DataView {
         cqlBatch = new CQLBatchLoop(new CQLBatch(trans.info(),session),50,dryRun);
     }
 
-    public Session getSession(AuthzTrans trans){
+    public Session getSession(){
         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);
+        TimeTaken tt = trans.start("Get NS by ID %s", Env.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);
@@ -116,27 +116,25 @@ public class BatchDataView implements DataView {
         StringBuilder sb = cqlBatch.inc();
         sb.append("DELETE from authz.future WHERE id = ");
         sb.append(fdd.id.toString());
-        return Result.ok(fdd);        
+        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);        
+        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("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);
@@ -156,7 +154,7 @@ public class BatchDataView implements DataView {
     @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("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();
@@ -180,7 +178,7 @@ public class BatchDataView implements DataView {
         sb.append(QUOTE_PAREN_SEMI);
         return Result.ok(fdd);
     }
-    
+
     @Override
     public void flush() {
         cqlBatch.flush();