BlockPayload(Parser|Serializer) is already implemented in Swiften

12 files changed, 20 insertions, 163 deletions

diff --git a/spectrum/src/frontends/xmpp/BlockParser.cpp b/spectrum/src/frontends/xmpp/BlockParser.cpp
deleted file mode 100644
index a2c91195..00000000
--- a/spectrum/src/frontends/xmpp/BlockParser.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2011 Jan Kaluza
- * Licensed under the Simplified BSD license.
- * See Documentation/Licenses/BSD-simplified.txt for more information.
- */
-
-#include <BlockParser.h>
-
-namespace Transport {
-
-// This payload is NOT part of ANY XEP and it is only
-// libtransport related extension.
-BlockParser::BlockParser() /*: level_(0)*/ {
-}
-
-void BlockParser::handleStartElement(const std::string& /*element*/, const std::string& /*ns*/, const Swift::AttributeMap& /*attributes*/) {
-}
-
-void BlockParser::handleEndElement(const std::string&, const std::string&) {
-}
-
-void BlockParser::handleCharacterData(const std::string&) {
-
-}
-
-}
diff --git a/spectrum/src/frontends/xmpp/BlockParser.h b/spectrum/src/frontends/xmpp/BlockParser.h
deleted file mode 100644
index b8fb343b..00000000
--- a/spectrum/src/frontends/xmpp/BlockParser.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2011 Jan Kaluza
- * Licensed under the Simplified BSD license.
- * See Documentation/Licenses/BSD-simplified.txt for more information.
- */
-
-#pragma once
-
-#include <BlockPayload.h>
-#include <Swiften/Parser/GenericPayloadParser.h>
-
-// This payload is NOT part of ANY XEP and it is only
-// libtransport related extension.
-namespace Transport {
-	class BlockParser : public Swift::GenericPayloadParser<BlockPayload> {
-		public:
-			BlockParser();
-
-			virtual void handleStartElement(const std::string& element, const std::string&, const Swift::AttributeMap& attributes);
-			virtual void handleEndElement(const std::string& element, const std::string&);
-			virtual void handleCharacterData(const std::string& data);
-
-// 		private:
-// 			int level_;
-	};
-}
diff --git a/spectrum/src/frontends/xmpp/BlockPayload.cpp b/spectrum/src/frontends/xmpp/BlockPayload.cpp
deleted file mode 100644
index 5879a32f..00000000
--- a/spectrum/src/frontends/xmpp/BlockPayload.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2011 Jan Kaluza
- * Licensed under the Simplified BSD license.
- * See Documentation/Licenses/BSD-simplified.txt for more information.
- */
-
-#include <BlockPayload.h>
-
-namespace Transport {
-
-// This payload is NOT part of ANY XEP and it is only
-// libtransport related extension.
-BlockPayload::BlockPayload() {
-	
-}
-
-}
diff --git a/spectrum/src/frontends/xmpp/BlockPayload.h b/spectrum/src/frontends/xmpp/BlockPayload.h
deleted file mode 100644
index 4456efe9..00000000
--- a/spectrum/src/frontends/xmpp/BlockPayload.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2011 Jan Kaluza
- * Licensed under the Simplified BSD license.
- * See Documentation/Licenses/BSD-simplified.txt for more information.
- */
-
-#pragma once
-
-#include <vector>
-#include <string>
-
-#include <Swiften/Elements/Payload.h>
-
-// This payload is NOT part of ANY XEP and it is only
-// libtransport related extension.
-namespace Transport {
-	class BlockPayload : public Swift::Payload {
-		public:
-			typedef std::shared_ptr<BlockPayload> ref;
-
-		public:
-			BlockPayload();
-	};
-}
diff --git a/spectrum/src/frontends/xmpp/BlockSerializer.cpp b/spectrum/src/frontends/xmpp/BlockSerializer.cpp
deleted file mode 100644
index eff0fda1..00000000
--- a/spectrum/src/frontends/xmpp/BlockSerializer.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2011 Jan Kaluza
- * Licensed under the Simplified BSD license.
- * See Documentation/Licenses/BSD-simplified.txt for more information.
- */
-
-#include <BlockSerializer.h>
-
-#include <boost/shared_ptr.hpp>
-
-#include <Swiften/Serializer/XML/XMLTextNode.h>
-#include <Swiften/Serializer/XML/XMLRawTextNode.h>
-#include <Swiften/Serializer/XML/XMLElement.h>
-
-namespace Transport {
-
-// This payload is NOT part of ANY XEP and it is only
-// libtransport related extension.
-BlockSerializer::BlockSerializer() : Swift::GenericPayloadSerializer<BlockPayload>() {
-}
-
-std::string BlockSerializer::serializePayload(std::shared_ptr<BlockPayload> attention)  const {
-	Swift::XMLElement attentionElement("block", "urn:xmpp:block:0");
-
-	return attentionElement.serialize();
-}
-
-}
diff --git a/spectrum/src/frontends/xmpp/BlockSerializer.h b/spectrum/src/frontends/xmpp/BlockSerializer.h
deleted file mode 100644
index a3559c92..00000000
--- a/spectrum/src/frontends/xmpp/BlockSerializer.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2011 Jan Kaluza
- * Licensed under the Simplified BSD license.
- * See Documentation/Licenses/BSD-simplified.txt for more information.
- */
-
-#pragma once
-
-#include <Swiften/Serializer/GenericPayloadSerializer.h>
-#include <BlockPayload.h>
-
-// This payload is NOT part of ANY XEP and it is only
-// libtransport related extension.
-namespace Transport {
-	class BlockSerializer : public Swift::GenericPayloadSerializer<BlockPayload> {
-		public:
-			BlockSerializer();
-
-			virtual std::string serializePayload(std::shared_ptr<BlockPayload>)  const;
-	};
-}
diff --git a/spectrum/src/frontends/xmpp/XMPPFrontend.cpp b/spectrum/src/frontends/xmpp/XMPPFrontend.cpp
index ffc35586..71d1b8b8 100644
--- a/spectrum/src/frontends/xmpp/XMPPFrontend.cpp
+++ b/spectrum/src/frontends/xmpp/XMPPFrontend.cpp
@@ -55,8 +55,9 @@
 #include "Swiften/Serializer/PayloadSerializers/GatewayPayloadSerializer.h"
 #include "Swiften/Serializer/PayloadSerializers/SpectrumErrorSerializer.h"
 #include "Swiften/Parser/PayloadParsers/MUCPayloadParser.h"
