Reuse the OntClass of an OntologyTermImpl when gathering its parents or children

Author: arteymix

src/ubic/basecode/ontology/jena/AbstractOntologyService.java

@@ -737,9 +737,13 @@ public String toString() {
 
     private Set<OntClass> getOntClassesFromTerms( Collection<OntologyTerm> terms ) {
         return terms.stream()
-                .map( OntologyTerm::getUri )
-                .filter( Objects::nonNull )
-                .map( model::getOntClass )
+                .map( o -> {
+                    if ( o instanceof OntologyTermImpl ) {
+                        return ( ( OntologyTermImpl ) o ).getOntClass();
+                    } else {
+                        return o.getUri() != null ? model.getOntClass( o.getUri() ) : null;
+                    }
+                } )
                 .filter( Objects::nonNull )
                 .collect( Collectors.toSet() );
     }

src/ubic/basecode/ontology/jena/OntologyTermImpl.java

@@ -26,7 +26,10 @@
 import ubic.basecode.ontology.model.OntologyTerm;
 
 import javax.annotation.Nullable;
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import static ubic.basecode.ontology.jena.JenaUtils.where;
@@ -232,4 +235,8 @@ public boolean isRoot() {
     public boolean isTermObsolete() {
         return isObsolete();
     }
+
+    public OntClass getOntClass() {
+        return ontResource;
+    }
 }