X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=misc%2Fenv%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fmisc%2Fenv%2Futil%2FChrono.java;h=aa20dfaee68c11195a959459fb3255a689410596;hb=83b93fc82cc39590f1f3aa1e92a53f37cd191416;hp=553d7ade05a8a7ea626b9c96ecddbfce1f4be350;hpb=7e966914050e66219689001ff4ab601a49eef0ac;p=aaf%2Fauthz.git

diff --git a/misc/env/src/main/java/org/onap/aaf/misc/env/util/Chrono.java b/misc/env/src/main/java/org/onap/aaf/misc/env/util/Chrono.java
index 553d7ade..aa20dfae 100644
--- a/misc/env/src/main/java/org/onap/aaf/misc/env/util/Chrono.java
+++ b/misc/env/src/main/java/org/onap/aaf/misc/env/util/Chrono.java
@@ -38,7 +38,13 @@ import javax.xml.datatype.XMLGregorianCalendar;
 public class Chrono {
     private static final long NUM_100NS_INTERVALS_SINCE_UUID_EPOCH = 0x01b21dd213814000L;
 
-    public final static DateFormat dateFmt, dateOnlyFmt, niceDateFmt, utcFmt,iso8601Fmt;
+    public final static DateFormat dateFmt;
+    public final static DateFormat dateOnlyFmt;
+    public final static DateFormat niceDateFmt;
+    public final static DateFormat utcFmt;
+    public final static DateFormat niceUTCDateFmt;
+    public final static DateFormat iso8601Fmt;
+    public final static DateFormat batchFmt;
     // Give general access to XML DataType Factory, since it's pretty common
     public static final DatatypeFactory xmlDatatypeFactory;
     
@@ -52,8 +58,13 @@ public class Chrono {
         niceDateFmt = new SimpleDateFormat("yyyy/MM/dd HH:mm zzz");
         dateFmt = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
         utcFmt =  new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
-        iso8601Fmt =  new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSX");
         utcFmt.setTimeZone(TimeZone.getTimeZone("UTC"));
+        niceUTCDateFmt = new SimpleDateFormat("yyyy/MM/dd HH:mm zzz");
+        niceUTCDateFmt.setTimeZone(TimeZone.getTimeZone("UTC"));
+        iso8601Fmt =  new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSX");
+        batchFmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss+SSSS");
+        // Note: DB and thus Batch conversions should always be in UTC Time
+        batchFmt.setTimeZone(TimeZone.getTimeZone("UTC"));
     }
     
 
@@ -120,6 +131,25 @@ public class Chrono {
         if (xgc==null)return "";
         return utcFmt.format(xgc.toGregorianCalendar().getTime());
     }
+    
+    public static String niceUTCStamp() {
+        return niceUTCDateFmt.format(new Date());
+    }
+
+    public static String niceUTCStamp(Date date) {
+        if (date==null)return "";
+        return niceUTCDateFmt.format(date);
+    }
+
+    public static String niceUTCStamp(GregorianCalendar gc) {
+        if (gc==null)return "";
+        return niceUTCDateFmt.format(gc.getTime());
+    }
+
+    public static String niceUTCStamp(XMLGregorianCalendar xgc) {
+        if (xgc==null)return "";
+        return niceUTCDateFmt.format(xgc.toGregorianCalendar().getTime());
+    }
 
     public static String dateStamp() {
         return dateFmt.format(new Date());