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=72fed8ab2bb60a4f65a6f749f1d39ab3dc4e84cd;hb=5e1256abb2a3ef1b5781a066759708d89725fa12;hp=deac3e419d07491f5321e2e92f2b4c4043825295;hpb=9dc1cd2632d1dda9c8f072e99616e73e0517f1aa;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 deac3e41..72fed8ab 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
@@ -3,6 +3,8 @@
  * org.onap.aaf
  * ===========================================================================
  * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ *
+ * Modifications Copyright (C) 2019 IBM.
  * ===========================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +26,7 @@ import java.io.IOException;
 import java.util.GregorianCalendar;
 import java.util.List;
 
+import org.onap.aaf.auth.batch.helpers.LastNotified;
 import org.onap.aaf.auth.batch.reports.Notify;
 import org.onap.aaf.auth.env.AuthzTrans;
 import org.onap.aaf.cadi.Access;
@@ -32,14 +35,17 @@ import org.onap.aaf.misc.env.util.Chrono;
 public abstract class NotifyCredBody extends NotifyBody {
 
 	private final String explanation;
-	public NotifyCredBody(Access access, String name) throws IOException {
+	private final String instruction;
+	 
+	public NotifyCredBody(Access access, String name) {
 		super(access,"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."
-				+ "<h3>Instructions for 'Password':</h3><ul>" 
+		explanation = "The following Credentials that you are responsible for "
+				+ "are expiring on the dates shown. <br><br>"
+				;
+				
+        instruction = "<br><h3>Instructions for 'Password':</h3><ul>" 
 				+ "<li><b><i>Click</i></b> 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>"
@@ -47,10 +53,20 @@ public abstract class NotifyCredBody extends NotifyBody {
 				+ "<li>IF there is a WARNING, click the link for more information</li>"
 				+ "</ul>";
 	}
+	
+	/**
+	 * Default Dynamic Text.  Override is expected
+	 * @return
+	 */
+	protected String dynamic() {
+		return "Failure to act before the expiration date will cause your App's Authentications to fail.";
+	}
 
 	@Override
 	public boolean body(AuthzTrans trans, StringBuilder sb, int indent, Notify n, String id) {
-		println(sb,indent,explanation);
+		print(sb,indent,explanation);
+		print(sb,indent,dynamic());
+		println(sb,indent,instruction);
 		println(sb,indent,"<table>");
 		indent+=2;
 		println(sb,indent,"<tr>");
@@ -62,7 +78,11 @@ public abstract class NotifyCredBody extends NotifyBody {
 		println(sb,indent,"<th>Warnings</th>");
 		indent-=2;
 		println(sb,indent,"</tr>");
-		String theid, type, info, expires, warnings;
+		String theid;
+		String type;
+		String info;
+		String expires;
+		String warnings;
 		GregorianCalendar gc = new GregorianCalendar();
 		for(List<String> row : rows.get(id)) {
 			theid=row.get(1);
@@ -100,6 +120,16 @@ public abstract class NotifyCredBody extends NotifyBody {
 		
 		return true;
 	}
+	
+	@Override
+	public void record(AuthzTrans trans, StringBuilder query, String id, List<String> notified, LastNotified ln) {
+		for(List<String> row : rows.get(id)) {
+			for(String n : notified) {
+				// Need to match LastNotified Key ... cred.id + '|' + inst.type + '|' + inst.tag;
+				ln.update(query, n, row.get(0), row.get(1)+'|'+row.get(3)+'|'+row.get(6));
+			}
+		}
+	}
 
 	@Override
 	public String user(List<String> row) {