Skip to content

Dispatch case-server exception on import #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
etiennehomer wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Dispatch case-server exception on import #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
120bdbe
Dispatch case-server exception on import
etiennehomer Feb 11, 2026
4d38899
Remove ExploreBusinessErrorCode.EXPLORE_INCORRECT_CASE_FILE
etiennehomer Feb 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/main/java/org/gridsuite/explore/server/error/ExploreBusinessErrorCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion src/main/java/org/gridsuite/explore/server/error/ExploreExceptionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
}

Expand Down
14 changes: 2 additions & 12 deletions src/main/java/org/gridsuite/explore/server/services/CaseService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -55,15 +52,8 @@ UUID importCase(MultipartFile multipartFile) {
}
HttpEntity<MultiValueMap<String, Object>> 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;
}

Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/gridsuite/explore/server/ExploreExceptionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

}