Skip to content

[BI-2354] - Incorrect Case Sensitivity in Exp Import Error Message #420

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
mlm483 merged 1 commit into from
Nov 4, 2024
Merged

[BI-2354] - Incorrect Case Sensitivity in Exp Import Error Message #420

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion ...ain/java/org/breedinginsight/brapps/importer/services/processors/ExperimentProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ private List<Trait> verifyTraits(UUID programId, List<Column<?>> phenotypeCols,
.map(TraitEntity::getObservationVariableName)
.collect(Collectors.toSet());
List<String> differences = varNames.stream()
.filter(var -> !returnedVarNames.contains(var))
.filter(var -> !Utilities.containsCaseInsensitive(var, returnedVarNames))
.collect(Collectors.toList());
//TODO convert this to a ValidationError
throw new HttpStatusException(HttpStatus.UNPROCESSABLE_ENTITY,
Expand Down
3 changes: 2 additions & 1 deletion ...ht/brapps/importer/services/processors/experiment/services/ExperimentValidateService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.breedinginsight.model.Trait;
import org.breedinginsight.services.OntologyService;
import org.breedinginsight.services.exceptions.DoesNotExistException;
import org.breedinginsight.utilities.Utilities;
import tech.tablesaw.columns.Column;

import javax.inject.Inject;
Expand Down Expand Up @@ -78,7 +79,7 @@ public List<Trait> verifyTraits(UUID programId, DynamicColumnParseResult cols) {
.map(TraitEntity::getObservationVariableName)
.collect(Collectors.toSet());
List<String> differences = varNames.stream()
.filter(var -> !returnedVarNames.contains(var))
.filter(var -> !Utilities.containsCaseInsensitive(var, returnedVarNames))
.collect(Collectors.toList());
//TODO convert this to a ValidationError
throw new HttpStatusException(HttpStatus.UNPROCESSABLE_ENTITY,
Expand Down
9 changes: 3 additions & 6 deletions src/main/java/org/breedinginsight/utilities/Utilities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,7 @@
import java.lang.reflect.Field;
import java.sql.ResultSet;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.UUID;
import java.util.*;
import java.util.function.Function;
import java.util.regex.Pattern;

Expand All @@ -48,10 +45,10 @@ public static <T> Optional<T> findInList(List<T> checkList, T objectToCheck, Fun
* Case insensitive search for string in string list
*
* @param target - string to search for
* @param list - list of strings to search in
* @param list - collection of strings to search in
* @return true if case insensitive match, false otherwise
*/
public static boolean containsCaseInsensitive(String target, List<String> list){
public static boolean containsCaseInsensitive(String target, Collection<String> list){
return list.stream().anyMatch(x -> x.equalsIgnoreCase(target));
}

Expand Down