Remove Tabs, per Jococo

[aaf/authz.git] / auth / auth-batch / src / main / java / org / onap / aaf / auth / batch / helpers / Cred.java

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 c4a9b0d..1f5a1f4 100644 (file)
--- 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) {
@@ -141,7 +168,7 @@ public class Cred  {
                         boolean hastype = false;
                         for (int t : types) {
                             if (t==type) {
-                               hastype=true;
+                                hastype=true;
                                 break;
                             }
                         }
@@ -149,7 +176,8 @@ public class Cred  {
                             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();
@@ -160,18 +188,19 @@ public class Cred  {
     }
 
     public static void add(
-               final String id, 
-               final int type,
-               final Date timestamp,
-               final int other,
-               final long written
-               ) {
+            final String id, 
+            final int type,
+            final Date timestamp,
+            final int other,
+            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) {
@@ -187,10 +216,10 @@ public class Cred  {
         if (!found) {
             lscd.add(cred);
         }
-       }
+    }
 
 
-       /** 
+    /** 
      * Count entries in Cred data.
      * Note, as opposed to other methods, need to load the whole cred table for the Types.
      * @param numbuckets 
@@ -277,22 +306,28 @@ 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);
     }
 
 
     public static void batchDelete(StringBuilder sb, List<String> row) {
-       sb.append("DELETE from authz.cred WHERE id='");
-       sb.append(row.get(1));
-       sb.append("' AND type=");
-       sb.append(Integer.parseInt(row.get(3)));
-       // Note: We have to work with long, because Expires is part of Key... can't easily do date.
-       sb.append(" AND expires=dateof(maxtimeuuid(");
-       sb.append(row.get(5));
-       sb.append("));\n");
-       }
+        sb.append("DELETE from authz.cred WHERE id='");
+        sb.append(row.get(1));
+        sb.append("' AND type=");
+        sb.append(Integer.parseInt(row.get(3)));
+        // Note: We have to work with long, because Expires is part of Key... can't easily do date.
+        sb.append(" AND expires=dateof(maxtimeuuid(");
+        sb.append(row.get(5));
+        sb.append("));\n");
+    }
 
-       public String toString() {
+    public String toString() {
         StringBuilder sb = new StringBuilder(id);
         sb.append('[');
         for (Instance i : instances) {
@@ -323,13 +358,24 @@ public class Cred  {
     }
 
 
-       public static String histSubject(List<String> row) {
-               return row.get(1);
-       }
+    public static String histSubject(List<String> row) {
+        return row.get(1);
+    }
 
 
-       public static String histMemo(String fmt, String orgName, List<String> row) {
-               return String.format(fmt, row.get(1),orgName,row.get(4));
-       }
+    public static String histMemo(String fmt, String orgName, List<String> row) {
+        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