-#include "BlockParser.h"
-#include "BlockSerializer.h"
+#include <Swiften/Elements/BlockPayload.h>
+#include <Swiften/Parser/PayloadParsers/BlockParser.h>
+#include <Swiften/Serializer/PayloadSerializers/BlockSerializer.h>
 #include "Swiften/Parser/PayloadParsers/InvisibleParser.h"
 #include "Swiften/Serializer/PayloadSerializers/InvisibleSerializer.h"
 #include "Swiften/Parser/PayloadParsers/HintPayloadParser.h"
@@ -108,7 +109,7 @@ void XMPPFrontend::init(Component *transport, Swift::EventLoop *loop, Swift::Net
 	m_parserFactories.push_back(new Swift::GenericPayloadParserFactory<StorageParser>("private", "jabber:iq:private"));
 	m_parserFactories.push_back(new Swift::GenericPayloadParserFactory<Swift::AttentionParser>("attention", "urn:xmpp:attention:0"));
 	m_parserFactories.push_back(new Swift::GenericPayloadParserFactory<Swift::XHTMLIMParser>("html", "http://jabber.org/protocol/xhtml-im"));
-	m_parserFactories.push_back(new Swift::GenericPayloadParserFactory<Transport::BlockParser>("block", "urn:xmpp:block:0"));
+	m_parserFactories.push_back(new Swift::GenericPayloadParserFactory<Swift::BlockParser<Swift::BlockPayload>>("block", "urn:xmpp:block:0"));
 	m_parserFactories.push_back(new Swift::GenericPayloadParserFactory<Swift::InvisibleParser>("invisible", "urn:xmpp:invisible:0"));
 	m_parserFactories.push_back(new Swift::GenericPayloadParserFactory<Swift::StatsParser>("query", "http://jabber.org/protocol/stats"));
 	m_parserFactories.push_back(new Swift::GenericPayloadParserFactory<Swift::GatewayPayloadParser>("query", "jabber:iq:gateway"));
@@ -120,7 +121,7 @@ void XMPPFrontend::init(Component *transport, Swift::EventLoop *loop, Swift::Net
 
 	m_payloadSerializers.push_back(new Swift::AttentionSerializer());
 	m_payloadSerializers.push_back(new Swift::XHTMLIMSerializer());
-	m_payloadSerializers.push_back(new Transport::BlockSerializer());
+	m_payloadSerializers.push_back(new Swift::BlockSerializer<Swift::BlockPayload>("block"));
 	m_payloadSerializers.push_back(new Swift::InvisibleSerializer());
 	m_payloadSerializers.push_back(new Swift::StatsSerializer());
 	m_payloadSerializers.push_back(new Swift::SpectrumErrorSerializer());
diff --git a/spectrum/src/frontends/xmpp/blockresponder.cpp b/spectrum/src/frontends/xmpp/blockresponder.cpp
index d864b8d0..8c8c666f 100644
--- a/spectrum/src/frontends/xmpp/blockresponder.cpp
+++ b/spectrum/src/frontends/xmpp/blockresponder.cpp
@@ -22,8 +22,7 @@
 
 #include <iostream>
 #include <boost/bind.hpp>
-#include "Swiften/Queries/IQRouter.h"
-#include "BlockPayload.h"
+#include <Swiften/Queries/IQRouter.h>
 #include "transport/UserManager.h"
 #include "transport/User.h"
 #include "transport/Buddy.h"
@@ -36,7 +35,7 @@ namespace Transport {
 
 DEFINE_LOGGER(blockResponderLogger, "BlockResponder");
 
-BlockResponder::BlockResponder(Swift::IQRouter *router, UserManager *userManager) : Swift::SetResponder<BlockPayload>(router) {
+BlockResponder::BlockResponder(Swift::IQRouter *router, UserManager *userManager) : Swift::SetResponder<Swift::BlockPayload>(router) {
 	m_userManager = userManager;
 }
 
@@ -44,7 +43,7 @@ BlockResponder::~BlockResponder() {
 	
 }
 
-bool BlockResponder::handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, std::shared_ptr<Transport::BlockPayload> info) {
+bool BlockResponder::handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, std::shared_ptr<Swift::BlockPayload> info) {
 	User *user = m_userManager->getUser(from.toBare().toString());
 	if (!user) {
 		LOG4CXX_WARN(blockResponderLogger, from.toBare().toString() << ": User is not logged in");
diff --git a/spectrum/src/frontends/xmpp/blockresponder.h b/spectrum/src/frontends/xmpp/blockresponder.h
index d6a2b187..7b5758c0 100644
--- a/spectrum/src/frontends/xmpp/blockresponder.h
+++ b/spectrum/src/frontends/xmpp/blockresponder.h
@@ -24,15 +24,16 @@
 
 #include <boost/signals2.hpp>
 
-#include "Swiften/Queries/SetResponder.h"
-#include "BlockPayload.h"
+#include <Swiften/Elements/BlockPayload.h>
+#include <Swiften/Queries/SetResponder.h>
+
 
 namespace Transport {
 
 class UserManager;
 class Buddy;
 
-class BlockResponder : public Swift::SetResponder<Transport::BlockPayload> {
+class BlockResponder : public Swift::SetResponder<Swift::BlockPayload> {
 	public:
 		BlockResponder(Swift::IQRouter *router, UserManager *userManager);
 		~BlockResponder();
@@ -40,7 +41,7 @@ class BlockResponder : public Swift::SetResponder<Transport::BlockPayload> {
 		boost::signals2::signal<void (Buddy *)> onBlockToggled;
 
 	private:
-		virtual bool handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, std::shared_ptr<Transport::BlockPayload> payload);
+		virtual bool handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, std::shared_ptr<Swift::BlockPayload> payload);
 
 		UserManager *m_userManager;
 };
diff --git a/tests/libtransport/BasicSlackTest.cpp b/tests/libtransport/BasicSlackTest.cpp
index c76d4c15..59d8d548 100644
--- a/tests/libtransport/BasicSlackTest.cpp
+++ b/tests/libtransport/BasicSlackTest.cpp
@@ -26,8 +26,6 @@
 #include "Swiften/Serializer/PayloadSerializers/GatewayPayloadSerializer.h"
 #include "Swiften/Serializer/PayloadSerializers/SpectrumErrorSerializer.h"
 #include "Swiften/Parser/PayloadParsers/MUCPayloadParser.h"
-#include "BlockParser.h"
-#include "BlockSerializer.h"
 #include "Swiften/Parser/PayloadParsers/InvisibleParser.h"
 #include "Swiften/Serializer/PayloadSerializers/InvisibleSerializer.h"
 
diff --git a/tests/libtransport/basictest.cpp b/tests/libtransport/basictest.cpp
index 463b3226..034c427d 100644
--- a/tests/libtransport/basictest.cpp
+++ b/tests/libtransport/basictest.cpp
@@ -28,8 +28,6 @@
 #include "Swiften/Serializer/PayloadSerializers/GatewayPayloadSerializer.h"
 #include "Swiften/Serializer/PayloadSerializers/SpectrumErrorSerializer.h"
 #include "Swiften/Parser/PayloadParsers/MUCPayloadParser.h"
-#include "BlockParser.h"
-#include "BlockSerializer.h"
 #include "Swiften/Parser/PayloadParsers/InvisibleParser.h"
 #include "Swiften/Serializer/PayloadSerializers/InvisibleSerializer.h"
 #include "Swiften/Parser/PayloadParsers/HintPayloadParser.h"
@@ -69,7 +67,7 @@ void BasicTest::setMeUp (void) {
 	parserFactories.push_back(new Swift::GenericPayloadParserFactory<StorageParser>("private", "jabber:iq:private"));
 	parserFactories.push_back(new Swift::GenericPayloadParserFactory<Swift::AttentionParser>("attention", "urn:xmpp:attention:0"));
 	parserFactories.push_back(new Swift::GenericPayloadParserFactory<Swift::XHTMLIMParser>("html", "http://jabber.org/protocol/xhtml-im"));
-	parserFactories.push_back(new Swift::GenericPayloadParserFactory<Transport::BlockParser>("block", "urn:xmpp:block:0"));
+	parserFactories.push_back(new Swift::GenericPayloadParserFactory<Swift::BlockParser<Swift::BlockPayload>>("block", "urn:xmpp:block:0"));
 	parserFactories.push_back(new Swift::GenericPayloadParserFactory<Swift::InvisibleParser>("invisible", "urn:xmpp:invisible:0"));
 	parserFactories.push_back(new Swift::GenericPayloadParserFactory<Swift::StatsParser>("query", "http://jabber.org/protocol/stats"));
 	parserFactories.push_back(new Swift::GenericPayloadParserFactory<Swift::GatewayPayloadParser>("query", "jabber:iq:gateway"));
@@ -86,7 +84,7 @@ void BasicTest::setMeUp (void) {
 
 	_payloadSerializers.push_back(new Swift::AttentionSerializer());
 	_payloadSerializers.push_back(new Swift::XHTMLIMSerializer());
-	_payloadSerializers.push_back(new Transport::BlockSerializer());
+	_payloadSerializers.push_back(new Swift::BlockSerializer<Swift::BlockPayload>("block"));
 	_payloadSerializers.push_back(new Swift::InvisibleSerializer());
 	_payloadSerializers.push_back(new Swift::StatsSerializer());
 	_payloadSerializers.push_back(new Swift::SpectrumErrorSerializer());
diff --git a/tests/libtransport/basictest.h b/tests/libtransport/basictest.h
index 26734ced..3b3fe08c 100644
--- a/tests/libtransport/basictest.h
+++ b/tests/libtransport/basictest.h
@@ -49,9 +49,11 @@
 #include <Swiften/Server/Server.h>
 #include <Swiften/Network/DummyNetworkFactories.h>
 #include <Swiften/Network/DummyConnectionServer.h>
-#include "Swiften/Server/ServerStanzaChannel.h"
-#include "Swiften/Server/ServerFromClientSession.h"
-#include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"
+#include <Swiften/Server/ServerStanzaChannel.h>
+#include <Swiften/Server/ServerFromClientSession.h>
+#include <Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParsers/MUCPayloadParser.h>
+#include <Swiften/Parser/PayloadParsers/BlockParser.h>
 
 using namespace Transport;