You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by al...@apache.org on 2018/09/12 20:58:00 UTC
nifi-minifi-cpp git commit: MINIFICPP-604: Convert C++ namespace
operators to Java packing operators
Repository: nifi-minifi-cpp
Updated Branches:
refs/heads/master fd73a02da -> 01bfcab05
MINIFICPP-604: Convert C++ namespace operators to Java packing operators
This closes #396.
Signed-off-by: Aldrin Piri <al...@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/01bfcab0
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/01bfcab0
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/01bfcab0
Branch: refs/heads/master
Commit: 01bfcab05f21e7c23baea1820bf34cceb92a2605
Parents: fd73a02
Author: Marc Parisi <ph...@apache.org>
Authored: Mon Sep 10 20:21:33 2018 -0400
Committer: Aldrin Piri <al...@apache.org>
Committed: Wed Sep 12 16:57:33 2018 -0400
----------------------------------------------------------------------
libminifi/include/agent/build_description.h | 6 ++++--
libminifi/include/core/state/nodes/AgentInformation.h | 6 ++++--
libminifi/test/unit/ManifestTests.cpp | 4 ++--
3 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/01bfcab0/libminifi/include/agent/build_description.h
----------------------------------------------------------------------
diff --git a/libminifi/include/agent/build_description.h b/libminifi/include/agent/build_description.h
index e02911c..3e56d73 100644
--- a/libminifi/include/agent/build_description.h
+++ b/libminifi/include/agent/build_description.h
@@ -65,7 +65,7 @@ class BuildDescription {
static struct Components getClassDescriptions(const std::string group = "minifi-system") {
static std::map<std::string, struct Components> class_mappings;
if (UNLIKELY(IsNullOrEmpty(class_mappings[group].processors_) && IsNullOrEmpty(class_mappings[group].processors_))) {
- for (auto clazz : core::ClassLoader::getDefaultClassLoader().getClasses(group)) {
+ for (const auto clazz : core::ClassLoader::getDefaultClassLoader().getClasses(group)) {
std::string class_name = clazz;
auto lastOfIdx = clazz.find_last_of("::");
if (lastOfIdx != std::string::npos) {
@@ -77,7 +77,9 @@ class BuildDescription {
std::shared_ptr<core::ConfigurableComponent> component = std::dynamic_pointer_cast<core::ConfigurableComponent>(obj);
- ClassDescription description(clazz);
+ std::string classDescriptionName = clazz;
+ utils::StringUtils::replaceAll(classDescriptionName,"::",".");
+ ClassDescription description(classDescriptionName);
if (nullptr != component) {
auto processor = std::dynamic_pointer_cast<core::Processor>(obj) ;
http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/01bfcab0/libminifi/include/core/state/nodes/AgentInformation.h
----------------------------------------------------------------------
diff --git a/libminifi/include/core/state/nodes/AgentInformation.h b/libminifi/include/core/state/nodes/AgentInformation.h
index 323c628..2f7d5a0 100644
--- a/libminifi/include/core/state/nodes/AgentInformation.h
+++ b/libminifi/include/core/state/nodes/AgentInformation.h
@@ -58,7 +58,7 @@ namespace minifi {
namespace state {
namespace response {
-#define GROUP_STR "org::apache::nifi::minifi"
+#define GROUP_STR "org.apache.nifi.minifi"
class ComponentManifest : public DeviceInformation {
public:
@@ -154,7 +154,9 @@ class ComponentManifest : public DeviceInformation {
for (const auto &type : allowed_types) {
SerializedResponseNode typeNode;
typeNode.name = "type";
- typeNode.value = type;
+ std::string typeClazz = type;
+ utils::StringUtils::replaceAll(typeClazz,"::",".");
+ typeNode.value = typeClazz;
allowed_type.children.push_back(typeNode);
SerializedResponseNode bgroup;
http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/01bfcab0/libminifi/test/unit/ManifestTests.cpp
----------------------------------------------------------------------
diff --git a/libminifi/test/unit/ManifestTests.cpp b/libminifi/test/unit/ManifestTests.cpp
index 3bbca21..83811a2 100644
--- a/libminifi/test/unit/ManifestTests.cpp
+++ b/libminifi/test/unit/ManifestTests.cpp
@@ -74,7 +74,7 @@ TEST_CASE("Test Relationships", "[rel1]") {
REQUIRE(processors.children.size() > 0);
minifi::state::response::SerializedResponseNode proc_0;
for (const auto &node : processors.children) {
- if ("org::apache::nifi::minifi::processors::PutFile" == node.name) {
+ if ("org.apache.nifi.minifi.processors.PutFile" == node.name) {
proc_0 = node;
}
}
@@ -101,7 +101,7 @@ TEST_CASE("Test Dependent", "[dependent]") {
REQUIRE(processors.children.size() > 0);
minifi::state::response::SerializedResponseNode proc_0;
for (const auto &node : processors.children) {
- if ("org::apache::nifi::minifi::processors::PutFile" == node.name) {
+ if ("org.apache.nifi.minifi.processors.PutFile" == node.name) {
proc_0 = node;
}
}