Swiftdiff options
| author | Tarun Gupta <tarun1995gupta@gmail.com> | 2015-06-13 23:46:09 (GMT) |
|---|---|---|
| committer | Tarun Gupta <tarun1995gupta@gmail.com> | 2015-06-16 19:16:21 (GMT) |
| commit | 88392c931a8987f21caa5fa2e0717b8ce2514948 (patch) | |
| tree | d12b579818bdf72aa81df4b9f556202021c211cf | |
| parent | 1910b4f007f2cf2f19be8793fd7ad29a729d7997 (diff) | |
| download | stroke-88392c931a8987f21caa5fa2e0717b8ce2514948.zip stroke-88392c931a8987f21caa5fa2e0717b8ce2514948.tar.bz2 | |
Add IsodeIQDelegation Element.
Adds IsodeIQDelegation Element, its Parser and Serializer.
License:
This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Test-Information:
Tests added for both IsodeIQDelegation Serializer, which passes.
Change-Id: I7f67c0db4510b41266993ec5719e9ed13e3eb3c4
6 files changed, 307 insertions, 0 deletions
diff --git a/src/com/isode/stroke/elements/IsodeIQDelegation.java b/src/com/isode/stroke/elements/IsodeIQDelegation.java new file mode 100644 index 0000000..55c4a7a --- /dev/null +++ b/src/com/isode/stroke/elements/IsodeIQDelegation.java @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2014 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ +/* + * Copyright (c) 2015 Tarun Gupta. + * Licensed under the simplified BSD license. + * See Documentation/Licenses/BSD-simplified.txt for more information. + */ + +package com.isode.stroke.elements; + +import com.isode.stroke.elements.Payload; +import com.isode.stroke.elements.Forwarded; +import com.isode.stroke.base.NotNull; + +public class IsodeIQDelegation extends Payload { + + private Forwarded forward; + + /** + * Default Constructor. + */ + public IsodeIQDelegation() { + + } + + /** + * @param forward, Not Null. + */ + public void setForward(Forwarded forward) { + NotNull.exceptIfNull(forward, "forward"); + this.forward = forward; + } + + /** + * @return forward, Not Null. + */ + public Forwarded getForward() { + return forward; + } +}
\ No newline at end of file diff --git a/src/com/isode/stroke/parser/payloadparsers/FullPayloadParserFactoryCollection.java b/src/com/isode/stroke/parser/payloadparsers/FullPayloadParserFactoryCollection.java index ab8aed5..5bdf421 100644 --- a/src/com/isode/stroke/parser/payloadparsers/FullPayloadParserFactoryCollection.java +++ b/src/com/isode/stroke/parser/payloadparsers/FullPayloadParserFactoryCollection.java @@ -24,6 +24,7 @@ public class FullPayloadParserFactoryCollection extends PayloadParserFactoryColl //addFactory(new GenericPayloadParserFactory<PriorityParser>("priority", PriorityParser.class)); addFactory(new ErrorParserFactory(this)); addFactory(new SoftwareVersionParserFactory()); + addFactory(new GenericPayloadParserFactory<IsodeIQDelegationParser>("delegate", "http://isode.com/iq_delegation", IsodeIQDelegationParser.class)); addFactory(new GenericPayloadParserFactory<StorageParser>("storage", "storage:bookmarks", StorageParser.class)); addFactory(new RosterParserFactory()); addFactory(new GenericPayloadParserFactory<DiscoInfoParser>("query", "http://jabber.org/protocol/disco#info", DiscoInfoParser.class)); diff --git a/src/com/isode/stroke/parser/payloadparsers/IsodeIQDelegationParser.java b/src/com/isode/stroke/parser/payloadparsers/IsodeIQDelegationParser.java new file mode 100644 index 0000000..2f5b416 --- /dev/null +++ b/src/com/isode/stroke/parser/payloadparsers/IsodeIQDelegationParser.java @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2014 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ +/* + * Copyright (c) 2015 Tarun Gupta. + * Licensed under the simplified BSD license. + * See Documentation/Licenses/BSD-simplified.txt for more information. + */ + +package com.isode.stroke.parser.payloadparsers; + +import com.isode.stroke.parser.GenericPayloadParser; +import com.isode.stroke.parser.AttributeMap; +import com.isode.stroke.parser.PayloadParserFactoryCollection; +import com.isode.stroke.parser.PayloadParser; +import com.isode.stroke.parser.PayloadParserFactory; +import com.isode.stroke.elements.IsodeIQDelegation; +import com.isode.stroke.elements.Forwarded; +import com.isode.stroke.base.NotNull; + +public class IsodeIQDelegationParser extends GenericPayloadParser<IsodeIQDelegation> { + + private PayloadParserFactoryCollection parsers; + private int level = 0; + private PayloadParser currentPayloadParser; + + public IsodeIQDelegationParser(PayloadParserFactoryCollection parsers) { + super(new IsodeIQDelegation()); + this.parsers = parsers; + this.level = 0; + } + + /** + * @param element. + * @param ns. + * @param attributes. + */ + @Override + public void handleStartElement(String element, String ns, AttributeMap attributes) { + if (level == 1) { + PayloadParserFactory factory = parsers.getPayloadParserFactory(element, ns, attributes); + if (factory != null) { + currentPayloadParser = factory.createPayloadParser(); + } + } + + if (level >= 1 && currentPayloadParser != null) { + currentPayloadParser.handleStartElement(element, ns, attributes); + } + ++level; + } + + /** + * @param element. + * @param ns. + */ + @Override + public void handleEndElement(String element, String ns) { + --level; + if (currentPayloadParser != null) { + if (level >= 1) { + currentPayloadParser.handleEndElement(element, ns); + } + + if (level == 1) { + getPayloadInternal().setForward((Forwarded)(currentPayloadParser.getPayload())); + currentPayloadParser = null; + } + } + } + + /** + * @param data, NotNull. + */ + @Override + public void handleCharacterData(String data) { + NotNull.exceptIfNull(data, "data"); + if (level > 1 && currentPayloadParser != null) { + currentPayloadParser.handleCharacterData(data); + } + } +}
\ No newline at end of file diff --git a/src/com/isode/stroke/serializer/payloadserializers/FullPayloadSerializerCollection.java b/src/com/isode/stroke/serializer/payloadserializers/FullPayloadSerializerCollection.java index ec35ba3..a273fa0 100644 --- a/src/com/isode/stroke/serializer/payloadserializers/FullPayloadSerializerCollection.java +++ b/src/com/isode/stroke/serializer/payloadserializers/FullPayloadSerializerCollection.java @@ -71,6 +71,7 @@ public class FullPayloadSerializerCollection extends PayloadSerializerCollection addSerializer(new MAMFinSerializer()); addSerializer(new UserTuneSerializer(this)); addSerializer(new UserLocationSerializer(this)); + addSerializer(new IsodeIQDelegationSerializer(this)); } } diff --git a/src/com/isode/stroke/serializer/payloadserializers/IsodeIQDelegationSerializer.java b/src/com/isode/stroke/serializer/payloadserializers/IsodeIQDelegationSerializer.java new file mode 100644 index 0000000..79c9d6b --- /dev/null +++ b/src/com/isode/stroke/serializer/payloadserializers/IsodeIQDelegationSerializer.java @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2014 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ +/* + * Copyright (c) 2015 Tarun Gupta. + * Licensed under the simplified BSD license. + * See Documentation/Licenses/BSD-simplified.txt for more information. + */ + +package com.isode.stroke.serializer.payloadserializers; + +import com.isode.stroke.serializer.payloadserializers.ForwardedSerializer; +import com.isode.stroke.serializer.GenericPayloadSerializer; +import com.isode.stroke.serializer.xml.XMLRawTextNode; +import com.isode.stroke.serializer.xml.XMLElement; +import com.isode.stroke.serializer.PayloadSerializerCollection; +import com.isode.stroke.serializer.PayloadSerializer; +import com.isode.stroke.elements.IsodeIQDelegation; +import com.isode.stroke.elements.Forwarded; +import com.isode.stroke.base.NotNull; + +public class IsodeIQDelegationSerializer extends GenericPayloadSerializer<IsodeIQDelegation> { + + private PayloadSerializerCollection serializers; + + public IsodeIQDelegationSerializer(PayloadSerializerCollection serializers) { + super(IsodeIQDelegation.class); + this.serializers = serializers; + } + + public String serializePayload(IsodeIQDelegation payload) { + if (payload == null) { + return ""; + } + XMLElement element = new XMLElement("delegate", "http://isode.com/iq_delegation"); + element.addNode(new XMLRawTextNode((new ForwardedSerializer(serializers)).serialize((Forwarded)payload.getForward()))); + return element.serialize(); + } +}
\ No newline at end of file diff --git a/test/com/isode/stroke/serializer/payloadserializers/IsodeIQDelegationSerializerTest.java b/test/com/isode/stroke/serializer/payloadserializers/IsodeIQDelegationSerializerTest.java new file mode 100644 index 0000000..000a3f0 --- /dev/null +++ b/test/com/isode/stroke/serializer/payloadserializers/IsodeIQDelegationSerializerTest.java @@ -0,0 +1,137 @@ +/* + * Copyright (c) 2015 Tarun Gupta. + * Licensed under the simplified BSD license. + * See Documentation/Licenses/BSD-simplified.txt for more information. + */ + +package com.isode.stroke.serializer.payloadserializers; + +import static org.junit.Assert.assertEquals; +import org.junit.Test; +import com.isode.stroke.serializer.payloadserializers.IsodeIQDelegationSerializer; +import com.isode.stroke.serializer.PayloadSerializerCollection; +import com.isode.stroke.elements.IsodeIQDelegation; +import com.isode.stroke.base.DateTime; +import com.isode.stroke.elements.Delay; +import com.isode.stroke.elements.Forwarded; +import com.isode.stroke.elements.IQ; +import com.isode.stroke.elements.Message; +import com.isode.stroke.elements.Payload; +import com.isode.stroke.elements.Presence; +import com.isode.stroke.elements.Subject; +import com.isode.stroke.jid.JID; + +public class IsodeIQDelegationSerializerTest { + + /** + * Default Constructor. + */ + public IsodeIQDelegationSerializerTest() { + + } + + @Test + public void testSerialize_Forwarded_IQ() { + FullPayloadSerializerCollection serializerCollection = new FullPayloadSerializerCollection(); + IsodeIQDelegationSerializer testling = new IsodeIQDelegationSerializer(serializerCollection); + IsodeIQDelegation isodeIQDelegation = new IsodeIQDelegation(); + + IQ iq = IQ.createResult(JID.fromString("juliet@capulet.lit/balcony"), JID.fromString("romeo@montague.lit/orchard"), "id0", new Subject("text")); + Forwarded forwarded = new Forwarded(); + forwarded.setStanza(iq); + forwarded.setDelay(new Delay(DateTime.stringToDate("2010-07-10T23:08:25Z"), null)); + isodeIQDelegation.setForward(forwarded); + String expectedResult = "<delegate xmlns=\"http://isode.com/iq_delegation\">" + + "<forwarded xmlns=\"urn:xmpp:forward:0\">" + + "<delay stamp=\"2010-07-10T23:08:25Z\" xmlns=\"urn:xmpp:delay\"/>" + + "<iq from=\"romeo@montague.lit/orchard\" id=\"id0\" to=\"juliet@capulet.lit/balcony\" type=\"result\"><subject>text</subject></iq>" + + "</forwarded>" + + "</delegate>"; + assertEquals(expectedResult, testling.serialize(isodeIQDelegation)); + } + + @Test + public void testSerialize_Forwarded_Message() { + FullPayloadSerializerCollection serializerCollection = new FullPayloadSerializerCollection(); + IsodeIQDelegationSerializer testling = new IsodeIQDelegationSerializer(serializerCollection); + IsodeIQDelegation isodeIQDelegation = new IsodeIQDelegation(); + + Message message = new Message(); + message.setType(Message.Type.Chat); + message.setTo(JID.fromString("juliet@capulet.lit/balcony")); + message.setFrom(JID.fromString("romeo@montague.lit/orchard")); + message.setBody("Call me but love, and I'll be new baptized; Henceforth I never will be Romeo."); + + Forwarded forwarded = new Forwarded(); + forwarded.setStanza(message); + forwarded.setDelay(new Delay(DateTime.stringToDate("2010-07-10T23:08:25Z"), null)); + + isodeIQDelegation.setForward(forwarded); + + String expectedResult = + "<delegate xmlns=\"http://isode.com/iq_delegation\">" + + "<forwarded xmlns=\"urn:xmpp:forward:0\">" + + "<delay stamp=\"2010-07-10T23:08:25Z\" xmlns=\"urn:xmpp:delay\"/>" + + "<message from=\"romeo@montague.lit/orchard\" to=\"juliet@capulet.lit/balcony\" type=\"chat\">" + + "<body>Call me but love, and I'll be new baptized; Henceforth I never will be Romeo.</body>" + + "</message>" + + "</forwarded>" + + "</delegate>"; + + assertEquals(expectedResult, testling.serialize(isodeIQDelegation)); + } + + @Test + public void testSerialize_Forwarded_MessageNoDelay() { + FullPayloadSerializerCollection serializerCollection = new FullPayloadSerializerCollection(); + IsodeIQDelegationSerializer testling = new IsodeIQDelegationSerializer(serializerCollection); + IsodeIQDelegation isodeIQDelegation = new IsodeIQDelegation(); + + Message message = new Message(); + message.setType(Message.Type.Chat); + message.setTo(JID.fromString("juliet@capulet.lit/balcony")); + message.setFrom(JID.fromString("romeo@montague.lit/orchard")); + message.setBody("Call me but love, and I'll be new baptized; Henceforth I never will be Romeo."); + + Forwarded forwarded = new Forwarded(); + forwarded.setStanza(message); + + isodeIQDelegation.setForward(forwarded); + + String expectedResult = + "<delegate xmlns=\"http://isode.com/iq_delegation\">" + + "<forwarded xmlns=\"urn:xmpp:forward:0\">" + + "<message from=\"romeo@montague.lit/orchard\" to=\"juliet@capulet.lit/balcony\" type=\"chat\">" + + "<body>Call me but love, and I'll be new baptized; Henceforth I never will be Romeo.</body>" + + "</message>" + + "</forwarded>" + + "</delegate>"; + assertEquals(expectedResult, testling.serialize(isodeIQDelegation)); + } + + @Test + public void testSerialize_Forwarded_Presence() { + FullPayloadSerializerCollection serializerCollection = new FullPayloadSerializerCollection(); + IsodeIQDelegationSerializer testling = new IsodeIQDelegationSerializer(serializerCollection); + IsodeIQDelegation isodeIQDelegation = new IsodeIQDelegation(); + + Presence presence = new Presence(); + presence.setType(Presence.Type.Subscribe); + + Forwarded forwarded = new Forwarded(); + forwarded.setStanza(presence); + forwarded.setDelay(new Delay(DateTime.stringToDate("2010-07-10T23:08:25Z"), null)); + + isodeIQDelegation.setForward(forwarded); + + String expectedResult = + "<delegate xmlns=\"http://isode.com/iq_delegation\">" + + "<forwarded xmlns=\"urn:xmpp:forward:0\">" + + "<delay stamp=\"2010-07-10T23:08:25Z\" xmlns=\"urn:xmpp:delay\"/>" + + "<presence type=\"subscribe\"/>" + + "</forwarded>" + + "</delegate>"; + + assertEquals(expectedResult, testling.serialize(isodeIQDelegation)); + } +}
\ No newline at end of file |