[Enhancement #209] Refactor OWLAPI lists to support data property val…

…ues for referenced lists.
kbss-cvut · Nov 27, 2023 · 08d83dc · 08d83dc
1 parent 9e738a5
commit 08d83dc
Show file tree

Hide file tree

Showing 18 changed files with 696 additions and 506 deletions.
diff --git a/ontodriver-owlapi/src/main/java/cz/cvut/kbss/ontodriver/owlapi/AxiomAdapter.java b/ontodriver-owlapi/src/main/java/cz/cvut/kbss/ontodriver/owlapi/AxiomAdapter.java
@@ -46,7 +46,7 @@ public OWLAxiom toOwlObjectPropertyAssertionAxiom(Axiom<?> axiom) {
                 objectValue);
     }
 
-    OWLAxiom toOwlDataPropertyAssertionAxiom(Axiom<?> axiom) {
+    public OWLAxiom toOwlDataPropertyAssertionAxiom(Axiom<?> axiom) {
         final OWLDataProperty dataProperty = dataFactory
                 .getOWLDataProperty(IRI.create(axiom.getAssertion().getIdentifier()));
         final OWLLiteral dataValue = OwlapiUtils.createOWLLiteralFromValue(axiom.getValue().getValue(),

diff --git a/ontodriver-owlapi/src/main/java/cz/cvut/kbss/ontodriver/owlapi/OwlapiAdapter.java b/ontodriver-owlapi/src/main/java/cz/cvut/kbss/ontodriver/owlapi/OwlapiAdapter.java
@@ -19,16 +19,13 @@
 
 import cz.cvut.kbss.ontodriver.descriptor.AxiomDescriptor;
 import cz.cvut.kbss.ontodriver.descriptor.AxiomValueDescriptor;
-import cz.cvut.kbss.ontodriver.descriptor.ReferencedListDescriptor;
-import cz.cvut.kbss.ontodriver.descriptor.ReferencedListValueDescriptor;
-import cz.cvut.kbss.ontodriver.descriptor.SimpleListDescriptor;
-import cz.cvut.kbss.ontodriver.descriptor.SimpleListValueDescriptor;
 import cz.cvut.kbss.ontodriver.model.Axiom;
 import cz.cvut.kbss.ontodriver.owlapi.change.TransactionalChange;
 import cz.cvut.kbss.ontodriver.owlapi.connector.Connector;
 import cz.cvut.kbss.ontodriver.owlapi.connector.OntologySnapshot;
 import cz.cvut.kbss.ontodriver.owlapi.exception.OwlapiDriverException;
-import cz.cvut.kbss.ontodriver.owlapi.list.ListHandler;
+import cz.cvut.kbss.ontodriver.owlapi.list.ReferencedListHandler;
+import cz.cvut.kbss.ontodriver.owlapi.list.SimpleListHandler;
 import cz.cvut.kbss.ontodriver.owlapi.query.OwlapiPreparedStatement;
 import cz.cvut.kbss.ontodriver.owlapi.query.OwlapiStatement;
 import cz.cvut.kbss.ontodriver.owlapi.query.StatementExecutorFactory;
@@ -215,14 +212,14 @@ public void addTransactionalChanges(Collection<TransactionalChange> changes) {
         pendingChanges.addAll(changes);
     }
 
-    public ListHandler<SimpleListDescriptor, SimpleListValueDescriptor> getSimpleListHandler() {
+    public SimpleListHandler getSimpleListHandler() {
         startTransactionIfNotActive();
-        return ListHandler.getSimpleListHandler(this, ontologySnapshot);
+        return new SimpleListHandler(this, ontologySnapshot);
     }
 
-    public ListHandler<ReferencedListDescriptor, ReferencedListValueDescriptor> getReferencedListHandler() {
+    public ReferencedListHandler getReferencedListHandler() {
         startTransactionIfNotActive();
-        return ListHandler.getReferencedListHandler(this, ontologySnapshot);
+        return new ReferencedListHandler(this, ontologySnapshot);
     }
 
     public OwlapiStatement createStatement(OwlapiConnection connection) {

diff --git a/...api/src/main/java/cz/cvut/kbss/ontodriver/owlapi/list/InferredReferencedListIterator.java b/...api/src/main/java/cz/cvut/kbss/ontodriver/owlapi/list/InferredReferencedListIterator.java
@@ -25,7 +25,9 @@
 import cz.cvut.kbss.ontodriver.owlapi.exception.ReasonerNotAvailableException;
 import cz.cvut.kbss.ontodriver.owlapi.util.OwlapiUtils;
 import org.semanticweb.owlapi.model.OWLIndividual;
+import org.semanticweb.owlapi.model.OWLLiteral;
 import org.semanticweb.owlapi.model.OWLNamedIndividual;
+import org.semanticweb.owlapi.model.OWLObject;
 import org.semanticweb.owlapi.reasoner.OWLReasoner;
 
 import java.util.Collection;
@@ -34,7 +36,7 @@
 import java.util.NoSuchElementException;
 import java.util.stream.Collectors;
 
-class InferredReferencedListIterator extends ReferencedListIterator {
+class InferredReferencedListIterator<T> extends ReferencedListIterator<T> {
 
     private OWLNamedIndividual currentNode;
     private final OWLReasoner reasoner;
@@ -69,20 +71,28 @@ void doStep() {
         checkMaxSuccessors(currentNextNodeProperty, nextNodes);
         this.currentNextNodeProperty = hasNextProperty;
         this.currentNode = nextNodes.iterator().next();
-        this.nextItem = reasoner.getObjectPropertyValues(currentNode, hasContentProperty).entities()
-                                .collect(Collectors.toSet());
+        this.nextItem = hasContentProperty.isOWLObjectProperty() ? reasoner.getObjectPropertyValues(currentNode, hasContentProperty.asOWLObjectProperty())
+                                                                           .entities()
+                                                                           .collect(Collectors.toSet())
+                : reasoner.getDataPropertyValues(currentNode, hasContentProperty.asOWLDataProperty());
     }
 
     @Override
-    NamedResource nextValue() {
+    T nextValue() {
         if (!hasNext()) {
             throw new NoSuchElementException("There are no more elements.");
         }
         checkMaxSuccessors(hasContentProperty, nextItem);
-        final OWLIndividual value = nextItem.iterator().next();
-        checkIsNamed(value);
+        final OWLObject value = nextItem.iterator().next();
         doStep();
-        return NamedResource.create(value.asOWLNamedIndividual().getIRI().toURI());
+        if (value.isIndividual()) {
+            final OWLIndividual individual = (OWLIndividual) value;
+            checkIsNamed(individual);
+            return (T) NamedResource.create(individual.asOWLNamedIndividual().getIRI().toURI());
+        } else {
+            final OWLLiteral literal = (OWLLiteral) value;
+            return (T) OwlapiUtils.owlLiteralToValue(literal);
+        }
     }
 
     @Override
@@ -91,7 +101,7 @@ List<TransactionalChange> removeWithoutReconnect() {
     }
 
     @Override
-    List<TransactionalChange> replaceNode(NamedResource newValue) {
+    List<TransactionalChange> replaceNode(T newValue) {
         throw new UnsupportedOperationException();
     }
 }
diff --git a/ontodriver-owlapi/src/main/java/cz/cvut/kbss/ontodriver/owlapi/list/ListHandler.java b/ontodriver-owlapi/src/main/java/cz/cvut/kbss/ontodriver/owlapi/list/ListHandler.java
diff --git a/ontodriver-owlapi/src/main/java/cz/cvut/kbss/ontodriver/owlapi/list/OwlapiListIterator.java b/ontodriver-owlapi/src/main/java/cz/cvut/kbss/ontodriver/owlapi/list/OwlapiListIterator.java
@@ -22,18 +22,19 @@
 import cz.cvut.kbss.ontodriver.model.NamedResource;
 import cz.cvut.kbss.ontodriver.owlapi.change.TransactionalChange;
 import org.semanticweb.owlapi.model.OWLIndividual;
-import org.semanticweb.owlapi.model.OWLObjectProperty;
+import org.semanticweb.owlapi.model.OWLObject;
+import org.semanticweb.owlapi.model.OWLProperty;
 
 import java.util.Collection;
 import java.util.List;
 
-abstract class OwlapiListIterator {
+abstract class OwlapiListIterator<T> {
 
     abstract boolean hasNext();
 
-    abstract Axiom<NamedResource> next();
+    abstract Axiom<T> next();
 
-    abstract NamedResource nextValue();
+    abstract T nextValue();
 
     /**
      * Gets the current list node.
@@ -64,9 +65,9 @@ abstract class OwlapiListIterator {
      * @param newValue The new value to use
      * @return List of changes to apply
      */
-    abstract List<TransactionalChange> replaceNode(NamedResource newValue);
+    abstract List<TransactionalChange> replaceNode(T newValue);
 
-    static void checkMaxSuccessors(OWLObjectProperty property, Collection<? extends OWLIndividual> successors) {
+    static void checkMaxSuccessors(OWLProperty property, Collection<? extends OWLObject> successors) {
         if (successors.size() > 1) {
             throw new IntegrityConstraintViolatedException(
                     "Invalid number of successors. Expected only 1 value of property " + property + ", but got " +

diff --git a/ontodriver-owlapi/src/main/java/cz/cvut/kbss/ontodriver/owlapi/list/OwlapiLists.java b/ontodriver-owlapi/src/main/java/cz/cvut/kbss/ontodriver/owlapi/list/OwlapiLists.java
@@ -81,14 +81,14 @@ public List<Axiom<NamedResource>> loadReferencedList(ReferencedListDescriptor de
     }
 
     @Override
-    public void persistReferencedList(ReferencedListValueDescriptor descriptor) throws OntoDriverException {
+    public <V> void persistReferencedList(ReferencedListValueDescriptor<V> descriptor) throws OntoDriverException {
         ensureStateAndArgumentValid(descriptor);
         adapter.getReferencedListHandler().persistList(descriptor);
         afterChangeCallback.execute();
     }
 
     @Override
-    public void updateReferencedList(ReferencedListValueDescriptor descriptor) throws OntoDriverException {
+    public <V> void updateReferencedList(ReferencedListValueDescriptor<V> descriptor) throws OntoDriverException {
         ensureStateAndArgumentValid(descriptor);
         adapter.getReferencedListHandler().updateList(descriptor);
         afterChangeCallback.execute();