]> granicus.if.org Git - icinga2/commitdiff
Rename statusqueryhandler to objectqueryhandler
authorJean-Marcel Flach <jean-marcel.flach@netways.de>
Thu, 24 Sep 2015 15:38:44 +0000 (17:38 +0200)
committerJean-Marcel Flach <jean-marcel.flach@netways.de>
Thu, 24 Sep 2015 15:38:44 +0000 (17:38 +0200)
fixes #10209

lib/remote/CMakeLists.txt
lib/remote/objectqueryhandler.cpp [moved from lib/remote/statusqueryhandler.cpp with 96% similarity]
lib/remote/objectqueryhandler.hpp [moved from lib/remote/statusqueryhandler.hpp with 89% similarity]

index f802bbb3990502da0d6ce8885f6c9f2e2c8f18ab..66cc2eefec76d4f2715ed4d87e16c9dbae0456f4 100644 (file)
@@ -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
 )
 
similarity index 96%
rename from lib/remote/statusqueryhandler.cpp
rename to lib/remote/objectqueryhandler.cpp
index 43bc3cdebd818e8e743e05cf5971fa76d29bb7ef..31cd6ea96c145c6e6f336e0a11dfa130d151b619 100644 (file)
@@ -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;
similarity index 89%
rename from lib/remote/statusqueryhandler.hpp
rename to lib/remote/objectqueryhandler.hpp
index 375efef470b23419ced00715b91a277b4e59de0e..be4749fcce56f628664ace97be16b850acb06019 100644 (file)
  * 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 */