ont-api: add DataPropertySearcher (issue #15) + tests

sszuev · sszuev · commit cafc5befb347 · 2020-07-26T18:21:21.000+03:00
diff --git a/src/main/java/com/github/owlcs/ontapi/internal/InternalReadModel.java b/src/main/java/com/github/owlcs/ontapi/internal/InternalReadModel.java
@@ -19,10 +19,7 @@
 import com.github.owlcs.ontapi.OntApiException;
 import com.github.owlcs.ontapi.internal.axioms.AbstractNaryTranslator;
 import com.github.owlcs.ontapi.internal.searchers.axioms.*;
-import com.github.owlcs.ontapi.internal.searchers.objects.AnnotationPropertySearcher;
-import com.github.owlcs.ontapi.internal.searchers.objects.ClassSearcher;
-import com.github.owlcs.ontapi.internal.searchers.objects.NamedIndividualSearcher;
-import com.github.owlcs.ontapi.internal.searchers.objects.ObjectPropertySearcher;
+import com.github.owlcs.ontapi.internal.searchers.objects.*;
 import com.github.owlcs.ontapi.jena.OntJenaException;
 import com.github.owlcs.ontapi.jena.RWLockedGraph;
 import com.github.owlcs.ontapi.jena.impl.OntGraphModelImpl;
@@ -152,6 +149,7 @@ abstract class InternalReadModel extends OntGraphModelImpl implements ListAxioms
     protected final ObjectsSearcher<OWLNamedIndividual> individualSearcher = new NamedIndividualSearcher();
     protected final ObjectsSearcher<OWLObjectProperty> objectPropertySearcher = new ObjectPropertySearcher();
     protected final ObjectsSearcher<OWLAnnotationProperty> annotationPropertySearcher = new AnnotationPropertySearcher();
+    protected final ObjectsSearcher<OWLDataProperty> dataPropertySearcher = new DataPropertySearcher();
 
     InternalReadModel(Graph base,
                       OntPersonality personality,
@@ -899,6 +897,8 @@ private ObjectsSearcher<OWLObject> getEntitySearcher(OWLComponentType type) {
                 return BaseSearcher.cast(objectPropertySearcher);
             case ANNOTATION_PROPERTY:
                 return BaseSearcher.cast(annotationPropertySearcher);
+            case DATATYPE_PROPERTY:
+                return BaseSearcher.cast(dataPropertySearcher);
         }
         // TODO: support other types (see https://github.com/owlcs/ont-api/issues/15)
         return null;
diff --git a/src/main/java/com/github/owlcs/ontapi/internal/searchers/objects/ClassSearcher.java b/src/main/java/com/github/owlcs/ontapi/internal/searchers/objects/ClassSearcher.java
@@ -60,15 +60,15 @@ protected ONTObject<OWLClass> createEntity(String uri, ModelObjectFactory factor
     @Override
     protected boolean containsEntity(String uri, OntModel m, AxiomsSettings conf) {
         Resource clazz = toResource(m, uri);
-        if (isBuiltin(m, clazz)) {
-            if (OWL.Thing.equals(clazz)) {
-                if (containsAxiom(Iter.flatMap(listImplicitStatements(m), s -> listRootStatements(m, s)), conf)) {
-                    return true;
-                }
+        if (!isBuiltin(m, clazz)) {
+            return containsDeclaration(clazz, m, conf);
+        }
+        if (OWL.Thing.equals(clazz)) {
+            if (containsAxiom(Iter.flatMap(listImplicitStatements(m), s -> listRootStatements(m, s)), conf)) {
+                return true;
             }
-            return containsInOntology(clazz, m, conf);
         }
-        return containsDeclaration(clazz, m, conf);
+        return containsInOntology(clazz, m, conf);
     }
 
     @Override
diff --git a/src/main/java/com/github/owlcs/ontapi/internal/searchers/objects/DataPropertySearcher.java b/src/main/java/com/github/owlcs/ontapi/internal/searchers/objects/DataPropertySearcher.java
@@ -0,0 +1,60 @@
+/*
+ * This file is part of the ONT API.
+ * The contents of this file are subject to the LGPL License, Version 3.0.
+ * Copyright (c) 2020, owl.cs group.
+ *
+ * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License along with this program.  If not, see http://www.gnu.org/licenses/.
+ *
+ * Alternatively, the contents of this file may be used under the terms of the Apache License, Version 2.0 in which case, the provisions of the Apache License Version 2.0 are applicable instead of those above.
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+ */
+
+package com.github.owlcs.ontapi.internal.searchers.objects;
+
+import com.github.owlcs.ontapi.OntApiException;
+import com.github.owlcs.ontapi.internal.*;
+import com.github.owlcs.ontapi.jena.model.OntModel;
+import com.github.owlcs.ontapi.jena.utils.Iter;
+import com.github.owlcs.ontapi.jena.vocabulary.OWL;
+import org.apache.jena.graph.Node;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.util.iterator.ExtendedIterator;
+import org.semanticweb.owlapi.model.OWLAxiom;
+import org.semanticweb.owlapi.model.OWLDataProperty;
+
+import java.util.Set;
+
+/**
+ * Created by @ssz on 26.07.2020.
+ */
+public class DataPropertySearcher extends PropertySearcher<OWLDataProperty> {
+    private static final Set<AxiomTranslator<OWLAxiom>> TRANSLATORS = selectTranslators(OWLComponentType.DATATYPE_PROPERTY);
+
+    @Override
+    protected ExtendedIterator<? extends AxiomTranslator<OWLAxiom>> listTranslators() {
+        return Iter.create(TRANSLATORS);
+    }
+
+    @Override
+    protected ONTObject<OWLDataProperty> createEntity(String uri, OntModel model, ONTObjectFactory factory) {
+        return factory.getProperty(OntApiException.mustNotBeNull(model.getDataProperty(uri)));
+    }
+
+    @Override
+    protected ONTObject<OWLDataProperty> createEntity(String uri, ModelObjectFactory factory) {
+        return factory.getDataProperty(uri);
+    }
+
+    @Override
+    protected Resource getEntityType() {
+        return OWL.DatatypeProperty;
+    }
+
+    @Override
+    protected Set<Node> getBuiltins(OntModel m) {
+        return getBuiltinsVocabulary(m).getDatatypeProperties();
+    }
+}
diff --git a/src/test/java/com/github/owlcs/ontapi/tests/model/SignatureTest.java b/src/test/java/com/github/owlcs/ontapi/tests/model/SignatureTest.java
@@ -75,83 +75,99 @@ public void testAnnotationProperties() {
         data.doTest(T.ANNOTATION_PROPERTY);
     }
 
+    @Test
+    public void testDataProperties() {
+        data.doTest(T.DATA_PROPERTY);
+    }
+
     enum TestData {
         PIZZA(ModelData.PIZZA,
                 T.CLASS.of(-18549559397L),
                 T.CLASS_EXPRESSION.of(-42505386964L),
                 T.NAMED_INDIVIDUAL.of(627705256L),
                 T.OBJECT_PROPERTY.of(833765171L),
-                T.ANNOTATION_PROPERTY.of(2561927052L)
+                T.ANNOTATION_PROPERTY.of(2561927052L),
+                T.DATA_PROPERTY.of()
         ),
         FAMILY(ModelData.FAMILY,
                 T.CLASS.of(-1268263574L),
                 T.CLASS_EXPRESSION.of(-16978651096L),
                 T.NAMED_INDIVIDUAL.of(85936112709L),
                 T.OBJECT_PROPERTY.of(16114808725L),
-                T.ANNOTATION_PROPERTY.of(1501132596L)
+                T.ANNOTATION_PROPERTY.of(1501132596L),
+                T.DATA_PROPERTY.of(-253462624L)
         ),
         PEOPLE(ModelData.PEOPLE,
                 T.CLASS.of(-44946003502L),
                 T.CLASS_EXPRESSION.of(-51187071185L),
                 T.NAMED_INDIVIDUAL.of(-27921947437L),
                 T.OBJECT_PROPERTY.of(-3152099946L),
-                T.ANNOTATION_PROPERTY.of(374445982L)
+                T.ANNOTATION_PROPERTY.of(374445982L),
+                T.DATA_PROPERTY.of()
         ),
         CAMERA(ModelData.CAMERA,
                 T.CLASS.of(8550118707L),
                 T.CLASS_EXPRESSION.of(7152927621L),
                 T.NAMED_INDIVIDUAL.of(-1151331346L),
                 T.OBJECT_PROPERTY.of(7453849661L),
-                T.ANNOTATION_PROPERTY.of(1501132596L)
+                T.ANNOTATION_PROPERTY.of(1501132596L),
+                T.DATA_PROPERTY.of(1045936326L)
         ),
         KOALA(ModelData.KOALA,
                 T.CLASS.of(4003478322L),
                 T.CLASS_EXPRESSION.of(6612435426L),
                 T.NAMED_INDIVIDUAL.of(11447501603L),
                 T.OBJECT_PROPERTY.of(1499233275L),
-                T.ANNOTATION_PROPERTY.of(-1366328290L)
+                T.ANNOTATION_PROPERTY.of(-1366328290L),
+                T.DATA_PROPERTY.of(-1885133841L)
         ),
         TRAVEL(ModelData.TRAVEL,
                 T.CLASS.of(-12813239L),
                 T.CLASS_EXPRESSION.of(5669053922L),
                 T.NAMED_INDIVIDUAL.of(647180319L),
                 T.OBJECT_PROPERTY.of(451649769L),
-                T.ANNOTATION_PROPERTY.of(2561927052L)
+                T.ANNOTATION_PROPERTY.of(2561927052L),
+                T.DATA_PROPERTY.of(-3029448884L)
         ),
         WINE(ModelData.WINE,
                 T.CLASS.of(-7328739440L),
                 T.CLASS_EXPRESSION.of(-12745569437L),
                 T.NAMED_INDIVIDUAL.of(3479779986L),
                 T.OBJECT_PROPERTY.of(2015421784L),
-                T.ANNOTATION_PROPERTY.of(1366640788L)
+                T.ANNOTATION_PROPERTY.of(1366640788L),
+                T.DATA_PROPERTY.of(-2003930395L)
         ),
         FOOD(ModelData.FOOD,
                 T.CLASS.of(-23236948086L),
                 T.CLASS_EXPRESSION.of(-15980117497L),
                 T.NAMED_INDIVIDUAL.of(-37834773654L),
                 T.OBJECT_PROPERTY.of(-1744813981L),
-                T.ANNOTATION_PROPERTY.of(1501132596L)
+                T.ANNOTATION_PROPERTY.of(1501132596L),
+                T.DATA_PROPERTY.of()
         ),
         NCBITAXON_CUT(ModelData.NCBITAXON_CUT,
                 T.CLASS.of(-72461035056L),
                 T.CLASS_EXPRESSION.of(2872387903L),
                 T.NAMED_INDIVIDUAL.of(-75278820767L),
                 T.OBJECT_PROPERTY.of(-3871221171L),
-                T.ANNOTATION_PROPERTY.of(7516115975L)
+                T.ANNOTATION_PROPERTY.of(7516115975L),
+                T.DATA_PROPERTY.of(-795195587L)
         ),
         HP_CUT(ModelData.HP_CUT,
                 T.CLASS.of(4720902778L),
                 T.CLASS_EXPRESSION.of(8426758568L),
                 T.NAMED_INDIVIDUAL.of(),
                 T.OBJECT_PROPERTY.of(-1116367413L),
-                T.ANNOTATION_PROPERTY.of(6911265806L)
+                T.ANNOTATION_PROPERTY.of(6911265806L),
+                T.DATA_PROPERTY.of()
         ),
         FAMILY_PEOPLE_UNION(ModelData.FAMILY_PEOPLE_UNION,
                 T.CLASS.of(-1213682231L),
                 T.CLASS_EXPRESSION.of(2421052769L),
                 T.NAMED_INDIVIDUAL.of(899752725L),
                 T.OBJECT_PROPERTY.of(-163607138L),
-                T.ANNOTATION_PROPERTY.of(1501132596L)
+                T.ANNOTATION_PROPERTY.of(1501132596L),
+                T.DATA_PROPERTY.of(-1511256518L)
         ),
         ;
         private final ModelData resource;
