finish RestServerZmpImpl

CMakeLists.txt

@@ -40,7 +40,7 @@ set (3PARTY_SOURCES ../3party/civetweb/src/civetweb.c ../3party/civetweb/src/Civ
 
 
 
 
 #Generate the shared library from the sources
 #Generate the shared library from the sources
-add_library(Microservice SHARED ${SOURCES} ${3PARTY_SOURCES} )
+add_library(Microservice SHARED ${SOURCES} ${3PARTY_SOURCES} src/impl/servers/Microservice_IRestServerZmqImpl.cpp src/impl/servers/Microservice_IRestServerZmqImpl.h src/common/Microservice_Iface.cpp)
 target_link_libraries(Microservice ${PROJECT_LINK_LIBS} )
 target_link_libraries(Microservice ${PROJECT_LINK_LIBS} )
 set_target_properties(Microservice PROPERTIES VERSION ${Microservice_VERSION_STRING}
 set_target_properties(Microservice PROPERTIES VERSION ${Microservice_VERSION_STRING}
                                           SOVERSION ${Microservice_VERSION_MAJOR})
                                           SOVERSION ${Microservice_VERSION_MAJOR})

schema/RestMsg.fbs

 namespace common.context;
 namespace common.context;
 
 
+enum CrudMethod:byte { Create = 0, Read, Update, Delete }
 
 
 table RestMsg {
 table RestMsg {
   source:string;
   source:string;
+  crudMethod:CrudMethod = Read;
   url:string;
   url:string;
   queryString:string;
   queryString:string;
   content:string;
   content:string;

src/Microservice_App.cpp

@@ -8,7 +8,7 @@
 
 
 #include <Microservice_App.h>
 #include <Microservice_App.h>
 #include <params/Microservice_Params.h>
 #include <params/Microservice_Params.h>
-#include <handlers/Microservice_BaseHandler.h>
+#include <handlers/Microservice_RestHandler.h>
 #include <handlers/Microservice_MonitorHandler.h>
 #include <handlers/Microservice_MonitorHandler.h>
 #include <algorithm>
 #include <algorithm>
 #include <Microservice_Client.h>
 #include <Microservice_Client.h>
@@ -79,7 +79,7 @@ Microservice_App::Microservice_App(const char* appName) {
 
 
 Microservice_App& Microservice_App::withMonitoring() {
 Microservice_App& Microservice_App::withMonitoring() {
     this->mpc_MonitorHandler = new cMicroservice_MonitorHandler();
     this->mpc_MonitorHandler = new cMicroservice_MonitorHandler();
-    return addHandler(nsMicroservice_Constants::MON_PREFIX, (cMicroservice_BaseHandler*)mpc_MonitorHandler);
+    return addHandler(nsMicroservice_Constants::MON_PREFIX, (Microservice_RestHandler*)mpc_MonitorHandler);
 }
 }
 
 
 
 
@@ -112,7 +112,7 @@ Microservice_App& Microservice_App::withMonitoring() {
 //    for (std::map<std::string,cMicroservice_BaseHandler*>::iterator itr = mc_HandlersMap.begin();
 //    for (std::map<std::string,cMicroservice_BaseHandler*>::iterator itr = mc_HandlersMap.begin();
 //            itr != mc_HandlersMap.end(); ++itr)
 //            itr != mc_HandlersMap.end(); ++itr)
 //    {
 //    {
-//        cMicroservice_RestHandler* pc_RestHandler = new cMicroservice_RestHandler(itr->first,itr->second);
+//        Microservice_RestHandler* pc_RestHandler = new Microservice_RestHandler(itr->first,itr->second);
 //        mpc_RestServer->AddHandler(itr->first.c_str(),pc_RestHandler);
 //        mpc_RestServer->AddHandler(itr->first.c_str(),pc_RestHandler);
 //    }
 //    }
 //    
 //    
@@ -154,7 +154,7 @@ Microservice_App& Microservice_App::addHandler(const char* pba_Prefix, IHandler*
      * add handler according to implementation types
      * add handler according to implementation types
      */
      */
     std::string prefix;
     std::string prefix;
-    cMicroservice_BaseHandler* p_microservice_baseHandler = dynamic_cast<cMicroservice_BaseHandler*>(p_handler);
+    Microservice_RestHandler* p_microservice_baseHandler = dynamic_cast<Microservice_RestHandler*>(p_handler);
     if (p_microservice_baseHandler){
     if (p_microservice_baseHandler){
         reactor_.RegisterHandler(prefix.append(IRestServer::TYPE).append(nsMicroservice_Constants::TYPE_PREFIX_SEPERATOR).append(pba_Prefix),
         reactor_.RegisterHandler(prefix.append(IRestServer::TYPE).append(nsMicroservice_Constants::TYPE_PREFIX_SEPERATOR).append(pba_Prefix),
                                  p_handler);
                                  p_handler);

src/Microservice_App.h

@@ -24,7 +24,7 @@
 
 
 class cMicroservice_RestServerParams;
 class cMicroservice_RestServerParams;
 class cMicroservice_RMQServerParams;
 class cMicroservice_RMQServerParams;
-class cMicroservice_BaseHandler;
+class Microservice_RestHandler;
 //class cMicroservice_RestServer;
 //class cMicroservice_RestServer;
 //class cMicroservice_RMQServer;
 //class cMicroservice_RMQServer;
 class cMicroservice_MonitorHandler;
 class cMicroservice_MonitorHandler;
@@ -41,7 +41,7 @@ private:
     cMicroservice_RMQServerParams* mpc_RMQParams;
     cMicroservice_RMQServerParams* mpc_RMQParams;
     std::string mc_AppName;
     std::string mc_AppName;
     std::string mc_AppInstance;
     std::string mc_AppInstance;
-    std::map<std::string,cMicroservice_BaseHandler*> mc_HandlersMap;
+    std::map<std::string,Microservice_RestHandler*> mc_HandlersMap;
     std::map<std::string, cMicroservice_Client*> mc_ClientMap;
     std::map<std::string, cMicroservice_Client*> mc_ClientMap;
     //std::vector<IRestServer*> mc_ServerList;
     //std::vector<IRestServer*> mc_ServerList;
     std::vector<IServer*> servers_;
     std::vector<IServer*> servers_;

src/common/Microservice_Defines.h

@@ -49,6 +49,9 @@ namespace nsMicroservice_Constants
     static const char* FAILED_TO_FIND_HANDLER = "Failed to find handler for key: ";
     static const char* FAILED_TO_FIND_HANDLER = "Failed to find handler for key: ";
     static const char* INVALID_CONTEXT = " Invalid context ";
     static const char* INVALID_CONTEXT = " Invalid context ";
     static const char *const TYPE_PREFIX_SEPERATOR = ":";
     static const char *const TYPE_PREFIX_SEPERATOR = ":";
+    static const char *const EXIT_MSG = "exit";
+    static const int EXIT_MSG_LEN = strlen(EXIT_MSG);
+
 }
 }
 
 
 /*
 /*

src/common/Microservice_Iface.cpp

+//
+// Created by amir on 05/04/17.
+//
+
+#include "Microservice_Iface.h"
+#include <Microservice_BaseRestResponse.h>
+
+using namespace nsMicroservice_Iface;
+
+void IContainer::SendErrorResp(IResponse* pti_Response,std::string error){
+    /*
+     * create error rest response
+     */
+    std::ostringstream c_OutputStream;
+    c_OutputStream << nsMicroservice_Constants::ERROR_REST_RESPONSE_TEMPLATE_PREFIX
+                   << error.c_str()
+                   << nsMicroservice_Constants::ERROR_REST_RESPONSE_TEMPLATE_SUFFIX
+                   << '}';
+    /*
+     * send it
+     */
+    //pti_Response->Send(mba_ErrorBuff);
+    pti_Response->Send(c_OutputStream.str().c_str());
+}
+
+void IContainer::WriteObjectToResponse(nsMicroservice_Iface::IResponse *pti_Response,
+                                                            rapidjson::Document &t_ObjectDoc) {
+    std::ostringstream c_OutputStream;
+
+    if(!t_ObjectDoc.IsNull()) {
+        rapidjson::StringBuffer buffer;
+        rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+        t_ObjectDoc.Accept(writer);
+        c_OutputStream << nsMicroservice_Constants::SUCCESS_REST_RESPONSE_TEMPLATE << buffer.GetString() << '}';
+    } else {
+        c_OutputStream << nsMicroservice_Constants::SUCCESS_NULL_REST_RESPONSE_TEMPLATE << '}';
+    }
+    pti_Response->Send(c_OutputStream.str().c_str());
+}
+
+void IContainer::WriteObjectToResponse(nsMicroservice_Iface::IResponse *pti_Response,
+                                                            cMicroservice_BaseRestResponse &t_BaseRestResponse) {
+
+    if(t_BaseRestResponse.IsSuccess()){
+        WriteObjectToResponse(pti_Response,t_BaseRestResponse.GetObjectNode());
+    }
+    else{
+        SendErrorResp(pti_Response,t_BaseRestResponse.GetError());
+    }
+}
+
+void IContainer::WriteStringToResponse(nsMicroservice_Iface::IResponse *pti_Response,
+                                                            const char *pba_Doc) {
+    std::ostringstream c_OutputStream;
+    c_OutputStream << nsMicroservice_Constants::SUCCESS_REST_RESPONSE_TEMPLATE << pba_Doc << '}';
+    pti_Response->Send(c_OutputStream.str().c_str());
+}
+
+bool IContainer::ReadObjectFromRequest(nsMicroservice_Iface::IRequest *pti_Request,
+                                                                  rapidjson::Document &t_ObjectDoc) {
+    const char* pba_Content = pti_Request->GetContent();
+    if (pba_Content)
+    {
+        if (!t_ObjectDoc.Parse<0>(pba_Content).HasParseError())
+            return true;
+    }
+    return false;
+}
+

src/common/Microservice_Iface.h

@@ -315,16 +315,16 @@ namespace nsMicroservice_Iface
 
 
 		//public static Pattern seperatorPattern =  Pattern.compile("/");
 		//public static Pattern seperatorPattern =  Pattern.compile("/");
 
 
-		virtual void SendErrorResp(nsMicroservice_Iface::IResponse* pti_Response,std::string error) = 0;
+		virtual void SendErrorResp(nsMicroservice_Iface::IResponse* pti_Response,std::string error);
 
 
 		/**
 		/**
          * writing the value to resp as json
          * writing the value to resp as json
          * @param res
          * @param res
          * @param value
          * @param value
          */
          */
-		virtual void WriteObjectToResponse(nsMicroservice_Iface::IResponse* pti_Response,rapidjson::Document& t_ObjectDoc) = 0;
-		virtual void WriteObjectToResponse(nsMicroservice_Iface::IResponse* pti_Response,cMicroservice_BaseRestResponse& t_BaseRestResponse) = 0;
-		virtual void WriteStringToResponse(nsMicroservice_Iface::IResponse* pti_Response,const char* pba_Doc) = 0;
+		virtual void WriteObjectToResponse(nsMicroservice_Iface::IResponse* pti_Response,rapidjson::Document& t_ObjectDoc);
+		virtual void WriteObjectToResponse(nsMicroservice_Iface::IResponse* pti_Response,cMicroservice_BaseRestResponse& t_BaseRestResponse);
+		virtual void WriteStringToResponse(nsMicroservice_Iface::IResponse* pti_Response,const char* pba_Doc);
 
 
 		/**
 		/**
          * reading the object from the request body json
          * reading the object from the request body json
@@ -332,7 +332,7 @@ namespace nsMicroservice_Iface
          * @param ObjClass
          * @param ObjClass
          * @return
          * @return
          */
          */
-		virtual bool ReadObjectFromRequest(nsMicroservice_Iface::IRequest* pti_Request,rapidjson::Document& t_ObjectDoc) = 0;
+		virtual bool ReadObjectFromRequest(nsMicroservice_Iface::IRequest* pti_Request,rapidjson::Document& t_ObjectDoc);
 
 
 		////////// PUB/SUB ////////////////////////////////
 		////////// PUB/SUB ////////////////////////////////
 		/**
 		/**

src/handlers/Microservice_MonitorHandler.cpp

@@ -26,7 +26,7 @@ cMicroservice_MonitorHandler::~cMicroservice_MonitorHandler() {
 }
 }
 
 
 void cMicroservice_MonitorHandler::AddHandler(nsMicroservice_Iface::IHandler* p_handler) {
 void cMicroservice_MonitorHandler::AddHandler(nsMicroservice_Iface::IHandler* p_handler) {
-    if(p_handler != (cMicroservice_BaseHandler*)this)
+    if(p_handler != (Microservice_RestHandler*)this)
         handlers_.push_back(p_handler);
         handlers_.push_back(p_handler);
 }
 }
 
 

src/handlers/Microservice_MonitorHandler.h

@@ -24,7 +24,7 @@ static const char *const FAILED_RESOLVE_LOG_LEVEL = "Failed to,resolve log level
 
 
 static const char *const LEVEL = "level";
 static const char *const LEVEL = "level";
 
 
-#include "Microservice_BaseHandler.h"
+#include "Microservice_RestHandler.h"
 #include "Microservice_MsgQHandler.h"
 #include "Microservice_MsgQHandler.h"
 #include "Microservice_PubSubHandler.h"
 #include "Microservice_PubSubHandler.h"
 
 
@@ -33,7 +33,7 @@ class Microservice_App;
 /**
 /**
  * inherit public virtual to support dynamic_cast of the multiple base classes
  * inherit public virtual to support dynamic_cast of the multiple base classes
  */
  */
-class cMicroservice_MonitorHandler: public virtual cMicroservice_BaseHandler {
+class cMicroservice_MonitorHandler: public virtual Microservice_RestHandler {
 public:
 public:
     cMicroservice_MonitorHandler();
     cMicroservice_MonitorHandler();
     cMicroservice_MonitorHandler(const cMicroservice_MonitorHandler& orig);
     cMicroservice_MonitorHandler(const cMicroservice_MonitorHandler& orig);

src/handlers/Microservice_RMQHandler.cpp

@@ -25,7 +25,7 @@
 
 
 #include <sstream>
 #include <sstream>
 
 
-cMicroservice_RMQHandler::cMicroservice_RMQHandler(std::string apiContextPath,cMicroservice_BaseHandler* pc_Handler):
+cMicroservice_RMQHandler::cMicroservice_RMQHandler(std::string apiContextPath,Microservice_RestHandler* pc_Handler):
 mpc_Handler(pc_Handler)
 mpc_Handler(pc_Handler)
 {
 {
   mpc_Buffer = new rapidjson::StringBuffer(0,nsMicroservice_Constants::MAX_JSON_BUFFER);
   mpc_Buffer = new rapidjson::StringBuffer(0,nsMicroservice_Constants::MAX_JSON_BUFFER);

src/handlers/Microservice_RMQHandler.h

@@ -13,7 +13,7 @@
 #include <stddef.h>
 #include <stddef.h>
 #include <writer.h>
 #include <writer.h>
 #include <stringbuffer.h>
 #include <stringbuffer.h>
-#include "Microservice_BaseHandler.h"
+#include "Microservice_RestHandler.h"
 
 
 
 
 class cMicroservice_RequestContext;
 class cMicroservice_RequestContext;
@@ -25,7 +25,7 @@ private:
   JsonStringWriter *mpc_Writer;
   JsonStringWriter *mpc_Writer;
   rapidjson::StringBuffer* mpc_Buffer;
   rapidjson::StringBuffer* mpc_Buffer;
   std::string apiContextPath;
   std::string apiContextPath;
-  cMicroservice_BaseHandler* mpc_Handler;
+  Microservice_RestHandler* mpc_Handler;
   nsMicroservice_Iface::ILogger* mpc_Logger;
   nsMicroservice_Iface::ILogger* mpc_Logger;
   cMicroservice_RequestContext* mpc_RequestContext;
   cMicroservice_RequestContext* mpc_RequestContext;
   char mba_Buff[nsMicroservice_Constants::MAX_URI_LENGTH];
   char mba_Buff[nsMicroservice_Constants::MAX_URI_LENGTH];
@@ -47,7 +47,7 @@ private:
   void GetQueryParams(cRMQ_Message* pc_Message);
   void GetQueryParams(cRMQ_Message* pc_Message);
 
 
 public:
 public:
-  cMicroservice_RMQHandler(std::string apiContextPath,cMicroservice_BaseHandler* pc_Handler);
+  cMicroservice_RMQHandler(std::string apiContextPath,Microservice_RestHandler* pc_Handler);
 
 
    void withLogger(nsMicroservice_Iface::ILogger* pc_Logger) { this->mpc_Logger = pc_Logger;  }
    void withLogger(nsMicroservice_Iface::ILogger* pc_Logger) { this->mpc_Logger = pc_Logger;  }
 
 

src/handlers/Microservice_Reactor.h

@@ -6,7 +6,7 @@
 #define MICROSERVICE_MICROSERVICE_REACTOR_H
 #define MICROSERVICE_MICROSERVICE_REACTOR_H
 
 
 #include <string>
 #include <string>
-#include "Microservice_BaseHandler.h"
+#include "Microservice_RestHandler.h"
 
 
 
 
 /**
 /**

src/handlers/Microservice_BaseHandler.h → src/handlers/Microservice_RestHandler.h

@@ -13,13 +13,13 @@
 
 
 class cMicroservice_App;
 class cMicroservice_App;
 
 
-class cMicroservice_BaseHandler : public nsMicroservice_Iface::IHandler
+class Microservice_RestHandler : public nsMicroservice_Iface::IHandler
 {
 {
 protected:
 protected:
   JsonStringWriter* mpc_Writer;
   JsonStringWriter* mpc_Writer;
 
 
 public:
 public:
-  virtual ~cMicroservice_BaseHandler() { 
+  virtual ~Microservice_RestHandler() {
 //      mpc_Configuration = nullptr;
 //      mpc_Configuration = nullptr;
 //      mpc_Logger = nullptr;
 //      mpc_Logger = nullptr;
 //      mpc_msApp = nullptr;
 //      mpc_msApp = nullptr;

src/impl/servers/Microservice_IRestServerCivetWebImpl.cpp

@@ -190,7 +190,7 @@ void cMicroservice_IRestServerCivetWebImpl::HandleNewRequest(mg_connection *p_co
     if (retStat.IsSuccess())
     if (retStat.IsSuccess())
         p_reactor_->Delegate(key, &ctx);
         p_reactor_->Delegate(key, &ctx);
     else
     else
-        SendGeneralError(p_connection,500,"Failed in parsing...yored lekafa..");
+        SendGeneralError(p_connection,500,"Failed in parsing...kus restek! yored lekafa..");
 
 
 }
 }
 
 
@@ -199,67 +199,6 @@ cMicroservice_IRestServerCivetWebImpl::SendGeneralError(mg_connection *p_connect
     mg_printf(p_connection, "HTTP/1.0 %u %s\r\nContent-Length: 0\r\n\r\n",respCode,error);
     mg_printf(p_connection, "HTTP/1.0 %u %s\r\nContent-Length: 0\r\n\r\n",respCode,error);
 }
 }
 
 
-void
-cMicroservice_IRestServerCivetWebImpl::SendErrorResp(nsMicroservice_Iface::IResponse *pti_Response, std::string error) {
-    /*
-     * create error rest response
-     */
-    std::ostringstream c_OutputStream;
-    c_OutputStream << nsMicroservice_Constants::ERROR_REST_RESPONSE_TEMPLATE_PREFIX
-                   << error.c_str()
-                   << nsMicroservice_Constants::ERROR_REST_RESPONSE_TEMPLATE_SUFFIX
-                   << '}';
-    /*
-     * send it
-     */
-    //pti_Response->Send(mba_ErrorBuff);
-    pti_Response->Send(c_OutputStream.str().c_str());
-}
-
-void cMicroservice_IRestServerCivetWebImpl::WriteObjectToResponse(nsMicroservice_Iface::IResponse *pti_Response,
-                                                                  rapidjson::Document &t_ObjectDoc) {
-
-    std::ostringstream c_OutputStream;
-
-    if(!t_ObjectDoc.IsNull()) {
-        rapidjson::StringBuffer buffer;
-        rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
-        t_ObjectDoc.Accept(writer);
-        c_OutputStream << nsMicroservice_Constants::SUCCESS_REST_RESPONSE_TEMPLATE << buffer.GetString() << '}';
-    } else {
-        c_OutputStream << nsMicroservice_Constants::SUCCESS_NULL_REST_RESPONSE_TEMPLATE << '}';
-    }
-    pti_Response->Send(c_OutputStream.str().c_str());
-}
-
-void cMicroservice_IRestServerCivetWebImpl::WriteObjectToResponse(nsMicroservice_Iface::IResponse *pti_Response,
-                                                                  cMicroservice_BaseRestResponse &t_BaseRestResponse) {
-
-    if(t_BaseRestResponse.IsSuccess()){
-        WriteObjectToResponse(pti_Response,t_BaseRestResponse.GetObjectNode());
-    }
-    else{
-        SendErrorResp(pti_Response,t_BaseRestResponse.GetError());
-    }
-}
-
-void cMicroservice_IRestServerCivetWebImpl::WriteStringToResponse(nsMicroservice_Iface::IResponse *pti_Response,
-                                                                  const char *pba_Doc) {
-    std::ostringstream c_OutputStream;
-    c_OutputStream << nsMicroservice_Constants::SUCCESS_REST_RESPONSE_TEMPLATE << pba_Doc << '}';
-    pti_Response->Send(c_OutputStream.str().c_str());
-}
-
-bool cMicroservice_IRestServerCivetWebImpl::ReadObjectFromRequest(nsMicroservice_Iface::IRequest *pti_Request,
-                                                                  rapidjson::Document &t_ObjectDoc) {
-    const char* pba_Content = pti_Request->GetContent();
-    if (pba_Content)
-    {
-        if (!t_ObjectDoc.Parse<0>(pba_Content).HasParseError())
-            return true;
-    }
-    return false;
-}
 
 
 MSRetStat
 MSRetStat
 cMicroservice_IRestServerCivetWebImpl::ParseRequest(mg_connection *p_conn,
 cMicroservice_IRestServerCivetWebImpl::ParseRequest(mg_connection *p_conn,
@@ -332,37 +271,8 @@ cMicroservice_IRestServerCivetWebImpl::GetQueryParams(cMicroservice_RequestConte
     memcpy(mba_Buff, p_reqInfo->query_string,
     memcpy(mba_Buff, p_reqInfo->query_string,
            (queryLen < nsMicroservice_Constants::MAX_URI_LENGTH) ? queryLen : nsMicroservice_Constants::MAX_URI_LENGTH - 1);
            (queryLen < nsMicroservice_Constants::MAX_URI_LENGTH) ? queryLen : nsMicroservice_Constants::MAX_URI_LENGTH - 1);
     mba_Buff[queryLen] = CNULL;
     mba_Buff[queryLen] = CNULL;
-    char* pba_token = strtok(mba_Buff, nsMicroservice_Constants::AND_SEPERATOR);
+    CommonUtils::BuildQueryParams(mba_Buff,pc_queryParams);
 
 
-    while (pba_token)
-    {
-        // x=y or just x
-        char* pba_Equal = strchr(pba_token, '=');
-        if (pba_Equal)
-        {
-            *pba_Equal = CNULL;
-            DequeStringMap::iterator t_QueryParamIter = pc_queryParams->find(pba_token);
-            if (t_QueryParamIter != pc_queryParams->end())
-            {
-                // existing query key >> adding to deque
-                t_QueryParamIter->second.push_back(pba_Equal + 1);
-            }
-            else
-            {
-                // new one
-                std::deque<std::string> t_QueryDeque;
-                t_QueryDeque.push_back(pba_Equal + 1);
-                (*pc_queryParams)[pba_token] = t_QueryDeque;
-            }
-        }
-        else
-        {
-            // insert empty deque - cannot insert null value
-            std::deque<std::string> t_QueryDeque;
-            (*pc_queryParams)[pba_token] = t_QueryDeque;
-        }
-        pba_token = strtok(NULL, nsMicroservice_Constants::AND_SEPERATOR);
-    }
 }
 }
 
 
 eCrudMethod cMicroservice_IRestServerCivetWebImpl::GetCrudMethod(const mg_request_info *p_reqInfo) {
 eCrudMethod cMicroservice_IRestServerCivetWebImpl::GetCrudMethod(const mg_request_info *p_reqInfo) {

src/impl/servers/Microservice_IRestServerCivetWebImpl.h

@@ -26,7 +26,7 @@ struct mg_connection;
 struct mg_context;
 struct mg_context;
 struct mg_request_info;
 struct mg_request_info;
 
 
-//class cMicroservice_RestHandler;
+//class Microservice_RestHandler;
 class cMicroservice_IResponseRestImpl;
 class cMicroservice_IResponseRestImpl;
 class cMicroservice_IRequestRestImpl;
 class cMicroservice_IRequestRestImpl;
 
 
@@ -52,19 +52,6 @@ public:
     void HandleRequest(mg_connection *conn,const mg_request_info *req_info);
     void HandleRequest(mg_connection *conn,const mg_request_info *req_info);
     void SendNotImplemented(mg_connection* conn);
     void SendNotImplemented(mg_connection* conn);
 
 
-    virtual void SendErrorResp(nsMicroservice_Iface::IResponse *pti_Response, std::string error) override;
-
-    virtual void
-    WriteObjectToResponse(nsMicroservice_Iface::IResponse *pti_Response, rapidjson::Document &t_ObjectDoc) override;
-
-    virtual void WriteObjectToResponse(nsMicroservice_Iface::IResponse *pti_Response,
-                                       cMicroservice_BaseRestResponse &t_BaseRestResponse) override;
-
-    virtual void WriteStringToResponse(nsMicroservice_Iface::IResponse *pti_Response, const char *pba_Doc) override;
-
-    virtual bool
-    ReadObjectFromRequest(nsMicroservice_Iface::IRequest *pti_Request, rapidjson::Document &t_ObjectDoc) override;
-
 private:
 private:
     cMicroservice_RestServerParams* mpc_Param;
     cMicroservice_RestServerParams* mpc_Param;
     struct mg_context *p_ctx_;
     struct mg_context *p_ctx_;
@@ -91,6 +78,8 @@ private:
     void GetQueryParams(cMicroservice_RequestContext &ctx, const mg_request_info *p_reqInfo);
     void GetQueryParams(cMicroservice_RequestContext &ctx, const mg_request_info *p_reqInfo);
 
 
     eCrudMethod GetCrudMethod(const mg_request_info *p_reqInfo);
     eCrudMethod GetCrudMethod(const mg_request_info *p_reqInfo);
+
+
 };
 };
 
 
 #endif /* MICROSERVICE_IRESTSERVERMONGOOSEIMPL_H */
 #endif /* MICROSERVICE_IRESTSERVERMONGOOSEIMPL_H */

src/impl/servers/Microservice_IRestServerRMQImpl.cpp

@@ -53,7 +53,7 @@ bool cMicroservice_IRestServerRMQImpl::build(std::string& appName,
         
         
         for (auto prfxHandler : msHandlersMap)
         for (auto prfxHandler : msHandlersMap)
         {
         {
-            cMicroservice_RMQHandler* pc_RMQHandler = new cMicroservice_RMQHandler(prfxHandler.first, dynamic_cast<cMicroservice_BaseHandler*>(prfxHandler.second));
+            cMicroservice_RMQHandler* pc_RMQHandler = new cMicroservice_RMQHandler(prfxHandler.first, dynamic_cast<Microservice_RestHandler*>(prfxHandler.second));
             pc_RMQHandler->withLogger(pc_Logger);
             pc_RMQHandler->withLogger(pc_Logger);
             this->mc_HandlersMap[prfxHandler.first] = pc_RMQHandler;
             this->mc_HandlersMap[prfxHandler.first] = pc_RMQHandler;
         }
         }

src/impl/servers/Microservice_IRestServerRMQImpl.h

@@ -20,7 +20,7 @@
 class cMicroservice_RMQServerParams;
 class cMicroservice_RMQServerParams;
 class cMicroservice_RMQHandler;
 class cMicroservice_RMQHandler;
 class cRMQ_MessageRest;
 class cRMQ_MessageRest;
-//class cMicroservice_RestHandler;
+//class Microservice_RestHandler;
 
 
 class cMicroservice_IRestServerRMQImpl: public nsMicroservice_Iface::IRestServer 
 class cMicroservice_IRestServerRMQImpl: public nsMicroservice_Iface::IRestServer 
 {
 {

src/impl/servers/Microservice_IRestServerZmqImpl.h

+//
+// Created by amir on 05/04/17.
+//
+
+#ifndef MICROSERVICE_MICROSERVICE_IRESTSERVERZMQIMPL_H
+#define MICROSERVICE_MICROSERVICE_IRESTSERVERZMQIMPL_H
+
+
+static const int HIGH_WATER_MARK = 10000;
+
+#include <common/Microservice_Iface.h>
+#include <zmqpp/socket.hpp>
+#include <params/Microservice_Params.h>
+#include <thread>
+#include <zmqpp/context.hpp>
+#include <common/RestMsg_generated.h>
+
+
+class Microservice_IResponseRestZmqImpl: public nsMicroservice_Iface::IResponse
+{
+     // for cloning
+    Microservice_IResponseRestZmqImpl(zmqpp::socket* p_respConnection) : p_respConnection_(p_respConnection){}
+
+    zmqpp::socket* p_respConnection_;
+public:
+    Microservice_IResponseRestZmqImpl() : p_respConnection_(nullptr) {}
+    void Send(const char* response) override {
+        if (p_respConnection_)
+            p_respConnection_->send(response,zmqpp::socket::dont_wait);
+
+    }
+
+    void Reset() override { p_respConnection_ = nullptr; }
+
+    void setRespConnection(zmqpp::socket *p_respConnection) {
+        Microservice_IResponseRestZmqImpl::p_respConnection_ = p_respConnection;
+    }
+
+    virtual nsMicroservice_Iface::IResponse *clone() override {
+        return new Microservice_IResponseRestZmqImpl(p_respConnection_);
+    }
+
+};
+
+class Microservice_IRequestRestZmqImpl: public nsMicroservice_Iface::IRequest {
+public:
+    Microservice_IRequestRestZmqImpl() : p_restMsg_(nullptr) {}
+
+    void setRestMsg(const common::context::RestMsg *p_restMsg) {
+        Microservice_IRequestRestZmqImpl::p_restMsg_ = p_restMsg;
+    }
+
+    const char *GetQueryString() override {
+        if (p_restMsg_)
+            return p_restMsg_->queryString()->c_str();
+        return nullptr;
+    }
+
+    const char *GetRelativePath() override {
+        if (p_restMsg_)
+            return p_restMsg_->url()->c_str();
+        return nullptr;
+    }
+
+    const char *GetContent() override {
+        if (p_restMsg_)
+            return p_restMsg_->content()->c_str();
+        return nullptr;
+    }
+
+    void Reset() override {
+        p_restMsg_ = nullptr;
+    }
+
+private:
+    const common::context::RestMsg* p_restMsg_;
+
+};
+
+class Microservice_IRestServerZmqImpl : public nsMicroservice_Iface::IRestServer , public nsMicroservice_Iface::IContainer {
+public:
+    Microservice_IRestServerZmqImpl(const Microservice_ZMQServerParams &params) :
+            params_(params),p_logger_(nullptr), p_runThread_(nullptr){
+        serverType_.assign(getType());
+    }
+
+    virtual ~Microservice_IRestServerZmqImpl();
+
+    bool init() override;
+    void run() override;
+    void stop() override;
+
+    bool build(std::string &appName, const std::map<std::string, nsMicroservice_Iface::IHandler *> &msHandlersMap,
+               nsMicroservice_Iface::ILogger *pc_Logger, nsMicroservice_Iface::IPubSub *pc_PubSub,
+               nsMicroservice_Iface::IMetricsFactory *p_metrics_factory) override;
+
+    void registerService(nsMicroservice_Iface::IServiceDiscovery *pc_ServiceDiscovery, std::string &id) override;
+
+private:
+    Microservice_ZMQServerParams params_;
+    nsMicroservice_Iface::ILogger* p_logger_;
+    std::thread* p_runThread_;
+    zmqpp::context context_;
+    zmqpp::socket* p_server_;
+    std::string serverType_;
+    struct RequestWorkParams;
+
+    void HandleRequest(RequestWorkParams* p_requestWorkParams);
+    void HandleNewRequest(RequestWorkParams *p_rwp, std::string &key, std::string &apiContextPath);
+    void SendNotImplemented(RequestWorkParams *p_rwp);
+
+    MSRetStat ParseRequest(RequestWorkParams *p_rwp, cMicroservice_RequestContext &context, std::string &apiContextPath);
+
+    eCrudMethod GetCrudMethod(common::context::CrudMethod method) {
+        switch (method){
+            case common::context::CrudMethod::CrudMethod_Create:
+                return eCrudMethod::eCreate;
+            case common::context::CrudMethod::CrudMethod_Read:
+                return eCrudMethod::eRead;
+            case common::context::CrudMethod::CrudMethod_Update:
+                return eCrudMethod::eUpdate;
+            case common::context::CrudMethod::CrudMethod_Delete:
+                return eCrudMethod::eDelete;
+        }
+        return eCrudMethod::eMaxMethods;
+    }
+
+    void
+    GetQueryParams(cMicroservice_RequestContext &ctx, RequestWorkParams *p_rwp, const common::context::RestMsg *p_restMsg);
+
+    void LogRequest(const common::context::RestMsg *p_restMsg);
+};
+
+
+#endif //MICROSERVICE_MICROSERVICE_IRESTSERVERZMQIMPL_H

src/utils/CommonUtils.cpp

@@ -3,3 +3,38 @@
 //
 //
 
 
 #include "CommonUtils.h"
 #include "CommonUtils.h"
+
+
+void CommonUtils::BuildQueryParams(char *buffer, DequeStringMap *p_queryParams)  {
+    char* pba_token = strtok(buffer, nsMicroservice_Constants::AND_SEPERATOR);
+
+    while (pba_token)
+    {
+        // x=y or just x
+        char* pba_Equal = strchr(pba_token, '=');
+        if (pba_Equal)
+        {
+            *pba_Equal = CNULL;
+            auto t_QueryParamIter = p_queryParams->find(pba_token);
+            if (t_QueryParamIter != p_queryParams->end())
+            {
+                // existing query key >> adding to deque
+                t_QueryParamIter->second.push_back(pba_Equal + 1);
+            }
+            else
+            {
+                // new one
+                std::deque<std::string> t_QueryDeque;
+                t_QueryDeque.push_back(pba_Equal + 1);
+                (*p_queryParams)[pba_token] = t_QueryDeque;
+            }
+        }
+        else
+        {
+            // insert empty deque - cannot insert null value
+            std::deque<std::string> t_QueryDeque;
+            (*p_queryParams)[pba_token] = t_QueryDeque;
+        }
+        pba_token = strtok(NULL, nsMicroservice_Constants::AND_SEPERATOR);
+    }
+}

src/utils/CommonUtils.h

@@ -10,6 +10,7 @@
 #include <utility>
 #include <utility>
 #include <string.h>
 #include <string.h>
 #include <unistd.h>
 #include <unistd.h>
+#include <common/Microservice_RequestContext.h>
 
 
 /**
 /**
  * common utils
  * common utils
@@ -50,6 +51,10 @@ public:
             cpunum = 1;
             cpunum = 1;
         return (int)cpunum;
         return (int)cpunum;
     }
     }
+
+
+    static void BuildQueryParams(char* buffer,DequeStringMap *p_queryParams);
+
 };
 };
 
 
 
 

test/Microservice_ClientTest.cpp

@@ -16,7 +16,7 @@
 #include <utils/ClientFactory.h>
 #include <utils/ClientFactory.h>
 #include <utils/CommonUtils.h>
 #include <utils/CommonUtils.h>
 #include <flatbuffers/flatbuffers.h>
 #include <flatbuffers/flatbuffers.h>
-#include <common/RestMsgContext_generated.h>
+#include <common/RestMsg_generated.h>
 
 
 static const char *const PUBSUBHOST = "zmqpubsub";
 static const char *const PUBSUBHOST = "zmqpubsub";
 
 

test/Microservice_Test.cpp

@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdlib.h>
 #include <Microservice_App.h>
 #include <Microservice_App.h>
-#include <handlers/Microservice_BaseHandler.h>
+#include <handlers/Microservice_RestHandler.h>
 #include <Microservice_Client.h>
 #include <Microservice_Client.h>
 #include <params/Microservice_Params.h>
 #include <params/Microservice_Params.h>
 #include <document.h> //rapidjson
 #include <document.h> //rapidjson
@@ -55,7 +55,7 @@ public:
     std::chrono::steady_clock::time_point start_;
     std::chrono::steady_clock::time_point start_;
 };
 };
 
 
-class cMicroserviceHandler: public virtual cMicroservice_BaseHandler
+class cMicroserviceHandler: public virtual Microservice_RestHandler
 {
 {
     char mba_GetReturnedString[1024];
     char mba_GetReturnedString[1024];
     cMicroservice_Client* p_rest_client_;
     cMicroservice_Client* p_rest_client_;
@@ -304,7 +304,7 @@ void runNewMS(){
                                                        Microservice_ZMQServerParams::eProtocol::eIpc))
                                                        Microservice_ZMQServerParams::eProtocol::eIpc))
             .addServer(ServerFactory::createIRestServerCivetWebImpl("", 50010, 1))// .addRestServer(new cMicroservice_IRestServerCivetWebImpl(new cMicroservice_RestServerParams(50010,"",1)))
             .addServer(ServerFactory::createIRestServerCivetWebImpl("", 50010, 1))// .addRestServer(new cMicroservice_IRestServerCivetWebImpl(new cMicroservice_RestServerParams(50010,"",1)))
             .addServer(ServerFactory::createIMsgQueueServerZmqImpl(msApp.name(), 0, Microservice_ZMQServerParams::eProtocol::eIpc))
             .addServer(ServerFactory::createIMsgQueueServerZmqImpl(msApp.name(), 0, Microservice_ZMQServerParams::eProtocol::eIpc))
-            .addHandler("/xxx",(cMicroservice_BaseHandler*)new cMicroserviceHandler("hello"))
+            .addHandler("/xxx",(Microservice_RestHandler*)new cMicroserviceHandler("hello"))
             .addHandler("/zmq",new MSMsgQHandler())
             .addHandler("/zmq",new MSMsgQHandler())
             .build()
             .build()
             .run();
             .run();

test/Microservice_ZMQTest.cpp

@@ -10,7 +10,7 @@
 #include <thread>
 #include <thread>
 #include <utils/CommonUtils.h>
 #include <utils/CommonUtils.h>
 #include <flatbuffers/flatbuffers.h>
 #include <flatbuffers/flatbuffers.h>
-#include <common/RestMsgContext_generated.h>
+#include <common/RestMsg_generated.h>
 #include <common/RestResponse_generated.h>
 #include <common/RestResponse_generated.h>
 
 
 static const char *const IPC_FILE1 = "/tmp/service-name1.ipc";
 static const char *const IPC_FILE1 = "/tmp/service-name1.ipc";

todo_src/Microservice_RMQHandler.h

@@ -13,7 +13,7 @@
 #include <stddef.h>
 #include <stddef.h>
 #include <writer.h>
 #include <writer.h>
 #include <stringbuffer.h>
 #include <stringbuffer.h>
-#include <handlers/Microservice_BaseHandler.h>
+#include <handlers/Microservice_RestHandler.h>
 
 
 
 
 class cMicroservice_RequestContext;
 class cMicroservice_RequestContext;