update TeslaDam module

2018-02-05 15:22:51 +08:00
parent d1400c8791
commit f22cf4ae35
13 changed files with 56 additions and 120 deletions
--- a/tesladam/CMakeLists.txt
+++ b/tesladam/CMakeLists.txt
@@ -15,34 +15,36 @@
 #

 set(public_header_dir ${CMAKE_CURRENT_SOURCE_DIR}/../include)
-set(tesladam_public_header
-	include/alibabacloud/tesladam/model/ActionDiskRmaRequest.h
-	include/alibabacloud/tesladam/model/ActionDiskRmaResult.h
-	include/alibabacloud/tesladam/model/ActionDiskMaskRequest.h
-	include/alibabacloud/tesladam/model/ActionDiskMaskResult.h
-	include/alibabacloud/tesladam/model/ActionDiskCheckRequest.h
-	include/alibabacloud/tesladam/model/ActionDiskCheckResult.h
-	include/alibabacloud/tesladam/model/HostGetsRequest.h
-	include/alibabacloud/tesladam/model/HostGetsResult.h
-	include/alibabacloud/tesladam/TeslaDamClient.h
-	include/alibabacloud/tesladam/TeslaDamExport.h
-	include/alibabacloud/tesladam/TeslaDamRequest.h
-	)

-set(tesladam_src
-	src/model/ActionDiskRmaRequest.cc
-	src/model/ActionDiskRmaResult.cc
-	src/model/ActionDiskMaskRequest.cc
-	src/model/ActionDiskMaskResult.cc
-	src/model/ActionDiskCheckRequest.cc
-	src/model/ActionDiskCheckResult.cc
-	src/model/HostGetsRequest.cc
-	src/model/HostGetsResult.cc
-	src/TeslaDamClient.cc
-	src/TeslaDamRequest.cc
-	)
+set(tesladam_public_header 
+	include/alibabacloud/tesladam/TeslaDamClient.h
+	include/alibabacloud/tesladam/TeslaDamExport.h )

-add_library(tesladam ${LIB_TYPE} ${tesladam_public_header} ${tesladam_src})
+set(tesladam_public_header_model 
+	include/alibabacloud/tesladam/model/ActionDiskRmaRequest.h
+	include/alibabacloud/tesladam/model/ActionDiskRmaResult.h
+	include/alibabacloud/tesladam/model/ActionDiskMaskRequest.h
+	include/alibabacloud/tesladam/model/ActionDiskMaskResult.h
+	include/alibabacloud/tesladam/model/ActionDiskCheckRequest.h
+	include/alibabacloud/tesladam/model/ActionDiskCheckResult.h
+	include/alibabacloud/tesladam/model/HostGetsRequest.h
+	include/alibabacloud/tesladam/model/HostGetsResult.h )
+
+set(tesladam_src 
+	src/TeslaDamClient.cc
+	src/model/ActionDiskRmaRequest.cc
+	src/model/ActionDiskRmaResult.cc
+	src/model/ActionDiskMaskRequest.cc
+	src/model/ActionDiskMaskResult.cc
+	src/model/ActionDiskCheckRequest.cc
+	src/model/ActionDiskCheckResult.cc
+	src/model/HostGetsRequest.cc
+	src/model/HostGetsResult.cc )
+
+add_library(tesladam ${LIB_TYPE}
+	${tesladam_public_header}
+	${tesladam_public_header_model}
+	${tesladam_src})

 set_target_properties(tesladam
 	PROPERTIES
@@ -51,7 +53,6 @@ set_target_properties(tesladam
 	LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib
 	RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
 	OUTPUT_NAME ${TARGET_OUTPUT_NAME_PREFIX}tesladam
-	PUBLIC_HEADER "${tesladam_public_header}"
 	)

 if(${LIB_TYPE} STREQUAL "SHARED")
@@ -86,9 +87,12 @@ else()
 		jsoncpp)
 endif()

