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/01/30 19:01:08 UTC
[5/7] incubator-nifi git commit: NIFI-250: Updated
ControllerServiceProvider to have a 'createControllerService' that takes no
identifier and randomly generates one
NIFI-250: Updated ControllerServiceProvider to have a 'createControllerService' that takes no identifier and randomly generates one
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/3102e083
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/3102e083
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/3102e083
Branch: refs/heads/NIFI-250
Commit: 3102e08378b34cb869c708faa05c427de6b68139
Parents: 3344cef
Author: Mark Payne <ma...@hotmail.com>
Authored: Fri Jan 30 10:18:54 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Fri Jan 30 10:18:54 2015 -0500
----------------------------------------------------------------------
.../nifi/cluster/manager/impl/WebClusterManager.java | 3 ++-
.../controller/service/ControllerServiceProvider.java | 11 +++++++++++
.../java/org/apache/nifi/controller/FlowController.java | 2 +-
.../service/StandardControllerServiceProvider.java | 6 ++++++
4 files changed, 20 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3102e083/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 27620b5..9649fee 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
@@ -1294,8 +1294,9 @@ public class WebClusterManager implements HttpClusterManager, ProtocolHandler, C
}
}
+ @Override
public ControllerServiceNode createControllerService(final String type, final boolean firstTimeAdded) {
- return createControllerService(type, UUID.randomUUID().toString(), firstTimeAdded);
+ return controllerServiceProvider.createControllerService(type, firstTimeAdded);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3102e083/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 1bc3964..42d6609 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
@@ -27,10 +27,21 @@ import org.apache.nifi.controller.ControllerServiceLookup;
public interface ControllerServiceProvider extends ControllerServiceLookup {
/**
+ * Creates a new Controller Service of the specified type and assigns it a randomly generated ID. If <code>firstTimeadded</code>
+ * is true, calls any methods that are annotated with {@link OnAdded}
+ *
+ * @param type
+ * @param firstTimeAdded
+ * @return
+ */
+ 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>
* is true, calls any methods that are annotated with {@link OnAdded}
*
* @param type
+ * @param id
* @param firstTimeAdded
* @return
*/
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3102e083/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 209a4d6..347d6b9 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
@@ -2651,7 +2651,7 @@ public class FlowController implements EventAccess, ControllerServiceProvider, H
}
public ControllerServiceNode createControllerService(final String type, final boolean firstTimeAdded) {
- return createControllerService(type, UUID.randomUUID().toString(), firstTimeAdded);
+ return controllerServiceProvider.createControllerService(type, firstTimeAdded);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3102e083/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 0263ee0..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
@@ -28,6 +28,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -95,6 +96,11 @@ public class StandardControllerServiceProvider implements ControllerServiceProvi
populateInterfaces(superClass, interfacesDefinedThusFar);
}
}
+
+ @Override
+ 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 boolean firstTimeAdded) {