Generate SDK by new Generator

hsm/CMakeLists.txt

@@ -21,39 +21,39 @@ set(hsm_public_header
 	include/alibabacloud/hsm/HsmExport.h )
 
 set(hsm_public_header_model 
-	include/alibabacloud/hsm/model/ConfigWhiteListRequest.h
-	include/alibabacloud/hsm/model/ConfigWhiteListResult.h
 	include/alibabacloud/hsm/model/ConfigNetworkRequest.h
 	include/alibabacloud/hsm/model/ConfigNetworkResult.h
-	include/alibabacloud/hsm/model/ReleaseInstanceRequest.h
-	include/alibabacloud/hsm/model/ReleaseInstanceResult.h
+	include/alibabacloud/hsm/model/ConfigWhiteListRequest.h
+	include/alibabacloud/hsm/model/ConfigWhiteListResult.h
+	include/alibabacloud/hsm/model/CreateInstanceRequest.h
+	include/alibabacloud/hsm/model/CreateInstanceResult.h
 	include/alibabacloud/hsm/model/DescribeInstancesRequest.h
 	include/alibabacloud/hsm/model/DescribeInstancesResult.h
 	include/alibabacloud/hsm/model/DescribeRegionsRequest.h
 	include/alibabacloud/hsm/model/DescribeRegionsResult.h
-	include/alibabacloud/hsm/model/CreateInstanceRequest.h
-	include/alibabacloud/hsm/model/CreateInstanceResult.h
 	include/alibabacloud/hsm/model/ModifyInstanceRequest.h
 	include/alibabacloud/hsm/model/ModifyInstanceResult.h
+	include/alibabacloud/hsm/model/ReleaseInstanceRequest.h
+	include/alibabacloud/hsm/model/ReleaseInstanceResult.h
 	include/alibabacloud/hsm/model/RenewInstanceRequest.h
 	include/alibabacloud/hsm/model/RenewInstanceResult.h )
 
 set(hsm_src 
 	src/HsmClient.cc
-	src/model/ConfigWhiteListRequest.cc
-	src/model/ConfigWhiteListResult.cc
 	src/model/ConfigNetworkRequest.cc
 	src/model/ConfigNetworkResult.cc
-	src/model/ReleaseInstanceRequest.cc
-	src/model/ReleaseInstanceResult.cc
+	src/model/ConfigWhiteListRequest.cc
+	src/model/ConfigWhiteListResult.cc
+	src/model/CreateInstanceRequest.cc
+	src/model/CreateInstanceResult.cc
 	src/model/DescribeInstancesRequest.cc
 	src/model/DescribeInstancesResult.cc
 	src/model/DescribeRegionsRequest.cc
 	src/model/DescribeRegionsResult.cc
-	src/model/CreateInstanceRequest.cc
-	src/model/CreateInstanceResult.cc
 	src/model/ModifyInstanceRequest.cc
 	src/model/ModifyInstanceResult.cc
+	src/model/ReleaseInstanceRequest.cc
+	src/model/ReleaseInstanceResult.cc
 	src/model/RenewInstanceRequest.cc
 	src/model/RenewInstanceResult.cc )
 

hsm/include/alibabacloud/hsm/HsmClient.h

@@ -22,20 +22,20 @@
 #include <alibabacloud/core/EndpointProvider.h>
 #include <alibabacloud/core/RpcServiceClient.h>
 #include "HsmExport.h"
-#include "model/ConfigWhiteListRequest.h"
-#include "model/ConfigWhiteListResult.h"
 #include "model/ConfigNetworkRequest.h"
 #include "model/ConfigNetworkResult.h"
-#include "model/ReleaseInstanceRequest.h"
-#include "model/ReleaseInstanceResult.h"
+#include "model/ConfigWhiteListRequest.h"
+#include "model/ConfigWhiteListResult.h"
+#include "model/CreateInstanceRequest.h"
+#include "model/CreateInstanceResult.h"
 #include "model/DescribeInstancesRequest.h"
 #include "model/DescribeInstancesResult.h"
 #include "model/DescribeRegionsRequest.h"
 #include "model/DescribeRegionsResult.h"
-#include "model/CreateInstanceRequest.h"
-#include "model/CreateInstanceResult.h"
 #include "model/ModifyInstanceRequest.h"
 #include "model/ModifyInstanceResult.h"
