Update FullPayloadSerializerCollection

Updates the FullPayloadSerializerCollection and FullPayloadParserSerializerCollection to bring it inline with the Swiften classes. This included reordering the elements so they are in the same order as the Swiften class (so its easier to see classes that are missing), and adding ones that were missing. For ones where no Java implemenation exits yet the line is added but commented out. Test-information: Sanity test, ran unit tests all test still pass. Change-Id: I318c8da577f638f4d799fabdfc09a3afa7fcb608
author: Alex Clayton <alex.clayton@isode.com> 2016-01-29 15:32:25 (GMT)
committer: Alex Clayton <alex.clayton@isode.com> 2016-02-02 16:52:54 (GMT)
commit: 2c9305a872e4ca958bfd86472c4540cc10d11a2f (patch)
tree: 6da5005540c406b5185fc65cce4f768bd6596476 /src/com/isode
parent: f21f0d6f9c3662c4f224383ec84c69317c465514 (diff)
download: stroke-2c9305a872e4ca958bfd86472c4540cc10d11a2f.zip
stroke-2c9305a872e4ca958bfd86472c4540cc10d11a2f.tar.bz2
2 files changed, 135 insertions, 130 deletions
diff --git a/src/com/isode/stroke/parser/payloadparsers/FullPayloadParserFactoryCollection.java b/src/com/isode/stroke/parser/payloadparsers/FullPayloadParserFactoryCollection.java
index 87b84d8..9cb7cb8 100644
--- a/src/com/isode/stroke/parser/payloadparsers/FullPayloadParserFactoryCollection.java
+++ b/src/com/isode/stroke/parser/payloadparsers/FullPayloadParserFactoryCollection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2015, Isode Limited, London, England.
+ * Copyright (c) 2010-2016, Isode Limited, London, England.
  * All rights reserved.
  */
 package com.isode.stroke.parser.payloadparsers;
