Merge pull request #102 from ncats/CVValidator_2613

filter type before cast

Author: tylerperyea

gsrs-module-substances-core/src/main/java/ix/ginas/utils/validation/validators/CVFragmentStructureValidator.java

@@ -43,7 +43,8 @@ private class FragmentChanges{
 	@Override
     public void validate(ControlledVocabulary newCV, ControlledVocabulary oldCV, ValidatorCallback callback) {
 
-		List<FragmentVocabularyTerm> invalidUpdateTerms =newCV.getTerms().stream()				
+		List<FragmentVocabularyTerm> invalidUpdateTerms =newCV.getTerms().stream()
+				.filter(term-> term instanceof FragmentVocabularyTerm)
 				.map(term->(FragmentVocabularyTerm)term)
 				.filter(term->!Optional.ofNullable(term.getFragmentStructure()).isPresent() 
 						|| !Optional.ofNullable(term.getDisplay()).isPresent()
@@ -58,6 +59,7 @@ public void validate(ControlledVocabulary newCV, ControlledVocabulary oldCV, Val
 		FragmentChanges changes = getAddedUpdatedDeletedTerms(newCV, oldCV);
 
 		Map<String, List<String>> hashLookup = newCV.getTerms().stream()
+		.filter(term-> term instanceof FragmentVocabularyTerm)
 		.map(key->(FragmentVocabularyTerm)key)		
 		.map(f->Tuple.of(getHash(f), f.getValue()))
 		.filter(t->t.k().isPresent())
@@ -130,7 +132,8 @@ private FragmentChanges getAddedUpdatedDeletedTerms(ControlledVocabulary newCV,
 
 		FragmentChanges fragmentChanges = new FragmentChanges();
 
-		List<FragmentVocabularyTerm> termsAfterUpdate =newCV.getTerms().stream()							
+		List<FragmentVocabularyTerm> termsAfterUpdate =newCV.getTerms().stream()
+				.filter(term->term instanceof FragmentVocabularyTerm)
 				.map(term->(FragmentVocabularyTerm)term)			
 				.collect(Collectors.toList());
 
@@ -140,7 +143,8 @@ private FragmentChanges getAddedUpdatedDeletedTerms(ControlledVocabulary newCV,
 			return fragmentChanges;
 		}
 
-		List<FragmentVocabularyTerm> termsBeforeUpdate = oldCV.getTerms().stream()				
+		List<FragmentVocabularyTerm> termsBeforeUpdate = oldCV.getTerms().stream()
+				.filter(term-> term instanceof FragmentVocabularyTerm)
 				.map(term->(FragmentVocabularyTerm)term)				
 				.collect(Collectors.toList());