Skip to content

Commit 2c24da7

Browse files
committed
Drop null values prior to validation in RenameSamplesForMgapStep
1 parent 0a87f3c commit 2c24da7

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

mGAP/src/org/labkey/mgap/pipeline/RenameSamplesForMgapStep.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
import java.util.HashSet;
5252
import java.util.List;
5353
import java.util.Map;
54+
import java.util.Objects;
5455
import java.util.Set;
5556

5657
public class RenameSamplesForMgapStep extends AbstractPipelineStep implements VariantProcessingStep
@@ -295,7 +296,7 @@ private Map<String, String> getSamplesToAlias(File input) throws PipelineJobExce
295296
}
296297

297298
//Now ensure we dont have duplicate mappings:
298-
List<String> translated = new ArrayList<>(header.getSampleNamesInOrder().stream().map(sampleNameMap::get).toList());
299+
List<String> translated = new ArrayList<>(header.getSampleNamesInOrder().stream().map(sampleNameMap::get).filter(Objects::nonNull).toList());
299300
Set<String> unique = new HashSet<>();
300301
List<String> duplicates = translated.stream().filter(o -> !unique.add(o)).toList();
301302
if (!duplicates.isEmpty())

0 commit comments

Comments
 (0)