From: Ray Lee <ray.lee@lyrasis.org>
Date: Thu, 23 Apr 2020 01:09:06 +0000 (-0400)
Subject: DRYD-853: Include instance id in ES index name.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=aaa2f736584dfa34a13d2ae9e92cc7f2cc88bd44;p=tmp%2Fjakarta-migration.git

DRYD-853: Include instance id in ES index name.
---

diff --git a/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java b/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
index 084660171..4c8af4694 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
@@ -1560,16 +1560,13 @@ public class ServiceMain {
         return repoConfigDoc;
     }
 
-    private String getElasticsearchIndexName(Document repoConfigDoc, String repositoryName,
-    		String cspaceInstanceId) {
-    	String result = ConfigUtils.DEFAULT_ELASTICSEARCH_INDEX_NAME;
-
-    	if (repositoryName.equalsIgnoreCase(ConfigUtils.DEFAULT_NUXEO_REPOSITORY_NAME) == false) {
-    		return repositoryName;
-    	}
+	private String getElasticsearchIndexName(Document repoConfigDoc, String repositoryName, String cspaceInstanceId) {
+		String repo = repositoryName.equalsIgnoreCase(ConfigUtils.DEFAULT_NUXEO_REPOSITORY_NAME)
+			? ConfigUtils.DEFAULT_ELASTICSEARCH_INDEX_NAME
+			: repositoryName;
 
-    	return result;
-    }
+		return repo + cspaceInstanceId;
+	}
 
     /*
      * This method is filling out the elasticsearch-config.xml file with tenant specific repository information.