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

NIFI-2009 removed 'annotationData' and 'validationContextFactory' instance variables from StandardProcessNode 

NIFI-2009 fixed import ordering

This closes #527.
This commit is contained in:
Oleg Zhurakousky 2016-06-14 10:31:05 -04:00 committed by Pierre Villard
parent 992b5552bb
commit 83d5cb365d
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractConfiguredComponent.java
View File

@ -323,4 +323,8 @@ public abstract class AbstractConfiguredComponent implements ConfigurableCompone
public String getComponentType() {
return componentType;
}
protected ValidationContextFactory getValidationContextFactory() {
return this.validationContextFactory;
}
}

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

@ -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