ont-map: handle ont-api changes with system ont vocabulary (see owlcs/ont-api#4)

Author: sszuev

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

@@ -22,7 +22,6 @@
 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;
 import org.apache.jena.rdf.model.ResourceFactory;
@@ -387,14 +386,15 @@ interface Builder {
          * then it is assumed that it is a plain (string) literal,
          * 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 built-in datatypes
+         * the method {@link com.github.owlcs.ontapi.jena.OntVocabulary#getBuiltinDatatypes()} can be used.
          * 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}
          * @return this builder
          * @throws MapJenaException.IllegalArgument if input is wrong
-         * @see BuiltIn#get()
+         * @see com.github.owlcs.ontapi.jena.OntVocabulary.Factory#get()
          */
         Builder add(String predicate, String value) throws MapJenaException.IllegalArgument;
 

src/main/java/com/github/owlcs/map/spin/ValidationHelper.java

@@ -22,8 +22,8 @@
 import com.github.owlcs.map.MapJenaException;
 import com.github.owlcs.map.spin.vocabulary.AVC;
 import com.github.owlcs.map.utils.ModelUtils;
+import com.github.owlcs.ontapi.jena.OntVocabulary;
 import com.github.owlcs.ontapi.jena.model.*;
-import com.github.owlcs.ontapi.jena.utils.BuiltIn;
 import com.github.owlcs.ontapi.jena.utils.Iter;
 import com.github.owlcs.ontapi.jena.vocabulary.OWL;
 import com.github.owlcs.ontapi.jena.vocabulary.RDF;
@@ -255,7 +255,7 @@ void testValue() {
                 }
                 if (value.isURIResource()) {
                     //noinspection SuspiciousMethodCalls
-                    if (BuiltIn.get().reservedProperties().contains(value))
+                    if (OntVocabulary.Factory.get().getSystemProperties().contains(value))
                         return;
                     if (value.canAs(OntProperty.class))
                         return;

src/main/java/com/github/owlcs/map/utils/LocalClassPropertyMapImpl.java

@@ -19,11 +19,11 @@
 package com.github.owlcs.map.utils;
 
 import com.github.owlcs.map.ClassPropertyMap;
+import com.github.owlcs.ontapi.jena.OntVocabulary;
 import com.github.owlcs.ontapi.jena.model.OntClass;
 import com.github.owlcs.ontapi.jena.model.OntModel;
 import com.github.owlcs.ontapi.jena.model.OntObject;
 import com.github.owlcs.ontapi.jena.model.OntProperty;
-import com.github.owlcs.ontapi.jena.utils.BuiltIn;
 import org.apache.jena.rdf.model.Property;
 import org.apache.jena.rdf.model.Resource;
 
@@ -42,8 +42,8 @@
  */
 @SuppressWarnings("WeakerAccess")
 public class LocalClassPropertyMapImpl extends ClassPropertyMapImpl {
-    private static final Set<Property> BUILT_IN_PROPERTIES = BuiltIn.get().properties();
-    private static final Set<Resource> BUILT_IN_CLASSES = BuiltIn.get().classes();
+    private static final Set<Property> BUILT_IN_PROPERTIES = OntVocabulary.Factory.get().getBuiltinOWLProperties();
+    private static final Set<Resource> BUILT_IN_CLASSES = OntVocabulary.Factory.get().getBuiltinClasses();
 
     private final OntModel toSearch;
     private final OntModel model;