In ElasticFacadeImpl fix issue with index name prefixing and unprefix…

…ing when the index name is a comma separated list of index names
moqui · Feb 27, 2024 · 1c69844 · 1c69844
1 parent dd78edc
commit 1c69844
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/framework/src/main/groovy/org/moqui/impl/context/ElasticFacadeImpl.groovy b/framework/src/main/groovy/org/moqui/impl/context/ElasticFacadeImpl.groovy
@@ -695,13 +695,23 @@ class ElasticFacadeImpl implements ElasticFacade {
             if (index == null) return null
             index = index.trim()
             if (index.isEmpty()) return null
-            return indexPrefix != null && !index.startsWith(indexPrefix) ? indexPrefix.concat(index) : index
+            // handle comma separated index names
+            return index.split(",").collect({
+                it = it.trim()
+                return indexPrefix != null && !it.startsWith(indexPrefix) ? indexPrefix.concat(it) : it
+            }).join(",")
+            // return indexPrefix != null && !index.startsWith(indexPrefix) ? indexPrefix.concat(index) : index
         }
         String unprefixIndexName(String index) {
             if (index == null) return null
             index = index.trim()
             if (index.isEmpty()) return null
-            return indexPrefix != null && index.startsWith(indexPrefix) ? index.substring(indexPrefix.length()) : index
+            // handle comma separated index names
+            return index.split(",").collect({
+                it = it.trim()
+                return indexPrefix != null && it.startsWith(indexPrefix) ? it.substring(indexPrefix.length()) : it
+            }).join(",")
+            // return indexPrefix != null && index.startsWith(indexPrefix) ? index.substring(indexPrefix.length()) : index
         }
     }