NIFI-3674 Adding EL support to regex properties and cleaning up property descriptions
This closes #1660. Signed-off-by: Bryan Bende <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/de67e5f7 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/de67e5f7 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/de67e5f7 Branch: refs/heads/master Commit: de67e5f7d5e294dee4df6e809fad8b7aa507468b Parents: ea6320d Author: Bryan Bende <[email protected]> Authored: Mon May 1 09:52:41 2017 -0400 Committer: Bryan Bende <[email protected]> Committed: Mon May 1 09:55:17 2017 -0400 ---------------------------------------------------------------------- .../nifi/reporting/AbstractSiteToSiteReportingTask.java | 6 +++--- .../apache/nifi/reporting/SiteToSiteStatusReportingTask.java | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/de67e5f7/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/AbstractSiteToSiteReportingTask.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/AbstractSiteToSiteReportingTask.java b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/AbstractSiteToSiteReportingTask.java index edf40ce..37ed737 100644 --- a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/AbstractSiteToSiteReportingTask.java +++ b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/AbstractSiteToSiteReportingTask.java @@ -44,7 +44,7 @@ public abstract class AbstractSiteToSiteReportingTask extends AbstractReportingT static final PropertyDescriptor DESTINATION_URL = new PropertyDescriptor.Builder() .name("Destination URL") - .description("The URL of the destination NiFi instance to send the Provenance Events to, " + + .description("The URL of the destination NiFi instance to send data to, " + "should be in the format http(s)://host:port/nifi.") .required(true) .expressionLanguageSupported(true) @@ -52,7 +52,7 @@ public abstract class AbstractSiteToSiteReportingTask extends AbstractReportingT .build(); static final PropertyDescriptor PORT_NAME = new PropertyDescriptor.Builder() .name("Input Port Name") - .description("The name of the Input Port to delivery Provenance Events to.") + .description("The name of the Input Port to deliver data to.") .required(true) .expressionLanguageSupported(true) .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) @@ -73,7 +73,7 @@ public abstract class AbstractSiteToSiteReportingTask extends AbstractReportingT .build(); static final PropertyDescriptor COMPRESS = new PropertyDescriptor.Builder() .name("Compress Events") - .description("Indicates whether or not to compress the events when being sent.") + .description("Indicates whether or not to compress the data being sent.") .required(true) .allowableValues("true", "false") .defaultValue("true") http://git-wip-us.apache.org/repos/asf/nifi/blob/de67e5f7/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/SiteToSiteStatusReportingTask.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/SiteToSiteStatusReportingTask.java b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/SiteToSiteStatusReportingTask.java index d94acc9..d5dace2 100644 --- a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/SiteToSiteStatusReportingTask.java +++ b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/SiteToSiteStatusReportingTask.java @@ -77,7 +77,7 @@ public class SiteToSiteStatusReportingTask extends AbstractSiteToSiteReportingTa .required(true) .expressionLanguageSupported(true) .defaultValue("(Processor|ProcessGroup|RemoteProcessGroup|RootProcessGroup|Connection|InputPort|OutputPort)") - .addValidator(StandardValidators.REGULAR_EXPRESSION_VALIDATOR) + .addValidator(StandardValidators.createRegexValidator(0, Integer.MAX_VALUE, true)) .build(); static final PropertyDescriptor COMPONENT_NAME_FILTER_REGEX = new PropertyDescriptor.Builder() .name("Component Name Filter Regex") @@ -85,7 +85,7 @@ public class SiteToSiteStatusReportingTask extends AbstractSiteToSiteReportingTa .required(true) .expressionLanguageSupported(true) .defaultValue(".*") - .addValidator(StandardValidators.REGULAR_EXPRESSION_VALIDATOR) + .addValidator(StandardValidators.createRegexValidator(0, Integer.MAX_VALUE, true)) .build(); private volatile Pattern componentTypeFilter; @@ -110,8 +110,8 @@ public class SiteToSiteStatusReportingTask extends AbstractSiteToSiteReportingTa return; } - componentTypeFilter = Pattern.compile(context.getProperty(COMPONENT_TYPE_FILTER_REGEX).getValue()); - componentNameFilter = Pattern.compile(context.getProperty(COMPONENT_NAME_FILTER_REGEX).getValue()); + componentTypeFilter = Pattern.compile(context.getProperty(COMPONENT_TYPE_FILTER_REGEX).evaluateAttributeExpressions().getValue()); + componentNameFilter = Pattern.compile(context.getProperty(COMPONENT_NAME_FILTER_REGEX).evaluateAttributeExpressions().getValue()); final ProcessGroupStatus procGroupStatus = context.getEventAccess().getControllerStatus(); final String rootGroupName = procGroupStatus == null ? null : procGroupStatus.getName();
