From 665991c21278c271e15a5a206fe75206956c70c7 Mon Sep 17 00:00:00 2001 From: sdk-team Date: Tue, 17 Jan 2023 11:02:04 +0000 Subject: [PATCH] Update PreloadScdnObjectCaches. --- VERSION | 2 +- scdn/CMakeLists.txt | 4 - scdn/include/alibabacloud/scdn/ScdnClient.h | 8 -- .../model/PreloadScdnObjectCachesRequest.h | 3 + .../TestAmpDescribeScdnDomainIspDataRequest.h | 48 -------- .../TestAmpDescribeScdnDomainIspDataResult.h | 74 ------------ scdn/src/ScdnClient.cc | 36 ------ .../model/PreloadScdnObjectCachesRequest.cc | 9 ++ ...TestAmpDescribeScdnDomainIspDataRequest.cc | 54 --------- .../TestAmpDescribeScdnDomainIspDataResult.cc | 107 ------------------ 10 files changed, 13 insertions(+), 332 deletions(-) delete mode 100644 scdn/include/alibabacloud/scdn/model/TestAmpDescribeScdnDomainIspDataRequest.h delete mode 100644 scdn/include/alibabacloud/scdn/model/TestAmpDescribeScdnDomainIspDataResult.h delete mode 100644 scdn/src/model/TestAmpDescribeScdnDomainIspDataRequest.cc delete mode 100644 scdn/src/model/TestAmpDescribeScdnDomainIspDataResult.cc diff --git a/VERSION b/VERSION index c1f414f14..b85bd88e3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.1424 \ No newline at end of file +1.36.1425 \ No newline at end of file diff --git a/scdn/CMakeLists.txt b/scdn/CMakeLists.txt index 04dc0a7ba..7e22a6538 100644 --- a/scdn/CMakeLists.txt +++ b/scdn/CMakeLists.txt @@ -139,8 +139,6 @@ set(scdn_public_header_model include/alibabacloud/scdn/model/StartScdnDomainResult.h include/alibabacloud/scdn/model/StopScdnDomainRequest.h include/alibabacloud/scdn/model/StopScdnDomainResult.h - include/alibabacloud/scdn/model/TestAmpDescribeScdnDomainIspDataRequest.h - include/alibabacloud/scdn/model/TestAmpDescribeScdnDomainIspDataResult.h include/alibabacloud/scdn/model/UpdateScdnDomainRequest.h include/alibabacloud/scdn/model/UpdateScdnDomainResult.h include/alibabacloud/scdn/model/VerifyScdnDomainOwnerRequest.h @@ -266,8 +264,6 @@ set(scdn_src src/model/StartScdnDomainResult.cc src/model/StopScdnDomainRequest.cc src/model/StopScdnDomainResult.cc - src/model/TestAmpDescribeScdnDomainIspDataRequest.cc - src/model/TestAmpDescribeScdnDomainIspDataResult.cc src/model/UpdateScdnDomainRequest.cc src/model/UpdateScdnDomainResult.cc src/model/VerifyScdnDomainOwnerRequest.cc diff --git a/scdn/include/alibabacloud/scdn/ScdnClient.h b/scdn/include/alibabacloud/scdn/ScdnClient.h index 17ffe0907..95b723ea2 100644 --- a/scdn/include/alibabacloud/scdn/ScdnClient.h +++ b/scdn/include/alibabacloud/scdn/ScdnClient.h @@ -140,8 +140,6 @@ #include "model/StartScdnDomainResult.h" #include "model/StopScdnDomainRequest.h" #include "model/StopScdnDomainResult.h" -#include "model/TestAmpDescribeScdnDomainIspDataRequest.h" -#include "model/TestAmpDescribeScdnDomainIspDataResult.h" #include "model/UpdateScdnDomainRequest.h" #include "model/UpdateScdnDomainResult.h" #include "model/VerifyScdnDomainOwnerRequest.h" @@ -332,9 +330,6 @@ namespace AlibabaCloud typedef Outcome StopScdnDomainOutcome; typedef std::future StopScdnDomainOutcomeCallable; typedef std::function&)> StopScdnDomainAsyncHandler; - typedef Outcome TestAmpDescribeScdnDomainIspDataOutcome; - typedef std::future TestAmpDescribeScdnDomainIspDataOutcomeCallable; - typedef std::function&)> TestAmpDescribeScdnDomainIspDataAsyncHandler; typedef Outcome UpdateScdnDomainOutcome; typedef std::future UpdateScdnDomainOutcomeCallable; typedef std::function&)> UpdateScdnDomainAsyncHandler; @@ -523,9 +518,6 @@ namespace AlibabaCloud StopScdnDomainOutcome stopScdnDomain(const Model::StopScdnDomainRequest &request)const; void stopScdnDomainAsync(const Model::StopScdnDomainRequest& request, const StopScdnDomainAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; StopScdnDomainOutcomeCallable stopScdnDomainCallable(const Model::StopScdnDomainRequest& request) const; - TestAmpDescribeScdnDomainIspDataOutcome testAmpDescribeScdnDomainIspData(const Model::TestAmpDescribeScdnDomainIspDataRequest &request)const; - void testAmpDescribeScdnDomainIspDataAsync(const Model::TestAmpDescribeScdnDomainIspDataRequest& request, const TestAmpDescribeScdnDomainIspDataAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; - TestAmpDescribeScdnDomainIspDataOutcomeCallable testAmpDescribeScdnDomainIspDataCallable(const Model::TestAmpDescribeScdnDomainIspDataRequest& request) const; UpdateScdnDomainOutcome updateScdnDomain(const Model::UpdateScdnDomainRequest &request)const; void updateScdnDomainAsync(const Model::UpdateScdnDomainRequest& request, const UpdateScdnDomainAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; UpdateScdnDomainOutcomeCallable updateScdnDomainCallable(const Model::UpdateScdnDomainRequest& request) const; diff --git a/scdn/include/alibabacloud/scdn/model/PreloadScdnObjectCachesRequest.h b/scdn/include/alibabacloud/scdn/model/PreloadScdnObjectCachesRequest.h index b68ac54c8..6ea9bb714 100644 --- a/scdn/include/alibabacloud/scdn/model/PreloadScdnObjectCachesRequest.h +++ b/scdn/include/alibabacloud/scdn/model/PreloadScdnObjectCachesRequest.h @@ -38,6 +38,8 @@ public: void setL2Preload(bool l2Preload); std::string getArea() const; void setArea(const std::string &area); + std::string getWithHeader() const; + void setWithHeader(const std::string &withHeader); long getOwnerId() const; void setOwnerId(long ownerId); @@ -46,6 +48,7 @@ private: std::string securityToken_; bool l2Preload_; std::string area_; + std::string withHeader_; long ownerId_; }; } // namespace Model diff --git a/scdn/include/alibabacloud/scdn/model/TestAmpDescribeScdnDomainIspDataRequest.h b/scdn/include/alibabacloud/scdn/model/TestAmpDescribeScdnDomainIspDataRequest.h deleted file mode 100644 index 16dd54c7b..000000000 --- a/scdn/include/alibabacloud/scdn/model/TestAmpDescribeScdnDomainIspDataRequest.h +++ /dev/null @@ -1,48 +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_SCDN_MODEL_TESTAMPDESCRIBESCDNDOMAINISPDATAREQUEST_H_ -#define ALIBABACLOUD_SCDN_MODEL_TESTAMPDESCRIBESCDNDOMAINISPDATAREQUEST_H_ - -#include -#include -#include -#include -#include - -namespace AlibabaCloud { -namespace Scdn { -namespace Model { -class ALIBABACLOUD_SCDN_EXPORT TestAmpDescribeScdnDomainIspDataRequest : public RpcServiceRequest { -public: - TestAmpDescribeScdnDomainIspDataRequest(); - ~TestAmpDescribeScdnDomainIspDataRequest(); - std::string getDomainName() const; - void setDomainName(const std::string &domainName); - std::string getEndTime() const; - void setEndTime(const std::string &endTime); - std::string getStartTime() const; - void setStartTime(const std::string &startTime); - -private: - std::string domainName_; - std::string endTime_; - std::string startTime_; -}; -} // namespace Model -} // namespace Scdn -} // namespace AlibabaCloud -#endif // !ALIBABACLOUD_SCDN_MODEL_TESTAMPDESCRIBESCDNDOMAINISPDATAREQUEST_H_ diff --git a/scdn/include/alibabacloud/scdn/model/TestAmpDescribeScdnDomainIspDataResult.h b/scdn/include/alibabacloud/scdn/model/TestAmpDescribeScdnDomainIspDataResult.h deleted file mode 100644 index c3e7bef8d..000000000 --- a/scdn/include/alibabacloud/scdn/model/TestAmpDescribeScdnDomainIspDataResult.h +++ /dev/null @@ -1,74 +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_SCDN_MODEL_TESTAMPDESCRIBESCDNDOMAINISPDATARESULT_H_ -#define ALIBABACLOUD_SCDN_MODEL_TESTAMPDESCRIBESCDNDOMAINISPDATARESULT_H_ - -#include -#include -#include -#include -#include - -namespace AlibabaCloud -{ - namespace Scdn - { - namespace Model - { - class ALIBABACLOUD_SCDN_EXPORT TestAmpDescribeScdnDomainIspDataResult : public ServiceResult - { - public: - struct ISPProportionData - { - std::string avgObjectSize; - std::string bytesProportion; - std::string bps; - std::string totalQuery; - std::string qps; - std::string proportion; - std::string totalBytes; - std::string iSP; - std::string avgResponseRate; - std::string reqErrRate; - std::string ispEname; - std::string avgResponseTime; - }; - - - TestAmpDescribeScdnDomainIspDataResult(); - explicit TestAmpDescribeScdnDomainIspDataResult(const std::string &payload); - ~TestAmpDescribeScdnDomainIspDataResult(); - std::string getEndTime()const; - std::string getDomainName()const; - std::vector getValue()const; - std::string getStartTime()const; - std::string getDataInterval()const; - - protected: - void parse(const std::string &payload); - private: - std::string endTime_; - std::string domainName_; - std::vector value_; - std::string startTime_; - std::string dataInterval_; - - }; - } - } -} -#endif // !ALIBABACLOUD_SCDN_MODEL_TESTAMPDESCRIBESCDNDOMAINISPDATARESULT_H_ \ No newline at end of file diff --git a/scdn/src/ScdnClient.cc b/scdn/src/ScdnClient.cc index b223a5422..472720572 100644 --- a/scdn/src/ScdnClient.cc +++ b/scdn/src/ScdnClient.cc @@ -2175,42 +2175,6 @@ ScdnClient::StopScdnDomainOutcomeCallable ScdnClient::stopScdnDomainCallable(con return task->get_future(); } -ScdnClient::TestAmpDescribeScdnDomainIspDataOutcome ScdnClient::testAmpDescribeScdnDomainIspData(const TestAmpDescribeScdnDomainIspDataRequest &request) const -{ - auto endpointOutcome = endpointProvider_->getEndpoint(); - if (!endpointOutcome.isSuccess()) - return TestAmpDescribeScdnDomainIspDataOutcome(endpointOutcome.error()); - - auto outcome = makeRequest(endpointOutcome.result(), request); - - if (outcome.isSuccess()) - return TestAmpDescribeScdnDomainIspDataOutcome(TestAmpDescribeScdnDomainIspDataResult(outcome.result())); - else - return TestAmpDescribeScdnDomainIspDataOutcome(outcome.error()); -} - -void ScdnClient::testAmpDescribeScdnDomainIspDataAsync(const TestAmpDescribeScdnDomainIspDataRequest& request, const TestAmpDescribeScdnDomainIspDataAsyncHandler& handler, const std::shared_ptr& context) const -{ - auto fn = [this, request, handler, context]() - { - handler(this, request, testAmpDescribeScdnDomainIspData(request), context); - }; - - asyncExecute(new Runnable(fn)); -} - -ScdnClient::TestAmpDescribeScdnDomainIspDataOutcomeCallable ScdnClient::testAmpDescribeScdnDomainIspDataCallable(const TestAmpDescribeScdnDomainIspDataRequest &request) const -{ - auto task = std::make_shared>( - [this, request]() - { - return this->testAmpDescribeScdnDomainIspData(request); - }); - - asyncExecute(new Runnable([task]() { (*task)(); })); - return task->get_future(); -} - ScdnClient::UpdateScdnDomainOutcome ScdnClient::updateScdnDomain(const UpdateScdnDomainRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); diff --git a/scdn/src/model/PreloadScdnObjectCachesRequest.cc b/scdn/src/model/PreloadScdnObjectCachesRequest.cc index a6aadf1bc..e2bb4a3ba 100644 --- a/scdn/src/model/PreloadScdnObjectCachesRequest.cc +++ b/scdn/src/model/PreloadScdnObjectCachesRequest.cc @@ -61,6 +61,15 @@ void PreloadScdnObjectCachesRequest::setArea(const std::string &area) { setParameter(std::string("Area"), area); } +std::string PreloadScdnObjectCachesRequest::getWithHeader() const { + return withHeader_; +} + +void PreloadScdnObjectCachesRequest::setWithHeader(const std::string &withHeader) { + withHeader_ = withHeader; + setParameter(std::string("WithHeader"), withHeader); +} + long PreloadScdnObjectCachesRequest::getOwnerId() const { return ownerId_; } diff --git a/scdn/src/model/TestAmpDescribeScdnDomainIspDataRequest.cc b/scdn/src/model/TestAmpDescribeScdnDomainIspDataRequest.cc deleted file mode 100644 index bceec2a3e..000000000 --- a/scdn/src/model/TestAmpDescribeScdnDomainIspDataRequest.cc +++ /dev/null @@ -1,54 +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 - -using AlibabaCloud::Scdn::Model::TestAmpDescribeScdnDomainIspDataRequest; - -TestAmpDescribeScdnDomainIspDataRequest::TestAmpDescribeScdnDomainIspDataRequest() - : RpcServiceRequest("scdn", "2017-11-15", "TestAmpDescribeScdnDomainIspData") { - setMethod(HttpRequest::Method::Post); -} - -TestAmpDescribeScdnDomainIspDataRequest::~TestAmpDescribeScdnDomainIspDataRequest() {} - -std::string TestAmpDescribeScdnDomainIspDataRequest::getDomainName() const { - return domainName_; -} - -void TestAmpDescribeScdnDomainIspDataRequest::setDomainName(const std::string &domainName) { - domainName_ = domainName; - setParameter(std::string("DomainName"), domainName); -} - -std::string TestAmpDescribeScdnDomainIspDataRequest::getEndTime() const { - return endTime_; -} - -void TestAmpDescribeScdnDomainIspDataRequest::setEndTime(const std::string &endTime) { - endTime_ = endTime; - setParameter(std::string("EndTime"), endTime); -} - -std::string TestAmpDescribeScdnDomainIspDataRequest::getStartTime() const { - return startTime_; -} - -void TestAmpDescribeScdnDomainIspDataRequest::setStartTime(const std::string &startTime) { - startTime_ = startTime; - setParameter(std::string("StartTime"), startTime); -} - diff --git a/scdn/src/model/TestAmpDescribeScdnDomainIspDataResult.cc b/scdn/src/model/TestAmpDescribeScdnDomainIspDataResult.cc deleted file mode 100644 index d351d3e17..000000000 --- a/scdn/src/model/TestAmpDescribeScdnDomainIspDataResult.cc +++ /dev/null @@ -1,107 +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 -#include - -using namespace AlibabaCloud::Scdn; -using namespace AlibabaCloud::Scdn::Model; - -TestAmpDescribeScdnDomainIspDataResult::TestAmpDescribeScdnDomainIspDataResult() : - ServiceResult() -{} - -TestAmpDescribeScdnDomainIspDataResult::TestAmpDescribeScdnDomainIspDataResult(const std::string &payload) : - ServiceResult() -{ - parse(payload); -} - -TestAmpDescribeScdnDomainIspDataResult::~TestAmpDescribeScdnDomainIspDataResult() -{} - -void TestAmpDescribeScdnDomainIspDataResult::parse(const std::string &payload) -{ - Json::Reader reader; - Json::Value value; - reader.parse(payload, value); - setRequestId(value["RequestId"].asString()); - auto allValueNode = value["Value"]["ISPProportionData"]; - for (auto valueValueISPProportionData : allValueNode) - { - ISPProportionData valueObject; - if(!valueValueISPProportionData["TotalQuery"].isNull()) - valueObject.totalQuery = valueValueISPProportionData["TotalQuery"].asString(); - if(!valueValueISPProportionData["TotalBytes"].isNull()) - valueObject.totalBytes = valueValueISPProportionData["TotalBytes"].asString(); - if(!valueValueISPProportionData["AvgResponseRate"].isNull()) - valueObject.avgResponseRate = valueValueISPProportionData["AvgResponseRate"].asString(); - if(!valueValueISPProportionData["AvgResponseTime"].isNull()) - valueObject.avgResponseTime = valueValueISPProportionData["AvgResponseTime"].asString(); - if(!valueValueISPProportionData["ReqErrRate"].isNull()) - valueObject.reqErrRate = valueValueISPProportionData["ReqErrRate"].asString(); - if(!valueValueISPProportionData["AvgObjectSize"].isNull()) - valueObject.avgObjectSize = valueValueISPProportionData["AvgObjectSize"].asString(); - if(!valueValueISPProportionData["Bps"].isNull()) - valueObject.bps = valueValueISPProportionData["Bps"].asString(); - if(!valueValueISPProportionData["Qps"].isNull()) - valueObject.qps = valueValueISPProportionData["Qps"].asString(); - if(!valueValueISPProportionData["Proportion"].isNull()) - valueObject.proportion = valueValueISPProportionData["Proportion"].asString(); - if(!valueValueISPProportionData["IspEname"].isNull()) - valueObject.ispEname = valueValueISPProportionData["IspEname"].asString(); - if(!valueValueISPProportionData["ISP"].isNull()) - valueObject.iSP = valueValueISPProportionData["ISP"].asString(); - if(!valueValueISPProportionData["BytesProportion"].isNull()) - valueObject.bytesProportion = valueValueISPProportionData["BytesProportion"].asString(); - value_.push_back(valueObject); - } - if(!value["EndTime"].isNull()) - endTime_ = value["EndTime"].asString(); - if(!value["StartTime"].isNull()) - startTime_ = value["StartTime"].asString(); - if(!value["DomainName"].isNull()) - domainName_ = value["DomainName"].asString(); - if(!value["DataInterval"].isNull()) - dataInterval_ = value["DataInterval"].asString(); - -} - -std::string TestAmpDescribeScdnDomainIspDataResult::getEndTime()const -{ - return endTime_; -} - -std::string TestAmpDescribeScdnDomainIspDataResult::getDomainName()const -{ - return domainName_; -} - -std::vector TestAmpDescribeScdnDomainIspDataResult::getValue()const -{ - return value_; -} - -std::string TestAmpDescribeScdnDomainIspDataResult::getStartTime()const -{ - return startTime_; -} - -std::string TestAmpDescribeScdnDomainIspDataResult::getDataInterval()const -{ - return dataInterval_; -} -