Rebuild sdk (#60)

* rebuild sdk

* fixed ut include Utils.h

hsm/src/model/ConfigNetworkRequest.cc

@@ -33,7 +33,7 @@ std::string ConfigNetworkRequest::getVSwitchId()const
 void ConfigNetworkRequest::setVSwitchId(const std::string& vSwitchId)
 {
 	vSwitchId_ = vSwitchId;
-	setParameter("VSwitchId", vSwitchId);
+	setCoreParameter("VSwitchId", vSwitchId);
 }
 
 long ConfigNetworkRequest::getResourceOwnerId()const
@@ -44,7 +44,7 @@ long ConfigNetworkRequest::getResourceOwnerId()const
 void ConfigNetworkRequest::setResourceOwnerId(long resourceOwnerId)
 {
 	resourceOwnerId_ = resourceOwnerId;
-	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
+	setCoreParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
 }
 
 std::string ConfigNetworkRequest::getInstanceId()const
@@ -55,7 +55,7 @@ std::string ConfigNetworkRequest::getInstanceId()const
 void ConfigNetworkRequest::setInstanceId(const std::string& instanceId)
 {
 	instanceId_ = instanceId;
-	setParameter("InstanceId", instanceId);
+	setCoreParameter("InstanceId", instanceId);
 }
 
 std::string ConfigNetworkRequest::getSourceIp()const
@@ -66,7 +66,7 @@ std::string ConfigNetworkRequest::getSourceIp()const
 void ConfigNetworkRequest::setSourceIp(const std::string& sourceIp)
 {
 	sourceIp_ = sourceIp;
-	setParameter("SourceIp", sourceIp);
+	setCoreParameter("SourceIp", sourceIp);
 }
 
 std::string ConfigNetworkRequest::getVpcId()const
@@ -77,7 +77,7 @@ std::string ConfigNetworkRequest::getVpcId()const
 void ConfigNetworkRequest::setVpcId(const std::string& vpcId)
 {
 	vpcId_ = vpcId;
-	setParameter("VpcId", vpcId);
+	setCoreParameter("VpcId", vpcId);
 }
 
 std::string ConfigNetworkRequest::getIp()const
@@ -88,6 +88,6 @@ std::string ConfigNetworkRequest::getIp()const
 void ConfigNetworkRequest::setIp(const std::string& ip)
 {
 	ip_ = ip;
-	setParameter("Ip", ip);
+	setCoreParameter("Ip", ip);
 }
 

hsm/src/model/ConfigNetworkResult.cc

@@ -35,10 +35,13 @@ ConfigNetworkResult::~ConfigNetworkResult()
 
 void ConfigNetworkResult::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());
 
 }

hsm/src/model/ConfigWhiteListRequest.cc

@@ -33,7 +33,7 @@ long ConfigWhiteListRequest::getResourceOwnerId()const
 void ConfigWhiteListRequest::setResourceOwnerId(long resourceOwnerId)
 {
 	resourceOwnerId_ = resourceOwnerId;
-	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
+	setCoreParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
 }
 
 std::string ConfigWhiteListRequest::getInstanceId()const
@@ -44,7 +44,7 @@ std::string ConfigWhiteListRequest::getInstanceId()const
 void ConfigWhiteListRequest::setInstanceId(const std::string& instanceId)
 {
 	instanceId_ = instanceId;
-	setParameter("InstanceId", instanceId);
+	setCoreParameter("InstanceId", instanceId);
 }
 
 std::string ConfigWhiteListRequest::getSourceIp()const
@@ -55,7 +55,7 @@ std::string ConfigWhiteListRequest::getSourceIp()const
 void ConfigWhiteListRequest::setSourceIp(const std::string& sourceIp)
 {
 	sourceIp_ = sourceIp;
-	setParameter("SourceIp", sourceIp);
+	setCoreParameter("SourceIp", sourceIp);
 }
 
 std::string ConfigWhiteListRequest::getWhiteList()const
@@ -66,6 +66,6 @@ std::string ConfigWhiteListRequest::getWhiteList()const
 void ConfigWhiteListRequest::setWhiteList(const std::string& whiteList)
 {
 	whiteList_ = whiteList;
-	setParameter("WhiteList", whiteList);
+	setCoreParameter("WhiteList", whiteList);
 }
 

