Repository: nifi Updated Branches: refs/heads/master 7facf95cc -> 849c43b16
NIFI-2009 removed 'annotationData' and 'validationContextFactory' instance variables from StandardProcessNode NIFI-2009 fixed import ordering This closes #527. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/83d5cb36 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/83d5cb36 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/83d5cb36 Branch: refs/heads/master Commit: 83d5cb365dcb3edcdc036fa6cda1aba47138d9e7 Parents: 992b555 Author: Oleg Zhurakousky <[email protected]> Authored: Tue Jun 14 10:31:05 2016 -0400 Committer: Pierre Villard <[email protected]> Committed: Wed Jun 15 18:54:25 2016 +0200 ---------------------------------------------------------------------- .../controller/AbstractConfiguredComponent.java | 4 ++++ .../nifi/controller/StandardProcessorNode.java | 24 ++++++-------------- 2 files changed, 11 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/83d5cb36/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractConfiguredComponent.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractConfiguredComponent.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractConfiguredComponent.java index 84610d1..b3de995 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractConfiguredComponent.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractConfiguredComponent.java @@ -323,4 +323,8 @@ public abstract class AbstractConfiguredComponent implements ConfigurableCompone public String getComponentType() { return componentType; } + + protected ValidationContextFactory getValidationContextFactory() { + return this.validationContextFactory; + } } http://git-wip-us.apache.org/repos/asf/nifi/blob/83d5cb36/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java index f2a7712..1f10e6a 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java @@ -59,6 +59,7 @@ import org.apache.nifi.util.ReflectionUtils; import org.quartz.CronExpression; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.util.Assert; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; @@ -110,7 +111,6 @@ public class StandardProcessorNode extends ProcessorNode implements Connectable private final AtomicBoolean lossTolerant; private final AtomicReference<String> comments; private final AtomicReference<Position> position; - private final AtomicReference<String> annotationData; private final AtomicReference<String> schedulingPeriod; // stored as string so it's presented to user as they entered it private final AtomicReference<String> yieldPeriod; private final AtomicReference<String> penalizationPeriod; @@ -125,7 +125,6 @@ public class StandardProcessorNode extends ProcessorNode implements Connectable private final boolean eventDrivenSupported; private final boolean batchSupported; private final Requirement inputRequirement; - private final ValidationContextFactory validationContextFactory; private final ProcessScheduler processScheduler; private long runNanos = 0L; @@ -166,7 +165,6 @@ public class StandardProcessorNode extends ProcessorNode implements Connectable style = new AtomicReference<>(Collections.unmodifiableMap(new HashMap<String, String>())); this.processGroup = new AtomicReference<>(); processScheduler = scheduler; - annotationData = new AtomicReference<>(); isolated = new AtomicBoolean(false); penalizationPeriod = new AtomicReference<>(DEFAULT_PENALIZATION_PERIOD); @@ -182,7 +180,6 @@ public class StandardProcessorNode extends ProcessorNode implements Connectable triggerWhenAnyDestinationAvailable = procClass.isAnnotationPresent(TriggerWhenAnyDestinationAvailable.class) || procClass.isAnnotationPresent( org.apache.nifi.processor.annotation.TriggerWhenAnyDestinationAvailable.class); - this.validationContextFactory = validationContextFactory; eventDrivenSupported = (procClass.isAnnotationPresent(EventDriven.class) || procClass.isAnnotationPresent(org.apache.nifi.processor.annotation.EventDriven.class)) && !triggeredSerially && !triggerWhenEmpty; @@ -925,7 +922,8 @@ public class StandardProcessorNode extends ProcessorNode implements Connectable @Override public boolean isValid() { try { - final ValidationContext validationContext = validationContextFactory.newValidationContext(getProperties(), getAnnotationData(), getProcessGroupIdentifier()); + final ValidationContext validationContext = this.getValidationContextFactory() + .newValidationContext(getProperties(), getAnnotationData(), getProcessGroupIdentifier()); final Collection<ValidationResult> validationResults; try (final NarCloseable narCloseable = NarCloseable.withNarLoader()) { @@ -971,8 +969,8 @@ public class StandardProcessorNode extends ProcessorNode implements Connectable public Collection<ValidationResult> getValidationErrors() { final List<ValidationResult> results = new ArrayList<>(); try { - final ValidationContext validationContext = validationContextFactory.newValidationContext(getProperties(), - getAnnotationData(), getProcessGroup().getIdentifier()); + final ValidationContext validationContext = this.getValidationContextFactory() + .newValidationContext(getProperties(), getAnnotationData(), getProcessGroup().getIdentifier()); final Collection<ValidationResult> validationResults; try (final NarCloseable narCloseable = NarCloseable.withNarLoader()) { @@ -1087,16 +1085,8 @@ public class StandardProcessorNode extends ProcessorNode implements Connectable @Override public void setAnnotationData(final String data) { - if (isRunning()) { - throw new IllegalStateException("Cannot set AnnotationData while processor is running"); - } - - this.annotationData.set(data); - } - - @Override - public String getAnnotationData() { - return annotationData.get(); + Assert.state(!isRunning(), "Cannot set AnnotationData while processor is running"); + super.setAnnotationData(data); } @Override
