From 6eb7d2001938ef997392a065979c386fa74b128f Mon Sep 17 00:00:00 2001 From: David Randolph Phillips Date: Mon, 12 Jun 2023 15:03:58 -0400 Subject: [PATCH] [BI-1618] Simplify error messages. Any augmenting of the messagewill happen on the front end --- .../brapps/importer/services/FileImportService.java | 2 +- .../java/org/breedinginsight/services/TraitUploadService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/breedinginsight/brapps/importer/services/FileImportService.java b/src/main/java/org/breedinginsight/brapps/importer/services/FileImportService.java index cbc6f6620..74051b813 100644 --- a/src/main/java/org/breedinginsight/brapps/importer/services/FileImportService.java +++ b/src/main/java/org/breedinginsight/brapps/importer/services/FileImportService.java @@ -162,7 +162,7 @@ private Table parseUploadedFile(CompletedFileUpload file) throws UnsupportedType //TODO: Allow them to pass in header row index in the future df = FileUtil.parseTableFromExcel(file.getInputStream(), 0); } catch (IOException | ParsingException e) { - throw new HttpStatusException(HttpStatus.BAD_REQUEST, String.format("Error(s) detected in file, %s. %s. Import cannot proceed.", file.getFilename(), e.getMessage())); + throw new HttpStatusException(HttpStatus.BAD_REQUEST, e.getMessage()); } } else { throw new UnsupportedTypeException("Unsupported mime type"); diff --git a/src/main/java/org/breedinginsight/services/TraitUploadService.java b/src/main/java/org/breedinginsight/services/TraitUploadService.java index 8c49c303d..4534c095f 100644 --- a/src/main/java/org/breedinginsight/services/TraitUploadService.java +++ b/src/main/java/org/breedinginsight/services/TraitUploadService.java @@ -116,7 +116,7 @@ public ProgramUpload updateTraitUpload(UUID programId, CompletedFileUpload file, traits = parser.parseExcel(new BOMInputStream(file.getInputStream(), false)); } catch(IOException | ParsingException e) { log.error(e.getMessage()); - throw new HttpStatusException( HttpStatus.BAD_REQUEST, String.format("Error(s) detected in file, %s. %s. Import cannot proceed.", file.getFilename(), e.getMessage()) ); + throw new HttpStatusException( HttpStatus.BAD_REQUEST, e.getMessage() ); } } else { throw new UnsupportedTypeException("Unsupported mime type");