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 2020/12/03 19:43:06 UTC
[nifi] 02/02: NIFI-8060 Addressed review feedback
This is an automated email from the ASF dual-hosted git repository.
markap14 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 2b1359a8080ac8b05058beffd272cf3f41ba9e1e
Author: Bryan Bende <bb...@apache.org>
AuthorDate: Wed Dec 2 15:35:17 2020 -0500
NIFI-8060 Addressed review feedback
---
.../flow/StandardStatelessDataflowFactory.java | 4 +--
...ory.java => StatelessProvenanceRepository.java} | 41 +++-------------------
2 files changed, 6 insertions(+), 39 deletions(-)
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/flow/StandardStatelessDataflowFactory.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/flow/StandardStatelessDataflowFactory.java
index 061d840..1d9dfa2 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/flow/StandardStatelessDataflowFactory.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/flow/StandardStatelessDataflowFactory.java
@@ -74,7 +74,7 @@ import org.apache.nifi.stateless.repository.ByteArrayContentRepository;
import org.apache.nifi.stateless.repository.RepositoryContextFactory;
import org.apache.nifi.stateless.repository.StatelessFlowFileRepository;
import org.apache.nifi.stateless.repository.StatelessRepositoryContextFactory;
-import org.apache.nifi.stateless.repository.VolatileProvenanceRepository;
+import org.apache.nifi.stateless.repository.StatelessProvenanceRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -127,7 +127,7 @@ public class StandardStatelessDataflowFactory implements StatelessDataflowFactor
final ParameterContextManager parameterContextManager = new StandardParameterContextManager();
processScheduler = new StatelessProcessScheduler(extensionManager);
- provenanceRepo = new VolatileProvenanceRepository(1_000);
+ provenanceRepo = new StatelessProvenanceRepository(1_000);
provenanceRepo.initialize(EventReporter.NO_OP, new StatelessAuthorizer(), new StatelessProvenanceAuthorizableFactory(), IdentifierLookup.EMPTY);
final SSLContext sslContext;
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/repository/VolatileProvenanceRepository.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/repository/StatelessProvenanceRepository.java
similarity index 91%
rename from nifi-nar-bundles/nifi-framework-bundle/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/repository/VolatileProvenanceRepository.java
rename to nifi-nar-bundles/nifi-framework-bundle/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/repository/StatelessProvenanceRepository.java
index 3f67385..4f8914c 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/repository/VolatileProvenanceRepository.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/repository/StatelessProvenanceRepository.java
@@ -39,13 +39,9 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
-public class VolatileProvenanceRepository implements ProvenanceRepository {
-
- // default property values
- public static final int DEFAULT_BUFFER_SIZE = 10000;
+public class StatelessProvenanceRepository implements ProvenanceRepository {
public static String CONTAINER_NAME = "in-memory";
@@ -53,17 +49,8 @@ public class VolatileProvenanceRepository implements ProvenanceRepository {
private final int maxSize;
private final AtomicLong idGenerator = new AtomicLong(0L);
- private final AtomicBoolean initialized = new AtomicBoolean(false);
-
- /**
- * Default no args constructor for service loading only
- */
- public VolatileProvenanceRepository() {
- ringBuffer = null;
- maxSize = DEFAULT_BUFFER_SIZE;
- }
- public VolatileProvenanceRepository(final int maxEvents) {
+ public StatelessProvenanceRepository(final int maxEvents) {
maxSize = maxEvents;
ringBuffer = new RingBuffer<>(maxSize);
}
@@ -71,9 +58,7 @@ public class VolatileProvenanceRepository implements ProvenanceRepository {
@Override
public void initialize(final EventReporter eventReporter, final Authorizer authorizer, final ProvenanceAuthorizableFactory resourceFactory,
final IdentifierLookup idLookup) throws IOException {
- if (initialized.getAndSet(true)) {
- return;
- }
+
}
@Override
@@ -109,10 +94,6 @@ public class VolatileProvenanceRepository implements ProvenanceRepository {
return ringBuffer.getSelectedElements(new RingBuffer.Filter<ProvenanceEventRecord>() {
@Override
public boolean select(final ProvenanceEventRecord value) {
- if (!isAuthorized(value, user)) {
- return false;
- }
-
return value.getEventId() >= firstRecordId;
}
}, maxRecords);
@@ -148,21 +129,7 @@ public class VolatileProvenanceRepository implements ProvenanceRepository {
@Override
public ProvenanceEventRecord getEvent(final long id, final NiFiUser user) {
- final ProvenanceEventRecord event = getEvent(id);
- if (event == null) {
- return null;
- }
-
- authorize(event, user);
- return event;
- }
-
- public boolean isAuthorized(final ProvenanceEventRecord event, final NiFiUser user) {
- return true;
- }
-
- protected void authorize(final ProvenanceEventRecord event, final NiFiUser user) {
-
+ return getEvent(id);
}
@Override