From df7f88e265f866c67415a8ad8f28eab5b6a0f061 Mon Sep 17 00:00:00 2001 From: Eryne Kachetel-Langue Date: Wed, 22 Jan 2025 11:59:53 +0100 Subject: [PATCH] =?UTF-8?q?FIX=20ITEM-460-modifier-le-libelle-dun-message-?= =?UTF-8?q?derreur=20:=20=20=20=20=20=20-=20ajout=20d'une=20m=C3=A9thode?= =?UTF-8?q?=20handleFileCheckingFailures()=20dans=20RestResponseEntityExce?= =?UTF-8?q?ptionHandler.java=20=20=20=20=20=20-=20ajout=20d'un=20construct?= =?UTF-8?q?eur=20dans=20ApiReturnError.java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/fr/abes/item/exception/ApiReturnError.java | 13 ++++++++++++- .../RestResponseEntityExceptionHandler.java | 7 ++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/web/src/main/java/fr/abes/item/exception/ApiReturnError.java b/web/src/main/java/fr/abes/item/exception/ApiReturnError.java index e1003d9..36ddddc 100644 --- a/web/src/main/java/fr/abes/item/exception/ApiReturnError.java +++ b/web/src/main/java/fr/abes/item/exception/ApiReturnError.java @@ -30,5 +30,16 @@ private ApiReturnError() { this.debugMessage = ex.getMessage(); } - + ApiReturnError(String fileCheckingError, HttpStatus status, String message, Throwable ex) { + this(); + if (ex.getMessage().contains("Le fichier dépasse la limite des")) { + this.status = status; + this.message = ex.getMessage(); + this.debugMessage = ex.getMessage(); + } else { + this.status = status; + this.message = message; + this.debugMessage = ex.getMessage(); + } + } } diff --git a/web/src/main/java/fr/abes/item/exception/RestResponseEntityExceptionHandler.java b/web/src/main/java/fr/abes/item/exception/RestResponseEntityExceptionHandler.java index cdcc1ba..19e160d 100644 --- a/web/src/main/java/fr/abes/item/exception/RestResponseEntityExceptionHandler.java +++ b/web/src/main/java/fr/abes/item/exception/RestResponseEntityExceptionHandler.java @@ -29,11 +29,16 @@ public ResponseEntity handleForbiddenFailures(Throwable t) { @ExceptionHandler(BadCredentialsException.class) public ResponseEntity handleBadCredentials(Throwable t) { return buildResponseEntity(new ApiReturnError(HttpStatus.UNAUTHORIZED, t.getMessage(), t)); } - @ExceptionHandler({ IllegalArgumentException.class, FileCheckingException.class, FileTypeException.class}) + @ExceptionHandler({ IllegalArgumentException.class, FileTypeException.class}) public ResponseEntity handleMiscFailures(Throwable t) { return buildResponseEntity(new ApiReturnError(HttpStatus.BAD_REQUEST, Constant.ERR_FILE_WRONGCONTENT, t)); } + @ExceptionHandler({ FileCheckingException.class }) + public ResponseEntity handleFileCheckingFailures(Throwable t) { + return buildResponseEntity(new ApiReturnError("fileCheckingError", HttpStatus.BAD_REQUEST, Constant.ERR_FILE_WRONGCONTENT, t)); + } + @ExceptionHandler({ DemandeCheckingException.class }) public ResponseEntity handleBadConditionsFailures(Throwable t) { return buildResponseEntity(new ApiReturnError(HttpStatus.PRECONDITION_FAILED, t.getMessage(), t));}