Repository: nifi Updated Branches: refs/heads/master 80224e3e5 -> 938e32ed9
NIFI-2746: Ensure that the FlowController is injected into all ResourceApplications. This closes #993 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/938e32ed Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/938e32ed Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/938e32ed Branch: refs/heads/master Commit: 938e32ed97265c4b084c3405b79c493f1b08d91c Parents: 80224e3 Author: Mark Payne <[email protected]> Authored: Wed Sep 7 13:21:19 2016 -0400 Committer: Matt Gilman <[email protected]> Committed: Wed Sep 7 14:11:46 2016 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/nifi/web/api/AccessPolicyResource.java | 5 ++++- .../src/main/java/org/apache/nifi/web/api/TenantsResource.java | 5 ++++- .../nifi-web-api/src/main/resources/nifi-web-api-context.xml | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/938e32ed/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/AccessPolicyResource.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/AccessPolicyResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/AccessPolicyResource.java index b547dc6..9875df4 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/AccessPolicyResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/AccessPolicyResource.java @@ -30,6 +30,7 @@ import org.apache.nifi.authorization.resource.Authorizable; import org.apache.nifi.authorization.user.NiFiUserUtils; import org.apache.nifi.cluster.coordination.ClusterCoordinator; import org.apache.nifi.cluster.coordination.http.replication.RequestReplicator; +import org.apache.nifi.controller.FlowController; import org.apache.nifi.util.NiFiProperties; import org.apache.nifi.web.NiFiServiceFacade; import org.apache.nifi.web.Revision; @@ -70,12 +71,14 @@ public class AccessPolicyResource extends ApplicationResource { private final NiFiServiceFacade serviceFacade; private final Authorizer authorizer; - public AccessPolicyResource(NiFiServiceFacade serviceFacade, Authorizer authorizer, NiFiProperties properties, RequestReplicator requestReplicator, ClusterCoordinator clusterCoordinator) { + public AccessPolicyResource(NiFiServiceFacade serviceFacade, Authorizer authorizer, NiFiProperties properties, RequestReplicator requestReplicator, + ClusterCoordinator clusterCoordinator, FlowController flowController) { this.serviceFacade = serviceFacade; this.authorizer = authorizer; setProperties(properties); setRequestReplicator(requestReplicator); setClusterCoordinator(clusterCoordinator); + setFlowController(flowController); } /** http://git-wip-us.apache.org/repos/asf/nifi/blob/938e32ed/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TenantsResource.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TenantsResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TenantsResource.java index 4c687d2..8073e8a 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TenantsResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TenantsResource.java @@ -30,6 +30,7 @@ import org.apache.nifi.authorization.resource.Authorizable; import org.apache.nifi.authorization.user.NiFiUserUtils; import org.apache.nifi.cluster.coordination.ClusterCoordinator; import org.apache.nifi.cluster.coordination.http.replication.RequestReplicator; +import org.apache.nifi.controller.FlowController; import org.apache.nifi.util.NiFiProperties; import org.apache.nifi.web.NiFiServiceFacade; import org.apache.nifi.web.Revision; @@ -79,12 +80,14 @@ public class TenantsResource extends ApplicationResource { private final NiFiServiceFacade serviceFacade; private final Authorizer authorizer; - public TenantsResource(NiFiServiceFacade serviceFacade, Authorizer authorizer, NiFiProperties properties, RequestReplicator requestReplicator, ClusterCoordinator clusterCoordinator) { + public TenantsResource(NiFiServiceFacade serviceFacade, Authorizer authorizer, NiFiProperties properties, RequestReplicator requestReplicator, + ClusterCoordinator clusterCoordinator, FlowController flowController) { this.serviceFacade = serviceFacade; this.authorizer = authorizer; setProperties(properties); setRequestReplicator(requestReplicator); setClusterCoordinator(clusterCoordinator); + setFlowController(flowController); } /** http://git-wip-us.apache.org/repos/asf/nifi/blob/938e32ed/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/nifi-web-api-context.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/nifi-web-api-context.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/nifi-web-api-context.xml index 6982ea3..316dce5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/nifi-web-api-context.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/nifi-web-api-context.xml @@ -399,6 +399,7 @@ <constructor-arg ref="nifiProperties"/> <constructor-arg ref="clusterCoordinator"/> <constructor-arg ref="requestReplicator" /> + <constructor-arg ref="flowController" /> </bean> <bean id="tenantsResource" class="org.apache.nifi.web.api.TenantsResource" scope="singleton"> <constructor-arg ref="serviceFacade"/> @@ -406,6 +407,7 @@ <constructor-arg ref="nifiProperties"/> <constructor-arg ref="clusterCoordinator"/> <constructor-arg ref="requestReplicator" /> + <constructor-arg ref="flowController" /> </bean> <!-- configuration for jaxb serialization -->
