[nifi] branch master updated: NIFI-6225: bug fix for listing relationships in sorted order

[mcgilman]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new a2bacde  NIFI-6225: bug fix for listing relationships in sorted order
a2bacde is described below

commit a2bacde62ce24acd0332b2147b4fe5834d14f210
Author: Mark Bean <mark.o.b...@gmail.com>
AuthorDate: Wed May 1 21:02:38 2019 +0000

    NIFI-6225: bug fix for listing relationships in sorted order
    
    This closes #3459
---
 .../apache/nifi/cluster/manager/ConnectionEntityMerger.java   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/ConnectionEntityMerger.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/ConnectionEntityMerger.java
index a25fb4b..9885b95 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/ConnectionEntityMerger.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/ConnectionEntityMerger.java
@@ -23,6 +23,8 @@ import org.apache.nifi.web.api.entity.ConnectionEntity;
 
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
+import java.util.TreeSet;
 
 public class ConnectionEntityMerger implements 
ComponentEntityMerger<ConnectionEntity>, 
ComponentEntityStatusMerger<ConnectionStatusDTO> {
 
@@ -51,6 +53,15 @@ public class ConnectionEntityMerger implements 
ComponentEntityMerger<ConnectionE
                 
clientEntity.getComponent().setLoadBalanceStatus(ConnectionDTO.LOAD_BALANCE_ACTIVE);
             }
         }
+        final Set<String> availableRelationships = clientEntity.getComponent() 
== null ? null : clientEntity.getComponent().getAvailableRelationships();
+        if (availableRelationships != null) {
+            clientEntity.getComponent().setAvailableRelationships(new 
TreeSet<>(availableRelationships));
+        }
+        final Set<String> selectedRelationships = clientEntity.getComponent() 
== null ? null : clientEntity.getComponent().getSelectedRelationships();
+        if (selectedRelationships != null) {
+            clientEntity.getComponent().setSelectedRelationships(new 
TreeSet<>(selectedRelationships));
+        }
+
     }
 
     @Override