Rebuild sdk (#60)

* rebuild sdk

* fixed ut include Utils.h

kms/src/KmsClient.cc

@@ -195,42 +195,6 @@ KmsClient::DisableKeyOutcomeCallable KmsClient::disableKeyCallable(const Disable
 	return task->get_future();
 }
 
-KmsClient::DeleteAliasOutcome KmsClient::deleteAlias(const DeleteAliasRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return DeleteAliasOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return DeleteAliasOutcome(DeleteAliasResult(outcome.result()));
-	else
-		return DeleteAliasOutcome(outcome.error());
-}
-
-void KmsClient::deleteAliasAsync(const DeleteAliasRequest& request, const DeleteAliasAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, deleteAlias(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-KmsClient::DeleteAliasOutcomeCallable KmsClient::deleteAliasCallable(const DeleteAliasRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<DeleteAliasOutcome()>>(
-			[this, request]()
-			{
-			return this->deleteAlias(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 KmsClient::DecryptOutcome KmsClient::decrypt(const DecryptRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -267,6 +231,42 @@ KmsClient::DecryptOutcomeCallable KmsClient::decryptCallable(const DecryptReques
 	return task->get_future();
 }
 
+KmsClient::DeleteAliasOutcome KmsClient::deleteAlias(const DeleteAliasRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DeleteAliasOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DeleteAliasOutcome(DeleteAliasResult(outcome.result()));
+	else
+		return DeleteAliasOutcome(outcome.error());
+}
+
+void KmsClient::deleteAliasAsync(const DeleteAliasRequest& request, const DeleteAliasAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, deleteAlias(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+KmsClient::DeleteAliasOutcomeCallable KmsClient::deleteAliasCallable(const DeleteAliasRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DeleteAliasOutcome()>>(
+			[this, request]()
+			{
+			return this->deleteAlias(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 KmsClient::TagResourceOutcome KmsClient::tagResource(const TagResourceRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -519,42 +519,6 @@ KmsClient::EncryptOutcomeCallable KmsClient::encryptCallable(const EncryptReques
 	return task->get_future();
 }
 
-KmsClient::UntagResourceOutcome KmsClient::untagResource(const UntagResourceRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return UntagResourceOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return UntagResourceOutcome(UntagResourceResult(outcome.result()));
-	else
-		return UntagResourceOutcome(outcome.error());
-}
-
-void KmsClient::untagResourceAsync(const UntagResourceRequest& request, const UntagResourceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, untagResource(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-KmsClient::UntagResourceOutcomeCallable KmsClient::untagResourceCallable(const UntagResourceRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<UntagResourceOutcome()>>(
-			[this, request]()
-			{
-			return this->untagResource(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 KmsClient::UpdateAliasOutcome KmsClient::updateAlias(const UpdateAliasRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -591,6 +555,42 @@ KmsClient::UpdateAliasOutcomeCallable KmsClient::updateAliasCallable(const Updat
 	return task->get_future();
 }
 
+KmsClient::UntagResourceOutcome KmsClient::untagResource(const UntagResourceRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return UntagResourceOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return UntagResourceOutcome(UntagResourceResult(outcome.result()));
+	else
+		return UntagResourceOutcome(outcome.error());
+}
+
+void KmsClient::untagResourceAsync(const UntagResourceRequest& request, const UntagResourceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, untagResource(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+KmsClient::UntagResourceOutcomeCallable KmsClient::untagResourceCallable(const UntagResourceRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<UntagResourceOutcome()>>(
+			[this, request]()
+			{
+			return this->untagResource(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 KmsClient::ListAliasesByKeyIdOutcome KmsClient::listAliasesByKeyId(const ListAliasesByKeyIdRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -663,42 +663,6 @@ KmsClient::EnableKeyOutcomeCallable KmsClient::enableKeyCallable(const EnableKey
 	return task->get_future();
 }
 
-KmsClient::ScheduleKeyDeletionOutcome KmsClient::scheduleKeyDeletion(const ScheduleKeyDeletionRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return ScheduleKeyDeletionOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return ScheduleKeyDeletionOutcome(ScheduleKeyDeletionResult(outcome.result()));
-	else
-		return ScheduleKeyDeletionOutcome(outcome.error());
-}
-
-void KmsClient::scheduleKeyDeletionAsync(const ScheduleKeyDeletionRequest& request, const ScheduleKeyDeletionAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, scheduleKeyDeletion(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-KmsClient::ScheduleKeyDeletionOutcomeCallable KmsClient::scheduleKeyDeletionCallable(const ScheduleKeyDeletionRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<ScheduleKeyDeletionOutcome()>>(
-			[this, request]()
-			{
-			return this->scheduleKeyDeletion(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 KmsClient::DescribeRegionsOutcome KmsClient::describeRegions(const DescribeRegionsRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -735,6 +699,42 @@ KmsClient::DescribeRegionsOutcomeCallable KmsClient::describeRegionsCallable(con
 	return task->get_future();
 }
 
+KmsClient::ScheduleKeyDeletionOutcome KmsClient::scheduleKeyDeletion(const ScheduleKeyDeletionRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return ScheduleKeyDeletionOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return ScheduleKeyDeletionOutcome(ScheduleKeyDeletionResult(outcome.result()));
+	else
+		return ScheduleKeyDeletionOutcome(outcome.error());
+}
+
+void KmsClient::scheduleKeyDeletionAsync(const ScheduleKeyDeletionRequest& request, const ScheduleKeyDeletionAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, scheduleKeyDeletion(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+KmsClient::ScheduleKeyDeletionOutcomeCallable KmsClient::scheduleKeyDeletionCallable(const ScheduleKeyDeletionRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<ScheduleKeyDeletionOutcome()>>(
+			[this, request]()
+			{
+			return this->scheduleKeyDeletion(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 KmsClient::ListKeysOutcome KmsClient::listKeys(const ListKeysRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -771,6 +771,42 @@ KmsClient::ListKeysOutcomeCallable KmsClient::listKeysCallable(const ListKeysReq
 	return task->get_future();
 }
 
+KmsClient::DescribeServiceOutcome KmsClient::describeService(const DescribeServiceRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeServiceOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeServiceOutcome(DescribeServiceResult(outcome.result()));
+	else
+		return DescribeServiceOutcome(outcome.error());
+}
+
+void KmsClient::describeServiceAsync(const DescribeServiceRequest& request, const DescribeServiceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeService(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+KmsClient::DescribeServiceOutcomeCallable KmsClient::describeServiceCallable(const DescribeServiceRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeServiceOutcome()>>(
+			[this, request]()
+			{
+			return this->describeService(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 KmsClient::GetParametersForImportOutcome KmsClient::getParametersForImport(const GetParametersForImportRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

kms/src/model/CancelKeyDeletionRequest.cc

@@ -33,17 +33,6 @@ std::string CancelKeyDeletionRequest::getKeyId()const
 void CancelKeyDeletionRequest::setKeyId(const std::string& keyId)
 {
 	keyId_ = keyId;
-	setParameter("KeyId", keyId);
-}
-
-std::string CancelKeyDeletionRequest::getSTSToken()const
-{
-	return sTSToken_;
-}
-
-void CancelKeyDeletionRequest::setSTSToken(const std::string& sTSToken)
-{
-	sTSToken_ = sTSToken;
-	setParameter("STSToken", sTSToken);
+	setCoreParameter("KeyId", keyId);
 }
 

kms/src/model/CancelKeyDeletionResult.cc

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

kms/src/model/CreateAliasRequest.cc

@@ -33,7 +33,7 @@ std::string CreateAliasRequest::getAliasName()const
 void CreateAliasRequest::setAliasName(const std::string& aliasName)
 {
 	aliasName_ = aliasName;
-	setParameter("AliasName", aliasName);
+	setCoreParameter("AliasName", aliasName);
 }
 
 std::string CreateAliasRequest::getKeyId()const
@@ -44,17 +44,6 @@ std::string CreateAliasRequest::getKeyId()const
 void CreateAliasRequest::setKeyId(const std::string& keyId)
 {
 	keyId_ = keyId;
-	setParameter("KeyId", keyId);
-}
-
-std::string CreateAliasRequest::getSTSToken()const
-{
-	return sTSToken_;
-}
-
-void CreateAliasRequest::setSTSToken(const std::string& sTSToken)
-{
-	sTSToken_ = sTSToken;
-	setParameter("STSToken", sTSToken);
+	setCoreParameter("KeyId", keyId);
 }
 

kms/src/model/CreateAliasResult.cc

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

kms/src/model/CreateKeyRequest.cc

@@ -25,6 +25,17 @@ CreateKeyRequest::CreateKeyRequest() :
 CreateKeyRequest::~CreateKeyRequest()
 {}
 
+std::string CreateKeyRequest::getProtectionLevel()const
+{
+	return protectionLevel_;
+}
+
+void CreateKeyRequest::setProtectionLevel(const std::string& protectionLevel)
+{
+	protectionLevel_ = protectionLevel;
+	setCoreParameter("ProtectionLevel", protectionLevel);
+}
+
 std::string CreateKeyRequest::getKeyUsage()const
 {
 	return keyUsage_;
@@ -33,7 +44,7 @@ std::string CreateKeyRequest::getKeyUsage()const
 void CreateKeyRequest::setKeyUsage(const std::string& keyUsage)
 {
 	keyUsage_ = keyUsage;
-	setParameter("KeyUsage", keyUsage);
+	setCoreParameter("KeyUsage", keyUsage);
 }
 
 std::string CreateKeyRequest::getOrigin()const
@@ -44,7 +55,7 @@ std::string CreateKeyRequest::getOrigin()const
 void CreateKeyRequest::setOrigin(const std::string& origin)
 {
 	origin_ = origin;
-	setParameter("Origin", origin);
+	setCoreParameter("Origin", origin);
 }
 
 std::string CreateKeyRequest::getDescription()const
@@ -55,17 +66,6 @@ std::string CreateKeyRequest::getDescription()const
 void CreateKeyRequest::setDescription(const std::string& description)
 {
 	description_ = description;
-	setParameter("Description", description);
-}
-
-std::string CreateKeyRequest::getSTSToken()const
-{
-	return sTSToken_;
-}
-
-void CreateKeyRequest::setSTSToken(const std::string& sTSToken)
-{
-	sTSToken_ = sTSToken;
-	setParameter("STSToken", sTSToken);
+	setCoreParameter("Description", description);
 }
 

kms/src/model/CreateKeyResult.cc

@@ -35,10 +35,13 @@ CreateKeyResult::~CreateKeyResult()
 
 void CreateKeyResult::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 keyMetadataNode = value["KeyMetadata"];
 	if(!keyMetadataNode["CreationDate"].isNull())
@@ -61,6 +64,8 @@ void CreateKeyResult::parse(const std::string &payload)
 		keyMetadata_.origin = keyMetadataNode["Origin"].asString();
 	if(!keyMetadataNode["MaterialExpireTime"].isNull())
 		keyMetadata_.materialExpireTime = keyMetadataNode["MaterialExpireTime"].asString();
+	if(!keyMetadataNode["ProtectionLevel"].isNull())
+		keyMetadata_.protectionLevel = keyMetadataNode["ProtectionLevel"].asString();
 
 }
 

kms/src/model/DecryptRequest.cc

@@ -33,18 +33,7 @@ std::string DecryptRequest::getEncryptionContext()const
 void DecryptRequest::setEncryptionContext(const std::string& encryptionContext)
 {
 	encryptionContext_ = encryptionContext;
-	setParameter("EncryptionContext", encryptionContext);
-}
-
-std::string DecryptRequest::getSTSToken()const
-{
-	return sTSToken_;
-}
-
-void DecryptRequest::setSTSToken(const std::string& sTSToken)
-{
-	sTSToken_ = sTSToken;
-	setParameter("STSToken", sTSToken);
+	setCoreParameter("EncryptionContext", encryptionContext);
 }
 
 std::string DecryptRequest::getCiphertextBlob()const
@@ -55,6 +44,6 @@ std::string DecryptRequest::getCiphertextBlob()const
 void DecryptRequest::setCiphertextBlob(const std::string& ciphertextBlob)
 {
 	ciphertextBlob_ = ciphertextBlob;
-	setParameter("CiphertextBlob", ciphertextBlob);
+	setCoreParameter("CiphertextBlob", ciphertextBlob);
 }
 

kms/src/model/DecryptResult.cc

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

kms/src/model/DeleteAliasRequest.cc

@@ -33,17 +33,6 @@ std::string DeleteAliasRequest::getAliasName()const
 void DeleteAliasRequest::setAliasName(const std::string& aliasName)
 {
 	aliasName_ = aliasName;
-	setParameter("AliasName", aliasName);
-}
-
-std::string DeleteAliasRequest::getSTSToken()const
-{
-	return sTSToken_;
-}
-
-void DeleteAliasRequest::setSTSToken(const std::string& sTSToken)
-{
-	sTSToken_ = sTSToken;
-	setParameter("STSToken", sTSToken);
+	setCoreParameter("AliasName", aliasName);
 }
 

kms/src/model/DeleteAliasResult.cc

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

kms/src/model/DeleteKeyMaterialRequest.cc

@@ -33,17 +33,6 @@ std::string DeleteKeyMaterialRequest::getKeyId()const
 void DeleteKeyMaterialRequest::setKeyId(const std::string& keyId)
 {
 	keyId_ = keyId;
-	setParameter("KeyId", keyId);
-}
-
-std::string DeleteKeyMaterialRequest::getSTSToken()const
-{
-	return sTSToken_;
-}
-
-void DeleteKeyMaterialRequest::setSTSToken(const std::string& sTSToken)
-{
-	sTSToken_ = sTSToken;
-	setParameter("STSToken", sTSToken);
+	setCoreParameter("KeyId", keyId);
 }
 

kms/src/model/DeleteKeyMaterialResult.cc

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

kms/src/model/DescribeKeyRequest.cc

@@ -33,17 +33,6 @@ std::string DescribeKeyRequest::getKeyId()const
 void DescribeKeyRequest::setKeyId(const std::string& keyId)
 {
 	keyId_ = keyId;
-	setParameter("KeyId", keyId);
-}
-
-std::string DescribeKeyRequest::getSTSToken()const
-{
-	return sTSToken_;
-}
-
-void DescribeKeyRequest::setSTSToken(const std::string& sTSToken)
-{
-	sTSToken_ = sTSToken;
-	setParameter("STSToken", sTSToken);
+	setCoreParameter("KeyId", keyId);
 }
 

kms/src/model/DescribeKeyResult.cc

@@ -35,10 +35,13 @@ DescribeKeyResult::~DescribeKeyResult()
 
 void DescribeKeyResult::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 keyMetadataNode = value["KeyMetadata"];
 	if(!keyMetadataNode["CreationDate"].isNull())
@@ -61,6 +64,8 @@ void DescribeKeyResult::parse(const std::string &payload)
 		keyMetadata_.origin = keyMetadataNode["Origin"].asString();
 	if(!keyMetadataNode["MaterialExpireTime"].isNull())
 		keyMetadata_.materialExpireTime = keyMetadataNode["MaterialExpireTime"].asString();
+	if(!keyMetadataNode["ProtectionLevel"].isNull())
+		keyMetadata_.protectionLevel = keyMetadataNode["ProtectionLevel"].asString();
 
 }
 

kms/src/model/DescribeRegionsRequest.cc

@@ -25,14 +25,3 @@ DescribeRegionsRequest::DescribeRegionsRequest() :
 DescribeRegionsRequest::~DescribeRegionsRequest()
 {}
 
-std::string DescribeRegionsRequest::getSTSToken()const
-{
-	return sTSToken_;
-}
-
-void DescribeRegionsRequest::setSTSToken(const std::string& sTSToken)
-{
-	sTSToken_ = sTSToken;
-	setParameter("STSToken", sTSToken);
-}
-

kms/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)

kms/src/model/DescribeServiceRequest.cc

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/kms/model/DescribeServiceRequest.h>
+
+using AlibabaCloud::Kms::Model::DescribeServiceRequest;
+
+DescribeServiceRequest::DescribeServiceRequest() :
+	RpcServiceRequest("kms", "2016-01-20", "DescribeService")
+{}
+
+DescribeServiceRequest::~DescribeServiceRequest()
+{}
+

kms/src/model/DescribeServiceResult.cc

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/kms/model/DescribeServiceResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Kms;
+using namespace AlibabaCloud::Kms::Model;
+
+DescribeServiceResult::DescribeServiceResult() :
+	ServiceResult()
+{}
+
+DescribeServiceResult::DescribeServiceResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DescribeServiceResult::~DescribeServiceResult()
+{}
+
+void DescribeServiceResult::parse(const std::string &payload)
+{
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
+	Json::Value value;
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
+	setRequestId(value["RequestId"].asString());
+	auto allProtectionLevels = value["ProtectionLevels"]["ProtectionLevel"];
+	for (auto value : allProtectionLevels)
+	{
+		ProtectionLevel protectionLevelsObject;
+		if(!value["Type"].isNull())
+			protectionLevelsObject.type = value["Type"].asString();
+		protectionLevels_.push_back(protectionLevelsObject);
+	}
+
+}
+
+std::vector<DescribeServiceResult::ProtectionLevel> DescribeServiceResult::getProtectionLevels()const
+{
+	return protectionLevels_;
+}
+

kms/src/model/DisableKeyRequest.cc

@@ -33,17 +33,6 @@ std::string DisableKeyRequest::getKeyId()const
 void DisableKeyRequest::setKeyId(const std::string& keyId)
 {
 	keyId_ = keyId;
-	setParameter("KeyId", keyId);
-}
-
-std::string DisableKeyRequest::getSTSToken()const
-{
-	return sTSToken_;
-}
-
-void DisableKeyRequest::setSTSToken(const std::string& sTSToken)
-{
-	sTSToken_ = sTSToken;
-	setParameter("STSToken", sTSToken);
+	setCoreParameter("KeyId", keyId);
 }
 

kms/src/model/DisableKeyResult.cc

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

kms/src/model/EnableKeyRequest.cc

@@ -33,17 +33,6 @@ std::string EnableKeyRequest::getKeyId()const
 void EnableKeyRequest::setKeyId(const std::string& keyId)
 {
 	keyId_ = keyId;
-	setParameter("KeyId", keyId);
-}
-
-std::string EnableKeyRequest::getSTSToken()const
-{
-	return sTSToken_;
-}
-
-void EnableKeyRequest::setSTSToken(const std::string& sTSToken)
-{
-	sTSToken_ = sTSToken;
-	setParameter("STSToken", sTSToken);
+	setCoreParameter("KeyId", keyId);
 }
 

kms/src/model/EnableKeyResult.cc

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

kms/src/model/EncryptRequest.cc

@@ -33,7 +33,7 @@ std::string EncryptRequest::getEncryptionContext()const
 void EncryptRequest::setEncryptionContext(const std::string& encryptionContext)
 {
 	encryptionContext_ = encryptionContext;
-	setParameter("EncryptionContext", encryptionContext);
+	setCoreParameter("EncryptionContext", encryptionContext);
 }
 
 std::string EncryptRequest::getKeyId()const
@@ -44,18 +44,7 @@ std::string EncryptRequest::getKeyId()const
 void EncryptRequest::setKeyId(const std::string& keyId)
 {
 	keyId_ = keyId;
-	setParameter("KeyId", keyId);
-}
-
-std::string EncryptRequest::getSTSToken()const
-{
-	return sTSToken_;
-}
-
-void EncryptRequest::setSTSToken(const std::string& sTSToken)
-{
-	sTSToken_ = sTSToken;
-	setParameter("STSToken", sTSToken);
+	setCoreParameter("KeyId", keyId);
 }
 
 std::string EncryptRequest::getPlaintext()const
@@ -66,6 +55,6 @@ std::string EncryptRequest::getPlaintext()const
 void EncryptRequest::setPlaintext(const std::string& plaintext)
 {
 	plaintext_ = plaintext;
-	setParameter("Plaintext", plaintext);
+	setCoreParameter("Plaintext", plaintext);
 }
 

kms/src/model/EncryptResult.cc

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

kms/src/model/GenerateDataKeyRequest.cc

@@ -33,7 +33,7 @@ std::string GenerateDataKeyRequest::getEncryptionContext()const
 void GenerateDataKeyRequest::setEncryptionContext(const std::string& encryptionContext)
 {
 	encryptionContext_ = encryptionContext;
-	setParameter("EncryptionContext", encryptionContext);
+	setCoreParameter("EncryptionContext", encryptionContext);
 }
 
 std::string GenerateDataKeyRequest::getKeyId()const
@@ -44,7 +44,7 @@ std::string GenerateDataKeyRequest::getKeyId()const
 void GenerateDataKeyRequest::setKeyId(const std::string& keyId)
 {
 	keyId_ = keyId;
-	setParameter("KeyId", keyId);
+	setCoreParameter("KeyId", keyId);
 }
 
 std::string GenerateDataKeyRequest::getKeySpec()const
@@ -55,18 +55,7 @@ std::string GenerateDataKeyRequest::getKeySpec()const
 void GenerateDataKeyRequest::setKeySpec(const std::string& keySpec)
 {
 	keySpec_ = keySpec;
-	setParameter("KeySpec", keySpec);
-}
-
-std::string GenerateDataKeyRequest::getSTSToken()const
-{
-	return sTSToken_;
-}
-
-void GenerateDataKeyRequest::setSTSToken(const std::string& sTSToken)
-{
-	sTSToken_ = sTSToken;
-	setParameter("STSToken", sTSToken);
+	setCoreParameter("KeySpec", keySpec);
 }
 
 int GenerateDataKeyRequest::getNumberOfBytes()const
@@ -77,6 +66,6 @@ int GenerateDataKeyRequest::getNumberOfBytes()const
 void GenerateDataKeyRequest::setNumberOfBytes(int numberOfBytes)
 {
 	numberOfBytes_ = numberOfBytes;
-	setParameter("NumberOfBytes", std::to_string(numberOfBytes));
+	setCoreParameter("NumberOfBytes", std::to_string(numberOfBytes));
 }
 

kms/src/model/GenerateDataKeyResult.cc

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

kms/src/model/GetParametersForImportRequest.cc

@@ -33,18 +33,7 @@ std::string GetParametersForImportRequest::getKeyId()const
 void GetParametersForImportRequest::setKeyId(const std::string& keyId)
 {
 	keyId_ = keyId;
-	setParameter("KeyId", keyId);
-}
-
-std::string GetParametersForImportRequest::getSTSToken()const
-{
-	return sTSToken_;
-}
-
-void GetParametersForImportRequest::setSTSToken(const std::string& sTSToken)
-{
-	sTSToken_ = sTSToken;
-	setParameter("STSToken", sTSToken);
+	setCoreParameter("KeyId", keyId);
 }
 
 std::string GetParametersForImportRequest::getWrappingAlgorithm()const
@@ -55,7 +44,7 @@ std::string GetParametersForImportRequest::getWrappingAlgorithm()const
 void GetParametersForImportRequest::setWrappingAlgorithm(const std::string& wrappingAlgorithm)
 {
 	wrappingAlgorithm_ = wrappingAlgorithm;
-	setParameter("WrappingAlgorithm", wrappingAlgorithm);
+	setCoreParameter("WrappingAlgorithm", wrappingAlgorithm);
 }
 
 std::string GetParametersForImportRequest::getWrappingKeySpec()const
@@ -66,6 +55,6 @@ std::string GetParametersForImportRequest::getWrappingKeySpec()const
 void GetParametersForImportRequest::setWrappingKeySpec(const std::string& wrappingKeySpec)
 {
 	wrappingKeySpec_ = wrappingKeySpec;
-	setParameter("WrappingKeySpec", wrappingKeySpec);
+	setCoreParameter("WrappingKeySpec", wrappingKeySpec);
 }
 

kms/src/model/GetParametersForImportResult.cc

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

kms/src/model/ImportKeyMaterialRequest.cc

@@ -33,7 +33,7 @@ std::string ImportKeyMaterialRequest::getImportToken()const
 void ImportKeyMaterialRequest::setImportToken(const std::string& importToken)
 {
 	importToken_ = importToken;
-	setParameter("ImportToken", importToken);
+	setCoreParameter("ImportToken", importToken);
 }
 
 std::string ImportKeyMaterialRequest::getEncryptedKeyMaterial()const
@@ -44,7 +44,7 @@ std::string ImportKeyMaterialRequest::getEncryptedKeyMaterial()const
 void ImportKeyMaterialRequest::setEncryptedKeyMaterial(const std::string& encryptedKeyMaterial)
 {
 	encryptedKeyMaterial_ = encryptedKeyMaterial;
-	setParameter("EncryptedKeyMaterial", encryptedKeyMaterial);
+	setCoreParameter("EncryptedKeyMaterial", encryptedKeyMaterial);
 }
 
 long ImportKeyMaterialRequest::getKeyMaterialExpireUnix()const
@@ -55,7 +55,7 @@ long ImportKeyMaterialRequest::getKeyMaterialExpireUnix()const
 void ImportKeyMaterialRequest::setKeyMaterialExpireUnix(long keyMaterialExpireUnix)
 {
 	keyMaterialExpireUnix_ = keyMaterialExpireUnix;
-	setParameter("KeyMaterialExpireUnix", std::to_string(keyMaterialExpireUnix));
+	setCoreParameter("KeyMaterialExpireUnix", std::to_string(keyMaterialExpireUnix));
 }
 
 std::string ImportKeyMaterialRequest::getKeyId()const
@@ -66,17 +66,6 @@ std::string ImportKeyMaterialRequest::getKeyId()const
 void ImportKeyMaterialRequest::setKeyId(const std::string& keyId)
 {
 	keyId_ = keyId;
-	setParameter("KeyId", keyId);
-}
-
-std::string ImportKeyMaterialRequest::getSTSToken()const
-{
-	return sTSToken_;
-}
-
-void ImportKeyMaterialRequest::setSTSToken(const std::string& sTSToken)
-{
-	sTSToken_ = sTSToken;
-	setParameter("STSToken", sTSToken);
+	setCoreParameter("KeyId", keyId);
 }
 

kms/src/model/ImportKeyMaterialResult.cc

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

kms/src/model/ListAliasesByKeyIdRequest.cc

@@ -33,7 +33,7 @@ int ListAliasesByKeyIdRequest::getPageSize()const
 void ListAliasesByKeyIdRequest::setPageSize(int pageSize)
 {
 	pageSize_ = pageSize;
-	setParameter("PageSize", std::to_string(pageSize));
+	setCoreParameter("PageSize", std::to_string(pageSize));
 }
 
 std::string ListAliasesByKeyIdRequest::getKeyId()const
@@ -44,18 +44,7 @@ std::string ListAliasesByKeyIdRequest::getKeyId()const
 void ListAliasesByKeyIdRequest::setKeyId(const std::string& keyId)
 {
 	keyId_ = keyId;
-	setParameter("KeyId", keyId);
-}
-
-std::string ListAliasesByKeyIdRequest::getSTSToken()const
-{
-	return sTSToken_;
-}
-
-void ListAliasesByKeyIdRequest::setSTSToken(const std::string& sTSToken)
-{
-	sTSToken_ = sTSToken;
-	setParameter("STSToken", sTSToken);
+	setCoreParameter("KeyId", keyId);
 }
 
 int ListAliasesByKeyIdRequest::getPageNumber()const
@@ -66,6 +55,6 @@ int ListAliasesByKeyIdRequest::getPageNumber()const
 void ListAliasesByKeyIdRequest::setPageNumber(int pageNumber)
 {
 	pageNumber_ = pageNumber;
-	setParameter("PageNumber", std::to_string(pageNumber));
+	setCoreParameter("PageNumber", std::to_string(pageNumber));
 }
 

kms/src/model/ListAliasesByKeyIdResult.cc

@@ -35,10 +35,13 @@ ListAliasesByKeyIdResult::~ListAliasesByKeyIdResult()
 
 void ListAliasesByKeyIdResult::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 allAliases = value["Aliases"]["Alias"];
 	for (auto value : allAliases)

kms/src/model/ListAliasesRequest.cc

@@ -33,18 +33,7 @@ int ListAliasesRequest::getPageSize()const
 void ListAliasesRequest::setPageSize(int pageSize)
 {
 	pageSize_ = pageSize;
-	setParameter("PageSize", std::to_string(pageSize));
-}
-
-std::string ListAliasesRequest::getSTSToken()const
-{
-	return sTSToken_;
-}
-
-void ListAliasesRequest::setSTSToken(const std::string& sTSToken)
-{
-	sTSToken_ = sTSToken;
-	setParameter("STSToken", sTSToken);
+	setCoreParameter("PageSize", std::to_string(pageSize));
 }
 
 int ListAliasesRequest::getPageNumber()const
@@ -55,6 +44,6 @@ int ListAliasesRequest::getPageNumber()const
 void ListAliasesRequest::setPageNumber(int pageNumber)
 {
 	pageNumber_ = pageNumber;
-	setParameter("PageNumber", std::to_string(pageNumber));
+	setCoreParameter("PageNumber", std::to_string(pageNumber));
 }
 

kms/src/model/ListAliasesResult.cc

@@ -35,10 +35,13 @@ ListAliasesResult::~ListAliasesResult()
 
 void ListAliasesResult::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 allAliases = value["Aliases"]["Alias"];
 	for (auto value : allAliases)

kms/src/model/ListKeysRequest.cc

@@ -33,18 +33,7 @@ int ListKeysRequest::getPageSize()const
 void ListKeysRequest::setPageSize(int pageSize)
 {
 	pageSize_ = pageSize;
-	setParameter("PageSize", std::to_string(pageSize));
-}
-
-std::string ListKeysRequest::getSTSToken()const
-{
-	return sTSToken_;
-}
-
-void ListKeysRequest::setSTSToken(const std::string& sTSToken)
-{
-	sTSToken_ = sTSToken;
-	setParameter("STSToken", sTSToken);
+	setCoreParameter("PageSize", std::to_string(pageSize));
 }
 
 int ListKeysRequest::getPageNumber()const
@@ -55,6 +44,6 @@ int ListKeysRequest::getPageNumber()const
 void ListKeysRequest::setPageNumber(int pageNumber)
 {
 	pageNumber_ = pageNumber;
-	setParameter("PageNumber", std::to_string(pageNumber));
+	setCoreParameter("PageNumber", std::to_string(pageNumber));
 }
 

kms/src/model/ListKeysResult.cc

@@ -35,10 +35,13 @@ ListKeysResult::~ListKeysResult()
 
 void ListKeysResult::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 allKeys = value["Keys"]["Key"];
 	for (auto value : allKeys)

kms/src/model/ListResourceTagsRequest.cc

@@ -33,17 +33,6 @@ std::string ListResourceTagsRequest::getKeyId()const
 void ListResourceTagsRequest::setKeyId(const std::string& keyId)
 {
 	keyId_ = keyId;
-	setParameter("KeyId", keyId);
-}
-
-std::string ListResourceTagsRequest::getSTSToken()const
-{
-	return sTSToken_;
-}
-
-void ListResourceTagsRequest::setSTSToken(const std::string& sTSToken)
-{
-	sTSToken_ = sTSToken;
-	setParameter("STSToken", sTSToken);
+	setCoreParameter("KeyId", keyId);
 }
 

kms/src/model/ListResourceTagsResult.cc

@@ -35,10 +35,13 @@ ListResourceTagsResult::~ListResourceTagsResult()
 
 void ListResourceTagsResult::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 allTags = value["Tags"]["Tag"];
 	for (auto value : allTags)

kms/src/model/ScheduleKeyDeletionRequest.cc

@@ -33,7 +33,7 @@ int ScheduleKeyDeletionRequest::getPendingWindowInDays()const
 void ScheduleKeyDeletionRequest::setPendingWindowInDays(int pendingWindowInDays)
 {
 	pendingWindowInDays_ = pendingWindowInDays;
-	setParameter("PendingWindowInDays", std::to_string(pendingWindowInDays));
+	setCoreParameter("PendingWindowInDays", std::to_string(pendingWindowInDays));
 }
 
 std::string ScheduleKeyDeletionRequest::getKeyId()const
@@ -44,17 +44,6 @@ std::string ScheduleKeyDeletionRequest::getKeyId()const
 void ScheduleKeyDeletionRequest::setKeyId(const std::string& keyId)
 {
 	keyId_ = keyId;
-	setParameter("KeyId", keyId);
-}
-
-std::string ScheduleKeyDeletionRequest::getSTSToken()const
-{
-	return sTSToken_;
-}
-
-void ScheduleKeyDeletionRequest::setSTSToken(const std::string& sTSToken)
-{
-	sTSToken_ = sTSToken;
-	setParameter("STSToken", sTSToken);
+	setCoreParameter("KeyId", keyId);
 }
 

kms/src/model/ScheduleKeyDeletionResult.cc

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

kms/src/model/TagResourceRequest.cc

@@ -33,18 +33,7 @@ std::string TagResourceRequest::getKeyId()const
 void TagResourceRequest::setKeyId(const std::string& keyId)
 {
 	keyId_ = keyId;
-	setParameter("KeyId", keyId);
-}
-
-std::string TagResourceRequest::getSTSToken()const
-{
-	return sTSToken_;
-}
-
-void TagResourceRequest::setSTSToken(const std::string& sTSToken)
-{
-	sTSToken_ = sTSToken;
-	setParameter("STSToken", sTSToken);
+	setCoreParameter("KeyId", keyId);
 }
 
 std::string TagResourceRequest::getTags()const
@@ -55,6 +44,6 @@ std::string TagResourceRequest::getTags()const
 void TagResourceRequest::setTags(const std::string& tags)
 {
 	tags_ = tags;
-	setParameter("Tags", tags);
+	setCoreParameter("Tags", tags);
 }
 

kms/src/model/TagResourceResult.cc

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

kms/src/model/UntagResourceRequest.cc

@@ -33,7 +33,7 @@ std::string UntagResourceRequest::getTagKeys()const
 void UntagResourceRequest::setTagKeys(const std::string& tagKeys)
 {
 	tagKeys_ = tagKeys;
-	setParameter("TagKeys", tagKeys);
+	setCoreParameter("TagKeys", tagKeys);
 }
 
 std::string UntagResourceRequest::getKeyId()const
@@ -44,17 +44,6 @@ std::string UntagResourceRequest::getKeyId()const
 void UntagResourceRequest::setKeyId(const std::string& keyId)
 {
 	keyId_ = keyId;
-	setParameter("KeyId", keyId);
-}
-
-std::string UntagResourceRequest::getSTSToken()const
-{
-	return sTSToken_;
-}
-
-void UntagResourceRequest::setSTSToken(const std::string& sTSToken)
-{
-	sTSToken_ = sTSToken;
-	setParameter("STSToken", sTSToken);
+	setCoreParameter("KeyId", keyId);
 }
 

kms/src/model/UntagResourceResult.cc

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

kms/src/model/UpdateAliasRequest.cc

@@ -33,7 +33,7 @@ std::string UpdateAliasRequest::getAliasName()const
 void UpdateAliasRequest::setAliasName(const std::string& aliasName)
 {
 	aliasName_ = aliasName;
-	setParameter("AliasName", aliasName);
+	setCoreParameter("AliasName", aliasName);
 }
 
 std::string UpdateAliasRequest::getKeyId()const
@@ -44,17 +44,6 @@ std::string UpdateAliasRequest::getKeyId()const
 void UpdateAliasRequest::setKeyId(const std::string& keyId)
 {
 	keyId_ = keyId;
-	setParameter("KeyId", keyId);
-}
-
-std::string UpdateAliasRequest::getSTSToken()const
-{
-	return sTSToken_;
-}
-
-void UpdateAliasRequest::setSTSToken(const std::string& sTSToken)
-{
-	sTSToken_ = sTSToken;
-	setParameter("STSToken", sTSToken);
+	setCoreParameter("KeyId", keyId);
 }
 

kms/src/model/UpdateAliasResult.cc

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