[nifi-registry] branch master updated: NIFIREG-276 Updating StandardFlowComparator to consider concurrent tasks changes on public ports

[ijokarumawak]

This is an automated email from the ASF dual-hosted git repository.

ijokarumawak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git


The following commit(s) were added to refs/heads/master by this push:
     new c8cb270  NIFIREG-276 Updating StandardFlowComparator to consider 
concurrent tasks changes on public ports
c8cb270 is described below

commit c8cb2700152ca08078cab0a4d78b7740c40bd731
Author: Bryan Bende <bbe...@apache.org>
AuthorDate: Fri May 31 10:36:06 2019 -0400

    NIFIREG-276 Updating StandardFlowComparator to consider concurrent tasks 
changes on public ports
    
    This closes #193.
    
    Signed-off-by: Koji Kawamura <ijokaruma...@gmail.com>
---
 .../registry/flow/diff/StandardFlowComparator.java | 26 +++++++++++++---------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git 
a/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/StandardFlowComparator.java
 
b/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/StandardFlowComparator.java
index f98225e..82c00e5 100644
--- 
a/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/StandardFlowComparator.java
+++ 
b/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/StandardFlowComparator.java
@@ -17,15 +17,6 @@
 
 package org.apache.nifi.registry.flow.diff;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
 import org.apache.nifi.registry.flow.VersionedComponent;
 import org.apache.nifi.registry.flow.VersionedConnection;
 import org.apache.nifi.registry.flow.VersionedControllerService;
@@ -38,6 +29,15 @@ import 
org.apache.nifi.registry.flow.VersionedPropertyDescriptor;
 import org.apache.nifi.registry.flow.VersionedRemoteGroupPort;
 import org.apache.nifi.registry.flow.VersionedRemoteProcessGroup;
 
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
 public class StandardFlowComparator implements FlowComparator {
     private static final String DEFAULT_LOAD_BALANCE_STRATEGY = 
"DO_NOT_LOAD_BALANCE";
     private static final String DEFAULT_PARTITIONING_ATTRIBUTE = "";
@@ -249,7 +249,13 @@ public class StandardFlowComparator implements 
FlowComparator {
     }
 
     private void compare(final VersionedPort portA, final VersionedPort portB, 
final Set<FlowDifference> differences) {
-        compareComponents(portA, portB, differences);
+        if (compareComponents(portA, portB, differences)) {
+            return;
+        }
+
+        if (portA != null && portA.isAllowRemoteAccess() && portB != null && 
portB.isAllowRemoteAccess()) {
+            addIfDifferent(differences, 
DifferenceType.CONCURRENT_TASKS_CHANGED, portA, portB, 
VersionedPort::getConcurrentlySchedulableTaskCount);
+        }
     }
 
     private void compare(final VersionedRemoteProcessGroup rpgA, final 
VersionedRemoteProcessGroup rpgB, final Set<FlowDifference> differences) {