adamdebreceni commented on a change in pull request #900:
URL: https://github.com/apache/nifi-minifi-cpp/pull/900#discussion_r501490582
##########
File path: extensions/libarchive/MergeContent.cpp
##########
@@ -72,10 +74,12 @@ core::Property MergeContent::AttributeStrategy(
"only the attributes that exist on all FlowFiles in the
bundle, with the same value, will be preserved.")
->withAllowableValues<std::string>({merge_content_options::ATTRIBUTE_STRATEGY_KEEP_COMMON,
merge_content_options::ATTRIBUTE_STRATEGY_KEEP_ALL_UNIQUE})
->withDefaultValue(merge_content_options::ATTRIBUTE_STRATEGY_KEEP_COMMON)->build());
+core::Property MergeContent::FlowFileSerializer(
+ core::PropertyBuilder::createProperty("Flow File Serializer")
+ ->withDescription("Determines how to flow files should be serialized before
merging")
+
->withAllowableValues<std::string>({merge_content_options::SERIALIZER_PAYLOAD,
merge_content_options::SERIALIZER_FLOW_FILE_V3})
+ ->withDefaultValue(merge_content_options::SERIALIZER_PAYLOAD)->build());
Review comment:
should be a straightforward change, this being an interface level
decision I would also like to ask @arpadboda to confirm dropping the separate
`Flow File Serializer` property and merging it into `Merge Format`
##########
File path: libminifi/include/io/StreamPipe.h
##########
@@ -0,0 +1,110 @@
+/**
+ * @file FlowFileRecord.h
+ * Flow file record class declaration
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <memory>
+#include <utility>
+#include "BaseStream.h"
+
+namespace org {
+namespace apache {
+namespace nifi {
+namespace minifi {
+
Review comment:
as expressed above, this is a tangential change and it would be better
if the namespace change gets its own ticket
[here](https://issues.apache.org/jira/browse/MINIFICPP-1386)
##########
File path: libminifi/include/io/StreamPipe.h
##########
@@ -0,0 +1,110 @@
+/**
+ * @file FlowFileRecord.h
+ * Flow file record class declaration
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <memory>
+#include <utility>
+#include "BaseStream.h"
+
+namespace org {
+namespace apache {
+namespace nifi {
+namespace minifi {
+
Review comment:
as expressed above, this move is a tangential change and it would be
better if the namespace change gets its own ticket
[here](https://issues.apache.org/jira/browse/MINIFICPP-1386)
##########
File path: extensions/libarchive/MergeContent.cpp
##########
@@ -72,10 +74,12 @@ core::Property MergeContent::AttributeStrategy(
"only the attributes that exist on all FlowFiles in the
bundle, with the same value, will be preserved.")
->withAllowableValues<std::string>({merge_content_options::ATTRIBUTE_STRATEGY_KEEP_COMMON,
merge_content_options::ATTRIBUTE_STRATEGY_KEEP_ALL_UNIQUE})
->withDefaultValue(merge_content_options::ATTRIBUTE_STRATEGY_KEEP_COMMON)->build());
+core::Property MergeContent::FlowFileSerializer(
+ core::PropertyBuilder::createProperty("Flow File Serializer")
+ ->withDescription("Determines how to flow files should be serialized before
merging")
+
->withAllowableValues<std::string>({merge_content_options::SERIALIZER_PAYLOAD,
merge_content_options::SERIALIZER_FLOW_FILE_V3})
+ ->withDefaultValue(merge_content_options::SERIALIZER_PAYLOAD)->build());
Review comment:
the serializer has been integrated into the Merge Format (using the
NiFi-equivalent `FlowFile Stream, v3` name)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
