From 0c3494282975946eeef1127b7281fbcfeb5484d3 Mon Sep 17 00:00:00 2001 From: HMS17 Date: Fri, 1 Dec 2023 10:38:21 -0500 Subject: [PATCH 1/2] [BI-1867] - Ontology: Increase name length to 16 characters --- .../services/validators/TraitFileValidatorError.java | 2 +- .../services/validators/TraitValidatorService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/breedinginsight/services/validators/TraitFileValidatorError.java b/src/main/java/org/breedinginsight/services/validators/TraitFileValidatorError.java index 25f1b3540..0eab0ad37 100644 --- a/src/main/java/org/breedinginsight/services/validators/TraitFileValidatorError.java +++ b/src/main/java/org/breedinginsight/services/validators/TraitFileValidatorError.java @@ -147,7 +147,7 @@ public ValidationError getInsufficientOrdinalValError() { @Override public ValidationError getCharLimitObsVarNameMsg() { - return new ValidationError("Name", "Name exceeds 12 character limit", HttpStatus.UNPROCESSABLE_ENTITY); + return new ValidationError("Name", "Name exceeds 16 character limit", HttpStatus.UNPROCESSABLE_ENTITY); } @Override diff --git a/src/main/java/org/breedinginsight/services/validators/TraitValidatorService.java b/src/main/java/org/breedinginsight/services/validators/TraitValidatorService.java index 3943ba77f..1b893c8bc 100644 --- a/src/main/java/org/breedinginsight/services/validators/TraitValidatorService.java +++ b/src/main/java/org/breedinginsight/services/validators/TraitValidatorService.java @@ -184,7 +184,7 @@ public ValidationErrors checkTraitFieldsLength(List traits, TraitValidato Trait trait = traits.get(i); Method method = trait.getMethod(); - int shortCharLimit = 12; + int shortCharLimit = 16; int longCharLimit = 30; if ((trait.getObservationVariableName() != null) && (trait.getObservationVariableName().length() > shortCharLimit)) { From ddc28e81af4479b05f295f130ca4995c22e16367 Mon Sep 17 00:00:00 2001 From: HMS17 Date: Fri, 1 Dec 2023 14:33:58 -0500 Subject: [PATCH 2/2] [BI-1867] - Ontology: Increase name length to 16 characters --- .../services/validators/TraitValidatorUnitTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/breedinginsight/services/validators/TraitValidatorUnitTest.java b/src/test/java/org/breedinginsight/services/validators/TraitValidatorUnitTest.java index a7fa4507b..184e7308e 100644 --- a/src/test/java/org/breedinginsight/services/validators/TraitValidatorUnitTest.java +++ b/src/test/java/org/breedinginsight/services/validators/TraitValidatorUnitTest.java @@ -298,7 +298,7 @@ public void duplicateTraitsInFile() { public void charLimitExceeded() { Trait trait = new Trait(); - trait.setObservationVariableName("OverTwelveChar"); + trait.setObservationVariableName("IsOverSixteenChar"); trait.setProgramObservationLevel(ProgramObservationLevel.builder().name("Plant").build()); Scale scale = new Scale(); scale.setScaleName("Test Scale");