hsm/src/model/ConfigWhiteListResult.cc

@@ -35,10 +35,13 @@ ConfigWhiteListResult::~ConfigWhiteListResult()
 
 void ConfigWhiteListResult::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());
 
 }

hsm/src/model/CreateInstanceRequest.cc

@@ -33,7 +33,7 @@ int CreateInstanceRequest::getPeriod()const
 void CreateInstanceRequest::setPeriod(int period)
 {
 	period_ = period;
-	setParameter("Period", std::to_string(period));
+	setCoreParameter("Period", std::to_string(period));
 }
 
 std::string CreateInstanceRequest::getPeriodUnit()const
@@ -44,7 +44,7 @@ std::string CreateInstanceRequest::getPeriodUnit()const
 void CreateInstanceRequest::setPeriodUnit(const std::string& periodUnit)
 {
 	periodUnit_ = periodUnit;
-	setParameter("PeriodUnit", periodUnit);
+	setCoreParameter("PeriodUnit", periodUnit);
 }
 
 std::string CreateInstanceRequest::getResourceOwnerId()const
@@ -55,7 +55,7 @@ std::string CreateInstanceRequest::getResourceOwnerId()const
 void CreateInstanceRequest::setResourceOwnerId(const std::string& resourceOwnerId)
 {
 	resourceOwnerId_ = resourceOwnerId;
-	setParameter("ResourceOwnerId", resourceOwnerId);
+	setCoreParameter("ResourceOwnerId", resourceOwnerId);
 }
 
 int CreateInstanceRequest::getQuantity()const
@@ -66,7 +66,7 @@ int CreateInstanceRequest::getQuantity()const
 void CreateInstanceRequest::setQuantity(int quantity)
 {
 	quantity_ = quantity;
-	setParameter("Quantity", std::to_string(quantity));
+	setCoreParameter("Quantity", std::to_string(quantity));
 }
 
 std::string CreateInstanceRequest::getHsmDeviceType()const
@@ -77,7 +77,7 @@ std::string CreateInstanceRequest::getHsmDeviceType()const
 void CreateInstanceRequest::setHsmDeviceType(const std::string& hsmDeviceType)
 {
 	hsmDeviceType_ = hsmDeviceType;
-	setParameter("HsmDeviceType", hsmDeviceType);
+	setCoreParameter("HsmDeviceType", hsmDeviceType);
 }
 
 std::string CreateInstanceRequest::getClientToken()const
@@ -88,7 +88,7 @@ std::string CreateInstanceRequest::getClientToken()const
 void CreateInstanceRequest::setClientToken(const std::string& clientToken)
 {
 	clientToken_ = clientToken;
-	setParameter("ClientToken", clientToken);
+	setCoreParameter("ClientToken", clientToken);
 }
 
 std::string CreateInstanceRequest::getZoneId()const
@@ -99,7 +99,7 @@ std::string CreateInstanceRequest::getZoneId()const
 void CreateInstanceRequest::setZoneId(const std::string& zoneId)
 {
 	zoneId_ = zoneId;
-	setParameter("ZoneId", zoneId);
+	setCoreParameter("ZoneId", zoneId);
 }
 
 std::string CreateInstanceRequest::getHsmOem()const
@@ -110,6 +110,6 @@ std::string CreateInstanceRequest::getHsmOem()const
 void CreateInstanceRequest::setHsmOem(const std::string& hsmOem)
 {
 	hsmOem_ = hsmOem;
-	setParameter("HsmOem", hsmOem);
+	setCoreParameter("HsmOem", hsmOem);
 }
 

hsm/src/model/CreateInstanceResult.cc

@@ -35,10 +35,13 @@ CreateInstanceResult::~CreateInstanceResult()
 
 void CreateInstanceResult::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 allInstanceIds = value["InstanceIds"]["InstanceId"];
 	for (const auto &item : allInstanceIds)

hsm/src/model/DescribeInstancesRequest.cc

@@ -33,7 +33,7 @@ long DescribeInstancesRequest::getResourceOwnerId()const
 void DescribeInstancesRequest::setResourceOwnerId(long resourceOwnerId)
 {
 	resourceOwnerId_ = resourceOwnerId;
-	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
+	setCoreParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
 }
 
 std::string DescribeInstancesRequest::getInstanceId()const
