From ab6d9784d5a9dd92a07d28938b320b26832d2330 Mon Sep 17 00:00:00 2001
From: ZMai <zmai@slb.com>
Date: Thu, 26 Jan 2023 12:21:08 -0600
Subject: [PATCH] Delete the unused method
---
.../search/service/IndexAliasService.java | 1 -
.../search/service/IndexAliasServiceImpl.java | 36 -------------------
.../osdu/search/util/CrossTenantUtils.java | 19 ++++------
3 files changed, 7 insertions(+), 49 deletions(-)
diff --git a/search-core/src/main/java/org/opengroup/osdu/search/service/IndexAliasService.java b/search-core/src/main/java/org/opengroup/osdu/search/service/IndexAliasService.java
index 859015859..3176456e5 100644
--- a/search-core/src/main/java/org/opengroup/osdu/search/service/IndexAliasService.java
+++ b/search-core/src/main/java/org/opengroup/osdu/search/service/IndexAliasService.java
@@ -19,5 +19,4 @@ import java.util.Map;
public interface IndexAliasService {
Map<String, String> getIndicesAliases(List<String> kinds);
- String getIndexAlias(String kind);
}
diff --git a/search-core/src/main/java/org/opengroup/osdu/search/service/IndexAliasServiceImpl.java b/search-core/src/main/java/org/opengroup/osdu/search/service/IndexAliasServiceImpl.java
index fd836182d..f1c1c3d04 100644
--- a/search-core/src/main/java/org/opengroup/osdu/search/service/IndexAliasServiceImpl.java
+++ b/search-core/src/main/java/org/opengroup/osdu/search/service/IndexAliasServiceImpl.java
@@ -88,35 +88,6 @@ public class IndexAliasServiceImpl implements IndexAliasService {
return aliases;
}
- public String getIndexAlias(String kind) {
- if(!elasticIndexNameResolver.isIndexAliasSupported(kind))
- return null;
-
- String alias = null;
- if(KIND_ALIAS_MAP.containsKey(kind)) {
- alias = KIND_ALIAS_MAP.get(kind);
- }
- else {
- try (RestHighLevelClient restClient = this.elasticClientHandler.createRestClient()) {
- if(isIndexAliasExistForKind(restClient, kind)) {
- alias = elasticIndexNameResolver.getIndexAliasFromKind(kind);
- }
- else {
- alias = createIndexAlias(restClient, kind);
- }
-
- if(!Strings.isNullOrEmpty(alias)) {
- KIND_ALIAS_MAP.put(kind, alias);
- }
- }
- catch (Exception e) {
- log.error(String.format("Fail to get or create index alias for kind '%s'", kind), e);
- }
- }
-
- return alias;
- }
-
private Set<String> getAllExistingAliases(RestHighLevelClient restClient) throws IOException {
GetAliasesRequest request = new GetAliasesRequest();
GetAliasesResponse response = restClient.indices().getAlias(request, RequestOptions.DEFAULT);
@@ -131,12 +102,6 @@ public class IndexAliasServiceImpl implements IndexAliasService {
return allAliases;
}
- private boolean isIndexAliasExistForKind(RestHighLevelClient restClient, String kind) throws IOException {
- String alias = elasticIndexNameResolver.getIndexAliasFromKind(kind);
- GetAliasesRequest request = new GetAliasesRequest(alias);
- return (restClient.indices().existsAlias(request, RequestOptions.DEFAULT));
- }
-
private String createIndexAlias(RestHighLevelClient restClient, String kind) throws IOException {
String index = elasticIndexNameResolver.getIndexNameFromKind(kind);
String alias = elasticIndexNameResolver.getIndexAliasFromKind(kind);
@@ -157,7 +122,6 @@ public class IndexAliasServiceImpl implements IndexAliasService {
return null;
}
-
private String resolveConcreteIndexName(RestHighLevelClient restClient, String index) throws IOException {
GetAliasesRequest request = new GetAliasesRequest(index);
GetAliasesResponse response = restClient.indices().getAlias(request, RequestOptions.DEFAULT);
diff --git a/search-core/src/main/java/org/opengroup/osdu/search/util/CrossTenantUtils.java b/search-core/src/main/java/org/opengroup/osdu/search/util/CrossTenantUtils.java
index 51ae4dc3c..08cc2686c 100644
--- a/search-core/src/main/java/org/opengroup/osdu/search/util/CrossTenantUtils.java
+++ b/search-core/src/main/java/org/opengroup/osdu/search/util/CrossTenantUtils.java
@@ -22,6 +22,7 @@ import org.opengroup.osdu.search.service.IndexAliasService;
import org.springframework.stereotype.Component;
import javax.inject.Inject;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -38,24 +39,18 @@ public class CrossTenantUtils {
public String getIndexName(Query searchRequest) {
List<String> kinds = KindParser.parse(searchRequest.getKind());
- StringBuilder builder = new StringBuilder();
- for(String kind : kinds) {
- String index = this.elasticIndexNameResolver.getIndexNameFromKind(kind);
- builder.append(index);
- builder.append(",");
- }
- builder.append("-.*"); // Exclude Lucene/ElasticSearch internal indices
- String index = builder.toString();
+ String index = getIndexName(kinds, new HashMap<>());
if(index.length() <= MAX_INDEX_NAME_LENGTH) {
return index;
}
-
- return getIndexNamesWithAliases(kinds);
+ else {
+ Map<String, String> aliases = this.indexAliasService.getIndicesAliases(kinds);
+ return getIndexName(kinds, aliases);
+ }
}
- private String getIndexNamesWithAliases(List<String> kinds) {
+ private String getIndexName(List<String> kinds, Map<String, String> aliases) {
StringBuilder builder = new StringBuilder();
- Map<String, String> aliases = this.indexAliasService.getIndicesAliases(kinds);
for(String kind : kinds) {
if(aliases.containsKey(kind) && !Strings.isNullOrEmpty(aliases.get(kind))) {
String alias = aliases.get(kind);
--
GitLab