Fix jsoncpp deprecation warnings (Closes #312)

Author: cinemast

src/jsonrpccpp/client/client.cpp

@@ -9,8 +9,10 @@
 
 #include "client.h"
 #include "rpcprotocolclient.h"
+#include <sstream>
 
 using namespace jsonrpc;
+using namespace std;
 
 Client::Client(IClientConnector &connector, clientVersion_t version, bool omitEndingLineFeed) : connector(connector) {
   this->protocol = new RpcProtocolClient(version, omitEndingLineFeed);
@@ -29,11 +31,11 @@ void Client::CallProcedures(const BatchCall &calls, BatchResponse &result) {
   std::string request, response;
   request = calls.toString();
   connector.SendRPCMessage(request, response);
-  Json::Reader reader;
   Json::Value tmpresult;
 
   try {
-    if (!reader.parse(response, tmpresult) || !tmpresult.isArray()) {
+    istringstream(response) >> tmpresult;
+    if(!tmpresult.isArray()) {
       throw JsonRpcException(Errors::ERROR_CLIENT_INVALID_RESPONSE, "Array expected.");
     }
   } catch (const Json::Exception &e) {

src/jsonrpccpp/client/rpcprotocolclient.cpp

@@ -35,11 +35,10 @@ void RpcProtocolClient::BuildRequest(const std::string &method, const Json::Valu
 }
 
 void RpcProtocolClient::HandleResponse(const std::string &response, Json::Value &result) {
-  Json::Reader reader;
   Json::Value value;
 
   try {
-    if (reader.parse(response, value)) {
+    if (std::istringstream(response) >> value) {
       this->HandleResponse(value, result);
     } else {
       throw JsonRpcException(Errors::ERROR_RPC_JSON_PARSE_ERROR, " " + response);

src/jsonrpccpp/common/specificationparser.cpp

@@ -22,12 +22,13 @@ vector<Procedure> SpecificationParser::GetProceduresFromFile(const string &filen
 }
 vector<Procedure> SpecificationParser::GetProceduresFromString(const string &content) {
 
-  Json::Reader reader;
   Json::Value val;
-  if (!reader.parse(content, val)) {
+
+  try {
+    std::istringstream(content) >> val;
+  } catch (Json::Exception &e) {
     throw JsonRpcException(Errors::ERROR_RPC_JSON_PARSE_ERROR, " specification file contains syntax errors");
   }
-
   if (!val.isArray()) {
     throw JsonRpcException(Errors::ERROR_SERVER_PROCEDURE_SPECIFICATION_SYNTAX, " top level json value is not an array");
   }

src/jsonrpccpp/server/abstractprotocolhandler.cpp

@@ -9,8 +9,7 @@
 
 #include "abstractprotocolhandler.h"
 #include <jsonrpccpp/common/errors.h>
-#include <jsonrpccpp/common/jsonparser.h>
-
+#include <sstream>
 #include <map>
 
 using namespace jsonrpc;
@@ -23,18 +22,14 @@ AbstractProtocolHandler::~AbstractProtocolHandler() {}
 void AbstractProtocolHandler::AddProcedure(const Procedure &procedure) { this->procedures[procedure.GetProcedureName()] = procedure; }
 
 void AbstractProtocolHandler::HandleRequest(const std::string &request, std::string &retValue) {
-  Json::Reader reader;
   Json::Value req;
   Json::Value resp;
   Json::StreamWriterBuilder wbuilder;
   wbuilder["indentation"] = "";
 
   try {
-    if (reader.parse(request, req, false)) {
-      this->HandleJsonRequest(req, resp);
-    } else {
-      this->WrapError(Json::nullValue, Errors::ERROR_RPC_JSON_PARSE_ERROR, Errors::GetErrorMessage(Errors::ERROR_RPC_JSON_PARSE_ERROR), resp);
-    }
+    istringstream(request) >> req;
+    this->HandleJsonRequest(req, resp);
   } catch (const Json::Exception &e) {
     this->WrapError(Json::nullValue, Errors::ERROR_RPC_JSON_PARSE_ERROR, Errors::GetErrorMessage(Errors::ERROR_RPC_JSON_PARSE_ERROR), resp);
   }

src/jsonrpccpp/server/rpcprotocolserver12.cpp

@@ -11,6 +11,7 @@
 #include <jsonrpccpp/common/jsonparser.h>
 
 using namespace jsonrpc;
+using namespace std;
 
 RpcProtocolServer12::RpcProtocolServer12(IProcedureInvokationHandler &handler) : rpc1(handler), rpc2(handler) {}
 
@@ -20,18 +21,14 @@ void RpcProtocolServer12::AddProcedure(const Procedure &procedure) {
 }
 
 void RpcProtocolServer12::HandleRequest(const std::string &request, std::string &retValue) {
-  Json::Reader reader;
   Json::Value req;
   Json::Value resp;
   Json::StreamWriterBuilder wbuilder;
   wbuilder["indentation"] = "";
 
   try {
-    if (reader.parse(request, req, false)) {
-      this->GetHandler(req).HandleJsonRequest(req, resp);
-    } else {
-      this->GetHandler(req).WrapError(Json::nullValue, Errors::ERROR_RPC_JSON_PARSE_ERROR, Errors::GetErrorMessage(Errors::ERROR_RPC_JSON_PARSE_ERROR), resp);
-    }
+    istringstream(request) >> req;
+    this->GetHandler(req).HandleJsonRequest(req, resp);
   } catch (const Json::Exception &e) {
     this->GetHandler(req).WrapError(Json::nullValue, Errors::ERROR_RPC_JSON_PARSE_ERROR, Errors::GetErrorMessage(Errors::ERROR_RPC_JSON_PARSE_ERROR), resp);
   }

src/test/mockclientconnector.cpp

@@ -17,12 +17,9 @@ MockClientConnector::MockClientConnector() {}
 string MockClientConnector::GetRequest() { return request; }
 
 Json::Value MockClientConnector::GetJsonRequest() {
-  Json::Reader reader;
   Json::Value result;
-  if (reader.parse(request, result))
-    return result;
-  else
-    return Json::nullValue;
+  std::istringstream(request) >> result;
+  return result;
 }
 
 void MockClientConnector::SetResponse(const std::string &response) { this->response = response; }

src/test/mockserverconnector.cpp

@@ -8,6 +8,7 @@
  ************************************************************************/
 
 #include "mockserverconnector.h"
+#include <sstream>
 
 using namespace jsonrpc;
 using namespace std;
@@ -26,21 +27,15 @@ bool MockServerConnector::SetRequest(const string &request) {
 }
 
 Json::Value MockServerConnector::GetJsonRequest() {
-  Json::Reader reader;
   Json::Value result;
-  if (reader.parse(request, result))
-    return result;
-  else
-    return Json::nullValue;
+  istringstream(request) >> result;
+  return result;
 }
 
 string MockServerConnector::GetResponse() { return this->response; }
 
 Json::Value MockServerConnector::GetJsonResponse() {
-  Json::Reader reader;
   Json::Value result;
-  if (reader.parse(response, result))
-    return result;
-  else
-    return Json::nullValue;
+  istringstream(response) >> result;
+  return result;
 }