From b1a984591dce5045f6714e21a1a922f15a6c9531 Mon Sep 17 00:00:00 2001
From: Ray Lee <ray.lee@lyrasis.org>
Date: Fri, 1 Nov 2019 23:40:31 -0700
Subject: [PATCH] NOJIRA: Maintain ordering when indexing holdingInstitutions
 in ES.

---
 .../nuxeo/elasticsearch/CSJsonESDocumentWriter.java        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/CSJsonESDocumentWriter.java b/3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/CSJsonESDocumentWriter.java
index 48adc57a9..8310650d1 100644
--- a/3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/CSJsonESDocumentWriter.java
+++ b/3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/CSJsonESDocumentWriter.java
@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -102,7 +103,7 @@ public class CSJsonESDocumentWriter extends JsonESDocumentWriter {
             // Combine term creator organizations and term editor organizations into a holding
             // institutions field.
 
-            Set<String> holdingInstitutions = new HashSet<String>();
+            Set<String> holdingInstitutions = new LinkedHashSet<String>();
 
             holdingInstitutions.addAll(getTermAttributionContributors(doc));
             holdingInstitutions.addAll(getTermAttributionEditors(doc));
@@ -255,7 +256,7 @@ public class CSJsonESDocumentWriter extends JsonESDocumentWriter {
     }
 
     private Set<String> getTermAttributionContributors(DocumentModel doc) {
-        Set orgs = new HashSet<String>();
+        Set orgs = new LinkedHashSet<String>();
 
         List<Map<String, Object>> groups = (List<Map<String, Object>>) doc.getProperty("materials_common", "materialTermAttributionContributingGroupList");
 
@@ -271,7 +272,7 @@ public class CSJsonESDocumentWriter extends JsonESDocumentWriter {
     }
 
     private Set<String> getTermAttributionEditors(DocumentModel doc) {
-        Set orgs = new HashSet<String>();
+        Set orgs = new LinkedHashSet<String>();
 
         List<Map<String, Object>> groups = (List<Map<String, Object>>) doc.getProperty("materials_common", "materialTermAttributionEditingGroupList");
 
-- 
2.47.3