Changed interface of RequestSocketImpl

cameo-api-cpp/include/JSON.h

@@ -59,7 +59,19 @@ private:
 typedef rapidjson::Document Object;
 typedef rapidjson::Value Value;
 
-bool parse(Object & object, zmq::message_t * message);
+template<typename T>
+bool parse(Object & object, T message);
+
+template<typename Message>
+bool parse(Object & object, Message * message) {
+
+	rapidjson::ParseResult ok = object.Parse(static_cast<char *>(message->data()), message->size());
+	if (!ok) {
+		return false;
+	}
+	return true;
+}
+
 bool parse(Object & object, const std::string& string);
 
 }

cameo-api-cpp/src/base/JSON.cpp

@@ -69,15 +69,6 @@ std::string StringObject::toString() {
 	return m_buffer.GetString();
 }
 
-bool parse(Object & object, zmq::message_t * message) {
-
-	rapidjson::ParseResult ok = object.Parse(static_cast<char *>(message->data()), message->size());
-	if (!ok) {
-		return false;
-	}
-	return true;
-}
-
 bool parse(Object & object, const std::string& string) {
 
 	rapidjson::ParseResult ok = object.Parse(static_cast<const char *>(string.c_str()), string.size());

cameo-api-cpp/src/base/impl/RequestSocketImpl.cpp

@@ -107,7 +107,7 @@ std::unique_ptr<zmq::message_t> RequestSocketImpl::receive(int overrideTimeout)
 	return reply;
 }
 
-std::unique_ptr<zmq::message_t> RequestSocketImpl::request(const std::string& request, int overrideTimeout) {
+std::string RequestSocketImpl::request(const std::string& request, int overrideTimeout) {
 
 	// Init if not already done or if a timeout occurred.
 	init();
@@ -121,10 +121,12 @@ std::unique_ptr<zmq::message_t> RequestSocketImpl::request(const std::string& re
 	m_socket->send(requestMessage);
 
 	// Receive and return the response.
-	return receive(overrideTimeout);
+	std::unique_ptr<zmq::message_t> response = receive(overrideTimeout);
+
+	return std::string(response->data<char>(), response->size());
 }
 
-std::unique_ptr<zmq::message_t> RequestSocketImpl::request(const std::string& requestPart1, const std::string& requestPart2, int overrideTimeout) {
+std::string RequestSocketImpl::request(const std::string& requestPart1, const std::string& requestPart2, int overrideTimeout) {
 
 	// Init if not already done or if a timeout occurred.
 	init();
@@ -142,10 +144,12 @@ std::unique_ptr<zmq::message_t> RequestSocketImpl::request(const std::string& re
 	m_socket->send(requestPart2Message);
 
 	// Receive and return the response.
-	return receive(overrideTimeout);
+	std::unique_ptr<zmq::message_t> response = receive(overrideTimeout);
+
+	return std::string(response->data<char>(), response->size());
 }
 
-std::unique_ptr<zmq::message_t> RequestSocketImpl::request(const std::string& requestPart1, const std::string& requestPart2, const std::string& requestPart3, int overrideTimeout) {
+std::string RequestSocketImpl::request(const std::string& requestPart1, const std::string& requestPart2, const std::string& requestPart3, int overrideTimeout) {
 
 	// Init if not already done or if a timeout occurred.
 	init();
@@ -167,38 +171,40 @@ std::unique_ptr<zmq::message_t> RequestSocketImpl::request(const std::string& re
 	m_socket->send(requestPart3Message);
 
 	// Receive and return the response.
-	return receive(overrideTimeout);
+	std::unique_ptr<zmq::message_t> response = receive(overrideTimeout);
+
+	return std::string(response->data<char>(), response->size());
 }
 
 json::Object RequestSocketImpl::requestJSON(const std::string& request, int overrideTimeout) {
 
-	std::unique_ptr<zmq::message_t> reply = this->request(request, overrideTimeout);
+	std::string reply = this->request(request, overrideTimeout);
 
 	// Get the JSON response.
 	json::Object response;
-	json::parse(response, reply.get());
+	json::parse(response, reply);
 
 	return response;
 }
 
 json::Object RequestSocketImpl::requestJSON(const std::string& requestPart1, const std::string& requestPart2, int overrideTimeout) {
 
-	std::unique_ptr<zmq::message_t> reply = this->request(requestPart1, requestPart2, overrideTimeout);
+	std::string reply = this->request(requestPart1, requestPart2, overrideTimeout);
 
 	// Get the JSON response.
 	json::Object response;
-	json::parse(response, reply.get());
+	json::parse(response, reply);
 
 	return response;
 }
 
 json::Object RequestSocketImpl::requestJSON(const std::string& requestPart1, const std::string& requestPart2, const std::string& requestPart3, int overrideTimeout) {
 
-	std::unique_ptr<zmq::message_t> reply = this->request(requestPart1, requestPart2, requestPart3, overrideTimeout);
+	std::string reply = this->request(requestPart1, requestPart2, requestPart3, overrideTimeout);
 
 	// Get the JSON response.
 	json::Object response;
-	json::parse(response, reply.get());
+	json::parse(response, reply);
 
 	return response;
 }

cameo-api-cpp/src/base/impl/RequestSocketImpl.h

@@ -38,9 +38,9 @@ public:
 	void init();
 	void reset();
 
-	std::unique_ptr<zmq::message_t> request(const std::string& request, int overrideTimeout = -1);
-	std::unique_ptr<zmq::message_t> request(const std::string& requestPart1, const std::string& requestPart2, int overrideTimeout = -1);
-	std::unique_ptr<zmq::message_t> request(const std::string& requestPart1, const std::string& requestPart2, const std::string& requestPart3, int overrideTimeout = -1);
+	std::string request(const std::string& request, int overrideTimeout = -1);
+	std::string request(const std::string& requestPart1, const std::string& requestPart2, int overrideTimeout = -1);
+	std::string request(const std::string& requestPart1, const std::string& requestPart2, const std::string& requestPart3, int overrideTimeout = -1);
 
 	json::Object requestJSON(const std::string& request, int overrideTimeout = -1);
 	json::Object requestJSON(const std::string& requestPart1, const std::string& requestPart2, int overrideTimeout = -1);