libtransport.git Changeset - 8bb71e514842

Changeset - 8bb71e514842

Parent rev.

Child rev.

[Not reviewed]

0 9 0

HanzZ - 13 years ago 2012-08-17 10:19:21
hanzz.k@gmail.com

pass UserManager and StorageBackend to adhoc commands

9 files changed with 32 insertions and 12 deletions:

include/transport/adhoccommand.h

include/transport/adhoccommandfactory.h

include/transport/adhocmanager.h

include/transport/settingsadhoccommand.h

spectrum/src/main.cpp

src/adhoccommand.cpp

src/adhocmanager.cpp

src/settingsadhoccommand.cpp

src/tests/settingsadhoccommand.cpp

0 comments (0 inline, 0 general)

include/transport/adhoccommand.h

➞

Show inline comments

@@ @@ -25,19 +25,21 @@ @@
 #include <map>
 #include "Swiften/Swiften.h"
 namespace Transport {
 class Component;
 class UserManager;
 class StorageBackend;
 class AdHocCommand {
 	public:
 		/// Creates new AdHocManager.
 		/// \param component Transport instance associated with this AdHocManager.
 		AdHocCommand(Component *component, const Swift::JID &initiator, const Swift::JID &to);
+		AdHocCommand(Component *component, UserManager *userManager, StorageBackend *storageBackend, const Swift::JID &initiator, const Swift::JID &to);
 		/// Destructor.
 		virtual ~AdHocCommand();
 		virtual boost::shared_ptr<Swift::Command> handleRequest(boost::shared_ptr<Swift::Command> payload) = 0;
@@ @@ -54,12 +56,14 @@ class AdHocCommand { @@
 		time_t getLastActivity() {
 			return m_lastActivity;
+		}
 	protected:
 		Component *m_component;
 		UserManager *m_userManager;
 		StorageBackend *m_storageBackend;
 		Swift::JID m_initiator;
 		Swift::JID m_to;
 		std::vector<Swift::FormField::ref> m_fields;
 		std::string m_id;
 	private:

include/transport/adhoccommandfactory.h

➞

Show inline comments

@@ @@ -26,21 +26,23 @@ @@
 #include "transport/adhoccommand.h"
 #include "Swiften/Swiften.h"
 namespace Transport {
 class Component;
 class UserManager;
 class StorageBackend;
 class AdHocCommandFactory {
 	public:
 		AdHocCommandFactory() {}
 		/// Destructor.
 		virtual ~AdHocCommandFactory() {}
 		virtual AdHocCommand *createAdHocCommand(Component *component, const Swift::JID &initiator, const Swift::JID &to) = 0;
+		virtual AdHocCommand *createAdHocCommand(Component *component, UserManager *userManager, StorageBackend *storageBackend, const Swift::JID &initiator, const Swift::JID &to) = 0;
 		virtual std::string getNode() = 0;
 		virtual std::string getName() = 0;
 };

include/transport/adhocmanager.h

➞

Show inline comments

@@ @@ -30,22 +30,24 @@ namespace Transport { @@
 class Conversation;
 class User;
 class Component;
 class DiscoItemsResponder;
 class AdHocCommandFactory;
 class AdHocCommand;
 class UserManager;
 class StorageBackend;
 /// Listens for AdHoc commands and manages all AdHoc commands sessions
 class AdHocManager : public Swift::Responder<Swift::Command> {
 	public:
 		typedef std::map<std::string, AdHocCommand *> CommandsMap;
 		typedef std::map<Swift::JID, CommandsMap> SessionsMap;
 		/// Creates new AdHocManager.
 		/// \param component Transport instance associated with this AdHocManager.
 		AdHocManager(Component *component, DiscoItemsResponder *discoItemsResponder);
+		AdHocManager(Component *component, DiscoItemsResponder *discoItemsResponder, UserManager *userManager, StorageBackend *storageBackend = NULL);
 		/// Destructor.
 		virtual ~AdHocManager();
 		/// Starts handling AdHoc commands payloads.
 		void start();
 		Component *m_component;
 		DiscoItemsResponder *m_discoItemsResponder;
 		std::map<std::string, AdHocCommandFactory *> m_factories;
 		SessionsMap m_sessions;
 		Swift::Timer::ref m_collectTimer;
 		UserManager *m_userManager;
 		StorageBackend *m_storageBackend;
 };
+}

include/transport/settingsadhoccommand.h

➞

Show inline comments

@@ @@ -28,18 +28,20 @@ @@
 #include "transport/adhoccommandfactory.h"
 namespace Transport {
 class Component;
 class UserManager;
 class StorageBackend;
 class SettingsAdHocCommand : public AdHocCommand {
 	public:
 		typedef enum { Init, WaitingForResponse } State;
 		SettingsAdHocCommand(Component *component, const Swift::JID &initiator, const Swift::JID &to);
+		SettingsAdHocCommand(Component *component, UserManager *userManager, StorageBackend *storageBackend, const Swift::JID &initiator, const Swift::JID &to);
 		/// Destructor.
 		virtual ~SettingsAdHocCommand();
 		virtual boost::shared_ptr<Swift::Command> handleRequest(boost::shared_ptr<Swift::Command> payload);
@@ @@ -51,14 +53,14 @@ class SettingsAdHocCommand : public AdHocCommand { @@
 class SettingsAdHocCommandFactory : public AdHocCommandFactory {
 	public:
 		SettingsAdHocCommandFactory() {}
 		virtual ~SettingsAdHocCommandFactory() {}
 		AdHocCommand *createAdHocCommand(Component *component, const Swift::JID &initiator, const Swift::JID &to) {
 			return new SettingsAdHocCommand(component, initiator, to);
 		AdHocCommand *createAdHocCommand(Component *component, UserManager *userManager, StorageBackend *storageBackend, const Swift::JID &initiator, const Swift::JID &to) {
 			return new SettingsAdHocCommand(component, userManager, storageBackend, initiator, to);
+		}
 		std::string getNode() {
 			return "settings";
+		}

spectrum/src/main.cpp

➞

Show inline comments

@@ @@ -348,13 +348,13 @@ int main(int argc, char **argv) @@
 	GatewayResponder gatewayResponder(transport.getIQRouter(), &userManager);
 	gatewayResponder.start();
 	DiscoItemsResponder discoItemsResponder(&transport);
 	discoItemsResponder.start();
 	AdHocManager adhocmanager(&transport, &discoItemsResponder);
+	AdHocManager adhocmanager(&transport, &discoItemsResponder, &userManager, storageBackend);
 	adhocmanager.start();
 	SettingsAdHocCommandFactory settings;
 	adhocmanager.addAdHocCommand(&settings);
 	eventLoop_ = &eventLoop;

src/adhoccommand.cpp

➞

Show inline comments

@@ @@ -19,23 +19,26 @@ @@
  */
 #include "transport/adhoccommand.h"
 #include "transport/adhoccommandfactory.h"
 #include "transport/conversation.h"
 #include "transport/usermanager.h"
 #include "transport/storagebackend.h"
 #include "transport/buddy.h"
 #include "transport/factory.h"
 #include "transport/user.h"
 #include "transport/logging.h"
 namespace Transport {
 DEFINE_LOGGER(logger, "AdHocCommand");
 AdHocCommand::AdHocCommand(Component *component, const Swift::JID &initiator, const Swift::JID &to) {
+AdHocCommand::AdHocCommand(Component *component, UserManager *userManager, StorageBackend *storageBackend, const Swift::JID &initiator, const Swift::JID &to) {
 	m_component = component;
 	m_userManager = userManager;
 	m_storageBackend = storageBackend;
 	m_initiator = initiator;
 	m_to = to;
 	std::string bucket = "abcdefghijklmnopqrstuvwxyz";
 	for (int i = 0; i < 32; i++) {
 		m_id += bucket[rand() % bucket.size()];

src/adhocmanager.cpp

➞

Show inline comments

@@ @@ -24,20 +24,23 @@ @@
 #include "transport/conversation.h"
 #include "transport/usermanager.h"
 #include "transport/buddy.h"
 #include "transport/factory.h"
 #include "transport/user.h"
 #include "transport/logging.h"
 #include "transport/storagebackend.h"
 namespace Transport {
 DEFINE_LOGGER(logger, "AdHocManager");
 AdHocManager::AdHocManager(Component *component, DiscoItemsResponder *discoItemsResponder) : Swift::Responder<Swift::Command>(component->getIQRouter()){
+AdHocManager::AdHocManager(Component *component, DiscoItemsResponder *discoItemsResponder, UserManager *userManager, StorageBackend *storageBackend) : Swift::Responder<Swift::Command>(component->getIQRouter()){
 	m_component = component;
 	m_discoItemsResponder = discoItemsResponder;
 	m_userManager = userManager;
 	m_storageBackend = storageBackend;
 	m_collectTimer = m_component->getNetworkFactories()->getTimerFactory()->createTimer(20);
 	m_collectTimer->onTick.connect(boost::bind(&AdHocManager::removeOldSessions, this));
 	m_collectTimer->start();
+}
 			sendError(from, id, Swift::ErrorPayload::BadRequest, Swift::ErrorPayload::Modify);
 			return true;
+		}
+	}
 	// Check if we can create command with this node
 	else if (m_factories.find(payload->getNode()) != m_factories.end()) {
 		command = m_factories[payload->getNode()]->createAdHocCommand(m_component, from, to);
+		command = m_factories[payload->getNode()]->createAdHocCommand(m_component, m_userManager, m_storageBackend, from, to);
 		m_sessions[from][command->getId()] = command;
 		LOG4CXX_INFO(logger, from.toString() << ": Started new AdHoc command session with node " << payload->getNode());
+	}
 	else {
 		LOG4CXX_INFO(logger, from.toString() << ": Unknown node " << payload->getNode() << ". Can't start AdHoc command session.");
 		sendError(from, id, Swift::ErrorPayload::BadRequest, Swift::ErrorPayload::Modify);

src/settingsadhoccommand.cpp

➞

Show inline comments

@@ @@ -22,18 +22,20 @@ @@
 #include "transport/conversation.h"
 #include "transport/usermanager.h"
 #include "transport/buddy.h"
 #include "transport/factory.h"
 #include "transport/user.h"
 #include "transport/logging.h"
 #include "transport/storagebackend.h"
 namespace Transport {
 DEFINE_LOGGER(logger, "SettingsAdHocCommand");
 SettingsAdHocCommand::SettingsAdHocCommand(Component *component, const Swift::JID &initiator, const Swift::JID &to) : AdHocCommand(component, initiator, to) {
+SettingsAdHocCommand::SettingsAdHocCommand(Component *component, UserManager *userManager, StorageBackend *storageBackend, const Swift::JID &initiator, const Swift::JID &to) : AdHocCommand(component, userManager, storageBackend, initiator, to) {
 	m_state = Init;
+}
 SettingsAdHocCommand::~SettingsAdHocCommand() {
+}

src/tests/settingsadhoccommand.cpp

➞

Show inline comments

 		AdHocManager *adhoc;
 		SettingsAdHocCommandFactory *settings;
 		void setUp (void) {
 			setMeUp();
 			adhoc = new AdHocManager(component, itemsResponder);
+			adhoc = new AdHocManager(component, itemsResponder, userManager);
 			adhoc->start();
 			settings = new SettingsAdHocCommandFactory();
 			adhoc->addAdHocCommand(settings);
 			received.clear();
+		}

0 comments (0 inline, 0 general)