Delete the unused method

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);
 }

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);

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);