+#include "model/ReleaseInstanceRequest.h"
+#include "model/ReleaseInstanceResult.h"
 #include "model/RenewInstanceRequest.h"
 #include "model/RenewInstanceResult.h"
 
@@ -47,27 +47,27 @@ namespace AlibabaCloud
 		class ALIBABACLOUD_HSM_EXPORT HsmClient : public RpcServiceClient
 		{
 		public:
-			typedef Outcome<Error, Model::ConfigWhiteListResult> ConfigWhiteListOutcome;
-			typedef std::future<ConfigWhiteListOutcome> ConfigWhiteListOutcomeCallable;
-			typedef std::function<void(const HsmClient*, const Model::ConfigWhiteListRequest&, const ConfigWhiteListOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ConfigWhiteListAsyncHandler;
 			typedef Outcome<Error, Model::ConfigNetworkResult> ConfigNetworkOutcome;
 			typedef std::future<ConfigNetworkOutcome> ConfigNetworkOutcomeCallable;
 			typedef std::function<void(const HsmClient*, const Model::ConfigNetworkRequest&, const ConfigNetworkOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ConfigNetworkAsyncHandler;
-			typedef Outcome<Error, Model::ReleaseInstanceResult> ReleaseInstanceOutcome;
-			typedef std::future<ReleaseInstanceOutcome> ReleaseInstanceOutcomeCallable;
-			typedef std::function<void(const HsmClient*, const Model::ReleaseInstanceRequest&, const ReleaseInstanceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ReleaseInstanceAsyncHandler;
+			typedef Outcome<Error, Model::ConfigWhiteListResult> ConfigWhiteListOutcome;
+			typedef std::future<ConfigWhiteListOutcome> ConfigWhiteListOutcomeCallable;
+			typedef std::function<void(const HsmClient*, const Model::ConfigWhiteListRequest&, const ConfigWhiteListOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ConfigWhiteListAsyncHandler;
+			typedef Outcome<Error, Model::CreateInstanceResult> CreateInstanceOutcome;
+			typedef std::future<CreateInstanceOutcome> CreateInstanceOutcomeCallable;
+			typedef std::function<void(const HsmClient*, const Model::CreateInstanceRequest&, const CreateInstanceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateInstanceAsyncHandler;
 			typedef Outcome<Error, Model::DescribeInstancesResult> DescribeInstancesOutcome;
 			typedef std::future<DescribeInstancesOutcome> DescribeInstancesOutcomeCallable;
 			typedef std::function<void(const HsmClient*, const Model::DescribeInstancesRequest&, const DescribeInstancesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeInstancesAsyncHandler;
 			typedef Outcome<Error, Model::DescribeRegionsResult> DescribeRegionsOutcome;
 			typedef std::future<DescribeRegionsOutcome> DescribeRegionsOutcomeCallable;
 			typedef std::function<void(const HsmClient*, const Model::DescribeRegionsRequest&, const DescribeRegionsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeRegionsAsyncHandler;
-			typedef Outcome<Error, Model::CreateInstanceResult> CreateInstanceOutcome;
-			typedef std::future<CreateInstanceOutcome> CreateInstanceOutcomeCallable;
-			typedef std::function<void(const HsmClient*, const Model::CreateInstanceRequest&, const CreateInstanceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateInstanceAsyncHandler;
 			typedef Outcome<Error, Model::ModifyInstanceResult> ModifyInstanceOutcome;
 			typedef std::future<ModifyInstanceOutcome> ModifyInstanceOutcomeCallable;
 			typedef std::function<void(const HsmClient*, const Model::ModifyInstanceRequest&, const ModifyInstanceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyInstanceAsyncHandler;
+			typedef Outcome<Error, Model::ReleaseInstanceResult> ReleaseInstanceOutcome;
+			typedef std::future<ReleaseInstanceOutcome> ReleaseInstanceOutcomeCallable;
+			typedef std::function<void(const HsmClient*, const Model::ReleaseInstanceRequest&, const ReleaseInstanceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ReleaseInstanceAsyncHandler;
 			typedef Outcome<Error, Model::RenewInstanceResult> RenewInstanceOutcome;
 			typedef std::future<RenewInstanceOutcome> RenewInstanceOutcomeCallable;
 			typedef std::function<void(const HsmClient*, const Model::RenewInstanceRequest&, const RenewInstanceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> RenewInstanceAsyncHandler;
@@ -76,27 +76,27 @@ namespace AlibabaCloud
 			HsmClient(const std::shared_ptr<CredentialsProvider> &credentialsProvider, const ClientConfiguration &configuration);
 			HsmClient(const std::string &accessKeyId, const std::string &accessKeySecret, const ClientConfiguration &configuration);
 			~HsmClient();
-			ConfigWhiteListOutcome configWhiteList(const Model::ConfigWhiteListRequest &request)const;
-			void configWhiteListAsync(const Model::ConfigWhiteListRequest& request, const ConfigWhiteListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			ConfigWhiteListOutcomeCallable configWhiteListCallable(const Model::ConfigWhiteListRequest& request) const;
 			ConfigNetworkOutcome configNetwork(const Model::ConfigNetworkRequest &request)const;
 			void configNetworkAsync(const Model::ConfigNetworkRequest& request, const ConfigNetworkAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ConfigNetworkOutcomeCallable configNetworkCallable(const Model::ConfigNetworkRequest& request) const;
-			ReleaseInstanceOutcome releaseInstance(const Model::ReleaseInstanceRequest &request)const;
-			void releaseInstanceAsync(const Model::ReleaseInstanceRequest& request, const ReleaseInstanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			ReleaseInstanceOutcomeCallable releaseInstanceCallable(const Model::ReleaseInstanceRequest& request) const;
+			ConfigWhiteListOutcome configWhiteList(const Model::ConfigWhiteListRequest &request)const;
+			void configWhiteListAsync(const Model::ConfigWhiteListRequest& request, const ConfigWhiteListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			ConfigWhiteListOutcomeCallable configWhiteListCallable(const Model::ConfigWhiteListRequest& request) const;
+			CreateInstanceOutcome createInstance(const Model::CreateInstanceRequest &request)const;
+			void createInstanceAsync(const Model::CreateInstanceRequest& request, const CreateInstanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			CreateInstanceOutcomeCallable createInstanceCallable(const Model::CreateInstanceRequest& request) const;
 			DescribeInstancesOutcome describeInstances(const Model::DescribeInstancesRequest &request)const;
 			void describeInstancesAsync(const Model::DescribeInstancesRequest& request, const DescribeInstancesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeInstancesOutcomeCallable describeInstancesCallable(const Model::DescribeInstancesRequest& request) const;
 			DescribeRegionsOutcome describeRegions(const Model::DescribeRegionsRequest &request)const;
 			void describeRegionsAsync(const Model::DescribeRegionsRequest& request, const DescribeRegionsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeRegionsOutcomeCallable describeRegionsCallable(const Model::DescribeRegionsRequest& request) const;
-			CreateInstanceOutcome createInstance(const Model::CreateInstanceRequest &request)const;
-			void createInstanceAsync(const Model::CreateInstanceRequest& request, const CreateInstanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			CreateInstanceOutcomeCallable createInstanceCallable(const Model::CreateInstanceRequest& request) const;
 			ModifyInstanceOutcome modifyInstance(const Model::ModifyInstanceRequest &request)const;
 			void modifyInstanceAsync(const Model::ModifyInstanceRequest& request, const ModifyInstanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ModifyInstanceOutcomeCallable modifyInstanceCallable(const Model::ModifyInstanceRequest& request) const;
+			ReleaseInstanceOutcome releaseInstance(const Model::ReleaseInstanceRequest &request)const;
+			void releaseInstanceAsync(const Model::ReleaseInstanceRequest& request, const ReleaseInstanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			ReleaseInstanceOutcomeCallable releaseInstanceCallable(const Model::ReleaseInstanceRequest& request) const;
 			RenewInstanceOutcome renewInstance(const Model::RenewInstanceRequest &request)const;
 			void renewInstanceAsync(const Model::RenewInstanceRequest& request, const RenewInstanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			RenewInstanceOutcomeCallable renewInstanceCallable(const Model::RenewInstanceRequest& request) const;

hsm/include/alibabacloud/hsm/model/ConfigNetworkRequest.h

@@ -35,26 +35,26 @@ namespace AlibabaCloud
 				ConfigNetworkRequest();
 				~ConfigNetworkRequest();
 
-				std::string getVSwitchId()const;
-				void setVSwitchId(const std::string& vSwitchId);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
+				std::string getIp()const;
+				void setIp(const std::string& ip);
+				std::string getVSwitchId()const;
+				void setVSwitchId(const std::string& vSwitchId);
 				std::string getInstanceId()const;
 				void setInstanceId(const std::string& instanceId);
 				std::string getSourceIp()const;
 				void setSourceIp(const std::string& sourceIp);
 				std::string getVpcId()const;
 				void setVpcId(const std::string& vpcId);
-				std::string getIp()const;
-				void setIp(const std::string& ip);
 
             private:
-				std::string vSwitchId_;
 				long resourceOwnerId_;
+				std::string ip_;
+				std::string vSwitchId_;
 				std::string instanceId_;
 				std::string sourceIp_;
 				std::string vpcId_;
-				std::string ip_;
 
 			};
 		}

hsm/include/alibabacloud/hsm/model/ConfigWhiteListRequest.h

@@ -37,18 +37,18 @@ namespace AlibabaCloud
 
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
+				std::string getWhiteList()const;
+				void setWhiteList(const std::string& whiteList);
 				std::string getInstanceId()const;
 				void setInstanceId(const std::string& instanceId);
 				std::string getSourceIp()const;
 				void setSourceIp(const std::string& sourceIp);
-				std::string getWhiteList()const;
-				void setWhiteList(const std::string& whiteList);
 
             private:
 				long resourceOwnerId_;
+				std::string whiteList_;
 				std::string instanceId_;
 				std::string sourceIp_;
-				std::string whiteList_;
 
 			};
 		}

hsm/include/alibabacloud/hsm/model/CreateInstanceRequest.h

@@ -37,30 +37,30 @@ namespace AlibabaCloud
 
 				int getPeriod()const;
 				void setPeriod(int period);
-				std::string getPeriodUnit()const;
-				void setPeriodUnit(const std::string& periodUnit);
 				std::string getResourceOwnerId()const;
 				void setResourceOwnerId(const std::string& resourceOwnerId);
 				int getQuantity()const;
 				void setQuantity(int quantity);
-				std::string getHsmDeviceType()const;
-				void setHsmDeviceType(const std::string& hsmDeviceType);
 				std::string getClientToken()const;
 				void setClientToken(const std::string& clientToken);
-				std::string getZoneId()const;
-				void setZoneId(const std::string& zoneId);
 				std::string getHsmOem()const;
 				void setHsmOem(const std::string& hsmOem);
+				std::string getPeriodUnit()const;
+				void setPeriodUnit(const std::string& periodUnit);
+				std::string getHsmDeviceType()const;
+				void setHsmDeviceType(const std::string& hsmDeviceType);
+				std::string getZoneId()const;
+				void setZoneId(const std::string& zoneId);
 
             private:
 				int period_;
-				std::string periodUnit_;
 				std::string resourceOwnerId_;
 				int quantity_;
-				std::string hsmDeviceType_;
 				std::string clientToken_;
-				std::string zoneId_;
 				std::string hsmOem_;
+				std::string periodUnit_;
+				std::string hsmDeviceType_;
+				std::string zoneId_;
 
 			};
 		}

hsm/include/alibabacloud/hsm/model/DescribeInstancesRequest.h

@@ -37,23 +37,23 @@ namespace AlibabaCloud
 
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
+				int getCurrentPage()const;
+				void setCurrentPage(int currentPage);
 				std::string getInstanceId()const;
 				void setInstanceId(const std::string& instanceId);
 				std::string getSourceIp()const;
 				void setSourceIp(const std::string& sourceIp);
 				int getPageSize()const;
 				void setPageSize(int pageSize);
-				int getCurrentPage()const;
-				void setCurrentPage(int currentPage);
 				int getHsmStatus()const;
 				void setHsmStatus(int hsmStatus);
 
             private:
 				long resourceOwnerId_;
+				int currentPage_;
 				std::string instanceId_;
 				std::string sourceIp_;
 				int pageSize_;
-				int currentPage_;
 				int hsmStatus_;
 
 			};

hsm/include/alibabacloud/hsm/model/ModifyInstanceRequest.h

@@ -37,18 +37,18 @@ namespace AlibabaCloud
 
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
+				std::string getRemark()const;
+				void setRemark(const std::string& remark);
 				std::string getInstanceId()const;
 				void setInstanceId(const std::string& instanceId);
 				std::string getSourceIp()const;
 				void setSourceIp(const std::string& sourceIp);
-				std::string getRemark()const;
-				void setRemark(const std::string& remark);
 
             private:
 				long resourceOwnerId_;
+				std::string remark_;
 				std::string instanceId_;
 				std::string sourceIp_;
-				std::string remark_;
 
 			};
 		}

hsm/src/HsmClient.cc

@@ -51,42 +51,6 @@ HsmClient::HsmClient(const std::string & accessKeyId, const std::string & access
 HsmClient::~HsmClient()
 {}
 
-HsmClient::ConfigWhiteListOutcome HsmClient::configWhiteList(const ConfigWhiteListRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return ConfigWhiteListOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return ConfigWhiteListOutcome(ConfigWhiteListResult(outcome.result()));
-	else
-		return ConfigWhiteListOutcome(outcome.error());
-}
-
-void HsmClient::configWhiteListAsync(const ConfigWhiteListRequest& request, const ConfigWhiteListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, configWhiteList(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-HsmClient::ConfigWhiteListOutcomeCallable HsmClient::configWhiteListCallable(const ConfigWhiteListRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<ConfigWhiteListOutcome()>>(
-			[this, request]()
-			{
-			return this->configWhiteList(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 HsmClient::ConfigNetworkOutcome HsmClient::configNetwork(const ConfigNetworkRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -123,36 +87,72 @@ HsmClient::ConfigNetworkOutcomeCallable HsmClient::configNetworkCallable(const C
 	return task->get_future();
 }
 
-HsmClient::ReleaseInstanceOutcome HsmClient::releaseInstance(const ReleaseInstanceRequest &request) const
+HsmClient::ConfigWhiteListOutcome HsmClient::configWhiteList(const ConfigWhiteListRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
 	if (!endpointOutcome.isSuccess())
-		return ReleaseInstanceOutcome(endpointOutcome.error());
+		return ConfigWhiteListOutcome(endpointOutcome.error());
 
 	auto outcome = makeRequest(endpointOutcome.result(), request);
 
 	if (outcome.isSuccess())
-		return ReleaseInstanceOutcome(ReleaseInstanceResult(outcome.result()));
+		return ConfigWhiteListOutcome(ConfigWhiteListResult(outcome.result()));
 	else
-		return ReleaseInstanceOutcome(outcome.error());
+		return ConfigWhiteListOutcome(outcome.error());
 }
 
-void HsmClient::releaseInstanceAsync(const ReleaseInstanceRequest& request, const ReleaseInstanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+void HsmClient::configWhiteListAsync(const ConfigWhiteListRequest& request, const ConfigWhiteListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
 {
 	auto fn = [this, request, handler, context]()
 	{
-		handler(this, request, releaseInstance(request), context);
+		handler(this, request, configWhiteList(request), context);
 	};
 
 	asyncExecute(new Runnable(fn));
 }
 
-HsmClient::ReleaseInstanceOutcomeCallable HsmClient::releaseInstanceCallable(const ReleaseInstanceRequest &request) const
+HsmClient::ConfigWhiteListOutcomeCallable HsmClient::configWhiteListCallable(const ConfigWhiteListRequest &request) const
 {
-	auto task = std::make_shared<std::packaged_task<ReleaseInstanceOutcome()>>(
+	auto task = std::make_shared<std::packaged_task<ConfigWhiteListOutcome()>>(
 			[this, request]()
 			{
-			return this->releaseInstance(request);
+			return this->configWhiteList(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
+HsmClient::CreateInstanceOutcome HsmClient::createInstance(const CreateInstanceRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return CreateInstanceOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return CreateInstanceOutcome(CreateInstanceResult(outcome.result()));
+	else
+		return CreateInstanceOutcome(outcome.error());
+}
+
+void HsmClient::createInstanceAsync(const CreateInstanceRequest& request, const CreateInstanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, createInstance(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+HsmClient::CreateInstanceOutcomeCallable HsmClient::createInstanceCallable(const CreateInstanceRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<CreateInstanceOutcome()>>(
+			[this, request]()
+			{
+			return this->createInstance(request);
 			});
 
 	asyncExecute(new Runnable([task]() { (*task)(); }));
@@ -231,42 +231,6 @@ HsmClient::DescribeRegionsOutcomeCallable HsmClient::describeRegionsCallable(con
 	return task->get_future();
 }
 
-HsmClient::CreateInstanceOutcome HsmClient::createInstance(const CreateInstanceRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return CreateInstanceOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return CreateInstanceOutcome(CreateInstanceResult(outcome.result()));
-	else
-		return CreateInstanceOutcome(outcome.error());
-}
-
-void HsmClient::createInstanceAsync(const CreateInstanceRequest& request, const CreateInstanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, createInstance(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-HsmClient::CreateInstanceOutcomeCallable HsmClient::createInstanceCallable(const CreateInstanceRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<CreateInstanceOutcome()>>(
-			[this, request]()
-			{
-			return this->createInstance(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 HsmClient::ModifyInstanceOutcome HsmClient::modifyInstance(const ModifyInstanceRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -303,6 +267,42 @@ HsmClient::ModifyInstanceOutcomeCallable HsmClient::modifyInstanceCallable(const
 	return task->get_future();
 }
 
+HsmClient::ReleaseInstanceOutcome HsmClient::releaseInstance(const ReleaseInstanceRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return ReleaseInstanceOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return ReleaseInstanceOutcome(ReleaseInstanceResult(outcome.result()));
+	else
+		return ReleaseInstanceOutcome(outcome.error());
+}
+
+void HsmClient::releaseInstanceAsync(const ReleaseInstanceRequest& request, const ReleaseInstanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, releaseInstance(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+HsmClient::ReleaseInstanceOutcomeCallable HsmClient::releaseInstanceCallable(const ReleaseInstanceRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<ReleaseInstanceOutcome()>>(
+			[this, request]()
+			{
+			return this->releaseInstance(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 HsmClient::RenewInstanceOutcome HsmClient::renewInstance(const RenewInstanceRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

hsm/src/model/ConfigNetworkRequest.cc

@@ -25,17 +25,6 @@ ConfigNetworkRequest::ConfigNetworkRequest() :
 ConfigNetworkRequest::~ConfigNetworkRequest()
 {}
 
-std::string ConfigNetworkRequest::getVSwitchId()const
-{
-	return vSwitchId_;
-}
-
-void ConfigNetworkRequest::setVSwitchId(const std::string& vSwitchId)
-{
-	vSwitchId_ = vSwitchId;
-	setCoreParameter("VSwitchId", vSwitchId);
-}
-
 long ConfigNetworkRequest::getResourceOwnerId()const
 {
 	return resourceOwnerId_;
@@ -47,6 +36,28 @@ void ConfigNetworkRequest::setResourceOwnerId(long resourceOwnerId)
 	setCoreParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
 }
 
+std::string ConfigNetworkRequest::getIp()const
+{
+	return ip_;
+}
+
+void ConfigNetworkRequest::setIp(const std::string& ip)
+{
+	ip_ = ip;
+	setCoreParameter("Ip", ip);
+}
+
+std::string ConfigNetworkRequest::getVSwitchId()const
+{
+	return vSwitchId_;
+}
+
+void ConfigNetworkRequest::setVSwitchId(const std::string& vSwitchId)
+{
+	vSwitchId_ = vSwitchId;
+	setCoreParameter("VSwitchId", vSwitchId);
+}
+
 std::string ConfigNetworkRequest::getInstanceId()const
 {
 	return instanceId_;
@@ -80,14 +91,3 @@ void ConfigNetworkRequest::setVpcId(const std::string& vpcId)
 	setCoreParameter("VpcId", vpcId);
 }
 
-std::string ConfigNetworkRequest::getIp()const
-{
-	return ip_;
-}
-
-void ConfigNetworkRequest::setIp(const std::string& ip)
-{
-	ip_ = ip;
-	setCoreParameter("Ip", ip);
-}
-

hsm/src/model/ConfigNetworkResult.cc

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

hsm/src/model/ConfigWhiteListRequest.cc

@@ -36,6 +36,17 @@ void ConfigWhiteListRequest::setResourceOwnerId(long resourceOwnerId)
 	setCoreParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
 }
 
+std::string ConfigWhiteListRequest::getWhiteList()const
+{
+	return whiteList_;
+}
+
+void ConfigWhiteListRequest::setWhiteList(const std::string& whiteList)
+{
+	whiteList_ = whiteList;
+	setCoreParameter("WhiteList", whiteList);
+}
+
 std::string ConfigWhiteListRequest::getInstanceId()const
 {
 	return instanceId_;
@@ -58,14 +69,3 @@ void ConfigWhiteListRequest::setSourceIp(const std::string& sourceIp)
 	setCoreParameter("SourceIp", sourceIp);
 }
 
-std::string ConfigWhiteListRequest::getWhiteList()const
-{
-	return whiteList_;
-}
-
-void ConfigWhiteListRequest::setWhiteList(const std::string& whiteList)
-{
-	whiteList_ = whiteList;
-	setCoreParameter("WhiteList", whiteList);
-}
-

hsm/src/model/ConfigWhiteListResult.cc

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

hsm/src/model/CreateInstanceRequest.cc

@@ -36,17 +36,6 @@ void CreateInstanceRequest::setPeriod(int period)
 	setCoreParameter("Period", std::to_string(period));
 }
 
-std::string CreateInstanceRequest::getPeriodUnit()const
-{
-	return periodUnit_;
-}
-
-void CreateInstanceRequest::setPeriodUnit(const std::string& periodUnit)
-{
-	periodUnit_ = periodUnit;
-	setCoreParameter("PeriodUnit", periodUnit);
-}
-
 std::string CreateInstanceRequest::getResourceOwnerId()const
 {
 	return resourceOwnerId_;
@@ -69,17 +58,6 @@ void CreateInstanceRequest::setQuantity(int quantity)
 	setCoreParameter("Quantity", std::to_string(quantity));
 }
 
-std::string CreateInstanceRequest::getHsmDeviceType()const
-{
-	return hsmDeviceType_;
-}
-
-void CreateInstanceRequest::setHsmDeviceType(const std::string& hsmDeviceType)
-{
-	hsmDeviceType_ = hsmDeviceType;
-	setCoreParameter("HsmDeviceType", hsmDeviceType);
-}
-
 std::string CreateInstanceRequest::getClientToken()const
 {
 	return clientToken_;
@@ -91,17 +69,6 @@ void CreateInstanceRequest::setClientToken(const std::string& clientToken)
 	setCoreParameter("ClientToken", clientToken);
 }
 
-std::string CreateInstanceRequest::getZoneId()const
-{
-	return zoneId_;
-}
-
-void CreateInstanceRequest::setZoneId(const std::string& zoneId)
-{
-	zoneId_ = zoneId;
-	setCoreParameter("ZoneId", zoneId);
-}
-
 std::string CreateInstanceRequest::getHsmOem()const
 {
 	return hsmOem_;
@@ -113,3 +80,36 @@ void CreateInstanceRequest::setHsmOem(const std::string& hsmOem)
 	setCoreParameter("HsmOem", hsmOem);
 }
 
+std::string CreateInstanceRequest::getPeriodUnit()const
+{
+	return periodUnit_;
+}
+
+void CreateInstanceRequest::setPeriodUnit(const std::string& periodUnit)
+{
+	periodUnit_ = periodUnit;
+	setCoreParameter("PeriodUnit", periodUnit);
+}
+
+std::string CreateInstanceRequest::getHsmDeviceType()const
+{
+	return hsmDeviceType_;
+}
+
+void CreateInstanceRequest::setHsmDeviceType(const std::string& hsmDeviceType)
+{
+	hsmDeviceType_ = hsmDeviceType;
+	setCoreParameter("HsmDeviceType", hsmDeviceType);
+}
+
+std::string CreateInstanceRequest::getZoneId()const
+{
+	return zoneId_;
+}
+
+void CreateInstanceRequest::setZoneId(const std::string& zoneId)
+{
+	zoneId_ = zoneId;
+	setCoreParameter("ZoneId", zoneId);
+}
+

hsm/src/model/CreateInstanceResult.cc

@@ -35,13 +35,9 @@ CreateInstanceResult::~CreateInstanceResult()
 
 void CreateInstanceResult::parse(const std::string &payload)
 {
-	Json::CharReaderBuilder builder;
-	Json::CharReader *reader = builder.newCharReader();
-	Json::Value *val;
+	Json::Reader reader;
 	Json::Value value;
-	JSONCPP_STRING *errs;
-	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
-	value = *val;
+	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto allInstanceIds = value["InstanceIds"]["InstanceId"];
 	for (const auto &item : allInstanceIds)

hsm/src/model/DescribeInstancesRequest.cc

@@ -36,6 +36,17 @@ void DescribeInstancesRequest::setResourceOwnerId(long resourceOwnerId)
 	setCoreParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
 }
 
+int DescribeInstancesRequest::getCurrentPage()const
+{
+	return currentPage_;
+}
+
+void DescribeInstancesRequest::setCurrentPage(int currentPage)
+{
+	currentPage_ = currentPage;
+	setCoreParameter("CurrentPage", std::to_string(currentPage));
+}
+
 std::string DescribeInstancesRequest::getInstanceId()const
 {
 	return instanceId_;
@@ -69,17 +80,6 @@ void DescribeInstancesRequest::setPageSize(int pageSize)
 	setCoreParameter("PageSize", std::to_string(pageSize));
 }
 
-int DescribeInstancesRequest::getCurrentPage()const
-{
-	return currentPage_;
-}
-
-void DescribeInstancesRequest::setCurrentPage(int currentPage)
-{
-	currentPage_ = currentPage;
-	setCoreParameter("CurrentPage", std::to_string(currentPage));
-}
-
 int DescribeInstancesRequest::getHsmStatus()const
 {
 	return hsmStatus_;

hsm/src/model/DescribeInstancesResult.cc

@@ -35,13 +35,9 @@ DescribeInstancesResult::~DescribeInstancesResult()
 
 void DescribeInstancesResult::parse(const std::string &payload)
 {
-	Json::CharReaderBuilder builder;
-	Json::CharReader *reader = builder.newCharReader();
-	Json::Value *val;
+	Json::Reader reader;
 	Json::Value value;
-	JSONCPP_STRING *errs;
-	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
-	value = *val;
+	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto allInstances = value["Instances"]["Instance"];
 	for (auto value : allInstances)

hsm/src/model/DescribeRegionsResult.cc

@@ -35,13 +35,9 @@ DescribeRegionsResult::~DescribeRegionsResult()
 
 void DescribeRegionsResult::parse(const std::string &payload)
 {
-	Json::CharReaderBuilder builder;
-	Json::CharReader *reader = builder.newCharReader();
-	Json::Value *val;
+	Json::Reader reader;
 	Json::Value value;
-	JSONCPP_STRING *errs;
-	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
-	value = *val;
+	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto allRegions = value["Regions"]["Region"];
 	for (auto value : allRegions)

hsm/src/model/ModifyInstanceRequest.cc

@@ -36,6 +36,17 @@ void ModifyInstanceRequest::setResourceOwnerId(long resourceOwnerId)
 	setCoreParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
 }
 
+std::string ModifyInstanceRequest::getRemark()const
+{
+	return remark_;
+}
+
+void ModifyInstanceRequest::setRemark(const std::string& remark)
+{
+	remark_ = remark;
+	setCoreParameter("Remark", remark);
+}
+
 std::string ModifyInstanceRequest::getInstanceId()const
 {
 	return instanceId_;
@@ -58,14 +69,3 @@ void ModifyInstanceRequest::setSourceIp(const std::string& sourceIp)
 	setCoreParameter("SourceIp", sourceIp);
 }
 
-std::string ModifyInstanceRequest::getRemark()const
-{
-	return remark_;
-}
-
-void ModifyInstanceRequest::setRemark(const std::string& remark)
-{
-	remark_ = remark;
-	setCoreParameter("Remark", remark);
-}
-

hsm/src/model/ModifyInstanceResult.cc

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

hsm/src/model/ReleaseInstanceResult.cc

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

hsm/src/model/RenewInstanceResult.cc

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