Batch, Remove unneeded Classes, refine, etc

[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 dad03ce..7b98a2f 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
@@ -36,6 +36,7 @@ import org.onap.aaf.auth.batch.helpers.CQLBatch;
 import org.onap.aaf.auth.batch.helpers.CQLBatchLoop;
 import org.onap.aaf.auth.batch.helpers.Cred;
 import org.onap.aaf.auth.batch.helpers.Future;
+import org.onap.aaf.auth.batch.helpers.LastNotified;
 import org.onap.aaf.auth.batch.helpers.UserRole;
 import org.onap.aaf.auth.batch.helpers.X509;
 import org.onap.aaf.auth.dao.CassAccess;
@@ -51,6 +52,7 @@ import org.onap.aaf.cadi.util.CSV;
 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;
 
 public class Remove extends Batch {
@@ -74,7 +76,7 @@ public class Remove extends Batch {
                        } finally {
                                tt2.done();
                        }
-                       cqlBatch = new CQLBatch(noAvg.info(),session); 
+                       cqlBatch = new CQLBatch(noAvg.debug(),session); 
 
 
                } finally {
@@ -138,6 +140,8 @@ public class Remove extends Batch {
                                                                        if(!ur.get()) {
                                                                                ur.set(true);
                                                                        }
+                                                                       //TODO If deleted because Role is no longer there, double check...
+                                                                       
                                                                        UserRole.batchDelete(cbl.inc(),row);
                                                                        hdd.target=UserRoleDAO.TABLE; 
                                                                        hdd.subject=UserRole.histSubject(row);
@@ -158,8 +162,8 @@ public class Remove extends Batch {
                                                                        if(!x509.get()) {
                                                                                x509.set(true);
                                                                        }
-                                                                       X509.row(cbl.inc(),row);
-                                                                       hdd.target=CertDAO.TABLE; 
+                                                                       X509.batchDelete(cbl.inc(),row);
+                                                                       hdd.target="x509"; 
                                                                        hdd.subject=X509.histSubject(row);
                                                                        hdd.memo=X509.histMemo(memoFmt.get(),row);
                                                                        historyDAO.createBatch(cbl.inc(), hdd);
@@ -172,6 +176,9 @@ public class Remove extends Batch {
                                                                        // Not cached
                                                                        Approval.deleteByIDBatch(cbl.inc(),row.get(1));
                                                                        break;
+                                                               case "notified":
+                                                                       LastNotified.delete(cbl.inc(),row);
+                                                                       break;
                                                        }
                                                });
                                                cbl.flush();
@@ -183,14 +190,19 @@ public class Remove extends Batch {
                                }
                        }
                } finally {
-                       if(ur.get()) {
-                               cqlBatch.touch(UserRoleDAO.TABLE, 0, UserRoleDAO.CACHE_SEG, dryRun);
-                       }
-                       if(cred.get()) {
-                               cqlBatch.touch(CredDAO.TABLE, 0, CredDAO.CACHE_SEG, dryRun);
-                       }
-                       if(x509.get()) {
-                               cqlBatch.touch(CertDAO.TABLE, 0, CertDAO.CACHE_SEG, dryRun);
+                       TimeTaken tt = trans.start("Touch UR,Cred and Cert Caches",Trans.REMOTE);
+                       try {
+                               if(ur.get()) {
+                                       cqlBatch.touch(UserRoleDAO.TABLE, 0, UserRoleDAO.CACHE_SEG, dryRun);
+                               }
+                               if(cred.get()) {
+                                       cqlBatch.touch(CredDAO.TABLE, 0, CredDAO.CACHE_SEG, dryRun);
+                               }
+                               if(x509.get()) {
+                                       cqlBatch.touch(CertDAO.TABLE, 0, CertDAO.CACHE_SEG, dryRun);
+                               }
+                       } finally {
+                               tt.done();
                        }
                }
        }