Rebuild sdk (#60)

* rebuild sdk

* fixed ut include Utils.h

mopen/src/MoPenClient.cc

@@ -231,42 +231,6 @@ MoPenClient::MoPenBindIsvOutcomeCallable MoPenClient::moPenBindIsvCallable(const
 	return task->get_future();
 }
 
-MoPenClient::MoPenCreateDeviceOutcome MoPenClient::moPenCreateDevice(const MoPenCreateDeviceRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return MoPenCreateDeviceOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return MoPenCreateDeviceOutcome(MoPenCreateDeviceResult(outcome.result()));
-	else
-		return MoPenCreateDeviceOutcome(outcome.error());
-}
-
-void MoPenClient::moPenCreateDeviceAsync(const MoPenCreateDeviceRequest& request, const MoPenCreateDeviceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, moPenCreateDevice(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-MoPenClient::MoPenCreateDeviceOutcomeCallable MoPenClient::moPenCreateDeviceCallable(const MoPenCreateDeviceRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<MoPenCreateDeviceOutcome()>>(
-			[this, request]()
-			{
-			return this->moPenCreateDevice(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 MoPenClient::MoPenAddGroupMemberOutcome MoPenClient::moPenAddGroupMember(const MoPenAddGroupMemberRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -303,6 +267,42 @@ MoPenClient::MoPenAddGroupMemberOutcomeCallable MoPenClient::moPenAddGroupMember
 	return task->get_future();
 }
 
+MoPenClient::MoPenCreateDeviceOutcome MoPenClient::moPenCreateDevice(const MoPenCreateDeviceRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return MoPenCreateDeviceOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return MoPenCreateDeviceOutcome(MoPenCreateDeviceResult(outcome.result()));
+	else
+		return MoPenCreateDeviceOutcome(outcome.error());
+}
+
+void MoPenClient::moPenCreateDeviceAsync(const MoPenCreateDeviceRequest& request, const MoPenCreateDeviceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, moPenCreateDevice(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+MoPenClient::MoPenCreateDeviceOutcomeCallable MoPenClient::moPenCreateDeviceCallable(const MoPenCreateDeviceRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<MoPenCreateDeviceOutcome()>>(
+			[this, request]()
+			{
+			return this->moPenCreateDevice(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 MoPenClient::MoPenSendMqttMessageOutcome MoPenClient::moPenSendMqttMessage(const MoPenSendMqttMessageRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

mopen/src/model/MoPenAddGroupMemberRequest.cc

@@ -33,7 +33,7 @@ std::string MoPenAddGroupMemberRequest::getGroupId()const
 void MoPenAddGroupMemberRequest::setGroupId(const std::string& groupId)
 {
 	groupId_ = groupId;
-	setParameter("GroupId", groupId);
+	setCoreParameter("GroupId", groupId);
 }
 
 std::string MoPenAddGroupMemberRequest::getDeviceName()const
@@ -44,6 +44,6 @@ std::string MoPenAddGroupMemberRequest::getDeviceName()const
 void MoPenAddGroupMemberRequest::setDeviceName(const std::string& deviceName)
 {
 	deviceName_ = deviceName;
-	setParameter("DeviceName", deviceName);
+	setCoreParameter("DeviceName", deviceName);
 }
 

mopen/src/model/MoPenAddGroupMemberResult.cc

@@ -35,10 +35,13 @@ MoPenAddGroupMemberResult::~MoPenAddGroupMemberResult()
 
 void MoPenAddGroupMemberResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	if(!value["Success"].isNull())
 		success_ = value["Success"].asString() == "true";

mopen/src/model/MoPenBindIsvRequest.cc

@@ -33,7 +33,7 @@ std::string MoPenBindIsvRequest::getOrderKey()const
 void MoPenBindIsvRequest::setOrderKey(const std::string& orderKey)
 {
 	orderKey_ = orderKey;
-	setParameter("OrderKey", orderKey);
+	setCoreParameter("OrderKey", orderKey);
 }
 
 std::string MoPenBindIsvRequest::getDeviceName()const
@@ -44,6 +44,6 @@ std::string MoPenBindIsvRequest::getDeviceName()const
 void MoPenBindIsvRequest::setDeviceName(const std::string& deviceName)
 {
 	deviceName_ = deviceName;
-	setParameter("DeviceName", deviceName);
+	setCoreParameter("DeviceName", deviceName);
 }
 

mopen/src/model/MoPenBindIsvResult.cc

@@ -35,10 +35,13 @@ MoPenBindIsvResult::~MoPenBindIsvResult()
 
 void MoPenBindIsvResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	if(!value["Code"].isNull())
 		code_ = value["Code"].asString() == "true";

mopen/src/model/MoPenCreateDeviceRequest.cc

@@ -33,7 +33,7 @@ std::string MoPenCreateDeviceRequest::getDeviceName()const
 void MoPenCreateDeviceRequest::setDeviceName(const std::string& deviceName)
 {
 	deviceName_ = deviceName;
-	setParameter("DeviceName", deviceName);
+	setCoreParameter("DeviceName", deviceName);
 }
 
 int MoPenCreateDeviceRequest::getDeviceType()const
@@ -44,6 +44,6 @@ int MoPenCreateDeviceRequest::getDeviceType()const
 void MoPenCreateDeviceRequest::setDeviceType(int deviceType)
 {
 	deviceType_ = deviceType;
-	setParameter("DeviceType", std::to_string(deviceType));
+	setCoreParameter("DeviceType", std::to_string(deviceType));
 }
 

mopen/src/model/MoPenCreateDeviceResult.cc

@@ -35,10 +35,13 @@ MoPenCreateDeviceResult::~MoPenCreateDeviceResult()
 
 void MoPenCreateDeviceResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto dataNode = value["Data"];
 	if(!dataNode["DeviceName"].isNull())

mopen/src/model/MoPenDeleteGroupMemberRequest.cc

@@ -33,7 +33,7 @@ long MoPenDeleteGroupMemberRequest::getGroupId()const
 void MoPenDeleteGroupMemberRequest::setGroupId(long groupId)
 {
 	groupId_ = groupId;
-	setParameter("GroupId", std::to_string(groupId));
+	setCoreParameter("GroupId", std::to_string(groupId));
 }
 
 std::string MoPenDeleteGroupMemberRequest::getDeviceName()const
@@ -44,6 +44,6 @@ std::string MoPenDeleteGroupMemberRequest::getDeviceName()const
 void MoPenDeleteGroupMemberRequest::setDeviceName(const std::string& deviceName)
 {
 	deviceName_ = deviceName;
-	setParameter("DeviceName", deviceName);
+	setCoreParameter("DeviceName", deviceName);
 }
 

mopen/src/model/MoPenDeleteGroupMemberResult.cc

@@ -35,10 +35,13 @@ MoPenDeleteGroupMemberResult::~MoPenDeleteGroupMemberResult()
 
 void MoPenDeleteGroupMemberResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	if(!value["Code"].isNull())
 		code_ = value["Code"].asString();

mopen/src/model/MoPenDeleteGroupRequest.cc

@@ -33,6 +33,6 @@ std::string MoPenDeleteGroupRequest::getGroupId()const
 void MoPenDeleteGroupRequest::setGroupId(const std::string& groupId)
 {
 	groupId_ = groupId;
-	setParameter("GroupId", groupId);
+	setCoreParameter("GroupId", groupId);
 }
 

mopen/src/model/MoPenDeleteGroupResult.cc

@@ -35,10 +35,13 @@ MoPenDeleteGroupResult::~MoPenDeleteGroupResult()
 
 void MoPenDeleteGroupResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	if(!value["Success"].isNull())
 		success_ = value["Success"].asString() == "true";

mopen/src/model/MoPenDoRecognizeRequest.cc

@@ -33,7 +33,7 @@ long MoPenDoRecognizeRequest::getCanvasId()const
 void MoPenDoRecognizeRequest::setCanvasId(long canvasId)
 {
 	canvasId_ = canvasId;
-	setParameter("CanvasId", std::to_string(canvasId));
+	setCoreParameter("CanvasId", std::to_string(canvasId));
 }
 
 int MoPenDoRecognizeRequest::getEndY()const
@@ -44,7 +44,7 @@ int MoPenDoRecognizeRequest::getEndY()const
 void MoPenDoRecognizeRequest::setEndY(int endY)
 {
 	endY_ = endY;
-	setParameter("EndY", std::to_string(endY));
+	setCoreParameter("EndY", std::to_string(endY));
 }
 
 int MoPenDoRecognizeRequest::getEndX()const
@@ -55,7 +55,7 @@ int MoPenDoRecognizeRequest::getEndX()const
 void MoPenDoRecognizeRequest::setEndX(int endX)
 {
 	endX_ = endX;
-	setParameter("EndX", std::to_string(endX));
+	setCoreParameter("EndX", std::to_string(endX));
 }
 
 std::string MoPenDoRecognizeRequest::getJsonConf()const
@@ -66,7 +66,7 @@ std::string MoPenDoRecognizeRequest::getJsonConf()const
 void MoPenDoRecognizeRequest::setJsonConf(const std::string& jsonConf)
 {
 	jsonConf_ = jsonConf;
-	setParameter("JsonConf", jsonConf);
+	setCoreParameter("JsonConf", jsonConf);
 }
 
 std::string MoPenDoRecognizeRequest::getExportType()const
@@ -77,7 +77,7 @@ std::string MoPenDoRecognizeRequest::getExportType()const
 void MoPenDoRecognizeRequest::setExportType(const std::string& exportType)
 {
 	exportType_ = exportType;
-	setParameter("ExportType", exportType);
+	setCoreParameter("ExportType", exportType);
 }
 
 int MoPenDoRecognizeRequest::getStartY()const
@@ -88,7 +88,7 @@ int MoPenDoRecognizeRequest::getStartY()const
 void MoPenDoRecognizeRequest::setStartY(int startY)
 {
 	startY_ = startY;
-	setParameter("StartY", std::to_string(startY));
+	setCoreParameter("StartY", std::to_string(startY));
 }
 
 int MoPenDoRecognizeRequest::getStartX()const
@@ -99,6 +99,6 @@ int MoPenDoRecognizeRequest::getStartX()const
 void MoPenDoRecognizeRequest::setStartX(int startX)
 {
 	startX_ = startX;
-	setParameter("StartX", std::to_string(startX));
+	setCoreParameter("StartX", std::to_string(startX));
 }
 

mopen/src/model/MoPenDoRecognizeResult.cc

@@ -35,10 +35,13 @@ MoPenDoRecognizeResult::~MoPenDoRecognizeResult()
 
 void MoPenDoRecognizeResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto dataNode = value["Data"];
 	if(!dataNode["Result"].isNull())

mopen/src/model/MoPenFindGroupRequest.cc

@@ -33,6 +33,6 @@ std::string MoPenFindGroupRequest::getCreator()const
 void MoPenFindGroupRequest::setCreator(const std::string& creator)
 {
 	creator_ = creator;
-	setParameter("Creator", creator);
+	setCoreParameter("Creator", creator);
 }
 

mopen/src/model/MoPenFindGroupResult.cc

@@ -35,10 +35,13 @@ MoPenFindGroupResult::~MoPenFindGroupResult()
 
 void MoPenFindGroupResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto dataNode = value["Data"];
 	if(!dataNode["GroupId"].isNull())

mopen/src/model/MoPenQueryCanvasRequest.cc

@@ -33,7 +33,7 @@ std::string MoPenQueryCanvasRequest::getDeviceName()const
 void MoPenQueryCanvasRequest::setDeviceName(const std::string& deviceName)
 {
 	deviceName_ = deviceName;
-	setParameter("DeviceName", deviceName);
+	setCoreParameter("DeviceName", deviceName);
 }
 
 std::string MoPenQueryCanvasRequest::getSessionId()const
@@ -44,7 +44,7 @@ std::string MoPenQueryCanvasRequest::getSessionId()const
 void MoPenQueryCanvasRequest::setSessionId(const std::string& sessionId)
 {
 	sessionId_ = sessionId;
-	setParameter("SessionId", sessionId);
+	setCoreParameter("SessionId", sessionId);
 }
 
 int MoPenQueryCanvasRequest::getPageId()const
@@ -55,7 +55,7 @@ int MoPenQueryCanvasRequest::getPageId()const
 void MoPenQueryCanvasRequest::setPageId(int pageId)
 {
 	pageId_ = pageId;
-	setParameter("PageId", std::to_string(pageId));
+	setCoreParameter("PageId", std::to_string(pageId));
 }
 
 int MoPenQueryCanvasRequest::getStatus()const
@@ -66,6 +66,6 @@ int MoPenQueryCanvasRequest::getStatus()const
 void MoPenQueryCanvasRequest::setStatus(int status)
 {
 	status_ = status;
-	setParameter("Status", std::to_string(status));
+	setCoreParameter("Status", std::to_string(status));
 }
 

mopen/src/model/MoPenQueryCanvasResult.cc

@@ -35,10 +35,13 @@ MoPenQueryCanvasResult::~MoPenQueryCanvasResult()
 
 void MoPenQueryCanvasResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto dataNode = value["Data"];
 	auto allCanvasList = value["CanvasList"]["Canvas"];

mopen/src/model/MoPenSendMqttMessageRequest.cc

@@ -33,7 +33,7 @@ std::string MoPenSendMqttMessageRequest::getPayload()const
 void MoPenSendMqttMessageRequest::setPayload(const std::string& payload)
 {
 	payload_ = payload;
-	setParameter("Payload", payload);
+	setCoreParameter("Payload", payload);
 }
 
 std::string MoPenSendMqttMessageRequest::getDeviceName()const
@@ -44,6 +44,6 @@ std::string MoPenSendMqttMessageRequest::getDeviceName()const
 void MoPenSendMqttMessageRequest::setDeviceName(const std::string& deviceName)
 {
 	deviceName_ = deviceName;
-	setParameter("DeviceName", deviceName);
+	setCoreParameter("DeviceName", deviceName);
 }
 

mopen/src/model/MoPenSendMqttMessageResult.cc

@@ -35,10 +35,13 @@ MoPenSendMqttMessageResult::~MoPenSendMqttMessageResult()
 
 void MoPenSendMqttMessageResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	if(!value["Code"].isNull())
 		code_ = value["Code"].asString();

mopen/src/model/MopenCreateGroupRequest.cc

@@ -33,6 +33,6 @@ std::string MopenCreateGroupRequest::getCreator()const
 void MopenCreateGroupRequest::setCreator(const std::string& creator)
 {
 	creator_ = creator;
-	setParameter("Creator", creator);
+	setCoreParameter("Creator", creator);
 }
 

mopen/src/model/MopenCreateGroupResult.cc

@@ -35,10 +35,13 @@ MopenCreateGroupResult::~MopenCreateGroupResult()
 
 void MopenCreateGroupResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto dataNode = value["Data"];
 	if(!dataNode["GroupId"].isNull())