From 15a46958f0a864acc6c9c5e5704f2ed67ab69cbb Mon Sep 17 00:00:00 2001 From: Jean-Marcel Flach Date: Thu, 24 Sep 2015 17:38:44 +0200 Subject: [PATCH] Rename statusqueryhandler to objectqueryhandler fixes #10209 --- lib/remote/CMakeLists.txt | 6 +++--- .../{statusqueryhandler.cpp => objectqueryhandler.cpp} | 6 +++--- .../{statusqueryhandler.hpp => objectqueryhandler.hpp} | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) rename lib/remote/{statusqueryhandler.cpp => objectqueryhandler.cpp} (96%) rename lib/remote/{statusqueryhandler.hpp => objectqueryhandler.hpp} (89%) diff --git a/lib/remote/CMakeLists.txt b/lib/remote/CMakeLists.txt index f802bbb39..66cc2eefe 100644 --- a/lib/remote/CMakeLists.txt +++ b/lib/remote/CMakeLists.txt @@ -22,14 +22,14 @@ mkclass_target(zone.ti zone.tcpp zone.thpp) set(remote_SOURCES actionshandler.cpp apiaction.cpp - apifunction.cpp apilistener.cpp apilistener.thpp apilistener-configsync.cpp - apilistener-filesync.cpp apiuser.cpp apiuser.thpp authority.cpp base64.cpp + apifunction.cpp apilistener.cpp apilistener.thpp apilistener-configsync.cpp + apilistener-filesync.cpp apiuser.cpp apiuser.thpp authority.cpp base64.cpp configfileshandler.cpp configpackageshandler.cpp configpackageutility.cpp configobjectutility.cpp configstageshandler.cpp createobjecthandler.cpp deleteobjecthandler.cpp endpoint.cpp endpoint.thpp filterutility.cpp httpchunkedencoding.cpp httpclientconnection.cpp httpserverconnection.cpp httphandler.cpp httprequest.cpp httpresponse.cpp httputility.cpp jsonrpc.cpp jsonrpcconnection.cpp jsonrpcconnection-heartbeat.cpp - messageorigin.cpp modifyobjecthandler.cpp statushandler.cpp statusqueryhandler.cpp typequeryhandler.cpp + messageorigin.cpp modifyobjecthandler.cpp statushandler.cpp objectqueryhandler.cpp typequeryhandler.cpp url.cpp zone.cpp zone.thpp ) diff --git a/lib/remote/statusqueryhandler.cpp b/lib/remote/objectqueryhandler.cpp similarity index 96% rename from lib/remote/statusqueryhandler.cpp rename to lib/remote/objectqueryhandler.cpp index 43bc3cdeb..31cd6ea96 100644 --- a/lib/remote/statusqueryhandler.cpp +++ b/lib/remote/objectqueryhandler.cpp @@ -17,7 +17,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ******************************************************************************/ -#include "remote/statusqueryhandler.hpp" +#include "remote/objectqueryhandler.hpp" #include "remote/httputility.hpp" #include "remote/filterutility.hpp" #include "base/serializer.hpp" @@ -28,9 +28,9 @@ using namespace icinga; -REGISTER_URLHANDLER("/v1", StatusQueryHandler); +REGISTER_URLHANDLER("/v1", ObjectQueryHandler); -bool StatusQueryHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) +bool ObjectQueryHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) { if (request.RequestMethod != "GET") return false; diff --git a/lib/remote/statusqueryhandler.hpp b/lib/remote/objectqueryhandler.hpp similarity index 89% rename from lib/remote/statusqueryhandler.hpp rename to lib/remote/objectqueryhandler.hpp index 375efef47..be4749fcc 100644 --- a/lib/remote/statusqueryhandler.hpp +++ b/lib/remote/objectqueryhandler.hpp @@ -17,22 +17,22 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ******************************************************************************/ -#ifndef STATUSQUERYHANDLER_H -#define STATUSQUERYHANDLER_H +#ifndef OBJECTQUERYHANDLER_H +#define OBJECTQUERYHANDLER_H #include "remote/httphandler.hpp" namespace icinga { -class I2_REMOTE_API StatusQueryHandler : public HttpHandler +class I2_REMOTE_API ObjectQueryHandler : public HttpHandler { public: - DECLARE_PTR_TYPEDEFS(StatusQueryHandler); + DECLARE_PTR_TYPEDEFS(ObjectQueryHandler); virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) override; }; } -#endif /* STATUSQUERYHANDLER_H */ +#endif /* OBJECTQUERYHANDLER_H */ -- 2.40.0