Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-3674 Adding EL support to regex properties and cleaning up property descriptions 

This closes #1660.

Signed-off-by: Bryan Bende <bbende@apache.org>
This commit is contained in:
Bryan Bende 2017-05-01 09:52:41 -04:00
parent ea6320d621
commit de67e5f7d5
No known key found for this signature in database
GPG Key ID: A0DDA9ED50711C39
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/AbstractSiteToSiteReportingTask.java
View File

@ -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")

8
nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/SiteToSiteStatusReportingTask.java
View File

@ -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();