You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2016/11/15 16:49:40 UTC
[2/2] nifi git commit: NIFI-2684: Additional check for displayName
NIFI-2684: Additional check for displayName
This closes #1002
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/97cd94d2
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/97cd94d2
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/97cd94d2
Branch: refs/heads/master
Commit: 97cd94d260716011a1a0225387c2a0970658ec2a
Parents: ef2c505
Author: Matt Burgess <ma...@apache.org>
Authored: Tue Nov 15 11:44:46 2016 -0500
Committer: Matt Burgess <ma...@apache.org>
Committed: Tue Nov 15 11:48:50 2016 -0500
----------------------------------------------------------------------
.../apache/nifi/components/AbstractConfigurableComponent.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/97cd94d2/nifi-api/src/main/java/org/apache/nifi/components/AbstractConfigurableComponent.java
----------------------------------------------------------------------
diff --git a/nifi-api/src/main/java/org/apache/nifi/components/AbstractConfigurableComponent.java b/nifi-api/src/main/java/org/apache/nifi/components/AbstractConfigurableComponent.java
index 4c93797..d0e5a3b 100644
--- a/nifi-api/src/main/java/org/apache/nifi/components/AbstractConfigurableComponent.java
+++ b/nifi-api/src/main/java/org/apache/nifi/components/AbstractConfigurableComponent.java
@@ -91,8 +91,9 @@ public abstract class AbstractConfigurableComponent implements ConfigurableCompo
value = descriptor.getDefaultValue();
}
if (value == null && descriptor.isRequired()) {
- ValidationResult.Builder builder = new ValidationResult.Builder().valid(false).input(null).subject(descriptor.getDisplayName());
- builder = (descriptor.getDisplayName() != null) ? builder.explanation(descriptor.getDisplayName() + " is required") : builder.explanation(descriptor.getName() + " is required");
+ String displayName = descriptor.getDisplayName();
+ ValidationResult.Builder builder = new ValidationResult.Builder().valid(false).input(null).subject(displayName != null ? displayName : descriptor.getName());
+ builder = (displayName != null) ? builder.explanation(displayName + " is required") : builder.explanation(descriptor.getName() + " is required");
results.add(builder.build());
continue;
} else if (value == null) {