[6044] Properly catch ElasticsearchException

Bug: #6044
Signed-off-by: Gwendal Daniel <gwendal.daniel@obeosoft.com>

Author: gdaniel

CHANGELOG.adoc

@@ -271,6 +271,7 @@ The only difference is that this new marker has a second range of two dots after
 - https://github.com/eclipse-sirius/sirius-web/issues/6101[#6101] [sirius-web] Allow more control of the redirect URL in the new project card
 - https://github.com/eclipse-sirius/sirius-web/issues/5909[#5909] [graphql] Improve the customization of GraphQL error messages
 - https://github.com/eclipse-sirius/sirius-web/issues/5947[#5947] [sirius-web] Add support for publishing libraries from non-main editing contexts.
+- https://github.com/eclipse-sirius/sirius-web/issues/6044[#6044] [sirius-web] Properly catch `ElasticsearchException`
 
 
 

packages/sirius-web/backend/sirius-web-infrastructure/src/main/java/org/eclipse/sirius/web/infrastructure/elasticsearch/services/DefaultIndexCreationService.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2025 Obeo.
+ * Copyright (c) 2025, 2026 Obeo.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -23,6 +23,7 @@
 import org.springframework.stereotype.Service;
 
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
+import co.elastic.clients.elasticsearch._types.ElasticsearchException;
 
 /**
  * The default implementation that creates the index for an editing context.
@@ -65,7 +66,7 @@ public boolean createIndex(String editingContextId) {
                                                     textPropertyBuilder.index(false)))));
                     indexCreated = true;
                 }
-            } catch (IOException exception) {
+            } catch (IOException | ElasticsearchException exception) {
                 this.logger.warn("An error occurred while creating the index", exception);
             }
         }

packages/sirius-web/backend/sirius-web-infrastructure/src/main/java/org/eclipse/sirius/web/infrastructure/elasticsearch/services/DefaultIndexDeletionService.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2025 Obeo.
+ * Copyright (c) 2025, 2026 Obeo.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -22,6 +22,7 @@
 import org.springframework.stereotype.Service;
 
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
+import co.elastic.clients.elasticsearch._types.ElasticsearchException;
 
 /**
  * The default implementation that deletes the index for an editing context.
@@ -49,7 +50,7 @@ public boolean deleteIndex(String editingContextId) {
                     elasticSearchClient.indices().delete(deleteIndexRequest -> deleteIndexRequest.index(DefaultIndexCreationService.EDITING_CONTEXT_INDEX_NAME_PREFIX + editingContextId));
                     indexDeleted = true;
                 }
-            } catch (IOException exception) {
+            } catch (IOException | ElasticsearchException exception) {
                 this.logger.warn("An error occurred while deleting the index", exception);
             }
         }

packages/sirius-web/backend/sirius-web-infrastructure/src/main/java/org/eclipse/sirius/web/infrastructure/elasticsearch/services/IndexQueryService.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2025 Obeo.
+ * Copyright (c) 2025, 2026 Obeo.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -26,6 +26,7 @@
 import org.springframework.stereotype.Service;
 
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
+import co.elastic.clients.elasticsearch._types.ElasticsearchException;
 import co.elastic.clients.elasticsearch.core.SearchResponse;
 import co.elastic.clients.elasticsearch.core.search.Hit;
 
@@ -67,7 +68,7 @@ public List<IIndexEntry> search(String query) {
                                         .allowLeadingWildcard(true)))
                         , IIndexEntry.class);
                 result = response.hits().hits().stream().map(Hit::source).toList();
-            } catch (IOException exception) {
+            } catch (IOException | ElasticsearchException exception) {
                 this.logger.warn("An error occurred while querying indices", exception);
             }
         }

packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/application/controllers/omnibox/OmniboxControllerIntegrationTests.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2024, 2025 Obeo.
+ * Copyright (c) 2024, 2026 Obeo.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -270,6 +270,15 @@ public void givenQueryWhenObjectsAreSearchedInProjectsOmniboxThenObjectsAreRetur
         assertThat(complexQueryObjectLabels).isNotEmpty()
             .anyMatch(label -> label.contains("org.eclipse.sirius.web.tests.data"))
             .anyMatch(label -> label.contains("Success"));
+
+        Map<String, Object> queryWithSyntaxErrorVariables = Map.of(
+                "query", "name::Comp*"
+        );
+
+        var queryWithSyntaxErrorResult = this.projectsOmniboxSearchQueryRunner.run(queryWithSyntaxErrorVariables);
+        assertThat(queryWithSyntaxErrorResult.errors()).isEmpty();
+        List<String> queryWithSyntaxErrorObjectLabels = JsonPath.read(queryWithSyntaxErrorResult.data(), "$.data.viewer.projectsOmniboxSearch.edges[*].node.label");
+        assertThat(queryWithSyntaxErrorObjectLabels).isEmpty();
     }
 
 }