NIFI-13196: Added new isAutoTerminated(Relationship) method to Proces…

…sContext, which simply delegates to Connectable.isAutoTerminated(Relationship) This closes #8790 Signed-off-by: Joseph Witt <joewitt@apache.org>
apache · May 10, 2024 · 62fbd8e · 62fbd8e
1 parent 196f6bb
commit 62fbd8e
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 9 deletions.
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/ProcessContext.java b/nifi-api/src/main/java/org/apache/nifi/processor/ProcessContext.java
@@ -108,6 +108,13 @@ public interface ProcessContext extends PropertyContext, ClusterContext {
      */
     Set<Relationship> getAvailableRelationships();
 
+    /**
+     * Indicates whether or not the given relationship is configured to be auto-terminated
+     * @param relationship the relationship
+     * @return <code>true</code> if the given relationship is auto-terminated, <code>false</code> otherwise
+     */
+    boolean isAutoTerminated(Relationship relationship);
+
     /**
      * @return true if the processor has one or more incoming connections,
      * false otherwise

diff --git a/...main/java/org/apache/nifi/controller/repository/scheduling/ConnectableProcessContext.java b/...main/java/org/apache/nifi/controller/repository/scheduling/ConnectableProcessContext.java
@@ -16,15 +16,6 @@
  */
 package org.apache.nifi.controller.repository.scheduling;
 
-import java.time.Duration;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
 import org.apache.nifi.components.PropertyDescriptor;
 import org.apache.nifi.components.PropertyValue;
 import org.apache.nifi.components.resource.ResourceReference;
@@ -43,6 +34,15 @@
 import org.apache.nifi.scheduling.ExecutionNode;
 import org.apache.nifi.util.Connectables;
 
+import java.time.Duration;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
 /**
  * This class is essentially an empty shell for {@link Connectable}s that are not Processors
  */
@@ -250,6 +250,11 @@ public Set<Relationship> getAvailableRelationships() {
         return new HashSet<>(connectable.getRelationships());
     }
 
+    @Override
+    public boolean isAutoTerminated(final Relationship relationship) {
+        return connectable.isAutoTerminated(relationship);
+    }
+
     @Override
     public boolean hasIncomingConnection() {
         return connectable.hasIncomingConnection();

diff --git a/...-framework-components/src/main/java/org/apache/nifi/processor/StandardProcessContext.java b/...-framework-components/src/main/java/org/apache/nifi/processor/StandardProcessContext.java
@@ -309,6 +309,11 @@ public Set<Relationship> getAvailableRelationships() {
         return set;
     }
 
+    @Override
+    public boolean isAutoTerminated(final Relationship relationship) {
+        return procNode.isAutoTerminated(relationship);
+    }
+
     @Override
     public String getControllerServiceName(final String serviceIdentifier) {
         verifyTaskActive();

diff --git a/...ework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/mock/MockProcessContext.java b/...ework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/mock/MockProcessContext.java
@@ -85,6 +85,11 @@ public Set<Relationship> getAvailableRelationships() {
         return Collections.emptySet();
     }
 
+    @Override
+    public boolean isAutoTerminated(final Relationship relationship) {
+        return false;
+    }
+
     @Override
     public boolean hasIncomingConnection() {
         return true;

diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java b/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java
@@ -444,6 +444,11 @@ public Set<Relationship> getAvailableRelationships() {
         return relationships;
     }
 
+    @Override
+    public boolean isAutoTerminated(final Relationship relationship) {
+        return false;
+    }
+
     public void setUnavailableRelationships(final Set<Relationship> relationships) {
         this.unavailableRelationships = Collections.unmodifiableSet(new HashSet<>(relationships));
     }