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

NIFI-810: Updated the wording on validation errors due to upstream connections

This commit is contained in:
Mark Payne 2015-10-07 17:26:04 -04:00
parent 13edcfda2e
commit 5ecdb1858e
1 changed files with 1237 additions and 1238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
View File

@ -359,8 +359,7 @@ public class StandardProcessorNode extends ProcessorNode implements Connectable
if (capDesc != null) { if (capDesc != null) {
description = capDesc.value(); description = capDesc.value();
} else { } else {
final org.apache.nifi.processor.annotation.CapabilityDescription deprecatedCapDesc final org.apache.nifi.processor.annotation.CapabilityDescription deprecatedCapDesc = processor.getClass().getAnnotation(org.apache.nifi.processor.annotation.CapabilityDescription.class);
= processor.getClass().getAnnotation(org.apache.nifi.processor.annotation.CapabilityDescription.class);
if (deprecatedCapDesc != null) { if (deprecatedCapDesc != null) {
description = deprecatedCapDesc.value(); description = deprecatedCapDesc.value();
} }
@ -664,7 +663,7 @@ public class StandardProcessorNode extends ProcessorNode implements Connectable
} finally { } finally {
readLock.unlock(); readLock.unlock();
} }
return (applicableConnections == null) ? Collections.<Connection>emptySet() : Collections.unmodifiableSet(applicableConnections); return (applicableConnections == null) ? Collections.<Connection> emptySet() : Collections.unmodifiableSet(applicableConnections);
} }
@Override @Override
@ -1049,8 +1048,8 @@ public class StandardProcessorNode extends ProcessorNode implements Connectable
final int incomingConnCount = getIncomingConnections().size(); final int incomingConnCount = getIncomingConnections().size();
if (incomingConnCount != 0) { if (incomingConnCount != 0) {
results.add(new ValidationResult.Builder() results.add(new ValidationResult.Builder()
.explanation("Processor does not accept Incoming Connections but is currently configured with " + incomingConnCount + " Incoming Connections") .explanation("Processor is currently configured with " + incomingConnCount + " upstream connections but does not accept any upstream connections")
.subject("Incoming Connections") .subject("Upstream Connections")
.valid(false) .valid(false)
.build()); .build());
} }
@ -1059,8 +1058,8 @@ public class StandardProcessorNode extends ProcessorNode implements Connectable
case INPUT_REQUIRED: { case INPUT_REQUIRED: {
if (getIncomingConnections().isEmpty()) { if (getIncomingConnections().isEmpty()) {
results.add(new ValidationResult.Builder() results.add(new ValidationResult.Builder()
.explanation("Processor required at least one Incoming Connection in order to perform its function but currently has no Incoming Connection") .explanation("Processor requires an upstream connection but currently has none")
.subject("Incoming Connections") .subject("Upstream Connections")
.valid(false) .valid(false)
.build()); .build());
} }