1 files changed, 3 insertions, 14 deletions
diff --git a/src/com/isode/stroke/serializer/payloadserializers/PubSubEventSubscriptionSerializer.java b/src/com/isode/stroke/serializer/payloadserializers/PubSubEventSubscriptionSerializer.java
index d34bfb1..3118752 100644
--- a/src/com/isode/stroke/serializer/payloadserializers/PubSubEventSubscriptionSerializer.java
+++ b/src/com/isode/stroke/serializer/payloadserializers/PubSubEventSubscriptionSerializer.java
@@ -9,13 +9,11 @@
 
 package com.isode.stroke.serializer.payloadserializers;
 
+import com.isode.stroke.base.DateTime;
+import com.isode.stroke.elements.PubSubEventSubscription;
 import com.isode.stroke.serializer.GenericPayloadSerializer;
 import com.isode.stroke.serializer.PayloadSerializerCollection;
 import com.isode.stroke.serializer.xml.XMLElement;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.TimeZone;
-import com.isode.stroke.elements.PubSubEventSubscription;
 
 public class PubSubEventSubscriptionSerializer extends GenericPayloadSerializer<PubSubEventSubscription> {
 public PubSubEventSubscriptionSerializer(PayloadSerializerCollection serializers) {
@@ -46,7 +44,7 @@ protected String serializePayload(PubSubEventSubscription payload) {
 	}
 
 	if(payload.getExpiry() != null) {
-		element.setAttribute("expiry", dateToString(payload.getExpiry()));
+		element.setAttribute("expiry", DateTime.dateToString(payload.getExpiry()));
 	}
 
 	return element.serialize();
@@ -62,14 +60,5 @@ private static String serializeSubscriptionType(PubSubEventSubscription.Subscrip
 	return "undefined-subscriptiontype";
 }
 
-private static String dateToString(Date date) {
-	SimpleDateFormat dfm = new SimpleDateFormat("YYYY-MM-dd");
-	SimpleDateFormat tfm = new SimpleDateFormat("hh:mm:ss");
-	dfm.setTimeZone(TimeZone.getTimeZone("UTC"));
-	tfm.setTimeZone(TimeZone.getTimeZone("UTC"));
-	String sinceDateString = dfm.format(date) + "T" + tfm.format(date) + "Z";
-	return sinceDateString;
-}
-
 PayloadSerializerCollection serializers_;
 }