Public and Private Locate entries

[aaf/authz.git] / auth / auth-batch / src / main / java / org / onap / aaf / auth / batch / update / Remove.java

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Remove.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Remove.java
index 3e1a8df..f2425f4 100644 (file)
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Remove.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Remove.java
@@ -71,7 +71,7 @@ public class Remove extends Batch {
             } finally {
                 tt2.done();
             }
-            cqlBatch = new CQLBatch(session); 
+            cqlBatch = new CQLBatch(noAvg.info(),session); 
             
 
         } finally {
@@ -84,7 +84,7 @@ public class Remove extends Batch {
         final int maxBatch = 25;
 
         // Create Intermediate Output 
-        File logDir = new File(logDir());
+        File logDir = logDir();
         
         List<File> remove = new ArrayList<>();
         if(args().length>0) {
@@ -95,6 +95,10 @@ public class Remove extends Batch {
                remove.add(new File(logDir,"Delete"+Chrono.dateOnlyStamp()+".csv"));
         }
         
+        for(File f : remove) {
+               trans.init().log("Processing File:",f.getAbsolutePath());
+        }
+        
         final Holder<Boolean> ur = new Holder<>(false);
         final Holder<Boolean> cred = new Holder<>(false);
         final Holder<Boolean> x509 = new Holder<>(false);
@@ -143,7 +147,7 @@ public class Remove extends Batch {
                                                                                        ur.set(true);
                                                                                }
                                                                                hi.set(++i);
-                                                                               UserRole.row(sb,row);
+                                                                               UserRole.batchDelete(sb,row);
                                                                                hdd.target=UserRoleDAO.TABLE; 
                                                                                hdd.subject=UserRole.histSubject(row);
                                                                                hdd.memo=UserRole.histMemo(memoFmt.get(), row);
@@ -154,7 +158,7 @@ public class Remove extends Batch {
                                                                                        cred.set(true);
                                                                                }
                                                                                hi.set(++i);
-                                                                               Cred.row(sb,row);
+                                                                               Cred.batchDelete(sb,row);
                                                                                hdd.target=CredDAO.TABLE; 
                                                                                hdd.subject=Cred.histSubject(row);
                                                                                hdd.memo=Cred.histMemo(memoFmt.get(), orgName,row);