X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aaf%2Fauthz.git;a=blobdiff_plain;f=auth%2Fauth-batch%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fbatch%2Freports%2Fbodies%2FNotifyCredBody.java;h=e06be053749a4fbc682468cc5260edf5671be2c3;hp=2369582d525269a2e020259b055458dd651a4000;hb=628b7105ce4d9818aac69a082e515f9275fd46fd;hpb=4b6435c97dc1e05ee6a1e06190e3c431f9d1a8fe
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 2369582d..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,11 +21,13 @@
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 {
@@ -35,32 +37,40 @@ public abstract class NotifyCredBody extends NotifyBody {
// 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."
+ + "
Instructions for 'Password':
"
+ + "- Click on the Fully Qualified ID to ADD a new Password
"
+ + "- REMEMBER! You are not finished until you
"
+ + "- CHANGE ALL the configurations on ALL your processes!!
"
+ + "- BOUNCE them
"
+ + " - IF there is a WARNING, click the link for more information
"
+ + "
";
}
@Override
public boolean body(AuthzTrans trans, StringBuilder sb, int indent, Notify n, String id) {
println(sb,indent,explanation);
- println(sb,indent,"
");
println(sb,indent,"");
indent+=2;
println(sb,indent,"");
indent+=2;
println(sb,indent,"Fully Qualified ID | ");
+ println(sb,indent,"Unique ID | ");
println(sb,indent,"Type | ");
- println(sb,indent,"Details | ");
println(sb,indent,"Expires | ");
- println(sb,indent,"Cred Detail Page | ");
+ println(sb,indent,"Warnings | ");
indent-=2;
println(sb,indent,"
");
- String theid, type, info, gui, expires, notes;
- String p_theid=null, p_type=null, p_gui=null, p_expires=null;
+ String theid, type, info, expires, warnings;
+ GregorianCalendar gc = new GregorianCalendar();
for(List 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;
@@ -68,27 +78,22 @@ public abstract class NotifyCredBody extends NotifyBody {
type = "Unknown, see AAF GUI";
break;
}
- gui = ""+row.get(2)+"";
- expires = row.get(4);
+ theid = ""+theid+"";
+ gc.setTimeInMillis(Long.parseLong(row.get(5)));
+ expires = Chrono.niceUTCStamp(gc);
info = row.get(6);
- notes = row.get(8);
- if(notes!=null && !notes.isEmpty()) {
- info += "
" + notes;
- }
+ //TODO get Warnings
+ warnings = "";
println(sb,indent,"");
indent+=2;
- printCell(sb,indent,theid,p_theid);
- printCell(sb,indent,type,p_type);
- printCell(sb,indent,info,null);
- printCell(sb,indent,expires,p_expires);
- printCell(sb,indent,gui,p_gui);
+ 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,"
");
- p_theid=theid;
- p_type=type;
- p_gui=gui;
- p_expires=expires;
}
indent-=2;
println(sb,indent,"
");