ont-map: reflect changes in ont-api jena model (see owlcs/ont-api#4, owlcs/ont-api#8)

Author: sszuev

src/main/java/com/github/owlcs/map/ClassPropertyMap.java

@@ -35,20 +35,21 @@ public interface ClassPropertyMap {
     /**
      * Lists all properties by a class.
      *
-     * @param ce {@link OntCE} with a model inside
+     * @param ce {@link OntClass} with a model inside
      * @return <b>distinct</b> Stream of {@link Property properties}
      */
-    Stream<Property> properties(OntCE ce);
+    Stream<Property> properties(OntClass ce);
 
     /**
      * Lists all classes by a property.
-     * A reverse operation to the {@link #properties(OntCE)}.
+     * A reverse operation to the {@link #properties(OntClass)}.
      *
-     * @param pe {@link OntPE} - an property, which in OWL2 can be either {@link OntNDP}, {@link OntNAP} or {@link OntOPE}
-     * @return <b>distinct</b> Stream of {@link OntCE class-expressions}
+     * @param pe {@link OntProperty} - an property, which in OWL2 can be either {@link OntDataProperty},
+     *           {@link OntAnnotationProperty} or {@link OntObjectProperty}
+     * @return <b>distinct</b> Stream of {@link OntClass class-expressions}
      */
-    default Stream<OntCE> classes(OntPE pe) {
-        return pe.getModel().ontObjects(OntCE.class)
+    default Stream<OntClass> classes(OntProperty pe) {
+        return pe.getModel().ontObjects(OntClass.class)
                 .filter(c -> properties(c).anyMatch(p -> Objects.equals(p, pe.asProperty())))
                 .distinct();
     }

src/main/java/com/github/owlcs/map/MapContext.java

@@ -18,15 +18,15 @@
 
 package com.github.owlcs.map;
 
-import com.github.owlcs.ontapi.jena.model.OntCE;
-import com.github.owlcs.ontapi.jena.model.OntOPE;
+import com.github.owlcs.ontapi.jena.model.OntClass;
+import com.github.owlcs.ontapi.jena.model.OntObjectProperty;
 import org.apache.jena.rdf.model.Property;
 
 import java.util.stream.Stream;
 
 /**
  * A class expressions mapping (class bridge), that is a primary component of a {@link MapModel mapping model}.
- * In GUI it can be represented as an arrow between source and target {@link OntCE class expression}s.
+ * In GUI it can be represented as an arrow between source and target {@link OntClass class expression}s.
  * <p>
  * Created by @szuev on 14.04.2018.
  */
@@ -35,16 +35,16 @@ public interface MapContext extends MapResource {
     /**
      * Returns a source class expression.
      *
-     * @return {@link OntCE}
+     * @return {@link OntClass}
      */
-    OntCE getSource();
+    OntClass getSource();
 
     /**
      * Returns a target class expression.
      *
-     * @return {@link OntCE}
+     * @return {@link OntClass}
      */
-    OntCE getTarget();
+    OntClass getTarget();
 
     /**
      * Answers a context' expression in the form of function-call object.
@@ -76,13 +76,15 @@ public interface MapContext extends MapResource {
      * Adds a properties bridge.
      * Source properties are specified by mapping and filter function calls, the target goes explicitly.
      * All input properties must be an OWL2 entities with possible to assign data on individual:
-     * {@link com.github.owlcs.ontapi.jena.model.OntNAP named annotation property} and
-     * {@link com.github.owlcs.ontapi.jena.model.OntNDP datatype property},
-     * while {@link com.github.owlcs.ontapi.jena.model.OntNOP object property} is used to bind contexts together, not to inference data.
+     * {@link com.github.owlcs.ontapi.jena.model.OntAnnotationProperty} and
+     * {@link com.github.owlcs.ontapi.jena.model.OntDataProperty},
+     * while {@link com.github.owlcs.ontapi.jena.model.OntObjectProperty.Named}
+     * is used to bind contexts together, not to inference data.
      *
      * @param filterFunctionCall  {@link MapFunction.Call} function-call to filter data
      * @param mappingFunctionCall {@link MapFunction.Call} function-call to map data
-     * @param target              property, either {@link com.github.owlcs.ontapi.jena.model.OntNAP} or {@link com.github.owlcs.ontapi.jena.model.OntNDP}
+     * @param target              property, either {@link com.github.owlcs.ontapi.jena.model.OntAnnotationProperty}
+     *                            or {@link com.github.owlcs.ontapi.jena.model.OntDataProperty}
      * @return {@link PropertyBridge} a container with all input settings.
      * @throws MapJenaException if something goes wrong (e.g. incompatible function or property specified)
      */
@@ -109,14 +111,14 @@ PropertyBridge addPropertyBridge(MapFunction.Call filterFunctionCall,
     /**
      * Creates a context with the same target class expression and with source linked to the source of this context.
      * Classes can be linked to each other through object property range and domain axioms,
-     * see description for {@link #createRelatedContext(OntCE, OntOPE)}.
+     * see description for {@link #createRelatedContext(OntClass, OntObjectProperty)}.
      * Throws an exception in the case the link (object property) does not exist or it can not be uniquely determined.
      *
-     * @param source {@link OntCE} source for the new context, the target is the same as in this context.
+     * @param source {@link OntClass} source for the new context, the target is the same as in this context.
      * @return <b>new</b> context
      * @throws MapJenaException unable to make reference context
      */
-    MapContext createRelatedContext(OntCE source) throws MapJenaException;
+    MapContext createRelatedContext(OntClass source) throws MapJenaException;
 
     /**
      * Creates a context associated with this one through the specified object property expression.
@@ -129,24 +131,24 @@ PropertyBridge addPropertyBridge(MapFunction.Call filterFunctionCall,
      * otherwise with "related object context" rule.
      * If {@code C1} and {@code C2} are not linked to each other, an exception are expected.
      *
-     * @param source {@link OntCE} class expression, source for result context
-     * @param link   {@link OntOPE} object property expression, a link between {@code source} and {@link #getSource()}
+     * @param source {@link OntClass} class expression, source for result context
+     * @param link   {@link OntObjectProperty} object property expression, a link between {@code source} and {@link #getSource()}
      * @return <b>new</b> context with specified class as source and {@link #getTarget()} as target.
      * @throws MapJenaException unable to make reference context
      */
-    MapContext createRelatedContext(OntCE source, OntOPE link) throws MapJenaException;
+    MapContext createRelatedContext(OntClass source, OntObjectProperty link) throws MapJenaException;
 
     /**
      * Binds this context and the specified with a link-property.
      * On inference these contexts together will produce consistent data:
      * the result individuals will be bound in an object property assertion.
      *
      * @param other {@link MapContext} other context
-     * @param link  {@link OntOPE}, link property
+     * @param link  {@link OntObjectProperty}, link property
      * @return {@link PropertyBridge} which connects this context and the specified
      * @throws MapJenaException if something goes wrong or input parameters are not correct
      */
-    PropertyBridge attachContext(MapContext other, OntOPE link) throws MapJenaException;
+    PropertyBridge attachContext(MapContext other, OntObjectProperty link) throws MapJenaException;
 
     /**
      * Lists all contexts that depend on this somehow.
@@ -204,7 +206,8 @@ default PropertyBridge addPropertyBridge(MapFunction.Builder func, Property targ
      * This is commonly used method, while its overloaded companion is used less frequently to build specific ontology mappings.
      *
      * @param func   {@link MapFunction.Call}, expression
-     * @param target property, either {@link com.github.owlcs.ontapi.jena.model.OntNAP} or {@link com.github.owlcs.ontapi.jena.model.OntNDP}
+     * @param target property, either {@link com.github.owlcs.ontapi.jena.model.OntAnnotationProperty}
+     *               or {@link com.github.owlcs.ontapi.jena.model.OntDataProperty}
      * @return {@link PropertyBridge} a container with all input settings
      * @throws MapJenaException if something goes wrong (e.g. incompatible function or property specified)
      * @see #addPropertyBridge(MapFunction.Call, MapFunction.Call, Property)

src/main/java/com/github/owlcs/map/MapFunction.java

@@ -19,9 +19,9 @@
 package com.github.owlcs.map;
 
 import com.github.owlcs.map.spin.vocabulary.AVC;
-import com.github.owlcs.ontapi.jena.model.OntCE;
-import com.github.owlcs.ontapi.jena.model.OntGraphModel;
-import com.github.owlcs.ontapi.jena.model.OntPE;
+import com.github.owlcs.ontapi.jena.model.OntClass;
+import com.github.owlcs.ontapi.jena.model.OntModel;
+import com.github.owlcs.ontapi.jena.model.OntNamedProperty;
 import com.github.owlcs.ontapi.jena.utils.BuiltIn;
 import org.apache.jena.rdf.model.Literal;
 import org.apache.jena.rdf.model.Property;
@@ -388,7 +388,7 @@ interface Builder {
          * e.g. if you set 'Anything' it would be actually {@code "Anything"^^<http://www.w3.org/2001/XMLSchema#string>}.
          * If some value is already associated with the given {@code predicate}, it will be replaced by the new value.
          * To list all built-in datatypes the method {@link BuiltIn.Vocabulary#datatypes()} can be used.
-         * To list all model datatypes the expression {@link OntGraphModel#datatypes()}
+         * To list all model datatypes the expression {@link OntModel#datatypes()}
          *
          * @param predicate iri ({@link Arg#name()}), not {@code null}
          * @param value     String, value, not {@code null}
@@ -458,10 +458,10 @@ default Builder add(Property predicate, String value) {
          * This method is just for simplification code.
          *
          * @param predicate {@link Property}, that corresponds {@link Arg#name()}, not {@code null}
-         * @param ce        {@link OntCE}, not {@code null}
+         * @param ce        {@link OntClass}, not {@code null}
          * @return this builder
          */
-        default Builder addClass(Property predicate, OntCE ce) {
+        default Builder addClass(Property predicate, OntClass ce) {
             return add(predicate, ce.asNode().toString());
         }
 
@@ -470,13 +470,13 @@ default Builder addClass(Property predicate, OntCE ce) {
          * This method is just for simplification code.
          *
          * @param predicate {@link Property}, that corresponds {@link Arg#name()}, not {@code null}
-         * @param property  {@link com.github.owlcs.ontapi.jena.model.OntNDP},
-         *                  {@link com.github.owlcs.ontapi.jena.model.OntNAP} or
-         *                  {@link com.github.owlcs.ontapi.jena.model.OntNOP}, not {@code null}
+         * @param property  {@link com.github.owlcs.ontapi.jena.model.OntDataProperty},
+         *                  {@link com.github.owlcs.ontapi.jena.model.OntAnnotationProperty} or
+         *                  {@link com.github.owlcs.ontapi.jena.model.OntObjectProperty.Named}, not {@code null}
          * @param <P>       a property subclass
          * @return this builder
          */
-        default <P extends OntPE & Property> Builder addProperty(Property predicate, P property) {
+        default <P extends OntNamedProperty<?>> Builder addProperty(Property predicate, P property) {
             return add(predicate, property.getURI());
         }
 

src/main/java/com/github/owlcs/map/MapManager.java

@@ -18,7 +18,7 @@
 
 package com.github.owlcs.map;
 
-import com.github.owlcs.ontapi.jena.model.OntGraphModel;
+import com.github.owlcs.ontapi.jena.model.OntModel;
 import org.apache.jena.graph.Graph;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.Resource;
@@ -60,13 +60,13 @@ public interface MapManager {
     /**
      * Copies all meaningful data from the given {@code Graph} into the manager's primary {@code Graph}.
      * The most obvious (and currently single) use of this method is registering all functions that graph may contain.
-     * In this sense, the method behaves in the same way as method {@link #asMapModel(OntGraphModel)},
+     * In this sense, the method behaves in the same way as method {@link #asMapModel(OntModel)},
      * but does not return anything.
      * No changes to the input graph are made.
      *
      * @param g {@link Graph}, not {@code null}
      * @throws MapJenaException in case the given graph contains desired data, but it is corrupted
-     * @see #asMapModel(OntGraphModel)
+     * @see #asMapModel(OntModel)
      */
     void addGraph(Graph g) throws MapJenaException;
 
@@ -81,22 +81,22 @@ public interface MapManager {
      * Wraps the given ontology model into the map model interface.
      * If the specified model contains custom functions inside, they will be registered in the manager.
      *
-     * @param model {@link OntGraphModel}, not {@code null}
+     * @param model {@link OntModel}, not {@code null}
      * @return {@link MapModel}
      * @throws MapJenaException if such wrapping is not possible or the model contains broken functions
      * @see #addGraph(Graph)
      */
-    MapModel asMapModel(OntGraphModel model) throws MapJenaException;
+    MapModel asMapModel(OntModel model) throws MapJenaException;
 
     /**
      * Answers {@code true} if the given ontology model is also a mapping model,
-     * and therefore it can be safely wrapped as {@link MapModel} using the method {@link #asMapModel(OntGraphModel)}.
+     * and therefore it can be safely wrapped as {@link MapModel} using the method {@link #asMapModel(OntModel)}.
      *
-     * @param model {@link OntGraphModel}
+     * @param model {@link OntModel}
      * @return boolean indicating whether the ontology contains mapping specific elements
      * and therefore is assignable to the {@link MapModel mapping} interface
      */
-    boolean isMapModel(OntGraphModel model);
+    boolean isMapModel(OntModel model);
 
     /**
      * Provides a class-properties mapping,
@@ -111,10 +111,10 @@ public interface MapManager {
      * but such kind of mappings would be almost useless, since no individual property assertions would be inferred
      * in a valid OWL2 model.
      *
-     * @param model {@link OntGraphModel OWL model}
+     * @param model {@link OntModel OWL model}
      * @return {@link ClassPropertyMap class properties mapping object}
      */
-    ClassPropertyMap getClassProperties(OntGraphModel model);
+    ClassPropertyMap getClassProperties(OntModel model);
 
     /**
      * Gets an engine to conduct inference on top of the specified {@link MapModel Mapping Model}.

src/main/java/com/github/owlcs/map/MapModel.java

@@ -18,10 +18,10 @@
 
 package com.github.owlcs.map;
 
-import com.github.owlcs.ontapi.jena.model.OntCE;
-import com.github.owlcs.ontapi.jena.model.OntGraphModel;
+import com.github.owlcs.ontapi.jena.model.OntClass;
 import com.github.owlcs.ontapi.jena.model.OntID;
-import com.github.owlcs.ontapi.jena.model.OntOPE;
+import com.github.owlcs.ontapi.jena.model.OntModel;
+import com.github.owlcs.ontapi.jena.model.OntObjectProperty;
 import org.apache.jena.graph.Graph;
 
 import java.util.stream.Stream;
@@ -45,20 +45,20 @@ public interface MapModel {
     /**
      * Answers the OWL2 model which wraps the same mapping graph.
      *
-     * @return {@link OntGraphModel OWL2 jena model}
+     * @return {@link OntModel OWL2 jena model}
      */
-    OntGraphModel asGraphModel();
+    OntModel asGraphModel();
 
     /**
      * Lists all linked OWL2 ontologies,
      * i.e. all actual imports with exclusion of library
      * plus this mapping model itself if it has its own OWL-declarations.
      *
-     * @return Stream of linked ontologies in form of {@link OntGraphModel OWL2 jena model}s
-     * @see OntGraphModel#imports()
+     * @return Stream of linked ontologies in form of {@link OntModel OWL2 jena model}s
+     * @see OntModel#imports()
      * @see #asGraphModel()
      */
-    Stream<OntGraphModel> ontologies();
+    Stream<OntModel> ontologies();
 
     /**
      * Returns the manager with which this mapping model is associated.
@@ -79,11 +79,11 @@ public interface MapModel {
      * The specified class expressions can be anonymous,
      * since OWL2 allows individuals to be attached to any class expression.
      *
-     * @param source {@link OntCE} a source class expression
-     * @param target {@link OntCE} a target class expression
+     * @param source {@link OntClass} a source class expression
+     * @param target {@link OntClass} a target class expression
      * @return {@link MapContext} existing or fresh context
      */
-    MapContext createContext(OntCE source, OntCE target);
+    MapContext createContext(OntClass source, OntClass target);
 
     /**
      * Deletes the specified context and all related triples including property bindings.
@@ -107,7 +107,7 @@ public interface MapModel {
      * @param right {@link MapContext}
      * @return this model
      * @throws MapJenaException if something goes wrong
-     * @see MapContext#attachContext(MapContext, OntOPE)
+     * @see MapContext#attachContext(MapContext, OntObjectProperty)
      */
     MapModel bindContexts(MapContext left, MapContext right) throws MapJenaException;
 
@@ -145,14 +145,14 @@ default Stream<MapResource> rules() {
     /**
      * Creates a ready to use context.
      *
-     * @param source         {@link OntCE} a source class expression, not {@code null}
-     * @param target         {@link OntCE} a target class expression, not {@code null}
+     * @param source         {@link OntClass} a source class expression, not {@code null}
+     * @param target         {@link OntClass} a target class expression, not {@code null}
      * @param targetFunction {@link MapFunction.Builder}, not {@code null}
      * @return {@link MapContext} a new context instance
      * @throws MapJenaException if something goes wrong (e.g. not target function specified)
      */
-    default MapContext createContext(OntCE source,
-                                     OntCE target,
+    default MapContext createContext(OntClass source,
+                                     OntClass target,
                                      MapFunction.Builder targetFunction) throws MapJenaException {
         return createContext(source, target, targetFunction.build());
     }
@@ -161,14 +161,14 @@ default MapContext createContext(OntCE source,
     /**
      * Creates a ready to use context, i.e. a class expression binding with an target rule expression.
      *
-     * @param source         {@link OntCE} a source class expression, not {@code null}
-     * @param target         {@link OntCE} a target class expression, not {@code null}
+     * @param source         {@link OntClass} a source class expression, not {@code null}
+     * @param target         {@link OntClass} a target class expression, not {@code null}
      * @param targetFunction {@link MapFunction.Call}, not {@code null}
      * @return {@link MapContext} a new context instance
      * @throws MapJenaException if something goes wrong (e.g. not target function specified)
      */
-    default MapContext createContext(OntCE source,
-                                     OntCE target,
+    default MapContext createContext(OntClass source,
+                                     OntClass target,
                                      MapFunction.Call targetFunction) throws MapJenaException {
         return createContext(source, target).addClassBridge(targetFunction);
     }