Skip to content

Commit ddb7766

Browse files
committed
Fix UserSelectionsApiTest being too strict about the submittor
1 parent 66e9c38 commit ddb7766

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

index/src/main/java/org/fao/geonet/index/es/EsRestClient.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -336,23 +336,21 @@ public SearchResponse query(String index, Query.Builder queryBuilder, Query.Buil
336336
}
337337

338338

339-
public String deleteByQuery(String index, String query) throws Exception {
339+
public void deleteByQuery(String index, String query) throws Exception {
340340
if (!activated) {
341-
return "";
341+
throw new IllegalStateException("Index not yet activated.");
342342
}
343343

344344
DeleteByQueryRequest request = DeleteByQueryRequest.of(
345-
b -> b.index(new ArrayList<>(Arrays.asList(index)))
345+
b -> b.index(index)
346346
.q(query)
347347
.refresh(true));
348348

349349
final DeleteByQueryResponse deleteByQueryResponse =
350350
client.deleteByQuery(request);
351351

352352

353-
if (deleteByQueryResponse.deleted() >= 0) {
354-
return String.format("Record removed. %s.", deleteByQueryResponse.deleted());
355-
} else {
353+
if (!deleteByQueryResponse.failures().isEmpty()) {
356354
StringBuilder stringBuilder = new StringBuilder();
357355

358356
deleteByQueryResponse.failures().forEach(f -> stringBuilder.append(f.toString()));

0 commit comments

Comments
 (0)