@@ -44,7 +44,7 @@ std::string DescribeInstancesRequest::getInstanceId()const
 void DescribeInstancesRequest::setInstanceId(const std::string& instanceId)
 {
 	instanceId_ = instanceId;
-	setParameter("InstanceId", instanceId);
+	setCoreParameter("InstanceId", instanceId);
 }
 
 std::string DescribeInstancesRequest::getSourceIp()const
@@ -55,7 +55,7 @@ std::string DescribeInstancesRequest::getSourceIp()const
 void DescribeInstancesRequest::setSourceIp(const std::string& sourceIp)
 {
 	sourceIp_ = sourceIp;
-	setParameter("SourceIp", sourceIp);
+	setCoreParameter("SourceIp", sourceIp);
 }
 
 int DescribeInstancesRequest::getPageSize()const
@@ -66,7 +66,7 @@ int DescribeInstancesRequest::getPageSize()const
 void DescribeInstancesRequest::setPageSize(int pageSize)
 {
 	pageSize_ = pageSize;
-	setParameter("PageSize", std::to_string(pageSize));
+	setCoreParameter("PageSize", std::to_string(pageSize));
 }
 
 int DescribeInstancesRequest::getCurrentPage()const
@@ -77,7 +77,7 @@ int DescribeInstancesRequest::getCurrentPage()const
 void DescribeInstancesRequest::setCurrentPage(int currentPage)
 {
 	currentPage_ = currentPage;
-	setParameter("CurrentPage", std::to_string(currentPage));
+	setCoreParameter("CurrentPage", std::to_string(currentPage));
 }
 
 int DescribeInstancesRequest::getHsmStatus()const
@@ -88,6 +88,6 @@ int DescribeInstancesRequest::getHsmStatus()const
 void DescribeInstancesRequest::setHsmStatus(int hsmStatus)
 {
 	hsmStatus_ = hsmStatus;
-	setParameter("HsmStatus", std::to_string(hsmStatus));
+	setCoreParameter("HsmStatus", std::to_string(hsmStatus));
 }
 

hsm/src/model/DescribeInstancesResult.cc

@@ -35,10 +35,13 @@ DescribeInstancesResult::~DescribeInstancesResult()
 
 void DescribeInstancesResult::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 allInstances = value["Instances"]["Instance"];
 	for (auto value : allInstances)

hsm/src/model/DescribeRegionsRequest.cc

@@ -33,7 +33,7 @@ long DescribeRegionsRequest::getResourceOwnerId()const
 void DescribeRegionsRequest::setResourceOwnerId(long resourceOwnerId)
 {
 	resourceOwnerId_ = resourceOwnerId;
-	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
+	setCoreParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
 }
 
 std::string DescribeRegionsRequest::getSourceIp()const
@@ -44,6 +44,6 @@ std::string DescribeRegionsRequest::getSourceIp()const
 void DescribeRegionsRequest::setSourceIp(const std::string& sourceIp)
 {
 	sourceIp_ = sourceIp;
-	setParameter("SourceIp", sourceIp);
+	setCoreParameter("SourceIp", sourceIp);
 }
 

hsm/src/model/DescribeRegionsResult.cc

@@ -35,10 +35,13 @@ DescribeRegionsResult::~DescribeRegionsResult()
 
 void DescribeRegionsResult::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 allRegions = value["Regions"]["Region"];
 	for (auto value : allRegions)

hsm/src/model/ModifyInstanceRequest.cc

@@ -33,7 +33,7 @@ long ModifyInstanceRequest::getResourceOwnerId()const
 void ModifyInstanceRequest::setResourceOwnerId(long resourceOwnerId)
 {
 	resourceOwnerId_ = resourceOwnerId;
-	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
+	setCoreParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
 }
 
 std::string ModifyInstanceRequest::getInstanceId()const
@@ -44,7 +44,7 @@ std::string ModifyInstanceRequest::getInstanceId()const
 void ModifyInstanceRequest::setInstanceId(const std::string& instanceId)
 {
 	instanceId_ = instanceId;
-	setParameter("InstanceId", instanceId);
+	setCoreParameter("InstanceId", instanceId);
 }
 
 std::string ModifyInstanceRequest::getSourceIp()const
