X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-batch%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fbatch%2Freports%2Fbodies%2FNotifyCredBody.java;h=e06be053749a4fbc682468cc5260edf5671be2c3;hb=628b7105ce4d9818aac69a082e515f9275fd46fd;hp=db96d50a801516721a3994a9465486b3762b73da;hpb=27e133b8f3f189bb41354d0624dcdb0998bd4701;p=aaf%2Fauthz.git

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/bodies/NotifyCredBody.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/bodies/NotifyCredBody.java
index db96d50a..e06be053 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/bodies/NotifyCredBody.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/bodies/NotifyCredBody.java
@@ -21,34 +21,93 @@
 package org.onap.aaf.auth.batch.reports.bodies;
 
 import java.io.IOException;
+import java.util.GregorianCalendar;
 import java.util.List;
 
 import org.onap.aaf.auth.batch.reports.Notify;
 import org.onap.aaf.auth.env.AuthzTrans;
 import org.onap.aaf.cadi.Access;
+import org.onap.aaf.misc.env.util.Chrono;
+
+public abstract class NotifyCredBody extends NotifyBody {
 
-public class NotifyCredBody extends AbsCredBody {
 	private final String explanation;
 	public NotifyCredBody(Access access, String name) throws IOException {
-		super(name);
+		super("cred",name);
 		
 		// Default
 		explanation = "The following Credentials are expiring on the dates shown. "
-				+ "Failure to act before the expiration date will cause your App's Authentications to fail.";
+				+ "Failure to act before the expiration date will cause your App's "
+				+ "Authentications to fail."
+				+ "<h3>Instructions for 'Password':</h3><ul>" 
+				+ "<li>Click on the Fully Qualified ID to ADD a new Password</li>"
+				+ "<li><b>REMEMBER!</b> You are not finished until you <ol>"
+				+ "<li><b>CHANGE <i>ALL</i></b> the configurations on <b><i>ALL</i></b> your processes!!</li>"
+				+ "<li><b>BOUNCE</b> them</li></ol>"
+				+ "<li>IF there is a WARNING, click the link for more information</li>"
+				+ "</ul>";
 	}
 
 	@Override
-	public String body(AuthzTrans trans, Notify n, String id) {
-		StringBuilder sb = new StringBuilder();
-		sb.append(explanation);
-		sb.append("<br>");
-		sb.append("<tr>\n" + 
-				"<th>Role</th>\n" + 
-				"<th>Expires</th>\n" + 
-				"</tr>\n");
+	public boolean body(AuthzTrans trans, StringBuilder sb, int indent, Notify n, String id) {
+		println(sb,indent,explanation);
+		println(sb,indent,"<table>");
+		indent+=2;
+		println(sb,indent,"<tr>");
+		indent+=2;
+		println(sb,indent,"<th>Fully Qualified ID</th>");
+		println(sb,indent,"<th>Unique ID</th>");
+		println(sb,indent,"<th>Type</th>");
+		println(sb,indent,"<th>Expires</th>");
+		println(sb,indent,"<th>Warnings</th>");
+		indent-=2;
+		println(sb,indent,"</tr>");
+		String theid, type, info, expires, warnings;
+		GregorianCalendar gc = new GregorianCalendar();
 		for(List<String> row : rows.get(id)) {
+			theid=row.get(1);
+			switch(row.get(3)) {
+				case "1":
+				case "2":
+					type = "Password";
+					break;
+				case "200":
+					type = "x509 (Certificate)";
+					break;
+				default:
+					type = "Unknown, see AAF GUI";
+					break;
+			}
+			theid = "<a href=\""+n.guiURL+"/creddetail?ns="+row.get(2)+"\">"+theid+"</a>";
+			gc.setTimeInMillis(Long.parseLong(row.get(5)));
+			expires = Chrono.niceUTCStamp(gc);
+			info = row.get(6);
+			//TODO get Warnings 
+			warnings = "";
 			
+			println(sb,indent,"<tr>");
+			indent+=2;
+			printCell(sb,indent,theid);
+			printCell(sb,indent,info);
+			printCell(sb,indent,type);
+			printCell(sb,indent,expires);
+			printCell(sb,indent,warnings);
+			indent-=2;
+			println(sb,indent,"</tr>");
+		}
+		indent-=2;
+		println(sb,indent,"</table>");
+		
+		return true;
+	}
+
+	@Override
+	public String user(List<String> row) {
+		if( (row != null) && row.size()>1) {
+			return row.get(1);
 		}
-		return sb.toString();
+		return null;
 	}
+
+
 }