summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Maudsley <richard.maudsley@isode.com>2014-03-11 11:14:25 (GMT)
committerSwift Review <review@swift.im>2014-05-26 17:16:33 (GMT)
commitdb8568aa6a9bbfa8dca9cdae696e8428a0068d89 (patch)
tree38ab6981542192128711049cb551dc03cf6f97a7 /src/com/isode/stroke/serializer
parentcafd510a0efc9df985999ceded57efa1d411de2e (diff)
downloadstroke-db8568aa6a9bbfa8dca9cdae696e8428a0068d89.zip
stroke-db8568aa6a9bbfa8dca9cdae696e8428a0068d89.tar.bz2
Added MAM parsers, serializers and tests.
Change-Id: I4e5368f9ac86446b7ebf976e2cb63d64ebefe7b2
Diffstat (limited to 'src/com/isode/stroke/serializer')
-rw-r--r--src/com/isode/stroke/serializer/payloadserializers/DelaySerializer.java31
-rw-r--r--src/com/isode/stroke/serializer/payloadserializers/ForwardedSerializer.java56
-rw-r--r--src/com/isode/stroke/serializer/payloadserializers/FullPayloadSerializerCollection.java8
-rw-r--r--src/com/isode/stroke/serializer/payloadserializers/MAMArchivedSerializer.java33
-rw-r--r--src/com/isode/stroke/serializer/payloadserializers/MAMQuerySerializer.java35
-rw-r--r--src/com/isode/stroke/serializer/payloadserializers/MAMResultSerializer.java44
-rw-r--r--src/com/isode/stroke/serializer/payloadserializers/ResultSetSerializer.java60
7 files changed, 266 insertions, 1 deletions
diff --git a/src/com/isode/stroke/serializer/payloadserializers/DelaySerializer.java b/src/com/isode/stroke/serializer/payloadserializers/DelaySerializer.java
new file mode 100644
index 0000000..f54f38f
--- /dev/null
+++ b/src/com/isode/stroke/serializer/payloadserializers/DelaySerializer.java
@@ -0,0 +1,31 @@
+/*
+* Copyright (c) 2014 Kevin Smith and Remko Tronçon
+* All rights reserved.
+*/
+
+/*
+* Copyright (c) 2014, Isode Limited, London, England.
+* All rights reserved.
+*/
+
+package com.isode.stroke.serializer.payloadserializers;
+
+import com.isode.stroke.base.DateTime;
+import com.isode.stroke.elements.Delay;
+import com.isode.stroke.serializer.GenericPayloadSerializer;
+import com.isode.stroke.serializer.xml.XMLElement;
+
+public class DelaySerializer extends GenericPayloadSerializer<Delay> {
+ public DelaySerializer() {
+ super(Delay.class);
+ }
+
+ protected String serializePayload(Delay delay) {
+ XMLElement delayElement = new XMLElement("delay", "urn:xmpp:delay");
+ if (delay.getFrom() != null && delay.getFrom().isValid()) {
+ delayElement.setAttribute("from", delay.getFrom().toString());
+ }
+ delayElement.setAttribute("stamp", DateTime.dateToString(delay.getStamp()));
+ return delayElement.serialize();
+ }
+}
diff --git a/src/com/isode/stroke/serializer/payloadserializers/ForwardedSerializer.java b/src/com/isode/stroke/serializer/payloadserializers/ForwardedSerializer.java
new file mode 100644
index 0000000..625205e
--- /dev/null
+++ b/src/com/isode/stroke/serializer/payloadserializers/ForwardedSerializer.java
@@ -0,0 +1,56 @@
+/*
+* Copyright (c) 2014 Kevin Smith and Remko Tronçon
+* All rights reserved.
+*/
+
+/*
+* Copyright (c) 2014, Isode Limited, London, England.
+* All rights reserved.
+*/
+
+package com.isode.stroke.serializer.payloadserializers;
+
+import com.isode.stroke.elements.Forwarded;
+import com.isode.stroke.elements.IQ;
+import com.isode.stroke.elements.Message;
+import com.isode.stroke.elements.Presence;
+import com.isode.stroke.serializer.GenericPayloadSerializer;
+import com.isode.stroke.serializer.IQSerializer;
+import com.isode.stroke.serializer.MessageSerializer;
+import com.isode.stroke.serializer.PayloadSerializerCollection;
+import com.isode.stroke.serializer.PresenceSerializer;
+import com.isode.stroke.serializer.xml.XMLElement;
+import com.isode.stroke.serializer.xml.XMLRawTextNode;
+
+public class ForwardedSerializer extends GenericPayloadSerializer<Forwarded> {
+ public ForwardedSerializer(PayloadSerializerCollection serializers) {
+ super(Forwarded.class);
+ serializers_ = serializers;
+ }
+
+ public String serializePayload(Forwarded payload) {
+ if (payload == null) {
+ return "";
+ }
+
+ XMLElement element = new XMLElement("forwarded", "urn:xmpp:forward:0");
+
+ if (payload.getDelay() != null) {
+ element.addNode(new XMLRawTextNode((new DelaySerializer()).serialize(payload.getDelay())));
+ }
+
+ if (payload.getStanza() != null) { /* find out what type of stanza we are dealing with and branch into the correct serializer */
+ if (payload.getStanza() instanceof IQ) {
+ element.addNode(new XMLRawTextNode((new IQSerializer(serializers_)).serialize((IQ)payload.getStanza())));
+ } else if (payload.getStanza() instanceof Message) {
+ element.addNode(new XMLRawTextNode((new MessageSerializer(serializers_)).serialize((Message)payload.getStanza())));
+ } else if (payload.getStanza() instanceof Presence) {
+ element.addNode(new XMLRawTextNode((new PresenceSerializer(serializers_)).serialize((Presence)payload.getStanza())));
+ }
+ }
+
+ return element.serialize();
+ }
+
+ private PayloadSerializerCollection serializers_;
+}
diff --git a/src/com/isode/stroke/serializer/payloadserializers/FullPayloadSerializerCollection.java b/src/com/isode/stroke/serializer/payloadserializers/FullPayloadSerializerCollection.java
index f846d85..9cb3646 100644
--- a/src/com/isode/stroke/serializer/payloadserializers/FullPayloadSerializerCollection.java
+++ b/src/com/isode/stroke/serializer/payloadserializers/FullPayloadSerializerCollection.java
@@ -49,7 +49,7 @@ public class FullPayloadSerializerCollection extends PayloadSerializerCollection
//addSerializer(new VCardUpdateSerializer());
addSerializer(new RawXMLPayloadSerializer());
//addSerializer(new StorageSerializer());
- //addSerializer(new DelaySerializer());
+ addSerializer(new DelaySerializer());
addSerializer(new FormSerializer());
//addSerializer(new PrivateStorageSerializer(this));
addSerializer(new CommandSerializer());
@@ -61,6 +61,12 @@ public class FullPayloadSerializerCollection extends PayloadSerializerCollection
addSerializer(new PubSubEventSerializer(this));
addSerializer(new PubSubOwnerPubSubSerializer(this));
addSerializer(new PubSubErrorSerializer());
+
+ addSerializer(new ResultSetSerializer());
+ addSerializer(new ForwardedSerializer(this));
+ addSerializer(new MAMResultSerializer(this));
+ addSerializer(new MAMQuerySerializer());
+ addSerializer(new MAMArchivedSerializer());
}
}
diff --git a/src/com/isode/stroke/serializer/payloadserializers/MAMArchivedSerializer.java b/src/com/isode/stroke/serializer/payloadserializers/MAMArchivedSerializer.java
new file mode 100644
index 0000000..0a5f1f4
--- /dev/null
+++ b/src/com/isode/stroke/serializer/payloadserializers/MAMArchivedSerializer.java
@@ -0,0 +1,33 @@
+/*
+* Copyright (c) 2014 Kevin Smith and Remko Tronçon
+* All rights reserved.
+*/
+
+/*
+* Copyright (c) 2014, Isode Limited, London, England.
+* All rights reserved.
+*/
+
+package com.isode.stroke.serializer.payloadserializers;
+
+import com.isode.stroke.elements.MAMArchived;
+import com.isode.stroke.serializer.GenericPayloadSerializer;
+import com.isode.stroke.serializer.xml.XMLElement;
+
+public class MAMArchivedSerializer extends GenericPayloadSerializer<MAMArchived> {
+ public MAMArchivedSerializer() {
+ super(MAMArchived.class);
+ }
+
+ protected String serializePayload(MAMArchived payload) {
+ if (payload == null) {
+ return "";
+ }
+
+ XMLElement element = new XMLElement("archived", "urn:xmpp:mam:0");
+ element.setAttribute("by", payload.getBy().toString());
+ element.setAttribute("id", payload.getID());
+
+ return element.serialize();
+ }
+}
diff --git a/src/com/isode/stroke/serializer/payloadserializers/MAMQuerySerializer.java b/src/com/isode/stroke/serializer/payloadserializers/MAMQuerySerializer.java
new file mode 100644
index 0000000..46cc42c
--- /dev/null
+++ b/src/com/isode/stroke/serializer/payloadserializers/MAMQuerySerializer.java
@@ -0,0 +1,35 @@
+package com.isode.stroke.serializer.payloadserializers;
+
+import com.isode.stroke.elements.MAMQuery;
+import com.isode.stroke.serializer.GenericPayloadSerializer;
+import com.isode.stroke.serializer.xml.XMLElement;
+import com.isode.stroke.serializer.xml.XMLRawTextNode;
+
+public class MAMQuerySerializer extends GenericPayloadSerializer<MAMQuery> {
+
+ public MAMQuerySerializer() {
+ super(MAMQuery.class);
+ }
+
+ protected String serializePayload(MAMQuery payload) {
+ if (payload == null) {
+ return "";
+ }
+
+ XMLElement element = new XMLElement("query", "urn:xmpp:mam:0");
+
+ if (payload.getQueryID() != null) {
+ element.setAttribute("queryid", payload.getQueryID());
+ }
+
+ if (payload.getForm() != null) {
+ element.addNode(new XMLRawTextNode((new FormSerializer()).serialize(payload.getForm())));
+ }
+
+ if (payload.getResultSet() != null) {
+ element.addNode(new XMLRawTextNode((new ResultSetSerializer()).serialize(payload.getResultSet())));
+ }
+
+ return element.serialize();
+ }
+}
diff --git a/src/com/isode/stroke/serializer/payloadserializers/MAMResultSerializer.java b/src/com/isode/stroke/serializer/payloadserializers/MAMResultSerializer.java
new file mode 100644
index 0000000..532e93f
--- /dev/null
+++ b/src/com/isode/stroke/serializer/payloadserializers/MAMResultSerializer.java
@@ -0,0 +1,44 @@
+/*
+* Copyright (c) 2014 Kevin Smith and Remko Tronçon
+* All rights reserved.
+*/
+
+/*
+* Copyright (c) 2014, Isode Limited, London, England.
+* All rights reserved.
+*/
+
+package com.isode.stroke.serializer.payloadserializers;
+
+import com.isode.stroke.elements.MAMResult;
+import com.isode.stroke.serializer.GenericPayloadSerializer;
+import com.isode.stroke.serializer.PayloadSerializerCollection;
+import com.isode.stroke.serializer.xml.XMLElement;
+import com.isode.stroke.serializer.xml.XMLRawTextNode;
+
+public class MAMResultSerializer extends GenericPayloadSerializer<MAMResult> {
+ public MAMResultSerializer(PayloadSerializerCollection serializers) {
+ super(MAMResult.class);
+ serializers_ = serializers;
+ }
+
+ public String serializePayload(MAMResult payload) {
+ if (payload == null) {
+ return "";
+ }
+
+ XMLElement element = new XMLElement("result", "urn:xmpp:mam:0");
+
+ element.setAttribute("id", payload.getID());
+
+ if (payload.getQueryID() != null) {
+ element.setAttribute("queryid", payload.getQueryID());
+ }
+
+ element.addNode(new XMLRawTextNode((new ForwardedSerializer(serializers_)).serialize(payload.getPayload())));
+
+ return element.serialize();
+ }
+
+ PayloadSerializerCollection serializers_;
+}
diff --git a/src/com/isode/stroke/serializer/payloadserializers/ResultSetSerializer.java b/src/com/isode/stroke/serializer/payloadserializers/ResultSetSerializer.java
new file mode 100644
index 0000000..06589d5
--- /dev/null
+++ b/src/com/isode/stroke/serializer/payloadserializers/ResultSetSerializer.java
@@ -0,0 +1,60 @@
+/*
+* Copyright (c) 2014 Kevin Smith and Remko Tronçon
+* All rights reserved.
+*/
+
+/*
+* Copyright (c) 2014, Isode Limited, London, England.
+* All rights reserved.
+*/
+
+package com.isode.stroke.serializer.payloadserializers;
+
+import com.isode.stroke.elements.ResultSet;
+import com.isode.stroke.serializer.GenericPayloadSerializer;
+import com.isode.stroke.serializer.xml.XMLElement;
+
+public class ResultSetSerializer extends GenericPayloadSerializer<ResultSet> {
+
+ public ResultSetSerializer() {
+ super(ResultSet.class);
+ }
+
+ protected String serializePayload(ResultSet payload) {
+ if (payload == null) {
+ return "";
+ }
+
+ XMLElement element = new XMLElement("set", "http://jabber.org/protocol/rsm");
+
+ if (payload.getMaxItems() != null) {
+ element.addNode(new XMLElement("max", "", payload.getMaxItems().toString()));
+ }
+
+ if (payload.getCount() != null) {
+ element.addNode(new XMLElement("count", "", payload.getCount().toString()));
+ }
+
+ if (payload.getFirstID() != null) {
+ XMLElement firstElement = new XMLElement("first", "", payload.getFirstID());
+ if (payload.getFirstIDIndex() != null) {
+ firstElement.setAttribute("index", payload.getFirstIDIndex().toString());
+ }
+ element.addNode(firstElement);
+ }
+
+ if (payload.getLastID() != null) {
+ element.addNode(new XMLElement("last", "", payload.getLastID()));
+ }
+
+ if (payload.getAfter() != null) {
+ element.addNode(new XMLElement("after", "", payload.getAfter()));
+ }
+
+ if (payload.getBefore() != null) {
+ element.addNode(new XMLElement("before", "", payload.getBefore()));
+ }
+
+ return element.serialize();
+ }
+}