From a0e65f411dda87534981a6fac9f127e664560bc0 Mon Sep 17 00:00:00 2001 From: "dr.phillips" Date: Tue, 28 Apr 2026 14:19:01 -0400 Subject: [PATCH 1/2] [BI-2820] modified error message --- .../services/processors/SampleSubmissionProcessor.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/breedinginsight/brapps/importer/services/processors/SampleSubmissionProcessor.java b/src/main/java/org/breedinginsight/brapps/importer/services/processors/SampleSubmissionProcessor.java index 396bf8658..4222e21c2 100644 --- a/src/main/java/org/breedinginsight/brapps/importer/services/processors/SampleSubmissionProcessor.java +++ b/src/main/java/org/breedinginsight/brapps/importer/services/processors/SampleSubmissionProcessor.java @@ -67,7 +67,8 @@ public class SampleSubmissionProcessor implements Processor { private static final String UNKNOWN_GID = "Unknown germplasm GID"; private static final String INVALID_COLUMN = "Column must be a number between 1 and 12"; private static final String INVALID_ROW = "Row must be a letter between A and H"; - private static final String MULTIPLE_SAMPLES_SINGLE_WELL = "The sample in row %d is already in row: %s, column: %d"; +// private static final String MULTIPLE_SAMPLES_SINGLE_WELL = "The sample in row %d is already in row: %s, column: %d"; + private static final String MULTIPLE_SAMPLES_SINGLE_WELL = "Plate position not unique, duplicate in row %d"; private final String referenceSource; private final BrAPIGermplasmDAO germplasmDAO; private final BrAPIObservationUnitDAO observationUnitDAO; @@ -230,7 +231,7 @@ private boolean validRow(SampleSubmissionImport row, int rowNum, ValidationError if (plateLayout[plateRow][plateCol] > 0) { validationErrors.addError(rowNum, new ValidationError(SampleSubmissionImport.Columns.ROW + "/" + SampleSubmissionImport.Columns.COLUMN, - String.format(MULTIPLE_SAMPLES_SINGLE_WELL, plateLayout[plateRow][plateCol], Character.toString('A' + plateRow), plateCol), + String.format(MULTIPLE_SAMPLES_SINGLE_WELL, plateLayout[plateRow][plateCol]), HttpStatus.UNPROCESSABLE_ENTITY)); } else { plateLayout[plateRow][plateCol] = rowNum; From fe913ec65544f8531ae9055b48efdd6a4973df9f Mon Sep 17 00:00:00 2001 From: "dr.phillips" Date: Thu, 30 Apr 2026 11:24:08 -0400 Subject: [PATCH 2/2] [BI-2820] remove commented-out code --- .../importer/services/processors/SampleSubmissionProcessor.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/breedinginsight/brapps/importer/services/processors/SampleSubmissionProcessor.java b/src/main/java/org/breedinginsight/brapps/importer/services/processors/SampleSubmissionProcessor.java index 4222e21c2..8ded93d89 100644 --- a/src/main/java/org/breedinginsight/brapps/importer/services/processors/SampleSubmissionProcessor.java +++ b/src/main/java/org/breedinginsight/brapps/importer/services/processors/SampleSubmissionProcessor.java @@ -67,7 +67,6 @@ public class SampleSubmissionProcessor implements Processor { private static final String UNKNOWN_GID = "Unknown germplasm GID"; private static final String INVALID_COLUMN = "Column must be a number between 1 and 12"; private static final String INVALID_ROW = "Row must be a letter between A and H"; -// private static final String MULTIPLE_SAMPLES_SINGLE_WELL = "The sample in row %d is already in row: %s, column: %d"; private static final String MULTIPLE_SAMPLES_SINGLE_WELL = "Plate position not unique, duplicate in row %d"; private final String referenceSource; private final BrAPIGermplasmDAO germplasmDAO;