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

NIFI-8431: remove redundant validation of dynamic properties 

removed unused variable

Signed-off-by: Matthew Burgess <mattyb149@apache.org>

This closes #5045
This commit is contained in:
Mark Bean 2021-04-14 16:33:34 +00:00 committed by Matthew Burgess
parent 5062f2e54e
commit 5c2df42be3
No known key found for this signature in database
GPG Key ID: 05D3DEB8126DAD24
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nifi-api/src/main/java/org/apache/nifi/components/AbstractConfigurableComponent.java
View File

@ -20,7 +20,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
public abstract class AbstractConfigurableComponent implements ConfigurableComponent {
@ -93,7 +92,6 @@ public abstract class AbstractConfigurableComponent implements ConfigurableCompo
// goes through context properties, should match supported properties + supported dynamic properties
final Collection<ValidationResult> results = new ArrayList<>();
final Set<PropertyDescriptor> contextDescriptors = context.getProperties().keySet();
final List<PropertyDescriptor> supportedDescriptors = getSupportedPropertyDescriptors();
for (final PropertyDescriptor descriptor : contextDescriptors) {
// If the property descriptor's dependency is not satisfied, the property does not need to be considered, as it's not relevant to the
@ -126,19 +124,6 @@ public abstract class AbstractConfigurableComponent implements ConfigurableCompo
}
}
// validate any dynamic properties
for (final Map.Entry<PropertyDescriptor, String> entry : context.getProperties().entrySet()) {
final PropertyDescriptor descriptor = entry.getKey();
final String value = entry.getValue();
if (supportedDescriptors != null && !supportedDescriptors.contains(descriptor)) {
final ValidationResult result = descriptor.validate(value, context);
if (!result.isValid()) {
results.add(result);
}
}
}
// only run customValidate if regular validation is successful. This allows Processor developers to not have to check
// if values are null or invalid so that they can focus only on the interaction between the properties, etc.
if (results.isEmpty()) {