Elasticsearch: fix broken getIndices() implementation

Signed-off-by: Karel Suta <[email protected]>
tnb-software · Apr 5, 2023 · ddd508f · ddd508f
1 parent 9333a77
commit ddd508f
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/...icsearch/src/main/java/software/tnb/elasticsearch/validation/ElasticsearchValidation.java b/...icsearch/src/main/java/software/tnb/elasticsearch/validation/ElasticsearchValidation.java
@@ -9,10 +9,10 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import co.elastic.clients.elasticsearch._types.ElasticsearchException;
-import co.elastic.clients.elasticsearch._types.ExpandWildcard;
 import co.elastic.clients.elasticsearch.core.IndexRequest;
 import co.elastic.clients.elasticsearch.core.IndexResponse;
 import co.elastic.clients.elasticsearch.core.SearchRequest;
@@ -21,8 +21,6 @@
 import co.elastic.clients.elasticsearch.indices.CreateIndexRequest;
 import co.elastic.clients.elasticsearch.indices.DeleteIndexRequest;
 import co.elastic.clients.elasticsearch.indices.ExistsRequest;
-import co.elastic.clients.elasticsearch.indices.GetIndexRequest;
-import co.elastic.clients.elasticsearch.indices.GetIndexResponse;
 
 public class ElasticsearchValidation {
     private static final Logger LOG = LoggerFactory.getLogger(ElasticsearchValidation.class);
@@ -77,10 +75,8 @@ public IndexResponse insert(String index, Object content) {
     }
 
     public List<String> getIndices() {
-        GetIndexRequest request = new GetIndexRequest.Builder().expandWildcards(ExpandWildcard.All).build();
-        GetIndexResponse response = null;
         try {
-            response = client.indices().get(request);
+            return client.cat().indices().valueBody().stream().map(i -> i.index()).collect(Collectors.toList());
         } catch (ElasticsearchException ese) {
             if (ese.getMessage().contains("index_not_found_exception")) {
                 return new ArrayList<>();
@@ -90,7 +86,7 @@ public List<String> getIndices() {
         } catch (IOException e) {
             fail("Unable to list indices: ", e);
         }
-        return new ArrayList<>(response.result().keySet());
+        return new ArrayList<>();
     }
 
     public boolean indexExists(String index) {