From a2479b1476d8efd7b455568b58cf879382ea29a7 Mon Sep 17 00:00:00 2001
From: ZMai <zmai@slb.com>
Date: Mon, 6 Feb 2023 09:41:19 -0600
Subject: [PATCH] Refactor the codes for creating index alias and update unit
test
---
.../opengroup/osdu/indexer/service/IndicesServiceImpl.java | 5 +++--
.../opengroup/osdu/indexer/service/IndicesServiceTest.java | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndicesServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndicesServiceImpl.java
index 11e568301..bc8d633ac 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndicesServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndicesServiceImpl.java
@@ -312,8 +312,9 @@ public class IndicesServiceImpl implements IndicesService {
try {
List<String> kinds = new ArrayList<>();
kinds.add(kind);
- if(getKindWithMajorVersion(kind) != null) {
- kinds.add(getKindWithMajorVersion(kind));
+ String kindWithMajorVersion = getKindWithMajorVersion(kind);
+ if(elasticIndexNameResolver.isIndexAliasSupported(kindWithMajorVersion)) {
+ kinds.add(kindWithMajorVersion);
}
for (String kd : kinds) {
index = elasticIndexNameResolver.getIndexNameFromKind(kd);
diff --git a/indexer-core/src/test/java/org/opengroup/osdu/indexer/service/IndicesServiceTest.java b/indexer-core/src/test/java/org/opengroup/osdu/indexer/service/IndicesServiceTest.java
index 8e975d58b..7f22b619a 100644
--- a/indexer-core/src/test/java/org/opengroup/osdu/indexer/service/IndicesServiceTest.java
+++ b/indexer-core/src/test/java/org/opengroup/osdu/indexer/service/IndicesServiceTest.java
@@ -102,6 +102,7 @@ public class IndicesServiceTest {
when(elasticIndexNameResolver.getKindFromIndexName(any())).thenReturn(kind);
when(elasticIndexNameResolver.getIndexNameFromKind(any())).thenReturn(index);
when(elasticIndexNameResolver.getIndexAliasFromKind(any())).thenReturn("a12345678");
+ when(elasticIndexNameResolver.isIndexAliasSupported(any())).thenReturn(true);
when(restHighLevelClient.indices()).thenReturn(indicesClient);
when(indicesClient.create(any(CreateIndexRequest.class), any(RequestOptions.class))).thenReturn(indexResponse);
when(indicesClient.updateAliases(any(IndicesAliasesRequest.class), any(RequestOptions.class))).thenReturn(acknowledgedResponse);
--
GitLab