From 120bdbef62e6dde20d916ba11901d63e40f9e22b Mon Sep 17 00:00:00 2001 From: Etienne Homer Date: Wed, 11 Feb 2026 14:10:53 +0100 Subject: [PATCH 1/2] Dispatch case-server exception on import Signed-off-by: Etienne Homer --- .../explore/server/services/CaseService.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/gridsuite/explore/server/services/CaseService.java b/src/main/java/org/gridsuite/explore/server/services/CaseService.java index 476905d3..5f3f9442 100644 --- a/src/main/java/org/gridsuite/explore/server/services/CaseService.java +++ b/src/main/java/org/gridsuite/explore/server/services/CaseService.java @@ -7,15 +7,12 @@ package org.gridsuite.explore.server.services; -import org.gridsuite.explore.server.error.ExploreBusinessErrorCode; -import org.gridsuite.explore.server.error.ExploreException; import org.springframework.beans.factory.annotation.Value; import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.*; import org.springframework.stereotype.Service; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import org.springframework.web.client.HttpStatusCodeException; import org.springframework.web.client.RestTemplate; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.util.UriComponentsBuilder; @@ -55,15 +52,8 @@ UUID importCase(MultipartFile multipartFile) { } HttpEntity> request = new HttpEntity<>( body, headers); - try { - caseUuid = restTemplate.postForObject(caseServerBaseUri + "/" + CASE_SERVER_API_VERSION + "/cases", request, - UUID.class); - } catch (HttpStatusCodeException e) { - if (e.getStatusCode() == HttpStatus.UNPROCESSABLE_ENTITY) { - throw ExploreException.of(ExploreBusinessErrorCode.EXPLORE_INCORRECT_CASE_FILE, e.getMessage()); - } - throw e; - } + caseUuid = restTemplate.postForObject(caseServerBaseUri + "/" + CASE_SERVER_API_VERSION + "/cases", request, + UUID.class); return caseUuid; } From 4d3889979f310ee8b3159dd179808e53ab74ab2b Mon Sep 17 00:00:00 2001 From: Etienne Homer Date: Wed, 11 Feb 2026 14:37:04 +0100 Subject: [PATCH 2/2] Remove ExploreBusinessErrorCode.EXPLORE_INCORRECT_CASE_FILE Signed-off-by: Etienne Homer --- .../explore/server/error/ExploreBusinessErrorCode.java | 3 +-- .../explore/server/error/ExploreExceptionHandler.java | 1 - .../org/gridsuite/explore/server/ExploreExceptionTest.java | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/gridsuite/explore/server/error/ExploreBusinessErrorCode.java b/src/main/java/org/gridsuite/explore/server/error/ExploreBusinessErrorCode.java index 602bd491..c1e55a48 100644 --- a/src/main/java/org/gridsuite/explore/server/error/ExploreBusinessErrorCode.java +++ b/src/main/java/org/gridsuite/explore/server/error/ExploreBusinessErrorCode.java @@ -14,8 +14,7 @@ * Business error codes emitted by the explore service. */ public enum ExploreBusinessErrorCode implements BusinessErrorCode { - EXPLORE_MAX_ELEMENTS_EXCEEDED("explore.maxElementsExceeded"), - EXPLORE_INCORRECT_CASE_FILE("explore.incorrectCaseFile"); + EXPLORE_MAX_ELEMENTS_EXCEEDED("explore.maxElementsExceeded"); private final String code; diff --git a/src/main/java/org/gridsuite/explore/server/error/ExploreExceptionHandler.java b/src/main/java/org/gridsuite/explore/server/error/ExploreExceptionHandler.java index 8e655e2d..b288496f 100644 --- a/src/main/java/org/gridsuite/explore/server/error/ExploreExceptionHandler.java +++ b/src/main/java/org/gridsuite/explore/server/error/ExploreExceptionHandler.java @@ -39,7 +39,6 @@ protected ExploreBusinessErrorCode getBusinessCode(ExploreException ex) { protected HttpStatus mapStatus(ExploreBusinessErrorCode errorCode) { return switch (errorCode) { case EXPLORE_MAX_ELEMENTS_EXCEEDED -> HttpStatus.FORBIDDEN; - case EXPLORE_INCORRECT_CASE_FILE -> HttpStatus.UNPROCESSABLE_ENTITY; }; } diff --git a/src/test/java/org/gridsuite/explore/server/ExploreExceptionTest.java b/src/test/java/org/gridsuite/explore/server/ExploreExceptionTest.java index 710022f4..dd46c45f 100644 --- a/src/test/java/org/gridsuite/explore/server/ExploreExceptionTest.java +++ b/src/test/java/org/gridsuite/explore/server/ExploreExceptionTest.java @@ -19,11 +19,11 @@ class ExploreExceptionTest { @Test void staticFactoryFormatsMessage() { - ExploreException exception = ExploreException.of(ExploreBusinessErrorCode.EXPLORE_INCORRECT_CASE_FILE, + ExploreException exception = ExploreException.of(ExploreBusinessErrorCode.EXPLORE_MAX_ELEMENTS_EXCEEDED, "Case %s failed", "demo"); assertThat(exception.getMessage()).isEqualTo("Case demo failed"); - assertThat(exception.getBusinessErrorCode()).isEqualTo(ExploreBusinessErrorCode.EXPLORE_INCORRECT_CASE_FILE); + assertThat(exception.getBusinessErrorCode()).isEqualTo(ExploreBusinessErrorCode.EXPLORE_MAX_ELEMENTS_EXCEEDED); } }