Skip to content

[BI-2267] Trim trailing white space on breeding method file uploads #392

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

Merged
davedrp merged 1 commit into from
Aug 28, 2024
Merged

[BI-2267] Trim trailing white space on breeding method file uploads #392

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions ...main/java/org/breedinginsight/brapps/importer/services/processors/GermplasmProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,7 @@ public Map<String, ImportPreviewStatistics> process(ImportUpload upload, List<Br
private void processNewGermplasm(Germplasm germplasm, ValidationErrors validationErrors, Map<String, ProgramBreedingMethodEntity> breedingMethods,
List<String> badBreedingMethods,
Program program, UUID importListId, boolean commit, PendingImport mappedImportRow, int i, User user, Supplier<BigInteger> nextVal) {
germplasm = removeBreedingMethodBlanks(germplasm);
// Get the breeding method database object
ProgramBreedingMethodEntity breedingMethod = null;
if (germplasm.getBreedingMethod() != null) {
Expand Down Expand Up @@ -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<BrAPIImport> importRows, Program program, UUID importListId, boolean commit, PendingImport mappedImportRow, int rowIndex) {
BrAPIGermplasm existingGermplasm;
String gid = germplasm.getAccessionNumber();
Expand Down