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%2FFuture.java;h=13f81938dea4261d679d611ab2fe5a6f2cd9e2ba;hb=59ffb7d529245c3bd0233dbf6cb0ae9fe9ccb856;hp=d9ee272d67ce3fa135e52b9dbc6c2496f011e356;hpb=d3cb040149ce8c021857d9aaf704cf16e606d2ec;p=aaf%2Fauthz.git

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Future.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Future.java
index d9ee272d..13f81938 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Future.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Future.java
@@ -34,6 +34,7 @@ import java.util.UUID;
 import org.onap.aaf.auth.dao.cass.FutureDAO;
 import org.onap.aaf.auth.env.AuthzTrans;
 import org.onap.aaf.auth.layer.Result;
+import org.onap.aaf.cadi.util.CSV;
 import org.onap.aaf.misc.env.Env;
 import org.onap.aaf.misc.env.TimeTaken;
 import org.onap.aaf.misc.env.Trans;
@@ -111,8 +112,27 @@ public class Future implements CacheChange.Data, Comparable<Future> {
     public final Date expires() {
         return fdd.expires;
     }
-
+    
     public static void load(Trans trans, Session session, Creator<Future> creator) {
+    	load(trans,session,creator, new Visitor<Future>() {
+			@Override
+			public void visit(Future f) {
+			    data.put(f.fdd.id,f);
+			    if (f.role==null) {
+			        return;
+			    }
+			    List<Future> lf = byRole.get(f.role);
+			    if (lf==null) {
+			        lf = new ArrayList<>();
+			        byRole.put(f.role,lf);
+			    }
+			    lf.add(f);
+			}
+		});
+    }
+
+
+    public static void load(Trans trans, Session session, Creator<Future> creator, Visitor<Future> visitor) {
         trans.info().log( "query: " + creator.select() );
         ResultSet results;
         TimeTaken tt = trans.start("Load Futures", Env.REMOTE);
@@ -127,19 +147,8 @@ public class Future implements CacheChange.Data, Comparable<Future> {
         tt = trans.start("Process Futures", Env.SUB);
         try {
             for (Row row : results.all()) {
-                ++count;
-                Future f = creator.create(row);
-                data.put(f.fdd.id,f);
-                if (f.role==null) {
-                    continue;
-                }
-                List<Future> lf = byRole.get(f.role);
-                if (lf==null) {
-                    lf = new ArrayList<>();
-                    byRole.put(f.role,lf);
-                }
-                lf.add(f);
-
+        	    ++count;
+            	visitor.visit(creator.create(row));
             }
         } finally {
             tt.done();
@@ -199,6 +208,16 @@ public class Future implements CacheChange.Data, Comparable<Future> {
     public static boolean pendingDelete(Future f) {
         return cache.contains(f);
     }
+    
+	public static void row(CSV.Writer cw, Future f) {
+		cw.row("future",f.fdd.id,f.fdd.target,f.fdd.expires,f.role,f.fdd.memo);
+	}
+
 
+	public static void deleteByIDBatch(StringBuilder sb, String id) {
+		sb.append("DELETE from authz.future where id=");
+		sb.append(id);
+		sb.append(";\n");
+	}
 
 }