Generate SDK by new Generator

ivpd/src/IvpdClient.cc

@@ -51,36 +51,36 @@ IvpdClient::IvpdClient(const std::string & accessKeyId, const std::string & acce
 IvpdClient::~IvpdClient()
 {}
 
-IvpdClient::ExtendImageStyleOutcome IvpdClient::extendImageStyle(const ExtendImageStyleRequest &request) const
+IvpdClient::ChangeImageSizeOutcome IvpdClient::changeImageSize(const ChangeImageSizeRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
 	if (!endpointOutcome.isSuccess())
-		return ExtendImageStyleOutcome(endpointOutcome.error());
+		return ChangeImageSizeOutcome(endpointOutcome.error());
 
 	auto outcome = makeRequest(endpointOutcome.result(), request);
 
 	if (outcome.isSuccess())
-		return ExtendImageStyleOutcome(ExtendImageStyleResult(outcome.result()));
+		return ChangeImageSizeOutcome(ChangeImageSizeResult(outcome.result()));
 	else
-		return ExtendImageStyleOutcome(outcome.error());
+		return ChangeImageSizeOutcome(outcome.error());
 }
 
-void IvpdClient::extendImageStyleAsync(const ExtendImageStyleRequest& request, const ExtendImageStyleAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+void IvpdClient::changeImageSizeAsync(const ChangeImageSizeRequest& request, const ChangeImageSizeAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
 {
 	auto fn = [this, request, handler, context]()
 	{
-		handler(this, request, extendImageStyle(request), context);
+		handler(this, request, changeImageSize(request), context);
 	};
 
 	asyncExecute(new Runnable(fn));
 }
 
-IvpdClient::ExtendImageStyleOutcomeCallable IvpdClient::extendImageStyleCallable(const ExtendImageStyleRequest &request) const
+IvpdClient::ChangeImageSizeOutcomeCallable IvpdClient::changeImageSizeCallable(const ChangeImageSizeRequest &request) const
 {
-	auto task = std::make_shared<std::packaged_task<ExtendImageStyleOutcome()>>(
+	auto task = std::make_shared<std::packaged_task<ChangeImageSizeOutcome()>>(
 			[this, request]()
 			{
-			return this->extendImageStyle(request);
+			return this->changeImageSize(request);
 			});
 
 	asyncExecute(new Runnable([task]() { (*task)(); }));
@@ -123,108 +123,36 @@ IvpdClient::DetectImageElementsOutcomeCallable IvpdClient::detectImageElementsCa
 	return task->get_future();
 }
 
-IvpdClient::RecognizeImageStyleOutcome IvpdClient::recognizeImageStyle(const RecognizeImageStyleRequest &request) const
+IvpdClient::ExtendImageStyleOutcome IvpdClient::extendImageStyle(const ExtendImageStyleRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
 	if (!endpointOutcome.isSuccess())
-		return RecognizeImageStyleOutcome(endpointOutcome.error());
+		return ExtendImageStyleOutcome(endpointOutcome.error());
 
 	auto outcome = makeRequest(endpointOutcome.result(), request);
 
 	if (outcome.isSuccess())
-		return RecognizeImageStyleOutcome(RecognizeImageStyleResult(outcome.result()));
+		return ExtendImageStyleOutcome(ExtendImageStyleResult(outcome.result()));
 	else
-		return RecognizeImageStyleOutcome(outcome.error());
+		return ExtendImageStyleOutcome(outcome.error());
 }
 
-void IvpdClient::recognizeImageStyleAsync(const RecognizeImageStyleRequest& request, const RecognizeImageStyleAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+void IvpdClient::extendImageStyleAsync(const ExtendImageStyleRequest& request, const ExtendImageStyleAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
 {
 	auto fn = [this, request, handler, context]()
 	{
-		handler(this, request, recognizeImageStyle(request), context);
+		handler(this, request, extendImageStyle(request), context);
 	};
 
 	asyncExecute(new Runnable(fn));
 }
 
-IvpdClient::RecognizeImageStyleOutcomeCallable IvpdClient::recognizeImageStyleCallable(const RecognizeImageStyleRequest &request) const
+IvpdClient::ExtendImageStyleOutcomeCallable IvpdClient::extendImageStyleCallable(const ExtendImageStyleRequest &request) const
 {
-	auto task = std::make_shared<std::packaged_task<RecognizeImageStyleOutcome()>>(
+	auto task = std::make_shared<std::packaged_task<ExtendImageStyleOutcome()>>(
 			[this, request]()
 			{
-			return this->recognizeImageStyle(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
-IvpdClient::ChangeImageSizeOutcome IvpdClient::changeImageSize(const ChangeImageSizeRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return ChangeImageSizeOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return ChangeImageSizeOutcome(ChangeImageSizeResult(outcome.result()));
-	else
-		return ChangeImageSizeOutcome(outcome.error());
-}
-
-void IvpdClient::changeImageSizeAsync(const ChangeImageSizeRequest& request, const ChangeImageSizeAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, changeImageSize(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-IvpdClient::ChangeImageSizeOutcomeCallable IvpdClient::changeImageSizeCallable(const ChangeImageSizeRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<ChangeImageSizeOutcome()>>(
-			[this, request]()
-			{
-			return this->changeImageSize(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
-IvpdClient::SegmentImageOutcome IvpdClient::segmentImage(const SegmentImageRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return SegmentImageOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return SegmentImageOutcome(SegmentImageResult(outcome.result()));
-	else
-		return SegmentImageOutcome(outcome.error());
-}
-
-void IvpdClient::segmentImageAsync(const SegmentImageRequest& request, const SegmentImageAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, segmentImage(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-IvpdClient::SegmentImageOutcomeCallable IvpdClient::segmentImageCallable(const SegmentImageRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<SegmentImageOutcome()>>(
-			[this, request]()
-			{
-			return this->segmentImage(request);
+			return this->extendImageStyle(request);
 			});
 
 	asyncExecute(new Runnable([task]() { (*task)(); }));
@@ -303,6 +231,42 @@ IvpdClient::RecognizeImageColorOutcomeCallable IvpdClient::recognizeImageColorCa
 	return task->get_future();
 }
 
+IvpdClient::RecognizeImageStyleOutcome IvpdClient::recognizeImageStyle(const RecognizeImageStyleRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return RecognizeImageStyleOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return RecognizeImageStyleOutcome(RecognizeImageStyleResult(outcome.result()));
+	else
+		return RecognizeImageStyleOutcome(outcome.error());
+}
+
+void IvpdClient::recognizeImageStyleAsync(const RecognizeImageStyleRequest& request, const RecognizeImageStyleAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, recognizeImageStyle(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+IvpdClient::RecognizeImageStyleOutcomeCallable IvpdClient::recognizeImageStyleCallable(const RecognizeImageStyleRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<RecognizeImageStyleOutcome()>>(
+			[this, request]()
+			{
+			return this->recognizeImageStyle(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 IvpdClient::RecolorImageOutcome IvpdClient::recolorImage(const RecolorImageRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -339,3 +303,39 @@ IvpdClient::RecolorImageOutcomeCallable IvpdClient::recolorImageCallable(const R
 	return task->get_future();
 }
 
+IvpdClient::SegmentImageOutcome IvpdClient::segmentImage(const SegmentImageRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return SegmentImageOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return SegmentImageOutcome(SegmentImageResult(outcome.result()));
+	else
+		return SegmentImageOutcome(outcome.error());
+}
+
+void IvpdClient::segmentImageAsync(const SegmentImageRequest& request, const SegmentImageAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, segmentImage(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+IvpdClient::SegmentImageOutcomeCallable IvpdClient::segmentImageCallable(const SegmentImageRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<SegmentImageOutcome()>>(
+			[this, request]()
+			{
+			return this->segmentImage(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+

ivpd/src/model/ChangeImageSizeRequest.cc

@@ -25,17 +25,6 @@ ChangeImageSizeRequest::ChangeImageSizeRequest() :
 ChangeImageSizeRequest::~ChangeImageSizeRequest()
 {}
 
-int ChangeImageSizeRequest::getWidth()const
-{
-	return width_;
-}
-
-void ChangeImageSizeRequest::setWidth(int width)
-{
-	width_ = width;
-	setCoreParameter("Width", std::to_string(width));
-}
-
 std::string ChangeImageSizeRequest::getUrl()const
 {
 	return url_;
@@ -47,6 +36,17 @@ void ChangeImageSizeRequest::setUrl(const std::string& url)
 	setCoreParameter("Url", url);
 }
 
+int ChangeImageSizeRequest::getWidth()const
+{
+	return width_;
+}
+
+void ChangeImageSizeRequest::setWidth(int width)
+{
+	width_ = width;
+	setCoreParameter("Width", std::to_string(width));
+}
+
 int ChangeImageSizeRequest::getHeight()const
 {
 	return height_;

ivpd/src/model/ChangeImageSizeResult.cc

@@ -35,13 +35,9 @@ ChangeImageSizeResult::~ChangeImageSizeResult()
 
 void ChangeImageSizeResult::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 dataNode = value["Data"];
 	if(!dataNode["Url"].isNull())

ivpd/src/model/DetectImageElementsResult.cc

@@ -35,13 +35,9 @@ DetectImageElementsResult::~DetectImageElementsResult()
 
 void DetectImageElementsResult::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 dataNode = value["Data"];
 	auto allElements = value["Elements"]["Element"];

ivpd/src/model/ExtendImageStyleResult.cc

@@ -35,13 +35,9 @@ ExtendImageStyleResult::~ExtendImageStyleResult()
 
 void ExtendImageStyleResult::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 dataNode = value["Data"];
 	if(!dataNode["Url"].isNull())

ivpd/src/model/MakeSuperResolutionImageResult.cc

@@ -35,13 +35,9 @@ MakeSuperResolutionImageResult::~MakeSuperResolutionImageResult()
 
 void MakeSuperResolutionImageResult::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 dataNode = value["Data"];
 	if(!dataNode["Url"].isNull())

ivpd/src/model/RecognizeImageColorRequest.cc

@@ -25,17 +25,6 @@ RecognizeImageColorRequest::RecognizeImageColorRequest() :
 RecognizeImageColorRequest::~RecognizeImageColorRequest()
 {}
 
-std::string RecognizeImageColorRequest::getColorCount()const
-{
-	return colorCount_;
-}
-
-void RecognizeImageColorRequest::setColorCount(const std::string& colorCount)
-{
-	colorCount_ = colorCount;
-	setCoreParameter("ColorCount", colorCount);
-}
-
 std::string RecognizeImageColorRequest::getUrl()const
 {
 	return url_;
@@ -47,3 +36,14 @@ void RecognizeImageColorRequest::setUrl(const std::string& url)
 	setCoreParameter("Url", url);
 }
 
+std::string RecognizeImageColorRequest::getColorCount()const
+{
+	return colorCount_;
+}
+
+void RecognizeImageColorRequest::setColorCount(const std::string& colorCount)
+{
+	colorCount_ = colorCount;
+	setCoreParameter("ColorCount", colorCount);
+}
+

ivpd/src/model/RecognizeImageColorResult.cc

@@ -35,13 +35,9 @@ RecognizeImageColorResult::~RecognizeImageColorResult()
 
 void RecognizeImageColorResult::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 dataNode = value["Data"];
 	auto allColorTemplateList = value["ColorTemplateList"]["ColorTemplate"];

ivpd/src/model/RecognizeImageStyleResult.cc

@@ -35,13 +35,9 @@ RecognizeImageStyleResult::~RecognizeImageStyleResult()
 
 void RecognizeImageStyleResult::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 dataNode = value["Data"];
 		auto allStyles = dataNode["Styles"]["Style"];

ivpd/src/model/RecolorImageRequest.cc

@@ -25,17 +25,6 @@ RecolorImageRequest::RecolorImageRequest() :
 RecolorImageRequest::~RecolorImageRequest()
 {}
 
-std::string RecolorImageRequest::getMode()const
-{
-	return mode_;
-}
-
-void RecolorImageRequest::setMode(const std::string& mode)
-{
-	mode_ = mode;
-	setCoreParameter("Mode", mode);
-}
-
 std::vector<RecolorImageRequest::ColorTemplate> RecolorImageRequest::getColorTemplate()const
 {
 	return colorTemplate_;
@@ -52,6 +41,28 @@ void RecolorImageRequest::setColorTemplate(const std::vector<ColorTemplate>& col
 	}
 }
 
+std::string RecolorImageRequest::getUrl()const
+{
+	return url_;
+}
+
+void RecolorImageRequest::setUrl(const std::string& url)
+{
+	url_ = url;
+	setCoreParameter("Url", url);
+}
+
+std::string RecolorImageRequest::getMode()const
+{
+	return mode_;
+}
+
+void RecolorImageRequest::setMode(const std::string& mode)
+{
+	mode_ = mode;
+	setCoreParameter("Mode", mode);
+}
+
 int RecolorImageRequest::getColorCount()const
 {
 	return colorCount_;
@@ -74,14 +85,3 @@ void RecolorImageRequest::setRefUrl(const std::string& refUrl)
 	setCoreParameter("RefUrl", refUrl);
 }
 
-std::string RecolorImageRequest::getUrl()const
-{
-	return url_;
-}
-
-void RecolorImageRequest::setUrl(const std::string& url)
-{
-	url_ = url;
-	setCoreParameter("Url", url);
-}
-

ivpd/src/model/RecolorImageResult.cc

@@ -35,13 +35,9 @@ RecolorImageResult::~RecolorImageResult()
 
 void RecolorImageResult::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 dataNode = value["Data"];
 		auto allImageList = dataNode["ImageList"]["ImageList"];

ivpd/src/model/SegmentImageResult.cc

@@ -35,13 +35,9 @@ SegmentImageResult::~SegmentImageResult()
 
 void SegmentImageResult::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 dataNode = value["Data"];
 	if(!dataNode["Url"].isNull())