+install(FILES ${tesladam_public_header}
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/alibabacloud/tesladam)
+install(FILES ${tesladam_public_header_model}
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/alibabacloud/tesladam/model)
 install(TARGETS tesladam
 	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-	PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/alibabacloud/tesladam
-	)
+	)
--- a/tesladam/include/alibabacloud/tesladam/TeslaDamClient.h
+++ b/tesladam/include/alibabacloud/tesladam/TeslaDamClient.h
@@ -52,12 +52,10 @@ namespace AlibabaCloud
 			typedef std::future<HostGetsOutcome> HostGetsOutcomeCallable;			
 			typedef std::function<void(const TeslaDamClient*, const Model::HostGetsRequest&, const HostGetsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> HostGetsAsyncHandler;

-
 			TeslaDamClient(const Credentials &credentials, const ClientConfiguration &configuration);
 			TeslaDamClient(const std::shared_ptr<CredentialsProvider> &credentialsProvider, const ClientConfiguration &configuration);
 			TeslaDamClient(const std::string &accessKeyId, const std::string &accessKeySecret, const ClientConfiguration &configuration);
 			~TeslaDamClient();
-
            ActionDiskRmaOutcome actionDiskRma(const Model::ActionDiskRmaRequest &request)const;
            void actionDiskRmaAsync(const Model::ActionDiskRmaRequest& request, const ActionDiskRmaAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
            ActionDiskRmaOutcomeCallable actionDiskRmaCallable(const Model::ActionDiskRmaRequest& request) const;
--- a/tesladam/include/alibabacloud/tesladam/TeslaDamRequest.h
+++ b/tesladam/include/alibabacloud/tesladam/TeslaDamRequest.h
@@ -1,39 +0,0 @@
-/*
- * 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.
- */
-
-#ifndef ALIBABACLOUD_TESLADAM_TESLADAMREQUEST_H_
-#define ALIBABACLOUD_TESLADAM_TESLADAMREQUEST_H_
-
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include "TeslaDamExport.h"
-
-namespace AlibabaCloud
-{
-	namespace TeslaDam
-	{
-		class ALIBABACLOUD_TESLADAM_EXPORT TeslaDamRequest : public RpcServiceRequest
-		{
-		public:
-			explicit TeslaDamRequest(const std::string & action);
-			virtual ~TeslaDamRequest();
-
-		private:
-
-		};
-	}
-}
-
-#endif // !ALIBABACLOUD_TESLADAM_TESLADAMREQUEST_H_
--- a/tesladam/include/alibabacloud/tesladam/model/ActionDiskCheckRequest.h
+++ b/tesladam/include/alibabacloud/tesladam/model/ActionDiskCheckRequest.h
@@ -19,7 +19,8 @@

 #include <string>
 #include <vector>
-#include <alibabacloud/tesladam/TeslaDamRequest.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/tesladam/TeslaDamExport.h>

 namespace AlibabaCloud
 {
@@ -27,7 +28,7 @@ namespace AlibabaCloud
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_TESLADAM_EXPORT ActionDiskCheckRequest : public TeslaDamRequest
+			class ALIBABACLOUD_TESLADAM_EXPORT ActionDiskCheckRequest : public RpcServiceRequest
 			{

 			public:
--- a/tesladam/include/alibabacloud/tesladam/model/ActionDiskMaskRequest.h
+++ b/tesladam/include/alibabacloud/tesladam/model/ActionDiskMaskRequest.h
@@ -19,7 +19,8 @@

 #include <string>
 #include <vector>
-#include <alibabacloud/tesladam/TeslaDamRequest.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/tesladam/TeslaDamExport.h>

 namespace AlibabaCloud
 {
@@ -27,7 +28,7 @@ namespace AlibabaCloud
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_TESLADAM_EXPORT ActionDiskMaskRequest : public TeslaDamRequest
+			class ALIBABACLOUD_TESLADAM_EXPORT ActionDiskMaskRequest : public RpcServiceRequest
 			{

 			public:
--- a/tesladam/include/alibabacloud/tesladam/model/ActionDiskRmaRequest.h
+++ b/tesladam/include/alibabacloud/tesladam/model/ActionDiskRmaRequest.h
@@ -19,7 +19,8 @@

 #include <string>
 #include <vector>
-#include <alibabacloud/tesladam/TeslaDamRequest.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/tesladam/TeslaDamExport.h>

 namespace AlibabaCloud
 {
@@ -27,7 +28,7 @@ namespace AlibabaCloud
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_TESLADAM_EXPORT ActionDiskRmaRequest : public TeslaDamRequest
+			class ALIBABACLOUD_TESLADAM_EXPORT ActionDiskRmaRequest : public RpcServiceRequest
 			{

 			public:
--- a/tesladam/include/alibabacloud/tesladam/model/HostGetsRequest.h
+++ b/tesladam/include/alibabacloud/tesladam/model/HostGetsRequest.h
@@ -19,7 +19,8 @@

 #include <string>
 #include <vector>
-#include <alibabacloud/tesladam/TeslaDamRequest.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/tesladam/TeslaDamExport.h>

 namespace AlibabaCloud
 {
@@ -27,7 +28,7 @@ namespace AlibabaCloud
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_TESLADAM_EXPORT HostGetsRequest : public TeslaDamRequest
+			class ALIBABACLOUD_TESLADAM_EXPORT HostGetsRequest : public RpcServiceRequest
 			{

 			public:
--- a/tesladam/src/TeslaDamClient.cc
+++ b/tesladam/src/TeslaDamClient.cc
@@ -26,21 +26,21 @@ TeslaDamClient::TeslaDamClient(const Credentials &credentials, const ClientConfi
 	RpcServiceClient(std::make_shared<SimpleCredentialsProvider>(credentials), configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(credentials, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), "");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), "tesladam");
 }

 TeslaDamClient::TeslaDamClient(const std::shared_ptr<CredentialsProvider>& credentialsProvider, const ClientConfiguration & configuration) :
 	RpcServiceClient(credentialsProvider, configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(credentialsProvider, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), "");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), "tesladam");
 }

 TeslaDamClient::TeslaDamClient(const std::string & accessKeyId, const std::string & accessKeySecret, const ClientConfiguration & configuration) :
 	RpcServiceClient(std::make_shared<SimpleCredentialsProvider>(accessKeyId, accessKeySecret), configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(accessKeyId, accessKeySecret, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), "");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), "tesladam");
 }

 TeslaDamClient::~TeslaDamClient()
--- a/tesladam/src/TeslaDamRequest.cc
+++ b/tesladam/src/TeslaDamRequest.cc
@@ -1,27 +0,0 @@
-/*
- * 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/tesladam/TeslaDamRequest.h>
-
-using namespace AlibabaCloud;
-using namespace AlibabaCloud::TeslaDam;
-
-TeslaDamRequest::TeslaDamRequest(const std::string & action) :
-	RpcServiceRequest("tesladam", "2018-01-18", action)
-{ }
-
-TeslaDamRequest::~TeslaDamRequest()
-{ }
--- a/tesladam/src/model/ActionDiskCheckRequest.cc
+++ b/tesladam/src/model/ActionDiskCheckRequest.cc
@@ -16,11 +16,10 @@

 #include <alibabacloud/tesladam/model/ActionDiskCheckRequest.h>

-using namespace AlibabaCloud::TeslaDam;
-using namespace AlibabaCloud::TeslaDam::Model;
+using AlibabaCloud::TeslaDam::Model::ActionDiskCheckRequest;

 ActionDiskCheckRequest::ActionDiskCheckRequest() :
-	TeslaDamRequest("ActionDiskCheck")
+	RpcServiceRequest("tesladam", "2018-01-18", "ActionDiskCheck")
 {}

 ActionDiskCheckRequest::~ActionDiskCheckRequest()
--- a/tesladam/src/model/ActionDiskMaskRequest.cc
+++ b/tesladam/src/model/ActionDiskMaskRequest.cc
@@ -16,11 +16,10 @@

 #include <alibabacloud/tesladam/model/ActionDiskMaskRequest.h>

-using namespace AlibabaCloud::TeslaDam;
-using namespace AlibabaCloud::TeslaDam::Model;
+using AlibabaCloud::TeslaDam::Model::ActionDiskMaskRequest;

 ActionDiskMaskRequest::ActionDiskMaskRequest() :
-	TeslaDamRequest("ActionDiskMask")
+	RpcServiceRequest("tesladam", "2018-01-18", "ActionDiskMask")
 {}

 ActionDiskMaskRequest::~ActionDiskMaskRequest()
--- a/tesladam/src/model/ActionDiskRmaRequest.cc
+++ b/tesladam/src/model/ActionDiskRmaRequest.cc
@@ -16,11 +16,10 @@

 #include <alibabacloud/tesladam/model/ActionDiskRmaRequest.h>

-using namespace AlibabaCloud::TeslaDam;
-using namespace AlibabaCloud::TeslaDam::Model;
+using AlibabaCloud::TeslaDam::Model::ActionDiskRmaRequest;

 ActionDiskRmaRequest::ActionDiskRmaRequest() :
-	TeslaDamRequest("ActionDiskRma")
+	RpcServiceRequest("tesladam", "2018-01-18", "ActionDiskRma")
 {}

 ActionDiskRmaRequest::~ActionDiskRmaRequest()
--- a/tesladam/src/model/HostGetsRequest.cc
+++ b/tesladam/src/model/HostGetsRequest.cc
@@ -16,11 +16,10 @@

 #include <alibabacloud/tesladam/model/HostGetsRequest.h>

-using namespace AlibabaCloud::TeslaDam;
-using namespace AlibabaCloud::TeslaDam::Model;
+using AlibabaCloud::TeslaDam::Model::HostGetsRequest;

 HostGetsRequest::HostGetsRequest() :
-	TeslaDamRequest("HostGets")
+	RpcServiceRequest("tesladam", "2018-01-18", "HostGets")
 {}

 HostGetsRequest::~HostGetsRequest()