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%2FApproval.java;h=1bc82f5effd20575c5e16bf69aa900d60d5d650d;hb=a174f8ddbc5eb78a648fb68b33ef18cb64d81fda;hp=acaf0d5886bcbb12922e14e0486957ca5f6a48f1;hpb=59ffb7d529245c3bd0233dbf6cb0ae9fe9ccb856;p=aaf%2Fauthz.git

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Approval.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Approval.java
index acaf0d58..1bc82f5e 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Approval.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Approval.java
@@ -24,6 +24,7 @@ package org.onap.aaf.auth.batch.helpers;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.TreeMap;
 import java.util.UUID;
@@ -50,18 +51,19 @@ public class Approval implements CacheChange.Data  {
     public static TreeMap<String,List<Approval>> byApprover = new TreeMap<>();
     public static TreeMap<String,List<Approval>> byUser = new TreeMap<>();
     public static TreeMap<UUID,List<Approval>> byTicket = new TreeMap<>();
+    public static List<Approval> list = new LinkedList<>();
     private final static CacheChange<Approval> cache = new CacheChange<>(); 
     
     public final ApprovalDAO.Data add;
     private String role;
     
-    public Approval(UUID id, UUID ticket, String approver, Date last_notified, 
+    public Approval(UUID id, UUID ticket, String approver,// Date last_notified, 
             String user, String memo, String operation, String status, String type, long updated) {
         add = new ApprovalDAO.Data();
         add.id = id;
         add.ticket = ticket;
         add.approver = approver;
-        add.last_notified = last_notified;
+//        add.last_notified = last_notified;
         add.user = user;
         add.memo = memo;
         add.operation = operation;
@@ -123,10 +125,11 @@ public class Approval implements CacheChange.Data  {
         }
     }
     
-	public static void row(CSV.Writer cw, Approval app) {
-		cw.row("approval",app.add.id,app.add.ticket,app.add.user,app.role,app.add.memo);
+	public static void row(CSV.RowSetter crs, Approval app) {
+		crs.row("approval",app.add.id,app.add.ticket,app.add.user,app.role,app.add.memo);
 	}
 
+
     public static void load(Trans trans, Session session, Creator<Approval> creator ) {
         trans.info().log( "query: " + creator.select() );
         TimeTaken tt = trans.start("Load Notify", Env.REMOTE);
@@ -147,6 +150,8 @@ public class Approval implements CacheChange.Data  {
                     ++count;
                     try {
                             Approval app = creator.create(row);
+                            list.add(app);
+                            
                             String person = app.getApprover();
                             if (person!=null) {
                             ln = byApprover.get(person);
@@ -206,41 +211,41 @@ public class Approval implements CacheChange.Data  {
         }
     }
 
-    public void update(AuthzTrans trans, ApprovalDAO apprDAO, boolean dryRun) {
-        if (dryRun) {
-            trans.info().printf("Would update Approval %s, %s, last_notified %s",add.id,add.status,add.last_notified);
-        } else {
-            trans.info().printf("Update Approval %s, %s, last_notified %s",add.id,add.status,add.last_notified);
-            apprDAO.update(trans, add);
-        }
-    }
+//    public void update(AuthzTrans trans, ApprovalDAO apprDAO, boolean dryRun) {
+//        if (dryRun) {
+//            trans.info().printf("Would update Approval %s, %s, last_notified %s",add.id,add.status,add.last_notified);
+//        } else {
+//            trans.info().printf("Update Approval %s, %s, last_notified %s",add.id,add.status,add.last_notified);
+//            apprDAO.update(trans, add);
+//        }
+//    }
 
     public static Creator<Approval> v2_0_17 = new Creator<Approval>() {
         @Override
         public Approval create(Row row) {
-            return new Approval(row.getUUID(0), row.getUUID(1), row.getString(2), row.getTimestamp(3),
-                    row.getString(4),row.getString(5),row.getString(6),row.getString(7),row.getString(8)
-                    ,row.getLong(9)/1000);
+            return new Approval(row.getUUID(0), row.getUUID(1), row.getString(2),
+                    row.getString(3),row.getString(4),row.getString(5),row.getString(6),row.getString(7),
+                    row.getLong(8)/1000);
         }
 
         @Override
         public String select() {
-            return "select id,ticket,approver,last_notified,user,memo,operation,status,type,WRITETIME(status) from authz.approval";
+            return "select id,ticket,approver,user,memo,operation,status,type,WRITETIME(status) from authz.approval";
         }
     };
 
-    /**
-     * @return the lastNotified
-     */
-    public Date getLast_notified() {
-        return add.last_notified;
-    }
-    /**
-     * @param lastNotified the lastNotified to set
-     */
-    public void setLastNotified(Date last_notified) {
-        add.last_notified = last_notified;
-    }
+//    /**
+//     * @return the lastNotified
+//     */
+//    public Date getLast_notified() {
+//        return add.last_notified;
+//    }
+//    /**
+//     * @param lastNotified the lastNotified to set
+//     */
+//    public void setLastNotified(Date last_notified) {
+//        add.last_notified = last_notified;
+//    }
     /**
      * @return the status
      */