From 5cd6b4419a17f4b6fb9d910ac321aa090eb7165c Mon Sep 17 00:00:00 2001 From: David Randolph Phillips Date: Wed, 21 Aug 2024 14:30:51 -0400 Subject: [PATCH] [BI-2267] removed leading and tailing blanks from the germplasm breeding method --- .../importer/services/processors/GermplasmProcessor.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/org/breedinginsight/brapps/importer/services/processors/GermplasmProcessor.java b/src/main/java/org/breedinginsight/brapps/importer/services/processors/GermplasmProcessor.java index de5eb65ae..e91d091f2 100644 --- a/src/main/java/org/breedinginsight/brapps/importer/services/processors/GermplasmProcessor.java +++ b/src/main/java/org/breedinginsight/brapps/importer/services/processors/GermplasmProcessor.java @@ -325,6 +325,7 @@ public Map process(ImportUpload upload, List
breedingMethods, List badBreedingMethods, Program program, UUID importListId, boolean commit, PendingImport mappedImportRow, int i, User user, Supplier nextVal) { + germplasm = removeBreedingMethodBlanks(germplasm); // Get the breeding method database object ProgramBreedingMethodEntity breedingMethod = null; if (germplasm.getBreedingMethod() != null) { @@ -358,6 +359,14 @@ private void processNewGermplasm(Germplasm germplasm, ValidationErrors validatio importList.addDataItem(newGermplasm.getGermplasmName()); } + // Removes leading and trailing blanks from the germplasm breedingMethod + private Germplasm removeBreedingMethodBlanks(Germplasm germplasm) { + if(germplasm.getBreedingMethod() != null ) { + germplasm.setBreedingMethod(germplasm.getBreedingMethod().strip()); + } + return germplasm; + } + private boolean processExistingGermplasm(Germplasm germplasm, ValidationErrors validationErrors, List importRows, Program program, UUID importListId, boolean commit, PendingImport mappedImportRow, int rowIndex) { BrAPIGermplasm existingGermplasm; String gid = germplasm.getAccessionNumber();