From 03e7a5b2fefa08d49ef34e70bfb1d52f0a7d828e Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 12 Mar 2009 20:26:36 +0100 Subject: Request-Klassen vereinfacht --- src/Common/Makefile.am | 2 +- src/Common/Makefile.in | 5 ++-- src/Common/Request.cpp | 41 ++++++++++++++++++++++++++++ src/Common/Request.h | 1 + src/Common/Requests/FSInfoRequest.cpp | 48 --------------------------------- src/Common/Requests/FSInfoRequest.h | 10 +++---- src/Common/Requests/Makefile.am | 4 +-- src/Common/Requests/Makefile.in | 12 ++++----- src/Common/Requests/SimpleRequest.cpp | 37 +++++++++++++++++++++++++ src/Common/Requests/SimpleRequest.h | 44 ++++++++++++++++++++++++++++++ src/Common/Requests/StatusRequest.cpp | 45 ------------------------------- src/Common/Requests/StatusRequest.h | 10 +++---- src/Common/Requests/UserListRequest.cpp | 45 ------------------------------- src/Common/Requests/UserListRequest.h | 10 +++---- 14 files changed, 143 insertions(+), 171 deletions(-) create mode 100644 src/Common/Request.cpp delete mode 100644 src/Common/Requests/FSInfoRequest.cpp create mode 100644 src/Common/Requests/SimpleRequest.cpp create mode 100644 src/Common/Requests/SimpleRequest.h delete mode 100644 src/Common/Requests/StatusRequest.cpp delete mode 100644 src/Common/Requests/UserListRequest.cpp (limited to 'src/Common') diff --git a/src/Common/Makefile.am b/src/Common/Makefile.am index e1c22b9..f0a0ad7 100644 --- a/src/Common/Makefile.am +++ b/src/Common/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = Requests RequestHandlers noinst_LTLIBRARIES = libcommon.la libcommon_la_SOURCES = ActionManager.cpp ConfigEntry.cpp ConfigManager.cpp Exception.cpp Initializable.cpp \ - Logger.cpp LogManager.cpp ModuleManager.cpp RequestManager.cpp \ + Logger.cpp LogManager.cpp ModuleManager.cpp Request.cpp RequestManager.cpp \ SystemBackend.cpp Tokenizer.cpp XmlPacket.cpp libcommon_la_LIBADD = Requests/librequests.la RequestHandlers/librequesthandlers.la ../../lib/libgnu.la diff --git a/src/Common/Makefile.in b/src/Common/Makefile.in index d70edc7..9841291 100644 --- a/src/Common/Makefile.in +++ b/src/Common/Makefile.in @@ -55,7 +55,7 @@ libcommon_la_DEPENDENCIES = Requests/librequests.la \ RequestHandlers/librequesthandlers.la ../../lib/libgnu.la am_libcommon_la_OBJECTS = ActionManager.lo ConfigEntry.lo \ ConfigManager.lo Exception.lo Initializable.lo Logger.lo \ - LogManager.lo ModuleManager.lo RequestManager.lo \ + LogManager.lo ModuleManager.lo Request.lo RequestManager.lo \ SystemBackend.lo Tokenizer.lo XmlPacket.lo libcommon_la_OBJECTS = $(am_libcommon_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) @@ -239,7 +239,7 @@ top_srcdir = @top_srcdir@ SUBDIRS = Requests RequestHandlers noinst_LTLIBRARIES = libcommon.la libcommon_la_SOURCES = ActionManager.cpp ConfigEntry.cpp ConfigManager.cpp Exception.cpp Initializable.cpp \ - Logger.cpp LogManager.cpp ModuleManager.cpp RequestManager.cpp \ + Logger.cpp LogManager.cpp ModuleManager.cpp Request.cpp RequestManager.cpp \ SystemBackend.cpp Tokenizer.cpp XmlPacket.cpp libcommon_la_LIBADD = Requests/librequests.la RequestHandlers/librequesthandlers.la ../../lib/libgnu.la @@ -307,6 +307,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LogManager.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Logger.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ModuleManager.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Request.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RequestManager.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SystemBackend.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Tokenizer.Plo@am__quote@ diff --git a/src/Common/Request.cpp b/src/Common/Request.cpp new file mode 100644 index 0000000..0b8715e --- /dev/null +++ b/src/Common/Request.cpp @@ -0,0 +1,41 @@ +/* + * Request.cpp + * + * Copyright (C) 2009 Matthias Schiffer + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include + +#include "Request.h" + +namespace Mad { +namespace Common { + +void Request::handlePacket(Net::Connection *connection _UNUSED_PARAMETER_, uint16_t requestId _UNUSED_PARAMETER_, const XmlPacket &packet) { + if(packet.getType() == "Error") { + finishWithError(Common::Exception(packet["Where"], packet["ErrorCode"], packet["SubCode"], packet["SubSubCode"])); + return; + } + if(packet.getType() != "OK") { + finishWithError(Exception(Exception::UNEXPECTED_PACKET)); + return; // TODO Logging + } + + finish(packet); +} + +} +} diff --git a/src/Common/Request.h b/src/Common/Request.h index b0e6777..ef84194 100644 --- a/src/Common/Request.h +++ b/src/Common/Request.h @@ -53,6 +53,7 @@ class Request : public RequestHandler { void finishWithError(const Exception &e) {exp = e; finished(*this);} virtual void sendRequest(Net::Connection *connection, uint16_t requestId) = 0; + virtual void handlePacket(Net::Connection *connection, uint16_t requestId, const XmlPacket &packet); public: const XmlPacket& getResult() const throw(Exception) { diff --git a/src/Common/Requests/FSInfoRequest.cpp b/src/Common/Requests/FSInfoRequest.cpp deleted file mode 100644 index 7b5574d..0000000 --- a/src/Common/Requests/FSInfoRequest.cpp +++ /dev/null @@ -1,48 +0,0 @@ -/* - * FSInfoRequest.cpp - * - * Copyright (C) 2008 Matthias Schiffer - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#include "FSInfoRequest.h" -#include - -#include - -namespace Mad { -namespace Common { -namespace Requests { - -void FSInfoRequest::sendRequest(Net::Connection *connection, uint16_t requestId) { - XmlPacket packet; - packet.setType("FSInfo"); - - connection->send(packet.encode(requestId)); -} - -void FSInfoRequest::handlePacket(Net::Connection*, uint16_t, const Common::XmlPacket &packet) { - if(packet.getType() != "OK") { - finishWithError(Exception(Exception::UNEXPECTED_PACKET)); - return; // TODO Logging - } - - finish(packet); -} - -} -} -} - diff --git a/src/Common/Requests/FSInfoRequest.h b/src/Common/Requests/FSInfoRequest.h index 39759ab..27a38ed 100644 --- a/src/Common/Requests/FSInfoRequest.h +++ b/src/Common/Requests/FSInfoRequest.h @@ -20,19 +20,15 @@ #ifndef MAD_COMMON_REQUESTS_FSINFOREQUEST_H_ #define MAD_COMMON_REQUESTS_FSINFOREQUEST_H_ -#include "../Request.h" +#include "SimpleRequest.h" namespace Mad { namespace Common { namespace Requests { -class FSInfoRequest : public Request { - protected: - virtual void sendRequest(Net::Connection *connection, uint16_t requestId); - virtual void handlePacket(Net::Connection*, uint16_t, const Common::XmlPacket &packet); - +class FSInfoRequest : public SimpleRequest { public: - FSInfoRequest(slot_type slot) : Request(slot) {} + FSInfoRequest(slot_type slot) : SimpleRequest("FSInfo", slot) {} }; } diff --git a/src/Common/Requests/Makefile.am b/src/Common/Requests/Makefile.am index eae8669..b5c3bec 100644 --- a/src/Common/Requests/Makefile.am +++ b/src/Common/Requests/Makefile.am @@ -1,4 +1,4 @@ noinst_LTLIBRARIES = librequests.la -librequests_la_SOURCES = DisconnectRequest.cpp FSInfoRequest.cpp GSSAPIAuthRequest.cpp StatusRequest.cpp UserListRequest.cpp +librequests_la_SOURCES = DisconnectRequest.cpp GSSAPIAuthRequest.cpp SimpleRequest.cpp -noinst_HEADERS = DisconnectRequest.h FSInfoRequest.h GSSAPIAuthRequest.h StatusRequest.h UserListRequest.h +noinst_HEADERS = DisconnectRequest.h FSInfoRequest.h GSSAPIAuthRequest.h SimpleRequest.h StatusRequest.h UserListRequest.h diff --git a/src/Common/Requests/Makefile.in b/src/Common/Requests/Makefile.in index f8b1bc6..8533102 100644 --- a/src/Common/Requests/Makefile.in +++ b/src/Common/Requests/Makefile.in @@ -52,8 +52,8 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) librequests_la_LIBADD = -am_librequests_la_OBJECTS = DisconnectRequest.lo FSInfoRequest.lo \ - GSSAPIAuthRequest.lo StatusRequest.lo UserListRequest.lo +am_librequests_la_OBJECTS = DisconnectRequest.lo GSSAPIAuthRequest.lo \ + SimpleRequest.lo librequests_la_OBJECTS = $(am_librequests_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/config/depcomp @@ -224,8 +224,8 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LTLIBRARIES = librequests.la -librequests_la_SOURCES = DisconnectRequest.cpp FSInfoRequest.cpp GSSAPIAuthRequest.cpp StatusRequest.cpp UserListRequest.cpp -noinst_HEADERS = DisconnectRequest.h FSInfoRequest.h GSSAPIAuthRequest.h StatusRequest.h UserListRequest.h +librequests_la_SOURCES = DisconnectRequest.cpp GSSAPIAuthRequest.cpp SimpleRequest.cpp +noinst_HEADERS = DisconnectRequest.h FSInfoRequest.h GSSAPIAuthRequest.h SimpleRequest.h StatusRequest.h UserListRequest.h all: all-am .SUFFIXES: @@ -278,10 +278,8 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DisconnectRequest.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FSInfoRequest.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GSSAPIAuthRequest.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StatusRequest.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UserListRequest.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SimpleRequest.Plo@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/src/Common/Requests/SimpleRequest.cpp b/src/Common/Requests/SimpleRequest.cpp new file mode 100644 index 0000000..018ac39 --- /dev/null +++ b/src/Common/Requests/SimpleRequest.cpp @@ -0,0 +1,37 @@ +/* + * SimpleRequest.cpp + * + * Copyright (C) 2009 Matthias Schiffer + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include "SimpleRequest.h" + +#include + +namespace Mad { +namespace Common { +namespace Requests { + +void SimpleRequest::sendRequest(Net::Connection *connection, uint16_t requestId) { + XmlPacket packet; + packet.setType(type); + + connection->send(packet.encode(requestId)); +} + +} +} +} diff --git a/src/Common/Requests/SimpleRequest.h b/src/Common/Requests/SimpleRequest.h new file mode 100644 index 0000000..0426910 --- /dev/null +++ b/src/Common/Requests/SimpleRequest.h @@ -0,0 +1,44 @@ +/* + * SimpleRequest.h + * + * Copyright (C) 2009 Matthias Schiffer + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifndef MAD_COMMON_REQUESTS_SIMPLEREQUEST_H_ +#define MAD_COMMON_REQUESTS_SIMPLEREQUEST_H_ + +#include "../Request.h" + +#include + +namespace Mad { +namespace Common { +namespace Requests { + +class SimpleRequest : public Request { + protected: + const std::string type; + + virtual void sendRequest(Net::Connection *connection, uint16_t requestId); + + SimpleRequest(const std::string &type0, slot_type slot) : Request(slot), type(type0) {} +}; + +} +} +} + +#endif /* MAD_COMMON_REQUESTS_SIMPLEREQUEST_H_ */ diff --git a/src/Common/Requests/StatusRequest.cpp b/src/Common/Requests/StatusRequest.cpp deleted file mode 100644 index 3526e23..0000000 --- a/src/Common/Requests/StatusRequest.cpp +++ /dev/null @@ -1,45 +0,0 @@ -/* - * CoreStatusRequest.cpp - * - * Copyright (C) 2008 Matthias Schiffer - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#include "StatusRequest.h" -#include - -namespace Mad { -namespace Common { -namespace Requests { - -void StatusRequest::sendRequest(Net::Connection *connection, uint16_t requestId) { - XmlPacket packet; - packet.setType("GetStatus"); - - connection->send(packet.encode(requestId)); -} - -void StatusRequest::handlePacket(Net::Connection*, uint16_t, const XmlPacket &packet) { - if(packet.getType() != "OK") { - finishWithError(Exception(Exception::UNEXPECTED_PACKET)); - return; // TODO Logging - } - - finish(packet); -} - -} -} -} diff --git a/src/Common/Requests/StatusRequest.h b/src/Common/Requests/StatusRequest.h index eb24305..d557358 100644 --- a/src/Common/Requests/StatusRequest.h +++ b/src/Common/Requests/StatusRequest.h @@ -20,19 +20,15 @@ #ifndef MAD_COMMON_REQUESTS_STATUSREQUEST_H_ #define MAD_COMMON_REQUESTS_STATUSREQUEST_H_ -#include "../Request.h" +#include "SimpleRequest.h" namespace Mad { namespace Common { namespace Requests { -class StatusRequest : public Request { - protected: - virtual void sendRequest(Net::Connection *connection, uint16_t requestId); - virtual void handlePacket(Net::Connection *connection, uint16_t, const XmlPacket &packet); - +class StatusRequest : public SimpleRequest { public: - StatusRequest(slot_type slot) : Request(slot) {} + StatusRequest(slot_type slot) : SimpleRequest("GetStatus", slot) {} }; } diff --git a/src/Common/Requests/UserListRequest.cpp b/src/Common/Requests/UserListRequest.cpp deleted file mode 100644 index 2545677..0000000 --- a/src/Common/Requests/UserListRequest.cpp +++ /dev/null @@ -1,45 +0,0 @@ -/* - * UserListRequest.cpp - * - * Copyright (C) 2009 Matthias Schiffer - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#include "UserListRequest.h" -#include - -namespace Mad { -namespace Common { -namespace Requests { - -void UserListRequest::sendRequest(Net::Connection *connection, uint16_t requestId) { - XmlPacket packet; - packet.setType("ListUsers"); - - connection->send(packet.encode(requestId)); -} - -void UserListRequest::handlePacket(Net::Connection*, uint16_t, const XmlPacket &packet) { - if(packet.getType() != "OK") { - finishWithError(Exception(Exception::UNEXPECTED_PACKET)); - return; // TODO Logging - } - - finish(packet); -} - -} -} -} diff --git a/src/Common/Requests/UserListRequest.h b/src/Common/Requests/UserListRequest.h index bcd9578..918925c 100644 --- a/src/Common/Requests/UserListRequest.h +++ b/src/Common/Requests/UserListRequest.h @@ -20,19 +20,15 @@ #ifndef MAD_COMMON_REQUESTS_USERLISTREQUEST_H_ #define MAD_COMMON_REQUESTS_USERLISTREQUEST_H_ -#include "../Request.h" +#include "SimpleRequest.h" namespace Mad { namespace Common { namespace Requests { -class UserListRequest : public Request { - protected: - virtual void sendRequest(Net::Connection *connection, uint16_t requestId); - virtual void handlePacket(Net::Connection *connection, uint16_t, const XmlPacket &packet); - +class UserListRequest : public SimpleRequest { public: - UserListRequest(slot_type slot) : Request(slot) {} + UserListRequest(slot_type slot) : SimpleRequest("ListUsers", slot) {} }; } -- cgit v1.2.3