This is an automated email from the ASF dual-hosted git repository. szaszm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit c8f5bf582e7a7fee6c01a232f5318b10109a8ad3 Author: Gabor Gyimesi <[email protected]> AuthorDate: Mon Feb 7 15:23:54 2022 +0100 MINIFICPP-1729 Fix typo of "language" Closes #1256 Signed-off-by: Marton Szasz <[email protected]> --- bootstrap.sh | 6 +++--- bstrp_functions.sh | 4 ++-- extensions/expression-language/ProcessContextExpr.cpp | 4 ++-- libminifi/include/core/Property.h | 2 +- libminifi/include/core/state/nodes/AgentInformation.h | 2 +- libminifi/src/core/Property.cpp | 2 +- main/AgentDocs.cpp | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index 00f6c44..7d54da0 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -272,9 +272,9 @@ add_disabled_option EXECUTE_SCRIPT_ENABLED ${FALSE} "ENABLE_SCRIPTING" add_dependency EXECUTE_SCRIPT_ENABLED "python" add_dependency EXECUTE_SCRIPT_ENABLED "lua" -add_enabled_option EXPRESSION_LANGAUGE_ENABLED ${TRUE} "DISABLE_EXPRESSION_LANGUAGE" -add_dependency EXPRESSION_LANGAUGE_ENABLED "bison" -add_dependency EXPRESSION_LANGAUGE_ENABLED "flex" +add_enabled_option EXPRESSION_LANGUAGE_ENABLED ${TRUE} "DISABLE_EXPRESSION_LANGUAGE" +add_dependency EXPRESSION_LANGUAGE_ENABLED "bison" +add_dependency EXPRESSION_LANGUAGE_ENABLED "flex" add_disabled_option PCAP_ENABLED ${FALSE} "ENABLE_PCAP" add_dependency PCAP_ENABLED "libpcap" diff --git a/bstrp_functions.sh b/bstrp_functions.sh index 5f5f3e7..cccfde0 100755 --- a/bstrp_functions.sh +++ b/bstrp_functions.sh @@ -372,7 +372,7 @@ show_supported_features() { echo "B. libcurl features ............$(print_feature_status HTTP_CURL_ENABLED)" echo "C. libarchive features .........$(print_feature_status LIBARCHIVE_ENABLED)" echo "D. Execute Script support ......$(print_feature_status EXECUTE_SCRIPT_ENABLED)" - echo "E. Expression Language support .$(print_feature_status EXPRESSION_LANGAUGE_ENABLED)" + echo "E. Expression Language support .$(print_feature_status EXPRESSION_LANGUAGE_ENABLED)" echo "F. Kafka support ...............$(print_feature_status KAFKA_ENABLED)" echo "G. PCAP support ................$(print_feature_status PCAP_ENABLED)" echo "H. USB Camera support ..........$(print_feature_status USB_ENABLED)" @@ -422,7 +422,7 @@ read_feature_options(){ b) ToggleFeature HTTP_CURL_ENABLED ;; c) ToggleFeature LIBARCHIVE_ENABLED ;; d) ToggleFeature EXECUTE_SCRIPT_ENABLED ;; - e) ToggleFeature EXPRESSION_LANGAUGE_ENABLED ;; + e) ToggleFeature EXPRESSION_LANGUAGE_ENABLED ;; f) ToggleFeature KAFKA_ENABLED ;; g) ToggleFeature PCAP_ENABLED ;; h) ToggleFeature USB_ENABLED ;; diff --git a/extensions/expression-language/ProcessContextExpr.cpp b/extensions/expression-language/ProcessContextExpr.cpp index 1f6ec93..b9cc1d1 100644 --- a/extensions/expression-language/ProcessContextExpr.cpp +++ b/extensions/expression-language/ProcessContextExpr.cpp @@ -26,7 +26,7 @@ namespace minifi { namespace core { bool ProcessContextExpr::getProperty(const Property &property, std::string &value, const std::shared_ptr<FlowFile> &flow_file) { - if (!property.supportsExpressionLangauge()) { + if (!property.supportsExpressionLanguage()) { return ProcessContext::getProperty(property.getName(), value); } auto name = property.getName(); @@ -47,7 +47,7 @@ bool ProcessContextExpr::getProperty(const Property &property, std::string &valu } bool ProcessContextExpr::getDynamicProperty(const Property &property, std::string &value, const std::shared_ptr<FlowFile> &flow_file) { - if (!property.supportsExpressionLangauge()) { + if (!property.supportsExpressionLanguage()) { return ProcessContext::getDynamicProperty(property.getName(), value); } auto name = property.getName(); diff --git a/libminifi/include/core/Property.h b/libminifi/include/core/Property.h index 1f6c27a..ef151cf 100644 --- a/libminifi/include/core/Property.h +++ b/libminifi/include/core/Property.h @@ -116,7 +116,7 @@ class Property { std::shared_ptr<PropertyValidator> getValidator() const; const PropertyValue &getValue() const; bool getRequired() const; - bool supportsExpressionLangauge() const; + bool supportsExpressionLanguage() const; std::string getValidRegex() const; std::vector<std::string> getDependentProperties() const; std::vector<std::pair<std::string, std::string>> getExclusiveOfProperties() const; diff --git a/libminifi/include/core/state/nodes/AgentInformation.h b/libminifi/include/core/state/nodes/AgentInformation.h index dcd1b76..fb4b242 100644 --- a/libminifi/include/core/state/nodes/AgentInformation.h +++ b/libminifi/include/core/state/nodes/AgentInformation.h @@ -136,7 +136,7 @@ class ComponentManifest : public DeviceInformation { SerializedResponseNode supportsExpressionLanguageScope; supportsExpressionLanguageScope.name = "expressionLanguageScope"; - supportsExpressionLanguageScope.value = prop.second.supportsExpressionLangauge() ? "FLOWFILE_ATTRIBUTES" : "NONE"; + supportsExpressionLanguageScope.value = prop.second.supportsExpressionLanguage() ? "FLOWFILE_ATTRIBUTES" : "NONE"; SerializedResponseNode descriptorRequired; descriptorRequired.name = "required"; diff --git a/libminifi/src/core/Property.cpp b/libminifi/src/core/Property.cpp index e58833e..c2a0e92 100644 --- a/libminifi/src/core/Property.cpp +++ b/libminifi/src/core/Property.cpp @@ -50,7 +50,7 @@ bool Property::getRequired() const { return is_required_; } -bool Property::supportsExpressionLangauge() const { +bool Property::supportsExpressionLanguage() const { return supports_el_; } diff --git a/main/AgentDocs.cpp b/main/AgentDocs.cpp index 873f4b3..222e76a 100644 --- a/main/AgentDocs.cpp +++ b/main/AgentDocs.cpp @@ -85,7 +85,7 @@ void AgentDocs::generate(const std::string &docsdir, std::ostream &genStream) { outfile << "| Name | Default Value | Allowable Values | Description | " << std::endl << "| - | - | - | - | " << std::endl; for (const auto &prop : processor.second.class_properties_) { - bool supportsEl = prop.second.supportsExpressionLangauge(); + bool supportsEl = prop.second.supportsExpressionLanguage(); outfile << "|"; if (prop.second.getRequired()) { outfile << "**";
