Changes from Batch Test

[aaf/authz.git] / auth / auth-batch / src / main / java / org / onap / aaf / auth / batch / reports / bodies / NotifyBody.java

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/bodies/NotifyBody.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/bodies/NotifyBody.java
index 453c2f2..82c1f2c 100644 (file)
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/bodies/NotifyBody.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/bodies/NotifyBody.java
@@ -46,17 +46,24 @@ public abstract class NotifyBody {
        private static final Map<String,NotifyBody> bodyMap = new HashMap<>();
 
        protected Map<String,List<List<String>>> rows;
+       protected final String env;
+       protected final String gui_url;
+       
        private final String name;
        private final String type;
        private String date;
        private int escalation;
+       private int count;
        
-       public NotifyBody(final String type, final String name) {
+       public NotifyBody(Access access, final String type, final String name) {
                rows = new TreeMap<>();
                this.name = name;
                this.type = type;
                date="";
                escalation = 1;
+               count = 0;
+               env = access.getProperty("CASS_ENV","DEVL");
+               gui_url = access.getProperty("GUI_URL", "");
        }
        
        public void store(List<String> row) {
@@ -87,6 +94,10 @@ public abstract class NotifyBody {
                return name;
        }
        
+       public String type() {
+               return type;
+       }
+       
        public String date() {
                return date;
        }
@@ -116,6 +127,8 @@ public abstract class NotifyBody {
         */
        protected abstract String user(List<String> row);
        
+       public abstract String subject();
+
        /**
         * Get Notify Body based on key of
         * type|name
@@ -183,24 +196,43 @@ public abstract class NotifyBody {
                        }
                }
        }
-       
 
-       protected void println(StringBuilder sb, int indent, Object ... objs) {
+       protected void print(StringBuilder sb, int indent, Object ... objs) {
                for(int i=0;i<indent;++i) {
                        sb.append(' ');
                }
                for(Object o : objs) {
                        sb.append(o.toString());
                }
+       }
+                       
+       protected void println(StringBuilder sb, int indent, Object ... objs) {
+               print(sb,indent,objs);
                sb.append('\n');
        }
-       
-       protected void printCell(StringBuilder sb, int indent, String current, String prev) {
+
+       protected void printf(StringBuilder sb, int indent, String fmt, Object ... objs) {
+               print(sb,indent,String.format(fmt, objs));
+       }
+
+       protected String printCell(StringBuilder sb, int indent, String current, String prev) {
                if(current.equals(prev)) {
                        println(sb,indent,DUPL);
                } else {
-                       println(sb,indent,"<td>",current,"</td>");
+                       printCell(sb,indent,current);
                }
+               return current; // use to set prev...
+       }
+       
+       protected void printCell(StringBuilder sb, int indent, String current) {
+               println(sb,indent,"<td>",current,"</td>");
+       }
+       
+       public synchronized void inc() {
+               ++count;
+       }
+       
+       public int count() {
+               return count;
        }
-
 }