NIFI-8206: Added identifiesExternalResource() method to PropertyDescriptor.Builder and implemented functionality.
- Updated components to make use of new feature
NIFI-8206: Added a ResourceType of TEXT. This requires that the ResourceReferenceFactory know which types are allowed in order to create the ResourceReference. PropertyValue needs to then have the PropertyDescriptor available to it. This resulted in highlighting many bugs in unit tests where components were not exposing property descriptors via getSupportedPropertyDescriptors() or were evaluating Expression Language using the wrong scope, so fixed many unit tests/components to properly declare Expression Language scope when using it
NIFI-8206: Removed problematic unit test that required directory names with special characters that are not allowed on some operating systems
This closes #4890.
Signed-off-by: Bryan Bende <bbende@apache.org>
diff --git a/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java b/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
index 29b6b67..e550b83 100644
--- a/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
+++ b/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
@@ -16,15 +16,23 @@
*/
package org.apache.nifi.components;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceDefinition;
+import org.apache.nifi.components.resource.ResourceReference;
+import org.apache.nifi.components.resource.StandardResourceReferenceFactory;
+import org.apache.nifi.components.resource.ResourceType;
+import org.apache.nifi.components.resource.StandardResourceDefinition;
+import org.apache.nifi.controller.ControllerService;
+import org.apache.nifi.expression.ExpressionLanguageScope;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
-import org.apache.nifi.controller.ControllerService;
-import org.apache.nifi.expression.ExpressionLanguageScope;
/**
* An immutable object for holding information about a type of component
@@ -110,6 +118,10 @@
*/
private final Set<PropertyDependency> dependencies;
+ /**
+ * The definition of the resource(s) that this property references
+ */
+ private final ResourceDefinition resourceDefinition;
protected PropertyDescriptor(final Builder builder) {
this.displayName = builder.displayName == null ? builder.name : builder.displayName;
@@ -126,6 +138,7 @@
this.controllerServiceDefinition = builder.controllerServiceDefinition;
this.validators = Collections.unmodifiableList(new ArrayList<>(builder.validators));
this.dependencies = builder.dependencies == null ? Collections.emptySet() : Collections.unmodifiableSet(new HashSet<>(builder.dependencies));
+ this.resourceDefinition = builder.resourceDefinition;
}
@Override
@@ -159,6 +172,17 @@
}
}
+ final ResourceDefinition resourceDefinition = getResourceDefinition();
+ if (resourceDefinition != null) {
+ final Validator validator = new ResourceDefinitionValidator(resourceDefinition, this.expressionLanguageScope);
+ final ValidationResult result = validator.validate(this.name, input, context);
+ if (!result.isValid()) {
+ return result;
+ }
+
+ lastResult = result;
+ }
+
for (final Validator validator : validators) {
lastResult = validator.validate(this.name, input, context);
if (!lastResult.isValid()) {
@@ -204,6 +228,7 @@
private boolean dynamic = false;
private boolean dynamicallyModifiesClasspath = false;
private Class<? extends ControllerService> controllerServiceDefinition;
+ private ResourceDefinition resourceDefinition;
private List<Validator> validators = new ArrayList<>();
public Builder fromPropertyDescriptor(final PropertyDescriptor specDescriptor) {
@@ -221,6 +246,7 @@
this.controllerServiceDefinition = specDescriptor.getControllerServiceDefinition();
this.validators = new ArrayList<>(specDescriptor.validators);
this.dependencies = new HashSet<>(specDescriptor.dependencies);
+ this.resourceDefinition = specDescriptor.resourceDefinition;
return this;
}
@@ -334,6 +360,8 @@
* to load required classes on an instance-by-instance basis
* (by calling {@link Class#forName(String, boolean, ClassLoader)} for example).
*
+ * Any property descriptor that dynamically modifies the classpath should also make use of the {@link #identifiesExternalResource(ResourceCardinality, ResourceType, ResourceType...)} method
+ * to indicate that the property descriptor references external resources and optionally restrict which types of resources and how many resources the property allows.
*
* @param dynamicallyModifiesClasspath whether or not this property should be used by the framework to modify the classpath
* @return the builder
@@ -454,6 +482,38 @@
}
/**
+ * Specifies that this property references one or more resources that are external to NiFi that the component is meant to consume.
+ * Any property descriptor that identifies an external resource will be automatically validated against the following rules:
+ * <ul>
+ * <li>If the ResourceCardinality is SINGLE, the given property value must be a file, a directory, or a URL that uses a protocol of http/https/file.</li>
+ * <li>The given resourceTypes dictate which types of input are allowed. For example, if <code>identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)</code>
+ * is used, the input must be a regular file. If <code>identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE, ResourceType.DIRECTORY)</code> is used, then the input
+ * must be exactly one file OR directory.
+ * </li>
+ * <li>If the ResourceCardinality is MULTIPLE, the given property value may consist of one or more resources, each separted by a comma and optional white space.</li>
+ * </ul>
+ *
+ * Generally, any property descriptor that makes use of the {@link #dynamicallyModifiesClasspath(boolean)} method to dynamically update its classpath should also
+ * make use of this method, specifying which types of resources are allowed and how many.
+ *
+ * @param cardinality specifies how many resources the property should allow
+ * @param resourceType the type of resource that is allowed
+ * @param additionalResourceTypes if more than one type of resource is allowed, any resource type in addition to the given resource type may be provided
+ * @return the builder
+ */
+ public Builder identifiesExternalResource(final ResourceCardinality cardinality, final ResourceType resourceType, final ResourceType... additionalResourceTypes) {
+ Objects.requireNonNull(cardinality);
+ Objects.requireNonNull(resourceType);
+
+ final Set<ResourceType> resourceTypes = new HashSet<>();
+ resourceTypes.add(resourceType);
+ resourceTypes.addAll(Arrays.asList(additionalResourceTypes));
+
+ this.resourceDefinition = new StandardResourceDefinition(cardinality, resourceTypes);
+ return this;
+ }
+
+ /**
* Establishes a relationship between this Property and the given property by declaring that this Property is only relevant if the given Property has a non-null value.
* Furthermore, if one or more explicit Allowable Values are provided, this Property will not be relevant unless the given Property's value is equal to one of the given Allowable Values.
* If this method is called multiple times, each with a different dependency, then a relationship is established such that this Property is relevant only if all dependencies are satisfied.
@@ -592,6 +652,10 @@
return dependencies;
}
+ public ResourceDefinition getResourceDefinition() {
+ return resourceDefinition;
+ }
+
@Override
public boolean equals(final Object other) {
if (other == null) {
@@ -665,4 +729,99 @@
return builder.build();
}
}
+
+ private static class ResourceDefinitionValidator implements Validator {
+ private final ResourceDefinition resourceDefinition;
+ private final ExpressionLanguageScope expressionLanguageScope;
+
+ public ResourceDefinitionValidator(final ResourceDefinition resourceDefinition, final ExpressionLanguageScope expressionLanguageScope) {
+ this.resourceDefinition = resourceDefinition;
+ this.expressionLanguageScope = expressionLanguageScope;
+ }
+
+ @Override
+ public ValidationResult validate(final String subject, final String configuredInput, final ValidationContext context) {
+ final ValidationResult.Builder resultBuilder = new ValidationResult.Builder()
+ .input(configuredInput)
+ .subject(subject);
+
+ if (configuredInput == null) {
+ return resultBuilder.valid(false)
+ .explanation("No value specified")
+ .build();
+ }
+
+ // If Expression Language is supported and is used in the property value, we cannot perform validation against the configured
+ // input unless the Expression Language is expressly limited to only variable registry. In that case, we can evaluate it and then
+ // validate the value after evaluating the Expression Language.
+ String input = configuredInput;
+ if (context.isExpressionLanguageSupported(subject) && context.isExpressionLanguagePresent(configuredInput)) {
+ if (expressionLanguageScope != null && expressionLanguageScope == ExpressionLanguageScope.VARIABLE_REGISTRY) {
+ input = context.newPropertyValue(configuredInput).evaluateAttributeExpressions().getValue();
+ resultBuilder.input(input);
+ } else {
+ return resultBuilder.valid(true)
+ .explanation("Expression Language is present, so validation of property value cannot be performed")
+ .build();
+ }
+ }
+
+ // If the property can be text, then there's nothing to validate. Anything that is entered may be valid.
+ // This will be improved in the future, by allowing the user to specify the type of resource that is being referenced.
+ // Until then, we will simply require that the component perform any necessary validation.
+ final boolean allowsText = resourceDefinition.getResourceTypes().contains(ResourceType.TEXT);
+ if (allowsText) {
+ return resultBuilder.valid(true)
+ .explanation("Property allows for Resource Type of Text, so validation of property value cannot be performed")
+ .build();
+ }
+
+ final String[] splits = input.split(",");
+ if (resourceDefinition.getCardinality() == ResourceCardinality.SINGLE && splits.length > 1) {
+ return resultBuilder.valid(false)
+ .explanation("Property only supports a single Resource but " + splits.length + " resources were specified")
+ .build();
+ }
+
+ final Set<ResourceType> resourceTypes = resourceDefinition.getResourceTypes();
+ final List<String> nonExistentResources = new ArrayList<>();
+
+ int count = 0;
+ for (final String split : splits) {
+ final ResourceReference resourceReference = new StandardResourceReferenceFactory().createResourceReference(split, resourceDefinition);
+ if (resourceReference == null) {
+ continue;
+ }
+
+ count++;
+
+ final boolean accessible = resourceReference.isAccessible();
+ if (!accessible) {
+ nonExistentResources.add(resourceReference.getLocation());
+ continue;
+ }
+
+ if (!resourceTypes.contains(resourceReference.getResourceType())) {
+ return resultBuilder.valid(false)
+ .explanation("Specified Resource is a " + resourceReference.getResourceType().name() + " but this property does not allow this type of resource")
+ .build();
+ }
+ }
+
+ if (count == 0) {
+ return resultBuilder.valid(false)
+ .explanation("No resources were specified")
+ .build();
+ }
+
+ if (!nonExistentResources.isEmpty()) {
+ return resultBuilder.valid(false)
+ .explanation("The specified resource(s) do not exist or could not be accessed: " + nonExistentResources)
+ .build();
+ }
+
+ return resultBuilder.valid(true)
+ .build();
+ }
+ }
}
diff --git a/nifi-api/src/main/java/org/apache/nifi/components/PropertyValue.java b/nifi-api/src/main/java/org/apache/nifi/components/PropertyValue.java
index edafaee..4e291e9 100644
--- a/nifi-api/src/main/java/org/apache/nifi/components/PropertyValue.java
+++ b/nifi-api/src/main/java/org/apache/nifi/components/PropertyValue.java
@@ -16,8 +16,8 @@
*/
package org.apache.nifi.components;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
+import org.apache.nifi.components.resource.ResourceReference;
+import org.apache.nifi.components.resource.ResourceReferences;
import org.apache.nifi.controller.ControllerService;
import org.apache.nifi.expression.AttributeValueDecorator;
import org.apache.nifi.flowfile.FlowFile;
@@ -25,6 +25,9 @@
import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.registry.VariableRegistry;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
/**
* <p>
* A PropertyValue provides a mechanism whereby the currently configured value
@@ -113,6 +116,18 @@
<T extends ControllerService> T asControllerService(Class<T> serviceType) throws IllegalArgumentException;
/**
+ * @return a ResourceReference for the configured property value, or <code>null</code> if no value was specified, or if the property references multiple resources.
+ * @see #asResources()
+ */
+ ResourceReference asResource();
+
+ /**
+ * @return a ResourceReferences for the configured property value. If no property value is set, a ResourceRferences will be returned that references no resources.
+ * I.e., this method will never return <code>null</code>.
+ */
+ ResourceReferences asResources();
+
+ /**
* @return <code>true</code> if the user has configured a value, or if the
* {@link PropertyDescriptor} for the associated property has a default
* value, <code>false</code> otherwise
diff --git a/nifi-api/src/main/java/org/apache/nifi/components/resource/FileResourceReference.java b/nifi-api/src/main/java/org/apache/nifi/components/resource/FileResourceReference.java
new file mode 100644
index 0000000..65fc167
--- /dev/null
+++ b/nifi-api/src/main/java/org/apache/nifi/components/resource/FileResourceReference.java
@@ -0,0 +1,100 @@
+/*
+ * 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.
+ */
+
+package org.apache.nifi.components.resource;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Objects;
+
+public class FileResourceReference implements ResourceReference {
+ private final File file;
+ private final ResourceType resourceType;
+
+ public FileResourceReference(final File file) {
+ this.file = Objects.requireNonNull(file);
+ this.resourceType = file.isDirectory() ? ResourceType.DIRECTORY : ResourceType.FILE;
+ }
+
+ @Override
+ public File asFile() {
+ return file;
+ }
+
+ @Override
+ public URL asURL() {
+ try {
+ return file.toURI().toURL();
+ } catch (final MalformedURLException e) {
+ throw new AssertionError("File " + file.getAbsolutePath() + " cannot be represented as a URL"); // we won't encounter this.
+ }
+ }
+
+ @Override
+ public InputStream read() throws IOException {
+ if (resourceType != ResourceType.FILE) {
+ throw new FileNotFoundException("Could not read from file with name " + file.getAbsolutePath() + " because that references a directory");
+ }
+
+ return new FileInputStream(file);
+ }
+
+ @Override
+ public boolean isAccessible() {
+ return file.exists() && file.canRead();
+ }
+
+ @Override
+ public String getLocation() {
+ return file.getAbsolutePath();
+ }
+
+ @Override
+ public ResourceType getResourceType() {
+ return resourceType;
+ }
+
+ @Override
+ public boolean equals(final Object o) {
+ if (this == o) {
+ return true;
+ }
+
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ final FileResourceReference that = (FileResourceReference) o;
+ return Objects.equals(file, that.file)
+ && resourceType == that.resourceType;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(file, resourceType);
+ }
+
+ @Override
+ public String toString() {
+ return "FileResourceReference[file=" + file + ", resourceType=" + resourceType + "]";
+ }
+}
diff --git a/nifi-api/src/main/java/org/apache/nifi/components/resource/ResourceCardinality.java b/nifi-api/src/main/java/org/apache/nifi/components/resource/ResourceCardinality.java
new file mode 100644
index 0000000..1563df7
--- /dev/null
+++ b/nifi-api/src/main/java/org/apache/nifi/components/resource/ResourceCardinality.java
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+package org.apache.nifi.components.resource;
+
+/**
+ * Indicates the cardinality of how many resources can be referenced by a given property.
+ */
+public enum ResourceCardinality {
+
+ /**
+ * Exactly one resource must be specified
+ */
+ SINGLE,
+
+ /**
+ * One or more resources may be supplied, as a comma-separated list
+ */
+ MULTIPLE;
+}
diff --git a/nifi-api/src/main/java/org/apache/nifi/components/resource/ResourceContext.java b/nifi-api/src/main/java/org/apache/nifi/components/resource/ResourceContext.java
new file mode 100644
index 0000000..bf02c59
--- /dev/null
+++ b/nifi-api/src/main/java/org/apache/nifi/components/resource/ResourceContext.java
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+package org.apache.nifi.components.resource;
+
+import org.apache.nifi.components.PropertyDescriptor;
+
+/**
+ * Provides the context in which a Reference Reference is to be evaluated
+ */
+public interface ResourceContext {
+ /**
+ * @return a ResourceReferenceFactory that can be used to parse a property value into a {@link ResourceReference} or {@link ResourceReferences}
+ */
+ ResourceReferenceFactory getResourceReferenceFactory();
+
+ /**
+ * @return the PropertyDescriptor that describes the property whose value may be a resource
+ */
+ PropertyDescriptor getPropertyDescriptor();
+}
diff --git a/nifi-api/src/main/java/org/apache/nifi/components/resource/ResourceDefinition.java b/nifi-api/src/main/java/org/apache/nifi/components/resource/ResourceDefinition.java
new file mode 100644
index 0000000..b91065e
--- /dev/null
+++ b/nifi-api/src/main/java/org/apache/nifi/components/resource/ResourceDefinition.java
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+
+package org.apache.nifi.components.resource;
+
+import java.util.Set;
+
+/**
+ * Defines the number and types of resources that allowed to be referenced by a component property
+ */
+public interface ResourceDefinition {
+
+ /**
+ * Specifies the number of resources that should be reference-able by a component property
+ * @return the cardinality for the number of resources that should be referenced
+ */
+ ResourceCardinality getCardinality();
+
+ /**
+ * @return the types of resources that are allowed to be referenced
+ */
+ Set<ResourceType> getResourceTypes();
+}
diff --git a/nifi-api/src/main/java/org/apache/nifi/components/resource/ResourceReference.java b/nifi-api/src/main/java/org/apache/nifi/components/resource/ResourceReference.java
new file mode 100644
index 0000000..49b95d3
--- /dev/null
+++ b/nifi-api/src/main/java/org/apache/nifi/components/resource/ResourceReference.java
@@ -0,0 +1,66 @@
+/*
+ * 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.
+ */
+
+package org.apache.nifi.components.resource;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+
+/**
+ * A reference to a Resource that is identified by a property value
+ */
+public interface ResourceReference {
+
+ /**
+ * @return a file representation of the resource, or <code>null</code> if the Resource cannot be represented as a File
+ */
+ File asFile();
+
+ /**
+ * @return a URL representation of the resource, or <code>null</code> if the Resource cannot be represented as a URL
+ */
+ URL asURL();
+
+ /**
+ * @return an InputStream to read the contents of the resource
+ *
+ * @throws IOException if unable to obtain an InputStream from the resource
+ */
+ InputStream read() throws IOException;
+
+ /**
+ * Indicates whether or not the resource is accessible. What it means for the resource to be accessible depends on the type of
+ * resource. A File resource, for example, might be accessible only if the file exists and is readable, while a URL resource might
+ * always be considered accessible, or might be accesssible only if the existence of the resource can be confirmed.
+ *
+ * @return <code>true</code> if the file can be accessed, <code>false</code> otherwise
+ */
+ boolean isAccessible();
+
+ /**
+ * @return a String representation of the location, or <code>null</code> for a Resource that does not have an external location.
+ * For a File or a Directory, this will be the full path name; for a URL it will be the String form of the URL
+ */
+ String getLocation();
+
+ /**
+ * @return the type of resource that is being referenced
+ */
+ ResourceType getResourceType();
+}
diff --git a/nifi-api/src/main/java/org/apache/nifi/components/resource/ResourceReferenceFactory.java b/nifi-api/src/main/java/org/apache/nifi/components/resource/ResourceReferenceFactory.java
new file mode 100644
index 0000000..67b056e
--- /dev/null
+++ b/nifi-api/src/main/java/org/apache/nifi/components/resource/ResourceReferenceFactory.java
@@ -0,0 +1,24 @@
+/*
+ * 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.
+ */
+
+package org.apache.nifi.components.resource;
+
+public interface ResourceReferenceFactory {
+ ResourceReference createResourceReference(String value, ResourceDefinition resourceDefinition);
+
+ ResourceReferences createResourceReferences(String value, ResourceDefinition resourceDefinition);
+}
diff --git a/nifi-api/src/main/java/org/apache/nifi/components/resource/ResourceReferences.java b/nifi-api/src/main/java/org/apache/nifi/components/resource/ResourceReferences.java
new file mode 100644
index 0000000..5addba0
--- /dev/null
+++ b/nifi-api/src/main/java/org/apache/nifi/components/resource/ResourceReferences.java
@@ -0,0 +1,73 @@
+/*
+ * 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.
+ */
+
+package org.apache.nifi.components.resource;
+
+import java.net.URL;
+import java.util.List;
+
+/**
+ * A representation of zero or more {@link ResourceReference}s
+ */
+public interface ResourceReferences {
+
+ /**
+ * @return a List representation of all Resource References
+ */
+ List<ResourceReference> asList();
+
+ /**
+ * @return a list of all Resource References' locations
+ */
+ List<String> asLocations();
+
+ /**
+ * @return a list of all Resource References' URLs
+ */
+ List<URL> asURLs();
+
+ /**
+ * @return the number of Resource References held
+ */
+ int getCount();
+
+ /**
+ * Iterates through the Resource References and for any reference that may represent more than one
+ * resource, flattens the resource into a List of single-entity references. For example, consider that this ResourceReferences
+ * holds a single ResourceReference, of type DIRECTORY and the referenced directory contains 10 files. Calling {@link #asList()} would
+ * return a single ResourceReference. But calling <code>flatten()</code> would return a new ResourceReferences type whose {@link #asList()}
+ * method would return 10 ResourceReference objects, each with a ResourceType of FILE. The flatten operation is not recursive, meaning that if
+ * a DIRECTORY is flattened, any sub-directories will be dropped. If the contents of the subdirectories are to be retained, use {@link #flattenRecursively()}
+ * instead.
+ *
+ * @return a flattened ResourceReferences
+ */
+ ResourceReferences flatten();
+
+ /**
+ * Recursively iterates through the Resource References and for any reference that may represent more than one
+ * resource, flattens the resource into a List of single-entity references. For example, consider that this ResourceReferences
+ * holds a single ResourceReference, of type DIRECTORY and the referenced directory contains 10 files. Calling {@link #asList()} would
+ * return a single ResourceReference. But calling <code>flatten()</code> would return a new ResourceReferences type whose {@link #asList()}
+ * method would return 10 ResourceReference objects, each with a ResourceType of FILE. The flatten operation is recursive, meaning that if
+ * a DIRECTORY is encountered, its reference will be replaced with a new reference for each file, even if that file exists 100 levels deep
+ * in the directory structure.
+ *
+ * @return a flattened ResourceReferences
+ */
+ ResourceReferences flattenRecursively();
+}
diff --git a/nifi-api/src/main/java/org/apache/nifi/components/resource/ResourceType.java b/nifi-api/src/main/java/org/apache/nifi/components/resource/ResourceType.java
new file mode 100644
index 0000000..60eff90
--- /dev/null
+++ b/nifi-api/src/main/java/org/apache/nifi/components/resource/ResourceType.java
@@ -0,0 +1,51 @@
+/*
+ * 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.
+ */
+
+package org.apache.nifi.components.resource;
+
+public enum ResourceType {
+ /**
+ * Referenced Resource is a File on a local (or mounted) file system
+ */
+ FILE("file"),
+
+ /**
+ * Referenced Resource is a directory on a local (or mounted) file system
+ */
+ DIRECTORY("directory"),
+
+ /**
+ * Referenced Resource is UTF-8 text, rather than an external entity
+ */
+ TEXT("text"),
+
+ /**
+ * Referenced Resource is a URL that uses the HTTP, HTTPS, or file protocol
+ * (i.e., <code>http://...</code>, <code>https://...</code>, or <code>file:...</code>)
+ */
+ URL("URL");
+
+ private final String prettyPrintName;
+ ResourceType(final String prettyPrintName) {
+ this.prettyPrintName = prettyPrintName;
+ }
+
+ @Override
+ public String toString() {
+ return prettyPrintName;
+ }
+}
diff --git a/nifi-api/src/main/java/org/apache/nifi/components/resource/StandardResourceContext.java b/nifi-api/src/main/java/org/apache/nifi/components/resource/StandardResourceContext.java
new file mode 100644
index 0000000..4e1fa6b
--- /dev/null
+++ b/nifi-api/src/main/java/org/apache/nifi/components/resource/StandardResourceContext.java
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+
+package org.apache.nifi.components.resource;
+
+import org.apache.nifi.components.PropertyDescriptor;
+
+public class StandardResourceContext implements ResourceContext {
+ private final ResourceReferenceFactory resourceReferenceFactory;
+ private final PropertyDescriptor propertyDescriptor;
+
+ public StandardResourceContext(final ResourceReferenceFactory resourceReferenceFactory, final PropertyDescriptor propertyDescriptor) {
+ this.resourceReferenceFactory = resourceReferenceFactory;
+ this.propertyDescriptor = propertyDescriptor;
+ }
+
+ @Override
+ public ResourceReferenceFactory getResourceReferenceFactory() {
+ return resourceReferenceFactory;
+ }
+
+ @Override
+ public PropertyDescriptor getPropertyDescriptor() {
+ return propertyDescriptor;
+ }
+}
diff --git a/nifi-api/src/main/java/org/apache/nifi/components/resource/StandardResourceDefinition.java b/nifi-api/src/main/java/org/apache/nifi/components/resource/StandardResourceDefinition.java
new file mode 100644
index 0000000..125dcbf
--- /dev/null
+++ b/nifi-api/src/main/java/org/apache/nifi/components/resource/StandardResourceDefinition.java
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+
+package org.apache.nifi.components.resource;
+
+import java.util.Set;
+
+public class StandardResourceDefinition implements ResourceDefinition {
+ private final ResourceCardinality cardinality;
+ private final Set<ResourceType> resourceTypes;
+
+ public StandardResourceDefinition(final ResourceCardinality cardinality, final Set<ResourceType> resourceTypes) {
+ this.cardinality = cardinality;
+ this.resourceTypes = resourceTypes;
+ }
+
+ @Override
+ public ResourceCardinality getCardinality() {
+ return cardinality;
+ }
+
+ @Override
+ public Set<ResourceType> getResourceTypes() {
+ return resourceTypes;
+ }
+}
diff --git a/nifi-api/src/main/java/org/apache/nifi/components/resource/StandardResourceReferenceFactory.java b/nifi-api/src/main/java/org/apache/nifi/components/resource/StandardResourceReferenceFactory.java
new file mode 100644
index 0000000..acc85e5
--- /dev/null
+++ b/nifi-api/src/main/java/org/apache/nifi/components/resource/StandardResourceReferenceFactory.java
@@ -0,0 +1,128 @@
+/*
+ * 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.
+ */
+
+package org.apache.nifi.components.resource;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+public class StandardResourceReferenceFactory implements ResourceReferenceFactory {
+
+ public ResourceReferences createResourceReferences(final String value, final ResourceDefinition resourceDefinition) {
+ if (value == null) {
+ return new StandardResourceReferences(Collections.emptyList());
+ }
+
+ final String trimmed = value.trim();
+ if (trimmed.isEmpty()) {
+ return null;
+ }
+
+ if (resourceDefinition == null) {
+ return null;
+ }
+
+ final List<ResourceReference> references;
+ final List<String> locations = parseResourceLocations(value);
+ references = new ArrayList<>(locations.size());
+ locations.forEach(location -> references.add(createResourceReference(location, resourceDefinition)));
+
+ return new StandardResourceReferences(references);
+ }
+
+ public ResourceReference createResourceReference(final String value, final ResourceDefinition resourceDefinition) {
+ if (value == null) {
+ return null;
+ }
+
+ final String trimmed = value.trim();
+ if (trimmed.isEmpty()) {
+ return null;
+ }
+
+ if (resourceDefinition == null) {
+ return null;
+ }
+
+ final Set<ResourceType> allowedResourceTypes = resourceDefinition.getResourceTypes();
+ if (allowedResourceTypes.contains(ResourceType.URL)) {
+ try {
+ if (trimmed.startsWith("http://") || trimmed.startsWith("https://")) {
+ return new URLResourceReference(new URL(trimmed));
+ }
+
+ if (trimmed.startsWith("file:")) {
+ final URL url = new URL(trimmed);
+ final String filename = url.getFile();
+ final File file = new File(filename);
+ return new FileResourceReference(file);
+ }
+ } catch (MalformedURLException e) {
+ throw new IllegalArgumentException("Invalid URL: " + trimmed);
+ }
+ }
+
+ final boolean fileAllowed = allowedResourceTypes.contains(ResourceType.FILE) || allowedResourceTypes.contains(ResourceType.DIRECTORY);
+ final boolean textAllowed = allowedResourceTypes.contains(ResourceType.TEXT);
+
+ if (fileAllowed && textAllowed) {
+ // We have to make a determination whether this is a file or text. Eventually, it will be best if the user tells us explicitly.
+ // For now, we will make a determination based on a couple of simple rules.
+ final File file = new File(trimmed);
+ if (file.isAbsolute() || file.exists()) {
+ return new FileResourceReference(file);
+ }
+
+ if (trimmed.startsWith("./") || trimmed.startsWith(".\\")) {
+ return new FileResourceReference(file);
+ }
+
+ return new Utf8TextResource(value); // Use explicit value, not trimmed value, as the white space may be important for textual content.
+ }
+
+ if (fileAllowed) {
+ final File file = new File(trimmed);
+ return new FileResourceReference(file);
+ }
+
+ if (textAllowed) {
+ return new Utf8TextResource(value);
+ }
+
+ return null;
+ }
+
+ private List<String> parseResourceLocations(final String rawValue) {
+ final List<String> resourceLocations = new ArrayList<>();
+ final String[] splits = rawValue.split(",");
+ for (final String split : splits) {
+ final String trimmed = split.trim();
+ if (trimmed.isEmpty()) {
+ continue;
+ }
+
+ resourceLocations.add(trimmed);
+ }
+
+ return resourceLocations;
+ }
+}
diff --git a/nifi-api/src/main/java/org/apache/nifi/components/resource/StandardResourceReferences.java b/nifi-api/src/main/java/org/apache/nifi/components/resource/StandardResourceReferences.java
new file mode 100644
index 0000000..0b240be
--- /dev/null
+++ b/nifi-api/src/main/java/org/apache/nifi/components/resource/StandardResourceReferences.java
@@ -0,0 +1,154 @@
+/*
+ * 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.
+ */
+
+package org.apache.nifi.components.resource;
+
+import java.io.File;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+public class StandardResourceReferences implements ResourceReferences {
+ public List<ResourceReference> resourceReferences;
+
+ public StandardResourceReferences(final List<ResourceReference> resourceReferences) {
+ this.resourceReferences = Objects.requireNonNull(resourceReferences);
+ }
+
+ @Override
+ public List<ResourceReference> asList() {
+ return Collections.unmodifiableList(resourceReferences);
+ }
+
+ @Override
+ public List<String> asLocations() {
+ final List<String> locations = new ArrayList<>(resourceReferences.size());
+ resourceReferences.forEach(ref -> locations.add(ref.getLocation()));
+ return locations;
+ }
+
+ @Override
+ public List<URL> asURLs() {
+ final List<URL> locations = new ArrayList<>(resourceReferences.size());
+ resourceReferences.forEach(ref -> locations.add(ref.asURL()));
+ return locations;
+ }
+
+ @Override
+ public int getCount() {
+ return resourceReferences.size();
+ }
+
+ @Override
+ public ResourceReferences flatten() {
+ if (resourceReferences.isEmpty()) {
+ return this;
+ }
+
+ final List<ResourceReference> flattened = new ArrayList<>();
+ resourceReferences.forEach(reference -> {
+ if (reference.getResourceType() == ResourceType.DIRECTORY) {
+ addChildren(reference.asFile(), flattened);
+ } else {
+ flattened.add(reference);
+ }
+ });
+
+ return new StandardResourceReferences(flattened);
+ }
+
+ private void addChildren(final File file, final List<ResourceReference> flattened) {
+ if (file == null) {
+ return;
+ }
+
+ if (file.isDirectory()) {
+ final File[] children = file.listFiles();
+ if (children != null) {
+ for (final File child : children) {
+ if (child.isFile()) {
+ flattened.add(new FileResourceReference(child));
+ }
+ }
+ }
+ } else {
+ flattened.add(new FileResourceReference(file));
+ }
+ }
+
+
+ @Override
+ public ResourceReferences flattenRecursively() {
+ if (resourceReferences.isEmpty()) {
+ return this;
+ }
+
+ final List<ResourceReference> flattened = new ArrayList<>();
+ resourceReferences.forEach(reference -> {
+ if (reference.getResourceType() == ResourceType.DIRECTORY) {
+ recurse(reference.asFile(), flattened);
+ } else {
+ flattened.add(reference);
+ }
+ });
+
+ return new StandardResourceReferences(flattened);
+ }
+
+ private void recurse(final File file, final List<ResourceReference> flattened) {
+ if (file == null) {
+ return;
+ }
+
+ if (file.isDirectory()) {
+ final File[] children = file.listFiles();
+ if (children != null) {
+ for (final File child : children) {
+ recurse(child, flattened);
+ }
+ }
+ } else {
+ flattened.add(new FileResourceReference(file));
+ }
+ }
+
+ @Override
+ public boolean equals(final Object o) {
+ if (this == o) {
+ return true;
+ }
+
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ final StandardResourceReferences that = (StandardResourceReferences) o;
+ return Objects.equals(resourceReferences, that.resourceReferences);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(resourceReferences);
+ }
+
+ @Override
+ public String toString() {
+ return "StandardResourceReferences[resources=" + resourceReferences + "]";
+ }
+}
diff --git a/nifi-api/src/main/java/org/apache/nifi/components/resource/URLResourceReference.java b/nifi-api/src/main/java/org/apache/nifi/components/resource/URLResourceReference.java
new file mode 100644
index 0000000..8b5f7f7
--- /dev/null
+++ b/nifi-api/src/main/java/org/apache/nifi/components/resource/URLResourceReference.java
@@ -0,0 +1,67 @@
+/*
+ * 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.
+ */
+
+package org.apache.nifi.components.resource;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+
+public class URLResourceReference implements ResourceReference {
+ private final URL url;
+
+ public URLResourceReference(final URL url) {
+ this.url = url;
+ }
+
+ @Override
+ public File asFile() {
+ return null;
+ }
+
+ @Override
+ public URL asURL() {
+ return url;
+ }
+
+ @Override
+ public InputStream read() throws IOException {
+ return url.openStream();
+ }
+
+ @Override
+ public boolean isAccessible() {
+ return true;
+ }
+
+ @Override
+ public String getLocation() {
+ return url.toExternalForm();
+ }
+
+ @Override
+ public ResourceType getResourceType() {
+ return ResourceType.URL;
+ }
+
+ @Override
+ public String toString() {
+ return "URLResourceReference[url=" + url + "]";
+ }
+
+}
diff --git a/nifi-api/src/main/java/org/apache/nifi/components/resource/Utf8TextResource.java b/nifi-api/src/main/java/org/apache/nifi/components/resource/Utf8TextResource.java
new file mode 100644
index 0000000..78f94e9
--- /dev/null
+++ b/nifi-api/src/main/java/org/apache/nifi/components/resource/Utf8TextResource.java
@@ -0,0 +1,68 @@
+/*
+ * 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.
+ */
+
+package org.apache.nifi.components.resource;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+
+public class Utf8TextResource implements ResourceReference {
+ private final String text;
+
+ public Utf8TextResource(final String text) {
+ this.text = text;
+ }
+
+ @Override
+ public File asFile() {
+ return null;
+ }
+
+ @Override
+ public URL asURL() {
+ return null;
+ }
+
+ @Override
+ public InputStream read() throws IOException {
+ return new ByteArrayInputStream(text.getBytes(StandardCharsets.UTF_8));
+ }
+
+ @Override
+ public boolean isAccessible() {
+ return true;
+ }
+
+ @Override
+ public String getLocation() {
+ return null;
+ }
+
+ @Override
+ public ResourceType getResourceType() {
+ return ResourceType.TEXT;
+ }
+
+ @Override
+ public String toString() {
+ return "Utf8TextResource[text=" + text.length() + " characters]";
+ }
+}
diff --git a/nifi-api/src/main/java/org/apache/nifi/documentation/xml/XmlDocumentationWriter.java b/nifi-api/src/main/java/org/apache/nifi/documentation/xml/XmlDocumentationWriter.java
index abaab37..e24b53a 100644
--- a/nifi-api/src/main/java/org/apache/nifi/documentation/xml/XmlDocumentationWriter.java
+++ b/nifi-api/src/main/java/org/apache/nifi/documentation/xml/XmlDocumentationWriter.java
@@ -16,19 +16,6 @@
*/
package org.apache.nifi.documentation.xml;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Function;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
import org.apache.nifi.annotation.behavior.DynamicProperty;
import org.apache.nifi.annotation.behavior.DynamicRelationship;
import org.apache.nifi.annotation.behavior.InputRequirement;
@@ -45,11 +32,27 @@
import org.apache.nifi.components.PropertyDependency;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.RequiredPermission;
+import org.apache.nifi.components.resource.ResourceDefinition;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.documentation.AbstractDocumentationWriter;
import org.apache.nifi.documentation.ExtensionType;
import org.apache.nifi.documentation.ServiceAPI;
import org.apache.nifi.processor.Relationship;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+
/**
* XML-based implementation of DocumentationWriter
*
@@ -177,11 +180,25 @@
writeTextElement("expressionLanguageScope", property.getExpressionLanguageScope() == null ? null : property.getExpressionLanguageScope().name());
writeBooleanElement("dynamicallyModifiesClasspath", property.isDynamicClasspathModifier());
writeBooleanElement("dynamic", property.isDynamic());
+ writeResourceDefinition(property.getResourceDefinition());
writeDependencies(property);
writeEndElement();
}
+ private void writeResourceDefinition(final ResourceDefinition resourceDefinition) throws IOException {
+ writeStartElement("resourceDefinition");
+ if (resourceDefinition != null) {
+ writeTextElement("cardinality", resourceDefinition.getCardinality().name());
+ writeArray("resourceTypes", resourceDefinition.getResourceTypes(), this::writeResourceType);
+ }
+ writeEndElement();
+ }
+
+ private void writeResourceType(final ResourceType resourceType) throws IOException {
+ writeTextElement("resourceType", resourceType.name());
+ }
+
private void writeAllowableValue(final AllowableValue allowableValue) throws IOException {
writeStartElement("allowableValue");
writeTextElement("displayName", allowableValue.getDisplayName());
diff --git a/nifi-api/src/test/java/org/apache/nifi/components/TestPropertyDescriptor.java b/nifi-api/src/test/java/org/apache/nifi/components/TestPropertyDescriptor.java
index e3043be..edeab30 100644
--- a/nifi-api/src/test/java/org/apache/nifi/components/TestPropertyDescriptor.java
+++ b/nifi-api/src/test/java/org/apache/nifi/components/TestPropertyDescriptor.java
@@ -16,13 +16,24 @@
*/
package org.apache.nifi.components;
-import static org.junit.Assert.assertNotNull;
-
import org.apache.nifi.components.PropertyDescriptor.Builder;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
+import org.apache.nifi.expression.ExpressionLanguageScope;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.anyString;
/**
* Regression test for issue NIFI-49, to ensure that if a Processor's Property's
@@ -56,4 +67,75 @@
public void testNoExceptionThrownByPropertyDescriptorWithValidDefaultValue() {
assertNotNull(validDescriptorBuilder.build());
}
+
+ @Test
+ public void testExternalResourceIgnoredIfELWithAttributesPresent() {
+ final PropertyDescriptor descriptor = new PropertyDescriptor.Builder()
+ .name("dir")
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
+ .expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
+ .required(false)
+ .build();
+
+ final ValidationContext validationContext = Mockito.mock(ValidationContext.class);
+ Mockito.when(validationContext.isExpressionLanguagePresent(anyString())).thenReturn(true);
+ Mockito.when(validationContext.isExpressionLanguageSupported(anyString())).thenReturn(true);
+ Mockito.when(validationContext.newPropertyValue(anyString())).thenAnswer(new Answer<Object>() {
+ @Override
+ public Object answer(final InvocationOnMock invocation) throws Throwable {
+ final String inputArg = invocation.getArgument(0);
+ return inputArg.replace("${TestPropertyDescriptor.Var1}", "__my_var__").replaceAll("\\$\\{.*}", "");
+ }
+ });
+
+ assertTrue(descriptor.validate("${TestPropertyDescriptor.Var1}", validationContext).isValid());
+ }
+
+ @Test
+ public void testExternalResourceConsideredIfELVarRegistryPresent() {
+ final PropertyDescriptor descriptor = new PropertyDescriptor.Builder()
+ .name("dir")
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE, ResourceType.DIRECTORY)
+ .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
+ .required(false)
+ .build();
+
+ final AtomicReference<String> variable = new AtomicReference<>("__my_var__");
+ final ValidationContext validationContext = Mockito.mock(ValidationContext.class);
+ Mockito.when(validationContext.isExpressionLanguagePresent(anyString())).thenReturn(true);
+ Mockito.when(validationContext.isExpressionLanguageSupported(anyString())).thenReturn(true);
+ Mockito.when(validationContext.newPropertyValue(anyString())).thenAnswer(new Answer<Object>() {
+ @Override
+ public Object answer(final InvocationOnMock invocation) {
+ final String inputArg = invocation.getArgument(0);
+ final String evaluatedValue = inputArg.replace("${TestPropertyDescriptor.Var1}", variable.get().replaceAll("\\$\\{.*}", ""));
+
+ final PropertyValue propertyValue = Mockito.mock(PropertyValue.class);
+ Mockito.when(propertyValue.getValue()).thenReturn(evaluatedValue);
+ Mockito.when(propertyValue.evaluateAttributeExpressions()).thenReturn(propertyValue);
+ return propertyValue;
+ }
+ });
+
+ // Should not be valid because Expression Language scope is VARIABLE_REGISTRY, so the ${TestPropertyDescriptor.Var1} will be replaced with
+ // __my_var__, and __my_var__ does not exist.
+ assertFalse(descriptor.validate("${TestPropertyDescriptor.Var1}", validationContext).isValid());
+
+ // Will now be valid because variable changed to 'target', which does exist.
+ variable.set("target");
+ assertTrue(descriptor.validate("${TestPropertyDescriptor.Var1}", validationContext).isValid());
+
+ // Consider if Expression Language is not supported.
+ Mockito.when(validationContext.isExpressionLanguageSupported(anyString())).thenReturn(false);
+ final PropertyDescriptor withElNotAllowed = new PropertyDescriptor.Builder()
+ .fromPropertyDescriptor(descriptor)
+ .expressionLanguageSupported(ExpressionLanguageScope.NONE)
+ .build();
+
+ // Expression will not be evaluated, so the directory being looked at will literally be ${TestPropertyDescriptor.Var1}
+ assertFalse(withElNotAllowed.validate("${TestPropertyDescriptor.Var1}", validationContext).isValid());
+
+ // Test the literal value 'target'
+ assertTrue(withElNotAllowed.validate("target", validationContext).isValid());
+ }
}
diff --git a/nifi-api/src/test/java/org/apache/nifi/components/resource/TestStandardResourceReferences.java b/nifi-api/src/test/java/org/apache/nifi/components/resource/TestStandardResourceReferences.java
new file mode 100644
index 0000000..1ce4f0044
--- /dev/null
+++ b/nifi-api/src/test/java/org/apache/nifi/components/resource/TestStandardResourceReferences.java
@@ -0,0 +1,163 @@
+/*
+ * 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.
+ */
+
+package org.apache.nifi.components.resource;
+
+import org.junit.Test;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static junit.framework.TestCase.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class TestStandardResourceReferences {
+
+ @Test
+ public void testAsURLs() {
+ final ResourceReferences references = new StandardResourceReferences(Arrays.asList(
+ new FileResourceReference(new File("target/1.txt")),
+ new FileResourceReference(new File("target/2.txt"))
+ ));
+
+ final List<URL> urls = references.asURLs();
+ assertEquals(2, urls.size());
+ for (final URL url : urls) {
+ final String filename = url.getFile();
+ assertTrue(filename.endsWith(".txt"));
+
+ final File parentFile = new File(filename).getParentFile();
+ assertEquals("target", parentFile.getName());
+ }
+ }
+
+ @Test
+ public void testFlattenRecursively() throws IOException {
+ // Create directory structure:
+ // target/dirs/
+ // target/dirs/0
+ // target/dirs/0/0
+ // target/dirs/0/0/0.txt
+ // target/dirs/0/0/1.txt
+ // ...
+ // target/dirs/2/2/2.txt
+ final int numDirs = 3;
+ final int numSubDirs = 3;
+ final int numFiles = 3;
+
+ final File baseDir = new File("target/dirs");
+ for (int i=0; i < numDirs; i++) {
+ final File dir = new File(baseDir, String.valueOf(i));
+ dir.mkdirs();
+
+ for (int j=0; j < numSubDirs; j++) {
+ final File subdir = new File(dir, String.valueOf(j));
+ subdir.mkdirs();
+
+ for (int k=0; k < numFiles; k++) {
+ final File file = new File(subdir, k + ".txt");
+
+ try (final OutputStream fos = new FileOutputStream(file)) {
+ fos.write((k + ".txt").getBytes(StandardCharsets.UTF_8));
+ }
+ }
+ }
+ }
+
+ final ResourceReferences references = new StandardResourceReferences(Collections.singletonList(new FileResourceReference(baseDir)));
+ assertEquals(1, references.getCount());
+ assertEquals(ResourceType.DIRECTORY, references.asList().get(0).getResourceType());
+
+ final ResourceReferences flattened = references.flattenRecursively();
+ assertEquals(numDirs * numSubDirs * numFiles, flattened.getCount());
+
+ final List<ResourceReference> flattenedReferences = flattened.asList();
+ assertEquals(numDirs * numSubDirs * numFiles, flattenedReferences.size());
+
+ // Ensure that each file that was flattened has a unique filename and the file exists.
+ final Set<String> filenames = new HashSet<>();
+ for (final ResourceReference reference : flattenedReferences) {
+ assertEquals(ResourceType.FILE, reference.getResourceType());
+
+ final String filename = reference.getLocation();
+ assertTrue(filename.endsWith(".txt"));
+
+ filenames.add(filename);
+ assertTrue(new File(filename).exists());
+ }
+
+ assertEquals(numDirs * numSubDirs * numFiles, filenames.size());
+ }
+
+ @Test
+ public void testFlatten() throws IOException {
+ // Create directory structure:
+ // target/dir
+ // target/dir/0
+ // target/dir/0/0.txt
+ // target/dir/0/1.txt
+ // ...
+ // target/dir/0.txt
+ // target/dir/1.txt
+ // ...
+ final int numFiles = 3;
+
+ final File baseDir = new File("target/dir");
+ baseDir.mkdirs();
+
+ for (int i=0; i < numFiles; i++) {
+ final File file = new File(baseDir, i + ".txt");
+
+ try (final OutputStream fos = new FileOutputStream(file)) {
+ fos.write((i + ".txt").getBytes(StandardCharsets.UTF_8));
+ }
+ }
+
+ final ResourceReferences references = new StandardResourceReferences(Collections.singletonList(new FileResourceReference(baseDir)));
+ assertEquals(1, references.getCount());
+ assertEquals(ResourceType.DIRECTORY, references.asList().get(0).getResourceType());
+
+ final ResourceReferences flattened = references.flatten();
+ assertEquals(numFiles, flattened.getCount());
+
+ final List<ResourceReference> flattenedReferences = flattened.asList();
+ assertEquals(numFiles, flattenedReferences.size());
+
+ // Ensure that each file that was flattened has a unique filename and the file exists.
+ final Set<String> filenames = new HashSet<>();
+ for (final ResourceReference reference : flattenedReferences) {
+ assertEquals(ResourceType.FILE, reference.getResourceType());
+
+ final String filename = reference.getLocation();
+ assertTrue(filename.endsWith(".txt"));
+
+ filenames.add(filename);
+ assertTrue(new File(filename).exists());
+ }
+
+ assertEquals(numFiles, filenames.size());
+ }
+}
diff --git a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/NotificationServiceManager.java b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/NotificationServiceManager.java
index 757d259..e7d524b 100644
--- a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/NotificationServiceManager.java
+++ b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/NotificationServiceManager.java
@@ -16,6 +16,33 @@
*/
package org.apache.nifi.bootstrap;
+import org.apache.nifi.attribute.expression.language.StandardPropertyValue;
+import org.apache.nifi.bootstrap.notification.NotificationContext;
+import org.apache.nifi.bootstrap.notification.NotificationInitializationContext;
+import org.apache.nifi.bootstrap.notification.NotificationService;
+import org.apache.nifi.bootstrap.notification.NotificationType;
+import org.apache.nifi.bootstrap.notification.NotificationValidationContext;
+import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.PropertyValue;
+import org.apache.nifi.components.ValidationContext;
+import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.resource.ResourceContext;
+import org.apache.nifi.components.resource.StandardResourceContext;
+import org.apache.nifi.components.resource.StandardResourceReferenceFactory;
+import org.apache.nifi.parameter.ParameterLookup;
+import org.apache.nifi.registry.VariableRegistry;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -32,29 +59,6 @@
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import org.apache.nifi.attribute.expression.language.StandardPropertyValue;
-import org.apache.nifi.bootstrap.notification.NotificationContext;
-import org.apache.nifi.bootstrap.notification.NotificationInitializationContext;
-import org.apache.nifi.bootstrap.notification.NotificationService;
-import org.apache.nifi.bootstrap.notification.NotificationType;
-import org.apache.nifi.bootstrap.notification.NotificationValidationContext;
-import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.components.PropertyValue;
-import org.apache.nifi.components.ValidationContext;
-import org.apache.nifi.components.ValidationResult;
-import org.apache.nifi.parameter.ParameterLookup;
-import org.apache.nifi.registry.VariableRegistry;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
public class NotificationServiceManager {
private static final Logger logger = LoggerFactory.getLogger(NotificationServiceManager.class);
@@ -274,7 +278,8 @@
configuredValue = fullPropDescriptor.getDefaultValue();
}
- return new StandardPropertyValue(configuredValue, null, ParameterLookup.EMPTY, variableRegistry);
+ final ResourceContext resourceContext = new StandardResourceContext(new StandardResourceReferenceFactory(), descriptor);
+ return new StandardPropertyValue(resourceContext, configuredValue, null, ParameterLookup.EMPTY, variableRegistry);
}
@Override
@@ -394,7 +399,8 @@
value = descriptor.getDefaultValue();
}
- return new StandardPropertyValue(value, null, ParameterLookup.EMPTY, variableRegistry);
+ final ResourceContext resourceContext = new StandardResourceContext(new StandardResourceReferenceFactory(), descriptor);
+ return new StandardPropertyValue(resourceContext, value, null, ParameterLookup.EMPTY, variableRegistry);
}
@Override
diff --git a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/notification/NotificationValidationContext.java b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/notification/NotificationValidationContext.java
index 1cdb29b..74b1f4a 100644
--- a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/notification/NotificationValidationContext.java
+++ b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/notification/NotificationValidationContext.java
@@ -16,6 +16,9 @@
*/
package org.apache.nifi.bootstrap.notification;
+import org.apache.nifi.components.resource.ResourceContext;
+import org.apache.nifi.components.resource.StandardResourceContext;
+import org.apache.nifi.components.resource.StandardResourceReferenceFactory;
import org.apache.nifi.parameter.ParameterLookup;
import org.apache.nifi.attribute.expression.language.Query;
import org.apache.nifi.attribute.expression.language.Query.Range;
@@ -56,7 +59,8 @@
@Override
public PropertyValue newPropertyValue(final String rawValue) {
- return new StandardPropertyValue(rawValue, null, ParameterLookup.EMPTY, variableRegistry);
+ final ResourceContext resourceContext = new StandardResourceContext(new StandardResourceReferenceFactory(), null);
+ return new StandardPropertyValue(resourceContext, rawValue, null, ParameterLookup.EMPTY, variableRegistry);
}
@Override
diff --git a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/notification/http/HttpNotificationService.java b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/notification/http/HttpNotificationService.java
index 2d7ac45..dcbffbb 100644
--- a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/notification/http/HttpNotificationService.java
+++ b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/notification/http/HttpNotificationService.java
@@ -16,15 +16,6 @@
*/
package org.apache.nifi.bootstrap.notification.http;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
import okhttp3.Call;
import okhttp3.MediaType;
import okhttp3.OkHttpClient;
@@ -37,6 +28,8 @@
import org.apache.nifi.bootstrap.notification.NotificationInitializationContext;
import org.apache.nifi.bootstrap.notification.NotificationType;
import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.expression.AttributeExpression;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.processor.util.StandardValidators;
@@ -45,6 +38,16 @@
import org.apache.nifi.security.util.StandardTlsConfiguration;
import org.apache.nifi.security.util.TlsConfiguration;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+
public class HttpNotificationService extends AbstractNotificationService {
public static final String NOTIFICATION_TYPE_KEY = "notification.type";
@@ -76,7 +79,7 @@
public static final PropertyDescriptor PROP_TRUSTSTORE = new PropertyDescriptor.Builder()
.name("Truststore Filename")
.description("The fully-qualified filename of the Truststore")
- .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
.sensitive(false)
.build();
public static final PropertyDescriptor PROP_TRUSTSTORE_TYPE = new PropertyDescriptor.Builder()
@@ -98,7 +101,7 @@
.name("Keystore Filename")
.description("The fully-qualified filename of the Keystore")
.defaultValue(null)
- .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
.sensitive(false)
.build();
public static final PropertyDescriptor PROP_KEYSTORE_TYPE = new PropertyDescriptor.Builder()
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardPropertyValue.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardPropertyValue.java
index 2b3c863..de27349 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardPropertyValue.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardPropertyValue.java
@@ -16,7 +16,13 @@
*/
package org.apache.nifi.attribute.expression.language;
+import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.PropertyValue;
+import org.apache.nifi.components.resource.ResourceContext;
+import org.apache.nifi.components.resource.ResourceReference;
+import org.apache.nifi.components.resource.ResourceReferences;
+import org.apache.nifi.components.resource.StandardResourceContext;
+import org.apache.nifi.components.resource.StandardResourceReferenceFactory;
import org.apache.nifi.controller.ControllerService;
import org.apache.nifi.controller.ControllerServiceLookup;
import org.apache.nifi.expression.AttributeValueDecorator;
@@ -37,13 +43,20 @@
private final PreparedQuery preparedQuery;
private final VariableRegistry variableRegistry;
private final ParameterLookup parameterLookup;
+ private final ResourceContext resourceContext;
public StandardPropertyValue(final String rawValue, final ControllerServiceLookup serviceLookup, final ParameterLookup parameterLookup) {
- this(rawValue, serviceLookup, parameterLookup, Query.prepare(rawValue), VariableRegistry.EMPTY_REGISTRY);
+ this(new StandardResourceContext(new StandardResourceReferenceFactory(), null),
+ rawValue, serviceLookup, parameterLookup);
}
- public StandardPropertyValue(final String rawValue, final ControllerServiceLookup serviceLookup, final ParameterLookup parameterLookup, final VariableRegistry variableRegistry) {
- this(rawValue, serviceLookup, parameterLookup, Query.prepare(rawValue), variableRegistry);
+ public StandardPropertyValue(final ResourceContext resourceContext, final String rawValue, final ControllerServiceLookup serviceLookup, final ParameterLookup parameterLookup) {
+ this(resourceContext, rawValue, serviceLookup, parameterLookup, Query.prepare(rawValue), VariableRegistry.EMPTY_REGISTRY);
+ }
+
+ public StandardPropertyValue(final ResourceContext resourceContext, final String rawValue, final ControllerServiceLookup serviceLookup, final ParameterLookup parameterLookup,
+ final VariableRegistry variableRegistry) {
+ this(resourceContext, rawValue, serviceLookup, parameterLookup, Query.prepare(rawValue), variableRegistry);
}
/**
@@ -51,25 +64,27 @@
* lookup and indicates whether or not the rawValue contains any NiFi
* Expressions. If it is unknown whether or not the value contains any NiFi
* Expressions, the
- * {@link #StandardPropertyValue(String, ControllerServiceLookup, ParameterLookup, VariableRegistry)}
+ * {@link #StandardPropertyValue(ResourceContext, String, ControllerServiceLookup, ParameterLookup, VariableRegistry)}
* constructor should be used or <code>true</code> should be passed.
* However, if it is known that the value contains no NiFi Expression, that
* information should be provided so that calls to
* {@link #evaluateAttributeExpressions()} are much more efficient
*
+ * @param resourceContext the context in which resources are to be understood
* @param rawValue value
* @param serviceLookup lookup
* @param parameterLookup the parameter lookup
* @param preparedQuery query
* @param variableRegistry variableRegistry
*/
- public StandardPropertyValue(final String rawValue, final ControllerServiceLookup serviceLookup, final ParameterLookup parameterLookup, final PreparedQuery preparedQuery,
- final VariableRegistry variableRegistry) {
+ public StandardPropertyValue(final ResourceContext resourceContext, final String rawValue, final ControllerServiceLookup serviceLookup, final ParameterLookup parameterLookup,
+ final PreparedQuery preparedQuery, final VariableRegistry variableRegistry) {
this.rawValue = rawValue;
this.serviceLookup = serviceLookup;
this.preparedQuery = preparedQuery;
this.variableRegistry = variableRegistry;
this.parameterLookup = parameterLookup == null ? ParameterLookup.EMPTY : parameterLookup;
+ this.resourceContext = resourceContext;
}
@Override
@@ -164,7 +179,7 @@
final EvaluationContext evaluationContext = new StandardEvaluationContext(lookup, stateValues, parameterLookup);
final String evaluated = preparedQuery.evaluateExpressions(evaluationContext, decorator);
- return new StandardPropertyValue(evaluated, serviceLookup, parameterLookup, new EmptyPreparedQuery(evaluated), null);
+ return new StandardPropertyValue(resourceContext, evaluated, serviceLookup, parameterLookup, new EmptyPreparedQuery(evaluated), null);
}
@Override
@@ -201,6 +216,28 @@
}
@Override
+ public ResourceReference asResource() {
+ final PropertyDescriptor propertyDescriptor = resourceContext.getPropertyDescriptor();
+ if (propertyDescriptor == null) {
+ // If no property descriptor has been specified, there are no known types of resources.
+ return null;
+ }
+
+ return resourceContext.getResourceReferenceFactory().createResourceReference(rawValue, propertyDescriptor.getResourceDefinition());
+ }
+
+ @Override
+ public ResourceReferences asResources() {
+ final PropertyDescriptor propertyDescriptor = resourceContext.getPropertyDescriptor();
+ if (propertyDescriptor == null) {
+ // If no property descriptor has been specified, there are no known types of resources.
+ return null;
+ }
+
+ return resourceContext.getResourceReferenceFactory().createResourceReferences(rawValue, propertyDescriptor.getResourceDefinition());
+ }
+
+ @Override
public boolean isSet() {
return rawValue != null;
}
diff --git a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/StringUtils.java b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/StringUtils.java
index 8948eaf..b389fd8 100644
--- a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/StringUtils.java
+++ b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/StringUtils.java
@@ -77,15 +77,21 @@
return str.substring(pos + separator.length());
}
- public static String join(final Collection collection, String delimiter) {
- if (collection == null || collection.size() == 0) {
+ public static String join(final Collection<?> collection, String delimiter) {
+ if (collection == null || collection.isEmpty()) {
return EMPTY;
}
- final StringBuilder sb = new StringBuilder(collection.size() * 16);
- for (Object element : collection) {
- sb.append((String) element);
+
+ if (collection.size() == 1) {
+ return String.valueOf(collection.iterator().next());
+ }
+
+ final StringBuilder sb = new StringBuilder();
+ for (final Object element : collection) {
+ sb.append(element);
sb.append(delimiter);
}
+
return sb.toString().substring(0, sb.lastIndexOf(delimiter));
}
diff --git a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/processor/util/StandardValidators.java b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/processor/util/StandardValidators.java
index 89b67db..0a9a603 100644
--- a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/processor/util/StandardValidators.java
+++ b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/processor/util/StandardValidators.java
@@ -20,6 +20,8 @@
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.Validator;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.expression.AttributeExpression.ResultType;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.processor.DataUnit;
@@ -532,6 +534,12 @@
};
}
+ /**
+ * @deprecated use {@link org.apache.nifi.components.PropertyDescriptor.Builder#identifiesExternalResource(ResourceCardinality, ResourceType, ResourceType...)
+ * identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE, ResourceType.DIRECTORY, ResourceType.URL}
+ * instead.
+ */
+ @Deprecated
public static Validator createURLorFileValidator() {
return (subject, input, context) -> {
if (context.isExpressionLanguageSupported(subject) && context.isExpressionLanguagePresent(input)) {
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/EmptyControllerServiceLookup.java b/nifi-mock/src/main/java/org/apache/nifi/util/EmptyControllerServiceLookup.java
new file mode 100644
index 0000000..9eff489
--- /dev/null
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/EmptyControllerServiceLookup.java
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+package org.apache.nifi.util;
+
+public class EmptyControllerServiceLookup extends MockControllerServiceLookup {
+}
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockConfigurationContext.java b/nifi-mock/src/main/java/org/apache/nifi/util/MockConfigurationContext.java
index 4e68366..57c5c2e 100644
--- a/nifi-mock/src/main/java/org/apache/nifi/util/MockConfigurationContext.java
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/MockConfigurationContext.java
@@ -16,10 +16,6 @@
*/
package org.apache.nifi.util;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.PropertyValue;
import org.apache.nifi.controller.ConfigurationContext;
@@ -27,12 +23,18 @@
import org.apache.nifi.controller.ControllerServiceLookup;
import org.apache.nifi.registry.VariableRegistry;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
public class MockConfigurationContext implements ConfigurationContext {
private final Map<PropertyDescriptor, String> properties;
private final ControllerServiceLookup serviceLookup;
private final ControllerService service;
private final VariableRegistry variableRegistry;
+ private volatile boolean validateExpressions;
public MockConfigurationContext(final Map<PropertyDescriptor, String> properties,
final ControllerServiceLookup serviceLookup) {
@@ -51,17 +53,24 @@
final VariableRegistry variableRegistry) {
this.service = service;
this.properties = properties;
- this.serviceLookup = serviceLookup;
+ this.serviceLookup = serviceLookup == null ? new EmptyControllerServiceLookup() : serviceLookup;
this.variableRegistry = variableRegistry;
}
+ public void setValidateExpressions(final boolean validate) {
+ this.validateExpressions = validate;
+ }
+
@Override
public PropertyValue getProperty(final PropertyDescriptor property) {
+ final PropertyDescriptor canonicalDescriptor = getActualDescriptor(property);
String value = properties.get(property);
if (value == null) {
- value = getActualDescriptor(property).getDefaultValue();
+ value = canonicalDescriptor.getDefaultValue();
}
- return new MockPropertyValue(value, serviceLookup, variableRegistry);
+
+ final boolean alreadyEvaluated = !validateExpressions;
+ return new MockPropertyValue(value, serviceLookup, canonicalDescriptor, alreadyEvaluated, variableRegistry);
}
@Override
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java b/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java
index 01098df..e2199f4 100644
--- a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java
@@ -16,18 +16,6 @@
*/
package org.apache.nifi.util;
-import static java.util.Objects.requireNonNull;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.attribute.expression.language.Query;
import org.apache.nifi.attribute.expression.language.Query.Range;
@@ -48,6 +36,19 @@
import org.apache.nifi.state.MockStateManager;
import org.junit.Assert;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
+import static java.util.Objects.requireNonNull;
+
public class MockProcessContext extends MockControllerServiceLookup implements ProcessContext, ControllerServiceLookup, NodeTypeProvider {
private final ConfigurableComponent component;
@@ -144,6 +145,19 @@
return getProperty(descriptor.getName());
}
+ public PropertyValue getPropertyWithoutValidatingExpressions(final PropertyDescriptor propertyDescriptor) {
+ final PropertyDescriptor canonicalDescriptor = component.getPropertyDescriptor(propertyDescriptor.getName());
+ if (canonicalDescriptor == null) {
+ return null;
+ }
+
+ final String setPropertyValue = properties.get(canonicalDescriptor);
+ final String propValue = (setPropertyValue == null) ? canonicalDescriptor.getDefaultValue() : setPropertyValue;
+
+ final MockPropertyValue propertyValue = new MockPropertyValue(propValue, this, canonicalDescriptor, true, variableRegistry);
+ return propertyValue;
+ }
+
@Override
public PropertyValue getProperty(final String propertyName) {
final PropertyDescriptor descriptor = component.getPropertyDescriptor(propertyName);
@@ -154,7 +168,8 @@
final String setPropertyValue = properties.get(descriptor);
final String propValue = (setPropertyValue == null) ? descriptor.getDefaultValue() : setPropertyValue;
- final MockPropertyValue propertyValue = new MockPropertyValue(propValue, this, variableRegistry, (enableExpressionValidation && allowExpressionValidation) ? descriptor : null);
+ final boolean alreadyEvaluated = !this.allowExpressionValidation;
+ final MockPropertyValue propertyValue = new MockPropertyValue(propValue, this, descriptor, alreadyEvaluated, variableRegistry);
return propertyValue;
}
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockPropertyValue.java b/nifi-mock/src/main/java/org/apache/nifi/util/MockPropertyValue.java
index 296b75b..0fc9bbe 100644
--- a/nifi-mock/src/main/java/org/apache/nifi/util/MockPropertyValue.java
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/MockPropertyValue.java
@@ -16,16 +16,17 @@
*/
package org.apache.nifi.util;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.attribute.expression.language.Query;
import org.apache.nifi.attribute.expression.language.Query.Range;
import org.apache.nifi.attribute.expression.language.StandardPropertyValue;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.PropertyValue;
+import org.apache.nifi.components.resource.ResourceContext;
+import org.apache.nifi.components.resource.ResourceReference;
+import org.apache.nifi.components.resource.ResourceReferences;
+import org.apache.nifi.components.resource.StandardResourceContext;
+import org.apache.nifi.components.resource.StandardResourceReferenceFactory;
import org.apache.nifi.controller.ControllerService;
import org.apache.nifi.controller.ControllerServiceLookup;
import org.apache.nifi.expression.AttributeValueDecorator;
@@ -36,6 +37,11 @@
import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.registry.VariableRegistry;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
public class MockPropertyValue implements PropertyValue {
private final String rawValue;
private final Boolean expectExpressions;
@@ -45,7 +51,7 @@
private final PropertyValue stdPropValue;
private final VariableRegistry variableRegistry;
- private boolean expressionsEvaluated = false;
+ private boolean expressionsEvaluated;
public MockPropertyValue(final String rawValue) {
this(rawValue, null);
@@ -63,9 +69,11 @@
this(rawValue, serviceLookup, propertyDescriptor, false, variableRegistry);
}
- private MockPropertyValue(final String rawValue, final ControllerServiceLookup serviceLookup, final PropertyDescriptor propertyDescriptor, final boolean alreadyEvaluated,
+ protected MockPropertyValue(final String rawValue, final ControllerServiceLookup serviceLookup, final PropertyDescriptor propertyDescriptor, final boolean alreadyEvaluated,
final VariableRegistry variableRegistry) {
- this.stdPropValue = new StandardPropertyValue(rawValue, serviceLookup, ParameterLookup.EMPTY, variableRegistry);
+
+ final ResourceContext resourceContext = new StandardResourceContext(new StandardResourceReferenceFactory(), propertyDescriptor);
+ this.stdPropValue = new StandardPropertyValue(resourceContext, rawValue, serviceLookup, ParameterLookup.EMPTY, variableRegistry);
this.rawValue = rawValue;
this.serviceLookup = (MockControllerServiceLookup) serviceLookup;
this.expectExpressions = propertyDescriptor == null ? null : propertyDescriptor.isExpressionLanguageSupported();
@@ -76,7 +84,7 @@
}
private void ensureExpressionsEvaluated() {
- if (Boolean.TRUE.equals(expectExpressions) && !expressionsEvaluated) {
+ if (Boolean.TRUE.equals(expectExpressions) && !expressionsEvaluated && isExpressionLanguagePresent()) {
throw new IllegalStateException("Attempting to retrieve value of " + propertyDescriptor
+ " without first evaluating Expressions, even though the PropertyDescriptor indicates "
+ "that the Expression Language is Supported. If you realize that this is the case and do not want "
@@ -91,7 +99,7 @@
// language scope is not null, we have attributes available but scope is not equal to FF attributes
// it means that we're not evaluating against flow file attributes even though attributes are available
- if(attributesAvailable && !ExpressionLanguageScope.FLOWFILE_ATTRIBUTES.equals(expressionLanguageScope)) {
+ if (attributesAvailable && !ExpressionLanguageScope.FLOWFILE_ATTRIBUTES.equals(expressionLanguageScope)) {
throw new IllegalStateException("Attempting to evaluate expression language for " + propertyDescriptor.getName()
+ " using flow file attributes but the scope evaluation is set to " + expressionLanguageScope + ". The"
+ " proper scope should be set in the property descriptor using"
@@ -103,20 +111,20 @@
// in that case, we don't care if attributes are not available even though scope is FLOWFILE_ATTRIBUTES
// it likely means that the property has been defined in a common/abstract class used by multiple processors with
// different input requirements.
- if(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES.equals(expressionLanguageScope)
+ if (ExpressionLanguageScope.FLOWFILE_ATTRIBUTES.equals(expressionLanguageScope)
&& (this.serviceLookup.getInputRequirement() == null || this.serviceLookup.getInputRequirement().value().equals(InputRequirement.Requirement.INPUT_FORBIDDEN))) {
return;
}
// if we have a processor where input requirement is INPUT_ALLOWED, we need to check if there is an
// incoming connection or not. If not, we don't care if attributes are not available even though scope is FLOWFILE_ATTRIBUTES
- if(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES.equals(expressionLanguageScope)
+ if (ExpressionLanguageScope.FLOWFILE_ATTRIBUTES.equals(expressionLanguageScope)
&& !((MockProcessContext) this.serviceLookup).hasIncomingConnection()) {
return;
}
// we're trying to evaluate against flow files attributes but we don't have any attributes available.
- if(!attributesAvailable && ExpressionLanguageScope.FLOWFILE_ATTRIBUTES.equals(expressionLanguageScope)) {
+ if (!attributesAvailable && ExpressionLanguageScope.FLOWFILE_ATTRIBUTES.equals(expressionLanguageScope)) {
throw new IllegalStateException("Attempting to evaluate expression language for " + propertyDescriptor.getName()
+ " without using flow file attributes but the scope evaluation is set to " + expressionLanguageScope + ". The"
+ " proper scope should be set in the property descriptor using"
@@ -173,9 +181,13 @@
}
private void markEvaluated() {
+ if (expressionsEvaluated) {
+ return;
+ }
+
if (Boolean.FALSE.equals(expectExpressions)) {
throw new IllegalStateException("Attempting to Evaluate Expressions but " + propertyDescriptor
- + " indicates that the Expression Language is not supported. If you realize that this is the case and do not want "
+ + " is not a supported property, or the property indicates that the Expression Language is not supported. If you realize that this is the case and do not want "
+ "this error to occur, it can be disabled by calling TestRunner.setValidateExpressionUsage(false)");
}
expressionsEvaluated = true;
@@ -237,12 +249,16 @@
@Override
public PropertyValue evaluateAttributeExpressions(FlowFile flowFile, Map<String, String> additionalAttributes, AttributeValueDecorator decorator, Map<String, String> stateValues)
throws ProcessException {
+ final boolean alreadyValidated = this.expressionsEvaluated;
markEvaluated();
+
if (rawValue == null) {
return this;
}
- validateExpressionScope(flowFile != null || additionalAttributes != null);
+ if (!alreadyValidated) {
+ validateExpressionScope(flowFile != null || additionalAttributes != null);
+ }
final PropertyValue newValue = stdPropValue.evaluateAttributeExpressions(flowFile, additionalAttributes, decorator, stateValues);
return new MockPropertyValue(newValue.getValue(), serviceLookup, propertyDescriptor, true, variableRegistry);
@@ -273,6 +289,25 @@
}
@Override
+ public ResourceReference asResource() {
+ if (propertyDescriptor == null) {
+ return null;
+ }
+
+ return new StandardResourceReferenceFactory().createResourceReference(rawValue, propertyDescriptor.getResourceDefinition());
+ }
+
+ @Override
+ public ResourceReferences asResources() {
+ if (propertyDescriptor == null) {
+ return null;
+ }
+
+ return new StandardResourceReferenceFactory().createResourceReferences(rawValue, propertyDescriptor.getResourceDefinition());
+ }
+
+
+ @Override
public boolean isSet() {
return rawValue != null;
}
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockValidationContext.java b/nifi-mock/src/main/java/org/apache/nifi/util/MockValidationContext.java
index f4876c4..364df82 100644
--- a/nifi-mock/src/main/java/org/apache/nifi/util/MockValidationContext.java
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/MockValidationContext.java
@@ -54,6 +54,7 @@
private final StateManager stateManager;
private final VariableRegistry variableRegistry;
private final Map<PropertyDescriptor, PropertyConfiguration> properties;
+ private volatile boolean validateExpressions = true;
public MockValidationContext(final MockProcessContext processContext) {
this(processContext, null, VariableRegistry.EMPTY_REGISTRY);
@@ -87,6 +88,9 @@
return configurationMap;
}
+ public void setValidateExpressions(final boolean validate) {
+ this.validateExpressions = validate;
+ }
@Override
public ControllerService getControllerService(final String identifier) {
@@ -95,7 +99,7 @@
@Override
public PropertyValue newPropertyValue(final String rawValue) {
- return new MockPropertyValue(rawValue, this, variableRegistry);
+ return new MockPropertyValue(rawValue, this, null, true, variableRegistry);
}
@Override
@@ -106,12 +110,14 @@
@Override
public ValidationContext getControllerServiceValidationContext(final ControllerService controllerService) {
final MockProcessContext serviceProcessContext = new MockProcessContext(controllerService, context, stateManager, variableRegistry);
- return new MockValidationContext(serviceProcessContext, stateManager, variableRegistry);
+ final MockValidationContext serviceValidationContext = new MockValidationContext(serviceProcessContext, stateManager, variableRegistry);
+ serviceValidationContext.setValidateExpressions(validateExpressions);
+ return serviceValidationContext;
}
@Override
public PropertyValue getProperty(final PropertyDescriptor property) {
- return context.getProperty(property);
+ return context.getPropertyWithoutValidatingExpressions(property);
}
@Override
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java b/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
index 4a41be7..fa52608 100644
--- a/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
@@ -31,7 +31,6 @@
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.state.StateManager;
-import org.apache.nifi.controller.ConfigurationContext;
import org.apache.nifi.controller.ControllerService;
import org.apache.nifi.controller.queue.QueueSize;
import org.apache.nifi.flowfile.FlowFile;
@@ -94,6 +93,7 @@
private final Map<String, MockComponentLog> controllerServiceLoggers = new HashMap<>();
private final MockComponentLog logger;
private boolean enforceReadStreamsClosed = true;
+ private boolean validateExpressionUsage = true;
StandardProcessorTestRunner(final Processor processor) {
this(processor, null);
@@ -146,6 +146,7 @@
@Override
public void setValidateExpressionUsage(final boolean validate) {
+ this.validateExpressionUsage = validate;
context.setValidateExpressionUsage(validate);
}
@@ -693,8 +694,11 @@
}
// ensure controller service is valid before enabling
- final ValidationContext validationContext = new MockValidationContext(context).getControllerServiceValidationContext(service);
- final Collection<ValidationResult> results = context.getControllerService(service.getIdentifier()).validate(validationContext);
+ final MockValidationContext mockValidationContext = new MockValidationContext(context, null, variableRegistry);
+ mockValidationContext.setValidateExpressions(validateExpressionUsage);
+ final ValidationContext serviceValidationContext = mockValidationContext.getControllerServiceValidationContext(service);
+
+ final Collection<ValidationResult> results = context.getControllerService(service.getIdentifier()).validate(serviceValidationContext);
for (final ValidationResult result : results) {
if (!result.isValid()) {
@@ -703,7 +707,8 @@
}
try {
- final ConfigurationContext configContext = new MockConfigurationContext(service, configuration.getProperties(), context,variableRegistry);
+ final MockConfigurationContext configContext = new MockConfigurationContext(service, configuration.getProperties(), context, variableRegistry);
+ configContext.setValidateExpressions(validateExpressionUsage);
ReflectionUtils.invokeMethodsWithAnnotation(OnEnabled.class, service, configContext);
} catch (final InvocationTargetException ite) {
ite.getCause().printStackTrace();
diff --git a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/main/java/org/apache/nifi/atlas/reporting/ReportLineageToAtlas.java b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/main/java/org/apache/nifi/atlas/reporting/ReportLineageToAtlas.java
index fb0a850..9afacf5 100644
--- a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/main/java/org/apache/nifi/atlas/reporting/ReportLineageToAtlas.java
+++ b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/main/java/org/apache/nifi/atlas/reporting/ReportLineageToAtlas.java
@@ -55,6 +55,8 @@
import org.apache.nifi.components.PropertyValue;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.components.state.Scope;
import org.apache.nifi.context.PropertyContext;
import org.apache.nifi.controller.ConfigurationContext;
@@ -189,7 +191,7 @@
" then, 'atlas-application.properties' file under root classpath is used.")
.required(false)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
- .addValidator(StandardValidators.NON_BLANK_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.DIRECTORY)
// Atlas generates ssl-client.xml in this directory and then loads it from classpath
.dynamicallyModifiesClasspath(true)
.build();
@@ -280,7 +282,7 @@
" If not set, it is expected to set a JAAS configuration file in the JVM properties defined in the bootstrap.conf file." +
" This principal will be set into 'sasl.jaas.config' Kafka's property.")
.required(false)
- .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
public static final PropertyDescriptor KERBEROS_CREDENTIALS_SERVICE = new PropertyDescriptor.Builder()
diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/credentials/provider/factory/CredentialPropertyDescriptors.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/credentials/provider/factory/CredentialPropertyDescriptors.java
index b60f949..707d39a 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/credentials/provider/factory/CredentialPropertyDescriptors.java
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/credentials/provider/factory/CredentialPropertyDescriptors.java
@@ -17,6 +17,8 @@
package org.apache.nifi.processors.aws.credentials.provider.factory;
import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.processor.util.StandardValidators;
@@ -53,7 +55,7 @@
.displayName("Credentials File")
.expressionLanguageSupported(ExpressionLanguageScope.NONE)
.required(false)
- .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
.description("Path to a file containing AWS access key and secret key in properties file format.")
.build();
diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/storage/ADLSCredentialsControllerService.java b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/storage/ADLSCredentialsControllerService.java
index 8ecb554..9685140 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/storage/ADLSCredentialsControllerService.java
+++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/storage/ADLSCredentialsControllerService.java
@@ -215,7 +215,11 @@
if (property.isSet()) {
if (propertyDescriptor.isExpressionLanguageSupported()) {
- property = property.evaluateAttributeExpressions(attributes);
+ if (propertyDescriptor.getExpressionLanguageScope() == ExpressionLanguageScope.FLOWFILE_ATTRIBUTES) {
+ property = property.evaluateAttributeExpressions(attributes);
+ } else {
+ property = property.evaluateAttributeExpressions();
+ }
}
T value = getPropertyValue.apply(property);
setBuilderValue.accept(credentialsBuilder, value);
diff --git a/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/src/main/java/org/apache/nifi/cdc/mysql/processors/CaptureChangeMySQL.java b/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/src/main/java/org/apache/nifi/cdc/mysql/processors/CaptureChangeMySQL.java
index a7d9e30..5cd4827 100644
--- a/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/src/main/java/org/apache/nifi/cdc/mysql/processors/CaptureChangeMySQL.java
+++ b/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/src/main/java/org/apache/nifi/cdc/mysql/processors/CaptureChangeMySQL.java
@@ -26,37 +26,6 @@
import com.github.shyiko.mysql.binlog.event.RotateEventData;
import com.github.shyiko.mysql.binlog.event.TableMapEventData;
import com.github.shyiko.mysql.binlog.network.SSLMode;
-import java.io.IOException;
-import java.net.ConnectException;
-import java.net.InetSocketAddress;
-import java.net.MalformedURLException;
-import java.sql.Connection;
-import java.sql.Driver;
-import java.sql.DriverManager;
-import java.sql.DriverPropertyInfo;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.logging.Logger;
-import java.util.regex.Pattern;
-import javax.net.ssl.SSLContext;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.annotation.behavior.PrimaryNodeOnly;
@@ -98,6 +67,8 @@
import org.apache.nifi.components.PropertyValue;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.components.state.Scope;
import org.apache.nifi.components.state.StateManager;
import org.apache.nifi.components.state.StateMap;
@@ -117,6 +88,37 @@
import org.apache.nifi.ssl.SSLContextService;
import org.apache.nifi.util.file.classloader.ClassLoaderUtils;
+import javax.net.ssl.SSLContext;
+import java.io.IOException;
+import java.net.ConnectException;
+import java.net.InetSocketAddress;
+import java.net.MalformedURLException;
+import java.sql.Connection;
+import java.sql.Driver;
+import java.sql.DriverManager;
+import java.sql.DriverPropertyInfo;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.logging.Logger;
+import java.util.regex.Pattern;
+
import static com.github.shyiko.mysql.binlog.event.EventType.DELETE_ROWS;
import static com.github.shyiko.mysql.binlog.event.EventType.EXT_DELETE_ROWS;
import static com.github.shyiko.mysql.binlog.event.EventType.EXT_WRITE_ROWS;
@@ -235,7 +237,7 @@
+ "For example '/var/tmp/mysql-connector-java-5.1.38-bin.jar'")
.defaultValue(null)
.required(false)
- .addValidator(StandardValidators.createListValidator(true, true, StandardValidators.createURLorFileValidator()))
+ .identifiesExternalResource(ResourceCardinality.MULTIPLE, ResourceType.FILE, ResourceType.DIRECTORY, ResourceType.URL)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
diff --git a/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/src/test/groovy/org/apache/nifi/cdc/mysql/processors/CaptureChangeMySQLTest.groovy b/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/src/test/groovy/org/apache/nifi/cdc/mysql/processors/CaptureChangeMySQLTest.groovy
index 7e6aca0..d89b963 100644
--- a/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/src/test/groovy/org/apache/nifi/cdc/mysql/processors/CaptureChangeMySQLTest.groovy
+++ b/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/src/test/groovy/org/apache/nifi/cdc/mysql/processors/CaptureChangeMySQLTest.groovy
@@ -82,6 +82,9 @@
* Unit test(s) for MySQL CDC
*/
class CaptureChangeMySQLTest {
+ // Use an http-based URL driver location because we don't have the driver available in the unit test, and we don't want the processor to
+ // be invalid due to a missing file. By specifying an HTTP based URL address, we won't validate whether or not the file exists
+ private static final String DRIVER_LOCATION = "http://mysql-driver.com/driver.jar"
CaptureChangeMySQL processor
TestRunner testRunner
MockBinlogClient client
@@ -153,7 +156,7 @@
@Test
void testConnectionFailures() throws Exception {
- testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, 'file:///path/to/mysql-connector-java-5.1.38-bin.jar')
+ testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, DRIVER_LOCATION)
testRunner.setProperty(CaptureChangeMySQL.HOSTS, 'localhost:3306')
testRunner.setProperty(CaptureChangeMySQL.USERNAME, 'root')
client.connectionError = true
@@ -185,7 +188,7 @@
@Test
void testBeginCommitTransaction() throws Exception {
- testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, 'file:///path/to/mysql-connector-java-5.1.38-bin.jar')
+ testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, DRIVER_LOCATION)
testRunner.setProperty(CaptureChangeMySQL.HOSTS, 'localhost:3306')
testRunner.setProperty(CaptureChangeMySQL.USERNAME, 'root')
testRunner.setProperty(CaptureChangeMySQL.CONNECT_TIMEOUT, '2 seconds')
@@ -219,7 +222,7 @@
@Test
void testBeginCommitTransactionFiltered() throws Exception {
- testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, 'file:///path/to/mysql-connector-java-5.1.38-bin.jar')
+ testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, DRIVER_LOCATION)
testRunner.setProperty(CaptureChangeMySQL.HOSTS, 'localhost:3306')
testRunner.setProperty(CaptureChangeMySQL.USERNAME, 'root')
testRunner.setProperty(CaptureChangeMySQL.CONNECT_TIMEOUT, '2 seconds')
@@ -268,7 +271,7 @@
@Test
void testInitialSequenceIdIgnoredWhenStatePresent() throws Exception {
- testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, 'file:///path/to/mysql-connector-java-5.1.38-bin.jar')
+ testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, DRIVER_LOCATION)
testRunner.setProperty(CaptureChangeMySQL.HOSTS, 'localhost:3306')
testRunner.setProperty(CaptureChangeMySQL.USERNAME, 'root')
testRunner.setProperty(CaptureChangeMySQL.PASSWORD, 'password')
@@ -309,7 +312,7 @@
@Test
void testInitialSequenceIdNoStatePresent() throws Exception {
- testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, 'file:///path/to/mysql-connector-java-5.1.38-bin.jar')
+ testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, DRIVER_LOCATION)
testRunner.setProperty(CaptureChangeMySQL.HOSTS, 'localhost:3306')
testRunner.setProperty(CaptureChangeMySQL.USERNAME, 'root')
testRunner.setProperty(CaptureChangeMySQL.PASSWORD, 'password')
@@ -347,7 +350,7 @@
@Test(expected = AssertionError.class)
void testCommitWithoutBegin() throws Exception {
- testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, 'file:///path/to/mysql-connector-java-5.1.38-bin.jar')
+ testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, DRIVER_LOCATION)
testRunner.setProperty(CaptureChangeMySQL.HOSTS, 'localhost:3306')
testRunner.setProperty(CaptureChangeMySQL.USERNAME, 'root')
testRunner.setProperty(CaptureChangeMySQL.PASSWORD, 'password')
@@ -366,7 +369,7 @@
@Test
void testExtendedTransaction() throws Exception {
- testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, 'file:///path/to/mysql-connector-java-5.1.38-bin.jar')
+ testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, DRIVER_LOCATION)
testRunner.setProperty(CaptureChangeMySQL.HOSTS, 'localhost:3306')
testRunner.setProperty(CaptureChangeMySQL.USERNAME, 'root')
testRunner.setProperty(CaptureChangeMySQL.PASSWORD, 'password')
@@ -518,7 +521,7 @@
@Test
void testExcludeSchemaChanges() throws Exception {
- testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, 'file:///path/to/mysql-connector-java-5.1.38-bin.jar')
+ testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, DRIVER_LOCATION)
testRunner.setProperty(CaptureChangeMySQL.HOSTS, 'localhost:3306')
testRunner.setProperty(CaptureChangeMySQL.USERNAME, 'root')
testRunner.setProperty(CaptureChangeMySQL.PASSWORD, 'password')
@@ -592,7 +595,7 @@
@Test(expected = AssertionError.class)
void testNoTableInformationAvailable() throws Exception {
- testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, 'file:///path/to/mysql-connector-java-5.1.38-bin.jar')
+ testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, DRIVER_LOCATION)
testRunner.setProperty(CaptureChangeMySQL.HOSTS, 'localhost:3306')
testRunner.setProperty(CaptureChangeMySQL.USERNAME, 'root')
testRunner.setProperty(CaptureChangeMySQL.PASSWORD, 'password')
@@ -636,7 +639,7 @@
@Test
void testSkipTable() throws Exception {
- testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, 'file:///path/to/mysql-connector-java-5.1.38-bin.jar')
+ testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, DRIVER_LOCATION)
testRunner.setProperty(CaptureChangeMySQL.HOSTS, 'localhost:3306')
testRunner.setProperty(CaptureChangeMySQL.USERNAME, 'root')
testRunner.setProperty(CaptureChangeMySQL.PASSWORD, 'password')
@@ -735,7 +738,7 @@
@Test
void testFilterDatabase() throws Exception {
- testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, 'file:///path/to/mysql-connector-java-5.1.38-bin.jar')
+ testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, DRIVER_LOCATION)
testRunner.setProperty(CaptureChangeMySQL.HOSTS, 'localhost:3306')
testRunner.setProperty(CaptureChangeMySQL.USERNAME, 'root')
testRunner.setProperty(CaptureChangeMySQL.PASSWORD, 'password')
@@ -805,7 +808,7 @@
@Test
void testTransactionAcrossMultipleProcessorExecutions() throws Exception {
- testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, 'file:///path/to/mysql-connector-java-5.1.38-bin.jar')
+ testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, DRIVER_LOCATION)
testRunner.setProperty(CaptureChangeMySQL.HOSTS, 'localhost:3306')
testRunner.setProperty(CaptureChangeMySQL.USERNAME, 'root')
testRunner.setProperty(CaptureChangeMySQL.PASSWORD, 'password')
@@ -866,7 +869,7 @@
@Test
void testUpdateState() throws Exception {
- testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, 'file:///path/to/mysql-connector-java-5.1.38-bin.jar')
+ testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, DRIVER_LOCATION)
testRunner.setProperty(CaptureChangeMySQL.HOSTS, 'localhost:3306')
testRunner.setProperty(CaptureChangeMySQL.USERNAME, 'root')
testRunner.setProperty(CaptureChangeMySQL.PASSWORD, 'password')
@@ -928,7 +931,7 @@
@Test
void testUpdateStateUseGtid() throws Exception {
- testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, 'file:///path/to/mysql-connector-java-5.1.38-bin.jar')
+ testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, DRIVER_LOCATION)
testRunner.setProperty(CaptureChangeMySQL.HOSTS, 'localhost:3306')
testRunner.setProperty(CaptureChangeMySQL.USERNAME, 'root')
testRunner.setProperty(CaptureChangeMySQL.PASSWORD, 'password')
@@ -1022,7 +1025,7 @@
@Test
void testDDLOutsideTransaction() throws Exception {
- testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, 'file:///path/to/mysql-connector-java-5.1.38-bin.jar')
+ testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, DRIVER_LOCATION)
testRunner.setProperty(CaptureChangeMySQL.HOSTS, 'localhost:3306')
testRunner.setProperty(CaptureChangeMySQL.USERNAME, 'root')
testRunner.setProperty(CaptureChangeMySQL.PASSWORD, 'password')
@@ -1049,7 +1052,7 @@
@Test
void testRenameTable() throws Exception {
- testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, 'file:///path/to/mysql-connector-java-5.1.38-bin.jar')
+ testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, DRIVER_LOCATION)
testRunner.setProperty(CaptureChangeMySQL.HOSTS, 'localhost:3306')
testRunner.setProperty(CaptureChangeMySQL.USERNAME, 'root')
testRunner.setProperty(CaptureChangeMySQL.CONNECT_TIMEOUT, '2 seconds')
@@ -1089,7 +1092,7 @@
@Test
void testInitialGtidIgnoredWhenStatePresent() throws Exception {
- testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, 'file:///path/to/mysql-connector-java-5.1.38-bin.jar')
+ testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, DRIVER_LOCATION)
testRunner.setProperty(CaptureChangeMySQL.HOSTS, 'localhost:3306')
testRunner.setProperty(CaptureChangeMySQL.USERNAME, 'root')
testRunner.setProperty(CaptureChangeMySQL.CONNECT_TIMEOUT, '2 seconds')
@@ -1136,7 +1139,7 @@
@Test
void testInitialGtidNoStatePresent() throws Exception {
- testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, 'file:///path/to/mysql-connector-java-5.1.38-bin.jar')
+ testRunner.setProperty(CaptureChangeMySQL.DRIVER_LOCATION, DRIVER_LOCATION)
testRunner.setProperty(CaptureChangeMySQL.HOSTS, 'localhost:3306')
testRunner.setProperty(CaptureChangeMySQL.USERNAME, 'root')
testRunner.setProperty(CaptureChangeMySQL.PASSWORD, 'password')
diff --git a/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/src/main/java/org/apache/nifi/processors/cybersecurity/CompareFuzzyHash.java b/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/src/main/java/org/apache/nifi/processors/cybersecurity/CompareFuzzyHash.java
index f08ac79..6494e97 100644
--- a/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/src/main/java/org/apache/nifi/processors/cybersecurity/CompareFuzzyHash.java
+++ b/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/src/main/java/org/apache/nifi/processors/cybersecurity/CompareFuzzyHash.java
@@ -26,9 +26,10 @@
import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.SeeAlso;
import org.apache.nifi.annotation.documentation.Tags;
-import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.components.AllowableValue;
import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.ProcessContext;
@@ -46,11 +47,12 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
@EventDriven
@@ -80,10 +82,10 @@
public static final PropertyDescriptor HASH_LIST_FILE = new PropertyDescriptor.Builder()
.name("HASH_LIST_FILE")
- .displayName("Hash List source file")
+ .displayName("Hash List Source File")
.description("Path to the file containing hashes to be validated against")
.required(true)
- .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
.build();
// Note we add a PropertyDescriptor HASH_ALGORITHM and ATTRIBUTE_NAME from parent class
@@ -93,7 +95,7 @@
// The rationale behind being the expectation that other algorithms thatmay return double values
// may be added to the processor later on.
.name("MATCH_THRESHOLD")
- .displayName("Match threshold")
+ .displayName("Match Threshold")
.description("The similarity score must exceed or be equal to in order for" +
"match to be considered true. Refer to Additional Information for differences between TLSH " +
"and SSDEEP scores and how they relate to this property.")
@@ -103,7 +105,7 @@
public static final PropertyDescriptor MATCHING_MODE = new PropertyDescriptor.Builder()
.name("MATCHING_MODE")
- .displayName("Matching mode")
+ .displayName("Matching Mode")
.description("Defines if the Processor should try to match as many entries as possible (" + multiMatch.getDisplayName() +
") or if it should stop after the first match (" + singleMatch.getDisplayName() + ")")
.required(true)
@@ -154,9 +156,6 @@
return descriptors;
}
- @OnScheduled
- public void onScheduled(final ProcessContext context) {
- }
@Override
public void onTrigger(ProcessContext context, ProcessSession session) throws ProcessException {
@@ -179,7 +178,7 @@
return;
}
- FuzzyHashMatcher fuzzyHashMatcher = null;
+ final FuzzyHashMatcher fuzzyHashMatcher;
switch (algorithm) {
case tlsh:
@@ -195,12 +194,11 @@
return;
}
- if (fuzzyHashMatcher.isValidHash(inputHash) == false) {
+ if (!fuzzyHashMatcher.isValidHash(inputHash)) {
// and if that is the case we log
- logger.error("Invalid hash provided. Sending to failure");
+ logger.error("Invalid hash provided for {}. Sending to failure", flowFile);
// and send to failure
session.transfer(flowFile, REL_FAILURE);
- session.commit();
return;
}
@@ -208,14 +206,12 @@
double matchThreshold = context.getProperty(MATCH_THRESHOLD).asDouble();
try {
- Map<String, Double> matched = new ConcurrentHashMap<String, Double>();
+ Map<String, Double> matched = new HashMap<>();
- BufferedReader reader = fuzzyHashMatcher.getReader(context.getProperty(HASH_LIST_FILE).getValue());
+ try (BufferedReader reader = fuzzyHashMatcher.getReader(context.getProperty(HASH_LIST_FILE).getValue())) {
+ String line = null;
- String line = null;
-
- iterateFile: while ((line = reader.readLine()) != null) {
- if (line != null) {
+ while ((line = reader.readLine()) != null) {
similarity = fuzzyHashMatcher.getSimilarity(inputHash, line);
if (fuzzyHashMatcher.matchExceedsThreshold(similarity, matchThreshold)) {
@@ -227,48 +223,44 @@
} else {
logger.error("Found a match against a malformed entry '{}'. Please inspect the contents of" +
"the {} file and ensure they are properly formatted",
- new Object[]{line, HASH_LIST_FILE.getDisplayName()});
+ new Object[]{line, HASH_LIST_FILE.getDisplayName()});
}
}
- }
- // Check if single match is desired and if a match has been made
- if (context.getProperty(MATCHING_MODE).getValue() == singleMatch.getValue() && (matched.size() > 0)) {
- // and save time by breaking the outer loop
- break iterateFile;
+ // Check if single match is desired and if a match has been made
+ if (Objects.equals(context.getProperty(MATCHING_MODE).getValue(), singleMatch.getValue()) && (matched.size() > 0)) {
+ // and save time by breaking the outer loop
+ break;
+ }
}
}
- // no matter if the break was called or not, Continue processing
- // First by creating a new map to hold attributes
- Map<String, String> attributes = new ConcurrentHashMap<String, String>();
// Then by iterating over the hashmap of matches
if (matched.size() > 0) {
+ // no matter if the break was called or not, Continue processing
+ // First by creating a new map to hold attributes
+ final Map<String, String> attributes = new HashMap<>();
+
int x = 0;
for (Map.Entry<String, Double> entry : matched.entrySet()) {
// defining attributes accordingly
- attributes.put(
- attributeName + "." + x + ".match",
- entry.getKey());
- attributes.put(
- attributeName + "." + x + ".similarity",
- String.valueOf(entry.getValue()));
+ attributes.put(attributeName + "." + x + ".match", entry.getKey());
+ attributes.put(attributeName + "." + x + ".similarity", String.valueOf(entry.getValue()));
x++;
}
+
// Finally, append the attributes to the flowfile and sent to match
flowFile = session.putAllAttributes(flowFile, attributes);
session.transfer(flowFile, REL_FOUND);
session.commit();
- return;
} else {
// Otherwise send it to non-match
session.transfer(flowFile, REL_NOT_FOUND);
session.commit();
- return;
}
- } catch (IOException e) {
- logger.error("Error while reading the hash input source" );
- context.yield();
+ } catch (final IOException e) {
+ logger.error("Error while reading the hash input source for {}", flowFile, e);
+ session.transfer(flowFile, REL_FAILURE);
}
}
diff --git a/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/src/main/java/org/apache/nifi/rules/RulesFactory.java b/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/src/main/java/org/apache/nifi/rules/RulesFactory.java
index 177231d..af258e9 100644
--- a/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/src/main/java/org/apache/nifi/rules/RulesFactory.java
+++ b/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/src/main/java/org/apache/nifi/rules/RulesFactory.java
@@ -51,13 +51,15 @@
}
public static List<Rule> createRulesFromFile(String ruleFile, String ruleFileType, String rulesFileFormat) throws Exception {
- InputStream rulesInputStream = new FileInputStream(ruleFile);
- return createRules(rulesInputStream, ruleFileType, rulesFileFormat);
+ try (final InputStream rulesInputStream = new FileInputStream(ruleFile)) {
+ return createRules(rulesInputStream, ruleFileType, rulesFileFormat);
+ }
}
public static List<Rule> createRulesFromString(String rulesBody, String ruleFileType, String rulesFileFormat) throws Exception {
- InputStream rulesInputStream = new ByteArrayInputStream(rulesBody.getBytes());
- return createRules(rulesInputStream, ruleFileType, rulesFileFormat);
+ try (final InputStream rulesInputStream = new ByteArrayInputStream(rulesBody.getBytes())) {
+ return createRules(rulesInputStream, ruleFileType, rulesFileFormat);
+ }
}
private static List<Rule> createRules(InputStream rulesInputStream, String ruleFileType, String rulesFileFormat) throws Exception {
@@ -71,11 +73,9 @@
default:
return null;
}
-
}
private static List<Rule> createRulesFromEasyRulesFormat(InputStream rulesInputStream, String ruleFileType, String ruleFileFormat) throws Exception {
-
RuleDefinitionReader reader = FileType.valueOf(ruleFileType).equals(FileType.YAML)
? new YamlRuleDefinitionReader() : new JsonRuleDefinitionReader();
diff --git a/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/src/main/java/org/apache/nifi/rules/engine/AbstractEasyRulesEngineController.java b/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/src/main/java/org/apache/nifi/rules/engine/AbstractEasyRulesEngineController.java
index b7b5e9d..df6ed44 100644
--- a/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/src/main/java/org/apache/nifi/rules/engine/AbstractEasyRulesEngineController.java
+++ b/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/src/main/java/org/apache/nifi/rules/engine/AbstractEasyRulesEngineController.java
@@ -22,11 +22,12 @@
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.Validator;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.controller.AbstractControllerService;
import org.apache.nifi.controller.ConfigurationContext;
import org.apache.nifi.controller.ControllerServiceInitializationContext;
import org.apache.nifi.expression.ExpressionLanguageScope;
-import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.rules.Rule;
import org.apache.nifi.rules.RulesFactory;
@@ -53,7 +54,7 @@
.displayName("Rules File Path")
.description("Path to location of rules file. Only one of Rules File or Rules Body may be used")
.required(false)
- .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearch5TransportClientProcessor.java b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearch5TransportClientProcessor.java
index 4a356b3..4196bab 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearch5TransportClientProcessor.java
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearch5TransportClientProcessor.java
@@ -17,6 +17,8 @@
package org.apache.nifi.processors.elasticsearch;
import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.ProcessContext;
@@ -74,7 +76,7 @@
+ "JARs must also be available to this processor. Note: Do NOT place the X-Pack JARs into NiFi's "
+ "lib/ directory, doing so will prevent the X-Pack Transport JARs from being loaded.")
.required(false)
- .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.MULTIPLE, ResourceType.FILE, ResourceType.DIRECTORY)
.dynamicallyModifiesClasspath(true)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchTransportClientProcessor.java b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchTransportClientProcessor.java
index c6f42a9..ca4e8e6 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchTransportClientProcessor.java
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchTransportClientProcessor.java
@@ -17,6 +17,8 @@
package org.apache.nifi.processors.elasticsearch;
import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.ProcessContext;
@@ -70,7 +72,7 @@
+ "JAR must also be available to this processor. Note: Do NOT place the Shield JAR into NiFi's "
+ "lib/ directory, doing so will prevent the Shield plugin from being loaded.")
.required(false)
- .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE, ResourceType.DIRECTORY)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
diff --git a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/AbstractEnrichIP.java b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/AbstractEnrichIP.java
index e726976..9711534 100644
--- a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/AbstractEnrichIP.java
+++ b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/AbstractEnrichIP.java
@@ -16,20 +16,11 @@
*/
package org.apache.nifi.processors;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
-
import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.annotation.lifecycle.OnStopped;
import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.expression.AttributeExpression;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.processor.AbstractProcessor;
@@ -40,6 +31,16 @@
import org.apache.nifi.processors.maxmind.DatabaseReader;
import org.apache.nifi.util.StopWatch;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+
public abstract class AbstractEnrichIP extends AbstractProcessor {
public static final PropertyDescriptor GEO_DATABASE_FILE = new PropertyDescriptor.Builder()
@@ -49,7 +50,7 @@
.displayName("MaxMind Database File")
.description("Path to Maxmind IP Enrichment Database File")
.required(true)
- .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE, ResourceType.DIRECTORY)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
@@ -89,12 +90,11 @@
@OnScheduled
public void onScheduled(final ProcessContext context) throws IOException {
- final String dbFileString = context.getProperty(GEO_DATABASE_FILE).evaluateAttributeExpressions().getValue();
- final File dbFile = new File(dbFileString);
+ final File dbFile = context.getProperty(GEO_DATABASE_FILE).evaluateAttributeExpressions().asResource().asFile();
final StopWatch stopWatch = new StopWatch(true);
final DatabaseReader reader = new DatabaseReader.Builder(dbFile).build();
stopWatch.stop();
- getLogger().info("Completed loading of Maxmind Database. Elapsed time was {} milliseconds.", new Object[]{stopWatch.getDuration(TimeUnit.MILLISECONDS)});
+ getLogger().info("Completed loading of Maxmind Database. Elapsed time was {} milliseconds.", stopWatch.getDuration(TimeUnit.MILLISECONDS));
databaseReaderRef.set(reader);
}
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/hadoop/KerberosProperties.java b/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/hadoop/KerberosProperties.java
index 5977b6c..d468272 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/hadoop/KerberosProperties.java
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/hadoop/KerberosProperties.java
@@ -21,6 +21,8 @@
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.Validator;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.util.StandardValidators;
@@ -86,7 +88,6 @@
.required(false)
.description("Kerberos principal to authenticate as. Requires nifi.kerberos.krb5.file to be set in your nifi.properties")
.addValidator(kerberosConfigValidator)
- .addValidator(StandardValidators.ATTRIBUTE_EXPRESSION_LANGUAGE_VALIDATOR)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
@@ -94,9 +95,8 @@
.name("Kerberos Keytab")
.required(false)
.description("Kerberos keytab associated with the principal. Requires nifi.kerberos.krb5.file to be set in your nifi.properties")
- .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
.addValidator(kerberosConfigValidator)
- .addValidator(StandardValidators.ATTRIBUTE_EXPRESSION_LANGUAGE_VALIDATOR)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java b/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
index 881237d..378b4d1 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
@@ -17,7 +17,6 @@
package org.apache.nifi.processors.hadoop;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -31,6 +30,9 @@
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceReferences;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.hadoop.KerberosProperties;
import org.apache.nifi.hadoop.SecurityUtil;
@@ -93,7 +95,7 @@
+ "will search the classpath for a 'core-site.xml' and 'hdfs-site.xml' file or will revert to a default configuration. "
+ "To use swebhdfs, see 'Additional Details' section of PutHDFS's documentation.")
.required(false)
- .addValidator(HadoopValidators.ONE_OR_MORE_FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.MULTIPLE, ResourceType.FILE)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
@@ -131,7 +133,7 @@
.description("A comma-separated list of paths to files and/or directories that will be added to the classpath and used for loading native libraries. " +
"When specifying a directory, all files with in the directory will be added to the classpath, but further sub-directories will not be included.")
.required(false)
- .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.MULTIPLE, ResourceType.FILE, ResourceType.DIRECTORY)
.dynamicallyModifiesClasspath(true)
.build();
@@ -188,7 +190,7 @@
@Override
protected Collection<ValidationResult> customValidate(ValidationContext validationContext) {
- final String configResources = validationContext.getProperty(HADOOP_CONFIGURATION_RESOURCES).evaluateAttributeExpressions().getValue();
+ final ResourceReferences configResources = validationContext.getProperty(HADOOP_CONFIGURATION_RESOURCES).evaluateAttributeExpressions().asResources();
final String explicitPrincipal = validationContext.getProperty(kerberosProperties.getKerberosPrincipal()).evaluateAttributeExpressions().getValue();
final String explicitKeytab = validationContext.getProperty(kerberosProperties.getKerberosKeytab()).evaluateAttributeExpressions().getValue();
final String explicitPassword = validationContext.getProperty(kerberosProperties.getKerberosPassword()).getValue();
@@ -206,7 +208,7 @@
final List<ValidationResult> results = new ArrayList<>();
- if (StringUtils.isBlank(configResources)) {
+ if (configResources.getCount() == 0) {
return results;
}
@@ -273,7 +275,7 @@
// properties this processor sets. TODO: re-work ListHDFS to utilize Kerberos
HdfsResources resources = hdfsResources.get();
if (resources.getConfiguration() == null) {
- final String configResources = context.getProperty(HADOOP_CONFIGURATION_RESOURCES).evaluateAttributeExpressions().getValue();
+ final ResourceReferences configResources = context.getProperty(HADOOP_CONFIGURATION_RESOURCES).evaluateAttributeExpressions().asResources();
resources = resetHDFSResources(configResources, context);
hdfsResources.set(resources);
}
@@ -346,17 +348,14 @@
}
}
- private static Configuration getConfigurationFromResources(final Configuration config, String configResources) throws IOException {
- boolean foundResources = false;
- if (null != configResources) {
- String[] resources = configResources.split(",");
- for (String resource : resources) {
+ private static Configuration getConfigurationFromResources(final Configuration config, final ResourceReferences resourceReferences) throws IOException {
+ boolean foundResources = resourceReferences.getCount() > 0;
+ if (foundResources) {
+ final List<String> locations = resourceReferences.asLocations();
+ for (String resource : locations) {
config.addResource(new Path(resource.trim()));
- foundResources = true;
}
- }
-
- if (!foundResources) {
+ } else {
// check that at least 1 non-default resource is available on the classpath
String configStr = config.toString();
for (String resource : configStr.substring(configStr.indexOf(":") + 1).split(",")) {
@@ -376,11 +375,11 @@
/*
* Reset Hadoop Configuration and FileSystem based on the supplied configuration resources.
*/
- HdfsResources resetHDFSResources(String configResources, ProcessContext context) throws IOException {
+ HdfsResources resetHDFSResources(final ResourceReferences resourceReferences, ProcessContext context) throws IOException {
Configuration config = new ExtendedConfiguration(getLogger());
config.setClassLoader(Thread.currentThread().getContextClassLoader());
- getConfigurationFromResources(config, configResources);
+ getConfigurationFromResources(config, resourceReferences);
// give sub-classes a chance to process configuration
preProcessConfiguration(config, context);
@@ -624,15 +623,15 @@
}
static protected class ValidationResources {
- private final String configResources;
+ private final ResourceReferences configResources;
private final Configuration configuration;
- public ValidationResources(String configResources, Configuration configuration) {
+ public ValidationResources(final ResourceReferences configResources, Configuration configuration) {
this.configResources = configResources;
this.configuration = configuration;
}
- public String getConfigResources() {
+ public ResourceReferences getConfigResources() {
return configResources;
}
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/HadoopValidators.java b/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/HadoopValidators.java
index f3d79b5..1db2e54 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/HadoopValidators.java
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/HadoopValidators.java
@@ -20,43 +20,12 @@
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.Validator;
-import java.io.File;
-
/**
* Validators for Hadoop related processors.
*/
public interface HadoopValidators {
/*
- * Validates that one or more files exist, as specified in a single property.
- */
- Validator ONE_OR_MORE_FILE_EXISTS_VALIDATOR = new Validator() {
- @Override
- public ValidationResult validate(String subject, String input, ValidationContext context) {
- if (context.isExpressionLanguageSupported(subject) && context.isExpressionLanguagePresent(input)) {
- return new ValidationResult.Builder().subject(subject).input(input).explanation("Expression Language Present").valid(true).build();
- }
-
- final String[] files = input.split(",");
- for (String filename : files) {
- try {
- final File file = new File(filename.trim());
- final boolean valid = file.exists() && file.isFile();
- if (!valid) {
- final String message = "File " + file + " does not exist or is not a file";
- return new ValidationResult.Builder().subject(subject).input(input).valid(false).explanation(message).build();
- }
- } catch (SecurityException e) {
- final String message = "Unable to access " + filename + " due to " + e.getMessage();
- return new ValidationResult.Builder().subject(subject).input(input).valid(false).explanation(message).build();
- }
- }
- return new ValidationResult.Builder().subject(subject).input(input).valid(true).build();
- }
-
- };
-
- /*
* Validates that a property is a valid umask, i.e. a short octal number that is not negative.
*/
Validator UMASK_VALIDATOR = new Validator() {
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/test/groovy/org/apache/nifi/processors/hadoop/AbstractHadoopProcessorSpec.groovy b/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/test/groovy/org/apache/nifi/processors/hadoop/AbstractHadoopProcessorSpec.groovy
deleted file mode 100644
index 49a835f..0000000
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/test/groovy/org/apache/nifi/processors/hadoop/AbstractHadoopProcessorSpec.groovy
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.processors.hadoop
-
-import org.apache.nifi.components.PropertyValue
-import org.apache.nifi.components.ValidationContext
-import org.apache.nifi.hadoop.KerberosProperties
-import org.apache.nifi.kerberos.KerberosCredentialsService
-import org.apache.nifi.processor.ProcessContext
-import org.apache.nifi.processor.ProcessSession
-import org.apache.nifi.processor.ProcessorInitializationContext
-import org.apache.nifi.processor.exception.ProcessException
-import org.apache.nifi.util.MockComponentLog
-import org.apache.nifi.util.MockPropertyValue
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
-import spock.lang.Specification
-import spock.lang.Unroll
-
-class AbstractHadoopProcessorSpec extends Specification {
- private static Logger LOGGER = LoggerFactory.getLogger AbstractHadoopProcessorSpec
-
- @Unroll
- def "customValidate for #testName"() {
- given:
- def testAbstractHadoopProcessor = new TestAbstractHadoopProcessor(allowExplicitKeytab);
- testAbstractHadoopProcessor.kerberosProperties = new KerberosProperties(new File('src/test/resources/krb5.conf'))
- def mockProcessorInitializationContext = Mock ProcessorInitializationContext
- def mockValidationContext = Mock ValidationContext
- def mockHadoopConfigurationResourcesPropertyValue = Mock PropertyValue
- def mockKerberosCredentialsServicePropertyValue = Mock PropertyValue
- def mockKerberosCredentialsServiceControllerService = Mock KerberosCredentialsService
-
- when:
- testAbstractHadoopProcessor.initialize(mockProcessorInitializationContext)
- def validationResults = testAbstractHadoopProcessor.customValidate(mockValidationContext)
-
- then:
- 1 * mockProcessorInitializationContext.getLogger() >> new MockComponentLog("AbstractHadoopProcessorSpec", testAbstractHadoopProcessor)
- 1 * mockValidationContext.getProperty(AbstractHadoopProcessor.HADOOP_CONFIGURATION_RESOURCES) >> mockHadoopConfigurationResourcesPropertyValue
- 1 * mockHadoopConfigurationResourcesPropertyValue.evaluateAttributeExpressions() >> mockHadoopConfigurationResourcesPropertyValue
- 1 * mockHadoopConfigurationResourcesPropertyValue.getValue() >> "src/test/resources/test-secure-core-site.xml"
-
- 1 * mockValidationContext.getProperty(AbstractHadoopProcessor.KERBEROS_CREDENTIALS_SERVICE) >> mockKerberosCredentialsServicePropertyValue
- if (configuredKeytabCredentialsService) {
- 1 * mockKerberosCredentialsServicePropertyValue.asControllerService(KerberosCredentialsService.class) >> mockKerberosCredentialsServiceControllerService
- 1 * mockKerberosCredentialsServiceControllerService.principal >> configuredKeytabCredentialsServicePrincipal
- 1 * mockKerberosCredentialsServiceControllerService.keytab >> configuredKeytabCredentialsServiceKeytab
- }
-
- 1 * mockValidationContext.getProperty(testAbstractHadoopProcessor.kerberosProperties.kerberosPrincipal) >> new MockPropertyValue(configuredPrincipal)
- 1 * mockValidationContext.getProperty(testAbstractHadoopProcessor.kerberosProperties.kerberosPassword) >> new MockPropertyValue(configuredPassword)
- 1 * mockValidationContext.getProperty(testAbstractHadoopProcessor.kerberosProperties.kerberosKeytab) >> new MockPropertyValue(configuredKeytab)
-
- then:
- def actualValidationErrors = validationResults.each { !it.isValid() }
- if (actualValidationErrors.size() > 0) {
- actualValidationErrors.each { LOGGER.debug(it.toString()) }
- }
- actualValidationErrors.size() == expectedValidationErrorCount
-
- where:
- testName | configuredPrincipal | configuredKeytab | configuredPassword | allowExplicitKeytab | configuredKeytabCredentialsService | configuredKeytabCredentialsServicePrincipal | configuredKeytabCredentialsServiceKeytab || expectedValidationErrorCount
- "success case 1" | "principal" | "keytab" | null | true | false | null | null || 0
- "success case 2" | "principal" | null | "password" | true | false | null | null || 0
- "success case 3" | "principal" | null | "password" | false | false | null | null || 0
- "success case 4" | null | null | null | true | true | "principal" | "keytab" || 0
- "success case 5" | null | null | null | false | true | "principal" | "keytab" || 0
- // do not allow explicit keytab, but provide one anyway; validation fails
- "failure case 1" | "principal" | "keytab" | null | false | false | null | null || 1
- "failure case 2" | null | "keytab" | null | false | false | null | null || 2
- // keytab credentials service is provided, but explicit properties for principal, password, or keytab are also provided; validation fails
- "failure case 3" | "principal" | null | null | true | true | "principal" | "keytab" || 1
- "failure case 4" | null | "keytab" | null | true | true | "principal" | "keytab" || 1
- "failure case 5" | null | null | "password" | true | true | "principal" | "keytab" || 2
- "failure case 6" | "principal" | null | null | false | true | "principal" | "keytab" || 1
- "failure case 7" | null | "keytab" | null | false | true | "principal" | "keytab" || 2
- "failure case 8" | null | null | "password" | false | true | "principal" | "keytab" || 2
- }
-
- private class TestAbstractHadoopProcessor extends AbstractHadoopProcessor {
- def allowExplicitKeytab = false
-
- TestAbstractHadoopProcessor(def allowExplicitKeytab) {
- this.allowExplicitKeytab = allowExplicitKeytab
- }
-
- @Override
- void onTrigger(ProcessContext context, ProcessSession session) throws ProcessException {
- throw new NoSuchMethodError("not intended to be invoked by the test, this implementation is only intended for custom validation purposes")
- }
-
- @Override
- boolean isAllowExplicitKeytab() {
- allowExplicitKeytab
- }
-
- }
-}
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-kerberos-test-utils/src/main/java/org/apache/nifi/kerberos/MockKerberosCredentialsService.java b/nifi-nar-bundles/nifi-extension-utils/nifi-kerberos-test-utils/src/main/java/org/apache/nifi/kerberos/MockKerberosCredentialsService.java
index b7b2a01..4ca23fb 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-kerberos-test-utils/src/main/java/org/apache/nifi/kerberos/MockKerberosCredentialsService.java
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-kerberos-test-utils/src/main/java/org/apache/nifi/kerberos/MockKerberosCredentialsService.java
@@ -18,6 +18,8 @@
import org.apache.nifi.annotation.lifecycle.OnEnabled;
import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.controller.AbstractControllerService;
import org.apache.nifi.controller.ConfigurationContext;
import org.apache.nifi.expression.ExpressionLanguageScope;
@@ -46,7 +48,7 @@
public static final PropertyDescriptor KEYTAB = new PropertyDescriptor.Builder()
.name("Kerberos Keytab")
.description("Kerberos keytab associated with the principal. Requires nifi.kerberos.krb5.file to be set in your nifi.properties")
- .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.required(true)
.build();
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java
index ce8f952..90209cc 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java
@@ -34,6 +34,9 @@
import org.apache.nifi.components.ConfigurableComponent;
import org.apache.nifi.components.PropertyDependency;
import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceDefinition;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.controller.ControllerService;
import org.apache.nifi.documentation.DocumentationWriter;
import org.apache.nifi.expression.ExpressionLanguageScope;
@@ -530,6 +533,35 @@
writeSimpleElement(xmlStreamWriter, "strong", "Sensitive Property: true");
}
+ final ResourceDefinition resourceDefinition = property.getResourceDefinition();
+ if (resourceDefinition != null) {
+ xmlStreamWriter.writeEmptyElement("br");
+ xmlStreamWriter.writeEmptyElement("br");
+ xmlStreamWriter.writeStartElement("strong");
+
+ final ResourceCardinality cardinality = resourceDefinition.getCardinality();
+ final Set<ResourceType> resourceTypes = resourceDefinition.getResourceTypes();
+ if (cardinality == ResourceCardinality.MULTIPLE) {
+ if (resourceTypes.size() == 1) {
+ xmlStreamWriter.writeCharacters("This property expects a comma-separated list of " + resourceTypes.iterator().next() + " resources");
+ } else {
+ xmlStreamWriter.writeCharacters("This property expects a comma-separated list of resources. Each of the resources may be of any of the following types: " +
+ StringUtils.join(resourceDefinition.getResourceTypes(), ", "));
+ }
+ } else {
+ if (resourceTypes.size() == 1) {
+ xmlStreamWriter.writeCharacters("This property requires exactly one " + resourceTypes.iterator().next() + " to be provided.");
+ } else {
+ xmlStreamWriter.writeCharacters("This property requires exactly one resource to be provided. That resource may be any of the following types: " +
+ StringUtils.join(resourceDefinition.getResourceTypes(), ", "));
+ }
+ }
+
+ xmlStreamWriter.writeCharacters(".");
+ xmlStreamWriter.writeEndElement();
+ xmlStreamWriter.writeEmptyElement("br");
+ }
+
if (property.isExpressionLanguageSupported()) {
xmlStreamWriter.writeEmptyElement("br");
String text = "Supports Expression Language: true";
@@ -595,7 +627,8 @@
suffix = sb.toString();
}
- writeSimpleElement(xmlStreamWriter, "strong", prefix + suffix);
+ final String elementName = dependencies.size() > 1 ? "li" : "strong";
+ writeSimpleElement(xmlStreamWriter, elementName, prefix + suffix);
}
if (dependencies.size() > 1) { // write </ul>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingContext.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingContext.java
index a844cc2..68e4004 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingContext.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingContext.java
@@ -22,6 +22,9 @@
import org.apache.nifi.attribute.expression.language.StandardPropertyValue;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.PropertyValue;
+import org.apache.nifi.components.resource.ResourceContext;
+import org.apache.nifi.components.resource.StandardResourceContext;
+import org.apache.nifi.components.resource.StandardResourceReferenceFactory;
import org.apache.nifi.connectable.Connectable;
import org.apache.nifi.controller.ControllerServiceLookup;
import org.apache.nifi.controller.flow.FlowManager;
@@ -104,7 +107,9 @@
}
final String configuredValue = properties.get(property);
- return new StandardPropertyValue(configuredValue == null ? descriptor.getDefaultValue() : configuredValue, serviceProvider, parameterLookup, preparedQueries.get(property), variableRegistry);
+ final ResourceContext resourceContext = new StandardResourceContext(new StandardResourceReferenceFactory(), descriptor);
+ return new StandardPropertyValue(resourceContext, configuredValue == null ? descriptor.getDefaultValue() : configuredValue, serviceProvider, parameterLookup, preparedQueries.get(property),
+ variableRegistry);
}
@Override
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/repository/scheduling/ConnectableProcessContext.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/repository/scheduling/ConnectableProcessContext.java
index e02a395..3d24128 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/repository/scheduling/ConnectableProcessContext.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/repository/scheduling/ConnectableProcessContext.java
@@ -18,6 +18,8 @@
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.PropertyValue;
+import org.apache.nifi.components.resource.ResourceReference;
+import org.apache.nifi.components.resource.ResourceReferences;
import org.apache.nifi.components.state.StateManager;
import org.apache.nifi.connectable.Connectable;
import org.apache.nifi.connectable.Connection;
@@ -138,6 +140,16 @@
}
@Override
+ public ResourceReference asResource() {
+ return null;
+ }
+
+ @Override
+ public ResourceReferences asResources() {
+ return null;
+ }
+
+ @Override
public boolean isSet() {
return false;
}
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/service/StandardConfigurationContext.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/service/StandardConfigurationContext.java
index f77062d..028a129 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/service/StandardConfigurationContext.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/service/StandardConfigurationContext.java
@@ -21,6 +21,9 @@
import org.apache.nifi.attribute.expression.language.StandardPropertyValue;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.PropertyValue;
+import org.apache.nifi.components.resource.ResourceContext;
+import org.apache.nifi.components.resource.StandardResourceContext;
+import org.apache.nifi.components.resource.StandardResourceReferenceFactory;
import org.apache.nifi.controller.ComponentNode;
import org.apache.nifi.controller.ConfigurationContext;
import org.apache.nifi.controller.ControllerServiceLookup;
@@ -80,7 +83,8 @@
final PropertyDescriptor resolvedDescriptor = component.getPropertyDescriptor(property.getName());
final String resolvedValue = (configuredValue == null) ? resolvedDescriptor.getDefaultValue() : configuredValue;
- return new StandardPropertyValue(resolvedValue, serviceLookup, component.getParameterLookup(), preparedQueries.get(property), variableRegistry);
+ final ResourceContext resourceContext = new StandardResourceContext(new StandardResourceReferenceFactory(), property);
+ return new StandardPropertyValue(resourceContext, resolvedValue, serviceLookup, component.getParameterLookup(), preparedQueries.get(property), variableRegistry);
}
@Override
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/state/manager/StandardStateManagerProvider.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/state/manager/StandardStateManagerProvider.java
index 4637271..e7e95f8 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/state/manager/StandardStateManagerProvider.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/state/manager/StandardStateManagerProvider.java
@@ -24,6 +24,10 @@
import org.apache.nifi.components.PropertyValue;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.resource.ResourceContext;
+import org.apache.nifi.components.resource.ResourceReferenceFactory;
+import org.apache.nifi.components.resource.StandardResourceContext;
+import org.apache.nifi.components.resource.StandardResourceReferenceFactory;
import org.apache.nifi.components.state.Scope;
import org.apache.nifi.components.state.StateManager;
import org.apache.nifi.components.state.StateManagerProvider;
@@ -219,9 +223,12 @@
final ParameterParser parser = new ExpressionLanguageAwareParameterParser();
final Map<PropertyDescriptor, PropertyValue> propertyMap = new HashMap<>();
final Map<PropertyDescriptor, PropertyConfiguration> propertyStringMap = new HashMap<>();
+
+ final ResourceReferenceFactory resourceReferenceFactory = new StandardResourceReferenceFactory();
//set default configuration
for (final PropertyDescriptor descriptor : provider.getPropertyDescriptors()) {
- propertyMap.put(descriptor, new StandardPropertyValue(descriptor.getDefaultValue(),null, parameterLookup, variableRegistry));
+ final ResourceContext resourceContext = new StandardResourceContext(resourceReferenceFactory, descriptor);
+ propertyMap.put(descriptor, new StandardPropertyValue(resourceContext, descriptor.getDefaultValue(),null, parameterLookup, variableRegistry));
final ParameterTokenList references = parser.parseTokens(descriptor.getDefaultValue());
final PropertyConfiguration configuration = new PropertyConfiguration(descriptor.getDefaultValue(), references, references.toReferenceList());
@@ -237,7 +244,8 @@
final PropertyConfiguration configuration = new PropertyConfiguration(entry.getValue(), references, references.toReferenceList());
propertyStringMap.put(descriptor, configuration);
- propertyMap.put(descriptor, new StandardPropertyValue(entry.getValue(),null, parameterLookup, variableRegistry));
+ final ResourceContext resourceContext = new StandardResourceContext(resourceReferenceFactory, descriptor);
+ propertyMap.put(descriptor, new StandardPropertyValue(resourceContext, entry.getValue(),null, parameterLookup, variableRegistry));
}
final ComponentLog logger = new SimpleProcessLogger(providerId, provider);
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/processor/StandardProcessContext.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/processor/StandardProcessContext.java
index b363683..aac9ba3 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/processor/StandardProcessContext.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/processor/StandardProcessContext.java
@@ -22,6 +22,9 @@
import org.apache.nifi.attribute.expression.language.StandardPropertyValue;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.PropertyValue;
+import org.apache.nifi.components.resource.ResourceContext;
+import org.apache.nifi.components.resource.StandardResourceContext;
+import org.apache.nifi.components.resource.StandardResourceReferenceFactory;
import org.apache.nifi.components.state.StateManager;
import org.apache.nifi.connectable.Connection;
import org.apache.nifi.controller.ControllerService;
@@ -92,16 +95,18 @@
public PropertyValue getProperty(final PropertyDescriptor descriptor) {
verifyTaskActive();
+ final ResourceContext resourceContext = new StandardResourceContext(new StandardResourceReferenceFactory(), descriptor);
+
final String setPropertyValue = properties.get(descriptor);
if (setPropertyValue != null) {
- return new StandardPropertyValue(setPropertyValue, this, procNode.getParameterLookup(), preparedQueries.get(descriptor), procNode.getVariableRegistry());
+ return new StandardPropertyValue(resourceContext, setPropertyValue, this, procNode.getParameterLookup(), preparedQueries.get(descriptor), procNode.getVariableRegistry());
}
// Get the "canonical" Property Descriptor from the Processor
final PropertyDescriptor canonicalDescriptor = procNode.getProcessor().getPropertyDescriptor(descriptor.getName());
final String defaultValue = canonicalDescriptor.getDefaultValue();
- return new StandardPropertyValue(defaultValue, this, procNode.getParameterLookup(), preparedQueries.get(descriptor), procNode.getVariableRegistry());
+ return new StandardPropertyValue(resourceContext, defaultValue, this, procNode.getParameterLookup(), preparedQueries.get(descriptor), procNode.getVariableRegistry());
}
/**
@@ -120,14 +125,15 @@
final String setPropertyValue = properties.get(descriptor);
final String propValue = (setPropertyValue == null) ? descriptor.getDefaultValue() : setPropertyValue;
-
- return new StandardPropertyValue(propValue, this, procNode.getParameterLookup(), preparedQueries.get(descriptor), procNode.getVariableRegistry());
+ final ResourceContext resourceContext = new StandardResourceContext(new StandardResourceReferenceFactory(), descriptor);
+ return new StandardPropertyValue(resourceContext, propValue, this, procNode.getParameterLookup(), preparedQueries.get(descriptor), procNode.getVariableRegistry());
}
@Override
public PropertyValue newPropertyValue(final String rawValue) {
verifyTaskActive();
- return new StandardPropertyValue(rawValue, this, procNode.getParameterLookup(), Query.prepareWithParametersPreEvaluated(rawValue), procNode.getVariableRegistry());
+ final ResourceContext resourceContext = new StandardResourceContext(new StandardResourceReferenceFactory(), null);
+ return new StandardPropertyValue(resourceContext, rawValue, this, procNode.getParameterLookup(), Query.prepareWithParametersPreEvaluated(rawValue), procNode.getVariableRegistry());
}
@Override
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/processor/StandardValidationContext.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/processor/StandardValidationContext.java
index 91a8156..e2ca1d2 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/processor/StandardValidationContext.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/processor/StandardValidationContext.java
@@ -17,7 +17,6 @@
*/
package org.apache.nifi.processor;
-import org.apache.nifi.components.validation.AbstractValidationContext;
import org.apache.nifi.attribute.expression.language.PreparedQuery;
import org.apache.nifi.attribute.expression.language.Query;
import org.apache.nifi.attribute.expression.language.Query.Range;
@@ -26,6 +25,10 @@
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.PropertyValue;
import org.apache.nifi.components.ValidationContext;
+import org.apache.nifi.components.resource.ResourceContext;
+import org.apache.nifi.components.resource.StandardResourceContext;
+import org.apache.nifi.components.resource.StandardResourceReferenceFactory;
+import org.apache.nifi.components.validation.AbstractValidationContext;
import org.apache.nifi.controller.ControllerService;
import org.apache.nifi.controller.ControllerServiceLookup;
import org.apache.nifi.controller.PropertyConfiguration;
@@ -103,7 +106,8 @@
@Override
public PropertyValue newPropertyValue(final String rawValue) {
- return new StandardPropertyValue(rawValue, controllerServiceProvider, parameterContext, Query.prepareWithParametersPreEvaluated(rawValue), variableRegistry);
+ final ResourceContext resourceContext = new StandardResourceContext(new StandardResourceReferenceFactory(), null);
+ return new StandardPropertyValue(resourceContext, rawValue, controllerServiceProvider, parameterContext, Query.prepareWithParametersPreEvaluated(rawValue), variableRegistry);
}
@Override
@@ -124,7 +128,8 @@
public PropertyValue getProperty(final PropertyDescriptor property) {
final PropertyConfiguration configuredValue = properties.get(property);
final String effectiveValue = configuredValue == null ? property.getDefaultValue() : configuredValue.getEffectiveValue(parameterContext);
- return new StandardPropertyValue(effectiveValue, controllerServiceProvider, parameterContext, preparedQueries.get(property), variableRegistry);
+ final ResourceContext resourceContext = new StandardResourceContext(new StandardResourceReferenceFactory(), property);
+ return new StandardPropertyValue(resourceContext, effectiveValue, controllerServiceProvider, parameterContext, preparedQueries.get(property), variableRegistry);
}
@Override
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/processor/TestStandardPropertyValue.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/processor/TestStandardPropertyValue.java
index be0ae24..fbefcc1 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/processor/TestStandardPropertyValue.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/processor/TestStandardPropertyValue.java
@@ -127,7 +127,7 @@
@Test
public void testisExpressionLanguagePresentShouldHandleNPE() {
// Arrange
- final PropertyValue value = new StandardPropertyValue(null, lookup, ParameterLookup.EMPTY, null, null);
+ final PropertyValue value = new StandardPropertyValue(null, lookup, ParameterLookup.EMPTY);
// Act
boolean elPresent = value.isExpressionLanguagePresent();
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractComponentNode.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractComponentNode.java
index a40c729..dec673b 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractComponentNode.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractComponentNode.java
@@ -24,6 +24,11 @@
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.resource.ResourceContext;
+import org.apache.nifi.components.resource.ResourceReferenceFactory;
+import org.apache.nifi.components.resource.ResourceReferences;
+import org.apache.nifi.components.resource.StandardResourceContext;
+import org.apache.nifi.components.resource.StandardResourceReferenceFactory;
import org.apache.nifi.components.validation.DisabledServiceValidationResult;
import org.apache.nifi.components.validation.EnablingServiceValidationResult;
import org.apache.nifi.components.validation.ValidationState;
@@ -51,10 +56,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashMap;
@@ -161,28 +164,23 @@
}
private Set<URL> getAdditionalClasspathResources(final Collection<PropertyDescriptor> propertyDescriptors) {
- final Set<String> modulePaths = new LinkedHashSet<>();
+ final Set<URL> additionalUrls = new LinkedHashSet<>();
+ final ResourceReferenceFactory resourceReferenceFactory = new StandardResourceReferenceFactory();
+
for (final PropertyDescriptor descriptor : propertyDescriptors) {
if (descriptor.isDynamicClasspathModifier()) {
final PropertyConfiguration propertyConfiguration = getProperty(descriptor);
final String value = propertyConfiguration == null ? null : propertyConfiguration.getEffectiveValue(getParameterContext());
if (!StringUtils.isEmpty(value)) {
- final StandardPropertyValue propertyValue = new StandardPropertyValue(value, null, getParameterLookup(), variableRegistry);
- modulePaths.add(propertyValue.evaluateAttributeExpressions().getValue());
+ final ResourceContext resourceContext = new StandardResourceContext(resourceReferenceFactory, descriptor);
+ final StandardPropertyValue propertyValue = new StandardPropertyValue(resourceContext, value, null, getParameterLookup(), variableRegistry);
+ final ResourceReferences references = propertyValue.evaluateAttributeExpressions().asResources().flatten();
+ additionalUrls.addAll(references.asURLs());
}
}
}
- final Set<URL> additionalUrls = new LinkedHashSet<>();
- try {
- final URL[] urls = ClassLoaderUtils.getURLsForClasspath(modulePaths, null, true);
- if (urls != null) {
- additionalUrls.addAll(Arrays.asList(urls));
- }
- } catch (MalformedURLException mfe) {
- getLogger().error("Error processing classpath resources for " + id + ": " + mfe.getMessage(), mfe);
- }
return additionalUrls;
}
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/history/EmbeddedQuestDbRolloverHandlerTest.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/history/EmbeddedQuestDbRolloverHandlerTest.java
index d30bec2..977380e 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/history/EmbeddedQuestDbRolloverHandlerTest.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/history/EmbeddedQuestDbRolloverHandlerTest.java
@@ -30,6 +30,7 @@
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,6 +44,7 @@
import java.util.concurrent.TimeUnit;
import java.util.function.Supplier;
+@Ignore("Buggy tests depend on time of day")
public class EmbeddedQuestDbRolloverHandlerTest {
private static final Logger LOGGER = LoggerFactory.getLogger(EmbeddedQuestDbRolloverHandlerTest.class);
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/StandardSearchContext.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/StandardSearchContext.java
index 233939f..265abec 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/StandardSearchContext.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/StandardSearchContext.java
@@ -16,12 +16,15 @@
*/
package org.apache.nifi.web.controller;
-import org.apache.nifi.parameter.ParameterLookup;
import org.apache.nifi.attribute.expression.language.StandardPropertyValue;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.PropertyValue;
+import org.apache.nifi.components.resource.ResourceContext;
+import org.apache.nifi.components.resource.StandardResourceContext;
+import org.apache.nifi.components.resource.StandardResourceReferenceFactory;
import org.apache.nifi.controller.ControllerServiceLookup;
import org.apache.nifi.controller.ProcessorNode;
+import org.apache.nifi.parameter.ParameterLookup;
import org.apache.nifi.registry.VariableRegistry;
import org.apache.nifi.search.SearchContext;
@@ -55,9 +58,10 @@
}
@Override
- public PropertyValue getProperty(PropertyDescriptor property) {
+ public PropertyValue getProperty(final PropertyDescriptor property) {
final String configuredValue = processorNode.getRawPropertyValue(property);
- return new StandardPropertyValue(configuredValue == null ? property.getDefaultValue() : configuredValue, controllerServiceLookup, ParameterLookup.EMPTY, variableRegistry);
+ final ResourceContext resourceContext = new StandardResourceContext(new StandardResourceReferenceFactory(), property);
+ return new StandardPropertyValue(resourceContext, configuredValue == null ? property.getDefaultValue() : configuredValue, controllerServiceLookup, ParameterLookup.EMPTY, variableRegistry);
}
@Override
diff --git a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/credentials/factory/CredentialPropertyDescriptors.java b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/credentials/factory/CredentialPropertyDescriptors.java
index 9d3a519..22df628 100644
--- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/credentials/factory/CredentialPropertyDescriptors.java
+++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/credentials/factory/CredentialPropertyDescriptors.java
@@ -17,6 +17,8 @@
package org.apache.nifi.processors.gcp.credentials.factory;
import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.processor.util.JsonValidator;
import org.apache.nifi.processor.util.StandardValidators;
@@ -75,7 +77,7 @@
.displayName("Service Account JSON File")
.expressionLanguageSupported(ExpressionLanguageScope.NONE)
.required(false)
- .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
.description("Path to a file containing a Service Account key file in JSON format.")
.build();
diff --git a/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/ExecuteGroovyScript.java b/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/ExecuteGroovyScript.java
index 627ec2c..eb0905c 100644
--- a/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/ExecuteGroovyScript.java
+++ b/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/ExecuteGroovyScript.java
@@ -27,12 +27,14 @@
import org.apache.nifi.annotation.documentation.SeeAlso;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnScheduled;
-import org.apache.nifi.annotation.lifecycle.OnUnscheduled;
import org.apache.nifi.annotation.lifecycle.OnStopped;
+import org.apache.nifi.annotation.lifecycle.OnUnscheduled;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.RequiredPermission;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.controller.ControllerService;
import org.apache.nifi.dbcp.DBCPService;
import org.apache.nifi.expression.ExpressionLanguageScope;
@@ -46,7 +48,6 @@
import org.apache.nifi.processors.groovyx.flow.GroovyProcessSessionWrap;
import org.apache.nifi.processors.groovyx.sql.OSql;
import org.apache.nifi.processors.groovyx.util.Files;
-import org.apache.nifi.processors.groovyx.util.Validators;
import org.apache.nifi.serialization.RecordReaderFactory;
import org.apache.nifi.serialization.RecordSetWriterFactory;
import org.codehaus.groovy.control.CompilerConfiguration;
@@ -98,7 +99,7 @@
.displayName("Script File")
.required(false)
.description("Path to script file to execute. Only one of Script File or Script Body may be used")
- .addValidator(Validators.createFileExistsAndReadableValidator())
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
diff --git a/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/util/Validators.java b/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/util/Validators.java
deleted file mode 100644
index 3893851..0000000
--- a/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/util/Validators.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.processors.groovyx.util;
-
-import java.io.File;
-
-import org.apache.nifi.components.ValidationResult;
-import org.apache.nifi.components.Validator;
-
-/***
- * class with validators
- */
-
-public class Validators {
- /**
- * differs from standard file exists validator by supporting expression language values. TODO: maybe there is a bug in standard validator?
- */
- public static Validator createFileExistsAndReadableValidator() {
- return (subject, input, context) -> {
- final String substituted;
- try {
- substituted = context.newPropertyValue(input).evaluateAttributeExpressions().getValue();
- } catch (final Exception e) {
- return new ValidationResult.Builder()
- .subject(subject)
- .input(input)
- .valid(false)
- .explanation("Not a valid Expression Language value: " + e.getMessage())
- .build();
- }
-
- final File file = new File(substituted);
- final boolean valid = file.exists() && file.canRead();
- final String explanation = valid ? null : "File " + file + " does not exist or cannot be read";
- return new ValidationResult.Builder()
- .subject(subject)
- .input(input)
- .valid(valid)
- .explanation(explanation)
- .build();
- };
- }
-}
diff --git a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/AbstractHadoopTest.java b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/AbstractHadoopTest.java
index cbd6559..d60ba7f 100644
--- a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/AbstractHadoopTest.java
+++ b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/AbstractHadoopTest.java
@@ -18,6 +18,10 @@
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.resource.FileResourceReference;
+import org.apache.nifi.components.resource.ResourceReference;
+import org.apache.nifi.components.resource.ResourceReferences;
+import org.apache.nifi.components.resource.StandardResourceReferences;
import org.apache.nifi.hadoop.KerberosProperties;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.util.MockProcessContext;
@@ -36,6 +40,7 @@
import java.io.File;
import java.io.IOException;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Optional;
@@ -95,9 +100,6 @@
results = ((MockProcessContext) pc).validate();
}
Assert.assertEquals(1, results.size());
- for (ValidationResult vr : results) {
- Assert.assertTrue(vr.toString().contains("is invalid because File target" + File.separator + "classes does not exist or is not a file"));
- }
results = new HashSet<>();
runner.setProperty(AbstractHadoopProcessor.HADOOP_CONFIGURATION_RESOURCES, "target/doesnotexist");
@@ -107,9 +109,6 @@
results = ((MockProcessContext) pc).validate();
}
Assert.assertEquals(1, results.size());
- for (ValidationResult vr : results) {
- Assert.assertTrue(vr.toString().contains("is invalid because File target" + File.separator + "doesnotexist does not exist or is not a file"));
- }
}
@Test
@@ -117,7 +116,10 @@
SimpleHadoopProcessor processor = new SimpleHadoopProcessor(kerberosProperties);
TestRunner runner = TestRunners.newTestRunner(processor);
try {
- processor.resetHDFSResources("src/test/resources/core-site-broken.xml", runner.getProcessContext());
+ final File brokenCoreSite = new File("src/test/resources/core-site-broken.xml");
+ final ResourceReference brokenCoreSiteReference = new FileResourceReference(brokenCoreSite);
+ final ResourceReferences references = new StandardResourceReferences(Collections.singletonList(brokenCoreSiteReference));
+ processor.resetHDFSResources(references, runner.getProcessContext());
Assert.fail("Should have thrown SocketTimeoutException");
} catch (IOException e) {
}
diff --git a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/GetHDFSSequenceFileTest.java b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/GetHDFSSequenceFileTest.java
index 6027f8e..459bc47 100644
--- a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/GetHDFSSequenceFileTest.java
+++ b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/GetHDFSSequenceFileTest.java
@@ -21,6 +21,7 @@
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.nifi.components.resource.ResourceReferences;
import org.apache.nifi.hadoop.KerberosProperties;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessorInitializationContext;
@@ -95,7 +96,7 @@
public class TestableGetHDFSSequenceFile extends GetHDFSSequenceFile {
@Override
- HdfsResources resetHDFSResources(String configResources, ProcessContext context) throws IOException {
+ HdfsResources resetHDFSResources(ResourceReferences configResources, ProcessContext context) throws IOException {
return hdfsResources;
}
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/dbcp/hive/HiveConnectionPool.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/dbcp/hive/HiveConnectionPool.java
index f84af6f..4454386 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/dbcp/hive/HiveConnectionPool.java
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/dbcp/hive/HiveConnectionPool.java
@@ -16,8 +16,6 @@
*/
package org.apache.nifi.dbcp.hive;
-import java.io.File;
-
import org.apache.commons.dbcp.BasicDataSource;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.security.UserGroupInformation;
@@ -30,8 +28,12 @@
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.controller.AbstractControllerService;
import org.apache.nifi.controller.ConfigurationContext;
+import org.apache.nifi.controller.ControllerServiceInitializationContext;
+import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.hadoop.KerberosProperties;
import org.apache.nifi.hadoop.SecurityUtil;
import org.apache.nifi.kerberos.KerberosCredentialsService;
@@ -44,9 +46,10 @@
import org.apache.nifi.security.krb.KerberosUser;
import org.apache.nifi.util.hive.AuthenticationFailedException;
import org.apache.nifi.util.hive.HiveConfigurator;
-import org.apache.nifi.util.hive.HiveUtils;
import org.apache.nifi.util.hive.ValidationResources;
+import javax.security.auth.login.LoginException;
+import java.io.File;
import java.io.IOException;
import java.lang.reflect.UndeclaredThrowableException;
import java.security.PrivilegedExceptionAction;
@@ -59,11 +62,6 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
-import org.apache.nifi.controller.ControllerServiceInitializationContext;
-import org.apache.nifi.expression.ExpressionLanguageScope;
-
-import javax.security.auth.login.LoginException;
-
/**
* Implementation for Database Connection Pooling Service used for Apache Hive
* connections. Apache DBCP is used for connection pooling functionality.
@@ -93,7 +91,7 @@
+ "will search the classpath for a 'hive-site.xml' file or will revert to a default configuration. Note that to enable authentication "
+ "with Kerberos e.g., the appropriate properties must be set in the configuration files. Please see the Hive documentation for more details.")
.required(false)
- .addValidator(HiveUtils.createMultipleFilesExistValidator())
+ .identifiesExternalResource(ResourceCardinality.MULTIPLE, ResourceType.FILE)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/processors/hive/ConvertAvroToORC.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/processors/hive/ConvertAvroToORC.java
index e8ee2a2..b323633 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/processors/hive/ConvertAvroToORC.java
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/processors/hive/ConvertAvroToORC.java
@@ -23,6 +23,7 @@
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.ql.io.orc.CompressionKind;
+import org.apache.hadoop.hive.ql.io.orc.NiFiOrcUtils;
import org.apache.hadoop.hive.ql.io.orc.OrcFlowFileWriter;
import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
import org.apache.nifi.annotation.behavior.InputRequirement;
@@ -34,6 +35,8 @@
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
@@ -45,8 +48,6 @@
import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.util.hive.HiveJdbcCommon;
-import org.apache.nifi.util.hive.HiveUtils;
-import org.apache.hadoop.hive.ql.io.orc.NiFiOrcUtils;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
@@ -97,7 +98,9 @@
.displayName("ORC Configuration Resources")
.description("A file or comma separated list of files which contains the ORC configuration (hive-site.xml, e.g.). Without this, Hadoop "
+ "will search the classpath for a 'hive-site.xml' file or will revert to a default configuration. Please see the ORC documentation for more details.")
- .required(false).addValidator(HiveUtils.createMultipleFilesExistValidator()).build();
+ .required(false)
+ .identifiesExternalResource(ResourceCardinality.MULTIPLE, ResourceType.FILE)
+ .build();
public static final PropertyDescriptor STRIPE_SIZE = new PropertyDescriptor.Builder()
.name("orc-stripe-size")
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/processors/hive/PutHiveStreaming.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/processors/hive/PutHiveStreaming.java
index 0ef4211..9173486 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/processors/hive/PutHiveStreaming.java
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/processors/hive/PutHiveStreaming.java
@@ -42,6 +42,8 @@
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.Validator;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.hadoop.KerberosProperties;
@@ -70,8 +72,8 @@
import org.apache.nifi.util.hive.HiveOptions;
import org.apache.nifi.util.hive.HiveUtils;
import org.apache.nifi.util.hive.HiveWriter;
-import org.xerial.snappy.Snappy;
import org.apache.nifi.util.hive.ValidationResources;
+import org.xerial.snappy.Snappy;
import javax.security.auth.login.LoginException;
import java.io.ByteArrayOutputStream;
@@ -185,7 +187,7 @@
+ "to a number greater than one, the 'hcatalog.hive.client.cache.disabled' property will be forced to 'true' to avoid concurrency issues. "
+ "Please see the Hive documentation for more details.")
.required(false)
- .addValidator(HiveUtils.createMultipleFilesExistValidator())
+ .identifiesExternalResource(ResourceCardinality.MULTIPLE, ResourceType.FILE)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/util/hive/HiveUtils.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/util/hive/HiveUtils.java
index 2dc67f7..c58010c 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/util/hive/HiveUtils.java
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/util/hive/HiveUtils.java
@@ -20,15 +20,11 @@
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.security.UserGroupInformation;
-
import org.apache.hive.hcatalog.streaming.ConnectionError;
import org.apache.hive.hcatalog.streaming.HiveEndPoint;
-import org.apache.nifi.components.ValidationResult;
-import org.apache.nifi.components.Validator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.File;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutorService;
@@ -51,30 +47,4 @@
LOG.info("cached writers {} ", entry.getValue());
}
}
-
- /**
- * Validates that one or more files exist, as specified in a single property.
- */
- public static Validator createMultipleFilesExistValidator() {
- return (subject, input, context) -> {
- if (context.isExpressionLanguageSupported(subject) && context.isExpressionLanguagePresent(input)) {
- return new ValidationResult.Builder().subject(subject).input(input).explanation("Expression Language Present").valid(true).build();
- }
- final String[] files = input.split("\\s*,\\s*");
- for (String filename : files) {
- try {
- final File file = new File(filename.trim());
- final boolean valid = file.exists() && file.isFile();
- if (!valid) {
- final String message = "File " + file + " does not exist or is not a file";
- return new ValidationResult.Builder().subject(subject).input(input).valid(false).explanation(message).build();
- }
- } catch (SecurityException e) {
- final String message = "Unable to access " + filename + " due to " + e.getMessage();
- return new ValidationResult.Builder().subject(subject).input(input).valid(false).explanation(message).build();
- }
- }
- return new ValidationResult.Builder().subject(subject).input(input).valid(true).build();
- };
- }
}
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/dbcp/hive/Hive3ConnectionPool.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/dbcp/hive/Hive3ConnectionPool.java
index 0a49a40..ef03c76 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/dbcp/hive/Hive3ConnectionPool.java
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/dbcp/hive/Hive3ConnectionPool.java
@@ -16,8 +16,6 @@
*/
package org.apache.nifi.dbcp.hive;
-import java.io.File;
-
import org.apache.commons.dbcp2.BasicDataSource;
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
import org.apache.hadoop.conf.Configuration;
@@ -32,8 +30,11 @@
import org.apache.nifi.components.PropertyValue;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.controller.AbstractControllerService;
import org.apache.nifi.controller.ConfigurationContext;
+import org.apache.nifi.controller.ControllerServiceInitializationContext;
import org.apache.nifi.dbcp.DBCPValidator;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.hadoop.KerberosProperties;
@@ -48,9 +49,10 @@
import org.apache.nifi.security.krb.KerberosUser;
import org.apache.nifi.util.hive.AuthenticationFailedException;
import org.apache.nifi.util.hive.HiveConfigurator;
-import org.apache.nifi.util.hive.HiveUtils;
import org.apache.nifi.util.hive.ValidationResources;
+import javax.security.auth.login.LoginException;
+import java.io.File;
import java.io.IOException;
import java.lang.reflect.UndeclaredThrowableException;
import java.security.PrivilegedExceptionAction;
@@ -63,10 +65,6 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
-import org.apache.nifi.controller.ControllerServiceInitializationContext;
-
-import javax.security.auth.login.LoginException;
-
/**
* Implementation for Database Connection Pooling Service used for Apache Hive
* connections. Apache DBCP is used for connection pooling functionality.
@@ -121,7 +119,7 @@
+ "will search the classpath for a 'hive-site.xml' file or will revert to a default configuration. Note that to enable authentication "
+ "with Kerberos e.g., the appropriate properties must be set in the configuration files. Please see the Hive documentation for more details.")
.required(false)
- .addValidator(HiveUtils.createMultipleFilesExistValidator())
+ .identifiesExternalResource(ResourceCardinality.MULTIPLE, ResourceType.FILE)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/processors/hive/PutHive3Streaming.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/processors/hive/PutHive3Streaming.java
index 0ba6bd2..b7a3573 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/processors/hive/PutHive3Streaming.java
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/processors/hive/PutHive3Streaming.java
@@ -40,6 +40,8 @@
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.expression.AttributeExpression;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
@@ -65,7 +67,6 @@
import org.apache.nifi.util.hive.AuthenticationFailedException;
import org.apache.nifi.util.hive.HiveConfigurator;
import org.apache.nifi.util.hive.HiveOptions;
-import org.apache.nifi.util.hive.HiveUtils;
import org.apache.nifi.util.hive.ValidationResources;
import javax.security.auth.login.LoginException;
@@ -137,7 +138,7 @@
+ "to a number greater than one, the 'hcatalog.hive.client.cache.disabled' property will be forced to 'true' to avoid concurrency issues. "
+ "Please see the Hive documentation for more details.")
.required(false)
- .addValidator(HiveUtils.createMultipleFilesExistValidator())
+ .identifiesExternalResource(ResourceCardinality.MULTIPLE, ResourceType.FILE)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/processors/orc/PutORC.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/processors/orc/PutORC.java
index 1560848..f691038 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/processors/orc/PutORC.java
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/processors/orc/PutORC.java
@@ -33,6 +33,8 @@
import org.apache.nifi.components.AllowableValue;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.RequiredPermission;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.processor.DataUnit;
@@ -44,7 +46,6 @@
import org.apache.nifi.processors.orc.record.ORCHDFSRecordWriter;
import org.apache.nifi.schema.access.SchemaNotFoundException;
import org.apache.nifi.serialization.record.RecordSchema;
-import org.apache.nifi.util.hive.HiveUtils;
import java.io.IOException;
import java.util.ArrayList;
@@ -79,7 +80,9 @@
.displayName("ORC Configuration Resources")
.description("A file or comma separated list of files which contains the ORC configuration (hive-site.xml, e.g.). Without this, Hadoop "
+ "will search the classpath for a 'hive-site.xml' file or will revert to a default configuration. Please see the ORC documentation for more details.")
- .required(false).addValidator(HiveUtils.createMultipleFilesExistValidator()).build();
+ .required(false)
+ .identifiesExternalResource(ResourceCardinality.MULTIPLE, ResourceType.FILE)
+ .build();
public static final PropertyDescriptor STRIPE_SIZE = new PropertyDescriptor.Builder()
.name("putorc-stripe-size")
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/util/hive/HiveUtils.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/util/hive/HiveUtils.java
deleted file mode 100644
index cb4107f..0000000
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/util/hive/HiveUtils.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 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.
- */
-
-package org.apache.nifi.util.hive;
-
-
-import org.apache.nifi.components.ValidationResult;
-import org.apache.nifi.components.Validator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-
-public class HiveUtils {
- private static final Logger LOG = LoggerFactory.getLogger(HiveUtils.class);
-
- public static final Validator GREATER_THAN_ONE_VALIDATOR = (subject, value, context) -> {
- if (context.isExpressionLanguageSupported(subject) && context.isExpressionLanguagePresent(value)) {
- return new ValidationResult.Builder().subject(subject).input(value).explanation("Expression Language Present").valid(true).build();
- }
-
- String reason = null;
- try {
- final int intVal = Integer.parseInt(value);
-
- if (intVal < 2) {
- reason = "value is less than 2";
- }
- } catch (final NumberFormatException e) {
- reason = "value is not a valid integer";
- }
-
- return new ValidationResult.Builder().subject(subject).input(value).explanation(reason).valid(reason == null).build();
- };
-
- /**
- * Validates that one or more files exist, as specified in a single property.
- */
- public static Validator createMultipleFilesExistValidator() {
- return (subject, input, context) -> {
- if (context.isExpressionLanguageSupported(subject) && context.isExpressionLanguagePresent(input)) {
- return new ValidationResult.Builder().subject(subject).input(input).explanation("Expression Language Present").valid(true).build();
- }
- final String[] files = input.split("\\s*,\\s*");
- for (String filename : files) {
- try {
- final File file = new File(filename.trim());
- final boolean valid = file.exists() && file.isFile();
- if (!valid) {
- final String message = "File " + file + " does not exist or is not a file";
- return new ValidationResult.Builder().subject(subject).input(input).valid(false).explanation(message).build();
- }
- } catch (SecurityException e) {
- final String message = "Unable to access " + filename + " due to " + e.getMessage();
- return new ValidationResult.Builder().subject(subject).input(input).valid(false).explanation(message).build();
- }
- }
- return new ValidationResult.Builder().subject(subject).input(input).valid(true).build();
- };
- }
-}
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive_1_1-processors/src/main/java/org/apache/nifi/dbcp/hive/Hive_1_1ConnectionPool.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive_1_1-processors/src/main/java/org/apache/nifi/dbcp/hive/Hive_1_1ConnectionPool.java
index 1e460bc..2b47335 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive_1_1-processors/src/main/java/org/apache/nifi/dbcp/hive/Hive_1_1ConnectionPool.java
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive_1_1-processors/src/main/java/org/apache/nifi/dbcp/hive/Hive_1_1ConnectionPool.java
@@ -16,7 +16,6 @@
*/
package org.apache.nifi.dbcp.hive;
-
import org.apache.commons.dbcp.BasicDataSource;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.security.UserGroupInformation;
@@ -29,9 +28,13 @@
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.controller.AbstractControllerService;
import org.apache.nifi.controller.ConfigurationContext;
+import org.apache.nifi.controller.ControllerServiceInitializationContext;
import org.apache.nifi.expression.AttributeExpression;
+import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.hadoop.SecurityUtil;
import org.apache.nifi.kerberos.KerberosCredentialsService;
import org.apache.nifi.logging.ComponentLog;
@@ -43,9 +46,9 @@
import org.apache.nifi.security.krb.KerberosUser;
import org.apache.nifi.util.hive.AuthenticationFailedException;
import org.apache.nifi.util.hive.HiveConfigurator;
-import org.apache.nifi.util.hive.HiveUtils;
import org.apache.nifi.util.hive.ValidationResources;
+import javax.security.auth.login.LoginException;
import java.io.IOException;
import java.lang.reflect.UndeclaredThrowableException;
import java.security.PrivilegedExceptionAction;
@@ -58,11 +61,6 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
-import org.apache.nifi.controller.ControllerServiceInitializationContext;
-import org.apache.nifi.expression.ExpressionLanguageScope;
-
-import javax.security.auth.login.LoginException;
-
/**
* Implementation for Database Connection Pooling Service used for Apache Hive 1.1
* connections. Apache DBCP is used for connection pooling functionality.
@@ -90,7 +88,7 @@
+ "will search the classpath for a 'hive-site.xml' file or will revert to a default configuration. Note that to enable authentication "
+ "with Kerberos e.g., the appropriate properties must be set in the configuration files. Please see the Hive documentation for more details.")
.required(false)
- .addValidator(HiveUtils.createMultipleFilesExistValidator())
+ .identifiesExternalResource(ResourceCardinality.MULTIPLE, ResourceType.FILE)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive_1_1-processors/src/main/java/org/apache/nifi/util/hive/HiveUtils.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive_1_1-processors/src/main/java/org/apache/nifi/util/hive/HiveUtils.java
deleted file mode 100644
index 48ad60a..0000000
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive_1_1-processors/src/main/java/org/apache/nifi/util/hive/HiveUtils.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * 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.
- */
-
-package org.apache.nifi.util.hive;
-
-import org.apache.nifi.components.ValidationResult;
-import org.apache.nifi.components.Validator;
-
-import java.io.File;
-
-public class HiveUtils {
-
- /**
- * Validates that one or more files exist, as specified in a single property.
- */
- public static Validator createMultipleFilesExistValidator() {
- return (subject, input, context) -> {
- if (context.isExpressionLanguageSupported(subject) && context.isExpressionLanguagePresent(input)) {
- return new ValidationResult.Builder().subject(subject).input(input).explanation("Expression Language Present").valid(true).build();
- }
- final String[] files = input.split("\\s*,\\s*");
- for (String filename : files) {
- try {
- final File file = new File(filename.trim());
- final boolean valid = file.exists() && file.isFile();
- if (!valid) {
- final String message = "File " + file + " does not exist or is not a file";
- return new ValidationResult.Builder().subject(subject).input(input).valid(false).explanation(message).build();
- }
- } catch (SecurityException e) {
- final String message = "Unable to access " + filename + " due to " + e.getMessage();
- return new ValidationResult.Builder().subject(subject).input(input).valid(false).explanation(message).build();
- }
- }
- return new ValidationResult.Builder().subject(subject).input(input).valid(true).build();
- };
- }
-}
diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/cf/JMSConnectionFactoryProperties.java b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/cf/JMSConnectionFactoryProperties.java
index f08535f..76cf7d2 100644
--- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/cf/JMSConnectionFactoryProperties.java
+++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/cf/JMSConnectionFactoryProperties.java
@@ -20,6 +20,8 @@
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.Validator;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.ssl.SSLContextService;
@@ -50,7 +52,7 @@
+ "to the classpath (defined as a comma separated list of values). Such resources typically represent target JMS client libraries "
+ "for the ConnectionFactory implementation.")
.required(false)
- .addValidator(StandardValidators.createListValidator(true, true, StandardValidators.createURLorFileValidator()))
+ .identifiesExternalResource(ResourceCardinality.MULTIPLE, ResourceType.FILE, ResourceType.DIRECTORY, ResourceType.URL)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.dynamicallyModifiesClasspath(true)
.build();
diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/cf/JndiJmsConnectionFactoryProperties.java b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/cf/JndiJmsConnectionFactoryProperties.java
index b42d104..93d9834 100644
--- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/cf/JndiJmsConnectionFactoryProperties.java
+++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/cf/JndiJmsConnectionFactoryProperties.java
@@ -19,6 +19,8 @@
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.PropertyDescriptor.Builder;
import org.apache.nifi.components.Validator;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.processor.util.StandardValidators;
@@ -59,10 +61,11 @@
public static final PropertyDescriptor JNDI_CLIENT_LIBRARIES = new Builder()
.name("naming.factory.libraries")
.displayName("JNDI / JMS Client Libraries")
- .description("Specifies jar files and/or directories (defined as a comma separated list) to add to the ClassPath " +
- "in order to load the JNDI / JMS client libraries.")
+ .description("Specifies jar files and/or directories to add to the ClassPath " +
+ "in order to load the JNDI / JMS client libraries. This should be a comma-separated list of files, directories, and/or URLs. If a directory is given, any files in that directory" +
+ " will be included, but subdirectories will not be included (i.e., it is not recursive).")
.required(false)
- .addValidator(StandardValidators.createListValidator(true, true, StandardValidators.createURLorFileValidator()))
+ .identifiesExternalResource(ResourceCardinality.MULTIPLE, ResourceType.FILE, ResourceType.DIRECTORY, ResourceType.URL)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.dynamicallyModifiesClasspath(true)
.build();
diff --git a/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/src/main/java/org/apache/nifi/processors/jolt/record/JoltTransformRecord.java b/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/src/main/java/org/apache/nifi/processors/jolt/record/JoltTransformRecord.java
index 013ca38..43cf10d 100644
--- a/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/src/main/java/org/apache/nifi/processors/jolt/record/JoltTransformRecord.java
+++ b/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/src/main/java/org/apache/nifi/processors/jolt/record/JoltTransformRecord.java
@@ -35,6 +35,8 @@
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
@@ -159,7 +161,7 @@
.description("Comma-separated list of paths to files and/or directories which contain modules containing custom transformations (that are not included on NiFi's classpath).")
.required(false)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
- .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.MULTIPLE, ResourceType.FILE, ResourceType.DIRECTORY)
.dynamicallyModifiesClasspath(true)
.build();
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
index 2708542..549e3df 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
@@ -16,18 +16,6 @@
*/
package org.apache.nifi.processors.kafka.pubsub;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.regex.Pattern;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.kafka.clients.CommonClientConfigs;
import org.apache.kafka.clients.consumer.ConsumerConfig;
@@ -41,6 +29,8 @@
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.Validator;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.kerberos.KerberosCredentialsService;
import org.apache.nifi.processor.ProcessContext;
@@ -50,6 +40,18 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Pattern;
+
final class KafkaProcessorUtils {
private static final String ALLOW_EXPLICIT_KEYTAB = "NIFI_ALLOW_EXPLICIT_KEYTAB";
@@ -116,7 +118,7 @@
.description("The Kerberos keytab that will be used to connect to brokers. If not set, it is expected to set a JAAS configuration file "
+ "in the JVM properties defined in the bootstrap.conf file. This principal will be set into 'sasl.jaas.config' Kafka's property.")
.required(false)
- .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
static final PropertyDescriptor SSL_CONTEXT_SERVICE = new PropertyDescriptor.Builder()
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafkaTest.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafkaTest.java
index 2a5add9..d4113ab 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafkaTest.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafkaTest.java
@@ -16,10 +16,6 @@
*/
package org.apache.nifi.processors.kafka.pubsub;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.mock;
-
import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.common.serialization.ByteArrayDeserializer;
import org.apache.nifi.util.TestRunner;
@@ -27,6 +23,10 @@
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+
public class ConsumeKafkaTest {
ConsumerLease mockLease = null;
@@ -120,7 +120,7 @@
runner.setVariable("principal", "nifi@APACHE.COM");
runner.setVariable("service", "kafka");
runner.setProperty(KafkaProcessorUtils.USER_PRINCIPAL, "${principal}");
- runner.setProperty(KafkaProcessorUtils.USER_KEYTAB, "${keytab}s");
+ runner.setProperty(KafkaProcessorUtils.USER_KEYTAB, "${keytab}");
runner.setProperty(KafkaProcessorUtils.JAAS_SERVICE_NAME, "${service}");
runner.assertValid();
}
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafkaRecord_0_10.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafkaRecord_0_10.java
index be2cfcd..b8e4e6c 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafkaRecord_0_10.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafkaRecord_0_10.java
@@ -16,15 +16,6 @@
*/
package org.apache.nifi.processors.kafka.pubsub;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.common.serialization.ByteArrayDeserializer;
import org.apache.nifi.logging.ComponentLog;
@@ -39,6 +30,15 @@
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
public class TestConsumeKafkaRecord_0_10 {
private ConsumerLease mockLease = null;
@@ -216,7 +216,7 @@
runner.setVariable("principal", "nifi@APACHE.COM");
runner.setVariable("service", "kafka");
runner.setProperty(KafkaProcessorUtils.USER_PRINCIPAL, "${principal}");
- runner.setProperty(KafkaProcessorUtils.USER_KEYTAB, "${keytab}s");
+ runner.setProperty(KafkaProcessorUtils.USER_KEYTAB, "${keytab}");
runner.setProperty(KafkaProcessorUtils.JAAS_SERVICE_NAME, "${service}");
runner.assertValid();
}
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-11-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-11-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
index 956b37d..5fbaed9 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-11-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-11-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
@@ -16,20 +16,6 @@
*/
package org.apache.nifi.processors.kafka.pubsub;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Supplier;
-import java.util.regex.Pattern;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.kafka.clients.CommonClientConfigs;
import org.apache.kafka.clients.consumer.ConsumerConfig;
@@ -43,6 +29,8 @@
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.Validator;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.kerberos.KerberosCredentialsService;
import org.apache.nifi.processor.ProcessContext;
@@ -52,6 +40,20 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
+import java.util.regex.Pattern;
+
final class KafkaProcessorUtils {
private static final String ALLOW_EXPLICIT_KEYTAB = "NIFI_ALLOW_EXPLICIT_KEYTAB";
@@ -118,7 +120,7 @@
.description("The Kerberos keytab that will be used to connect to brokers. If not set, it is expected to set a JAAS configuration file "
+ "in the JVM properties defined in the bootstrap.conf file. This principal will be set into 'sasl.jaas.config' Kafka's property.")
.required(false)
- .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
static final PropertyDescriptor SSL_CONTEXT_SERVICE = new PropertyDescriptor.Builder()
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-11-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafkaTest.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-11-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafkaTest.java
index fbf3a69..58fe730 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-11-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafkaTest.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-11-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafkaTest.java
@@ -16,10 +16,6 @@
*/
package org.apache.nifi.processors.kafka.pubsub;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.mock;
-
import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.common.serialization.ByteArrayDeserializer;
import org.apache.nifi.util.TestRunner;
@@ -27,6 +23,10 @@
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+
public class ConsumeKafkaTest {
ConsumerLease mockLease = null;
@@ -120,7 +120,7 @@
runner.setVariable("principal", "nifi@APACHE.COM");
runner.setVariable("service", "kafka");
runner.setProperty(KafkaProcessorUtils.USER_PRINCIPAL, "${principal}");
- runner.setProperty(KafkaProcessorUtils.USER_KEYTAB, "${keytab}s");
+ runner.setProperty(KafkaProcessorUtils.USER_KEYTAB, "${keytab}");
runner.setProperty(KafkaProcessorUtils.JAAS_SERVICE_NAME, "${service}");
runner.assertValid();
}
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-11-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafkaRecord_0_11.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-11-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafkaRecord_0_11.java
index ee027c2..f1a2beb 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-11-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafkaRecord_0_11.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-11-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafkaRecord_0_11.java
@@ -16,15 +16,6 @@
*/
package org.apache.nifi.processors.kafka.pubsub;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.common.serialization.ByteArrayDeserializer;
import org.apache.nifi.logging.ComponentLog;
@@ -39,6 +30,15 @@
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
public class TestConsumeKafkaRecord_0_11 {
private ConsumerLease mockLease = null;
@@ -216,7 +216,7 @@
runner.setVariable("principal", "nifi@APACHE.COM");
runner.setVariable("service", "kafka");
runner.setProperty(KafkaProcessorUtils.USER_PRINCIPAL, "${principal}");
- runner.setProperty(KafkaProcessorUtils.USER_KEYTAB, "${keytab}s");
+ runner.setProperty(KafkaProcessorUtils.USER_KEYTAB, "${keytab}");
runner.setProperty(KafkaProcessorUtils.JAAS_SERVICE_NAME, "${service}");
runner.assertValid();
}
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
index a642c47..322d77e 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
@@ -16,20 +16,6 @@
*/
package org.apache.nifi.processors.kafka.pubsub;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Supplier;
-import java.util.regex.Pattern;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.kafka.clients.CommonClientConfigs;
import org.apache.kafka.clients.consumer.ConsumerConfig;
@@ -43,6 +29,8 @@
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.Validator;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.kerberos.KerberosCredentialsService;
import org.apache.nifi.processor.ProcessContext;
@@ -52,6 +40,20 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
+import java.util.regex.Pattern;
+
public final class KafkaProcessorUtils {
private static final String ALLOW_EXPLICIT_KEYTAB = "NIFI_ALLOW_EXPLICIT_KEYTAB";
@@ -118,7 +120,7 @@
.description("The Kerberos keytab that will be used to connect to brokers. If not set, it is expected to set a JAAS configuration file "
+ "in the JVM properties defined in the bootstrap.conf file. This principal will be set into 'sasl.jaas.config' Kafka's property.")
.required(false)
- .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
public static final PropertyDescriptor SSL_CONTEXT_SERVICE = new PropertyDescriptor.Builder()
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafkaTest.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafkaTest.java
index 30e2322..be63f62 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafkaTest.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafkaTest.java
@@ -16,10 +16,6 @@
*/
package org.apache.nifi.processors.kafka.pubsub;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.mock;
-
import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.common.serialization.ByteArrayDeserializer;
import org.apache.nifi.util.TestRunner;
@@ -27,6 +23,10 @@
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+
public class ConsumeKafkaTest {
ConsumerLease mockLease = null;
@@ -120,7 +120,7 @@
runner.setVariable("principal", "nifi@APACHE.COM");
runner.setVariable("service", "kafka");
runner.setProperty(KafkaProcessorUtils.USER_PRINCIPAL, "${principal}");
- runner.setProperty(KafkaProcessorUtils.USER_KEYTAB, "${keytab}s");
+ runner.setProperty(KafkaProcessorUtils.USER_KEYTAB, "${keytab}");
runner.setProperty(KafkaProcessorUtils.JAAS_SERVICE_NAME, "${service}");
runner.assertValid();
}
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
index 9950273..5c378a5 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
@@ -29,6 +29,8 @@
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.Validator;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.kerberos.KerberosCredentialsService;
import org.apache.nifi.processor.ProcessContext;
@@ -154,7 +156,7 @@
.description("The Kerberos keytab that will be used to connect to brokers. If not set, it is expected to set a JAAS configuration file "
+ "in the JVM properties defined in the bootstrap.conf file. This principal will be set into 'sasl.jaas.config' Kafka's property.")
.required(false)
- .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
static final PropertyDescriptor USERNAME = new PropertyDescriptor.Builder()
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafka_2_0.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafka_2_0.java
index 297772e..5367494 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafka_2_0.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafka_2_0.java
@@ -120,7 +120,7 @@
runner.setVariable("principal", "nifi@APACHE.COM");
runner.setVariable("service", "kafka");
runner.setProperty(KafkaProcessorUtils.USER_PRINCIPAL, "${principal}");
- runner.setProperty(KafkaProcessorUtils.USER_KEYTAB, "${keytab}s");
+ runner.setProperty(KafkaProcessorUtils.USER_KEYTAB, "${keytab}");
runner.setProperty(KafkaProcessorUtils.JAAS_SERVICE_NAME, "${service}");
runner.assertValid();
}
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
index 9950273..5c378a5 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
@@ -29,6 +29,8 @@
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.Validator;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.kerberos.KerberosCredentialsService;
import org.apache.nifi.processor.ProcessContext;
@@ -154,7 +156,7 @@
.description("The Kerberos keytab that will be used to connect to brokers. If not set, it is expected to set a JAAS configuration file "
+ "in the JVM properties defined in the bootstrap.conf file. This principal will be set into 'sasl.jaas.config' Kafka's property.")
.required(false)
- .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
static final PropertyDescriptor USERNAME = new PropertyDescriptor.Builder()
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafka_2_6.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafka_2_6.java
index 7845830..0b8f92f 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafka_2_6.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafka_2_6.java
@@ -120,7 +120,7 @@
runner.setVariable("principal", "nifi@APACHE.COM");
runner.setVariable("service", "kafka");
runner.setProperty(KafkaProcessorUtils.USER_PRINCIPAL, "${principal}");
- runner.setProperty(KafkaProcessorUtils.USER_KEYTAB, "${keytab}s");
+ runner.setProperty(KafkaProcessorUtils.USER_KEYTAB, "${keytab}");
runner.setProperty(KafkaProcessorUtils.JAAS_SERVICE_NAME, "${service}");
runner.assertValid();
}
diff --git a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/AbstractKiteProcessor.java b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/AbstractKiteProcessor.java
index 345c1c2..a2afa57 100644
--- a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/AbstractKiteProcessor.java
+++ b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/AbstractKiteProcessor.java
@@ -21,11 +21,6 @@
import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableList;
import com.google.common.io.Resources;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.List;
import org.apache.avro.Schema;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
@@ -35,10 +30,11 @@
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.Validator;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
-import org.apache.nifi.processors.hadoop.HadoopValidators;
import org.apache.nifi.util.StringUtils;
import org.kitesdk.data.DatasetNotFoundException;
import org.kitesdk.data.Datasets;
@@ -46,18 +42,23 @@
import org.kitesdk.data.URIBuilder;
import org.kitesdk.data.spi.DefaultConfiguration;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.List;
+
abstract class AbstractKiteProcessor extends AbstractProcessor {
private static final Splitter COMMA = Splitter.on(',').trimResults();
- protected static final PropertyDescriptor CONF_XML_FILES
- = new PropertyDescriptor.Builder()
+ protected static final PropertyDescriptor CONF_XML_FILES = new PropertyDescriptor.Builder()
.name("Hadoop configuration files")
.displayName("Hadoop configuration Resources")
.description("A file or comma separated list of files which contains the Hadoop file system configuration. Without this, Hadoop "
+ "will search the classpath for a 'core-site.xml' and 'hdfs-site.xml' file or will revert to a default configuration.")
.required(false)
- .addValidator(HadoopValidators.ONE_OR_MORE_FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.MULTIPLE, ResourceType.FILE)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
diff --git a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/ConvertAvroSchema.java b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/ConvertAvroSchema.java
index afd2aec..d5d016f 100644
--- a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/ConvertAvroSchema.java
+++ b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/ConvertAvroSchema.java
@@ -18,18 +18,10 @@
*/
package org.apache.nifi.processors.kite;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.regex.Pattern;
-
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
import org.apache.avro.Schema;
import org.apache.avro.file.DataFileStream;
import org.apache.avro.file.DataFileWriter;
@@ -60,10 +52,17 @@
import org.kitesdk.data.SchemaNotFoundException;
import org.kitesdk.data.spi.DefaultConfiguration;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.regex.Pattern;
@Tags({ "avro", "convert", "kite" })
@CapabilityDescription("Convert records from one Avro schema to another, including support for flattening and simple type conversions")
@@ -183,6 +182,7 @@
.add(OUTPUT_SCHEMA)
.add(LOCALE)
.add(COMPRESSION_TYPE)
+ .add(CONF_XML_FILES)
.build();
private static final Set<Relationship> RELATIONSHIPS = ImmutableSet
diff --git a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/StoreInKiteDataset.java b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/StoreInKiteDataset.java
index 7730554..4aa359a 100644
--- a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/StoreInKiteDataset.java
+++ b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/StoreInKiteDataset.java
@@ -18,12 +18,8 @@
*/
package org.apache.nifi.processors.kite;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
import org.apache.avro.Schema;
import org.apache.avro.file.DataFileStream;
import org.apache.avro.generic.GenericData.Record;
@@ -32,6 +28,8 @@
import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.processor.ProcessContext;
@@ -39,7 +37,6 @@
import org.apache.nifi.processor.Relationship;
import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.processor.io.InputStreamCallback;
-import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.util.StopWatch;
import org.kitesdk.data.DatasetIOException;
import org.kitesdk.data.DatasetWriter;
@@ -49,8 +46,11 @@
import org.kitesdk.data.View;
import org.kitesdk.data.spi.SchemaValidationUtil;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
@InputRequirement(Requirement.INPUT_REQUIRED)
@Tags({"kite", "avro", "parquet", "hadoop", "hive", "hdfs", "hbase"})
@@ -87,19 +87,17 @@
.description("A comma-separated list of paths to files and/or directories that will be added to the classpath. When specifying a " +
"directory, all files with in the directory will be added to the classpath, but further sub-directories will not be included.")
.required(false)
- .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.MULTIPLE, ResourceType.FILE, ResourceType.DIRECTORY)
.dynamicallyModifiesClasspath(true)
.build();
- private static final List<PropertyDescriptor> PROPERTIES
- = ImmutableList.<PropertyDescriptor>builder()
+ private static final List<PropertyDescriptor> PROPERTIES = ImmutableList.<PropertyDescriptor>builder()
.addAll(AbstractKiteProcessor.getProperties())
.add(KITE_DATASET_URI)
.add(ADDITIONAL_CLASSPATH_RESOURCES)
.build();
- private static final Set<Relationship> RELATIONSHIPS
- = ImmutableSet.<Relationship>builder()
+ private static final Set<Relationship> RELATIONSHIPS = ImmutableSet.<Relationship>builder()
.add(SUCCESS)
.add(INCOMPATIBLE)
.add(FAILURE)
diff --git a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessorTest.java b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessorTest.java
index a9d1d9e..ee4a4ec 100644
--- a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessorTest.java
+++ b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessorTest.java
@@ -16,13 +16,9 @@
*/
package org.apache.nifi.processors.mongodb;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
import com.mongodb.MongoClientOptions;
import com.mongodb.MongoClientOptions.Builder;
-import javax.net.ssl.SSLContext;
+import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.exception.ProcessException;
@@ -32,6 +28,14 @@
import org.junit.Before;
import org.junit.Test;
+import javax.net.ssl.SSLContext;
+
+import java.util.List;
+
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
public class AbstractMongoProcessorTest {
MockAbstractMongoProcessor processor;
@@ -71,6 +75,11 @@
}
@Override
+ protected List<PropertyDescriptor> getSupportedPropertyDescriptors() {
+ return descriptors;
+ }
+
+ @Override
protected Builder getClientOptions(SSLContext sslContext) {
return MongoClientOptions.builder();
}
diff --git a/nifi-nar-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/test/java/org/apache/nifi/parquet/TestParquetRecordSetWriter.java b/nifi-nar-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/test/java/org/apache/nifi/parquet/TestParquetRecordSetWriter.java
index 637ba22..faa937c 100644
--- a/nifi-nar-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/test/java/org/apache/nifi/parquet/TestParquetRecordSetWriter.java
+++ b/nifi-nar-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/test/java/org/apache/nifi/parquet/TestParquetRecordSetWriter.java
@@ -21,8 +21,12 @@
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.controller.ConfigurationContext;
import org.apache.nifi.logging.ComponentLog;
+import org.apache.nifi.processor.AbstractProcessor;
+import org.apache.nifi.processor.ProcessContext;
+import org.apache.nifi.processor.ProcessSession;
+import org.apache.nifi.processor.exception.ProcessException;
+import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.schema.access.SchemaAccessUtils;
import org.apache.nifi.schema.access.SchemaNotFoundException;
import org.apache.nifi.serialization.RecordSetWriter;
@@ -32,7 +36,8 @@
import org.apache.nifi.serialization.record.RecordSchema;
import org.apache.nifi.serialization.record.SchemaIdentifier;
import org.apache.nifi.util.MockComponentLog;
-import org.apache.nifi.util.MockConfigurationContext;
+import org.apache.nifi.util.TestRunner;
+import org.apache.nifi.util.TestRunners;
import org.apache.parquet.avro.AvroParquetReader;
import org.apache.parquet.hadoop.ParquetReader;
import org.apache.parquet.hadoop.util.HadoopInputFile;
@@ -62,7 +67,7 @@
}
@Test
- public void testWriteUsers() throws IOException, SchemaNotFoundException {
+ public void testWriteUsers() throws IOException, SchemaNotFoundException, InitializationException {
initRecordSetWriter("src/test/resources/avro/user.avsc");
// get the schema from the writer factory
@@ -80,7 +85,7 @@
}
@Test
- public void testWriteUsersWhenSchemaFormatNotAvro() throws IOException, SchemaNotFoundException {
+ public void testWriteUsersWhenSchemaFormatNotAvro() throws IOException, SchemaNotFoundException, InitializationException {
initRecordSetWriter("src/test/resources/avro/user.avsc");
// get the schema from the writer factory
@@ -98,13 +103,20 @@
verifyParquetRecords(parquetFile, numUsers);
}
- private void initRecordSetWriter(final String schemaFile) throws IOException {
- final ConfigurationContext configurationContext = getConfigurationContextWithSchema(schemaFile);
+ private void initRecordSetWriter(final String schemaPath) throws IOException, InitializationException {
+ final TestRunner runner = TestRunners.newTestRunner(new AbstractProcessor() {
+ @Override
+ public void onTrigger(final ProcessContext context, final ProcessSession session) throws ProcessException {
+ }
+ });
- // simulate enabling the service
- recordSetWriterFactory.onEnabled(configurationContext);
- recordSetWriterFactory.storeSchemaWriteStrategy(configurationContext);
- recordSetWriterFactory.storeSchemaAccessStrategy(configurationContext);
+ runner.addControllerService("writer", recordSetWriterFactory);
+
+ final File schemaFile = new File(schemaPath);
+ final Map<PropertyDescriptor, String> properties = createPropertiesWithSchema(schemaFile);
+ properties.forEach((k, v) -> runner.setProperty(recordSetWriterFactory, k, v));
+
+ runner.enableControllerService(recordSetWriterFactory);
}
private void writeUsers(final RecordSchema writeSchema, final File parquetFile, final int numUsers) throws IOException {
@@ -140,12 +152,6 @@
}
}
- private ConfigurationContext getConfigurationContextWithSchema(String schemaPath) throws IOException {
- final File schemaFile = new File(schemaPath);
- final Map<PropertyDescriptor, String> properties = createPropertiesWithSchema(schemaFile);
- return new MockConfigurationContext(properties, null);
- }
-
private Map<PropertyDescriptor,String> createPropertiesWithSchema(final File schemaFile) throws IOException {
return createPropertiesWithSchema(IOUtils.toString(schemaFile.toURI()));
}
diff --git a/nifi-nar-bundles/nifi-rules-action-handler-bundle/nifi-rules-action-handler-service/src/test/java/org/apache/nifi/rules/handlers/TestActionHandlerLookup.java b/nifi-nar-bundles/nifi-rules-action-handler-bundle/nifi-rules-action-handler-service/src/test/java/org/apache/nifi/rules/handlers/TestActionHandlerLookup.java
index f9087ae..6ca73d8 100644
--- a/nifi-nar-bundles/nifi-rules-action-handler-bundle/nifi-rules-action-handler-service/src/test/java/org/apache/nifi/rules/handlers/TestActionHandlerLookup.java
+++ b/nifi-nar-bundles/nifi-rules-action-handler-bundle/nifi-rules-action-handler-service/src/test/java/org/apache/nifi/rules/handlers/TestActionHandlerLookup.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.rules.handlers;
+import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.context.PropertyContext;
import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.reporting.InitializationException;
@@ -25,7 +26,9 @@
import org.junit.Before;
import org.junit.Test;
+import java.util.Arrays;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
@@ -120,6 +123,11 @@
public Boolean getExecuteContextCalled() {
return executeContextCalled;
}
+
+ @Override
+ protected List<PropertyDescriptor> getSupportedPropertyDescriptors() {
+ return Arrays.asList(ENFORCE_ACTION_TYPE, ENFORCE_ACTION_TYPE_LEVEL);
+ }
}
}
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/InvokeScriptedProcessor.java b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/InvokeScriptedProcessor.java
index 7600549..fafaf8a 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/InvokeScriptedProcessor.java
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/InvokeScriptedProcessor.java
@@ -16,22 +16,6 @@
*/
package org.apache.nifi.processors.script;
-import java.io.File;
-import java.io.FileInputStream;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-
-import javax.script.Invocable;
-import javax.script.ScriptEngine;
-import javax.script.ScriptException;
-
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.nifi.annotation.behavior.DynamicProperty;
@@ -48,6 +32,7 @@
import org.apache.nifi.components.RequiredPermission;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.resource.ResourceReferences;
import org.apache.nifi.components.state.Scope;
import org.apache.nifi.controller.ControllerServiceLookup;
import org.apache.nifi.controller.NodeTypeProvider;
@@ -65,6 +50,21 @@
import org.apache.nifi.script.ScriptingComponentUtils;
import org.apache.nifi.script.impl.FilteredPropertiesValidationContextAdapter;
+import javax.script.Invocable;
+import javax.script.ScriptEngine;
+import javax.script.ScriptException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+
@Tags({"script", "invoke", "groovy", "python", "jython", "jruby", "ruby", "javascript", "js", "lua", "luaj"})
@CapabilityDescription("Experimental - Invokes a script engine for a Processor defined in the given script. The script must define "
+ "a valid class that implements the Processor interface, and it must set a variable 'processor' to an instance of "
@@ -470,12 +470,8 @@
scriptingComponentHelper.setScriptEngineName(context.getProperty(scriptingComponentHelper.SCRIPT_ENGINE).getValue());
scriptingComponentHelper.setScriptPath(context.getProperty(ScriptingComponentUtils.SCRIPT_FILE).evaluateAttributeExpressions().getValue());
scriptingComponentHelper.setScriptBody(context.getProperty(ScriptingComponentUtils.SCRIPT_BODY).getValue());
- String modulePath = context.getProperty(ScriptingComponentUtils.MODULES).evaluateAttributeExpressions().getValue();
- if (!StringUtils.isEmpty(modulePath)) {
- scriptingComponentHelper.setModules(modulePath.split(","));
- } else {
- scriptingComponentHelper.setModules(new String[0]);
- }
+ final ResourceReferences resourceReferences = context.getProperty(ScriptingComponentUtils.MODULES).evaluateAttributeExpressions().asResources();
+ scriptingComponentHelper.setModules(resourceReferences);
setup();
// Now that InvokeScriptedProcessor is validated, we can call validate on the scripted processor
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/ScriptingComponentHelper.java b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/ScriptingComponentHelper.java
index fce68fc..6467086 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/ScriptingComponentHelper.java
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/ScriptingComponentHelper.java
@@ -20,6 +20,7 @@
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.resource.ResourceReferences;
import org.apache.nifi.context.PropertyContext;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.logging.ComponentLog;
@@ -29,8 +30,6 @@
import javax.script.ScriptEngine;
import javax.script.ScriptEngineFactory;
import javax.script.ScriptEngineManager;
-import java.io.File;
-import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
import java.nio.file.Files;
@@ -65,9 +64,9 @@
private String scriptEngineName;
private String scriptPath;
private String scriptBody;
- private String[] modules;
private List<PropertyDescriptor> descriptors;
private List<AllowableValue> engineAllowableValues;
+ private ResourceReferences modules;
public BlockingQueue<ScriptEngine> engineQ = null;
@@ -96,10 +95,10 @@
}
public String[] getModules() {
- return modules;
+ return modules.asLocations().toArray(new String[0]);
}
- public void setModules(String[] modules) {
+ public void setModules(final ResourceReferences modules) {
this.modules = modules;
}
@@ -240,18 +239,14 @@
// Get a list of URLs from the configurator (if present), or just convert modules from Strings to URLs
URL[] additionalClasspathURLs = null;
if (configurator != null) {
- additionalClasspathURLs = configurator.getModuleURLsForClasspath(modules, log);
+ final String[] locations = modules.asLocations().toArray(new String[0]);
+ additionalClasspathURLs = configurator.getModuleURLsForClasspath(locations, log);
} else {
if (modules != null) {
- List<URL> urls = new LinkedList<>();
- for (String modulePathString : modules) {
- try {
- urls.add(new File(modulePathString).toURI().toURL());
- } catch (MalformedURLException mue) {
- log.error("{} is not a valid file, ignoring", new Object[]{modulePathString}, mue);
- }
+ final List<URL> urls = modules.asURLs();
+ if (!urls.isEmpty()) {
+ additionalClasspathURLs = urls.toArray(new URL[urls.size()]);
}
- additionalClasspathURLs = urls.toArray(new URL[urls.size()]);
}
}
@@ -280,12 +275,7 @@
scriptEngineName = context.getProperty(SCRIPT_ENGINE).getValue();
scriptPath = context.getProperty(ScriptingComponentUtils.SCRIPT_FILE).evaluateAttributeExpressions().getValue();
scriptBody = context.getProperty(ScriptingComponentUtils.SCRIPT_BODY).getValue();
- String modulePath = context.getProperty(ScriptingComponentUtils.MODULES).evaluateAttributeExpressions().getValue();
- if (!StringUtils.isEmpty(modulePath)) {
- modules = modulePath.split(",");
- } else {
- modules = new String[0];
- }
+ modules = context.getProperty(ScriptingComponentUtils.MODULES).evaluateAttributeExpressions().asResources().flattenRecursively();
}
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/ScriptingComponentUtils.java b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/ScriptingComponentUtils.java
index ea9ae26..c40faf2 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/ScriptingComponentUtils.java
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/ScriptingComponentUtils.java
@@ -20,16 +20,18 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.Validator;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceReference;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.Relationship;
-import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.search.SearchContext;
import org.apache.nifi.search.SearchResult;
import javax.script.ScriptEngineFactory;
import javax.script.ScriptEngineManager;
-import java.io.FileInputStream;
+import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
@@ -59,7 +61,7 @@
.name("Script File")
.required(false)
.description("Path to script file to execute. Only one of Script File or Script Body may be used")
- .addValidator(new StandardValidators.FileExistsValidator(true))
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
@@ -78,7 +80,7 @@
.description("Comma-separated list of paths to files and/or directories which contain modules required by the script.")
.required(false)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
- .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.MULTIPLE, ResourceType.FILE, ResourceType.DIRECTORY)
.build();
public static Collection<SearchResult> search(final SearchContext context, final ComponentLog logger) {
@@ -86,14 +88,14 @@
final String term = context.getSearchTerm();
- final String scriptFile = context.getProperty(ScriptingComponentUtils.SCRIPT_FILE).evaluateAttributeExpressions().getValue();
+ final ResourceReference scriptFile = context.getProperty(ScriptingComponentUtils.SCRIPT_FILE).evaluateAttributeExpressions().asResource();
String script = context.getProperty(ScriptingComponentUtils.SCRIPT_BODY).getValue();
- if (StringUtils.isBlank(script) && StringUtils.isBlank(scriptFile)) {
+ if (StringUtils.isBlank(script) && scriptFile == null) {
return results;
} else if (StringUtils.isBlank(script)) {
- try {
- script = IOUtils.toString(new FileInputStream(scriptFile), StandardCharsets.UTF_8);
+ try (final InputStream in = scriptFile.read()) {
+ script = IOUtils.toString(in, StandardCharsets.UTF_8);
} catch (Exception e) {
logger.error(String.format("Could not read from path %s", scriptFile), e);
return results;
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/groovy/org/apache/nifi/lookup/script/TestScriptedLookupService.groovy b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/groovy/org/apache/nifi/lookup/script/TestScriptedLookupService.groovy
index 1dc903f..1f8b7c6 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/groovy/org/apache/nifi/lookup/script/TestScriptedLookupService.groovy
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/groovy/org/apache/nifi/lookup/script/TestScriptedLookupService.groovy
@@ -17,15 +17,16 @@
package org.apache.nifi.lookup.script
import org.apache.commons.io.FileUtils
-import org.apache.nifi.components.PropertyDescriptor
-import org.apache.nifi.controller.ConfigurationContext
-import org.apache.nifi.controller.ControllerServiceInitializationContext
-import org.apache.nifi.logging.ComponentLog
+import org.apache.nifi.processor.AbstractProcessor
+import org.apache.nifi.processor.ProcessContext
+import org.apache.nifi.processor.ProcessSession
+import org.apache.nifi.processor.exception.ProcessException
import org.apache.nifi.processors.script.AccessibleScriptingComponentHelper
import org.apache.nifi.script.ScriptingComponentHelper
import org.apache.nifi.script.ScriptingComponentUtils
import org.apache.nifi.util.MockFlowFile
-import org.apache.nifi.util.MockPropertyValue
+import org.apache.nifi.util.TestRunner
+import org.apache.nifi.util.TestRunners
import org.junit.Before
import org.junit.BeforeClass
import org.junit.Test
@@ -35,9 +36,6 @@
import static junit.framework.TestCase.assertEquals
import static org.junit.Assert.assertFalse
import static org.junit.Assert.assertTrue
-import static org.mockito.Mockito.mock
-import static org.mockito.Mockito.when
-
/**
* Unit tests for the ScriptedLookupService controller service
*/
@@ -64,30 +62,18 @@
@Test
void testLookupServiceGroovyScript() {
+ final TestRunner runner = TestRunners.newTestRunner(new AbstractProcessor() {
+ @Override
+ public void onTrigger(final ProcessContext context, final ProcessSession session) throws ProcessException {
+ }
+ });
- def properties = [:] as Map<PropertyDescriptor, String>
- scriptedLookupService.getSupportedPropertyDescriptors().each {PropertyDescriptor descriptor ->
- properties.put(descriptor, descriptor.getDefaultValue())
- }
-
- // Mock the ConfigurationContext for setup(...)
- def configurationContext = mock(ConfigurationContext)
- when(configurationContext.getProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE))
- .thenReturn(new MockPropertyValue('Groovy'))
- when(configurationContext.getProperty(ScriptingComponentUtils.SCRIPT_FILE))
- .thenReturn(new MockPropertyValue('target/test/resources/groovy/test_lookup_inline.groovy'))
- when(configurationContext.getProperty(ScriptingComponentUtils.SCRIPT_BODY))
- .thenReturn(new MockPropertyValue(null))
- when(configurationContext.getProperty(ScriptingComponentUtils.MODULES))
- .thenReturn(new MockPropertyValue(null))
-
- def logger = mock(ComponentLog)
- def initContext = mock(ControllerServiceInitializationContext)
- when(initContext.getIdentifier()).thenReturn(UUID.randomUUID().toString())
- when(initContext.getLogger()).thenReturn(logger)
-
- scriptedLookupService.initialize initContext
- scriptedLookupService.onEnabled configurationContext
+ runner.addControllerService("lookupService", scriptedLookupService);
+ runner.setProperty(scriptedLookupService, "Script Engine", "Groovy");
+ runner.setProperty(scriptedLookupService, ScriptingComponentUtils.SCRIPT_FILE, 'target/test/resources/groovy/test_lookup_inline.groovy');
+ runner.setProperty(scriptedLookupService, ScriptingComponentUtils.SCRIPT_BODY, (String) null);
+ runner.setProperty(scriptedLookupService, ScriptingComponentUtils.MODULES, (String) null);
+ runner.enableControllerService(scriptedLookupService);
MockFlowFile mockFlowFile = new MockFlowFile(1L)
InputStream inStream = new ByteArrayInputStream('Flow file content not used'.bytes)
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/groovy/org/apache/nifi/lookup/script/TestSimpleScriptedLookupService.groovy b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/groovy/org/apache/nifi/lookup/script/TestSimpleScriptedLookupService.groovy
index 01b2b2d..848378c 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/groovy/org/apache/nifi/lookup/script/TestSimpleScriptedLookupService.groovy
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/groovy/org/apache/nifi/lookup/script/TestSimpleScriptedLookupService.groovy
@@ -17,15 +17,16 @@
package org.apache.nifi.lookup.script
import org.apache.commons.io.FileUtils
-import org.apache.nifi.components.PropertyDescriptor
-import org.apache.nifi.controller.ConfigurationContext
-import org.apache.nifi.controller.ControllerServiceInitializationContext
-import org.apache.nifi.logging.ComponentLog
+import org.apache.nifi.processor.AbstractProcessor
+import org.apache.nifi.processor.ProcessContext
+import org.apache.nifi.processor.ProcessSession
+import org.apache.nifi.processor.exception.ProcessException
import org.apache.nifi.processors.script.AccessibleScriptingComponentHelper
import org.apache.nifi.script.ScriptingComponentHelper
import org.apache.nifi.script.ScriptingComponentUtils
import org.apache.nifi.util.MockFlowFile
-import org.apache.nifi.util.MockPropertyValue
+import org.apache.nifi.util.TestRunner
+import org.apache.nifi.util.TestRunners
import org.junit.Before
import org.junit.BeforeClass
import org.junit.Test
@@ -35,9 +36,6 @@
import static junit.framework.TestCase.assertEquals
import static org.junit.Assert.assertFalse
import static org.junit.Assert.assertTrue
-import static org.mockito.Mockito.mock
-import static org.mockito.Mockito.when
-
/**
* Unit tests for the SimpleScriptedLookupService controller service
*/
@@ -64,30 +62,18 @@
@Test
void testSimpleLookupServiceGroovyScript() {
+ final TestRunner runner = TestRunners.newTestRunner(new AbstractProcessor() {
+ @Override
+ public void onTrigger(final ProcessContext context, final ProcessSession session) throws ProcessException {
+ }
+ });
- def properties = [:] as Map<PropertyDescriptor, String>
- scriptedLookupService.getSupportedPropertyDescriptors().each {PropertyDescriptor descriptor ->
- properties.put(descriptor, descriptor.getDefaultValue())
- }
-
- // Mock the ConfigurationContext for setup(...)
- def configurationContext = mock(ConfigurationContext)
- when(configurationContext.getProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE))
- .thenReturn(new MockPropertyValue('Groovy'))
- when(configurationContext.getProperty(ScriptingComponentUtils.SCRIPT_FILE))
- .thenReturn(new MockPropertyValue('target/test/resources/groovy/test_simple_lookup_inline.groovy'))
- when(configurationContext.getProperty(ScriptingComponentUtils.SCRIPT_BODY))
- .thenReturn(new MockPropertyValue(null))
- when(configurationContext.getProperty(ScriptingComponentUtils.MODULES))
- .thenReturn(new MockPropertyValue(null))
-
- def logger = mock(ComponentLog)
- def initContext = mock(ControllerServiceInitializationContext)
- when(initContext.getIdentifier()).thenReturn(UUID.randomUUID().toString())
- when(initContext.getLogger()).thenReturn(logger)
-
- scriptedLookupService.initialize initContext
- scriptedLookupService.onEnabled configurationContext
+ runner.addControllerService("lookupService", scriptedLookupService);
+ runner.setProperty(scriptedLookupService, "Script Engine", "Groovy");
+ runner.setProperty(scriptedLookupService, ScriptingComponentUtils.SCRIPT_FILE, 'target/test/resources/groovy/test_lookup_inline.groovy');
+ runner.setProperty(scriptedLookupService, ScriptingComponentUtils.SCRIPT_BODY, (String) null);
+ runner.setProperty(scriptedLookupService, ScriptingComponentUtils.MODULES, (String) null);
+ runner.enableControllerService(scriptedLookupService);
def mockFlowFile = new MockFlowFile(1L)
def inStream = new ByteArrayInputStream('Flow file content not used'.bytes)
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/groovy/org/apache/nifi/record/script/ScriptedReaderTest.groovy b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/groovy/org/apache/nifi/record/script/ScriptedReaderTest.groovy
index 5ec4917..74c08a2 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/groovy/org/apache/nifi/record/script/ScriptedReaderTest.groovy
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/groovy/org/apache/nifi/record/script/ScriptedReaderTest.groovy
@@ -17,17 +17,16 @@
package org.apache.nifi.record.script
import org.apache.commons.io.FileUtils
-import org.apache.nifi.components.PropertyDescriptor
-import org.apache.nifi.controller.ConfigurationContext
-import org.apache.nifi.controller.ControllerServiceInitializationContext
-import org.apache.nifi.logging.ComponentLog
-import org.apache.nifi.processor.util.StandardValidators
+import org.apache.nifi.processor.AbstractProcessor
+import org.apache.nifi.processor.ProcessContext
+import org.apache.nifi.processor.ProcessSession
+import org.apache.nifi.processor.exception.ProcessException
import org.apache.nifi.processors.script.AccessibleScriptingComponentHelper
import org.apache.nifi.script.ScriptingComponentHelper
import org.apache.nifi.script.ScriptingComponentUtils
import org.apache.nifi.serialization.RecordReader
import org.apache.nifi.util.MockComponentLog
-import org.apache.nifi.util.MockPropertyValue
+import org.apache.nifi.util.TestRunner
import org.apache.nifi.util.TestRunners
import org.junit.Before
import org.junit.BeforeClass
@@ -38,12 +37,7 @@
import org.slf4j.LoggerFactory
import static junit.framework.TestCase.assertEquals
-import static org.junit.Assert.assertNotNull
-import static org.junit.Assert.assertNull
-import static org.junit.Assert.fail
-import static org.mockito.Mockito.mock
-import static org.mockito.Mockito.when
-
+import static org.junit.Assert.*
/**
* Unit tests for the ScriptedReader class
*/
@@ -73,35 +67,24 @@
@Test
void testRecordReaderGroovyScript() {
+ final TestRunner runner = TestRunners.newTestRunner(new AbstractProcessor() {
+ @Override
+ public void onTrigger(final ProcessContext context, final ProcessSession session) throws ProcessException {
+ }
+ });
- def properties = [:] as Map<PropertyDescriptor, String>
- recordReaderFactory.getSupportedPropertyDescriptors().each {PropertyDescriptor descriptor ->
- properties.put(descriptor, descriptor.getDefaultValue())
- }
-
- // Mock the ConfigurationContext for setup(...)
- def configurationContext = mock(ConfigurationContext)
- when(configurationContext.getProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE))
- .thenReturn(new MockPropertyValue('Groovy'))
- when(configurationContext.getProperty(ScriptingComponentUtils.SCRIPT_FILE))
- .thenReturn(new MockPropertyValue('target/test/resources/groovy/test_record_reader_inline.groovy'))
- when(configurationContext.getProperty(ScriptingComponentUtils.SCRIPT_BODY))
- .thenReturn(new MockPropertyValue(null))
- when(configurationContext.getProperty(ScriptingComponentUtils.MODULES))
- .thenReturn(new MockPropertyValue(null))
-
- def logger = mock(ComponentLog)
- def initContext = mock(ControllerServiceInitializationContext)
- when(initContext.getIdentifier()).thenReturn(UUID.randomUUID().toString())
- when(initContext.getLogger()).thenReturn(logger)
-
- recordReaderFactory.initialize initContext
- recordReaderFactory.onEnabled configurationContext
+ runner.addControllerService("reader", recordReaderFactory);
+ runner.setProperty(recordReaderFactory, "Script Engine", "Groovy");
+ runner.setProperty(recordReaderFactory, ScriptingComponentUtils.SCRIPT_FILE, 'target/test/resources/groovy/test_record_reader_inline.groovy');
+ runner.setProperty(recordReaderFactory, ScriptingComponentUtils.SCRIPT_BODY, (String) null);
+ runner.setProperty(recordReaderFactory, ScriptingComponentUtils.MODULES, (String) null);
+ runner.enableControllerService(recordReaderFactory);
byte[] contentBytes = 'Flow file content not used'.bytes
InputStream inStream = new ByteArrayInputStream(contentBytes)
- RecordReader recordReader = recordReaderFactory.createRecordReader(Collections.emptyMap(), inStream, contentBytes.length, logger)
+ RecordReader recordReader = recordReaderFactory.createRecordReader(Collections.emptyMap(), inStream, contentBytes.length,
+ new MockComponentLog("id", recordReaderFactory))
assertNotNull(recordReader)
3.times {
@@ -114,18 +97,17 @@
@Test
void testXmlRecordReaderGroovyScript() {
+ final TestRunner runner = TestRunners.newTestRunner(new AbstractProcessor() {
+ @Override
+ public void onTrigger(final ProcessContext context, final ProcessSession session) throws ProcessException {
+ }
+ });
- def properties = [:] as Map<PropertyDescriptor, String>
- recordReaderFactory.getSupportedPropertyDescriptors().each {PropertyDescriptor descriptor ->
- properties.put(descriptor, descriptor.getDefaultValue())
- }
-
- // Test dynamic property descriptor
- PropertyDescriptor SCHEMA_TEXT = new PropertyDescriptor.Builder()
- .name('schema.text')
- .dynamic(true)
- .addValidator(StandardValidators.NON_BLANK_VALIDATOR)
- .build()
+ runner.addControllerService("reader", recordReaderFactory);
+ runner.setProperty(recordReaderFactory, "Script Engine", "Groovy");
+ runner.setProperty(recordReaderFactory, ScriptingComponentUtils.SCRIPT_FILE, 'target/test/resources/groovy/test_record_reader_xml.groovy');
+ runner.setProperty(recordReaderFactory, ScriptingComponentUtils.SCRIPT_BODY, (String) null);
+ runner.setProperty(recordReaderFactory, ScriptingComponentUtils.MODULES, (String) null);
def schemaText = '''
[
@@ -134,28 +116,10 @@
{"code": "int"}
]
'''
- properties.put(SCHEMA_TEXT, schemaText)
-
- // Mock the ConfigurationContext for setup(...)
- def configurationContext = mock(ConfigurationContext)
- when(configurationContext.getProperties()).thenReturn(properties)
- when(configurationContext.getProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE))
- .thenReturn(new MockPropertyValue('Groovy'))
- when(configurationContext.getProperty(ScriptingComponentUtils.SCRIPT_FILE))
- .thenReturn(new MockPropertyValue('target/test/resources/groovy/test_record_reader_xml.groovy'))
- when(configurationContext.getProperty(ScriptingComponentUtils.SCRIPT_BODY))
- .thenReturn(new MockPropertyValue(null))
- when(configurationContext.getProperty(ScriptingComponentUtils.MODULES))
- .thenReturn(new MockPropertyValue(null))
- when(configurationContext.getProperty(SCHEMA_TEXT)).thenReturn(new MockPropertyValue(schemaText))
+ runner.setProperty(recordReaderFactory, 'schema.text', schemaText)
def logger = new MockComponentLog('ScriptedReader', '')
- def initContext = mock(ControllerServiceInitializationContext)
- when(initContext.getIdentifier()).thenReturn(UUID.randomUUID().toString())
- when(initContext.getLogger()).thenReturn(logger)
-
- recordReaderFactory.initialize initContext
- recordReaderFactory.onEnabled configurationContext
+ runner.enableControllerService(recordReaderFactory)
Map<String, String> schemaVariables = ['record.tag': 'myRecord']
@@ -194,51 +158,35 @@
@Test
void testRecordReaderGroovyScriptChangeModuleDirectory() {
+ final TestRunner runner = TestRunners.newTestRunner(new AbstractProcessor() {
+ @Override
+ public void onTrigger(final ProcessContext context, final ProcessSession session) throws ProcessException {
+ }
+ });
- def properties = [:] as Map<PropertyDescriptor, String>
- recordReaderFactory.getSupportedPropertyDescriptors().each {PropertyDescriptor descriptor ->
- properties.put(descriptor, descriptor.getDefaultValue())
- }
+ runner.addControllerService("reader", recordReaderFactory);
+ runner.setProperty(recordReaderFactory, "Script Engine", "Groovy");
+ runner.setProperty(recordReaderFactory, ScriptingComponentUtils.SCRIPT_FILE, 'target/test/resources/groovy/test_record_reader_load_module.groovy');
+ runner.setProperty(recordReaderFactory, ScriptingComponentUtils.SCRIPT_BODY, (String) null);
+ runner.setProperty(recordReaderFactory, ScriptingComponentUtils.MODULES, (String) null);
- // Mock the ConfigurationContext for setup(...)
- def configurationContext = mock(ConfigurationContext)
- when(configurationContext.getProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE))
- .thenReturn(new MockPropertyValue('Groovy'))
- when(configurationContext.getProperty(ScriptingComponentUtils.SCRIPT_FILE))
- .thenReturn(new MockPropertyValue('target/test/resources/groovy/test_record_reader_load_module.groovy'))
- when(configurationContext.getProperty(ScriptingComponentUtils.SCRIPT_BODY))
- .thenReturn(new MockPropertyValue(null))
- when(configurationContext.getProperty(ScriptingComponentUtils.MODULES))
- .thenReturn(new MockPropertyValue(null))
-
- def logger = mock(ComponentLog)
- def initContext = mock(ControllerServiceInitializationContext)
- when(initContext.getIdentifier()).thenReturn(UUID.randomUUID().toString())
- when(initContext.getLogger()).thenReturn(logger)
-
- recordReaderFactory.initialize initContext
+ boolean enableFailed;
try {
- recordReaderFactory.onEnabled configurationContext
- fail('Expected exception in onEnabled when script is loaded with no Module Directory set')
- } catch(e) {
- // Do nothing, the exception is expected as the needed class is not in the Module Directory property
+ runner.enableControllerService(recordReaderFactory);
+ enableFailed = false;
+ } catch (final Throwable t) {
+ enableFailed = true;
+ // Expected
}
+ assertTrue(enableFailed)
+
+ runner.setProperty(recordReaderFactory, "Module Directory", 'target/test/resources/jar/test.jar');
+ runner.enableControllerService(recordReaderFactory)
byte[] contentBytes = 'Flow file content not used'.bytes
InputStream inStream = new ByteArrayInputStream(contentBytes)
- def recordReader = recordReaderFactory.createRecordReader(Collections.emptyMap(), inStream, contentBytes.length, logger)
- // This one is supposed to be null as the factory should fail on initialize
- assertNull(recordReader)
-
- when(configurationContext.getProperty(ScriptingComponentUtils.MODULES))
- .thenReturn(new MockPropertyValue('target/test/resources/jar/test.jar'))
-
- recordReaderFactory.onPropertyModified(ScriptingComponentUtils.MODULES, '', 'target/test/resources/jar/test.jar')
-
- recordReaderFactory.initialize initContext
- recordReaderFactory.onEnabled configurationContext
- recordReader = recordReaderFactory.createRecordReader(Collections.emptyMap(), inStream, contentBytes.length, logger)
+ def recordReader = recordReaderFactory.createRecordReader(Collections.emptyMap(), inStream, contentBytes.length, new MockComponentLog("id", recordReaderFactory))
assertNotNull(recordReader)
}
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/groovy/org/apache/nifi/record/script/ScriptedRecordSetWriterTest.groovy b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/groovy/org/apache/nifi/record/script/ScriptedRecordSetWriterTest.groovy
index ce1bf2a..56b5284 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/groovy/org/apache/nifi/record/script/ScriptedRecordSetWriterTest.groovy
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/groovy/org/apache/nifi/record/script/ScriptedRecordSetWriterTest.groovy
@@ -17,10 +17,10 @@
package org.apache.nifi.record.script
import org.apache.commons.io.FileUtils
-import org.apache.nifi.components.PropertyDescriptor
-import org.apache.nifi.controller.ConfigurationContext
-import org.apache.nifi.controller.ControllerServiceInitializationContext
-import org.apache.nifi.logging.ComponentLog
+import org.apache.nifi.processor.AbstractProcessor
+import org.apache.nifi.processor.ProcessContext
+import org.apache.nifi.processor.ProcessSession
+import org.apache.nifi.processor.exception.ProcessException
import org.apache.nifi.processors.script.AccessibleScriptingComponentHelper
import org.apache.nifi.script.ScriptingComponentHelper
import org.apache.nifi.script.ScriptingComponentUtils
@@ -30,7 +30,8 @@
import org.apache.nifi.serialization.record.RecordField
import org.apache.nifi.serialization.record.RecordFieldType
import org.apache.nifi.serialization.record.RecordSet
-import org.apache.nifi.util.MockPropertyValue
+import org.apache.nifi.util.MockComponentLog
+import org.apache.nifi.util.TestRunner
import org.apache.nifi.util.TestRunners
import org.junit.Before
import org.junit.BeforeClass
@@ -40,10 +41,8 @@
import org.slf4j.Logger
import org.slf4j.LoggerFactory
-import static org.junit.Assert.assertNotNull
import static org.junit.Assert.assertEquals
-import static org.mockito.Mockito.mock
-import static org.mockito.Mockito.when
+import static org.junit.Assert.assertNotNull
/**
* Unit tests for the ScriptedReader class
@@ -74,35 +73,23 @@
@Test
void testRecordWriterGroovyScript() {
+ final TestRunner runner = TestRunners.newTestRunner(new AbstractProcessor() {
+ @Override
+ public void onTrigger(final ProcessContext context, final ProcessSession session) throws ProcessException {
+ }
+ });
- def properties = [:] as Map<PropertyDescriptor, String>
- recordSetWriterFactory.getSupportedPropertyDescriptors().each {PropertyDescriptor descriptor ->
- properties.put(descriptor, descriptor.getDefaultValue())
- }
-
- // Mock the ConfigurationContext for setup(...)
- def configurationContext = mock(ConfigurationContext)
- when(configurationContext.getProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE))
- .thenReturn(new MockPropertyValue('Groovy'))
- when(configurationContext.getProperty(ScriptingComponentUtils.SCRIPT_FILE))
- .thenReturn(new MockPropertyValue('target/test/resources/groovy/test_record_writer_inline.groovy'))
- when(configurationContext.getProperty(ScriptingComponentUtils.SCRIPT_BODY))
- .thenReturn(new MockPropertyValue(null))
- when(configurationContext.getProperty(ScriptingComponentUtils.MODULES))
- .thenReturn(new MockPropertyValue(null))
-
- def logger = mock(ComponentLog)
- def initContext = mock(ControllerServiceInitializationContext)
- when(initContext.getIdentifier()).thenReturn(UUID.randomUUID().toString())
- when(initContext.getLogger()).thenReturn(logger)
-
- recordSetWriterFactory.initialize initContext
- recordSetWriterFactory.onEnabled configurationContext
+ runner.addControllerService("writer", recordSetWriterFactory);
+ runner.setProperty(recordSetWriterFactory, "Script Engine", "Groovy");
+ runner.setProperty(recordSetWriterFactory, ScriptingComponentUtils.SCRIPT_FILE, 'target/test/resources/groovy/test_record_writer_inline.groovy');
+ runner.setProperty(recordSetWriterFactory, ScriptingComponentUtils.SCRIPT_BODY, (String) null);
+ runner.setProperty(recordSetWriterFactory, ScriptingComponentUtils.MODULES, (String) null);
+ runner.enableControllerService(recordSetWriterFactory);
def schema = recordSetWriterFactory.getSchema(Collections.emptyMap(), null)
-
+
ByteArrayOutputStream outputStream = new ByteArrayOutputStream()
- RecordSetWriter recordSetWriter = recordSetWriterFactory.createWriter(logger, schema, outputStream, Collections.emptyMap())
+ RecordSetWriter recordSetWriter = recordSetWriterFactory.createWriter(new MockComponentLog('id', recordSetWriterFactory), schema, outputStream, Collections.emptyMap())
assertNotNull(recordSetWriter)
def recordSchema = new SimpleRecordSchema(
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/groovy/org/apache/nifi/reporting/script/ScriptedReportingTaskTest.groovy b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/groovy/org/apache/nifi/reporting/script/ScriptedReportingTaskTest.groovy
index a77d4c7..b8d6ea2 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/groovy/org/apache/nifi/reporting/script/ScriptedReportingTaskTest.groovy
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/groovy/org/apache/nifi/reporting/script/ScriptedReportingTaskTest.groovy
@@ -18,42 +18,29 @@
import org.apache.commons.io.FileUtils
import org.apache.nifi.components.PropertyDescriptor
-import org.apache.nifi.components.PropertyValue
import org.apache.nifi.controller.ConfigurationContext
import org.apache.nifi.logging.ComponentLog
import org.apache.nifi.processors.script.AccessibleScriptingComponentHelper
+import org.apache.nifi.provenance.ProvenanceEventRecord
+import org.apache.nifi.registry.VariableRegistry
+import org.apache.nifi.reporting.ReportingInitializationContext
import org.apache.nifi.script.ScriptingComponentHelper
import org.apache.nifi.script.ScriptingComponentUtils
-import org.apache.nifi.provenance.ProvenanceEventBuilder
-import org.apache.nifi.provenance.ProvenanceEventRecord
-import org.apache.nifi.provenance.ProvenanceEventRepository
-import org.apache.nifi.provenance.ProvenanceEventType
-import org.apache.nifi.provenance.StandardProvenanceEventRecord
-import org.apache.nifi.reporting.EventAccess
-import org.apache.nifi.reporting.ReportingContext
-import org.apache.nifi.reporting.ReportingInitializationContext
-import org.apache.nifi.state.MockStateManager
-import org.apache.nifi.util.MockFlowFile
-import org.apache.nifi.util.MockPropertyValue
+import org.apache.nifi.util.MockConfigurationContext
+import org.apache.nifi.util.MockEventAccess
+import org.apache.nifi.util.MockReportingContext
import org.apache.nifi.util.TestRunners
import org.junit.Before
import org.junit.BeforeClass
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
-import org.mockito.Mockito
-import org.mockito.stubbing.Answer
import org.slf4j.Logger
import org.slf4j.LoggerFactory
import static org.junit.Assert.assertEquals
import static org.junit.Assert.assertTrue
-import static org.mockito.Mockito.any
-import static org.mockito.Mockito.doAnswer
-import static org.mockito.Mockito.mock
-import static org.mockito.Mockito.when
-
-
+import static org.mockito.Mockito.*
/**
* Unit tests for ScriptedReportingTask.
*/
@@ -82,65 +69,29 @@
@Test
void testProvenanceGroovyScript() {
- def uuid = "10000000-0000-0000-0000-000000000000"
- def attributes = ['abc': 'xyz', 'xyz': 'abc', 'filename': 'file-' + uuid, 'uuid': uuid]
- def prevAttrs = ['filename': '1234.xyz']
+ final Map<PropertyDescriptor, String> properties = new HashMap<>();
+ properties.put(new PropertyDescriptor.Builder().name("Script Engine").build(), "Groovy");
+ properties.put(ScriptingComponentUtils.SCRIPT_FILE, 'target/test/resources/groovy/test_log_provenance_events.groovy');
- def flowFile = new MockFlowFile(3L)
- flowFile.putAttributes(attributes)
- final ProvenanceEventBuilder builder = new StandardProvenanceEventRecord.Builder();
- builder.eventTime = System.currentTimeMillis()
- builder.eventType = ProvenanceEventType.RECEIVE
- builder.transitUri = 'nifi://unit-test'
- builder.setAttributes(prevAttrs, attributes)
- builder.componentId = '1234'
- builder.componentType = 'dummy processor'
- builder.fromFlowFile(flowFile)
- final ProvenanceEventRecord event = builder.build()
+ final ConfigurationContext configurationContext = new MockConfigurationContext(properties, null)
- def properties = task.supportedPropertyDescriptors.collectEntries { descriptor ->
- [descriptor: descriptor.getDefaultValue()]
+ final MockReportingContext context = new MockReportingContext([:], null, VariableRegistry.EMPTY_REGISTRY)
+ context.setProperty("Script Engine", "Groovy")
+ context.setProperty(ScriptingComponentUtils.SCRIPT_FILE.name, 'target/test/resources/groovy/test_log_provenance_events.groovy');
+
+ final MockEventAccess eventAccess = context.getEventAccess();
+ 4.times { i ->
+ eventAccess.addProvenanceEvent(createProvenanceEvent(i))
}
- // Mock the ConfigurationContext for setup(...)
- def configurationContext = mock(ConfigurationContext)
- when(configurationContext.getProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE))
- .thenReturn(new MockPropertyValue('Groovy'))
- when(configurationContext.getProperty(ScriptingComponentUtils.SCRIPT_FILE))
- .thenReturn(new MockPropertyValue('target/test/resources/groovy/test_log_provenance_events.groovy'))
- when(configurationContext.getProperty(ScriptingComponentUtils.SCRIPT_BODY))
- .thenReturn(new MockPropertyValue(null))
- when(configurationContext.getProperty(ScriptingComponentUtils.MODULES))
- .thenReturn(new MockPropertyValue(null))
-
- // Set up ReportingContext
- def context = mock(ReportingContext)
- when(context.getStateManager()).thenReturn(new MockStateManager(task))
- doAnswer({ invocation ->
- def descriptor = invocation.getArgumentAt(0, PropertyDescriptor)
- return new MockPropertyValue(properties[descriptor])
- } as Answer<PropertyValue>
- ).when(context).getProperty(any(PropertyDescriptor))
-
-
- def eventAccess = mock(EventAccess)
- // Return 3 events for the test
- doAnswer({ invocation -> return [event, event, event] } as Answer<List<ProvenanceEventRecord>>
- ).when(eventAccess).getProvenanceEvents(Mockito.anyLong(), Mockito.anyInt())
-
- def provenanceRepository = mock(ProvenanceEventRepository.class)
- doAnswer({ invocation -> return 3 } as Answer<Long>
- ).when(provenanceRepository).getMaxEventId()
-
- when(context.getEventAccess()).thenReturn(eventAccess);
- when(eventAccess.getProvenanceRepository()).thenReturn(provenanceRepository)
-
def logger = mock(ComponentLog)
def initContext = mock(ReportingInitializationContext)
when(initContext.getIdentifier()).thenReturn(UUID.randomUUID().toString())
when(initContext.getLogger()).thenReturn(logger)
task.initialize initContext
+ task.getSupportedPropertyDescriptors()
+
task.setup configurationContext
task.onTrigger context
@@ -150,37 +101,28 @@
assertEquals '1234', se.e.componentId
assertEquals 'xyz', se.e.attributes.abc
task.offerScriptEngine(se)
-
}
+ private ProvenanceEventRecord createProvenanceEvent(final long id) {
+ final ProvenanceEventRecord event = mock(ProvenanceEventRecord.class)
+ doReturn(id).when(event).getEventId()
+ doReturn('1234').when(event).getComponentId()
+ doReturn(['abc': 'xyz']).when(event).getAttributes()
+ return event;
+ }
+
+
@Test
void testVMEventsGroovyScript() {
+ final Map<PropertyDescriptor, String> properties = new HashMap<>();
+ properties.put(new PropertyDescriptor.Builder().name("Script Engine").build(), "Groovy");
+ properties.put(ScriptingComponentUtils.SCRIPT_FILE, 'target/test/resources/groovy/test_log_vm_stats.groovy');
- def properties = [:] as Map<PropertyDescriptor, String>
- task.getSupportedPropertyDescriptors().each { PropertyDescriptor descriptor ->
- properties.put(descriptor, descriptor.getDefaultValue())
- }
+ final ConfigurationContext configurationContext = new MockConfigurationContext(properties, null)
- // Mock the ConfigurationContext for setup(...)
- def configurationContext = mock(ConfigurationContext)
- when(configurationContext.getProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE))
- .thenReturn(new MockPropertyValue('Groovy'))
- when(configurationContext.getProperty(ScriptingComponentUtils.SCRIPT_FILE))
- .thenReturn(new MockPropertyValue('target/test/resources/groovy/test_log_vm_stats.groovy'))
- when(configurationContext.getProperty(ScriptingComponentUtils.SCRIPT_BODY))
- .thenReturn(new MockPropertyValue(null))
- when(configurationContext.getProperty(ScriptingComponentUtils.MODULES))
- .thenReturn(new MockPropertyValue(null))
-
- // Set up ReportingContext
- def context = mock(ReportingContext)
- when(context.getStateManager()).thenReturn(new MockStateManager(task))
- doAnswer({ invocation ->
- PropertyDescriptor descriptor = invocation.getArgumentAt(0, PropertyDescriptor)
- return new MockPropertyValue(properties[descriptor])
- } as Answer<PropertyValue>
- ).when(context).getProperty(any(PropertyDescriptor))
-
+ final MockReportingContext context = new MockReportingContext([:], null, VariableRegistry.EMPTY_REGISTRY)
+ context.setProperty("Script Engine", "Groovy")
+ context.setProperty(ScriptingComponentUtils.SCRIPT_FILE.name, 'target/test/resources/groovy/test_log_vm_stats.groovy');
def logger = mock(ComponentLog)
def initContext = mock(ReportingInitializationContext)
@@ -188,6 +130,8 @@
when(initContext.getLogger()).thenReturn(logger)
task.initialize initContext
+ task.getSupportedPropertyDescriptors()
+
task.setup configurationContext
task.onTrigger context
def se = task.scriptEngine
@@ -199,32 +143,15 @@
@Test
void testVMEventsJythonScript() {
+ final Map<PropertyDescriptor, String> properties = new HashMap<>();
+ properties.put(new PropertyDescriptor.Builder().name("Script Engine").build(), "Groovy");
+ properties.put(ScriptingComponentUtils.SCRIPT_FILE, 'target/test/resources/groovy/test_log_vm_stats.groovy');
- def properties = [:] as Map<PropertyDescriptor, String>
- task.getSupportedPropertyDescriptors().each { PropertyDescriptor descriptor ->
- properties.put(descriptor, descriptor.getDefaultValue())
- }
+ final ConfigurationContext configurationContext = new MockConfigurationContext(properties, null)
- // Mock the ConfigurationContext for setup(...)
- def configurationContext = mock(ConfigurationContext)
- when(configurationContext.getProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE))
- .thenReturn(new MockPropertyValue('python'))
- when(configurationContext.getProperty(ScriptingComponentUtils.SCRIPT_FILE))
- .thenReturn(new MockPropertyValue('target/test/resources/jython/test_log_vm_stats.py'))
- when(configurationContext.getProperty(ScriptingComponentUtils.SCRIPT_BODY))
- .thenReturn(new MockPropertyValue(null))
- when(configurationContext.getProperty(ScriptingComponentUtils.MODULES))
- .thenReturn(new MockPropertyValue(null))
-
- // Set up ReportingContext
- def context = mock(ReportingContext)
- when(context.getStateManager()).thenReturn(new MockStateManager(task))
- doAnswer({ invocation ->
- PropertyDescriptor descriptor = invocation.getArgumentAt(0, PropertyDescriptor)
- return new MockPropertyValue(properties[descriptor])
- } as Answer<PropertyValue>
- ).when(context).getProperty(any(PropertyDescriptor))
-
+ final MockReportingContext context = new MockReportingContext([:], null, VariableRegistry.EMPTY_REGISTRY)
+ context.setProperty("Script Engine", "Groovy")
+ context.setProperty(ScriptingComponentUtils.SCRIPT_FILE.name, 'target/test/resources/groovy/test_log_vm_stats.groovy');
def logger = mock(ComponentLog)
def initContext = mock(ReportingInitializationContext)
@@ -232,6 +159,8 @@
when(initContext.getLogger()).thenReturn(logger)
task.initialize initContext
+ task.getSupportedPropertyDescriptors()
+
task.setup configurationContext
task.onTrigger context
def se = task.scriptEngine
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestInvokeJython.java b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestInvokeJython.java
index 345f4af..5b17e04 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestInvokeJython.java
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestInvokeJython.java
@@ -16,7 +16,6 @@
*/
package org.apache.nifi.processors.script;
-import org.apache.commons.lang3.StringUtils;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.script.ScriptingComponentUtils;
import org.apache.nifi.util.MockFlowFile;
@@ -32,9 +31,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Arrays;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
public class TestInvokeJython extends BaseScriptTest {
@@ -99,57 +95,6 @@
}
/**
- * Test a script that has a Jython processor that reads the system path as controlled by the Module Directory property then stores it in the attributes of the flowfile being routed.
- * <p>
- * This tests whether the JythonScriptEngineConfigurator successfully translates the "Module Directory" property into Python system paths, even with strings that contain Python escape sequences
- *
- * @throws Exception Any error encountered while testing
- */
- @Test
- public void testUpdateAttributeFromProcessorModulePaths() throws Exception {
- // Prepare a set of easily identified paths for the Module Directory property
- final String moduleDirectoryTestPrefix = "test";
- final String[] testModuleDirectoryValues = { "abc","\\a\\b\\c","\\123","\\d\"e" };
- final int numTestValues = testModuleDirectoryValues.length;
- // Prepend each module directory value with a simple prefix and an identifying number so we can identify it later.
- final List<String> testModuleDirectoryFullValues = IntStream.range(0,numTestValues)
- .boxed()
- .map(i -> String.format("%s#%s#%s",moduleDirectoryTestPrefix,i,testModuleDirectoryValues[i]))
- .collect(Collectors.toList());
- final String testModuleDirectoryCombined = String.join(",",testModuleDirectoryFullValues);
-
- // Run the script that captures the system path resulting from the Module Directory property
- final TestRunner runner = TestRunners.newTestRunner(new InvokeScriptedProcessor());
-
- runner.setValidateExpressionUsage(false);
- runner.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "python");
- runner.setProperty(ScriptingComponentUtils.SCRIPT_FILE, "target/test/resources/jython/test_modules_path.py");
- runner.setProperty(ScriptingComponentUtils.MODULES, testModuleDirectoryCombined);
-
- final Map<String, String> attributes = new HashMap<>();
-
- runner.assertValid();
- runner.enqueue(new byte[0], attributes);
- runner.run();
-
- runner.assertAllFlowFilesTransferred("success", 1);
- final List<MockFlowFile> result = runner.getFlowFilesForRelationship("success");
-
- // verify successful processing of the module paths
- result.get(0).assertAttributeExists("from-path");
- final String[] effectivePaths = result.get(0).getAttribute("from-path").split(","); // Extract the comma-delimited paths from the script-produced attribute
- Assert.assertTrue(effectivePaths.length >= numTestValues); // we should have our test values, plus defaults
- // Isolate only the paths with our identified prefix
- final List<String> relevantPaths = Arrays.stream(effectivePaths).filter(path -> path.startsWith(moduleDirectoryTestPrefix)).collect(Collectors.toList());
- Assert.assertEquals(testModuleDirectoryFullValues.size(), relevantPaths.size());
- relevantPaths.forEach(path -> {
- final int resultIx = Integer.valueOf(StringUtils.substringBetween(path,"#")); // extract the index so we can relate it to the sources, despite potential mangling
- final String expectedValue = testModuleDirectoryFullValues.get(resultIx);
- Assert.assertEquals(expectedValue, path); // Ensure our path was passed through without mangling
- });
- }
-
- /**
* Tests a script that has a Jython Processor that that reads the first line of text from the flowfiles content and stores the value in an attribute of the outgoing flowfile.
*
* @throws Exception Any error encountered while testing
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/record/sink/script/ScriptedRecordSinkTest.java b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/record/sink/script/ScriptedRecordSinkTest.java
index 22d879b..cf8d848 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/record/sink/script/ScriptedRecordSinkTest.java
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/record/sink/script/ScriptedRecordSinkTest.java
@@ -16,18 +16,15 @@
*/
package org.apache.nifi.record.sink.script;
-import org.apache.nifi.attribute.expression.language.StandardPropertyValue;
-import org.apache.nifi.components.PropertyValue;
-import org.apache.nifi.components.state.StateManager;
-import org.apache.nifi.controller.ConfigurationContext;
-import org.apache.nifi.controller.ControllerServiceInitializationContext;
-import org.apache.nifi.logging.ComponentLog;
+import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.processor.AbstractProcessor;
+import org.apache.nifi.processor.ProcessContext;
+import org.apache.nifi.processor.ProcessSession;
+import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.processors.script.AccessibleScriptingComponentHelper;
-import org.apache.nifi.record.sink.RecordSinkService;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.script.ScriptingComponentHelper;
import org.apache.nifi.script.ScriptingComponentUtils;
-import org.apache.nifi.serialization.RecordSetWriterFactory;
import org.apache.nifi.serialization.SimpleRecordSchema;
import org.apache.nifi.serialization.WriteResult;
import org.apache.nifi.serialization.record.ListRecordSet;
@@ -37,9 +34,8 @@
import org.apache.nifi.serialization.record.RecordFieldType;
import org.apache.nifi.serialization.record.RecordSchema;
import org.apache.nifi.serialization.record.RecordSet;
-import org.apache.nifi.state.MockStateManager;
-import org.apache.nifi.util.MockControllerServiceInitializationContext;
-import org.apache.nifi.util.MockPropertyValue;
+import org.apache.nifi.util.TestRunner;
+import org.apache.nifi.util.TestRunners;
import org.junit.Test;
import java.io.IOException;
@@ -47,12 +43,8 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.UUID;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
public class ScriptedRecordSinkTest {
@@ -87,38 +79,24 @@
}
private MockScriptedRecordSink initTask() throws InitializationException {
+ final TestRunner runner = TestRunners.newTestRunner(new AbstractProcessor() {
+ @Override
+ public void onTrigger(final ProcessContext context, final ProcessSession session) throws ProcessException {
+ }
+ });
+
+ final MockRecordWriter writer = new MockRecordWriter(null, false); // No header, don"t quote values
+ runner.addControllerService("writer", writer);
+ runner.enableControllerService(writer);
final MockScriptedRecordSink recordSink = new MockScriptedRecordSink();
- ConfigurationContext context = mock(ConfigurationContext.class);
- StateManager stateManager = new MockStateManager(recordSink);
+ runner.addControllerService("sink", recordSink);
+ runner.setProperty(recordSink, "Script Engine", "Groovy");
+ runner.setProperty(recordSink, ScriptingComponentUtils.SCRIPT_FILE, "src/test/resources/groovy/test_record_sink.groovy");
+ runner.setProperty(recordSink, ScriptingComponentUtils.SCRIPT_BODY, (String) null);
+ runner.setProperty(recordSink, ScriptingComponentUtils.MODULES, (String) null);
+ runner.enableControllerService(recordSink);
- final PropertyValue pValue = mock(StandardPropertyValue.class);
- MockRecordWriter writer = new MockRecordWriter(null, false); // No header, don"t quote values
- when(context.getProperty(RecordSinkService.RECORD_WRITER_FACTORY)).thenReturn(pValue);
- when(pValue.asControllerService(RecordSetWriterFactory.class)).thenReturn(writer);
-
-
- final ComponentLog logger = mock(ComponentLog.class);
- final ControllerServiceInitializationContext initContext = new MockControllerServiceInitializationContext(writer, UUID.randomUUID().toString(), logger, stateManager);
- recordSink.initialize(initContext);
-
- // Call something that sets up the ScriptingComponentHelper, so we can mock it
- recordSink.getSupportedPropertyDescriptors();
-
- when(context.getProperty(recordSink.getScriptingComponentHelper().SCRIPT_ENGINE))
- .thenReturn(new MockPropertyValue("Groovy"));
- when(context.getProperty(ScriptingComponentUtils.SCRIPT_FILE))
- .thenReturn(new MockPropertyValue("src/test/resources/groovy/test_record_sink.groovy"));
- when(context.getProperty(ScriptingComponentUtils.SCRIPT_BODY))
- .thenReturn(new MockPropertyValue(null));
- when(context.getProperty(ScriptingComponentUtils.MODULES))
- .thenReturn(new MockPropertyValue(null));
- try {
- recordSink.onEnabled(context);
- } catch (Exception e) {
- e.printStackTrace();
- fail("onEnabled error: " + e.getMessage());
- }
return recordSink;
}
@@ -128,5 +106,10 @@
public ScriptingComponentHelper getScriptingComponentHelper() {
return this.scriptingComponentHelper;
}
+
+ @Override
+ protected List<PropertyDescriptor> getSupportedPropertyDescriptors() {
+ return super.getSupportedPropertyDescriptors();
+ }
}
}
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/rules/engine/script/ScriptedRulesEngineTest.java b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/rules/engine/script/ScriptedRulesEngineTest.java
index 35bd320..4e91749 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/rules/engine/script/ScriptedRulesEngineTest.java
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/rules/engine/script/ScriptedRulesEngineTest.java
@@ -16,18 +16,18 @@
*/
package org.apache.nifi.rules.engine.script;
-import org.apache.nifi.components.state.StateManager;
-import org.apache.nifi.controller.ConfigurationContext;
-import org.apache.nifi.controller.ControllerServiceInitializationContext;
-import org.apache.nifi.logging.ComponentLog;
+import org.apache.nifi.processor.AbstractProcessor;
+import org.apache.nifi.processor.ProcessContext;
+import org.apache.nifi.processor.ProcessSession;
+import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.processors.script.AccessibleScriptingComponentHelper;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.rules.Action;
import org.apache.nifi.script.ScriptingComponentHelper;
import org.apache.nifi.script.ScriptingComponentUtils;
-import org.apache.nifi.state.MockStateManager;
-import org.apache.nifi.util.MockControllerServiceInitializationContext;
-import org.apache.nifi.util.MockPropertyValue;
+import org.apache.nifi.serialization.record.MockRecordWriter;
+import org.apache.nifi.util.TestRunner;
+import org.apache.nifi.util.TestRunners;
import org.junit.Before;
import org.junit.Test;
@@ -35,12 +35,8 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.UUID;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
public class ScriptedRulesEngineTest {
@@ -65,32 +61,24 @@
}
private MockScriptedRulesEngine initTask() throws InitializationException {
+ final TestRunner runner = TestRunners.newTestRunner(new AbstractProcessor() {
+ @Override
+ public void onTrigger(final ProcessContext context, final ProcessSession session) throws ProcessException {
+ }
+ });
+
+ final MockRecordWriter writer = new MockRecordWriter(null, false); // No header, don"t quote values
+ runner.addControllerService("writer", writer);
+ runner.enableControllerService(writer);
final MockScriptedRulesEngine rulesEngine = new MockScriptedRulesEngine();
- ConfigurationContext context = mock(ConfigurationContext.class);
- StateManager stateManager = new MockStateManager(rulesEngine);
+ runner.addControllerService("rulesEngine", rulesEngine);
+ runner.setProperty(rulesEngine, "Script Engine", "Groovy");
+ runner.setProperty(rulesEngine, ScriptingComponentUtils.SCRIPT_FILE, "src/test/resources/groovy/test_rules_engine.groovy");
+ runner.setProperty(rulesEngine, ScriptingComponentUtils.SCRIPT_BODY, (String) null);
+ runner.setProperty(rulesEngine, ScriptingComponentUtils.MODULES, (String) null);
+ runner.enableControllerService(rulesEngine);
- final ComponentLog logger = mock(ComponentLog.class);
- final ControllerServiceInitializationContext initContext = new MockControllerServiceInitializationContext(rulesEngine, UUID.randomUUID().toString(), logger, stateManager);
- rulesEngine.initialize(initContext);
-
- // Call something that sets up the ScriptingComponentHelper, so we can mock it
- rulesEngine.getSupportedPropertyDescriptors();
-
- when(context.getProperty(rulesEngine.getScriptingComponentHelper().SCRIPT_ENGINE))
- .thenReturn(new MockPropertyValue("Groovy"));
- when(context.getProperty(ScriptingComponentUtils.SCRIPT_FILE))
- .thenReturn(new MockPropertyValue("src/test/resources/groovy/test_rules_engine.groovy"));
- when(context.getProperty(ScriptingComponentUtils.SCRIPT_BODY))
- .thenReturn(new MockPropertyValue(null));
- when(context.getProperty(ScriptingComponentUtils.MODULES))
- .thenReturn(new MockPropertyValue(null));
- try {
- rulesEngine.onEnabled(context);
- } catch (Exception e) {
- e.printStackTrace();
- fail("onEnabled error: " + e.getMessage());
- }
return rulesEngine;
}
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/rules/handlers/script/ScriptedActionHandlerTest.java b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/rules/handlers/script/ScriptedActionHandlerTest.java
index e2a74da..727ca7f 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/rules/handlers/script/ScriptedActionHandlerTest.java
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/rules/handlers/script/ScriptedActionHandlerTest.java
@@ -16,11 +16,10 @@
*/
package org.apache.nifi.rules.handlers.script;
-import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.components.state.StateManager;
-import org.apache.nifi.controller.ConfigurationContext;
-import org.apache.nifi.controller.ControllerServiceInitializationContext;
-import org.apache.nifi.logging.ComponentLog;
+import org.apache.nifi.processor.AbstractProcessor;
+import org.apache.nifi.processor.ProcessContext;
+import org.apache.nifi.processor.ProcessSession;
+import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.processors.script.AccessibleScriptingComponentHelper;
import org.apache.nifi.reporting.Bulletin;
import org.apache.nifi.reporting.BulletinFactory;
@@ -31,10 +30,8 @@
import org.apache.nifi.rules.Action;
import org.apache.nifi.script.ScriptingComponentHelper;
import org.apache.nifi.script.ScriptingComponentUtils;
-import org.apache.nifi.state.MockStateManager;
+import org.apache.nifi.serialization.record.MockRecordWriter;
import org.apache.nifi.util.MockBulletinRepository;
-import org.apache.nifi.util.MockControllerServiceInitializationContext;
-import org.apache.nifi.util.MockPropertyValue;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.junit.Before;
@@ -46,14 +43,12 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.UUID;
import static junit.framework.TestCase.assertTrue;
import static org.hamcrest.core.IsInstanceOf.instanceOf;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -61,7 +56,6 @@
public class ScriptedActionHandlerTest {
- private ConfigurationContext context;
private TestRunner runner;
private ReportingContext reportingContext;
private MockScriptedActionHandler actionHandler;
@@ -81,7 +75,6 @@
@Test
public void testActions() throws InitializationException {
actionHandler = initTask("src/test/resources/groovy/test_action_handler.groovy");
- actionHandler.onEnabled(context);
List<Action> actions = Arrays.asList(new Action("LOG", attrs), new Action("ALERT", attrs));
actions.forEach((action) -> actionHandler.execute(action, facts));
// Verify a fact was added (not the intended operation of ActionHandler, but testable)
@@ -96,7 +89,6 @@
when(reportingContext.getBulletinRepository()).thenReturn(mockScriptedBulletinRepository);
when(reportingContext.createBulletin(anyString(), Mockito.any(Severity.class), anyString()))
.thenAnswer(invocation -> BulletinFactory.createBulletin(invocation.getArgument(0), invocation.getArgument(1).toString(), invocation.getArgument(2)));
- actionHandler.onEnabled(context);
List<Action> actions = Arrays.asList(new Action("LOG", attrs), new Action("ALERT", attrs));
actions.forEach(action -> actionHandler.execute(reportingContext, action, facts));
@@ -113,7 +105,6 @@
when(reportingContext.getBulletinRepository()).thenReturn(mockScriptedBulletinRepository);
when(reportingContext.createBulletin(anyString(), Mockito.any(Severity.class), anyString()))
.thenAnswer(invocation -> BulletinFactory.createBulletin(invocation.getArgument(0), invocation.getArgument(1).toString(), invocation.getArgument(2)));
- actionHandler.onEnabled(context);
List<Action> actions = Arrays.asList(new Action("LOG", attrs), new Action("ALERT", attrs));
actions.forEach(action -> actionHandler.execute(reportingContext, action, facts));
@@ -201,39 +192,24 @@
}
private MockScriptedActionHandler initTask(String scriptFile) throws InitializationException {
+ final TestRunner runner = TestRunners.newTestRunner(new AbstractProcessor() {
+ @Override
+ public void onTrigger(final ProcessContext context, final ProcessSession session) throws ProcessException {
+ }
+ });
+
+ final MockRecordWriter writer = new MockRecordWriter(null, false); // No header, don"t quote values
+ runner.addControllerService("writer", writer);
+ runner.enableControllerService(writer);
final MockScriptedActionHandler actionHandler = new MockScriptedActionHandler();
- context = mock(ConfigurationContext.class);
- StateManager stateManager = new MockStateManager(actionHandler);
+ runner.addControllerService("actionHandler", actionHandler);
+ runner.setProperty(actionHandler, "Script Engine", "Groovy");
+ runner.setProperty(actionHandler, ScriptingComponentUtils.SCRIPT_FILE, scriptFile);
+ runner.setProperty(actionHandler, ScriptingComponentUtils.SCRIPT_BODY, (String) null);
+ runner.setProperty(actionHandler, ScriptingComponentUtils.MODULES, (String) null);
+ runner.enableControllerService(actionHandler);
- final ComponentLog logger = mock(ComponentLog.class);
- final ControllerServiceInitializationContext initContext = new MockControllerServiceInitializationContext(actionHandler, UUID.randomUUID().toString(), logger, stateManager);
- actionHandler.initialize(initContext);
-
- // Call something that sets up the ScriptingComponentHelper, so we can mock it
- actionHandler.getSupportedPropertyDescriptors();
-
- Map<PropertyDescriptor, String> properties = new HashMap<>();
- properties.put(actionHandler.getScriptingComponentHelper().SCRIPT_ENGINE, actionHandler.getScriptingComponentHelper().SCRIPT_ENGINE.getName());
- properties.put(ScriptingComponentUtils.SCRIPT_FILE, ScriptingComponentUtils.SCRIPT_FILE.getName());
- properties.put(ScriptingComponentUtils.SCRIPT_BODY, ScriptingComponentUtils.SCRIPT_BODY.getName());
- properties.put(ScriptingComponentUtils.MODULES, ScriptingComponentUtils.MODULES.getName());
- when(context.getProperties()).thenReturn(properties);
-
- when(context.getProperty(actionHandler.getScriptingComponentHelper().SCRIPT_ENGINE))
- .thenReturn(new MockPropertyValue("Groovy"));
- when(context.getProperty(ScriptingComponentUtils.SCRIPT_FILE))
- .thenReturn(new MockPropertyValue(scriptFile));
- when(context.getProperty(ScriptingComponentUtils.SCRIPT_BODY))
- .thenReturn(new MockPropertyValue(null));
- when(context.getProperty(ScriptingComponentUtils.MODULES))
- .thenReturn(new MockPropertyValue(null));
- try {
- actionHandler.onEnabled(context);
- } catch (Exception e) {
- e.printStackTrace();
- fail("onEnabled error: " + e.getMessage());
- }
return actionHandler;
}
diff --git a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/test/java/org/apache/nifi/processors/solr/TestGetSolr.java b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/test/java/org/apache/nifi/processors/solr/TestGetSolr.java
index 602126a..b6d1d1d 100644
--- a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/test/java/org/apache/nifi/processors/solr/TestGetSolr.java
+++ b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/test/java/org/apache/nifi/processors/solr/TestGetSolr.java
@@ -102,6 +102,7 @@
runner.setProperty(GetSolr.DATE_FIELD, "created");
runner.setProperty(GetSolr.RETURN_FIELDS, "id,created");
runner.setProperty(SolrUtils.COLLECTION, "testCollection");
+ runner.setValidateExpressionUsage(false);
return runner;
}
diff --git a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service/src/main/java/org/apache/nifi/controller/livy/LivySessionController.java b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service/src/main/java/org/apache/nifi/controller/livy/LivySessionController.java
index fe1086e..f691346 100644
--- a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service/src/main/java/org/apache/nifi/controller/livy/LivySessionController.java
+++ b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service/src/main/java/org/apache/nifi/controller/livy/LivySessionController.java
@@ -17,32 +17,6 @@
package org.apache.nifi.controller.livy;
import com.fasterxml.jackson.databind.ObjectMapper;
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.ConnectException;
-import java.net.SocketTimeoutException;
-import java.nio.charset.StandardCharsets;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableKeyException;
-import java.security.cert.CertificateException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManagerFactory;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpEntity;
@@ -66,6 +40,8 @@
import org.apache.nifi.annotation.lifecycle.OnDisabled;
import org.apache.nifi.annotation.lifecycle.OnEnabled;
import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.controller.AbstractControllerService;
import org.apache.nifi.controller.ConfigurationContext;
import org.apache.nifi.controller.ControllerServiceInitializationContext;
@@ -81,6 +57,33 @@
import org.codehaus.jettison.json.JSONException;
import org.codehaus.jettison.json.JSONObject;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManagerFactory;
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.ConnectException;
+import java.net.SocketTimeoutException;
+import java.nio.charset.StandardCharsets;
+import java.security.KeyManagementException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.UnrecoverableKeyException;
+import java.security.cert.CertificateException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
@Tags({"Livy", "REST", "Spark", "http"})
@CapabilityDescription("Manages pool of Spark sessions over HTTP")
public class LivySessionController extends AbstractControllerService implements LivySessionService {
@@ -139,6 +142,7 @@
.displayName("Session JARs")
.description("JARs to be used in the Spark session.")
.required(false)
+ .identifiesExternalResource(ResourceCardinality.MULTIPLE, ResourceType.FILE)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
@@ -147,6 +151,7 @@
.displayName("Session Files")
.description("Files to be used in the Spark session.")
.required(false)
+ .identifiesExternalResource(ResourceCardinality.MULTIPLE, ResourceType.FILE)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.defaultValue(null)
.build();
diff --git a/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/java/org/apache/nifi/spring/SpringContextProcessor.java b/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/java/org/apache/nifi/spring/SpringContextProcessor.java
index 79aae5f..c6497db 100644
--- a/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/java/org/apache/nifi/spring/SpringContextProcessor.java
+++ b/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/java/org/apache/nifi/spring/SpringContextProcessor.java
@@ -16,23 +16,6 @@
*/
package org.apache.nifi.spring;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.nifi.annotation.behavior.TriggerWhenEmpty;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
@@ -43,6 +26,8 @@
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.Validator;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
@@ -62,6 +47,23 @@
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.PollableChannel;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
/**
* Implementation of {@link Processor} capable of sending and receiving data
* from application defined in Spring Application context. It does so via
@@ -148,7 +150,7 @@
.name("Application Context class path")
.description("Path to the directory with resources (i.e., JARs, configuration files etc.) required to be on "
+ "the classpath of the ApplicationContext.")
- .addValidator(StandardValidators.createDirectoryExistsValidator(false, false))
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.DIRECTORY)
.required(true)
.build();
public static final PropertyDescriptor SEND_TIMEOUT = new PropertyDescriptor.Builder()
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractGrok.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractGrok.java
index 5896b93..1a8aacf 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractGrok.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractGrok.java
@@ -34,6 +34,8 @@
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
import org.apache.nifi.processor.AbstractProcessor;
@@ -90,7 +92,7 @@
public static final PropertyDescriptor GROK_EXPRESSION = new PropertyDescriptor.Builder()
.name("Grok Expression")
.description("Grok expression. If other Grok expressions are referenced in this expression, they must be provided "
- + "in the Grok Pattern File if set or exist in the default Grok patterns")
+ + "in the Grok Pattern File if set or exist in the default Grok patterns")
.required(true)
.addValidator(StandardValidators.NON_BLANK_VALIDATOR)
.build();
@@ -98,9 +100,9 @@
public static final PropertyDescriptor GROK_PATTERN_FILE = new PropertyDescriptor.Builder()
.name("Grok Pattern file")
.description("Grok Pattern file definition. This file will be loaded after the default Grok "
- + "patterns file. If not set, then only the Grok Expression and the default Grok patterns will be used.")
+ + "patterns file. If not set, then only the Grok Expression and the default Grok patterns will be used.")
.required(false)
- .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
.build();
public static final PropertyDescriptor KEEP_EMPTY_CAPTURES = new PropertyDescriptor.Builder()
@@ -225,7 +227,7 @@
}
if (validationContext.getProperty(GROK_PATTERN_FILE).isSet()) {
- try (final InputStream in = new FileInputStream(new File(validationContext.getProperty(GROK_PATTERN_FILE).getValue()));
+ try (final InputStream in = validationContext.getProperty(GROK_PATTERN_FILE).asResource().read();
final Reader reader = new InputStreamReader(in)) {
grokCompiler.register(reader);
}
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/JoltTransformJSON.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/JoltTransformJSON.java
index 617ca9e..7c7d649 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/JoltTransformJSON.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/JoltTransformJSON.java
@@ -16,19 +16,8 @@
*/
package org.apache.nifi.processors.standard;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
-
+import com.bazaarvoice.jolt.JoltTransform;
+import com.bazaarvoice.jolt.JsonUtils;
import com.github.benmanes.caffeine.cache.Caffeine;
import com.github.benmanes.caffeine.cache.LoadingCache;
import org.apache.nifi.annotation.behavior.EventDriven;
@@ -43,6 +32,8 @@
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
@@ -60,8 +51,18 @@
import org.apache.nifi.util.StringUtils;
import org.apache.nifi.util.file.classloader.ClassLoaderUtils;
-import com.bazaarvoice.jolt.JoltTransform;
-import com.bazaarvoice.jolt.JsonUtils;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
@EventDriven
@SideEffectFree
@@ -117,8 +118,8 @@
.displayName("Custom Module Directory")
.description("Comma-separated list of paths to files and/or directories which contain modules containing custom transformations (that are not included on NiFi's classpath).")
.required(false)
+ .identifiesExternalResource(ResourceCardinality.MULTIPLE, ResourceType.FILE, ResourceType.DIRECTORY)
.expressionLanguageSupported(ExpressionLanguageScope.NONE)
- .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
.build();
static final PropertyDescriptor TRANSFORM_CACHE_SIZE = new PropertyDescriptor.Builder()
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java
index d1deca5..a483a4a 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java
@@ -44,6 +44,8 @@
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
@@ -295,32 +297,35 @@
public static final PropertyDescriptor HEADER = new PropertyDescriptor.Builder()
.name("Header File")
.displayName("Header")
- .description("Filename specifying the header to use. If not specified, no header is supplied. This property is valid only when using the "
- + "binary-concatenation merge strategy; otherwise, it is ignored.")
+ .description("Filename or text specifying the header to use. If not specified, no header is supplied.")
.required(false)
.addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
.dependsOn(DELIMITER_STRATEGY, DELIMITER_STRATEGY_FILENAME, DELIMITER_STRATEGY_TEXT)
+ .dependsOn(MERGE_FORMAT, MERGE_FORMAT_CONCAT)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE, ResourceType.TEXT)
.build();
public static final PropertyDescriptor FOOTER = new PropertyDescriptor.Builder()
.name("Footer File")
.displayName("Footer")
- .description("Filename specifying the footer to use. If not specified, no footer is supplied. This property is valid only when using the "
- + "binary-concatenation merge strategy; otherwise, it is ignored.")
+ .description("Filename or text specifying the footer to use. If not specified, no footer is supplied.")
.required(false)
.addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
.dependsOn(DELIMITER_STRATEGY, DELIMITER_STRATEGY_FILENAME, DELIMITER_STRATEGY_TEXT)
+ .dependsOn(MERGE_FORMAT, MERGE_FORMAT_CONCAT)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE, ResourceType.TEXT)
.build();
public static final PropertyDescriptor DEMARCATOR = new PropertyDescriptor.Builder()
.name("Demarcator File")
.displayName("Demarcator")
- .description("Filename specifying the demarcator to use. If not specified, no demarcator is supplied. This property is valid only when "
- + "using the binary-concatenation merge strategy; otherwise, it is ignored.")
+ .description("Filename or text specifying the demarcator to use. If not specified, no demarcator is supplied.")
.required(false)
.addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
.dependsOn(DELIMITER_STRATEGY, DELIMITER_STRATEGY_FILENAME, DELIMITER_STRATEGY_TEXT)
+ .dependsOn(MERGE_FORMAT, MERGE_FORMAT_CONCAT)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE, ResourceType.TEXT)
.build();
public static final PropertyDescriptor COMPRESSION_LEVEL = new PropertyDescriptor.Builder()
.name("Compression Level")
@@ -707,8 +712,7 @@
return property;
}
- private byte[] getDelimiterTextContent(final ProcessContext context, final List<FlowFile> flowFiles, final PropertyDescriptor descriptor)
- throws IOException {
+ private byte[] getDelimiterTextContent(final ProcessContext context, final List<FlowFile> flowFiles, final PropertyDescriptor descriptor) {
byte[] property = null;
if (flowFiles != null && flowFiles.size() > 0) {
final FlowFile flowFile = flowFiles.get(0);
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java
index 429f640..45a425a 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java
@@ -16,6 +16,35 @@
*/
package org.apache.nifi.processors.standard;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.nifi.annotation.behavior.EventDriven;
+import org.apache.nifi.annotation.behavior.InputRequirement;
+import org.apache.nifi.annotation.behavior.InputRequirement.Requirement;
+import org.apache.nifi.annotation.behavior.SideEffectFree;
+import org.apache.nifi.annotation.behavior.SupportsBatching;
+import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.Tags;
+import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.ValidationContext;
+import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
+import org.apache.nifi.expression.AttributeValueDecorator;
+import org.apache.nifi.expression.ExpressionLanguageScope;
+import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.logging.ComponentLog;
+import org.apache.nifi.processor.AbstractProcessor;
+import org.apache.nifi.processor.DataUnit;
+import org.apache.nifi.processor.ProcessContext;
+import org.apache.nifi.processor.ProcessSession;
+import org.apache.nifi.processor.ProcessorInitializationContext;
+import org.apache.nifi.processor.Relationship;
+import org.apache.nifi.processor.exception.ProcessException;
+import org.apache.nifi.processor.io.StreamCallback;
+import org.apache.nifi.processor.util.StandardValidators;
+import org.apache.nifi.stream.io.StreamUtils;
+import org.apache.nifi.util.StopWatch;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -39,33 +68,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.nifi.annotation.behavior.EventDriven;
-import org.apache.nifi.annotation.behavior.InputRequirement;
-import org.apache.nifi.annotation.behavior.InputRequirement.Requirement;
-import org.apache.nifi.annotation.behavior.SideEffectFree;
-import org.apache.nifi.annotation.behavior.SupportsBatching;
-import org.apache.nifi.annotation.documentation.CapabilityDescription;
-import org.apache.nifi.annotation.documentation.Tags;
-import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.components.ValidationContext;
-import org.apache.nifi.components.ValidationResult;
-import org.apache.nifi.expression.AttributeValueDecorator;
-import org.apache.nifi.expression.ExpressionLanguageScope;
-import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ComponentLog;
-import org.apache.nifi.processor.AbstractProcessor;
-import org.apache.nifi.processor.DataUnit;
-import org.apache.nifi.processor.ProcessContext;
-import org.apache.nifi.processor.ProcessSession;
-import org.apache.nifi.processor.ProcessorInitializationContext;
-import org.apache.nifi.processor.Relationship;
-import org.apache.nifi.processor.exception.ProcessException;
-import org.apache.nifi.processor.io.StreamCallback;
-import org.apache.nifi.processor.util.StandardValidators;
-import org.apache.nifi.stream.io.StreamUtils;
-import org.apache.nifi.util.StopWatch;
-
@EventDriven
@SideEffectFree
@SupportsBatching
@@ -94,7 +96,7 @@
public static final PropertyDescriptor MAPPING_FILE = new PropertyDescriptor.Builder()
.name("Mapping File")
.description("The name of the file (including the full path) containing the Mappings.")
- .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
.required(true)
.build();
public static final PropertyDescriptor MAPPING_FILE_REFRESH_INTERVAL = new PropertyDescriptor.Builder()
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanAttribute.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanAttribute.java
index bc5582e..3c24372 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanAttribute.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanAttribute.java
@@ -16,21 +16,6 @@
*/
package org.apache.nifi.processors.standard;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
import org.apache.nifi.annotation.behavior.EventDriven;
import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.annotation.behavior.InputRequirement.Requirement;
@@ -40,6 +25,8 @@
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.logging.ComponentLog;
@@ -53,6 +40,20 @@
import org.apache.nifi.util.file.monitor.LastModifiedMonitor;
import org.apache.nifi.util.file.monitor.SynchronousFileWatcher;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
@EventDriven
@SideEffectFree
@SupportsBatching
@@ -86,7 +87,7 @@
.description("A new-line-delimited text file that includes the terms that should trigger a match. Empty lines are ignored. The contents of "
+ "the text file are loaded into memory when the processor is scheduled and reloaded when the contents are modified.")
.required(true)
- .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
public static final PropertyDescriptor DICTIONARY_FILTER = new PropertyDescriptor.Builder()
@@ -157,8 +158,7 @@
private Set<String> createDictionary(final ProcessContext context) throws IOException {
final Set<String> terms = new HashSet<>();
- final File file = new File(context.getProperty(DICTIONARY_FILE).evaluateAttributeExpressions().getValue());
- try (final InputStream fis = new FileInputStream(file);
+ try (final InputStream fis = context.getProperty(DICTIONARY_FILE).evaluateAttributeExpressions().asResource().read();
final BufferedReader reader = new BufferedReader(new InputStreamReader(fis))) {
String line;
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanContent.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanContent.java
index 34eba67..6bf269b 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanContent.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanContent.java
@@ -16,24 +16,6 @@
*/
package org.apache.nifi.processors.standard;
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.Closeable;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.Charset;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.nio.file.StandardOpenOption;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.concurrent.locks.ReentrantLock;
import org.apache.nifi.annotation.behavior.EventDriven;
import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.annotation.behavior.InputRequirement.Requirement;
@@ -43,6 +25,8 @@
import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
@@ -52,7 +36,6 @@
import org.apache.nifi.processor.Relationship;
import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.processor.io.InputStreamCallback;
-import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.util.file.monitor.LastModifiedMonitor;
import org.apache.nifi.util.file.monitor.SynchronousFileWatcher;
import org.apache.nifi.util.search.Search;
@@ -60,6 +43,24 @@
import org.apache.nifi.util.search.ahocorasick.AhoCorasick;
import org.apache.nifi.util.search.ahocorasick.SearchState;
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.Closeable;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.ReentrantLock;
+
@EventDriven
@SideEffectFree
@SupportsBatching
@@ -79,7 +80,7 @@
.name("Dictionary File")
.description("The filename of the terms dictionary")
.required(true)
- .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
.build();
public static final PropertyDescriptor DICTIONARY_ENCODING = new PropertyDescriptor.Builder()
.name("Dictionary Encoding")
@@ -101,7 +102,7 @@
+ "term in the dictionary are routed to this relationship")
.build();
- public static final Charset UTF8 = Charset.forName("UTF-8");
+ public static final Charset UTF8 = StandardCharsets.UTF_8;
private final AtomicReference<SynchronousFileWatcher> fileWatcherRef = new AtomicReference<>();
private final AtomicReference<Search<byte[]>> searchRef = new AtomicReference<>();
@@ -154,16 +155,9 @@
final Search<byte[]> search = new AhoCorasick<>();
final Set<SearchTerm<byte[]>> terms = new HashSet<>();
- final InputStream inStream = Files.newInputStream(Paths.get(context.getProperty(DICTIONARY).getValue()), StandardOpenOption.READ);
+ try (final InputStream inStream = context.getProperty(DICTIONARY).asResource().read();
+ final TermLoader termLoader = createTermLoader(context, inStream)) {
- final TermLoader termLoader;
- if (context.getProperty(DICTIONARY_ENCODING).getValue().equalsIgnoreCase(TEXT_ENCODING)) {
- termLoader = new TextualTermLoader(inStream);
- } else {
- termLoader = new BinaryTermLoader(inStream);
- }
-
- try {
SearchTerm<byte[]> term;
while ((term = termLoader.nextTerm()) != null) {
terms.add(term);
@@ -173,8 +167,6 @@
searchRef.set(search);
logger.info("Loaded search dictionary from {}", new Object[]{context.getProperty(DICTIONARY).getValue()});
return true;
- } finally {
- termLoader.close();
}
} finally {
dictionaryUpdateLock.unlock();
@@ -184,6 +176,14 @@
}
}
+ private TermLoader createTermLoader(final ProcessContext context, final InputStream in) {
+ if (context.getProperty(DICTIONARY_ENCODING).getValue().equalsIgnoreCase(TEXT_ENCODING)) {
+ return new TextualTermLoader(in);
+ } else {
+ return new BinaryTermLoader(in);
+ }
+ }
+
@Override
public void onTrigger(final ProcessContext context, final ProcessSession session) throws ProcessException {
final ComponentLog logger = getLogger();
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java
index 1cc57fa..fd20b0c 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java
@@ -16,33 +16,9 @@
*/
package org.apache.nifi.processors.standard;
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
-
-import javax.xml.XMLConstants;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Templates;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
import org.apache.commons.lang3.StringUtils;
import org.apache.nifi.annotation.behavior.DynamicProperty;
import org.apache.nifi.annotation.behavior.EventDriven;
@@ -58,6 +34,8 @@
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.Validator;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.expression.AttributeExpression;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
@@ -76,9 +54,31 @@
import org.apache.nifi.util.StopWatch;
import org.apache.nifi.util.Tuple;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
+import javax.xml.XMLConstants;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
@EventDriven
@SideEffectFree
@@ -99,7 +99,7 @@
+ "One of the 'XSLT file name' and 'XSLT Lookup' properties must be defined.")
.required(false)
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
- .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
.build();
public static final PropertyDescriptor XSLT_CONTROLLER = new PropertyDescriptor.Builder()
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateXml.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateXml.java
index 279d9f2..ca2f30f 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateXml.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateXml.java
@@ -16,23 +16,6 @@
*/
package org.apache.nifi.processors.standard;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
-import javax.xml.validation.Validator;
-
import org.apache.nifi.annotation.behavior.EventDriven;
import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.annotation.behavior.InputRequirement.Requirement;
@@ -44,8 +27,10 @@
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.expression.ExpressionLanguageScope;
+import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
@@ -53,9 +38,23 @@
import org.apache.nifi.processor.ProcessorInitializationContext;
import org.apache.nifi.processor.Relationship;
import org.apache.nifi.processor.io.InputStreamCallback;
-import org.apache.nifi.processor.util.StandardValidators;
import org.xml.sax.SAXException;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+
@EventDriven
@SideEffectFree
@SupportsBatching
@@ -75,7 +74,7 @@
.description("The path to the Schema file that is to be used for validation")
.required(true)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
- .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE, ResourceType.URL)
.build();
public static final Relationship REL_VALID = new Relationship.Builder()
@@ -116,15 +115,11 @@
}
@OnScheduled
- public void parseSchema(final ProcessContext context) throws IOException, SAXException {
+ public void parseSchema(final ProcessContext context) throws SAXException {
try {
- final File file = new File(context.getProperty(SCHEMA_FILE).evaluateAttributeExpressions().getValue());
- // Ensure the file exists
- if (!file.exists()) {
- throw new FileNotFoundException("Schema file not found at specified location: " + file.getAbsolutePath());
- }
+ final URL url = context.getProperty(SCHEMA_FILE).evaluateAttributeExpressions().asResource().asURL();
final SchemaFactory schemaFactory = SchemaFactory.newInstance(SCHEMA_LANGUAGE);
- final Schema schema = schemaFactory.newSchema(file);
+ final Schema schema = schemaFactory.newSchema(url);
this.schemaRef.set(schema);
} catch (final SAXException e) {
throw e;
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java
index 8382701..e7980cd 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java
@@ -44,12 +44,14 @@
import org.apache.nifi.components.PropertyValue;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.context.PropertyContext;
-import org.apache.nifi.processor.ProcessSession;
-import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.logging.ComponentLog;
+import org.apache.nifi.processor.ProcessSession;
+import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.processor.io.OutputStreamCallback;
import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.proxy.ProxyConfiguration;
@@ -86,7 +88,7 @@
.name("Private Key Path")
.description("The fully qualified path to the Private Key file")
.required(false)
- .addValidator(new StandardValidators.FileExistsValidator(true,true))
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
.build();
public static final PropertyDescriptor PRIVATE_KEY_PASSPHRASE = new PropertyDescriptor.Builder()
@@ -103,7 +105,7 @@
" otherwise, if 'Strict Host Key Checking' property is applied (set to true)" +
" then uses the 'known_hosts' and 'known_hosts2' files from ~/.ssh directory" +
" else no host key file will be used")
- .addValidator(new StandardValidators.FileExistsValidator(true,true))
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
.required(false)
.build();
public static final PropertyDescriptor STRICT_HOST_KEY_CHECKING = new PropertyDescriptor.Builder()
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/src/main/java/org/apache/nifi/dbcp/DBCPConnectionPool.java b/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/src/main/java/org/apache/nifi/dbcp/DBCPConnectionPool.java
index a7f0b9c..3972cec 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/src/main/java/org/apache/nifi/dbcp/DBCPConnectionPool.java
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/src/main/java/org/apache/nifi/dbcp/DBCPConnectionPool.java
@@ -29,6 +29,8 @@
import org.apache.nifi.components.PropertyValue;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.controller.AbstractControllerService;
import org.apache.nifi.controller.ConfigurationContext;
import org.apache.nifi.expression.AttributeExpression;
@@ -127,7 +129,7 @@
.description("Comma-separated list of files/folders and/or URLs containing the driver JAR and its dependencies (if any). For example '/var/tmp/mariadb-java-client-1.1.7.jar'")
.defaultValue(null)
.required(false)
- .addValidator(StandardValidators.createListValidator(true, true, StandardValidators.createURLorFileValidator()))
+ .identifiesExternalResource(ResourceCardinality.MULTIPLE, ResourceType.FILE, ResourceType.DIRECTORY, ResourceType.URL)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/src/main/java/org/apache/nifi/dbcp/HadoopDBCPConnectionPool.java b/nifi-nar-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/src/main/java/org/apache/nifi/dbcp/HadoopDBCPConnectionPool.java
index 2b7925c..7bdd631 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/src/main/java/org/apache/nifi/dbcp/HadoopDBCPConnectionPool.java
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/src/main/java/org/apache/nifi/dbcp/HadoopDBCPConnectionPool.java
@@ -31,6 +31,8 @@
import org.apache.nifi.components.PropertyValue;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.controller.AbstractControllerService;
import org.apache.nifi.controller.ConfigurationContext;
import org.apache.nifi.controller.ControllerServiceInitializationContext;
@@ -113,7 +115,7 @@
"the classes from hadoop-common, such as Configuration and UserGroupInformation.")
.defaultValue(null)
.required(true)
- .addValidator(StandardValidators.createListValidator(true, true, StandardValidators.createURLorFileValidator()))
+ .identifiesExternalResource(ResourceCardinality.MULTIPLE, ResourceType.FILE, ResourceType.DIRECTORY, ResourceType.URL)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.dynamicallyModifiesClasspath(true)
.build();
@@ -125,7 +127,7 @@
+ "will search the classpath, or will revert to a default configuration. Note that to enable authentication with Kerberos, "
+ "the appropriate properties must be set in the configuration files.")
.required(false)
- .addValidator(StandardValidators.createListValidator(true, true, StandardValidators.createURLorFileValidator()))
+ .identifiesExternalResource(ResourceCardinality.MULTIPLE, ResourceType.FILE)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.dynamicallyModifiesClasspath(true)
.build();
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/src/main/java/org/apache/nifi/hbase/HBase_1_1_2_ClientService.java b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/src/main/java/org/apache/nifi/hbase/HBase_1_1_2_ClientService.java
index 6e46c3e..d02c2b5 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/src/main/java/org/apache/nifi/hbase/HBase_1_1_2_ClientService.java
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/src/main/java/org/apache/nifi/hbase/HBase_1_1_2_ClientService.java
@@ -49,6 +49,8 @@
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.controller.AbstractControllerService;
import org.apache.nifi.controller.ConfigurationContext;
import org.apache.nifi.controller.ControllerServiceInitializationContext;
@@ -60,7 +62,6 @@
import org.apache.nifi.hbase.scan.Column;
import org.apache.nifi.hbase.scan.ResultCell;
import org.apache.nifi.hbase.scan.ResultHandler;
-import org.apache.nifi.hbase.validate.ConfigFilesValidator;
import org.apache.nifi.kerberos.KerberosCredentialsService;
import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.reporting.InitializationException;
@@ -110,7 +111,7 @@
.description("Comma-separated list of Hadoop Configuration files," +
" such as hbase-site.xml and core-site.xml for kerberos, " +
"including full paths to the files.")
- .addValidator(new ConfigFilesValidator())
+ .identifiesExternalResource(ResourceCardinality.MULTIPLE, ResourceType.FILE, ResourceType.DIRECTORY)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
@@ -146,7 +147,7 @@
static final PropertyDescriptor PHOENIX_CLIENT_JAR_LOCATION = new PropertyDescriptor.Builder()
.name("Phoenix Client JAR Location")
.description("The full path to the Phoenix client JAR. Required if Phoenix is installed on top of HBase.")
- .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE, ResourceType.DIRECTORY, ResourceType.URL)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.dynamicallyModifiesClasspath(true)
.build();
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/src/main/java/org/apache/nifi/hbase/validate/ConfigFilesValidator.java b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/src/main/java/org/apache/nifi/hbase/validate/ConfigFilesValidator.java
deleted file mode 100644
index 9421440..0000000
--- a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/src/main/java/org/apache/nifi/hbase/validate/ConfigFilesValidator.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.hbase.validate;
-
-import org.apache.nifi.components.ValidationContext;
-import org.apache.nifi.components.ValidationResult;
-import org.apache.nifi.components.Validator;
-import org.apache.nifi.processor.util.StandardValidators;
-
-public class ConfigFilesValidator implements Validator {
-
- @Override
- public ValidationResult validate(final String subject, final String value, final ValidationContext context) {
- final String[] filenames = value.split(",");
- for (final String filename : filenames) {
- final ValidationResult result = StandardValidators.FILE_EXISTS_VALIDATOR.validate(subject, filename.trim(), context);
- if (!result.isValid()) {
- return result;
- }
- }
-
- return new ValidationResult.Builder().subject(subject).input(value).valid(true).build();
- }
-}
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/nifi-hbase_2-client-service/src/main/java/org/apache/nifi/hbase/HBase_2_ClientService.java b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/nifi-hbase_2-client-service/src/main/java/org/apache/nifi/hbase/HBase_2_ClientService.java
index 387aa1c..1929de9 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/nifi-hbase_2-client-service/src/main/java/org/apache/nifi/hbase/HBase_2_ClientService.java
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/nifi-hbase_2-client-service/src/main/java/org/apache/nifi/hbase/HBase_2_ClientService.java
@@ -49,6 +49,8 @@
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.controller.AbstractControllerService;
import org.apache.nifi.controller.ConfigurationContext;
import org.apache.nifi.controller.ControllerServiceInitializationContext;
@@ -60,7 +62,6 @@
import org.apache.nifi.hbase.scan.Column;
import org.apache.nifi.hbase.scan.ResultCell;
import org.apache.nifi.hbase.scan.ResultHandler;
-import org.apache.nifi.hbase.validate.ConfigFilesValidator;
import org.apache.nifi.kerberos.KerberosCredentialsService;
import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.reporting.InitializationException;
@@ -109,7 +110,7 @@
.description("Comma-separated list of Hadoop Configuration files," +
" such as hbase-site.xml and core-site.xml for kerberos, " +
"including full paths to the files.")
- .addValidator(new ConfigFilesValidator())
+ .identifiesExternalResource(ResourceCardinality.MULTIPLE, ResourceType.FILE, ResourceType.DIRECTORY)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
@@ -142,10 +143,11 @@
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
+ // This property is never referenced directly but is necessary so that the classpath will be dynamically modified.
static final PropertyDescriptor PHOENIX_CLIENT_JAR_LOCATION = new PropertyDescriptor.Builder()
.name("Phoenix Client JAR Location")
.description("The full path to the Phoenix client JAR. Required if Phoenix is installed on top of HBase.")
- .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE, ResourceType.DIRECTORY, ResourceType.URL)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.dynamicallyModifiesClasspath(true)
.build();
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/nifi-hbase_2-client-service/src/main/java/org/apache/nifi/hbase/validate/ConfigFilesValidator.java b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/nifi-hbase_2-client-service/src/main/java/org/apache/nifi/hbase/validate/ConfigFilesValidator.java
deleted file mode 100644
index 9421440..0000000
--- a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/nifi-hbase_2-client-service/src/main/java/org/apache/nifi/hbase/validate/ConfigFilesValidator.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.hbase.validate;
-
-import org.apache.nifi.components.ValidationContext;
-import org.apache.nifi.components.ValidationResult;
-import org.apache.nifi.components.Validator;
-import org.apache.nifi.processor.util.StandardValidators;
-
-public class ConfigFilesValidator implements Validator {
-
- @Override
- public ValidationResult validate(final String subject, final String value, final ValidationContext context) {
- final String[] filenames = value.split(",");
- for (final String filename : filenames) {
- final ValidationResult result = StandardValidators.FILE_EXISTS_VALIDATOR.validate(subject, filename.trim(), context);
- if (!result.isValid()) {
- return result;
- }
- }
-
- return new ValidationResult.Builder().subject(subject).input(value).valid(true).build();
- }
-}
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-kerberos-credentials-service-bundle/nifi-kerberos-credentials-service/src/main/java/org/apache/nifi/kerberos/KeytabCredentialsService.java b/nifi-nar-bundles/nifi-standard-services/nifi-kerberos-credentials-service-bundle/nifi-kerberos-credentials-service/src/main/java/org/apache/nifi/kerberos/KeytabCredentialsService.java
index e16d01c..d05b865 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-kerberos-credentials-service-bundle/nifi-kerberos-credentials-service/src/main/java/org/apache/nifi/kerberos/KeytabCredentialsService.java
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-kerberos-credentials-service-bundle/nifi-kerberos-credentials-service/src/main/java/org/apache/nifi/kerberos/KeytabCredentialsService.java
@@ -17,11 +17,6 @@
package org.apache.nifi.kerberos;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
import org.apache.nifi.annotation.behavior.Restricted;
import org.apache.nifi.annotation.behavior.Restriction;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
@@ -31,6 +26,8 @@
import org.apache.nifi.components.RequiredPermission;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.controller.AbstractControllerService;
import org.apache.nifi.controller.ConfigurationContext;
import org.apache.nifi.controller.ControllerServiceInitializationContext;
@@ -38,6 +35,11 @@
import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.reporting.InitializationException;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
@CapabilityDescription("Provides a mechanism for specifying a Keytab and a Principal that other components are able to use in order to "
+ "perform authentication using Kerberos. By encapsulating this information into a Controller Service and allowing other components to make use of it "
+ "(as opposed to specifying the principal and keytab directly in the processor) an administrator is able to choose which users are allowed to "
@@ -59,7 +61,7 @@
static final PropertyDescriptor KEYTAB = new PropertyDescriptor.Builder()
.name("Kerberos Keytab")
.description("Kerberos keytab associated with the principal. Requires nifi.kerberos.krb5.file to be set in your nifi.properties")
- .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.required(true)
.build();
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/AbstractCSVLookupService.java b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/AbstractCSVLookupService.java
index e09c1d3..10b143b 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/AbstractCSVLookupService.java
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/AbstractCSVLookupService.java
@@ -16,6 +16,21 @@
*/
package org.apache.nifi.lookup;
+import org.apache.commons.csv.CSVFormat;
+import org.apache.nifi.components.AllowableValue;
+import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
+import org.apache.nifi.controller.AbstractControllerService;
+import org.apache.nifi.controller.ConfigurationContext;
+import org.apache.nifi.controller.ControllerServiceInitializationContext;
+import org.apache.nifi.csv.CSVUtils;
+import org.apache.nifi.expression.ExpressionLanguageScope;
+import org.apache.nifi.processor.util.StandardValidators;
+import org.apache.nifi.reporting.InitializationException;
+import org.apache.nifi.util.file.monitor.LastModifiedMonitor;
+import org.apache.nifi.util.file.monitor.SynchronousFileWatcher;
+
import java.io.IOException;
import java.nio.file.Paths;
import java.util.ArrayList;
@@ -24,20 +39,6 @@
import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Stream;
-import org.apache.commons.csv.CSVFormat;
-
-import org.apache.nifi.components.AllowableValue;
-import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.controller.AbstractControllerService;
-import org.apache.nifi.controller.ControllerServiceInitializationContext;
-import org.apache.nifi.csv.CSVUtils;
-import org.apache.nifi.expression.ExpressionLanguageScope;
-import org.apache.nifi.controller.ConfigurationContext;
-import org.apache.nifi.processor.util.StandardValidators;
-import org.apache.nifi.reporting.InitializationException;
-import org.apache.nifi.util.file.monitor.LastModifiedMonitor;
-import org.apache.nifi.util.file.monitor.SynchronousFileWatcher;
-
public abstract class AbstractCSVLookupService extends AbstractControllerService {
protected static final String KEY = "key";
@@ -52,13 +53,14 @@
.displayName("CSV File")
.description("Path to a CSV File in which the key value pairs can be looked up.")
.required(true)
- .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
public static final PropertyDescriptor CHARSET =
new PropertyDescriptor.Builder()
.fromPropertyDescriptor(CSVUtils.CHARSET)
+ .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.name("Character Set")
.description("The Character Encoding that is used to decode the CSV file.")
.build();
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/configuration2/CommonsConfigurationLookupService.java b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/configuration2/CommonsConfigurationLookupService.java
index 3307e5f..cbc17f4 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/configuration2/CommonsConfigurationLookupService.java
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/configuration2/CommonsConfigurationLookupService.java
@@ -16,6 +16,28 @@
*/
package org.apache.nifi.lookup.configuration2;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.FileBasedConfiguration;
+import org.apache.commons.configuration2.builder.ConfigurationBuilderEvent;
+import org.apache.commons.configuration2.builder.ReloadingFileBasedConfigurationBuilder;
+import org.apache.commons.configuration2.builder.fluent.FileBasedBuilderParameters;
+import org.apache.commons.configuration2.builder.fluent.Parameters;
+import org.apache.commons.configuration2.event.EventListener;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.nifi.annotation.lifecycle.OnEnabled;
+import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
+import org.apache.nifi.controller.AbstractControllerService;
+import org.apache.nifi.controller.ConfigurationContext;
+import org.apache.nifi.controller.ControllerServiceInitializationContext;
+import org.apache.nifi.expression.ExpressionLanguageScope;
+import org.apache.nifi.lookup.LookupFailureException;
+import org.apache.nifi.lookup.StringLookupService;
+import org.apache.nifi.reporting.InitializationException;
+import org.apache.nifi.security.xml.XXEValidator;
+
import java.io.File;
import java.lang.reflect.ParameterizedType;
import java.util.ArrayList;
@@ -27,28 +49,6 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.apache.commons.configuration2.Configuration;
-import org.apache.commons.configuration2.FileBasedConfiguration;
-import org.apache.commons.configuration2.builder.ConfigurationBuilderEvent;
-import org.apache.commons.configuration2.builder.ReloadingFileBasedConfigurationBuilder;
-import org.apache.commons.configuration2.builder.fluent.FileBasedBuilderParameters;
-import org.apache.commons.configuration2.builder.fluent.Parameters;
-import org.apache.commons.configuration2.event.EventListener;
-import org.apache.commons.configuration2.ex.ConfigurationException;
-import org.apache.commons.lang3.StringUtils;
-
-import org.apache.nifi.annotation.lifecycle.OnEnabled;
-import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.controller.AbstractControllerService;
-import org.apache.nifi.controller.ControllerServiceInitializationContext;
-import org.apache.nifi.expression.ExpressionLanguageScope;
-import org.apache.nifi.controller.ConfigurationContext;
-import org.apache.nifi.lookup.LookupFailureException;
-import org.apache.nifi.lookup.StringLookupService;
-import org.apache.nifi.processor.util.StandardValidators;
-import org.apache.nifi.reporting.InitializationException;
-import org.apache.nifi.security.xml.XXEValidator;
-
/**
* This abstract class defines a generic {@link LookupService} backed by an
* Apache Commons Configuration {@link FileBasedConfiguration}.
@@ -66,7 +66,7 @@
.displayName("Configuration File")
.description("A configuration file")
.required(true)
- .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
.addValidator(new XXEValidator())
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/db/AbstractDatabaseLookupService.java b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/db/AbstractDatabaseLookupService.java
index e91e6d7..fdbebbf 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/db/AbstractDatabaseLookupService.java
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/db/AbstractDatabaseLookupService.java
@@ -68,6 +68,7 @@
+ "Setting this property to zero means no caching will be done and the table will be queried for each lookup value in each record. If the lookup "
+ "table changes often or the most recent data must be retrieved, do not use the cache.")
.addValidator(StandardValidators.NON_NEGATIVE_INTEGER_VALIDATOR)
+ .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.defaultValue("0")
.required(true)
.build();
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/maxmind/IPLookupService.java b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/maxmind/IPLookupService.java
index b2fb463..819b90f 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/maxmind/IPLookupService.java
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/maxmind/IPLookupService.java
@@ -17,6 +17,33 @@
package org.apache.nifi.lookup.maxmind;
+import com.maxmind.db.InvalidDatabaseException;
+import com.maxmind.geoip2.model.AnonymousIpResponse;
+import com.maxmind.geoip2.model.CityResponse;
+import com.maxmind.geoip2.model.ConnectionTypeResponse;
+import com.maxmind.geoip2.model.ConnectionTypeResponse.ConnectionType;
+import com.maxmind.geoip2.model.DomainResponse;
+import com.maxmind.geoip2.model.IspResponse;
+import com.maxmind.geoip2.record.Country;
+import com.maxmind.geoip2.record.Location;
+import com.maxmind.geoip2.record.Subdivision;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.Tags;
+import org.apache.nifi.annotation.lifecycle.OnEnabled;
+import org.apache.nifi.annotation.lifecycle.OnStopped;
+import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
+import org.apache.nifi.controller.AbstractControllerService;
+import org.apache.nifi.controller.ConfigurationContext;
+import org.apache.nifi.expression.ExpressionLanguageScope;
+import org.apache.nifi.lookup.LookupFailureException;
+import org.apache.nifi.lookup.RecordLookupService;
+import org.apache.nifi.serialization.record.MapRecord;
+import org.apache.nifi.serialization.record.Record;
+import org.apache.nifi.util.StopWatch;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -34,33 +61,6 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.nifi.annotation.documentation.CapabilityDescription;
-import org.apache.nifi.annotation.documentation.Tags;
-import org.apache.nifi.annotation.lifecycle.OnEnabled;
-import org.apache.nifi.annotation.lifecycle.OnStopped;
-import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.controller.AbstractControllerService;
-import org.apache.nifi.controller.ConfigurationContext;
-import org.apache.nifi.expression.ExpressionLanguageScope;
-import org.apache.nifi.lookup.LookupFailureException;
-import org.apache.nifi.lookup.RecordLookupService;
-import org.apache.nifi.processor.util.StandardValidators;
-import org.apache.nifi.serialization.record.MapRecord;
-import org.apache.nifi.serialization.record.Record;
-import org.apache.nifi.util.StopWatch;
-
-import com.maxmind.db.InvalidDatabaseException;
-import com.maxmind.geoip2.model.AnonymousIpResponse;
-import com.maxmind.geoip2.model.CityResponse;
-import com.maxmind.geoip2.model.ConnectionTypeResponse;
-import com.maxmind.geoip2.model.ConnectionTypeResponse.ConnectionType;
-import com.maxmind.geoip2.model.DomainResponse;
-import com.maxmind.geoip2.model.IspResponse;
-import com.maxmind.geoip2.record.Country;
-import com.maxmind.geoip2.record.Location;
-import com.maxmind.geoip2.record.Subdivision;
-
@Tags({"lookup", "enrich", "ip", "geo", "ipgeo", "maxmind", "isp", "domain", "cellular", "anonymous", "tor"})
@CapabilityDescription("A lookup service that provides several types of enrichment information for IP addresses. The service is configured by providing a MaxMind "
@@ -87,7 +87,7 @@
.displayName("MaxMind Database File")
.description("Path to Maxmind IP Enrichment Database File")
.required(true)
- .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
static final PropertyDescriptor LOOKUP_CITY = new PropertyDescriptor.Builder()
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/groovy/org/apache/nifi/lookup/TestRestLookupService.groovy b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/groovy/org/apache/nifi/lookup/TestRestLookupService.groovy
index 4f28719..0c26abb 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/groovy/org/apache/nifi/lookup/TestRestLookupService.groovy
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/groovy/org/apache/nifi/lookup/TestRestLookupService.groovy
@@ -50,6 +50,8 @@
recordReader = new MockRecordParser()
lookupService = new MockRestLookupService()
runner = TestRunners.newTestRunner(TestRestLookupServiceProcessor.class)
+ runner.setValidateExpressionUsage(false)
+
runner.addControllerService("lookupService", lookupService)
runner.addControllerService("recordReader", recordReader)
runner.setProperty(lookupService, RestLookupService.RECORD_READER, "recordReader")
@@ -86,7 +88,7 @@
Assert.assertEquals(48, record.getAsInt("age"))
Assert.assertEquals("Soccer", record.getAsString("sport"))
}
-
+
@Test
void testNestedLookup() {
runner.disableControllerService(lookupService)
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/grok/GrokReader.java b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/grok/GrokReader.java
index 7dc6737..07383f5 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/grok/GrokReader.java
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/grok/GrokReader.java
@@ -28,6 +28,8 @@
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.context.PropertyContext;
import org.apache.nifi.controller.ConfigurationContext;
import org.apache.nifi.expression.ExpressionLanguageScope;
@@ -46,7 +48,6 @@
import org.apache.nifi.serialization.record.RecordFieldType;
import org.apache.nifi.serialization.record.RecordSchema;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -93,7 +94,7 @@
.description("Path to a file that contains Grok Patterns to use for parsing logs. If not specified, a built-in default Pattern file "
+ "will be used. If specified, all patterns in the given pattern file will override the default patterns. See the Controller Service's "
+ "Additional Details for a list of pre-defined patterns.")
- .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.required(false)
.build();
@@ -136,8 +137,8 @@
}
if (context.getProperty(PATTERN_FILE).isSet()) {
- try (final InputStream in = new FileInputStream(context.getProperty(PATTERN_FILE)
- .evaluateAttributeExpressions().getValue()); final Reader reader = new InputStreamReader(in)) {
+ try (final InputStream in = context.getProperty(PATTERN_FILE).evaluateAttributeExpressions().asResource().read();
+ final Reader reader = new InputStreamReader(in)) {
grokCompiler.register(reader);
}
}
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/xml/XMLReader.java b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/xml/XMLReader.java
index 2f800c3..52a9701 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/xml/XMLReader.java
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/xml/XMLReader.java
@@ -77,6 +77,7 @@
+ "XML blob with a \"wrapper element\". This property dictates whether the reader expects a FlowFile to consist of a single Record or a series of Records with a \"wrapper element\" "
+ "that will be ignored.")
.allowableValues(RECORD_SINGLE, RECORD_ARRAY, RECORD_EVALUATE)
+ .expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
.defaultValue(RECORD_SINGLE.getValue())
.required(true)
.build();
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java b/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java
index 7080e3d..5d9675d 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java
@@ -16,17 +16,6 @@
*/
package org.apache.nifi.ssl;
-import java.io.File;
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-
import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnEnabled;
@@ -35,6 +24,8 @@
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.Validator;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.controller.AbstractControllerService;
import org.apache.nifi.controller.ConfigurationContext;
import org.apache.nifi.processor.exception.ProcessException;
@@ -48,6 +39,17 @@
import org.apache.nifi.security.util.TlsException;
import org.apache.nifi.util.StringUtils;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import java.io.File;
+import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
@Tags({"ssl", "secure", "certificate", "keystore", "truststore", "jks", "p12", "pkcs12", "pkcs", "tls"})
@CapabilityDescription("Standard implementation of the SSLContextService. Provides the ability to configure "
+ "keystore and/or truststore properties once and reuse that configuration throughout the application. "
@@ -68,7 +70,7 @@
.name("Truststore Filename")
.description("The fully-qualified filename of the Truststore")
.defaultValue(null)
- .addValidator(createFileExistsAndReadableValidator())
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
.sensitive(false)
.build();
public static final PropertyDescriptor TRUSTSTORE_TYPE = new PropertyDescriptor.Builder()
@@ -90,7 +92,7 @@
.name("Keystore Filename")
.description("The fully-qualified filename of the Keystore")
.defaultValue(null)
- .addValidator(createFileExistsAndReadableValidator())
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
.sensitive(false)
.build();
public static final PropertyDescriptor KEYSTORE_TYPE = new PropertyDescriptor.Builder()
@@ -172,21 +174,6 @@
resetValidationCache();
}
- private static Validator createFileExistsAndReadableValidator() {
- // Not using the FILE_EXISTS_VALIDATOR because the default is to allow expression language
- return (subject, input, context) -> {
- final File file = new File(input);
- final boolean valid = file.exists() && file.canRead();
- final String explanation = valid ? null : "File " + file + " does not exist or cannot be read";
- return new ValidationResult.Builder()
- .subject(subject)
- .input(input)
- .valid(valid)
- .explanation(explanation)
- .build();
- };
- }
-
@Override
protected List<PropertyDescriptor> getSupportedPropertyDescriptors() {
return properties;
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/test/groovy/org/apache/nifi/ssl/StandardSSLContextServiceTest.groovy b/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/test/groovy/org/apache/nifi/ssl/StandardSSLContextServiceTest.groovy
index 8c889f1..137d866 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/test/groovy/org/apache/nifi/ssl/StandardSSLContextServiceTest.groovy
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/test/groovy/org/apache/nifi/ssl/StandardSSLContextServiceTest.groovy
@@ -16,23 +16,13 @@
*/
package org.apache.nifi.ssl
-import org.apache.nifi.components.ValidationContext
-import org.apache.nifi.components.ValidationResult
-import org.apache.nifi.components.Validator
+
import org.apache.nifi.security.util.ClientAuth
-import org.apache.nifi.state.MockStateManager
import org.apache.nifi.util.MockProcessContext
-import org.apache.nifi.util.MockValidationContext
-import org.apache.nifi.util.MockVariableRegistry
import org.apache.nifi.util.TestRunner
import org.apache.nifi.util.TestRunners
import org.bouncycastle.jce.provider.BouncyCastleProvider
-import org.junit.After
-import org.junit.AfterClass
-import org.junit.Before
-import org.junit.BeforeClass
-import org.junit.Rule
-import org.junit.Test
+import org.junit.*
import org.junit.rules.TemporaryFolder
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
@@ -221,44 +211,9 @@
}
// Assert
- assert msg =~ "Cannot enable Controller Service SSLContextService.* because it is in an invalid state: 'Truststore Filename'.* is invalid because File.* does not exist or cannot be read"
runner.assertNotValid(sslContextService)
}
- @Test
- void testShouldNotEvaluateExpressionLanguageInFileValidator() {
- // Arrange
- final String VALID_TRUSTSTORE_PATH_WITH_EL = "\${literal(''):trim()}${TRUSTSTORE_PATH}"
-
- TestRunner runner = TestRunners.newTestRunner(TestProcessor.class)
- String controllerServiceId = "ssl-context"
- final SSLContextService sslContextService = new StandardSSLContextService()
- runner.addControllerService(controllerServiceId, sslContextService)
- runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE, VALID_TRUSTSTORE_PATH_WITH_EL)
- runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_PASSWORD, TRUSTSTORE_PASSWORD)
- runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_TYPE, TRUSTSTORE_TYPE)
-
- // The verifySslConfig and customValidate methods correctly do not evaluate EL, but the custom file validator does, so extract it alone and validate
- Validator fileValidator = StandardSSLContextService.createFileExistsAndReadableValidator()
- final ValidationContext mockValidationContext = new MockValidationContext(
- runner.getProcessContext() as MockProcessContext,
- new MockStateManager(sslContextService),
- new MockVariableRegistry())
-
- // Act
- ValidationResult vr = fileValidator.validate(StandardSSLContextService.TRUSTSTORE.name, VALID_TRUSTSTORE_PATH_WITH_EL, mockValidationContext)
- logger.info("Custom file validation result: ${vr}")
-
- // Assert
- final MockProcessContext processContext = (MockProcessContext) runner.getProcessContext()
-
- // If the EL was evaluated, the paths would be identical
- assert processContext.getControllerServiceProperties(sslContextService).get(StandardSSLContextService.TRUSTSTORE, "") != TRUSTSTORE_PATH
-
- // If the EL was evaluated, the path would be valid
- assert !vr.isValid()
- }
-
/**
* This test ensures that the deprecated ClientAuth enum is correctly mapped to the canonical enum.
*/
diff --git a/nifi-nar-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/JettyWebSocketServer.java b/nifi-nar-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/JettyWebSocketServer.java
index ecb13be..8b60e04 100644
--- a/nifi-nar-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/JettyWebSocketServer.java
+++ b/nifi-nar-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/JettyWebSocketServer.java
@@ -25,6 +25,8 @@
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.controller.ConfigurationContext;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.processor.util.StandardValidators;
@@ -158,7 +160,7 @@
+ "See http://www.eclipse.org/jetty/documentation/current/configuring-security.html for detail.")
.required(false)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
- .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE)
.build();
private static final List<PropertyDescriptor> properties;
diff --git a/nifi-system-tests/nifi-system-test-extensions-bundle/nifi-system-test-extensions/src/main/java/org/apache/nifi/processors/tests/system/ValidateFileExists.java b/nifi-system-tests/nifi-system-test-extensions-bundle/nifi-system-test-extensions/src/main/java/org/apache/nifi/processors/tests/system/ValidateFileExists.java
index 66bd95c..e422cc9 100644
--- a/nifi-system-tests/nifi-system-test-extensions-bundle/nifi-system-test-extensions/src/main/java/org/apache/nifi/processors/tests/system/ValidateFileExists.java
+++ b/nifi-system-tests/nifi-system-test-extensions-bundle/nifi-system-test-extensions/src/main/java/org/apache/nifi/processors/tests/system/ValidateFileExists.java
@@ -17,13 +17,14 @@
package org.apache.nifi.processors.tests.system;
import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.resource.ResourceCardinality;
+import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.Relationship;
import org.apache.nifi.processor.exception.ProcessException;
-import org.apache.nifi.processor.util.StandardValidators;
import java.util.Collections;
import java.util.List;
@@ -35,7 +36,7 @@
.displayName("Filename")
.description("A file that should exist")
.required(true)
- .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE, ResourceType.DIRECTORY)
.build();
private static final Relationship REL_SUCCESS = new Relationship.Builder().name("success").build();
