You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ph...@apache.org on 2018/01/11 18:45:53 UTC
nifi-minifi-cpp git commit: MINIFICPP-359 Generate connection name
field if none provided, thereby enabling anonymous connections.
Repository: nifi-minifi-cpp
Updated Branches:
refs/heads/master dec7caef7 -> a6c7a9f7b
MINIFICPP-359 Generate connection name field if none provided, thereby enabling anonymous connections.
This closes #231.
Signed-off-by: Marc Parisi <ph...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/commit/a6c7a9f7
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/a6c7a9f7
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/a6c7a9f7
Branch: refs/heads/master
Commit: a6c7a9f7b1aa0e0637b9d74276803250be2c67c4
Parents: dec7cae
Author: Andy I. Christianson <an...@andyic.org>
Authored: Mon Jan 8 12:05:13 2018 -0500
Committer: Marc Parisi <ph...@apache.org>
Committed: Thu Jan 11 13:45:42 2018 -0500
----------------------------------------------------------------------
libminifi/src/core/yaml/YamlConfiguration.cpp | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/a6c7a9f7/libminifi/src/core/yaml/YamlConfiguration.cpp
----------------------------------------------------------------------
diff --git a/libminifi/src/core/yaml/YamlConfiguration.cpp b/libminifi/src/core/yaml/YamlConfiguration.cpp
index e749a77..5b7e2ff 100644
--- a/libminifi/src/core/yaml/YamlConfiguration.cpp
+++ b/libminifi/src/core/yaml/YamlConfiguration.cpp
@@ -469,10 +469,16 @@ void YamlConfiguration::parseConnectionYaml(YAML::Node *connectionsNode, core::P
// Configure basic connection
uuid_t uuid;
- checkRequiredField(&connectionNode, "name",
- CONFIG_YAML_CONNECTIONS_KEY);
- std::string name = connectionNode["name"].as<std::string>();
std::string id = getOrGenerateId(&connectionNode);
+
+ // Default name to be same as ID
+ std::string name = id;
+
+ // If name is specified in configuration, use the value
+ if (connectionNode["name"]) {
+ name = connectionNode["name"].as<std::string>();
+ }
+
uuid_parse(id.c_str(), uuid);
connection = this->createConnection(name, uuid);
logger_->log_debug("Created connection with UUID %s and name %s", id, name);