diff --git a/Modules/CppRestSdk/files.cmake b/Modules/CppRestSdk/files.cmake index 356b6d628d..aa8840e89e 100644 --- a/Modules/CppRestSdk/files.cmake +++ b/Modules/CppRestSdk/files.cmake @@ -1,10 +1,10 @@ file(GLOB_RECURSE H_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include/*") set(CPP_FILES mitkRESTClient.cpp - mitkRESTServerMicroService.cpp + mitkRESTServer.cpp mitkCppRestSdkActivator.cpp mitkIRESTManager.cpp mitkRESTManager.cpp mitkIRESTObserver.cpp ) \ No newline at end of file diff --git a/Modules/CppRestSdk/include/mitkIRESTManager.h b/Modules/CppRestSdk/include/mitkIRESTManager.h index 02f9c6b148..800022ccb9 100644 --- a/Modules/CppRestSdk/include/mitkIRESTManager.h +++ b/Modules/CppRestSdk/include/mitkIRESTManager.h @@ -1,96 +1,96 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #ifndef mitkIRESTManager_h #define mitkIRESTManager_h #include "cpprest/json.h" #include "cpprest/uri.h" #include #include #include #include #include namespace mitk { - class RESTServerMicroService; + class RESTServer; class MITKCPPRESTSDK_EXPORT IRESTManager { public: virtual ~IRESTManager(); /** * @brief request type for client requests by calling SendRequest */ //TODO: Get, Post, Put enum class RequestType { get, post, put }; /** * @brief Executes a HTTP request in the mitkRESTClient class * * @param uri defines the URI the request is send to * @param type the RequestType of the HTTP request (optional) * @param body the body for the request (optional) * @return task to wait for */ virtual pplx::task SendRequest(const web::uri &uri, const RequestType &type = RequestType::get, const web::json::value &body = NULL, const utility::string_t &filePath = L"") = 0; /** * @brief starts listening for requests if there isn't another observer listening and the port is free * * @param uri defines the URI for which incoming requests should be send to the observer * @param observer the observer which handles the incoming requests */ virtual void ReceiveRequest(const web::uri &uri, IRESTObserver *observer) = 0; /** * @brief Handles incoming requests by notifying the observer which should receive it * * @param uri defines the URI of the request * @param body the body of the request * @return the data which is modified by the notified observer */ virtual web::json::value Handle(const web::uri &uri, web::json::value &body) = 0; /** * @brief Handles the deletion of an observer for all or a specific uri * * @param observer the observer which shouldn't receive requests anymore * @param uri the uri for which the observer doesn't handle requests anymore (optional) */ virtual void HandleDeleteObserver(IRESTObserver *observer, const web::uri &uri = L"") = 0; - virtual const std::map& GetM_ServerMap() = 0; + virtual const std::map& GetM_ServerMap() = 0; virtual const std::map, IRESTObserver *>& GetM_Observers() = 0; }; } // namespace mitk MITK_DECLARE_SERVICE_INTERFACE(mitk::IRESTManager, "org.mitk.IRESTManager") #endif diff --git a/Modules/CppRestSdk/include/mitkRESTManager.h b/Modules/CppRestSdk/include/mitkRESTManager.h index 8ec8912d0d..5cb0bc510b 100644 --- a/Modules/CppRestSdk/include/mitkRESTManager.h +++ b/Modules/CppRestSdk/include/mitkRESTManager.h @@ -1,122 +1,122 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #ifndef mitkRESTManager_h #define mitkRESTManager_h #ifdef _MSC_VER #pragma warning(push) #pragma warning(disable : 4251) #endif #include -#include +#include namespace mitk { class MITKCPPRESTSDK_EXPORT RESTManager : public IRESTManager { public: RESTManager(); ~RESTManager() override; /** * @brief Executes a HTTP request in the mitkRESTClient class * * @param uri defines the URI the request is send to * @param type the RequestType of the HTTP request (optional) * @param body the body for the request (optional) * @param filePath the file path to store the request to * @return task to wait for */ //TODO aus body pointer machen, nullptr pplx::task SendRequest(const web::uri &uri, const RequestType &type = RequestType::get, const web::json::value &body= NULL, const utility::string_t &filePath = L"") override; /** * @brief starts listening for requests if there isn't another observer listening and the port is free * * @param uri defines the URI for which incoming requests should be send to the observer * @param observer the observer which handles the incoming requests */ void ReceiveRequest(const web::uri &uri, IRESTObserver *observer) override; /** * @brief Handles incoming requests by notifying the observer which should receive it * * @param uri defines the URI of the request * @param body the body of the request * @return the data which is modified by the notified observer */ //TODO body const web::json::value Handle(const web::uri &uri, web::json::value &body) override; /** * @brief Handles the deletion of an observer for all or a specific uri * * @param observer the observer which shouldn't receive requests anymore * @param uri the uri for which the observer doesn't handle requests anymore (optional) */ virtual void HandleDeleteObserver(IRESTObserver *observer, const web::uri &uri) override; /** * @brief internal use only */ //TODO alternative: aus interface rausnehmen und dynamic casten - virtual const std::map& GetM_ServerMap() override; + virtual const std::map& GetM_ServerMap() override; virtual const std::map, IRESTObserver *>& GetM_Observers() override; protected: /** * @brief adds an observer if a port is free, called by ReceiveRequest method * * @param uri the uri which builds the key for the observer map * @param observer the observer which is added */ void AddObserver(const web::uri &uri, IRESTObserver *observer); /** * @brief handles server management if there is already a server under a port, called by ReceiveRequest method * * @param uri the uri which which is requested to be added * @param observer the observer which proceeds the request */ void ServerUnderPort(const web::uri &uri, IRESTObserver *observer); /** * @brief deletes an observer, called by HandleDeleteObserver method * * @param it the iterator comparing the observers in HandleDeleteObserver method * @param the uri for which the observer doesn't want to receive requests anymore * @return bool if there is another observer under the port */ bool DeleteObserver(std::map < std::pair, IRESTObserver *>::iterator &it, const web::uri &uri); //TODO Member immer private, zugriff über getter/setter - std::map m_ServerMap; // Map with port server pairs + std::map m_ServerMap; // Map with port server pairs std::map, IRESTObserver *> m_Observers; // Map with all observers }; } // namespace mitk #ifdef _MSC_VER #pragma warning(pop) #endif #endif // !mitkRESTManager_h diff --git a/Modules/CppRestSdk/include/mitkRESTServerMicroService.h b/Modules/CppRestSdk/include/mitkRESTServer.h similarity index 89% rename from Modules/CppRestSdk/include/mitkRESTServerMicroService.h rename to Modules/CppRestSdk/include/mitkRESTServer.h index 9fea58588d..4a03d2c966 100644 --- a/Modules/CppRestSdk/include/mitkRESTServerMicroService.h +++ b/Modules/CppRestSdk/include/mitkRESTServer.h @@ -1,80 +1,80 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ -#ifndef mitkRESTServerMicroService_h -#define mitkRESTServerMicroService_h +#ifndef mitkRESTServer_h +#define mitkRESTServer_h #ifdef _MSC_VER #pragma warning(push) #pragma warning(disable : 4251) #endif #include "cpprest/http_listener.h" #include #include #include #include typedef web::http::experimental::listener::http_listener MitkListener; typedef web::http::http_request MitkRequest; typedef web::http::http_response MitkResponse; typedef web::http::methods MitkRESTMethods; typedef web::http::status_codes MitkRestStatusCodes; typedef web::json::json_exception MitkJsonException; namespace mitk { - class MITKCPPRESTSDK_EXPORT RESTServerMicroService + class MITKCPPRESTSDK_EXPORT RESTServer { public: /** * @brief Creates an server listening to the given URI * * @param uri the URI at which the server is listening for requests */ - RESTServerMicroService(const web::uri &uri); - ~RESTServerMicroService(); + RESTServer(const web::uri &uri); + ~RESTServer(); web::uri GetUri(); /** * @brief Opens the listener and starts the listening process */ void OpenListener(); /** * @brief Closes the listener and stops the listening process */ void CloseListener(); private: /** * @brief Handle for incoming GET requests * * @param MitkRequest incoming request object */ void HandleGet(const MitkRequest &request); //TODO private machen protected: MitkListener m_Listener; web::uri m_Uri; }; } // namespace mitk #ifdef _MSC_VER #pragma warning(pop) #endif #endif \ No newline at end of file diff --git a/Modules/CppRestSdk/src/mitkRESTManager.cpp b/Modules/CppRestSdk/src/mitkRESTManager.cpp index 18b2bd8612..e444b9e633 100644 --- a/Modules/CppRestSdk/src/mitkRESTManager.cpp +++ b/Modules/CppRestSdk/src/mitkRESTManager.cpp @@ -1,212 +1,212 @@ #include "mitkRESTManager.h" #include #include mitk::RESTManager::RESTManager() {} mitk::RESTManager::~RESTManager() {} pplx::task mitk::RESTManager::SendRequest(const web::uri &uri, const RequestType &type, const web::json::value &content, const utility::string_t &filePath) { pplx::task answer; auto client = new RESTClient(); // according to the RequestType, different HTTP requests are made switch (type) { case RequestType::get: if (filePath.empty()) { // no file path specified, starts a normal get request returning the normal json result answer = client->Get(uri); } else { // file path ist specified, the result of the get request ist stored in this file // and an empty json object is returned answer = client->Get(uri, filePath); } break; case RequestType::post: //TODO fixen wert vorne bei vergleich if (content == NULL) { // warning because normally you won't create an empty ressource MITK_WARN << "Content for put is empty, this will create an empty ressource"; } answer = client->POST(uri, content); break; case RequestType::put: if (content == NULL) { // warning because normally you won't empty a ressource MITK_WARN << "Content for put is empty, this will empty the ressource"; } answer = client->PUT(uri, content); break; //TODO: default hinzufügen } return answer; } void mitk::RESTManager::ReceiveRequest(const web::uri &uri, mitk::IRESTObserver *observer) { - // New instance of RESTServerMicroservice in m_ServerMap, key is port of the request + // New instance of RESTServer in m_ServerMap, key is port of the request int port = uri.port(); // Checking if port is free to add a new Server if (m_ServerMap.count(port) == 0) { this->AddObserver(uri, observer); // creating server instance - auto server = new RESTServerMicroService(uri.authority()); + auto server = new RESTServer(uri.authority()); // add reference to server instance to map m_ServerMap[port] = server; // start Server server->OpenListener(); MITK_INFO << "new server " << mitk::RESTUtil::convertToUtf8(uri.authority().to_string()) << " at port " << port; } // If there is already a server under this port else { //TODO umbenennen this->ServerUnderPort(uri, observer); } } web::json::value mitk::RESTManager::Handle(const web::uri &uri, web::json::value &body) { // Checking if there is an observer for the port and path std::pair key(uri.port(), uri.path()); if (m_Observers.count(key) != 0) { //TODO Ausgaben minimieren MITK_INFO << "Manager: Data send to observer"; return m_Observers[key]->Notify(body, uri); } - // No observer under this port, return null which results in status code 404 (s. RESTServerMicroService) + // No observer under this port, return null which results in status code 404 (s. RESTServer) else { MITK_WARN << "No Observer can handle the data"; return NULL; } } void mitk::RESTManager::HandleDeleteObserver(IRESTObserver *observer, const web::uri &uri = L"") { for (auto it = m_Observers.begin(); it != m_Observers.end();) { mitk::IRESTObserver *obsMap = it->second; // Check wether observer is at this place in map if (obsMap == observer) { // Check wether it is the right uri to be deleted if (uri.is_empty() || it->first.second == uri.path()) { int port = it->first.first; bool noObserverForPort = this->DeleteObserver(it, uri); if (noObserverForPort) { // there isn't an observer at this port, delete m_ServerMap entry for this port // close listener m_ServerMap[port]->CloseListener(); delete m_ServerMap[port]; // delete server from map m_ServerMap.erase(port); } } else { ++it; } } else { ++it; } } } -const std::map &mitk::RESTManager::GetM_ServerMap() +const std::map &mitk::RESTManager::GetM_ServerMap() { return m_ServerMap; } const std::map, mitk::IRESTObserver *> &mitk::RESTManager::GetM_Observers() { return m_Observers; } void mitk::RESTManager::AddObserver(const web::uri &uri, IRESTObserver *observer) { // new observer has to be added std::pair key(uri.port(), uri.path()); m_Observers[key] = observer; // testing if entry has been added to observer map MITK_INFO << "[" << uri.port() << ", " << mitk::RESTUtil::convertToUtf8(uri.path()) << "] : Number of elements in map: " << m_Observers.count(key); } void mitk::RESTManager::ServerUnderPort(const web::uri &uri, IRESTObserver *observer) { // Same host, means new observer but not a new server instance if (m_ServerMap[uri.port()]->GetUri() == uri.authority()) { // new observer has to be added std::pair key(uri.port(), uri.path()); // only add a new observer if there isn't already an observer for this uri if (m_Observers.count(key) == 0) { this->AddObserver(uri, observer); // info output MITK_INFO << "started listening, no new server instance has been created"; } else { MITK_ERROR << "Threre is already a observer handeling this data"; } } // Error, since another server can't be added under this port else { MITK_ERROR << "There is already another server listening under this port"; } } bool mitk::RESTManager::DeleteObserver(std::map, IRESTObserver *>::iterator &it, const web::uri &uri) { // if yes // 1. store port and path in a temporary variable // (path is only needed to create a key for info output) int port = it->first.first; utility::string_t path = it->first.second; std::pair key(port, path); MITK_INFO << "Number of elements at key [ " << port << ", " << mitk::RESTUtil::convertToUtf8(key.second) << "]: " << m_Observers.count(key); // 2. delete map entry it = m_Observers.erase(it); MITK_INFO << "Number of elements at key [ " << port << ", " << mitk::RESTUtil::convertToUtf8(key.second) << "]: " << m_Observers.count(key); // 3. check, if there is another observer under this port in observer map (with bool flag) for (auto o : m_Observers) { if (o.first.first == port) { // there still exists an observer for this port return false; } } return true; } diff --git a/Modules/CppRestSdk/src/mitkRESTServerMicroService.cpp b/Modules/CppRestSdk/src/mitkRESTServer.cpp similarity index 75% rename from Modules/CppRestSdk/src/mitkRESTServerMicroService.cpp rename to Modules/CppRestSdk/src/mitkRESTServer.cpp index 9bc9825aef..f31f38701d 100644 --- a/Modules/CppRestSdk/src/mitkRESTServerMicroService.cpp +++ b/Modules/CppRestSdk/src/mitkRESTServer.cpp @@ -1,74 +1,74 @@ -#include "mitkRESTServerMicroService.h" +#include "mitkRESTServer.h" #include #include -mitk::RESTServerMicroService::RESTServerMicroService(const web::uri &uri) +mitk::RESTServer::RESTServer(const web::uri &uri) { m_Uri = uri; } -mitk::RESTServerMicroService::~RESTServerMicroService() +mitk::RESTServer::~RESTServer() { } -void mitk::RESTServerMicroService::OpenListener() +void mitk::RESTServer::OpenListener() { //create listener m_Listener = MitkListener(m_Uri); //Connect incoming get requests with HandleGet method m_Listener.support(web::http::methods::GET, - std::bind(&mitk::RESTServerMicroService::HandleGet, this, std::placeholders::_1)); + std::bind(&mitk::RESTServer::HandleGet, this, std::placeholders::_1)); //open listener m_Listener.open().wait(); } -void mitk::RESTServerMicroService::CloseListener() +void mitk::RESTServer::CloseListener() { //close listener m_Listener.close().wait(); } -web::uri mitk::RESTServerMicroService::GetUri() +web::uri mitk::RESTServer::GetUri() { return m_Uri; } -void mitk::RESTServerMicroService::HandleGet(const MitkRequest &request) +void mitk::RESTServer::HandleGet(const MitkRequest &request) { int port = m_Listener.uri().port(); //getting exact request uri has to be a parameter in handle function web::uri_builder build(m_Listener.uri()); build.append(request.absolute_uri()); auto uriStringT = build.to_uri().to_string(); MITK_INFO << "Get Request for server at port " << port << " Exact request uri: " << mitk::RESTUtil::convertToUtf8(uriStringT); web::json::value content; //get RESTManager as microservice to call th Handle method of the manager auto context = us::GetModuleContext(); auto managerRef = context->GetServiceReference(); if (managerRef) { auto managerService = context->GetService(managerRef); if (managerService) { web::json::value data = request.extract_json().get(); MITK_INFO << "Server: Data send to manager"; //call the handle method content = managerService->Handle(build.to_uri(), data); MITK_INFO << "server: Data received from manager"; } } if (content!=NULL) { //content handled by observer request.reply(MitkRestStatusCodes::OK, content); } else { //no observer to handle data request.reply(MitkRestStatusCodes::NotFound); } } \ No newline at end of file diff --git a/Modules/CppRestSdk/test/mitkRESTServerTest.cpp b/Modules/CppRestSdk/test/mitkRESTServerTest.cpp index 08e74c5569..d0d0bf979b 100644 --- a/Modules/CppRestSdk/test/mitkRESTServerTest.cpp +++ b/Modules/CppRestSdk/test/mitkRESTServerTest.cpp @@ -1,262 +1,262 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ // Testing #include "mitkTestFixture.h" #include "mitkTestingMacros.h" // MITK includes -#include "mitkRESTServerMicroService.h" +#include "mitkRESTServer.h" // VTK includes #include class mitkRESTServerTestSuite : public mitk::TestFixture, mitk::IRESTObserver { CPPUNIT_TEST_SUITE(mitkRESTServerTestSuite); MITK_TEST(OpenListener_Succeed); MITK_TEST(TwoListenerSameHostSamePort_OnlyOneOpened); MITK_TEST(CloseListener_Succeed); MITK_TEST(OpenMultipleListenerCloseOne_Succeed); MITK_TEST(OpenMultipleListenerCloseAll_Succeed); MITK_TEST(OpenListenerGetRequestSamePath_ReturnExpectedJSON); MITK_TEST(CloseListener_NoRequestPossible); MITK_TEST(OpenListenerGetRequestDifferentPath_ReturnNotFound); MITK_TEST(OpenListenerCloseAndReopen_Succeed); CPPUNIT_TEST_SUITE_END(); public: mitk::IRESTManager *m_Service; web::json::value m_Data; //TODO: bei Notify uri parameter zuerst //TODO: data als const ref web::json::value Notify(web::json::value &data, const web::uri &uri) override { MITK_INFO << "Observer: Data in observer"; data[L"userId"] = web::json::value(1); data[L"id"] = web::json::value(1); data[L"title"] = web::json::value(U("this is a title")); data[L"body"] = web::json::value(U("this is a body")); return data; } /** * @brief Setup Always call this method before each Test-case to ensure correct and new intialization of the used * members for a new test case. (If the members are not used in a test, the method does not need to be called). */ void setUp() override { m_Data[L"userId"] = web::json::value(1); m_Data[L"id"] = web::json::value(1); m_Data[L"title"] = web::json::value(U("this is a title")); m_Data[L"body"] = web::json::value(U("this is a body")); us::ServiceReference serviceRef = us::GetModuleContext()->GetServiceReference(); if (serviceRef) { m_Service = us::GetModuleContext()->GetService(serviceRef); } //TODO: if(m_Service) überprüfen, exception wenn nicht } void tearDown() override { m_Service->HandleDeleteObserver(this); } void OpenListener_Succeed() { if (m_Service) { m_Service->ReceiveRequest(L"http://localhost:8080/test", this); } CPPUNIT_ASSERT_MESSAGE("Open one listener, observer map size is one", m_Service->GetM_Observers().size() == 1); CPPUNIT_ASSERT_MESSAGE("Open one listener, server map size is one", m_Service->GetM_ServerMap().size() == 1); } void TwoListenerSameHostSamePort_OnlyOneOpened() { if (m_Service) { m_Service->ReceiveRequest(L"http://localhost:8080/test", this); m_Service->ReceiveRequest(L"http://localhost:8080/example", this); } CPPUNIT_ASSERT_MESSAGE("Open two listener with a different path,same host, same port, observer map size is two", m_Service->GetM_Observers().size() == 2); CPPUNIT_ASSERT_MESSAGE("Open two listener with a different path,same host, same port, server map size is one", m_Service->GetM_ServerMap().size() == 1); } void CloseListener_Succeed() { if (m_Service) { m_Service->ReceiveRequest(L"http://localhost:8080/test", this); } CPPUNIT_ASSERT_MESSAGE("Open one listener, observer map size is one", m_Service->GetM_Observers().size() == 1); CPPUNIT_ASSERT_MESSAGE("Open one listener, server map size is one", m_Service->GetM_ServerMap().size() == 1); if (m_Service) { m_Service->HandleDeleteObserver(this); } CPPUNIT_ASSERT_MESSAGE("Closed listener, observer map is empty", m_Service->GetM_Observers().size() == 0); CPPUNIT_ASSERT_MESSAGE("Closed listener, server map is empty", m_Service->GetM_ServerMap().size() == 0); } void OpenMultipleListenerCloseOne_Succeed() { if (m_Service) { m_Service->ReceiveRequest(L"http://localhost:8080/test", this); m_Service->ReceiveRequest(L"http://localhost:8090/example", this); } CPPUNIT_ASSERT_MESSAGE("Open two listener, observer map size is two", m_Service->GetM_Observers().size() == 2); CPPUNIT_ASSERT_MESSAGE("Open two listener, server map size is two", m_Service->GetM_ServerMap().size() == 2); if (m_Service) { m_Service->HandleDeleteObserver(this, L"http://localhost:8080/test"); } CPPUNIT_ASSERT_MESSAGE("Closed one of two listeners, observer map is size is one", m_Service->GetM_Observers().size() == 1); CPPUNIT_ASSERT_MESSAGE("Closed one of two listener, server map size is one", m_Service->GetM_ServerMap().size() == 1); } void OpenMultipleListenerCloseAll_Succeed() { if (m_Service) { m_Service->ReceiveRequest(L"http://localhost:8080/test", this); m_Service->ReceiveRequest(L"http://localhost:8090/example", this); } CPPUNIT_ASSERT_MESSAGE("Open two listener, observer map size is two", m_Service->GetM_Observers().size() == 2); CPPUNIT_ASSERT_MESSAGE("Open two listener, server map size is two", m_Service->GetM_ServerMap().size() == 2); if (m_Service) { m_Service->HandleDeleteObserver(this); } CPPUNIT_ASSERT_MESSAGE("Closed all listeners, observer map is empty", m_Service->GetM_Observers().size() == 0); CPPUNIT_ASSERT_MESSAGE("Closed all listeners, server map is empty", m_Service->GetM_ServerMap().size() == 0); } void OpenListenerGetRequestSamePath_ReturnExpectedJSON() { if (m_Service) { m_Service->ReceiveRequest(L"http://localhost:8080/test", this); } web::json::value *result = new web::json::value(); web::json::value data; data[L"userId"] = web::json::value(1); data[L"id"] = web::json::value(1); data[L"title"] = web::json::value(U("this is a title")); data[L"body"] = web::json::value(U("this is a body")); if (m_Service) { m_Service->SendRequest(L"http://localhost:8080/test") .then([=](pplx::task resultTask) { try { *result = resultTask.get(); } catch (const mitk::Exception &exception) { MITK_ERROR << exception.what(); return; } }) .wait(); } CPPUNIT_ASSERT_MESSAGE("Opened listener and send request to same uri, returned expected JSON", *result == data); } void RequestToClosedListener() { web::json::value *result = new web::json::value(); if (m_Service) { m_Service->SendRequest(L"http://localhost:8080/test") .then([=](pplx::task resultTask) { *result = resultTask.get(); }) .wait(); } } void CloseListener_NoRequestPossible() { if (m_Service) { m_Service->ReceiveRequest(L"http://localhost:8080/test", this); } CPPUNIT_ASSERT_MESSAGE("Open one listener, observer map size is one", m_Service->GetM_Observers().size() == 1); CPPUNIT_ASSERT_MESSAGE("Open one listener, server map size is one", m_Service->GetM_ServerMap().size() == 1); if (m_Service) { m_Service->HandleDeleteObserver(this); } CPPUNIT_ASSERT_MESSAGE("Closed listener, observer map is empty", m_Service->GetM_Observers().size() == 0); CPPUNIT_ASSERT_MESSAGE("Closed listener, server map is empty", m_Service->GetM_ServerMap().size() == 0); CPPUNIT_ASSERT_THROW(RequestToClosedListener(), mitk::Exception); } void RequestToDifferentPathNotFound() { if (m_Service) { m_Service->ReceiveRequest(L"http://localhost:8080/test", this); } web::json::value *result = new web::json::value(); web::json::value data; data[L"userId"] = web::json::value(1); data[L"id"] = web::json::value(1); data[L"title"] = web::json::value(U("this is a title")); data[L"body"] = web::json::value(U("this is a body")); if (m_Service) { m_Service->SendRequest(L"http://localhost:8080/example") .then([=](pplx::task resultTask) { *result = resultTask.get(); }) .wait(); } } void OpenListenerGetRequestDifferentPath_ReturnNotFound() { CPPUNIT_ASSERT_THROW(RequestToDifferentPathNotFound(), mitk::Exception); } void OpenListenerCloseAndReopen_Succeed() { if (m_Service) { m_Service->ReceiveRequest(L"http://localhost:8080/test", this); } CPPUNIT_ASSERT_MESSAGE("Open one listener, observer map size is one", m_Service->GetM_Observers().size() == 1); CPPUNIT_ASSERT_MESSAGE("Open one listener, server map size is one", m_Service->GetM_ServerMap().size() == 1); if (m_Service) { m_Service->HandleDeleteObserver(this); } CPPUNIT_ASSERT_MESSAGE("Closed listener, observer map is empty", m_Service->GetM_Observers().size() == 0); CPPUNIT_ASSERT_MESSAGE("Closed listener, server map is empty", m_Service->GetM_ServerMap().size() == 0); if (m_Service) { m_Service->ReceiveRequest(L"http://localhost:8080/test", this); } CPPUNIT_ASSERT_MESSAGE("Reopened listener, observer map size is one", m_Service->GetM_Observers().size() == 1); CPPUNIT_ASSERT_MESSAGE("Reopened listener, server map size is one", m_Service->GetM_ServerMap().size() == 1); } }; MITK_TEST_SUITE_REGISTRATION(mitkRESTServer) \ No newline at end of file diff --git a/Modules/CppRestSdkQt/include/mitkRESTServerMicroServiceQt.h b/Modules/CppRestSdkQt/include/mitkRESTServerMicroServiceQt.h index 50aca370e1..475166d2b6 100644 --- a/Modules/CppRestSdkQt/include/mitkRESTServerMicroServiceQt.h +++ b/Modules/CppRestSdkQt/include/mitkRESTServerMicroServiceQt.h @@ -1,51 +1,51 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #ifndef mitkRESTServerMicroServiceQt_h #define mitkRESTServerMicroServiceQt_h #include -#include +#include namespace mitk { - class RESTServerMicroServiceQt : public QObject, public RESTServerMicroService + class RESTServerMicroServiceQt : public QObject, public RESTServer { Q_OBJECT public: /** * @brief Creates an server listening to the given URI * * @param uri the URI at which the server is listening for requests */ RESTServerMicroServiceQt(const web::uri &uri); ~RESTServerMicroServiceQt(); public slots: /** * @brief Opens the listener and starts the listening process */ void OpenListener(); /** * @brief Closes the listener and stops the listening process */ void CloseListener(); }; } // namespace mitk #endif \ No newline at end of file diff --git a/Modules/CppRestSdkQt/src/mitkRESTServerMicroServiceQt.cpp b/Modules/CppRestSdkQt/src/mitkRESTServerMicroServiceQt.cpp index 03ce12991a..1cab0425a2 100644 --- a/Modules/CppRestSdkQt/src/mitkRESTServerMicroServiceQt.cpp +++ b/Modules/CppRestSdkQt/src/mitkRESTServerMicroServiceQt.cpp @@ -1,17 +1,17 @@ #include "mitkRESTServerMicroServiceQt.h" -mitk::RESTServerMicroServiceQt::RESTServerMicroServiceQt(const web::uri &uri) : RESTServerMicroService(uri) +mitk::RESTServerMicroServiceQt::RESTServerMicroServiceQt(const web::uri &uri) : RESTServer(uri) { } mitk::RESTServerMicroServiceQt::~RESTServerMicroServiceQt() {} void mitk::RESTServerMicroServiceQt::OpenListener() { - mitk::RESTServerMicroService::OpenListener(); + mitk::RESTServer::OpenListener(); } void mitk::RESTServerMicroServiceQt::CloseListener() { - mitk::RESTServerMicroService::CloseListener(); + mitk::RESTServer::CloseListener(); }