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%2FCred.java;h=f566933174156551faee23ccc252c29ab95dacc3;hb=bd7def7ee2098af56ce66752f59c062d7923fb69;hp=e3ac9e639e93d2b5de0a19a54c5497f4b786a67d;hpb=00d96bbfd0f6caaa0bbcbe51d1c067822aa5040f;p=aaf%2Fauthz.git

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Cred.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Cred.java
index e3ac9e63..f5669331 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Cred.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Cred.java
@@ -62,19 +62,47 @@ public class Cred  {
         public final int type;
         public final Date expires,written;
         public final Integer other;
+        public final String tag;
+        public List<Note> notes;
+
         
-        public Instance(int type, Date expires, Integer other, long written) {
+        public Instance(int type, Date expires, Integer other, long written, String tag) {
             this.type = type;
             this.expires = expires;
             this.other = other;
             this.written = new Date(written);
+            this.tag = tag;
+        }
+        
+        /**
+         * Usually returns Null...
+         * @return
+         */
+        public List<Note> notes() {
+        	return notes;
+        }
+        
+        public void addNote(int level, String note) {
+        	if(notes==null) {
+        		notes=new ArrayList<>();
+        	} 
+        	notes.add(new Note(level,note));
         }
         
         public String toString() {
-        	return expires.toString() + ": " + type;
+        	return expires.toString() + ": " + type + ' ' + tag;
         }
     }
     
+    public static class Note {
+    	public final int level;
+    	public final String note;
+    	
+    	public Note(int level, String note) {
+    		this.level = level;
+    		this.note = note;
+    	}
+    }
     public Date last(final int ... types) {
         Date last = null;
         for (Instance i : instances) {
@@ -107,12 +135,11 @@ public class Cred  {
     }
 
     public static void load(Trans trans, Session session, int ... types ) {
-        load(trans, session,"select id, type, expires, other, writetime(cred) from authz.cred;",types);
-        
+        load(trans, session,"select id, type, expires, other, writetime(cred), tag from authz.cred;",types);
     }
 
     public static void loadOneNS(Trans trans, Session session, String ns,int ... types ) {
-        load(trans, session,"select id, type, expires, other, writetime(cred) from authz.cred WHERE ns='" + ns + "';");
+        load(trans, session,"select id, type, expires, other, writetime(cred), tag from authz.cred WHERE ns='" + ns + "';");
     }
 
     private static void load(Trans trans, Session session, String query, int ...types) {
@@ -138,17 +165,19 @@ public class Cred  {
                     row = iter.next();
                     int type = row.getInt(1);
                     if (types.length>0) { // filter by types, if requested
-                        boolean quit = true;
+                        boolean hastype = false;
                         for (int t : types) {
                             if (t==type) {
+                            	hastype=true;
                                 break;
                             }
                         }
-                        if (quit) {
+                        if (!hastype) {
                             continue;
                         }
                     }
-                    add(row.getString(0), row.getInt(1),row.getTimestamp(2),row.getInt(3),row.getLong(4));
+                    add(row.getString(0), row.getInt(1),row.getTimestamp(2),row.getInt(3),row.getLong(4),
+                    		row.getString(5));
                 }
             } finally {
                 tt.done();
@@ -163,14 +192,15 @@ public class Cred  {
     		final int type,
     		final Date timestamp,
     		final int other,
-    		final long written
+    		final long written,
+    		final String tag
     		) {
         Cred cred = data.get(id);
         if (cred==null) {
             cred = new Cred(id);
             data.put(id, cred);
         }
-        cred.instances.add(new Instance(type, timestamp, other, written/1000));
+        cred.instances.add(new Instance(type, timestamp, other, written/1000,tag));
         
         List<Cred> lscd = byNS.get(cred.ns);
         if (lscd==null) {
@@ -276,7 +306,13 @@ public class Cred  {
     }
     
     public void row(final CSV.Writer csvw, final Instance inst) {
-    	csvw.row("cred",id,ns,Integer.toString(inst.type),Chrono.dateOnlyStamp(inst.expires),inst.expires.getTime());
+    	csvw.row("cred",id,ns,Integer.toString(inst.type),Chrono.dateOnlyStamp(inst.expires),
+    			inst.expires.getTime(),inst.tag);
+    }
+
+    public void row(final CSV.Writer csvw, final Instance inst, final String reason) {
+    	csvw.row("cred",id,ns,Integer.toString(inst.type),Chrono.dateOnlyStamp(inst.expires),
+    			inst.expires.getTime(),inst.tag,reason);
     }
 
 
@@ -328,7 +364,18 @@ public class Cred  {
 
 
 	public static String histMemo(String fmt, String orgName, List<String> row) {
-		return String.format(fmt, row.get(1),orgName,row.get(4));
+		String reason;
+		if(row.size()>5) { // Reason included
+			reason = row.get(5);
+		} else {
+			reason = String.format(fmt, row.get(1),orgName,row.get(4));
+		}
+		return reason;
 	}
 
+
+	public static void clear() {
+		data.clear();
+		byNS.clear();
+	}
 }
\ No newline at end of file