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 2015/02/06 16:46:05 UTC
incubator-nifi git commit: NIFI-250: Removed 'Availability' concept
from reporting tasks and controller services because it is implicitly,
depending on if on node or ncm
Repository: incubator-nifi
Updated Branches:
refs/heads/NIFI-250 d95ca18a0 -> 55949a428
NIFI-250: Removed 'Availability' concept from reporting tasks and controller services because it is implicitly, depending on if on node or ncm
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/55949a42
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/55949a42
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/55949a42
Branch: refs/heads/NIFI-250
Commit: 55949a428f45b7e615c09d6f870196fcc95acfe7
Parents: d95ca18
Author: Mark Payne <ma...@hotmail.com>
Authored: Fri Feb 6 10:45:59 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Fri Feb 6 10:45:59 2015 -0500
----------------------------------------------------------------------
.../cluster/manager/impl/WebClusterManager.java | 29 +++++---------------
.../reporting/ClusteredReportingTaskNode.java | 3 +-
.../nifi/controller/ReportingTaskNode.java | 2 --
.../service/ControllerServiceNode.java | 2 --
.../service/ControllerServiceProvider.java | 6 ++--
.../apache/nifi/controller/FlowController.java | 22 +++------------
.../nifi/controller/FlowFromDOMFactory.java | 2 --
.../nifi/controller/StandardFlowSerializer.java | 2 --
.../controller/StandardFlowSynchronizer.java | 2 +-
.../reporting/AbstractReportingTaskNode.java | 10 +------
.../reporting/StandardReportingTaskNode.java | 3 +-
.../service/ControllerServiceLoader.java | 6 +---
.../service/StandardControllerServiceNode.java | 11 +-------
.../StandardControllerServiceProvider.java | 9 +++---
.../src/main/resources/FlowConfiguration.xsd | 10 -------
.../nifi/web/controller/ControllerFacade.java | 23 ++++++++--------
16 files changed, 34 insertions(+), 108 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/55949a42/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
index 499d709..6a83894 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
@@ -123,7 +123,6 @@ import org.apache.nifi.cluster.protocol.message.ProtocolMessage.MessageType;
import org.apache.nifi.cluster.protocol.message.ReconnectionFailureMessage;
import org.apache.nifi.cluster.protocol.message.ReconnectionRequestMessage;
import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.controller.Availability;
import org.apache.nifi.controller.ControllerService;
import org.apache.nifi.controller.Heartbeater;
import org.apache.nifi.controller.ReportingTaskNode;
@@ -174,8 +173,11 @@ import org.apache.nifi.scheduling.SchedulingStrategy;
import org.apache.nifi.util.DomUtils;
import org.apache.nifi.util.FormatUtils;
import org.apache.nifi.util.NiFiProperties;
+import org.apache.nifi.util.ObjectHolder;
import org.apache.nifi.util.ReflectionUtils;
+import org.apache.nifi.web.OptimisticLockingManager;
import org.apache.nifi.web.Revision;
+import org.apache.nifi.web.UpdateRevision;
import org.apache.nifi.web.api.dto.FlowSnippetDTO;
import org.apache.nifi.web.api.dto.NodeDTO;
import org.apache.nifi.web.api.dto.ProcessGroupDTO;
@@ -210,9 +212,6 @@ import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
import com.sun.jersey.api.client.ClientResponse;
-import org.apache.nifi.util.ObjectHolder;
-import org.apache.nifi.web.OptimisticLockingManager;
-import org.apache.nifi.web.UpdateRevision;
/**
* Provides a cluster manager implementation. The manager federates incoming
@@ -1299,15 +1298,8 @@ public class WebClusterManager implements HttpClusterManager, ProtocolHandler, C
}
@Override
- public ControllerServiceNode createControllerService(final String type, final Availability availability, final boolean firstTimeAdded) {
- if ( availability == null ) {
- throw new NullPointerException("availability is null");
- }
- if ( availability == Availability.NODE ) {
- throw new IllegalArgumentException("Cannot create Controller Service with Availability 'NODE' on the Cluster Manager");
- }
-
- return controllerServiceProvider.createControllerService(type, availability, firstTimeAdded);
+ public ControllerServiceNode createControllerService(final String type, final boolean firstTimeAdded) {
+ return controllerServiceProvider.createControllerService(type, firstTimeAdded);
}
/**
@@ -1319,15 +1311,8 @@ public class WebClusterManager implements HttpClusterManager, ProtocolHandler, C
* @return
*/
@Override
- public ControllerServiceNode createControllerService(final String type, final String id, final Availability availability, final boolean firstTimeAdded) {
- if ( availability == null ) {
- throw new NullPointerException("availability is null");
- }
- if ( availability == Availability.NODE ) {
- throw new IllegalArgumentException("Cannot create Controller Service with Availability 'NODE' on the Cluster Manager");
- }
-
- return controllerServiceProvider.createControllerService(type, id, availability, firstTimeAdded);
+ public ControllerServiceNode createControllerService(final String type, final String id, final boolean firstTimeAdded) {
+ return controllerServiceProvider.createControllerService(type, id, firstTimeAdded);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/55949a42/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/controller/reporting/ClusteredReportingTaskNode.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/controller/reporting/ClusteredReportingTaskNode.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/controller/reporting/ClusteredReportingTaskNode.java
index 5477d8e..1ed5b30 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/controller/reporting/ClusteredReportingTaskNode.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/controller/reporting/ClusteredReportingTaskNode.java
@@ -17,7 +17,6 @@
package org.apache.nifi.controller.reporting;
import org.apache.nifi.cluster.manager.impl.ClusteredReportingContext;
-import org.apache.nifi.controller.Availability;
import org.apache.nifi.controller.ProcessScheduler;
import org.apache.nifi.controller.ValidationContextFactory;
import org.apache.nifi.controller.service.ControllerServiceProvider;
@@ -35,7 +34,7 @@ public class ClusteredReportingTaskNode extends AbstractReportingTaskNode {
public ClusteredReportingTaskNode(final ReportingTask reportingTask, final String id, final ProcessScheduler scheduler,
final EventAccess eventAccess, final BulletinRepository bulletinRepository, final ControllerServiceProvider serviceProvider,
final ValidationContextFactory validationContextFactory) {
- super(reportingTask, id, Availability.NCM, serviceProvider, scheduler, validationContextFactory);
+ super(reportingTask, id, serviceProvider, scheduler, validationContextFactory);
this.eventAccess = eventAccess;
this.bulletinRepository = bulletinRepository;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/55949a42/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/ReportingTaskNode.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/ReportingTaskNode.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/ReportingTaskNode.java
index b26bf82..50dd787 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/ReportingTaskNode.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/ReportingTaskNode.java
@@ -24,8 +24,6 @@ import org.apache.nifi.scheduling.SchedulingStrategy;
public interface ReportingTaskNode extends ConfiguredComponent {
- Availability getAvailability();
-
void setSchedulingStrategy(SchedulingStrategy schedulingStrategy);
SchedulingStrategy getSchedulingStrategy();
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/55949a42/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceNode.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceNode.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceNode.java
index 298a224..e14f59d 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceNode.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceNode.java
@@ -26,8 +26,6 @@ public interface ControllerServiceNode extends ConfiguredComponent {
ControllerService getControllerServiceImplementation();
- Availability getAvailability();
-
boolean isDisabled();
void setDisabled(boolean disabled);
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/55949a42/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceProvider.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceProvider.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceProvider.java
index a99452e..40e30b2 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceProvider.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceProvider.java
@@ -32,11 +32,10 @@ public interface ControllerServiceProvider extends ControllerServiceLookup {
* is true, calls any methods that are annotated with {@link OnAdded}
*
* @param type
- * @param availabilty
* @param firstTimeAdded
* @return
*/
- ControllerServiceNode createControllerService(String type, Availability availabilty, boolean firstTimeAdded);
+ ControllerServiceNode createControllerService(String type, boolean firstTimeAdded);
/**
* Creates a new Controller Service of the specified type and assigns it the given id. If <code>firstTimeadded</code>
@@ -44,11 +43,10 @@ public interface ControllerServiceProvider extends ControllerServiceLookup {
*
* @param type
* @param id
- * @param availabilty
* @param firstTimeAdded
* @return
*/
- ControllerServiceNode createControllerService(String type, String id, Availability availabilty, boolean firstTimeAdded);
+ ControllerServiceNode createControllerService(String type, String id, boolean firstTimeAdded);
/**
* Gets the controller service node for the specified identifier. Returns
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/55949a42/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
index c9c41f2..fc0be01 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
@@ -2635,27 +2635,13 @@ public class FlowController implements EventAccess, ControllerServiceProvider, H
}
}
- public ControllerServiceNode createControllerService(final String type, final Availability availability, final boolean firstTimeAdded) {
- if ( availability == null ) {
- throw new NullPointerException("availability is null");
- }
- if ( availability == Availability.NCM ) {
- throw new IllegalArgumentException("Cannot create Controller Service with Availability 'NCM' on a standalone instance or a Node");
- }
-
- return controllerServiceProvider.createControllerService(type, availability, firstTimeAdded);
+ public ControllerServiceNode createControllerService(final String type, final boolean firstTimeAdded) {
+ return controllerServiceProvider.createControllerService(type, firstTimeAdded);
}
@Override
- public ControllerServiceNode createControllerService(final String type, final String id, final Availability availability, final boolean firstTimeAdded) {
- if ( availability == null ) {
- throw new NullPointerException("availability is null");
- }
- if ( availability == Availability.NCM ) {
- throw new IllegalArgumentException("Cannot create Controller Service with Availability 'NCM' on a standalone instance or a Node");
- }
-
- return controllerServiceProvider.createControllerService(type, id, availability, firstTimeAdded);
+ public ControllerServiceNode createControllerService(final String type, final String id, final boolean firstTimeAdded) {
+ return controllerServiceProvider.createControllerService(type, id, firstTimeAdded);
}
public void enableReportingTask(final ReportingTaskNode reportingTaskNode) {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/55949a42/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java
index a5d24cc..2a44176 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java
@@ -87,7 +87,6 @@ public class FlowFromDOMFactory {
dto.setComments(getString(element, "comment"));
dto.setType(getString(element, "class"));
dto.setEnabled(getBoolean(element, "enabled"));
- dto.setAvailability(getString(element, "availability"));
dto.setProperties(getProperties(element, encryptor));
dto.setAnnotationData(getString(element, "annotationData"));
@@ -105,7 +104,6 @@ public class FlowFromDOMFactory {
dto.setSchedulingPeriod(getString(element, "schedulingPeriod"));
dto.setScheduledState(getString(element, "scheduledState"));
dto.setSchedulingStrategy(getString(element, "schedulingStrategy"));
- dto.setAvailability(getString(element, "availability"));
dto.setProperties(getProperties(element, encryptor));
dto.setAnnotationData(getString(element, "annotationData"));
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/55949a42/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSerializer.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSerializer.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSerializer.java
index 18e2d8c..f281fa7 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSerializer.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSerializer.java
@@ -413,7 +413,6 @@ public class StandardFlowSerializer implements FlowSerializer {
addTextElement(serviceElement, "comment", serviceNode.getComments());
addTextElement(serviceElement, "class", serviceNode.getControllerServiceImplementation().getClass().getCanonicalName());
addTextElement(serviceElement, "enabled", String.valueOf(!serviceNode.isDisabled()));
- addTextElement(serviceElement, "availability", serviceNode.getAvailability().toString());
addConfiguration(serviceElement, serviceNode.getProperties(), serviceNode.getAnnotationData(), encryptor);
@@ -429,7 +428,6 @@ public class StandardFlowSerializer implements FlowSerializer {
addTextElement(taskElement, "schedulingPeriod", taskNode.getSchedulingPeriod());
addTextElement(taskElement, "scheduledState", taskNode.getScheduledState().name());
addTextElement(taskElement, "schedulingStrategy", taskNode.getSchedulingStrategy().name());
- addTextElement(taskElement, "availability", taskNode.getAvailability().toString());
addConfiguration(taskElement, taskNode.getProperties(), taskNode.getAnnotationData(), encryptor);
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/55949a42/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
index f9279a9..5981a5d 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
@@ -347,7 +347,7 @@ public class StandardFlowSynchronizer implements FlowSynchronizer {
private void addControllerService(final FlowController controller, final Element controllerServiceElement, final StringEncryptor encryptor) {
final ControllerServiceDTO dto = FlowFromDOMFactory.getControllerService(controllerServiceElement, encryptor);
- final ControllerServiceNode node = controller.createControllerService(dto.getType(), dto.getId(), Availability.valueOf(dto.getAvailability().toUpperCase()), false);
+ final ControllerServiceNode node = controller.createControllerService(dto.getType(), dto.getId(), false);
node.setName(dto.getName());
node.setComments(dto.getComments());
node.setAnnotationData(dto.getAnnotationData());
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/55949a42/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingTaskNode.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingTaskNode.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingTaskNode.java
index ed72618..fa5a621 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingTaskNode.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingTaskNode.java
@@ -20,7 +20,6 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.nifi.controller.AbstractConfiguredComponent;
-import org.apache.nifi.controller.Availability;
import org.apache.nifi.controller.ConfigurationContext;
import org.apache.nifi.controller.ControllerServiceLookup;
import org.apache.nifi.controller.ProcessScheduler;
@@ -42,7 +41,6 @@ public abstract class AbstractReportingTaskNode extends AbstractConfiguredCompon
private final ReportingTask reportingTask;
private final ProcessScheduler processScheduler;
private final ControllerServiceLookup serviceLookup;
- private final Availability availability;
private final AtomicReference<SchedulingStrategy> schedulingStrategy = new AtomicReference<>(SchedulingStrategy.TIMER_DRIVEN);
private final AtomicReference<String> schedulingPeriod = new AtomicReference<>("5 mins");
@@ -50,19 +48,13 @@ public abstract class AbstractReportingTaskNode extends AbstractConfiguredCompon
private volatile String comment;
private volatile ScheduledState scheduledState = ScheduledState.STOPPED;
- public AbstractReportingTaskNode(final ReportingTask reportingTask, final String id, final Availability availability,
+ public AbstractReportingTaskNode(final ReportingTask reportingTask, final String id,
final ControllerServiceProvider controllerServiceProvider, final ProcessScheduler processScheduler,
final ValidationContextFactory validationContextFactory) {
super(reportingTask, id, validationContextFactory, controllerServiceProvider);
this.reportingTask = reportingTask;
this.processScheduler = processScheduler;
this.serviceLookup = controllerServiceProvider;
- this.availability = availability;
- }
-
- @Override
- public Availability getAvailability() {
- return availability;
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/55949a42/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/reporting/StandardReportingTaskNode.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/reporting/StandardReportingTaskNode.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/reporting/StandardReportingTaskNode.java
index dd83c61..fe3af92 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/reporting/StandardReportingTaskNode.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/reporting/StandardReportingTaskNode.java
@@ -16,7 +16,6 @@
*/
package org.apache.nifi.controller.reporting;
-import org.apache.nifi.controller.Availability;
import org.apache.nifi.controller.FlowController;
import org.apache.nifi.controller.ProcessScheduler;
import org.apache.nifi.controller.ReportingTaskNode;
@@ -30,7 +29,7 @@ public class StandardReportingTaskNode extends AbstractReportingTaskNode impleme
public StandardReportingTaskNode(final ReportingTask reportingTask, final String id, final FlowController controller,
final ProcessScheduler processScheduler, final ValidationContextFactory validationContextFactory) {
- super(reportingTask, id, Availability.NODE, controller, processScheduler, validationContextFactory);
+ super(reportingTask, id, controller, processScheduler, validationContextFactory);
this.flowController = controller;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/55949a42/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/ControllerServiceLoader.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/ControllerServiceLoader.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/ControllerServiceLoader.java
index 01114e5..575c375 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/ControllerServiceLoader.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/ControllerServiceLoader.java
@@ -28,7 +28,6 @@ import javax.xml.parsers.ParserConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.nifi.controller.Availability;
import org.apache.nifi.util.DomUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -91,12 +90,9 @@ public class ControllerServiceLoader {
//and schedulingPeriod must be set
final String serviceId = DomUtils.getChild(serviceElement, "id").getTextContent().trim();
final String serviceClass = DomUtils.getChild(serviceElement, "class").getTextContent().trim();
- final String availabilityName = DomUtils.getChild(serviceElement, "availability").getTextContent().trim();
-
- final Availability availability = Availability.valueOf(availabilityName);
//set the class to be used for the configured controller task
- final ControllerServiceNode serviceNode = provider.createControllerService(serviceClass, serviceId, availability, false);
+ final ControllerServiceNode serviceNode = provider.createControllerService(serviceClass, serviceId, false);
//optional task-specific properties
for (final Element optionalProperty : DomUtils.getChildElementsByTagName(serviceElement, "property")) {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/55949a42/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java
index be0e7d6..ff4704d 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java
@@ -24,7 +24,6 @@ import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.nifi.controller.AbstractConfiguredComponent;
-import org.apache.nifi.controller.Availability;
import org.apache.nifi.controller.ConfigurationContext;
import org.apache.nifi.controller.ConfiguredComponent;
import org.apache.nifi.controller.ControllerService;
@@ -39,7 +38,6 @@ public class StandardControllerServiceNode extends AbstractConfiguredComponent i
private final ControllerService proxedControllerService;
private final ControllerService implementation;
private final ControllerServiceProvider serviceProvider;
- private final Availability availability;
private final AtomicBoolean disabled = new AtomicBoolean(true);
@@ -51,12 +49,11 @@ public class StandardControllerServiceNode extends AbstractConfiguredComponent i
private String comment;
public StandardControllerServiceNode(final ControllerService proxiedControllerService, final ControllerService implementation, final String id,
- final Availability availability, final ValidationContextFactory validationContextFactory, final ControllerServiceProvider serviceProvider) {
+ final ValidationContextFactory validationContextFactory, final ControllerServiceProvider serviceProvider) {
super(proxiedControllerService, id, validationContextFactory, serviceProvider);
this.proxedControllerService = proxiedControllerService;
this.implementation = implementation;
this.serviceProvider = serviceProvider;
- this.availability = availability;
}
@Override
@@ -82,12 +79,6 @@ public class StandardControllerServiceNode extends AbstractConfiguredComponent i
}
@Override
- public Availability getAvailability() {
- return availability;
- }
-
-
- @Override
public ControllerService getProxiedControllerService() {
return proxedControllerService;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/55949a42/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
index fd97da7..3ec4755 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
@@ -36,7 +36,6 @@ import org.apache.nifi.annotation.lifecycle.OnAdded;
import org.apache.nifi.annotation.lifecycle.OnDisabled;
import org.apache.nifi.annotation.lifecycle.OnEnabled;
import org.apache.nifi.annotation.lifecycle.OnRemoved;
-import org.apache.nifi.controller.Availability;
import org.apache.nifi.controller.ConfigurationContext;
import org.apache.nifi.controller.ControllerService;
import org.apache.nifi.controller.ValidationContextFactory;
@@ -99,12 +98,12 @@ public class StandardControllerServiceProvider implements ControllerServiceProvi
}
@Override
- public ControllerServiceNode createControllerService(final String type, final Availability availability, final boolean firstTimeAdded) {
- return createControllerService(type, UUID.randomUUID().toString(), availability, firstTimeAdded);
+ public ControllerServiceNode createControllerService(final String type, final boolean firstTimeAdded) {
+ return createControllerService(type, UUID.randomUUID().toString(), firstTimeAdded);
}
@Override
- public ControllerServiceNode createControllerService(final String type, final String id, final Availability availability, final boolean firstTimeAdded) {
+ public ControllerServiceNode createControllerService(final String type, final String id, final boolean firstTimeAdded) {
if (type == null || id == null) {
throw new NullPointerException();
}
@@ -148,7 +147,7 @@ public class StandardControllerServiceProvider implements ControllerServiceProvi
final ValidationContextFactory validationContextFactory = new StandardValidationContextFactory(this);
- final ControllerServiceNode serviceNode = new StandardControllerServiceNode(proxiedService, originalService, id, availability, validationContextFactory, this);
+ final ControllerServiceNode serviceNode = new StandardControllerServiceNode(proxiedService, originalService, id, validationContextFactory, this);
serviceNodeHolder.set(serviceNode);
serviceNode.setName(rawClass.getSimpleName());
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/55949a42/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/resources/FlowConfiguration.xsd
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/resources/FlowConfiguration.xsd b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/resources/FlowConfiguration.xsd
index e2f146f..00c71ac 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/resources/FlowConfiguration.xsd
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/resources/FlowConfiguration.xsd
@@ -345,21 +345,12 @@
<xs:element name="comment" type="xs:string" />
<xs:element name="class" type="NonEmptyStringType" />
<xs:element name="enabled" type="xs:boolean" />
- <xs:element name="availability" type="Availability" />
<xs:element name="property" type="PropertyType" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="annotationData" type="xs:string" minOccurs="0" maxOccurs="1" />
</xs:sequence>
</xs:complexType>
- <xs:simpleType name="Availability">
- <xs:restriction base="xs:string">
- <xs:enumeration value="CLUSTER_MANAGER_ONLY"></xs:enumeration>
- <xs:enumeration value="NODE_ONLY"></xs:enumeration>
- <xs:enumeration value="BOTH"></xs:enumeration>
- </xs:restriction>
- </xs:simpleType>
-
<xs:complexType name="ReportingTasksType">
<xs:sequence>
<xs:element name="reportingTask" type="ReportingTaskType" minOccurs="0" maxOccurs="unbounded" />
@@ -375,7 +366,6 @@
<xs:element name="schedulingPeriod" type="NonEmptyStringType"/>
<xs:element name="schedulingState" type="ScheduledState" />
<xs:element name="schedulingStrategy" type="SchedulingStrategy" />
- <xs:element name="availability" type="Availability" />
<xs:element name="property" type="PropertyType" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="annotationData" type="xs:string" minOccurs="0" maxOccurs="1" />
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/55949a42/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
index 8ad938f..83bdd2f 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
@@ -37,13 +37,16 @@ import java.util.concurrent.TimeUnit;
import javax.ws.rs.WebApplicationException;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.nifi.admin.service.UserService;
+import org.apache.nifi.authorization.DownloadAuthorization;
import org.apache.nifi.cluster.protocol.NodeIdentifier;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.connectable.Connectable;
import org.apache.nifi.connectable.Connection;
import org.apache.nifi.connectable.Funnel;
import org.apache.nifi.connectable.Port;
-import org.apache.nifi.controller.Availability;
import org.apache.nifi.controller.ContentAvailability;
import org.apache.nifi.controller.ControllerService;
import org.apache.nifi.controller.Counter;
@@ -64,6 +67,7 @@ import org.apache.nifi.groups.ProcessGroupCounts;
import org.apache.nifi.groups.RemoteProcessGroup;
import org.apache.nifi.nar.ExtensionManager;
import org.apache.nifi.nar.NarCloseable;
+import org.apache.nifi.processor.DataUnit;
import org.apache.nifi.processor.Processor;
import org.apache.nifi.processor.QueueSize;
import org.apache.nifi.processor.Relationship;
@@ -80,11 +84,11 @@ import org.apache.nifi.provenance.search.SearchableField;
import org.apache.nifi.remote.RootGroupPort;
import org.apache.nifi.reporting.Bulletin;
import org.apache.nifi.reporting.BulletinRepository;
+import org.apache.nifi.reporting.ReportingTask;
import org.apache.nifi.scheduling.SchedulingStrategy;
import org.apache.nifi.search.SearchContext;
import org.apache.nifi.search.SearchResult;
import org.apache.nifi.search.Searchable;
-import org.apache.nifi.web.security.user.NiFiUserUtils;
import org.apache.nifi.services.FlowService;
import org.apache.nifi.user.NiFiUser;
import org.apache.nifi.util.FormatUtils;
@@ -109,13 +113,8 @@ import org.apache.nifi.web.api.dto.search.SearchResultsDTO;
import org.apache.nifi.web.api.dto.status.ControllerStatusDTO;
import org.apache.nifi.web.api.dto.status.ProcessGroupStatusDTO;
import org.apache.nifi.web.api.dto.status.StatusHistoryDTO;
+import org.apache.nifi.web.security.user.NiFiUserUtils;
import org.apache.nifi.web.util.DownloadableContent;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.nifi.admin.service.UserService;
-import org.apache.nifi.authorization.DownloadAuthorization;
-import org.apache.nifi.processor.DataUnit;
-import org.apache.nifi.reporting.ReportingTask;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.access.AccessDeniedException;
@@ -405,13 +404,13 @@ public class ControllerFacade implements ControllerServiceProvider {
return flowController.getControllerService(serviceIdentifier);
}
- public ControllerServiceNode createControllerService(final String type, final Availability availability, final boolean firstTimeAdded) {
- return flowController.createControllerService(type, availability, firstTimeAdded);
+ public ControllerServiceNode createControllerService(final String type, final boolean firstTimeAdded) {
+ return flowController.createControllerService(type, firstTimeAdded);
}
@Override
- public ControllerServiceNode createControllerService(final String type, final String id, final Availability availability, final boolean firstTimeAdded) {
- return flowController.createControllerService(type, id, availability, firstTimeAdded);
+ public ControllerServiceNode createControllerService(final String type, final String id, final boolean firstTimeAdded) {
+ return flowController.createControllerService(type, id, firstTimeAdded);
}
public void removeControllerService(ControllerServiceNode serviceNode) {