Normalized the XMLGregorianCalendar used in Marshalling to get the "Z"

format.

Author: jateeter

src/main/java/org/energyos/espi/common/models/atom/adapters/DateTimeAdapter.java

@@ -16,6 +16,8 @@
 
 package org.energyos.espi.common.models.atom.adapters;
 
+import java.text.SimpleDateFormat;
+
 import org.energyos.espi.common.models.atom.DateTimeType;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
@@ -32,6 +34,9 @@ public DateTime unmarshal(JAXBElement<DateTimeType> v) throws Exception {
 
     @Override
     public JAXBElement<DateTimeType> marshal(DateTime v) throws Exception {
+        SimpleDateFormat fmt = new SimpleDateFormat( "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'" );
+  
+        String dateFormatted = fmt.format(v.toDate());
         return null;
     }
 }

src/main/java/org/energyos/espi/common/utils/AtomMarshallerListener.java

@@ -1,11 +1,16 @@
 
 package org.energyos.espi.common.utils;
 
+import java.text.SimpleDateFormat;
+import java.util.GregorianCalendar;
 import java.util.List;
+import java.util.TimeZone;
 
 import javax.xml.bind.Marshaller;
+import javax.xml.datatype.XMLGregorianCalendar;
 
 import org.energyos.espi.common.models.atom.ContentType;
+import org.energyos.espi.common.models.atom.DateTimeType;
 import org.energyos.espi.common.models.atom.EntryType;
 import org.energyos.espi.common.models.atom.LinkType;
 
@@ -46,6 +51,14 @@ public void beforeMarshal(Object source) {
             	((LinkType) source).setHref(relRefList.remove(0));
             }
     	}
+    	
+    	if ((source instanceof DateTimeType)) {
+    		// Normalize the calendar so it will print the "Z" correctly
+            XMLGregorianCalendar xmlCal = ((DateTimeType)source).getValue();
+            XMLGregorianCalendar xmlCal1 = xmlCal.normalize();
+            ((DateTimeType)source).setValue(xmlCal1);
+    	}
+
     }
 
     @Override