Fix Batch Cred Deletes

[aaf/authz.git] / misc / env / src / main / java / org / onap / aaf / misc / env / util / Chrono.java

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 ae78918..aa20dfa 100644 (file)
--- 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 {\r
     private static final long NUM_100NS_INTERVALS_SINCE_UUID_EPOCH = 0x01b21dd213814000L;\r
 \r
-    public final static DateFormat dateFmt, dateOnlyFmt, niceDateFmt, utcFmt,iso8601Fmt;\r
+    public final static DateFormat dateFmt;\r
+    public final static DateFormat dateOnlyFmt;\r
+    public final static DateFormat niceDateFmt;\r
+    public final static DateFormat utcFmt;\r
+    public final static DateFormat niceUTCDateFmt;\r
+    public final static DateFormat iso8601Fmt;\r
+    public final static DateFormat batchFmt;\r
     // Give general access to XML DataType Factory, since it's pretty common\r
     public static final DatatypeFactory xmlDatatypeFactory;\r
     \r
@@ -52,8 +58,13 @@ public class Chrono {
         niceDateFmt = new SimpleDateFormat("yyyy/MM/dd HH:mm zzz");\r
         dateFmt = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");\r
         utcFmt =  new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");\r
-        iso8601Fmt =  new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSX");\r
         utcFmt.setTimeZone(TimeZone.getTimeZone("UTC"));\r
+        niceUTCDateFmt = new SimpleDateFormat("yyyy/MM/dd HH:mm zzz");\r
+        niceUTCDateFmt.setTimeZone(TimeZone.getTimeZone("UTC"));\r
+        iso8601Fmt =  new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSX");\r
+        batchFmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss+SSSS");\r
+        // Note: DB and thus Batch conversions should always be in UTC Time\r
+        batchFmt.setTimeZone(TimeZone.getTimeZone("UTC"));\r
     }\r
     \r
 \r
@@ -107,36 +118,55 @@ public class Chrono {
     }\r
 \r
     public static String utcStamp(Date date) {\r
-        if(date==null)return "";\r
+        if (date==null)return "";\r
         return utcFmt.format(date);\r
     }\r
 \r
     public static String utcStamp(GregorianCalendar gc) {\r
-        if(gc==null)return "";\r
+        if (gc==null)return "";\r
         return utcFmt.format(gc.getTime());\r
     }\r
 \r
     public static String utcStamp(XMLGregorianCalendar xgc) {\r
-        if(xgc==null)return "";\r
+        if (xgc==null)return "";\r
         return utcFmt.format(xgc.toGregorianCalendar().getTime());\r
     }\r
+    \r
+    public static String niceUTCStamp() {\r
+        return niceUTCDateFmt.format(new Date());\r
+    }\r
+\r
+    public static String niceUTCStamp(Date date) {\r
+        if (date==null)return "";\r
+        return niceUTCDateFmt.format(date);\r
+    }\r
+\r
+    public static String niceUTCStamp(GregorianCalendar gc) {\r
+        if (gc==null)return "";\r
+        return niceUTCDateFmt.format(gc.getTime());\r
+    }\r
+\r
+    public static String niceUTCStamp(XMLGregorianCalendar xgc) {\r
+        if (xgc==null)return "";\r
+        return niceUTCDateFmt.format(xgc.toGregorianCalendar().getTime());\r
+    }\r
 \r
     public static String dateStamp() {\r
         return dateFmt.format(new Date());\r
     }\r
 \r
     public static String dateStamp(GregorianCalendar gc) {\r
-        if(gc == null)return "";\r
+        if (gc == null)return "";\r
         return dateFmt.format(gc.getTime());\r
     }\r
 \r
     public static String dateStamp(Date date) {\r
-        if(date == null)return "";\r
+        if (date == null)return "";\r
         return dateFmt.format(date);\r
     }\r
 \r
     public static String dateStamp(XMLGregorianCalendar xgc) {\r
-        if(xgc==null)return "";\r
+        if (xgc==null)return "";\r
         return dateFmt.format(xgc.toGregorianCalendar().getTime());\r
     }\r
 \r
@@ -172,7 +202,7 @@ public class Chrono {
      * @return\r
      */\r
     public static String dateTime(GregorianCalendar gc) {\r
-        if(gc == null)return "";\r
+        if (gc == null)return "";\r
         TimeZone tz = gc.getTimeZone();\r
         int tz1 = (tz.getRawOffset()+tz.getDSTSavings())/0x8CA0;\r
         int tz1abs = Math.abs(tz1);\r
@@ -251,7 +281,7 @@ public class Chrono {
     }\r
 \r
     public static GregorianCalendar firstMomentOfDay(GregorianCalendar begin) {\r
-        if(begin==null)begin = new GregorianCalendar();\r
+        if (begin==null)begin = new GregorianCalendar();\r
         begin.set(GregorianCalendar.HOUR, 0);\r
         begin.set(GregorianCalendar.AM_PM, GregorianCalendar.AM);\r
         begin.set(GregorianCalendar.MINUTE, 0);\r
@@ -261,7 +291,7 @@ public class Chrono {
     }    \r
 \r
     public static GregorianCalendar lastMomentOfDay(GregorianCalendar end) {\r
-        if(end==null)end = new GregorianCalendar();\r
+        if (end==null)end = new GregorianCalendar();\r
         end.set(GregorianCalendar.HOUR, 11);\r
         end.set(GregorianCalendar.MINUTE, 59);\r
         end.set(GregorianCalendar.SECOND, 59);\r