@@ -12,83 +12,80 @@ import com.isode.stroke.parser.payloadparsers.PubSubOwnerPubSubParser;
 
 public class FullPayloadParserFactoryCollection extends PayloadParserFactoryCollection {
     public FullPayloadParserFactoryCollection() {
-	addFactory(new GenericPayloadParserFactory<CarbonsDisableParser>("disable", "urn:xmpp:carbons:2", CarbonsDisableParser.class));
-	addFactory(new GenericPayloadParserFactory<CarbonsEnableParser>("enable", "urn:xmpp:carbons:2", CarbonsEnableParser.class));
-	addFactory(new GenericPayloadParserFactory<CarbonsPrivateParser>("private", "urn:xmpp:carbons:2", CarbonsPrivateParser.class));
-	addFactory(new GenericPayloadParserFactory2<CarbonsReceivedParser>("received", "urn:xmpp:carbons:2", this, CarbonsReceivedParser.class));
-	addFactory(new GenericPayloadParserFactory2<CarbonsSentParser>("sent", "urn:xmpp:carbons:2", this, CarbonsSentParser.class));        
-	addFactory(new GenericPayloadParserFactory<StatusShowParser>("show", StatusShowParser.class));
-	addFactory(new GenericPayloadParserFactory<StatusParser>("status", StatusParser.class));
-	addFactory(new GenericPayloadParserFactory<ReplaceParser>("replace", "http://swift.im/protocol/replace", ReplaceParser.class));
-	addFactory(new GenericPayloadParserFactory<ReplaceParser>("replace", "urn:xmpp:message-correct:0", ReplaceParser.class));
-	addFactory(new GenericPayloadParserFactory<LastParser>("query", "jabber:iq:last", LastParser.class));
-	addFactory(new GenericPayloadParserFactory<BodyParser>("body", BodyParser.class));
-	addFactory(new GenericPayloadParserFactory<SubjectParser>("subject", SubjectParser.class));
-	addFactory(new JingleParserFactory(this));
-	addFactory(new GenericPayloadParserFactory<JingleReasonParser>("reason", "urn:xmpp:jingle:1", JingleReasonParser.class));
-	addFactory(new GenericPayloadParserFactory<JingleFileTransferFileInfoParser>("file", "", JingleFileTransferFileInfoParser.class));
-	addFactory(new JingleFileTransferDescriptionParserFactory(this));
-	addFactory(new GenericPayloadParserFactory<JingleFileTransferHashParser>("checksum", "urn:xmpp:jingle:apps:file-transfer:4", JingleFileTransferHashParser.class));
-	addFactory(new GenericPayloadParserFactory<JingleIBBTransportMethodPayloadParser>("transport", "urn:xmpp:jingle:transports:ibb:1", JingleIBBTransportMethodPayloadParser.class));
-	addFactory(new GenericPayloadParserFactory<JingleS5BTransportMethodPayloadParser>("transport", "urn:xmpp:jingle:transports:s5b:1", JingleS5BTransportMethodPayloadParser.class));
-	addFactory(new JingleContentPayloadParserFactory(this));
-	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<RosterItemExchangeParser>("x", "http://jabber.org/protocol/rosterx", RosterItemExchangeParser.class));
-	addFactory(new GenericPayloadParserFactory<IBBParser>("data", "http://jabber.org/protocol/ibb", IBBParser.class));
-	addFactory(new GenericPayloadParserFactory<DiscoInfoParser>("query", "http://jabber.org/protocol/disco#info", DiscoInfoParser.class));
-	addFactory(new GenericPayloadParserFactory<DiscoItemsParser>("query", "http://jabber.org/protocol/disco#items", DiscoItemsParser.class));
-	addFactory(new GenericPayloadParserFactory<CapsInfoParser> ("c", "http://jabber.org/protocol/caps", CapsInfoParser.class));
-	addFactory(new ResourceBindParserFactory());
-	addFactory(new StartSessionParserFactory());
-	addFactory(new SecurityLabelParserFactory());
-	addFactory(new GenericPayloadParserFactory<SecurityLabelsCatalogParser>("catalog", "urn:xmpp:sec-label:catalog:2", SecurityLabelsCatalogParser.class));
+        addFactory(new GenericPayloadParserFactory<IBBParser>("", "http://jabber.org/protocol/ibb", IBBParser.class));
+        addFactory(new GenericPayloadParserFactory<StatusShowParser>("show", StatusShowParser.class));
+        addFactory(new GenericPayloadParserFactory<StatusParser>("status", StatusParser.class));
+        addFactory(new GenericPayloadParserFactory<ReplaceParser>("replace", "http://swift.im/protocol/replace", ReplaceParser.class));
+        addFactory(new GenericPayloadParserFactory<ReplaceParser>("replace", "urn:xmpp:message-correct:0", ReplaceParser.class));
+        addFactory(new GenericPayloadParserFactory<LastParser>("query", "jabber:iq:last", LastParser.class));
+        addFactory(new GenericPayloadParserFactory<BodyParser>("body", BodyParser.class));
+        addFactory(new GenericPayloadParserFactory<SubjectParser>("subject", SubjectParser.class));
+        addFactory(new GenericPayloadParserFactory<ThreadParser>("thread", ThreadParser.class));
+        addFactory(new GenericPayloadParserFactory<PriorityParser>("priority", PriorityParser.class));
+        addFactory(new ErrorParserFactory(this));
+        addFactory(new GenericPayloadParserFactory<DelayParser>("delay", "urn:xmpp:delay", DelayParser.class));
+        addFactory(new SoftwareVersionParserFactory());
+        addFactory(new GenericPayloadParserFactory<StorageParser>("storage", "storage:bookmarks", StorageParser.class));
+        addFactory(new GenericPayloadParserFactory<RosterItemExchangeParser>("x", "http://jabber.org/protocol/rosterx", RosterItemExchangeParser.class));
+        addFactory(new RosterParserFactory());
+        addFactory(new GenericPayloadParserFactory<DiscoInfoParser>("query", "http://jabber.org/protocol/disco#info", DiscoInfoParser.class));
+        addFactory(new GenericPayloadParserFactory<DiscoItemsParser>("query", "http://jabber.org/protocol/disco#items", DiscoItemsParser.class));
+        addFactory(new GenericPayloadParserFactory<CapsInfoParser> ("c", "http://jabber.org/protocol/caps", CapsInfoParser.class));
+        addFactory(new ResourceBindParserFactory());
+        addFactory(new StartSessionParserFactory());
+        // addFactory(new GenericPayloadParserFactory<BlockParser<BlockPayload>("block", "urn:xmpp:blocking", BlockParser.class));
+        // addFactory(GenericPayloadParserFactory<BlockParser<BlockListPayload>("blocklist", "urn:xmpp:blocking", BlockParser.class));
+        // addFactory(GenericPayloadParserFactory<BlockParser<UnblockPayload>("unblock", "urn:xmpp:blocking", BlockParser.class));
+        addFactory(new SecurityLabelParserFactory());
+        addFactory(new GenericPayloadParserFactory<SecurityLabelsCatalogParser>("catalog", "urn:xmpp:sec-label:catalog:2", SecurityLabelsCatalogParser.class));
         addFactory(new FormParserFactory());
-        addFactory(new GenericPayloadParserFactory<CommandParser>("command",
-                "http://jabber.org/protocol/commands", CommandParser.class));
+        addFactory(new GenericPayloadParserFactory<CommandParser>("command","http://jabber.org/protocol/commands", CommandParser.class));
         addFactory(new GenericPayloadParserFactory<InBandRegistrationPayloadParser>("query", "jabber:iq:register", InBandRegistrationPayloadParser.class));
         addFactory(new SearchPayloadParserFactory());
-	addFactory(new GenericPayloadParserFactory<StreamInitiationFileInfoParser>("file", "http://jabber.org/protocol/si/profile/file-transfer", StreamInitiationFileInfoParser.class));
-	addFactory(new GenericPayloadParserFactory<StreamInitiationParser>("si", "http://jabber.org/protocol/si", StreamInitiationParser.class));        
-	addFactory(new GenericPayloadParserFactory<ThreadParser>("thread", ThreadParser.class));        
-	addFactory(new GenericPayloadParserFactory<BytestreamsParser>("query", "http://jabber.org/protocol/bytestreams", BytestreamsParser.class));
-	addFactory(new GenericPayloadParserFactory<VCardUpdateParser>("x", "vcard-temp:x:update", VCardUpdateParser.class));
-    addFactory(new GenericPayloadParserFactory<VCardParser>("vCard", "vcard-temp", VCardParser.class));
-	addFactory(new PrivateStorageParserFactory(this));
-    addFactory(new ChatStateParserFactory());
-	addFactory(new MUCUserPayloadParserFactory(this));
-	addFactory(new MUCOwnerPayloadParserFactory(this));
-	addFactory(new GenericPayloadParserFactory<MUCInvitationPayloadParser>("x", 
-	        "jabber:x:conference",MUCInvitationPayloadParser.class));
-	addFactory(new GenericPayloadParserFactory<MUCAdminPayloadParser>("query", 
-	        "http://jabber.org/protocol/muc#admin",MUCAdminPayloadParser.class));
-	addFactory(new GenericPayloadParserFactory<MUCDestroyPayloadParser>("destroy", 
-	        "http://jabber.org/protocol/muc#user",MUCDestroyPayloadParser.class));
-	addFactory(new GenericPayloadParserFactory<MUCDestroyPayloadParser>("destroy", 
-	        "http://jabber.org/protocol/muc#owner",MUCDestroyPayloadParser.class));
-    addFactory(new GenericPayloadParserFactory<IdleParser>("idle", "urn:xmpp:idle:1",IdleParser.class));
-	
-	addFactory(new DeliveryReceiptParserFactory());
-	addFactory(new DeliveryReceiptRequestParserFactory());
-	
-	addFactory(new GenericPayloadParserFactory2<PubSubParser>("pubsub", "http://jabber.org/protocol/pubsub", this, PubSubParser.class));
-	addFactory(new GenericPayloadParserFactory2<PubSubOwnerPubSubParser>("pubsub", "http://jabber.org/protocol/pubsub#owner", this, PubSubOwnerPubSubParser.class));
-	addFactory(new GenericPayloadParserFactory2<PubSubEventParser>("event", "http://jabber.org/protocol/pubsub#event", this, PubSubEventParser.class));
-	addFactory(new PubSubErrorParserFactory());
-	
-    addFactory(new GenericPayloadParserFactory<DelayParser>("delay", "urn:xmpp:delay", DelayParser.class));
-    addFactory(new GenericPayloadParserFactory<ResultSetParser>("set", "http://jabber.org/protocol/rsm", ResultSetParser.class));
-    addFactory(new GenericPayloadParserFactory2<ForwardedParser>("forwarded", "urn:xmpp:forward:0", this, ForwardedParser.class));
-    addFactory(new GenericPayloadParserFactory2<MAMResultParser>("result", "urn:xmpp:mam:0", this, MAMResultParser.class));
-    addFactory(new GenericPayloadParserFactory<MAMQueryParser>("query", "urn:xmpp:mam:0", MAMQueryParser.class));
-    addFactory(new GenericPayloadParserFactory<MAMFinParser>("fin", "urn:xmpp:mam:0", MAMFinParser.class));
-	addFactory(new GenericPayloadParserFactory<UserTuneParser>("tune", "http://jabber.org/protocol/tune", UserTuneParser.class));
-	addFactory(new GenericPayloadParserFactory<UserLocationParser>("geoloc", "http://jabber.org/protocol/geoloc", UserLocationParser.class));
-	addFactory(new GenericPayloadParserFactory<NicknameParser>("nick", "http://jabber.org/protocol/nick", NicknameParser.class));
+        addFactory(new GenericPayloadParserFactory<StreamInitiationParser>("si", "http://jabber.org/protocol/si", StreamInitiationParser.class)); 
+        addFactory(new GenericPayloadParserFactory<BytestreamsParser>("query", "http://jabber.org/protocol/bytestreams", BytestreamsParser.class));
+        addFactory(new GenericPayloadParserFactory<VCardUpdateParser>("x", "vcard-temp:x:update", VCardUpdateParser.class));
+        addFactory(new GenericPayloadParserFactory<VCardParser>("vCard", "vcard-temp", VCardParser.class));
+        addFactory(new PrivateStorageParserFactory(this));
+        addFactory(new ChatStateParserFactory());
+        addFactory(new MUCUserPayloadParserFactory(this));
+        addFactory(new MUCOwnerPayloadParserFactory(this));
+        addFactory(new GenericPayloadParserFactory<MUCInvitationPayloadParser>("x","jabber:x:conference",MUCInvitationPayloadParser.class));
+        addFactory(new GenericPayloadParserFactory<MUCAdminPayloadParser>("query","http://jabber.org/protocol/muc#admin",MUCAdminPayloadParser.class));
+        addFactory(new GenericPayloadParserFactory<MUCDestroyPayloadParser>("destroy","http://jabber.org/protocol/muc#user",MUCDestroyPayloadParser.class));
+        addFactory(new GenericPayloadParserFactory<MUCDestroyPayloadParser>("destroy","http://jabber.org/protocol/muc#owner",MUCDestroyPayloadParser.class));
+        addFactory(new GenericPayloadParserFactory<NicknameParser>("nick", "http://jabber.org/protocol/nick", NicknameParser.class));
+        addFactory(new JingleParserFactory(this));
+        addFactory(new GenericPayloadParserFactory<JingleReasonParser>("reason", "urn:xmpp:jingle:1", JingleReasonParser.class));
+        addFactory(new JingleContentPayloadParserFactory(this));
+        addFactory(new GenericPayloadParserFactory<JingleIBBTransportMethodPayloadParser>("transport", "urn:xmpp:jingle:transports:ibb:1", JingleIBBTransportMethodPayloadParser.class));
+        addFactory(new GenericPayloadParserFactory<JingleS5BTransportMethodPayloadParser>("transport", "urn:xmpp:jingle:transports:s5b:1", JingleS5BTransportMethodPayloadParser.class));
+        addFactory(new JingleFileTransferDescriptionParserFactory(this));
+        addFactory(new GenericPayloadParserFactory<StreamInitiationFileInfoParser>("file", "http://jabber.org/protocol/si/profile/file-transfer", StreamInitiationFileInfoParser.class));
+        addFactory(new GenericPayloadParserFactory<JingleFileTransferFileInfoParser>("file", JingleFileTransferFileInfoParser.class));
+        addFactory(new GenericPayloadParserFactory<JingleFileTransferHashParser>("checksum", JingleFileTransferHashParser.class));
+        addFactory(new GenericPayloadParserFactory<S5BProxyRequestParser>("query", "http://jabber.org/protocol/bytestreams",S5BProxyRequestParser.class));
+        // addFactory(new GenericPayloadParserFactory<WhiteboardParser>("wb","http://swift.im/whiteboard",WhiteboardParser.class));
+        addFactory(new GenericPayloadParserFactory<UserLocationParser>("geoloc", "http://jabber.org/protocol/geoloc", UserLocationParser.class));
+        addFactory(new GenericPayloadParserFactory<UserTuneParser>("tune", "http://jabber.org/protocol/tune", UserTuneParser.class));
+        addFactory(new DeliveryReceiptParserFactory());
+        addFactory(new DeliveryReceiptRequestParserFactory());
+        addFactory(new GenericPayloadParserFactory<IdleParser>("idle", "urn:xmpp:idle:1",IdleParser.class));
+        addFactory(new GenericPayloadParserFactory2<PubSubParser>("pubsub", "http://jabber.org/protocol/pubsub", this, PubSubParser.class));
+        addFactory(new GenericPayloadParserFactory2<PubSubOwnerPubSubParser>("pubsub", "http://jabber.org/protocol/pubsub#owner", this, PubSubOwnerPubSubParser.class));
+        addFactory(new GenericPayloadParserFactory2<PubSubEventParser>("event", "http://jabber.org/protocol/pubsub#event", this, PubSubEventParser.class));
+        addFactory(new PubSubErrorParserFactory());
+        addFactory(new GenericPayloadParserFactory<ResultSetParser>("set", "http://jabber.org/protocol/rsm", ResultSetParser.class));
+        addFactory(new GenericPayloadParserFactory2<ForwardedParser>("forwarded", "urn:xmpp:forward:0", this, ForwardedParser.class));
+        addFactory(new GenericPayloadParserFactory2<MAMResultParser>("result", "urn:xmpp:mam:0", this, MAMResultParser.class));
+        addFactory(new GenericPayloadParserFactory<MAMQueryParser>("query", "urn:xmpp:mam:0", MAMQueryParser.class));
+        addFactory(new GenericPayloadParserFactory<MAMFinParser>("fin", "urn:xmpp:mam:0", MAMFinParser.class));
+        addFactory(new GenericPayloadParserFactory<IsodeIQDelegationParser>("delegate", "http://isode.com/iq_delegation", IsodeIQDelegationParser.class));
+        addFactory(new GenericPayloadParserFactory<CarbonsEnableParser>("enable", "urn:xmpp:carbons:2", CarbonsEnableParser.class));
+        addFactory(new GenericPayloadParserFactory<CarbonsDisableParser>("disable", "urn:xmpp:carbons:2", CarbonsDisableParser.class));
+        addFactory(new GenericPayloadParserFactory2<CarbonsReceivedParser>("received", "urn:xmpp:carbons:2", this, CarbonsReceivedParser.class));
+        addFactory(new GenericPayloadParserFactory2<CarbonsSentParser>("sent", "urn:xmpp:carbons:2", this, CarbonsSentParser.class));
+        addFactory(new GenericPayloadParserFactory<CarbonsPrivateParser>("private", "urn:xmpp:carbons:2", CarbonsPrivateParser.class));
 
         PayloadParserFactory defaultFactory = new RawXMLPayloadParserFactory();
         setDefaultFactory(defaultFactory);
diff --git a/src/com/isode/stroke/serializer/payloadserializers/FullPayloadSerializerCollection.java b/src/com/isode/stroke/serializer/payloadserializers/FullPayloadSerializerCollection.java
index dff8f6b..0a4b578 100644
--- a/src/com/isode/stroke/serializer/payloadserializers/FullPayloadSerializerCollection.java
+++ b/src/com/isode/stroke/serializer/payloadserializers/FullPayloadSerializerCollection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2015, Isode Limited, London, England.
+ * Copyright (c) 2010-2016, Isode Limited, London, England.
  * All rights reserved.
  */
 package com.isode.stroke.serializer.payloadserializers;
@@ -15,75 +15,83 @@ import com.isode.stroke.serializer.PayloadSerializerCollection;
 public class FullPayloadSerializerCollection extends PayloadSerializerCollection {
 
     public FullPayloadSerializerCollection() {
-	addSerializer(new BodySerializer());
-	addSerializer(new SubjectSerializer());
-	addSerializer(new ChatStateSerializer());
-	addSerializer(new CarbonsDisableSerializer());
-	addSerializer(new CarbonsEnableSerializer());
-	addSerializer(new CarbonsPrivateSerializer());
-	addSerializer(new CarbonsReceivedSerializer(this));
-	addSerializer(new CarbonsSentSerializer(this));
-	addSerializer(new PrioritySerializer());
-	addSerializer(new ErrorSerializer(this));
-	addSerializer(new InBandRegistrationPayloadSerializer());
-	addSerializer(new IBBSerializer());
-	addSerializer(new JingleIBBTransportPayloadSerializer());
-	addSerializer(new JingleS5BTransportPayloadSerializer());
-	addSerializer(new JingleFileTransferFileInfoSerializer());
-	addSerializer(new JingleFileTransferDescriptionSerializer());
-	addSerializer(new JingleFileTransferHashSerializer());
-	addSerializer(new JingleContentPayloadSerializer());
-	addSerializer(new RosterSerializer());
-	addSerializer(new RosterItemExchangeSerializer());
-	addSerializer(new MUCPayloadSerializer());
-	addSerializer(new MUCDestroyPayloadSerializer());
-	addSerializer(new MUCAdminPayloadSerializer());
-	addSerializer(new MUCInvitationPayloadSerializer());
-	addSerializer(new MUCOwnerPayloadSerializer(this));
-	addSerializer(new MUCUserPayloadSerializer(this));
-	addSerializer(new SoftwareVersionSerializer());
-	addSerializer(new StatusSerializer());
-	addSerializer(new StatusShowSerializer());
-	addSerializer(new DiscoInfoSerializer());
-	addSerializer(new DiscoItemsSerializer());
-	addSerializer(new CapsInfoSerializer());
-	addSerializer(new ResourceBindSerializer());
-	addSerializer(new StartSessionSerializer());
-	addSerializer(new SecurityLabelSerializer());
-	addSerializer(new SecurityLabelsCatalogSerializer());
-	addSerializer(new StreamInitiationFileInfoSerializer());
-	addSerializer(new StreamInitiationSerializer());
-	addSerializer(new ThreadSerializer());
-	addSerializer(new BytestreamsSerializer());
-	addSerializer(new VCardSerializer());
-	addSerializer(new VCardUpdateSerializer());
-	addSerializer(new RawXMLPayloadSerializer());
-	addSerializer(new StorageSerializer());
-	addSerializer(new DelaySerializer());
+        addSerializer(new IBBSerializer());
+        addSerializer(new BodySerializer());
+        addSerializer(new SubjectSerializer());
+        addSerializer(new ThreadSerializer());
+        addSerializer(new ChatStateSerializer());
+        addSerializer(new PrioritySerializer());
+        addSerializer(new ErrorSerializer(this));
+        addSerializer(new RosterSerializer());
+        addSerializer(new RosterItemExchangeSerializer());
+        addSerializer(new MUCPayloadSerializer());
+        addSerializer(new MUCDestroyPayloadSerializer());
+        addSerializer(new MUCAdminPayloadSerializer());
+        addSerializer(new MUCInvitationPayloadSerializer());
+        addSerializer(new MUCOwnerPayloadSerializer(this));
+        addSerializer(new MUCUserPayloadSerializer(this));
+        addSerializer(new SoftwareVersionSerializer());
+        addSerializer(new StatusSerializer());
+        addSerializer(new StatusShowSerializer());
+        addSerializer(new DiscoInfoSerializer());
+        addSerializer(new DiscoItemsSerializer());
+        addSerializer(new CapsInfoSerializer());
+        // addSerializer(new BlockSerializer<BlockPayload>("block"));
+        // addSerializer(new BlockSerializer<UnblockPayload>("unblock"));
+        // addSerializer(new BlockSerializer<BlockListPayload>("blocklist"));
+        addSerializer(new ResourceBindSerializer());
+        addSerializer(new StartSessionSerializer());
+        addSerializer(new SecurityLabelSerializer());
+        addSerializer(new SecurityLabelsCatalogSerializer());
+        addSerializer(new StreamInitiationSerializer());
+        addSerializer(new BytestreamsSerializer());
+        addSerializer(new VCardSerializer());
+        addSerializer(new VCardUpdateSerializer());
+        addSerializer(new RawXMLPayloadSerializer());
+        addSerializer(new StorageSerializer());
+        addSerializer(new DelaySerializer());
         addSerializer(new FormSerializer());
-	addSerializer(new PrivateStorageSerializer(this));
+        addSerializer(new PrivateStorageSerializer(this));
         addSerializer(new CommandSerializer());
-	addSerializer(new NicknameSerializer());
+        addSerializer(new InBandRegistrationPayloadSerializer());
+        addSerializer(new NicknameSerializer());
         addSerializer(new SearchPayloadSerializer());
         addSerializer(new ReplaceSerializer());
         addSerializer(new LastSerializer());
+        // addSerializer(new WhiteboardSerializer());
+        addSerializer(new UserLocationSerializer(this));
+        addSerializer(new UserTuneSerializer(this));
         addSerializer(new IdleSerializer());
 
+        addSerializer(new StreamInitiationFileInfoSerializer());
+        addSerializer(new JingleFileTransferFileInfoSerializer());
+        addSerializer(new JingleContentPayloadSerializer());
+        addSerializer(new JingleFileTransferDescriptionSerializer());
+        addSerializer(new JingleFileTransferHashSerializer());
+        addSerializer(new JingleIBBTransportPayloadSerializer());
+        addSerializer(new JingleS5BTransportPayloadSerializer());
+        addSerializer(new JinglePayloadSerializer(this));
+        addSerializer(new S5BProxyRequestSerializer());
         addSerializer(new DeliveryReceiptSerializer());
         addSerializer(new DeliveryReceiptRequestSerializer());
 
-		addSerializer(new PubSubSerializer(this));
-		addSerializer(new PubSubEventSerializer(this));
-		addSerializer(new PubSubOwnerPubSubSerializer(this));
-		addSerializer(new PubSubErrorSerializer());
-		
+        addSerializer(new PubSubSerializer(this));
+        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 MAMFinSerializer());
-        addSerializer(new UserTuneSerializer(this));
-        addSerializer(new UserLocationSerializer(this));
+
+        addSerializer(new CarbonsDisableSerializer());
+        addSerializer(new CarbonsEnableSerializer());
+        addSerializer(new CarbonsPrivateSerializer());
+        addSerializer(new CarbonsReceivedSerializer(this));
+        addSerializer(new CarbonsSentSerializer(this));
+
         addSerializer(new IsodeIQDelegationSerializer(this));
     }
author	Alex Clayton <alex.clayton@isode.com>	2016-01-29 15:32:25 (GMT)
committer	Alex Clayton <alex.clayton@isode.com>	2016-02-02 16:52:54 (GMT)
commit	2c9305a872e4ca958bfd86472c4540cc10d11a2f (patch)
tree	6da5005540c406b5185fc65cce4f768bd6596476 /src/com/isode
parent	f21f0d6f9c3662c4f224383ec84c69317c465514 (diff)
download	stroke-2c9305a872e4ca958bfd86472c4540cc10d11a2f.zip stroke-2c9305a872e4ca958bfd86472c4540cc10d11a2f.tar.bz2