From 29d18c083b8a99b6b7551e7a8ed55d1aaa5f6f62 Mon Sep 17 00:00:00 2001 From: Huaweicloud-SDK Date: Thu, 8 Aug 2024 16:09:37 +0800 Subject: [PATCH] release 3.1.97 source code --- CHANGELOG.md | 112 +++++++++++++ CHANGELOG_CN.md | 112 +++++++++++++ VERSION | 2 +- .../kvs/v1/model/Composed_expression.h | 80 +++++++++ .../kvs/v1/model/Condition_expression.h | 24 +++ .../huaweicloud/kvs/v1/model/Expression.h | 91 +++++++++++ .../kvs/v1/model/Multi_field_expression.h | 80 +++++++++ .../huaweicloud/kvs/v1/model/Update_fields.h | 4 +- kvs/src/v1/model/Composed_expression.cpp | 119 ++++++++++++++ kvs/src/v1/model/Condition_expression.cpp | 68 ++++++++ kvs/src/v1/model/Expression.cpp | 152 ++++++++++++++++++ kvs/src/v1/model/Multi_field_expression.cpp | 119 ++++++++++++++ .../SmartDocumentRecognizerRequestBody.h | 11 ++ .../SmartDocumentRecognizerRequestBody.cpp | 35 ++++ 14 files changed, 1006 insertions(+), 3 deletions(-) create mode 100644 kvs/include/huaweicloud/kvs/v1/model/Composed_expression.h create mode 100644 kvs/include/huaweicloud/kvs/v1/model/Expression.h create mode 100644 kvs/include/huaweicloud/kvs/v1/model/Multi_field_expression.h create mode 100644 kvs/src/v1/model/Composed_expression.cpp create mode 100644 kvs/src/v1/model/Expression.cpp create mode 100644 kvs/src/v1/model/Multi_field_expression.cpp diff --git a/CHANGELOG.md b/CHANGELOG.md index d5e726d9f..6cc36c9d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,115 @@ +# 3.1.97 2024-08-08 + +### HuaweiCloud SDK KVS + +- _Features_ + - None +- _Bug Fix_ + - None +- _Change_ + - **PutKv** + - changes of request param + - `+ condition_expression.multi_field_expression` + - `+ condition_expression.composed_expression` + - **UpdateKv** + - changes of request param + - `+ condition_expression.multi_field_expression` + - `+ condition_expression.composed_expression` + - **DeleteKv** + - changes of request param + - `+ condition_expression.multi_field_expression` + - `+ condition_expression.composed_expression` + - **ScanKv** + - changes of request param + - `+ filter_expression.multi_field_expression` + - `+ filter_expression.composed_expression` + - **ScanSkeyKv** + - changes of request param + - `+ filter_expression.multi_field_expression` + - `+ filter_expression.composed_expression` + +### HuaweiCloud SDK OCR + +- _Features_ + - None +- _Bug Fix_ + - None +- _Change_ + - **RecognizeSmartDocumentRecognizer** + - changes of request param + - `+ single_orientation_mode` + +### HuaweiCloud SDK VPC + +- _Features_ + - None +- _Bug Fix_ + - None +- _Change_ + - **ListSubNetworkInterfaces** + - changes of response param + - `+ sub_network_interfaces.allowed_address_pairs` + - `+ sub_network_interfaces.state` + - `+ sub_network_interfaces.instance_id` + - `+ sub_network_interfaces.instance_type` + - `+ sub_network_interfaces.scope` + - `* sub_network_interfaces.tags: list -> list` + - **CreateSubNetworkInterface** + - changes of request param + - `+ sub_network_interface.allowed_address_pairs` + - `+ sub_network_interface.instance_id` + - `+ sub_network_interface.instance_type` + - `+ sub_network_interface.tags` + - changes of response param + - `+ sub_network_interface.allowed_address_pairs` + - `+ sub_network_interface.state` + - `+ sub_network_interface.instance_id` + - `+ sub_network_interface.instance_type` + - `+ sub_network_interface.scope` + - `* sub_network_interface.tags: list -> list` + - **BatchCreateSubNetworkInterface** + - changes of request param + - `+ sub_network_interface.allowed_address_pairs` + - `+ sub_network_interface.instance_id` + - `+ sub_network_interface.instance_type` + - `+ sub_network_interface.tags` + - changes of response param + - `+ sub_network_interfaces.allowed_address_pairs` + - `+ sub_network_interfaces.state` + - `+ sub_network_interfaces.instance_id` + - `+ sub_network_interfaces.instance_type` + - `+ sub_network_interfaces.scope` + - `* sub_network_interfaces.tags: list -> list` + - **ShowSubNetworkInterface** + - changes of response param + - `+ sub_network_interface.allowed_address_pairs` + - `+ sub_network_interface.state` + - `+ sub_network_interface.instance_id` + - `+ sub_network_interface.instance_type` + - `+ sub_network_interface.scope` + - `* sub_network_interface.tags: list -> list` + - **UpdateSubNetworkInterface** + - changes of request param + - `+ sub_network_interface.allowed_address_pairs` + - changes of response param + - `+ sub_network_interface.allowed_address_pairs` + - `+ sub_network_interface.state` + - `+ sub_network_interface.instance_id` + - `+ sub_network_interface.instance_type` + - `+ sub_network_interface.scope` + - `* sub_network_interface.tags: list -> list` + - **MigrateSubNetworkInterface** + - changes of response param + - `+ sub_network_interfaces.allowed_address_pairs` + - `+ sub_network_interfaces.state` + - `+ sub_network_interfaces.instance_id` + - `+ sub_network_interfaces.instance_type` + - `+ sub_network_interfaces.scope` + - `* sub_network_interfaces.tags: list -> list` + - **UpdateTrafficMirrorSession** + - changes of request param + - `- traffic_mirror_session.type` + # 3.1.96 2024-08-01 ### HuaweiCloud SDK LTS diff --git a/CHANGELOG_CN.md b/CHANGELOG_CN.md index 4d5d5cbcc..978eb9bf2 100644 --- a/CHANGELOG_CN.md +++ b/CHANGELOG_CN.md @@ -1,3 +1,115 @@ +# 3.1.97 2024-08-08 + +### HuaweiCloud SDK KVS + +- _新增特性_ + - 无 +- _解决问题_ + - 无 +- _特性变更_ + - **PutKv** + - 请求参数变更 + - `+ condition_expression.multi_field_expression` + - `+ condition_expression.composed_expression` + - **UpdateKv** + - 请求参数变更 + - `+ condition_expression.multi_field_expression` + - `+ condition_expression.composed_expression` + - **DeleteKv** + - 请求参数变更 + - `+ condition_expression.multi_field_expression` + - `+ condition_expression.composed_expression` + - **ScanKv** + - 请求参数变更 + - `+ filter_expression.multi_field_expression` + - `+ filter_expression.composed_expression` + - **ScanSkeyKv** + - 请求参数变更 + - `+ filter_expression.multi_field_expression` + - `+ filter_expression.composed_expression` + +### HuaweiCloud SDK OCR + +- _新增特性_ + - 无 +- _解决问题_ + - 无 +- _特性变更_ + - **RecognizeSmartDocumentRecognizer** + - 请求参数变更 + - `+ single_orientation_mode` + +### HuaweiCloud SDK VPC + +- _新增特性_ + - 无 +- _解决问题_ + - 无 +- _特性变更_ + - **ListSubNetworkInterfaces** + - 响应参数变更 + - `+ sub_network_interfaces.allowed_address_pairs` + - `+ sub_network_interfaces.state` + - `+ sub_network_interfaces.instance_id` + - `+ sub_network_interfaces.instance_type` + - `+ sub_network_interfaces.scope` + - `* sub_network_interfaces.tags: list -> list` + - **CreateSubNetworkInterface** + - 请求参数变更 + - `+ sub_network_interface.allowed_address_pairs` + - `+ sub_network_interface.instance_id` + - `+ sub_network_interface.instance_type` + - `+ sub_network_interface.tags` + - 响应参数变更 + - `+ sub_network_interface.allowed_address_pairs` + - `+ sub_network_interface.state` + - `+ sub_network_interface.instance_id` + - `+ sub_network_interface.instance_type` + - `+ sub_network_interface.scope` + - `* sub_network_interface.tags: list -> list` + - **BatchCreateSubNetworkInterface** + - 请求参数变更 + - `+ sub_network_interface.allowed_address_pairs` + - `+ sub_network_interface.instance_id` + - `+ sub_network_interface.instance_type` + - `+ sub_network_interface.tags` + - 响应参数变更 + - `+ sub_network_interfaces.allowed_address_pairs` + - `+ sub_network_interfaces.state` + - `+ sub_network_interfaces.instance_id` + - `+ sub_network_interfaces.instance_type` + - `+ sub_network_interfaces.scope` + - `* sub_network_interfaces.tags: list -> list` + - **ShowSubNetworkInterface** + - 响应参数变更 + - `+ sub_network_interface.allowed_address_pairs` + - `+ sub_network_interface.state` + - `+ sub_network_interface.instance_id` + - `+ sub_network_interface.instance_type` + - `+ sub_network_interface.scope` + - `* sub_network_interface.tags: list -> list` + - **UpdateSubNetworkInterface** + - 请求参数变更 + - `+ sub_network_interface.allowed_address_pairs` + - 响应参数变更 + - `+ sub_network_interface.allowed_address_pairs` + - `+ sub_network_interface.state` + - `+ sub_network_interface.instance_id` + - `+ sub_network_interface.instance_type` + - `+ sub_network_interface.scope` + - `* sub_network_interface.tags: list -> list` + - **MigrateSubNetworkInterface** + - 响应参数变更 + - `+ sub_network_interfaces.allowed_address_pairs` + - `+ sub_network_interfaces.state` + - `+ sub_network_interfaces.instance_id` + - `+ sub_network_interfaces.instance_type` + - `+ sub_network_interfaces.scope` + - `* sub_network_interfaces.tags: list -> list` + - **UpdateTrafficMirrorSession** + - 请求参数变更 + - `- traffic_mirror_session.type` + # 3.1.96 2024-08-01 ### HuaweiCloud SDK LTS diff --git a/VERSION b/VERSION index c9f6385c0..222308057 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.1.96 +3.1.97 diff --git a/kvs/include/huaweicloud/kvs/v1/model/Composed_expression.h b/kvs/include/huaweicloud/kvs/v1/model/Composed_expression.h new file mode 100644 index 000000000..d31231a4c --- /dev/null +++ b/kvs/include/huaweicloud/kvs/v1/model/Composed_expression.h @@ -0,0 +1,80 @@ + +#ifndef HUAWEICLOUD_SDK_KVS_V1_MODEL_Composed_expression_H_ +#define HUAWEICLOUD_SDK_KVS_V1_MODEL_Composed_expression_H_ + +#include +#include +#include + +#include + +#include +#include +#include + +#include +#include +#include + +namespace HuaweiCloud { +namespace Sdk { +namespace Kvs { +namespace V1 { +namespace Model { + +using namespace HuaweiCloud::Sdk::Core::Utils; +using namespace HuaweiCloud::Sdk::Core::Http; +/// +/// +/// +class HUAWEICLOUD_KVS_V1_EXPORT Composed_expression + : public ModelBase +{ +public: + Composed_expression(); + virtual ~Composed_expression(); + + ///////////////////////////////////////////// + /// ModelBase overrides + + void validate() override; + bool fromBson(const Viewer &viewer) override; + bool toBson(Builder &builder) const override; + ///////////////////////////////////////////// + /// Composed_expression members + + /// + /// 逻辑关系，取值如\"$and\", \"$or\", \"$nor\"。 + /// + + std::string getLogic() const; + bool logicIsSet() const; + void unsetlogic(); + void setLogic(const std::string& value); + + /// + /// 多个相同优先级且相同逻辑的单字段或多字段条件。 + /// + + std::vector& getExpressions(); + bool expressionsIsSet() const; + void unsetexpressions(); + void setExpressions(const std::vector& value); + + +protected: + std::string logic_; + bool logicIsSet_; + std::vector expressions_; + bool expressionsIsSet_; + +}; + + +} +} +} +} +} + +#endif // HUAWEICLOUD_SDK_KVS_V1_MODEL_Composed_expression_H_ diff --git a/kvs/include/huaweicloud/kvs/v1/model/Condition_expression.h b/kvs/include/huaweicloud/kvs/v1/model/Condition_expression.h index 8bb0a97f2..2ce33c636 100644 --- a/kvs/include/huaweicloud/kvs/v1/model/Condition_expression.h +++ b/kvs/include/huaweicloud/kvs/v1/model/Condition_expression.h @@ -13,6 +13,8 @@ #include #include +#include +#include namespace HuaweiCloud { namespace Sdk { @@ -50,10 +52,32 @@ class HUAWEICLOUD_KVS_V1_EXPORT Condition_expression void unsetsingleFieldExpression(); void setSingleFieldExpression(const Single_field_expression& value); + /// + /// + /// + + Multi_field_expression getMultiFieldExpression() const; + bool multiFieldExpressionIsSet() const; + void unsetmultiFieldExpression(); + void setMultiFieldExpression(const Multi_field_expression& value); + + /// + /// + /// + + Composed_expression getComposedExpression() const; + bool composedExpressionIsSet() const; + void unsetcomposedExpression(); + void setComposedExpression(const Composed_expression& value); + protected: Single_field_expression singleFieldExpression_; bool singleFieldExpressionIsSet_; + Multi_field_expression multiFieldExpression_; + bool multiFieldExpressionIsSet_; + Composed_expression composedExpression_; + bool composedExpressionIsSet_; }; diff --git a/kvs/include/huaweicloud/kvs/v1/model/Expression.h b/kvs/include/huaweicloud/kvs/v1/model/Expression.h new file mode 100644 index 000000000..dbda9752b --- /dev/null +++ b/kvs/include/huaweicloud/kvs/v1/model/Expression.h @@ -0,0 +1,91 @@ + +#ifndef HUAWEICLOUD_SDK_KVS_V1_MODEL_Expression_H_ +#define HUAWEICLOUD_SDK_KVS_V1_MODEL_Expression_H_ + +#include +#include +#include + +#include + +#include +#include +#include + +#include +#include +#include + +namespace HuaweiCloud { +namespace Sdk { +namespace Kvs { +namespace V1 { +namespace Model { + +using namespace HuaweiCloud::Sdk::Core::Utils; +using namespace HuaweiCloud::Sdk::Core::Http; +/// +/// +/// +class HUAWEICLOUD_KVS_V1_EXPORT Expression + : public ModelBase +{ +public: + Expression(); + virtual ~Expression(); + + ///////////////////////////////////////////// + /// ModelBase overrides + + void validate() override; + bool fromBson(const Viewer &viewer) override; + bool toBson(Builder &builder) const override; + ///////////////////////////////////////////// + /// Expression members + + /// + /// + /// + + Single_field_expression getSingleFieldExpression() const; + bool singleFieldExpressionIsSet() const; + void unsetsingleFieldExpression(); + void setSingleFieldExpression(const Single_field_expression& value); + + /// + /// + /// + + Multi_field_expression getMultiFieldExpression() const; + bool multiFieldExpressionIsSet() const; + void unsetmultiFieldExpression(); + void setMultiFieldExpression(const Multi_field_expression& value); + + /// + /// + /// + + Composed_expression getComposedExpression() const; + bool composedExpressionIsSet() const; + void unsetcomposedExpression(); + void setComposedExpression(const Composed_expression& value); + + +protected: + Single_field_expression singleFieldExpression_; + bool singleFieldExpressionIsSet_; + Multi_field_expression multiFieldExpression_; + bool multiFieldExpressionIsSet_; + Composed_expression composedExpression_; + bool composedExpressionIsSet_; + +}; + + +} +} +} +} +} + +#endif // HUAWEICLOUD_SDK_KVS_V1_MODEL_Expression_H_ diff --git a/kvs/include/huaweicloud/kvs/v1/model/Multi_field_expression.h b/kvs/include/huaweicloud/kvs/v1/model/Multi_field_expression.h new file mode 100644 index 000000000..a5c8c771f --- /dev/null +++ b/kvs/include/huaweicloud/kvs/v1/model/Multi_field_expression.h @@ -0,0 +1,80 @@ + +#ifndef HUAWEICLOUD_SDK_KVS_V1_MODEL_Multi_field_expression_H_ +#define HUAWEICLOUD_SDK_KVS_V1_MODEL_Multi_field_expression_H_ + +#include +#include +#include + +#include + +#include +#include +#include + +#include +#include +#include + +namespace HuaweiCloud { +namespace Sdk { +namespace Kvs { +namespace V1 { +namespace Model { + +using namespace HuaweiCloud::Sdk::Core::Utils; +using namespace HuaweiCloud::Sdk::Core::Http; +/// +/// +/// +class HUAWEICLOUD_KVS_V1_EXPORT Multi_field_expression + : public ModelBase +{ +public: + Multi_field_expression(); + virtual ~Multi_field_expression(); + + ///////////////////////////////////////////// + /// ModelBase overrides + + void validate() override; + bool fromBson(const Viewer &viewer) override; + bool toBson(Builder &builder) const override; + ///////////////////////////////////////////// + /// Multi_field_expression members + + /// + /// 多字段条件，多个相同优先级的单字段条件。 + /// + + std::string getLogic() const; + bool logicIsSet() const; + void unsetlogic(); + void setLogic(const std::string& value); + + /// + /// 多个相同逻辑操作的单字段条件。 + /// + + std::vector& getExpressions(); + bool expressionsIsSet() const; + void unsetexpressions(); + void setExpressions(const std::vector& value); + + +protected: + std::string logic_; + bool logicIsSet_; + std::vector expressions_; + bool expressionsIsSet_; + +}; + + +} +} +} +} +} + +#endif // HUAWEICLOUD_SDK_KVS_V1_MODEL_Multi_field_expression_H_ diff --git a/kvs/include/huaweicloud/kvs/v1/model/Update_fields.h b/kvs/include/huaweicloud/kvs/v1/model/Update_fields.h index c815cc95d..5f6d3aec4 100644 --- a/kvs/include/huaweicloud/kvs/v1/model/Update_fields.h +++ b/kvs/include/huaweicloud/kvs/v1/model/Update_fields.h @@ -44,7 +44,7 @@ class HUAWEICLOUD_KVS_V1_EXPORT Update_fields /// Update_fields members /// - /// 新增字段或覆盖某字段的值1个或多个字段。 > 禁止修改sortkey的字段。 + /// 新增或覆盖更新1个或多个字段的值。 > 禁止修改sortkey的字段。 /// Document getSet() const; @@ -53,7 +53,7 @@ class HUAWEICLOUD_KVS_V1_EXPORT Update_fields void setSet(const Document& value); /// - /// 对某个字段做加法运算，并更新为运算后的值1个或多个字段。 + /// 对1个或多个字段做加法运算，并更新为运算后的值。 /// Document getAdd() const; diff --git a/kvs/src/v1/model/Composed_expression.cpp b/kvs/src/v1/model/Composed_expression.cpp new file mode 100644 index 000000000..d460af0ff --- /dev/null +++ b/kvs/src/v1/model/Composed_expression.cpp @@ -0,0 +1,119 @@ + + +#include "huaweicloud/kvs/v1/model/Composed_expression.h" +#include +namespace HuaweiCloud { +namespace Sdk { +namespace Kvs { +namespace V1 { +namespace Model { + + + + +Composed_expression::Composed_expression() +{ + logic_ = ""; + logicIsSet_ = false; + expressionsIsSet_ = false; +} + +Composed_expression::~Composed_expression() = default; + +void Composed_expression::validate() +{ +} + +bool Composed_expression::toBson(Builder &builder) const +{ + + if (logicIsSet_ && !bson_append(builder, "logic", logic_)) { + return false; + } + if (expressionsIsSet_ && !bson_append(builder, "expressions", expressions_)) { + return false; + } + + return true; +} + +bool Composed_expression::fromBson(const Viewer &viewer) +{ + + Viewer::Iterator it = viewer.begin(); + while (it != viewer.end()) { + const std::string &key = it->key(); + + if (key == "logic") { + if (!bson_get(it, logic_)) { + return false; + } + logicIsSet_ = true; + ++it; + continue; + } + + if (key == "expressions") { + if (!bson_get(it, expressions_)) { + return false; + } + expressionsIsSet_ = true; + ++it; + continue; + } + + ++it; + } + + return true; +} + +std::string Composed_expression::getLogic() const +{ + return logic_; +} + +void Composed_expression::setLogic(const std::string& value) +{ + logic_ = value; + logicIsSet_ = true; +} + +bool Composed_expression::logicIsSet() const +{ + return logicIsSet_; +} + +void Composed_expression::unsetlogic() +{ + logicIsSet_ = false; +} + +std::vector& Composed_expression::getExpressions() +{ + return expressions_; +} + +void Composed_expression::setExpressions(const std::vector& value) +{ + expressions_ = value; + expressionsIsSet_ = true; +} + +bool Composed_expression::expressionsIsSet() const +{ + return expressionsIsSet_; +} + +void Composed_expression::unsetexpressions() +{ + expressionsIsSet_ = false; +} + +} +} +} +} +} + + diff --git a/kvs/src/v1/model/Condition_expression.cpp b/kvs/src/v1/model/Condition_expression.cpp index 53740f327..167041762 100644 --- a/kvs/src/v1/model/Condition_expression.cpp +++ b/kvs/src/v1/model/Condition_expression.cpp @@ -14,6 +14,8 @@ namespace Model { Condition_expression::Condition_expression() { singleFieldExpressionIsSet_ = false; + multiFieldExpressionIsSet_ = false; + composedExpressionIsSet_ = false; } Condition_expression::~Condition_expression() = default; @@ -28,6 +30,12 @@ bool Condition_expression::toBson(Builder &builder) const if (singleFieldExpressionIsSet_ && !bson_append(builder, "single_field_expression", singleFieldExpression_)) { return false; } + if (multiFieldExpressionIsSet_ && !bson_append(builder, "multi_field_expression", multiFieldExpression_)) { + return false; + } + if (composedExpressionIsSet_ && !bson_append(builder, "composed_expression", composedExpression_)) { + return false; + } return true; } @@ -48,6 +56,24 @@ bool Condition_expression::fromBson(const Viewer &viewer) continue; } + if (key == "multi_field_expression") { + if (!bson_get(it, multiFieldExpression_)) { + return false; + } + multiFieldExpressionIsSet_ = true; + ++it; + continue; + } + + if (key == "composed_expression") { + if (!bson_get(it, composedExpression_)) { + return false; + } + composedExpressionIsSet_ = true; + ++it; + continue; + } + ++it; } @@ -75,6 +101,48 @@ void Condition_expression::unsetsingleFieldExpression() singleFieldExpressionIsSet_ = false; } +Multi_field_expression Condition_expression::getMultiFieldExpression() const +{ + return multiFieldExpression_; +} + +void Condition_expression::setMultiFieldExpression(const Multi_field_expression& value) +{ + multiFieldExpression_ = value; + multiFieldExpressionIsSet_ = true; +} + +bool Condition_expression::multiFieldExpressionIsSet() const +{ + return multiFieldExpressionIsSet_; +} + +void Condition_expression::unsetmultiFieldExpression() +{ + multiFieldExpressionIsSet_ = false; +} + +Composed_expression Condition_expression::getComposedExpression() const +{ + return composedExpression_; +} + +void Condition_expression::setComposedExpression(const Composed_expression& value) +{ + composedExpression_ = value; + composedExpressionIsSet_ = true; +} + +bool Condition_expression::composedExpressionIsSet() const +{ + return composedExpressionIsSet_; +} + +void Condition_expression::unsetcomposedExpression() +{ + composedExpressionIsSet_ = false; +} + } } } diff --git a/kvs/src/v1/model/Expression.cpp b/kvs/src/v1/model/Expression.cpp new file mode 100644 index 000000000..d1c5bd49c --- /dev/null +++ b/kvs/src/v1/model/Expression.cpp @@ -0,0 +1,152 @@ + + +#include "huaweicloud/kvs/v1/model/Expression.h" +#include +namespace HuaweiCloud { +namespace Sdk { +namespace Kvs { +namespace V1 { +namespace Model { + + + + +Expression::Expression() +{ + singleFieldExpressionIsSet_ = false; + multiFieldExpressionIsSet_ = false; + composedExpressionIsSet_ = false; +} + +Expression::~Expression() = default; + +void Expression::validate() +{ +} + +bool Expression::toBson(Builder &builder) const +{ + + if (singleFieldExpressionIsSet_ && !bson_append(builder, "single_field_expression", singleFieldExpression_)) { + return false; + } + if (multiFieldExpressionIsSet_ && !bson_append(builder, "multi_field_expression", multiFieldExpression_)) { + return false; + } + if (composedExpressionIsSet_ && !bson_append(builder, "composed_expression", composedExpression_)) { + return false; + } + + return true; +} + +bool Expression::fromBson(const Viewer &viewer) +{ + + Viewer::Iterator it = viewer.begin(); + while (it != viewer.end()) { + const std::string &key = it->key(); + + if (key == "single_field_expression") { + if (!bson_get(it, singleFieldExpression_)) { + return false; + } + singleFieldExpressionIsSet_ = true; + ++it; + continue; + } + + if (key == "multi_field_expression") { + if (!bson_get(it, multiFieldExpression_)) { + return false; + } + multiFieldExpressionIsSet_ = true; + ++it; + continue; + } + + if (key == "composed_expression") { + if (!bson_get(it, composedExpression_)) { + return false; + } + composedExpressionIsSet_ = true; + ++it; + continue; + } + + ++it; + } + + return true; +} + +Single_field_expression Expression::getSingleFieldExpression() const +{ + return singleFieldExpression_; +} + +void Expression::setSingleFieldExpression(const Single_field_expression& value) +{ + singleFieldExpression_ = value; + singleFieldExpressionIsSet_ = true; +} + +bool Expression::singleFieldExpressionIsSet() const +{ + return singleFieldExpressionIsSet_; +} + +void Expression::unsetsingleFieldExpression() +{ + singleFieldExpressionIsSet_ = false; +} + +Multi_field_expression Expression::getMultiFieldExpression() const +{ + return multiFieldExpression_; +} + +void Expression::setMultiFieldExpression(const Multi_field_expression& value) +{ + multiFieldExpression_ = value; + multiFieldExpressionIsSet_ = true; +} + +bool Expression::multiFieldExpressionIsSet() const +{ + return multiFieldExpressionIsSet_; +} + +void Expression::unsetmultiFieldExpression() +{ + multiFieldExpressionIsSet_ = false; +} + +Composed_expression Expression::getComposedExpression() const +{ + return composedExpression_; +} + +void Expression::setComposedExpression(const Composed_expression& value) +{ + composedExpression_ = value; + composedExpressionIsSet_ = true; +} + +bool Expression::composedExpressionIsSet() const +{ + return composedExpressionIsSet_; +} + +void Expression::unsetcomposedExpression() +{ + composedExpressionIsSet_ = false; +} + +} +} +} +} +} + + diff --git a/kvs/src/v1/model/Multi_field_expression.cpp b/kvs/src/v1/model/Multi_field_expression.cpp new file mode 100644 index 000000000..afd7a958c --- /dev/null +++ b/kvs/src/v1/model/Multi_field_expression.cpp @@ -0,0 +1,119 @@ + + +#include "huaweicloud/kvs/v1/model/Multi_field_expression.h" +#include +namespace HuaweiCloud { +namespace Sdk { +namespace Kvs { +namespace V1 { +namespace Model { + + + + +Multi_field_expression::Multi_field_expression() +{ + logic_ = ""; + logicIsSet_ = false; + expressionsIsSet_ = false; +} + +Multi_field_expression::~Multi_field_expression() = default; + +void Multi_field_expression::validate() +{ +} + +bool Multi_field_expression::toBson(Builder &builder) const +{ + + if (logicIsSet_ && !bson_append(builder, "logic", logic_)) { + return false; + } + if (expressionsIsSet_ && !bson_append(builder, "expressions", expressions_)) { + return false; + } + + return true; +} + +bool Multi_field_expression::fromBson(const Viewer &viewer) +{ + + Viewer::Iterator it = viewer.begin(); + while (it != viewer.end()) { + const std::string &key = it->key(); + + if (key == "logic") { + if (!bson_get(it, logic_)) { + return false; + } + logicIsSet_ = true; + ++it; + continue; + } + + if (key == "expressions") { + if (!bson_get(it, expressions_)) { + return false; + } + expressionsIsSet_ = true; + ++it; + continue; + } + + ++it; + } + + return true; +} + +std::string Multi_field_expression::getLogic() const +{ + return logic_; +} + +void Multi_field_expression::setLogic(const std::string& value) +{ + logic_ = value; + logicIsSet_ = true; +} + +bool Multi_field_expression::logicIsSet() const +{ + return logicIsSet_; +} + +void Multi_field_expression::unsetlogic() +{ + logicIsSet_ = false; +} + +std::vector& Multi_field_expression::getExpressions() +{ + return expressions_; +} + +void Multi_field_expression::setExpressions(const std::vector& value) +{ + expressions_ = value; + expressionsIsSet_ = true; +} + +bool Multi_field_expression::expressionsIsSet() const +{ + return expressionsIsSet_; +} + +void Multi_field_expression::unsetexpressions() +{ + expressionsIsSet_ = false; +} + +} +} +} +} +} + + diff --git a/ocr/include/huaweicloud/ocr/v1/model/SmartDocumentRecognizerRequestBody.h b/ocr/include/huaweicloud/ocr/v1/model/SmartDocumentRecognizerRequestBody.h index 1f4648b2a..a07fbdd52 100644 --- a/ocr/include/huaweicloud/ocr/v1/model/SmartDocumentRecognizerRequestBody.h +++ b/ocr/include/huaweicloud/ocr/v1/model/SmartDocumentRecognizerRequestBody.h @@ -56,6 +56,15 @@ class HUAWEICLOUD_OCR_V1_EXPORT SmartDocumentRecognizerRequestBody void unseturl(); void setUrl(const std::string& value); + /// + /// 单朝向模式开关。可选值包括： - true：打开单朝向模式 - false：关闭单朝向模式 未传入该参数时默认为false，既默认图片中的字段为多朝向 + /// + + bool isSingleOrientationMode() const; + bool singleOrientationModeIsSet() const; + void unsetsingleOrientationMode(); + void setSingleOrientationMode(bool value); + /// /// 是否进行键值对（key-value）提取。若是，结果会以“kv_result”这一关键字返回。 /// @@ -134,6 +143,8 @@ class HUAWEICLOUD_OCR_V1_EXPORT SmartDocumentRecognizerRequestBody bool dataIsSet_; std::string url_; bool urlIsSet_; + bool singleOrientationMode_; + bool singleOrientationModeIsSet_; bool kv_; bool kvIsSet_; bool table_; diff --git a/ocr/src/v1/model/SmartDocumentRecognizerRequestBody.cpp b/ocr/src/v1/model/SmartDocumentRecognizerRequestBody.cpp index d2b41aac4..0268fddce 100644 --- a/ocr/src/v1/model/SmartDocumentRecognizerRequestBody.cpp +++ b/ocr/src/v1/model/SmartDocumentRecognizerRequestBody.cpp @@ -16,6 +16,8 @@ SmartDocumentRecognizerRequestBody::SmartDocumentRecognizerRequestBody() dataIsSet_ = false; url_ = ""; urlIsSet_ = false; + singleOrientationMode_ = false; + singleOrientationModeIsSet_ = false; kv_ = false; kvIsSet_ = false; table_ = false; @@ -50,6 +52,9 @@ web::json::value SmartDocumentRecognizerRequestBody::toJson() const if(urlIsSet_) { val[utility::conversions::to_string_t("url")] = ModelBase::toJson(url_); } + if(singleOrientationModeIsSet_) { + val[utility::conversions::to_string_t("single_orientation_mode")] = ModelBase::toJson(singleOrientationMode_); + } if(kvIsSet_) { val[utility::conversions::to_string_t("kv")] = ModelBase::toJson(kv_); } @@ -99,6 +104,15 @@ bool SmartDocumentRecognizerRequestBody::fromJson(const web::json::value& val) setUrl(refVal); } } + if(val.has_field(utility::conversions::to_string_t("single_orientation_mode"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("single_orientation_mode")); + if(!fieldValue.is_null()) + { + bool refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setSingleOrientationMode(refVal); + } + } if(val.has_field(utility::conversions::to_string_t("kv"))) { const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("kv")); if(!fieldValue.is_null()) @@ -217,6 +231,27 @@ void SmartDocumentRecognizerRequestBody::unseturl() urlIsSet_ = false; } +bool SmartDocumentRecognizerRequestBody::isSingleOrientationMode() const +{ + return singleOrientationMode_; +} + +void SmartDocumentRecognizerRequestBody::setSingleOrientationMode(bool value) +{ + singleOrientationMode_ = value; + singleOrientationModeIsSet_ = true; +} + +bool SmartDocumentRecognizerRequestBody::singleOrientationModeIsSet() const +{ + return singleOrientationModeIsSet_; +} + +void SmartDocumentRecognizerRequestBody::unsetsingleOrientationMode() +{ + singleOrientationModeIsSet_ = false; +} + bool SmartDocumentRecognizerRequestBody::isKv() const { return kv_;