Rebuild sdk (#60)

* rebuild sdk

* fixed ut include Utils.h

ess/src/EssClient.cc

@@ -1455,42 +1455,6 @@ EssClient::CreateNotificationConfigurationOutcomeCallable EssClient::createNotif
 	return task->get_future();
 }
 
-EssClient::ModifyScheduledTaskOutcome EssClient::modifyScheduledTask(const ModifyScheduledTaskRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return ModifyScheduledTaskOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return ModifyScheduledTaskOutcome(ModifyScheduledTaskResult(outcome.result()));
-	else
-		return ModifyScheduledTaskOutcome(outcome.error());
-}
-
-void EssClient::modifyScheduledTaskAsync(const ModifyScheduledTaskRequest& request, const ModifyScheduledTaskAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, modifyScheduledTask(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-EssClient::ModifyScheduledTaskOutcomeCallable EssClient::modifyScheduledTaskCallable(const ModifyScheduledTaskRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<ModifyScheduledTaskOutcome()>>(
-			[this, request]()
-			{
-			return this->modifyScheduledTask(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 EssClient::RecordLifecycleActionHeartbeatOutcome EssClient::recordLifecycleActionHeartbeat(const RecordLifecycleActionHeartbeatRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -1527,6 +1491,42 @@ EssClient::RecordLifecycleActionHeartbeatOutcomeCallable EssClient::recordLifecy
 	return task->get_future();
 }
 
+EssClient::ModifyScheduledTaskOutcome EssClient::modifyScheduledTask(const ModifyScheduledTaskRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return ModifyScheduledTaskOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return ModifyScheduledTaskOutcome(ModifyScheduledTaskResult(outcome.result()));
+	else
+		return ModifyScheduledTaskOutcome(outcome.error());
+}
+
+void EssClient::modifyScheduledTaskAsync(const ModifyScheduledTaskRequest& request, const ModifyScheduledTaskAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, modifyScheduledTask(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+EssClient::ModifyScheduledTaskOutcomeCallable EssClient::modifyScheduledTaskCallable(const ModifyScheduledTaskRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<ModifyScheduledTaskOutcome()>>(
+			[this, request]()
+			{
+			return this->modifyScheduledTask(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 EssClient::DeleteScalingGroupOutcome EssClient::deleteScalingGroup(const DeleteScalingGroupRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -1599,42 +1599,6 @@ EssClient::CreateScalingConfigurationOutcomeCallable EssClient::createScalingCon
 	return task->get_future();
 }
 
-EssClient::DescribeRegionsOutcome EssClient::describeRegions(const DescribeRegionsRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return DescribeRegionsOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return DescribeRegionsOutcome(DescribeRegionsResult(outcome.result()));
-	else
-		return DescribeRegionsOutcome(outcome.error());
-}
-
-void EssClient::describeRegionsAsync(const DescribeRegionsRequest& request, const DescribeRegionsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, describeRegions(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-EssClient::DescribeRegionsOutcomeCallable EssClient::describeRegionsCallable(const DescribeRegionsRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<DescribeRegionsOutcome()>>(
-			[this, request]()
-			{
-			return this->describeRegions(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 EssClient::DetachDBInstancesOutcome EssClient::detachDBInstances(const DetachDBInstancesRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -1671,6 +1635,42 @@ EssClient::DetachDBInstancesOutcomeCallable EssClient::detachDBInstancesCallable
 	return task->get_future();
 }
 
+EssClient::DescribeRegionsOutcome EssClient::describeRegions(const DescribeRegionsRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeRegionsOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeRegionsOutcome(DescribeRegionsResult(outcome.result()));
+	else
+		return DescribeRegionsOutcome(outcome.error());
+}
+
+void EssClient::describeRegionsAsync(const DescribeRegionsRequest& request, const DescribeRegionsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeRegions(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+EssClient::DescribeRegionsOutcomeCallable EssClient::describeRegionsCallable(const DescribeRegionsRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeRegionsOutcome()>>(
+			[this, request]()
+			{
+			return this->describeRegions(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 EssClient::SetInstancesProtectionOutcome EssClient::setInstancesProtection(const SetInstancesProtectionRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -1887,42 +1887,6 @@ EssClient::DescribeLimitationOutcomeCallable EssClient::describeLimitationCallab
 	return task->get_future();
 }
 
-EssClient::DescribeAlertConfigOutcome EssClient::describeAlertConfig(const DescribeAlertConfigRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return DescribeAlertConfigOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return DescribeAlertConfigOutcome(DescribeAlertConfigResult(outcome.result()));
-	else
-		return DescribeAlertConfigOutcome(outcome.error());
-}
-
-void EssClient::describeAlertConfigAsync(const DescribeAlertConfigRequest& request, const DescribeAlertConfigAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, describeAlertConfig(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-EssClient::DescribeAlertConfigOutcomeCallable EssClient::describeAlertConfigCallable(const DescribeAlertConfigRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<DescribeAlertConfigOutcome()>>(
-			[this, request]()
-			{
-			return this->describeAlertConfig(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 EssClient::CreateScalingGroupOutcome EssClient::createScalingGroup(const CreateScalingGroupRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -1959,6 +1923,42 @@ EssClient::CreateScalingGroupOutcomeCallable EssClient::createScalingGroupCallab
 	return task->get_future();
 }
 
+EssClient::DescribeAlertConfigOutcome EssClient::describeAlertConfig(const DescribeAlertConfigRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeAlertConfigOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeAlertConfigOutcome(DescribeAlertConfigResult(outcome.result()));
+	else
+		return DescribeAlertConfigOutcome(outcome.error());
+}
+
+void EssClient::describeAlertConfigAsync(const DescribeAlertConfigRequest& request, const DescribeAlertConfigAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeAlertConfig(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+EssClient::DescribeAlertConfigOutcomeCallable EssClient::describeAlertConfigCallable(const DescribeAlertConfigRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeAlertConfigOutcome()>>(
+			[this, request]()
+			{
+			return this->describeAlertConfig(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 EssClient::DeleteScalingConfigurationOutcome EssClient::deleteScalingConfiguration(const DeleteScalingConfigurationRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -2067,42 +2067,6 @@ EssClient::ModifyScalingRuleOutcomeCallable EssClient::modifyScalingRuleCallable
 	return task->get_future();
 }
 
-EssClient::DeleteScalingRuleOutcome EssClient::deleteScalingRule(const DeleteScalingRuleRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return DeleteScalingRuleOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return DeleteScalingRuleOutcome(DeleteScalingRuleResult(outcome.result()));
-	else
-		return DeleteScalingRuleOutcome(outcome.error());
-}
-
-void EssClient::deleteScalingRuleAsync(const DeleteScalingRuleRequest& request, const DeleteScalingRuleAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, deleteScalingRule(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-EssClient::DeleteScalingRuleOutcomeCallable EssClient::deleteScalingRuleCallable(const DeleteScalingRuleRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<DeleteScalingRuleOutcome()>>(
-			[this, request]()
-			{
-			return this->deleteScalingRule(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 EssClient::AttachDBInstancesOutcome EssClient::attachDBInstances(const AttachDBInstancesRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -2139,6 +2103,42 @@ EssClient::AttachDBInstancesOutcomeCallable EssClient::attachDBInstancesCallable
 	return task->get_future();
 }
 
+EssClient::DeleteScalingRuleOutcome EssClient::deleteScalingRule(const DeleteScalingRuleRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DeleteScalingRuleOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DeleteScalingRuleOutcome(DeleteScalingRuleResult(outcome.result()));
+	else
+		return DeleteScalingRuleOutcome(outcome.error());
+}
+
+void EssClient::deleteScalingRuleAsync(const DeleteScalingRuleRequest& request, const DeleteScalingRuleAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, deleteScalingRule(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+EssClient::DeleteScalingRuleOutcomeCallable EssClient::deleteScalingRuleCallable(const DeleteScalingRuleRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DeleteScalingRuleOutcome()>>(
+			[this, request]()
+			{
+			return this->deleteScalingRule(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 EssClient::CreateLifecycleHookOutcome EssClient::createLifecycleHook(const CreateLifecycleHookRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

ess/src/model/AttachDBInstancesResult.cc

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

ess/src/model/AttachInstancesResult.cc

@@ -35,10 +35,13 @@ AttachInstancesResult::~AttachInstancesResult()
 
 void AttachInstancesResult::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["ScalingActivityId"].isNull())
 		scalingActivityId_ = value["ScalingActivityId"].asString();

ess/src/model/AttachLoadBalancersResult.cc

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

ess/src/model/AttachVServerGroupsResult.cc

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

ess/src/model/CompleteLifecycleActionResult.cc

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

ess/src/model/CreateAlarmResult.cc

@@ -35,10 +35,13 @@ CreateAlarmResult::~CreateAlarmResult()
 
 void CreateAlarmResult::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["AlarmTaskId"].isNull())
 		alarmTaskId_ = value["AlarmTaskId"].asString();

ess/src/model/CreateLifecycleHookResult.cc

@@ -35,10 +35,13 @@ CreateLifecycleHookResult::~CreateLifecycleHookResult()
 
 void CreateLifecycleHookResult::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["LifecycleHookId"].isNull())
 		lifecycleHookId_ = value["LifecycleHookId"].asString();

ess/src/model/CreateNotificationConfigurationResult.cc

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

ess/src/model/CreateScalingConfigurationRequest.cc

@@ -47,6 +47,28 @@ void CreateScalingConfigurationRequest::setMemory(int memory)
 	setCoreParameter("Memory", std::to_string(memory));
 }
 
+std::string CreateScalingConfigurationRequest::getHpcClusterId()const
+{
+	return hpcClusterId_;
+}
+
+void CreateScalingConfigurationRequest::setHpcClusterId(const std::string& hpcClusterId)
+{
+	hpcClusterId_ = hpcClusterId;
+	setCoreParameter("HpcClusterId", hpcClusterId);
+}
+
+std::string CreateScalingConfigurationRequest::getClientToken()const
+{
+	return clientToken_;
+}
+
+void CreateScalingConfigurationRequest::setClientToken(const std::string& clientToken)
+{
+	clientToken_ = clientToken;
+	setCoreParameter("ClientToken", clientToken);
+}
+
 std::string CreateScalingConfigurationRequest::getScalingGroupId()const
 {
 	return scalingGroupId_;
@@ -230,6 +252,17 @@ void CreateScalingConfigurationRequest::setImageName(const std::string& imageNam
 	setCoreParameter("ImageName", imageName);
 }
 
+std::string CreateScalingConfigurationRequest::getInstanceDescription()const
+{
+	return instanceDescription_;
+}
+
+void CreateScalingConfigurationRequest::setInstanceDescription(const std::string& instanceDescription)
+{
+	instanceDescription_ = instanceDescription;
+	setCoreParameter("InstanceDescription", instanceDescription);
+}
+
 std::string CreateScalingConfigurationRequest::getInstanceType()const
 {
 	return instanceType_;
@@ -318,6 +351,18 @@ void CreateScalingConfigurationRequest::setOwnerId(long ownerId)
 	setCoreParameter("OwnerId", std::to_string(ownerId));
 }
 
+std::vector<std::string> CreateScalingConfigurationRequest::getSecurityGroupIds()const
+{
+	return securityGroupIds_;
+}
+
+void CreateScalingConfigurationRequest::setSecurityGroupIds(const std::vector<std::string>& securityGroupIds)
+{
+	securityGroupIds_ = securityGroupIds;
+	for(int i = 0; i!= securityGroupIds.size(); i++)
+		setCoreParameter("SecurityGroupIds."+ std::to_string(i), securityGroupIds.at(i));
+}
+
 std::vector<CreateScalingConfigurationRequest::DataDisk> CreateScalingConfigurationRequest::getDataDisk()const
 {
 	return dataDisk_;

ess/src/model/CreateScalingConfigurationResult.cc

@@ -35,10 +35,13 @@ CreateScalingConfigurationResult::~CreateScalingConfigurationResult()
 
 void CreateScalingConfigurationResult::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["ScalingConfigurationId"].isNull())
 		scalingConfigurationId_ = value["ScalingConfigurationId"].asString();

ess/src/model/CreateScalingGroupRequest.cc

@@ -25,6 +25,128 @@ CreateScalingGroupRequest::CreateScalingGroupRequest() :
 CreateScalingGroupRequest::~CreateScalingGroupRequest()
 {}
 
+std::string CreateScalingGroupRequest::getLoadBalancerIds()const
+{
+	return loadBalancerIds_;
+}
+
+void CreateScalingGroupRequest::setLoadBalancerIds(const std::string& loadBalancerIds)
+{
+	loadBalancerIds_ = loadBalancerIds;
+	setCoreParameter("LoadBalancerIds", loadBalancerIds);
+}
+
+std::string CreateScalingGroupRequest::getClientToken()const
+{
+	return clientToken_;
+}
+
+void CreateScalingGroupRequest::setClientToken(const std::string& clientToken)
+{
+	clientToken_ = clientToken;
+	setCoreParameter("ClientToken", clientToken);
+}
+
+std::vector<std::string> CreateScalingGroupRequest::getVSwitchIds()const
+{
+	return vSwitchIds_;
+}
+
+void CreateScalingGroupRequest::setVSwitchIds(const std::vector<std::string>& vSwitchIds)
+{
+	vSwitchIds_ = vSwitchIds;
+	for(int i = 0; i!= vSwitchIds.size(); i++)
+		setCoreParameter("VSwitchIds."+ std::to_string(i), vSwitchIds.at(i));
+}
+
+int CreateScalingGroupRequest::getOnDemandBaseCapacity()const
+{
+	return onDemandBaseCapacity_;
+}
+
+void CreateScalingGroupRequest::setOnDemandBaseCapacity(int onDemandBaseCapacity)
+{
+	onDemandBaseCapacity_ = onDemandBaseCapacity;
+	setCoreParameter("OnDemandBaseCapacity", std::to_string(onDemandBaseCapacity));
+}
+
+std::string CreateScalingGroupRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void CreateScalingGroupRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setCoreParameter("AccessKeyId", accessKeyId);
+}
+
+int CreateScalingGroupRequest::getOnDemandPercentageAboveBaseCapacity()const
+{
+	return onDemandPercentageAboveBaseCapacity_;
+}
+
+void CreateScalingGroupRequest::setOnDemandPercentageAboveBaseCapacity(int onDemandPercentageAboveBaseCapacity)
+{
+	onDemandPercentageAboveBaseCapacity_ = onDemandPercentageAboveBaseCapacity;
+	setCoreParameter("OnDemandPercentageAboveBaseCapacity", std::to_string(onDemandPercentageAboveBaseCapacity));
+}
+
+bool CreateScalingGroupRequest::getSpotInstanceRemedy()const
+{
+	return spotInstanceRemedy_;
+}
+
+void CreateScalingGroupRequest::setSpotInstanceRemedy(bool spotInstanceRemedy)
+{
+	spotInstanceRemedy_ = spotInstanceRemedy;
+	setCoreParameter("SpotInstanceRemedy", spotInstanceRemedy ? "true" : "false");
+}
+
+std::string CreateScalingGroupRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void CreateScalingGroupRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setCoreParameter("RegionId", regionId);
+}
+
+int CreateScalingGroupRequest::getDefaultCooldown()const
+{
+	return defaultCooldown_;
+}
+
+void CreateScalingGroupRequest::setDefaultCooldown(int defaultCooldown)
+{
+	defaultCooldown_ = defaultCooldown;
+	setCoreParameter("DefaultCooldown", std::to_string(defaultCooldown));
+}
+
+std::string CreateScalingGroupRequest::getRemovalPolicy1()const
+{
+	return removalPolicy1_;
+}
+
+void CreateScalingGroupRequest::setRemovalPolicy1(const std::string& removalPolicy1)
+{
+	removalPolicy1_ = removalPolicy1;
+	setCoreParameter("RemovalPolicy1", removalPolicy1);
+}
+
+std::string CreateScalingGroupRequest::getRemovalPolicy2()const
+{
+	return removalPolicy2_;
+}
+
+void CreateScalingGroupRequest::setRemovalPolicy2(const std::string& removalPolicy2)
+{
+	removalPolicy2_ = removalPolicy2;
+	setCoreParameter("RemovalPolicy2", removalPolicy2);
+}
+
 std::string CreateScalingGroupRequest::getMultiAZPolicy()const
 {
 	return multiAZPolicy_;
@@ -58,17 +180,6 @@ void CreateScalingGroupRequest::setLaunchTemplateId(const std::string& launchTem
 	setCoreParameter("LaunchTemplateId", launchTemplateId);
 }
 
-std::string CreateScalingGroupRequest::getLoadBalancerIds()const
-{
-	return loadBalancerIds_;
-}
-
-void CreateScalingGroupRequest::setLoadBalancerIds(const std::string& loadBalancerIds)
-{
-	loadBalancerIds_ = loadBalancerIds;
-	setCoreParameter("LoadBalancerIds", loadBalancerIds);
-}
-
 std::string CreateScalingGroupRequest::getHealthCheckType()const
 {
 	return healthCheckType_;
@@ -102,29 +213,6 @@ void CreateScalingGroupRequest::setScalingGroupName(const std::string& scalingGr
 	setCoreParameter("ScalingGroupName", scalingGroupName);
 }
 
-std::string CreateScalingGroupRequest::getClientToken()const
-{
-	return clientToken_;
-}
-
-void CreateScalingGroupRequest::setClientToken(const std::string& clientToken)
-{
-	clientToken_ = clientToken;
-	setCoreParameter("ClientToken", clientToken);
-}
-
-std::vector<std::string> CreateScalingGroupRequest::getVSwitchIds()const
-{
-	return vSwitchIds_;
-}
-
-void CreateScalingGroupRequest::setVSwitchIds(const std::vector<std::string>& vSwitchIds)
-{
-	vSwitchIds_ = vSwitchIds;
-	for(int i = 0; i!= vSwitchIds.size(); i++)
-		setCoreParameter("VSwitchIds."+ std::to_string(i), vSwitchIds.at(i));
-}
-
 std::string CreateScalingGroupRequest::getOwnerAccount()const
 {
 	return ownerAccount_;
@@ -136,6 +224,17 @@ void CreateScalingGroupRequest::setOwnerAccount(const std::string& ownerAccount)
 	setCoreParameter("OwnerAccount", ownerAccount);
 }
 
+int CreateScalingGroupRequest::getSpotInstancePools()const
+{
+	return spotInstancePools_;
+}
+
+void CreateScalingGroupRequest::setSpotInstancePools(int spotInstancePools)
+{
+	spotInstancePools_ = spotInstancePools;
+	setCoreParameter("SpotInstancePools", std::to_string(spotInstancePools));
+}
+
 int CreateScalingGroupRequest::getMinSize()const
 {
 	return minSize_;
@@ -180,17 +279,6 @@ void CreateScalingGroupRequest::setScalingPolicy(const std::string& scalingPolic
 	setCoreParameter("ScalingPolicy", scalingPolicy);
 }
 
-std::string CreateScalingGroupRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void CreateScalingGroupRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setCoreParameter("AccessKeyId", accessKeyId);
-}
-
 std::string CreateScalingGroupRequest::getVSwitchId()const
 {
 	return vSwitchId_;
@@ -202,17 +290,6 @@ void CreateScalingGroupRequest::setVSwitchId(const std::string& vSwitchId)
 	setCoreParameter("VSwitchId", vSwitchId);
 }
 
-std::string CreateScalingGroupRequest::getRegionId()const
-{
-	return regionId_;
-}
-
-void CreateScalingGroupRequest::setRegionId(const std::string& regionId)
-{
-	regionId_ = regionId;
-	setCoreParameter("RegionId", regionId);
-}
-
 int CreateScalingGroupRequest::getMaxSize()const
 {
 	return maxSize_;
@@ -245,28 +322,6 @@ void CreateScalingGroupRequest::setLifecycleHook(const std::vector<LifecycleHook
 	}
 }
 
-int CreateScalingGroupRequest::getDefaultCooldown()const
-{
-	return defaultCooldown_;
-}
-
-void CreateScalingGroupRequest::setDefaultCooldown(int defaultCooldown)
-{
-	defaultCooldown_ = defaultCooldown;
-	setCoreParameter("DefaultCooldown", std::to_string(defaultCooldown));
-}
-
-std::string CreateScalingGroupRequest::getRemovalPolicy1()const
-{
-	return removalPolicy1_;
-}
-
-void CreateScalingGroupRequest::setRemovalPolicy1(const std::string& removalPolicy1)
-{
-	removalPolicy1_ = removalPolicy1;
-	setCoreParameter("RemovalPolicy1", removalPolicy1);
-}
-
 std::vector<CreateScalingGroupRequest::VServerGroup> CreateScalingGroupRequest::getVServerGroup()const
 {
 	return vServerGroup_;
@@ -284,14 +339,3 @@ void CreateScalingGroupRequest::setVServerGroup(const std::vector<VServerGroup>&
 	}
 }
 
-std::string CreateScalingGroupRequest::getRemovalPolicy2()const
-{
-	return removalPolicy2_;
-}
-
-void CreateScalingGroupRequest::setRemovalPolicy2(const std::string& removalPolicy2)
-{
-	removalPolicy2_ = removalPolicy2;
-	setCoreParameter("RemovalPolicy2", removalPolicy2);
-}
-

ess/src/model/CreateScalingGroupResult.cc

@@ -35,10 +35,13 @@ CreateScalingGroupResult::~CreateScalingGroupResult()
 
 void CreateScalingGroupResult::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["ScalingGroupId"].isNull())
 		scalingGroupId_ = value["ScalingGroupId"].asString();

ess/src/model/CreateScalingRuleRequest.cc

@@ -98,6 +98,17 @@ void CreateScalingRuleRequest::setOwnerAccount(const std::string& ownerAccount)
 	setCoreParameter("OwnerAccount", ownerAccount);
 }
 
+int CreateScalingRuleRequest::getPredictiveTaskBufferTime()const
+{
+	return predictiveTaskBufferTime_;
+}
+
+void CreateScalingRuleRequest::setPredictiveTaskBufferTime(int predictiveTaskBufferTime)
+{
+	predictiveTaskBufferTime_ = predictiveTaskBufferTime;
+	setCoreParameter("PredictiveTaskBufferTime", std::to_string(predictiveTaskBufferTime));
+}
+
 std::string CreateScalingRuleRequest::getAdjustmentType()const
 {
 	return adjustmentType_;
@@ -131,6 +142,17 @@ void CreateScalingRuleRequest::setOwnerId(long ownerId)
 	setCoreParameter("OwnerId", std::to_string(ownerId));
 }
 
+int CreateScalingRuleRequest::getInitialMaxSize()const
+{
+	return initialMaxSize_;
+}
+
+void CreateScalingRuleRequest::setInitialMaxSize(int initialMaxSize)
+{
+	initialMaxSize_ = initialMaxSize;
+	setCoreParameter("InitialMaxSize", std::to_string(initialMaxSize));
+}
+
 std::string CreateScalingRuleRequest::getAccessKeyId()const
 {
 	return accessKeyId_;
@@ -142,6 +164,17 @@ void CreateScalingRuleRequest::setAccessKeyId(const std::string& accessKeyId)
 	setCoreParameter("AccessKeyId", accessKeyId);
 }
 
+int CreateScalingRuleRequest::getPredictiveValueBuffer()const
+{
+	return predictiveValueBuffer_;
+}
+
+void CreateScalingRuleRequest::setPredictiveValueBuffer(int predictiveValueBuffer)
+{
+	predictiveValueBuffer_ = predictiveValueBuffer;
+	setCoreParameter("PredictiveValueBuffer", std::to_string(predictiveValueBuffer));
+}
+
 std::string CreateScalingRuleRequest::getScalingRuleName()const
 {
 	return scalingRuleName_;
@@ -175,6 +208,17 @@ void CreateScalingRuleRequest::setMinAdjustmentMagnitude(int minAdjustmentMagnit
 	setCoreParameter("MinAdjustmentMagnitude", std::to_string(minAdjustmentMagnitude));
 }
 
+std::string CreateScalingRuleRequest::getPredictiveValueBehavior()const
+{
+	return predictiveValueBehavior_;
+}
+
+void CreateScalingRuleRequest::setPredictiveValueBehavior(const std::string& predictiveValueBehavior)
+{
+	predictiveValueBehavior_ = predictiveValueBehavior;
+	setCoreParameter("PredictiveValueBehavior", predictiveValueBehavior);
+}
+
 float CreateScalingRuleRequest::getTargetValue()const
 {
 	return targetValue_;
@@ -208,3 +252,14 @@ void CreateScalingRuleRequest::setMetricName(const std::string& metricName)
 	setCoreParameter("MetricName", metricName);
 }
 
+std::string CreateScalingRuleRequest::getPredictiveScalingMode()const
+{
+	return predictiveScalingMode_;
+}
+
+void CreateScalingRuleRequest::setPredictiveScalingMode(const std::string& predictiveScalingMode)
+{
+	predictiveScalingMode_ = predictiveScalingMode;
+	setCoreParameter("PredictiveScalingMode", predictiveScalingMode);
+}
+

ess/src/model/CreateScalingRuleResult.cc

@@ -35,10 +35,13 @@ CreateScalingRuleResult::~CreateScalingRuleResult()
 
 void CreateScalingRuleResult::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["ScalingRuleId"].isNull())
 		scalingRuleId_ = value["ScalingRuleId"].asString();

ess/src/model/CreateScheduledTaskResult.cc

@@ -35,10 +35,13 @@ CreateScheduledTaskResult::~CreateScheduledTaskResult()
 
 void CreateScheduledTaskResult::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["ScheduledTaskId"].isNull())
 		scheduledTaskId_ = value["ScheduledTaskId"].asString();

ess/src/model/DeactivateScalingConfigurationResult.cc

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

ess/src/model/DeleteAlarmResult.cc

@@ -35,10 +35,13 @@ DeleteAlarmResult::~DeleteAlarmResult()
 
 void DeleteAlarmResult::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["AlarmTaskId"].isNull())
 		alarmTaskId_ = value["AlarmTaskId"].asString();

ess/src/model/DeleteLifecycleHookResult.cc

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

ess/src/model/DeleteNotificationConfigurationResult.cc

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

ess/src/model/DeleteScalingConfigurationResult.cc

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

ess/src/model/DeleteScalingGroupResult.cc

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

ess/src/model/DeleteScalingRuleResult.cc

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

ess/src/model/DeleteScheduledTaskResult.cc

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

ess/src/model/DescribeAlarmsResult.cc

@@ -35,10 +35,13 @@ DescribeAlarmsResult::~DescribeAlarmsResult()
 
 void DescribeAlarmsResult::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 allAlarmList = value["AlarmList"]["Alarm"];
 	for (auto value : allAlarmList)

ess/src/model/DescribeAlertConfigResult.cc

@@ -35,10 +35,13 @@ DescribeAlertConfigResult::~DescribeAlertConfigResult()
 
 void DescribeAlertConfigResult::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["SuccessConfig"].isNull())
 		successConfig_ = std::stoi(value["SuccessConfig"].asString());

ess/src/model/DescribeCapacityHistoryResult.cc

@@ -35,10 +35,13 @@ DescribeCapacityHistoryResult::~DescribeCapacityHistoryResult()
 
 void DescribeCapacityHistoryResult::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 allCapacityHistoryItems = value["CapacityHistoryItems"]["CapacityHistoryModel"];
 	for (auto value : allCapacityHistoryItems)

ess/src/model/DescribeLifecycleHooksResult.cc

@@ -35,10 +35,13 @@ DescribeLifecycleHooksResult::~DescribeLifecycleHooksResult()
 
 void DescribeLifecycleHooksResult::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 allLifecycleHooks = value["LifecycleHooks"]["LifecycleHook"];
 	for (auto value : allLifecycleHooks)

ess/src/model/DescribeLimitationResult.cc

@@ -35,10 +35,13 @@ DescribeLimitationResult::~DescribeLimitationResult()
 
 void DescribeLimitationResult::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["MaxNumberOfScalingGroups"].isNull())
 		maxNumberOfScalingGroups_ = std::stoi(value["MaxNumberOfScalingGroups"].asString());

ess/src/model/DescribeNotificationConfigurationsResult.cc

@@ -35,10 +35,13 @@ DescribeNotificationConfigurationsResult::~DescribeNotificationConfigurationsRes
 
 void DescribeNotificationConfigurationsResult::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 allNotificationConfigurationModels = value["NotificationConfigurationModels"]["NotificationConfigurationModel"];
 	for (auto value : allNotificationConfigurationModels)

ess/src/model/DescribeNotificationTypesResult.cc

@@ -35,10 +35,13 @@ DescribeNotificationTypesResult::~DescribeNotificationTypesResult()
 
 void DescribeNotificationTypesResult::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 allNotificationTypes = value["NotificationTypes"]["NotificationType"];
 	for (const auto &item : allNotificationTypes)

ess/src/model/DescribeRegionsRequest.cc

@@ -47,6 +47,17 @@ void DescribeRegionsRequest::setResourceOwnerAccount(const std::string& resource
 	setCoreParameter("ResourceOwnerAccount", resourceOwnerAccount);
 }
 
+std::string DescribeRegionsRequest::getAcceptLanguage()const
+{
+	return acceptLanguage_;
+}
+
+void DescribeRegionsRequest::setAcceptLanguage(const std::string& acceptLanguage)
+{
+	acceptLanguage_ = acceptLanguage;
+	setCoreParameter("AcceptLanguage", acceptLanguage);
+}
+
 long DescribeRegionsRequest::getOwnerId()const
 {
 	return ownerId_;

ess/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)
@@ -50,6 +53,10 @@ void DescribeRegionsResult::parse(const std::string &payload)
 			regionsObject.classicUnavailable = value["ClassicUnavailable"].asString() == "true";
 		if(!value["VpcUnavailable"].isNull())
 			regionsObject.vpcUnavailable = value["VpcUnavailable"].asString() == "true";
+		if(!value["RegionEndpoint"].isNull())
+			regionsObject.regionEndpoint = value["RegionEndpoint"].asString();
+		if(!value["LocalName"].isNull())
+			regionsObject.localName = value["LocalName"].asString();
 		regions_.push_back(regionsObject);
 	}
 

ess/src/model/DescribeScalingActivitiesResult.cc

@@ -35,10 +35,13 @@ DescribeScalingActivitiesResult::~DescribeScalingActivitiesResult()
 
 void DescribeScalingActivitiesResult::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 allScalingActivities = value["ScalingActivities"]["ScalingActivity"];
 	for (auto value : allScalingActivities)

ess/src/model/DescribeScalingActivityDetailResult.cc

@@ -35,10 +35,13 @@ DescribeScalingActivityDetailResult::~DescribeScalingActivityDetailResult()
 
 void DescribeScalingActivityDetailResult::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["ScalingActivityId"].isNull())
 		scalingActivityId_ = value["ScalingActivityId"].asString();

ess/src/model/DescribeScalingConfigurationsResult.cc

@@ -35,10 +35,13 @@ DescribeScalingConfigurationsResult::~DescribeScalingConfigurationsResult()
 
 void DescribeScalingConfigurationsResult::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 allScalingConfigurations = value["ScalingConfigurations"]["ScalingConfiguration"];
 	for (auto value : allScalingConfigurations)
@@ -106,6 +109,10 @@ void DescribeScalingConfigurationsResult::parse(const std::string &payload)
 			scalingConfigurationsObject.passwordInherit = value["PasswordInherit"].asString() == "true";
 		if(!value["ResourceGroupId"].isNull())
 			scalingConfigurationsObject.resourceGroupId = value["ResourceGroupId"].asString();
+		if(!value["HpcClusterId"].isNull())
+			scalingConfigurationsObject.hpcClusterId = value["HpcClusterId"].asString();
+		if(!value["InstanceDescription"].isNull())
+			scalingConfigurationsObject.instanceDescription = value["InstanceDescription"].asString();
 		auto allDataDisks = value["DataDisks"]["DataDisk"];
 		for (auto value : allDataDisks)
 		{
@@ -153,6 +160,9 @@ void DescribeScalingConfigurationsResult::parse(const std::string &payload)
 		auto allInstanceTypes = value["InstanceTypes"]["InstanceType"];
 		for (auto value : allInstanceTypes)
 			scalingConfigurationsObject.instanceTypes.push_back(value.asString());
+		auto allSecurityGroupIds = value["SecurityGroupIds"]["SecurityGroupId"];
+		for (auto value : allSecurityGroupIds)
+			scalingConfigurationsObject.securityGroupIds.push_back(value.asString());
 		scalingConfigurations_.push_back(scalingConfigurationsObject);
 	}
 	if(!value["TotalCount"].isNull())

ess/src/model/DescribeScalingGroupsResult.cc

@@ -35,10 +35,13 @@ DescribeScalingGroupsResult::~DescribeScalingGroupsResult()
 
 void DescribeScalingGroupsResult::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 allScalingGroups = value["ScalingGroups"]["ScalingGroup"];
 	for (auto value : allScalingGroups)
@@ -96,6 +99,14 @@ void DescribeScalingGroupsResult::parse(const std::string &payload)
 			scalingGroupsObject.scalingPolicy = value["ScalingPolicy"].asString();
 		if(!value["StoppedCapacity"].isNull())
 			scalingGroupsObject.stoppedCapacity = std::stoi(value["StoppedCapacity"].asString());
+		if(!value["OnDemandBaseCapacity"].isNull())
+			scalingGroupsObject.onDemandBaseCapacity = std::stoi(value["OnDemandBaseCapacity"].asString());
+		if(!value["OnDemandPercentageAboveBaseCapacity"].isNull())
+			scalingGroupsObject.onDemandPercentageAboveBaseCapacity = std::stoi(value["OnDemandPercentageAboveBaseCapacity"].asString());
+		if(!value["SpotInstanceRemedy"].isNull())
+			scalingGroupsObject.spotInstanceRemedy = value["SpotInstanceRemedy"].asString() == "true";
+		if(!value["SpotInstancePools"].isNull())
+			scalingGroupsObject.spotInstancePools = std::stoi(value["SpotInstancePools"].asString());
 		auto allVServerGroups = value["VServerGroups"]["VServerGroup"];
 		for (auto value : allVServerGroups)
 		{

ess/src/model/DescribeScalingInstancesResult.cc

@@ -35,10 +35,13 @@ DescribeScalingInstancesResult::~DescribeScalingInstancesResult()
 
 void DescribeScalingInstancesResult::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 allScalingInstances = value["ScalingInstances"]["ScalingInstance"];
 	for (auto value : allScalingInstances)

ess/src/model/DescribeScalingRulesResult.cc

@@ -35,10 +35,13 @@ DescribeScalingRulesResult::~DescribeScalingRulesResult()
 
 void DescribeScalingRulesResult::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 allScalingRules = value["ScalingRules"]["ScalingRule"];
 	for (auto value : allScalingRules)
@@ -74,6 +77,16 @@ void DescribeScalingRulesResult::parse(const std::string &payload)
 			scalingRulesObject.targetValue = std::stof(value["TargetValue"].asString());
 		if(!value["DisableScaleIn"].isNull())
 			scalingRulesObject.disableScaleIn = value["DisableScaleIn"].asString() == "true";
+		if(!value["PredictiveScalingMode"].isNull())
+			scalingRulesObject.predictiveScalingMode = value["PredictiveScalingMode"].asString();
+		if(!value["PredictiveValueBehavior"].isNull())
+			scalingRulesObject.predictiveValueBehavior = value["PredictiveValueBehavior"].asString();
+		if(!value["PredictiveValueBuffer"].isNull())
+			scalingRulesObject.predictiveValueBuffer = std::stoi(value["PredictiveValueBuffer"].asString());
+		if(!value["PredictiveTaskBufferTime"].isNull())
+			scalingRulesObject.predictiveTaskBufferTime = std::stoi(value["PredictiveTaskBufferTime"].asString());
+		if(!value["InitialMaxSize"].isNull())
+			scalingRulesObject.initialMaxSize = std::stoi(value["InitialMaxSize"].asString());
 		auto allAlarms = value["Alarms"]["Alarm"];
 		for (auto value : allAlarms)
 		{
@@ -82,6 +95,26 @@ void DescribeScalingRulesResult::parse(const std::string &payload)
 				alarmsObject.alarmTaskName = value["AlarmTaskName"].asString();
 			if(!value["AlarmTaskId"].isNull())
 				alarmsObject.alarmTaskId = value["AlarmTaskId"].asString();
+			if(!value["ComparisonOperator"].isNull())
+				alarmsObject.comparisonOperator = value["ComparisonOperator"].asString();
+			if(!value["Statistics"].isNull())
+				alarmsObject.statistics = value["Statistics"].asString();
+			if(!value["MetricName"].isNull())
+				alarmsObject.metricName = value["MetricName"].asString();
+			if(!value["Threshold"].isNull())
+				alarmsObject.threshold = std::stof(value["Threshold"].asString());
+			if(!value["EvaluationCount"].isNull())
+				alarmsObject.evaluationCount = std::stoi(value["EvaluationCount"].asString());
+			auto allDimensions = value["Dimensions"]["Dimension"];
+			for (auto value : allDimensions)
+			{
+				ScalingRule::Alarm::Dimension dimensionsObject;
+				if(!value["DimensionKey"].isNull())
+					dimensionsObject.dimensionKey = value["DimensionKey"].asString();
+				if(!value["DimensionValue"].isNull())
+					dimensionsObject.dimensionValue = value["DimensionValue"].asString();
+				alarmsObject.dimensions.push_back(dimensionsObject);
+			}
 			scalingRulesObject.alarms.push_back(alarmsObject);
 		}
 		auto allStepAdjustments = value["StepAdjustments"]["StepAdjustment"];

ess/src/model/DescribeScheduledTasksResult.cc

@@ -35,10 +35,13 @@ DescribeScheduledTasksResult::~DescribeScheduledTasksResult()
 
 void DescribeScheduledTasksResult::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 allScheduledTasks = value["ScheduledTasks"]["ScheduledTask"];
 	for (auto value : allScheduledTasks)
@@ -64,6 +67,10 @@ void DescribeScheduledTasksResult::parse(const std::string &payload)
 			scheduledTasksObject.launchExpirationTime = std::stoi(value["LaunchExpirationTime"].asString());
 		if(!value["TaskEnabled"].isNull())
 			scheduledTasksObject.taskEnabled = value["TaskEnabled"].asString() == "true";
+		if(!value["MaxValue"].isNull())
+			scheduledTasksObject.maxValue = std::stoi(value["MaxValue"].asString());
+		if(!value["MinValue"].isNull())
+			scheduledTasksObject.minValue = std::stoi(value["MinValue"].asString());
 		scheduledTasks_.push_back(scheduledTasksObject);
 	}
 	if(!value["TotalCount"].isNull())

ess/src/model/DetachDBInstancesResult.cc

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

ess/src/model/DetachInstancesResult.cc

@@ -35,10 +35,13 @@ DetachInstancesResult::~DetachInstancesResult()
 
 void DetachInstancesResult::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["ScalingActivityId"].isNull())
 		scalingActivityId_ = value["ScalingActivityId"].asString();

ess/src/model/DetachLoadBalancersResult.cc

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

ess/src/model/DetachVServerGroupsResult.cc

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

ess/src/model/DisableAlarmResult.cc

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

ess/src/model/DisableScalingGroupResult.cc

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

ess/src/model/EnableAlarmResult.cc

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

ess/src/model/EnableScalingGroupResult.cc

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

ess/src/model/EnterStandbyResult.cc

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

ess/src/model/ExecuteScalingRuleResult.cc

@@ -35,10 +35,13 @@ ExecuteScalingRuleResult::~ExecuteScalingRuleResult()
 
 void ExecuteScalingRuleResult::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["ScalingActivityId"].isNull())
 		scalingActivityId_ = value["ScalingActivityId"].asString();

ess/src/model/ExitStandbyResult.cc

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

ess/src/model/ModifyAlarmResult.cc

@@ -35,10 +35,13 @@ ModifyAlarmResult::~ModifyAlarmResult()
 
 void ModifyAlarmResult::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["AlarmTaskId"].isNull())
 		alarmTaskId_ = value["AlarmTaskId"].asString();

ess/src/model/ModifyAlertConfigResult.cc

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

ess/src/model/ModifyLifecycleHookResult.cc

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

ess/src/model/ModifyNotificationConfigurationResult.cc

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

ess/src/model/ModifyScalingConfigurationRequest.cc

@@ -47,6 +47,17 @@ void ModifyScalingConfigurationRequest::setMemory(int memory)
 	setCoreParameter("Memory", std::to_string(memory));
 }
 
+std::string ModifyScalingConfigurationRequest::getHpcClusterId()const
+{
+	return hpcClusterId_;
+}
+
+void ModifyScalingConfigurationRequest::setHpcClusterId(const std::string& hpcClusterId)
+{
+	hpcClusterId_ = hpcClusterId;
+	setCoreParameter("HpcClusterId", hpcClusterId);
+}
+
 std::string ModifyScalingConfigurationRequest::getIoOptimized()const
 {
 	return ioOptimized_;
@@ -197,6 +208,17 @@ void ModifyScalingConfigurationRequest::setImageName(const std::string& imageNam
 	setCoreParameter("ImageName", imageName);
 }
 
+std::string ModifyScalingConfigurationRequest::getInstanceDescription()const
+{
+	return instanceDescription_;
+}
+
+void ModifyScalingConfigurationRequest::setInstanceDescription(const std::string& instanceDescription)
+{
+	instanceDescription_ = instanceDescription;
+	setCoreParameter("InstanceDescription", instanceDescription);
+}
+
 bool ModifyScalingConfigurationRequest::getOverride()const
 {
 	return override_;
@@ -285,6 +307,18 @@ void ModifyScalingConfigurationRequest::setOwnerId(long ownerId)
 	setCoreParameter("OwnerId", std::to_string(ownerId));
 }
 
+std::vector<std::string> ModifyScalingConfigurationRequest::getSecurityGroupIds()const
+{
+	return securityGroupIds_;
+}
+
+void ModifyScalingConfigurationRequest::setSecurityGroupIds(const std::vector<std::string>& securityGroupIds)
+{
+	securityGroupIds_ = securityGroupIds;
+	for(int i = 0; i!= securityGroupIds.size(); i++)
+		setCoreParameter("SecurityGroupIds."+ std::to_string(i), securityGroupIds.at(i));
+}
+
 std::vector<ModifyScalingConfigurationRequest::DataDisk> ModifyScalingConfigurationRequest::getDataDisk()const
 {
 	return dataDisk_;

ess/src/model/ModifyScalingConfigurationResult.cc

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

ess/src/model/ModifyScalingGroupRequest.cc

@@ -114,6 +114,17 @@ void ModifyScalingGroupRequest::setOwnerAccount(const std::string& ownerAccount)
 	setCoreParameter("OwnerAccount", ownerAccount);
 }
 
+int ModifyScalingGroupRequest::getSpotInstancePools()const
+{
+	return spotInstancePools_;
+}
+
+void ModifyScalingGroupRequest::setSpotInstancePools(int spotInstancePools)
+{
+	spotInstancePools_ = spotInstancePools;
+	setCoreParameter("SpotInstancePools", std::to_string(spotInstancePools));
+}
+
 std::string ModifyScalingGroupRequest::getActiveScalingConfigurationId()const
 {
 	return activeScalingConfigurationId_;
@@ -158,6 +169,17 @@ void ModifyScalingGroupRequest::setLaunchTemplateVersion(const std::string& laun
 	setCoreParameter("LaunchTemplateVersion", launchTemplateVersion);
 }
 
+int ModifyScalingGroupRequest::getOnDemandBaseCapacity()const
+{
+	return onDemandBaseCapacity_;
+}
+
+void ModifyScalingGroupRequest::setOnDemandBaseCapacity(int onDemandBaseCapacity)
+{
+	onDemandBaseCapacity_ = onDemandBaseCapacity;
+	setCoreParameter("OnDemandBaseCapacity", std::to_string(onDemandBaseCapacity));
+}
+
 std::string ModifyScalingGroupRequest::getAccessKeyId()const
 {
 	return accessKeyId_;
@@ -169,6 +191,28 @@ void ModifyScalingGroupRequest::setAccessKeyId(const std::string& accessKeyId)
 	setCoreParameter("AccessKeyId", accessKeyId);
 }
 
+int ModifyScalingGroupRequest::getOnDemandPercentageAboveBaseCapacity()const
+{
+	return onDemandPercentageAboveBaseCapacity_;
+}
+
+void ModifyScalingGroupRequest::setOnDemandPercentageAboveBaseCapacity(int onDemandPercentageAboveBaseCapacity)
+{
+	onDemandPercentageAboveBaseCapacity_ = onDemandPercentageAboveBaseCapacity;
+	setCoreParameter("OnDemandPercentageAboveBaseCapacity", std::to_string(onDemandPercentageAboveBaseCapacity));
+}
+
+bool ModifyScalingGroupRequest::getSpotInstanceRemedy()const
+{
+	return spotInstanceRemedy_;
+}
+
+void ModifyScalingGroupRequest::setSpotInstanceRemedy(bool spotInstanceRemedy)
+{
+	spotInstanceRemedy_ = spotInstanceRemedy;
+	setCoreParameter("SpotInstanceRemedy", spotInstanceRemedy ? "true" : "false");
+}
+
 int ModifyScalingGroupRequest::getMaxSize()const
 {
 	return maxSize_;

ess/src/model/ModifyScalingGroupResult.cc

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

ess/src/model/ModifyScalingRuleRequest.cc

@@ -98,6 +98,17 @@ void ModifyScalingRuleRequest::setOwnerAccount(const std::string& ownerAccount)
 	setCoreParameter("OwnerAccount", ownerAccount);
 }
 
+int ModifyScalingRuleRequest::getPredictiveTaskBufferTime()const
+{
+	return predictiveTaskBufferTime_;
+}
+
+void ModifyScalingRuleRequest::setPredictiveTaskBufferTime(int predictiveTaskBufferTime)
+{
+	predictiveTaskBufferTime_ = predictiveTaskBufferTime;
+	setCoreParameter("PredictiveTaskBufferTime", std::to_string(predictiveTaskBufferTime));
+}
+
 std::string ModifyScalingRuleRequest::getAdjustmentType()const
 {
 	return adjustmentType_;
@@ -142,6 +153,17 @@ void ModifyScalingRuleRequest::setScalingRuleId(const std::string& scalingRuleId
 	setCoreParameter("ScalingRuleId", scalingRuleId);
 }
 
+int ModifyScalingRuleRequest::getInitialMaxSize()const
+{
+	return initialMaxSize_;
+}
+
+void ModifyScalingRuleRequest::setInitialMaxSize(int initialMaxSize)
+{
+	initialMaxSize_ = initialMaxSize;
+	setCoreParameter("InitialMaxSize", std::to_string(initialMaxSize));
+}
+
 std::string ModifyScalingRuleRequest::getAccessKeyId()const
 {
 	return accessKeyId_;
@@ -153,6 +175,17 @@ void ModifyScalingRuleRequest::setAccessKeyId(const std::string& accessKeyId)
 	setCoreParameter("AccessKeyId", accessKeyId);
 }
 
+int ModifyScalingRuleRequest::getPredictiveValueBuffer()const
+{
+	return predictiveValueBuffer_;
+}
+
+void ModifyScalingRuleRequest::setPredictiveValueBuffer(int predictiveValueBuffer)
+{
+	predictiveValueBuffer_ = predictiveValueBuffer;
+	setCoreParameter("PredictiveValueBuffer", std::to_string(predictiveValueBuffer));
+}
+
 std::string ModifyScalingRuleRequest::getScalingRuleName()const
 {
 	return scalingRuleName_;
@@ -186,6 +219,17 @@ void ModifyScalingRuleRequest::setMinAdjustmentMagnitude(int minAdjustmentMagnit
 	setCoreParameter("MinAdjustmentMagnitude", std::to_string(minAdjustmentMagnitude));
 }
 
+std::string ModifyScalingRuleRequest::getPredictiveValueBehavior()const
+{
+	return predictiveValueBehavior_;
+}
+
+void ModifyScalingRuleRequest::setPredictiveValueBehavior(const std::string& predictiveValueBehavior)
+{
+	predictiveValueBehavior_ = predictiveValueBehavior;
+	setCoreParameter("PredictiveValueBehavior", predictiveValueBehavior);
+}
+
 float ModifyScalingRuleRequest::getTargetValue()const
 {
 	return targetValue_;
@@ -208,3 +252,14 @@ void ModifyScalingRuleRequest::setMetricName(const std::string& metricName)
 	setCoreParameter("MetricName", metricName);
 }
 
+std::string ModifyScalingRuleRequest::getPredictiveScalingMode()const
+{
+	return predictiveScalingMode_;
+}
+
+void ModifyScalingRuleRequest::setPredictiveScalingMode(const std::string& predictiveScalingMode)
+{
+	predictiveScalingMode_ = predictiveScalingMode;
+	setCoreParameter("PredictiveScalingMode", predictiveScalingMode);
+}
+

ess/src/model/ModifyScalingRuleResult.cc

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

ess/src/model/ModifyScheduledTaskRequest.cc

@@ -58,6 +58,17 @@ void ModifyScheduledTaskRequest::setScheduledAction(const std::string& scheduled
 	setCoreParameter("ScheduledAction", scheduledAction);
 }
 
+int ModifyScheduledTaskRequest::getMaxValue()const
+{
+	return maxValue_;
+}
+
+void ModifyScheduledTaskRequest::setMaxValue(int maxValue)
+{
+	maxValue_ = maxValue;
+	setCoreParameter("MaxValue", std::to_string(maxValue));
+}
+
 std::string ModifyScheduledTaskRequest::getResourceOwnerAccount()const
 {
 	return resourceOwnerAccount_;
@@ -146,6 +157,17 @@ void ModifyScheduledTaskRequest::setAccessKeyId(const std::string& accessKeyId)
 	setCoreParameter("AccessKeyId", accessKeyId);
 }
 
+int ModifyScheduledTaskRequest::getMinValue()const
+{
+	return minValue_;
+}
+
+void ModifyScheduledTaskRequest::setMinValue(int minValue)
+{
+	minValue_ = minValue;
+	setCoreParameter("MinValue", std::to_string(minValue));
+}
+
 std::string ModifyScheduledTaskRequest::getScheduledTaskName()const
 {
 	return scheduledTaskName_;

ess/src/model/ModifyScheduledTaskResult.cc

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

ess/src/model/RebalanceInstancesResult.cc

@@ -35,10 +35,13 @@ RebalanceInstancesResult::~RebalanceInstancesResult()
 
 void RebalanceInstancesResult::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["ScalingActivityId"].isNull())
 		scalingActivityId_ = value["ScalingActivityId"].asString();

ess/src/model/RecordLifecycleActionHeartbeatResult.cc

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

ess/src/model/RemoveInstancesResult.cc

@@ -35,10 +35,13 @@ RemoveInstancesResult::~RemoveInstancesResult()
 
 void RemoveInstancesResult::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["ScalingActivityId"].isNull())
 		scalingActivityId_ = value["ScalingActivityId"].asString();

ess/src/model/SetInstancesProtectionResult.cc

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

ess/src/model/VerifyAuthenticationResult.cc

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

ess/src/model/VerifyUserResult.cc

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