fgerlits commented on a change in pull request #1137: URL: https://github.com/apache/nifi-minifi-cpp/pull/1137#discussion_r686129649
########## File path: extensions/standard-processors/processors/AttributesToJSON.cpp ########## @@ -0,0 +1,174 @@ +/** + * @file AttributesToJSON.cpp + * AttributesToJSON class implementation + * + * 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. + */ +#include "AttributesToJSON.h" + +#include <unordered_set> + +#include "rapidjson/writer.h" +#include "utils/StringUtils.h" +#include "utils/ProcessorConfigUtils.h" + +namespace org { +namespace apache { +namespace nifi { +namespace minifi { +namespace processors { + +const core::Property AttributesToJSON::AttributesList( + core::PropertyBuilder::createProperty("Attributes List") + ->withDescription("Comma separated list of attributes to be included in the resulting JSON. " + "If this value is left empty then all existing Attributes will be included. This list of attributes is case sensitive. " + "If an attribute specified in the list is not found it will be be emitted to the resulting JSON with an empty string or NULL value.") + ->build()); + +const core::Property AttributesToJSON::AttributesRegularExpression( + core::PropertyBuilder::createProperty("Attributes Regular Expression") + ->withDescription("Regular expression that will be evaluated against the flow file attributes to select the matching attributes. " + "Both the matching attributes and the selected attributes from the Attributes List property will be written in the resulting JSON.") + ->build()); + +const core::Property AttributesToJSON::Destination( + core::PropertyBuilder::createProperty("Destination") + ->withDescription("Control if JSON value is written as a new flowfile attribute 'JSONAttributes' or written in the flowfile content. " + "Writing to flowfile content will overwrite any existing flowfile content.") + ->isRequired(true) + ->withDefaultValue<std::string>(toString(WriteDestination::FLOWFILE_ATTRIBUTE)) + ->withAllowableValues<std::string>(WriteDestination::values()) + ->build()); + +const core::Property AttributesToJSON::IncludeCoreAttributes( + core::PropertyBuilder::createProperty("Include Core Attributes") + ->withDescription("Determines if the FlowFile core attributes which are contained in every FlowFile should be included in the final JSON value generated.") + ->isRequired(true) + ->withDefaultValue<bool>(true) + ->build()); + +const core::Property AttributesToJSON::NullValue( + core::PropertyBuilder::createProperty("Null Value") + ->withDescription("If true a non existing or empty attribute will be NULL in the resulting JSON. If false an empty string will be placed in the JSON.") + ->isRequired(true) + ->withDefaultValue<bool>(false) + ->build()); + +core::Relationship AttributesToJSON::Success("success", "All FlowFiles received are routed to success"); + +void AttributesToJSON::initialize() { + setSupportedProperties({ + AttributesList, + AttributesRegularExpression, + Destination, + IncludeCoreAttributes, + NullValue + }); + setSupportedRelationships({Success}); +} + +void AttributesToJSON::onSchedule(core::ProcessContext* context, core::ProcessSessionFactory* /*sessionFactory*/) { + std::string value; + if (context->getProperty(AttributesList.getName(), value) && !value.empty()) { + attribute_list_ = utils::StringUtils::splitAndTrimRemovingEmpty(value, ","); + } + if (context->getProperty(AttributesRegularExpression.getName(), value) && !value.empty()) { + attributes_regular_expression_ = std::regex(value); + } + write_destination_ = WriteDestination::parse(utils::parsePropertyWithAllowableValuesOrThrow(*context, Destination.getName(), WriteDestination::values()).c_str()); + context->getProperty(IncludeCoreAttributes.getName(), include_core_attributes_); + context->getProperty(NullValue.getName(), null_value_); +} + +bool AttributesToJSON::isCoreAttributeToBeFiltered(const std::string& attribute) const { + return !include_core_attributes_ && core_attributes_.find(attribute) != core_attributes_.end(); +} + +std::unordered_set<std::string> AttributesToJSON::getAttributesToBeWritten(const std::map<std::string, std::string>& flowfile_attributes) const { + std::unordered_set<std::string> attributes; + + for (const auto& attribute : attribute_list_) { + if (!isCoreAttributeToBeFiltered(attribute)) { + attributes.insert(attribute); + } + } + + if (attributes_regular_expression_) { + for (const auto& [key, value] : flowfile_attributes) { + if (!isCoreAttributeToBeFiltered(key) && std::regex_search(key, attributes_regular_expression_.value())) { Review comment: I think NiFi matches the regex against the whole attribute name, not only part of if. I would change `regex_search` to `regex_match` so we do the same. -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
