Repository: nifi Updated Branches: refs/heads/master baed85fa3 -> 4f2643f66
http://git-wip-us.apache.org/repos/asf/nifi/blob/4f2643f6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/StandardRootGroupPort.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/StandardRootGroupPort.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/StandardRootGroupPort.java index 58f4804..cd10d5c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/StandardRootGroupPort.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/StandardRootGroupPort.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.remote; -import org.apache.nifi.admin.service.KeyService; +import org.apache.nifi.authorization.Authorizer; import org.apache.nifi.components.ValidationResult; import org.apache.nifi.connectable.ConnectableType; import org.apache.nifi.controller.AbstractPort; @@ -71,7 +71,7 @@ public class StandardRootGroupPort extends AbstractPort implements RootGroupPort private final AtomicReference<Set<String>> userAccessControl = new AtomicReference<Set<String>>(new HashSet<String>()); private final ProcessScheduler processScheduler; private final boolean secure; - private final KeyService keyService; + private final Authorizer authorizer; @SuppressWarnings("unused") private final BulletinRepository bulletinRepository; private final EventReporter eventReporter; @@ -85,13 +85,13 @@ public class StandardRootGroupPort extends AbstractPort implements RootGroupPort private boolean shutdown = false; // guarded by requestLock public StandardRootGroupPort(final String id, final String name, final ProcessGroup processGroup, - final TransferDirection direction, final ConnectableType type, final KeyService keyService, + final TransferDirection direction, final ConnectableType type, final Authorizer authorizer, final BulletinRepository bulletinRepository, final ProcessScheduler scheduler, final boolean secure) { super(id, name, processGroup, type, scheduler); this.processScheduler = scheduler; setScheduldingPeriod(MINIMUM_SCHEDULING_NANOS + " nanos"); - this.keyService = keyService; + this.authorizer = authorizer; this.secure = secure; this.bulletinRepository = bulletinRepository; this.scheduler = scheduler; http://git-wip-us.apache.org/repos/asf/nifi/blob/4f2643f6/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/src/test/java/org/apache/nifi/controller/MonitorMemoryTest.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/src/test/java/org/apache/nifi/controller/MonitorMemoryTest.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/src/test/java/org/apache/nifi/controller/MonitorMemoryTest.java index 044d29a..0970da4 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/src/test/java/org/apache/nifi/controller/MonitorMemoryTest.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/src/test/java/org/apache/nifi/controller/MonitorMemoryTest.java @@ -25,7 +25,7 @@ import java.lang.reflect.Modifier; import org.apache.commons.io.FileUtils; import org.apache.nifi.admin.service.AuditService; -import org.apache.nifi.admin.service.KeyService; +import org.apache.nifi.authorization.Authorizer; import org.apache.nifi.controller.repository.FlowFileEventRepository; import org.apache.nifi.provenance.MockProvenanceEventRepository; import org.apache.nifi.util.CapturingLogger; @@ -136,6 +136,6 @@ public class MonitorMemoryTest { properties.setProperty("nifi.remote.input.secure", ""); return FlowController.createStandaloneInstance(mock(FlowFileEventRepository.class), properties, - mock(KeyService.class), mock(AuditService.class), null, null); + mock(Authorizer.class), mock(AuditService.class), null, null); } }