@@ -55,7 +55,7 @@ std::string ModifyInstanceRequest::getSourceIp()const
 void ModifyInstanceRequest::setSourceIp(const std::string& sourceIp)
 {
 	sourceIp_ = sourceIp;
-	setParameter("SourceIp", sourceIp);
+	setCoreParameter("SourceIp", sourceIp);
 }
 
 std::string ModifyInstanceRequest::getRemark()const
@@ -66,6 +66,6 @@ std::string ModifyInstanceRequest::getRemark()const
 void ModifyInstanceRequest::setRemark(const std::string& remark)
 {
 	remark_ = remark;
-	setParameter("Remark", remark);
+	setCoreParameter("Remark", remark);
 }
 

hsm/src/model/ModifyInstanceResult.cc

@@ -35,10 +35,13 @@ ModifyInstanceResult::~ModifyInstanceResult()
 
 void ModifyInstanceResult::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());
 
 }

hsm/src/model/ReleaseInstanceRequest.cc

@@ -33,7 +33,7 @@ std::string ReleaseInstanceRequest::getResourceOwnerId()const
 void ReleaseInstanceRequest::setResourceOwnerId(const std::string& resourceOwnerId)
 {
 	resourceOwnerId_ = resourceOwnerId;
-	setParameter("ResourceOwnerId", resourceOwnerId);
+	setCoreParameter("ResourceOwnerId", resourceOwnerId);
 }
 
 std::string ReleaseInstanceRequest::getInstanceId()const
@@ -44,6 +44,6 @@ std::string ReleaseInstanceRequest::getInstanceId()const
 void ReleaseInstanceRequest::setInstanceId(const std::string& instanceId)
 {
 	instanceId_ = instanceId;
-	setParameter("InstanceId", instanceId);
+	setCoreParameter("InstanceId", instanceId);
 }
 

hsm/src/model/ReleaseInstanceResult.cc

@@ -35,10 +35,13 @@ ReleaseInstanceResult::~ReleaseInstanceResult()
 
 void ReleaseInstanceResult::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());
 
 }

hsm/src/model/RenewInstanceRequest.cc

@@ -33,7 +33,7 @@ int RenewInstanceRequest::getPeriod()const
 void RenewInstanceRequest::setPeriod(int period)
 {
 	period_ = period;
-	setParameter("Period", std::to_string(period));
+	setCoreParameter("Period", std::to_string(period));
 }
 
 std::string RenewInstanceRequest::getPeriodUnit()const
@@ -44,7 +44,7 @@ std::string RenewInstanceRequest::getPeriodUnit()const
 void RenewInstanceRequest::setPeriodUnit(const std::string& periodUnit)
 {
 	periodUnit_ = periodUnit;
-	setParameter("PeriodUnit", periodUnit);
+	setCoreParameter("PeriodUnit", periodUnit);
 }
 
 std::string RenewInstanceRequest::getResourceOwnerId()const
@@ -55,7 +55,7 @@ std::string RenewInstanceRequest::getResourceOwnerId()const
 void RenewInstanceRequest::setResourceOwnerId(const std::string& resourceOwnerId)
 {
 	resourceOwnerId_ = resourceOwnerId;
-	setParameter("ResourceOwnerId", resourceOwnerId);
+	setCoreParameter("ResourceOwnerId", resourceOwnerId);
 }
 
 std::string RenewInstanceRequest::getInstanceId()const
@@ -66,7 +66,7 @@ std::string RenewInstanceRequest::getInstanceId()const
 void RenewInstanceRequest::setInstanceId(const std::string& instanceId)
 {
 	instanceId_ = instanceId;
-	setParameter("InstanceId", instanceId);
+	setCoreParameter("InstanceId", instanceId);
 }
 
 std::string RenewInstanceRequest::getClientToken()const
@@ -77,6 +77,6 @@ std::string RenewInstanceRequest::getClientToken()const
 void RenewInstanceRequest::setClientToken(const std::string& clientToken)
 {
 	clientToken_ = clientToken;
-	setParameter("ClientToken", clientToken);
+	setCoreParameter("ClientToken", clientToken);
 }
 

hsm/src/model/RenewInstanceResult.cc

@@ -35,10 +35,13 @@ RenewInstanceResult::~RenewInstanceResult()
 
 void RenewInstanceResult::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());
 
 }