ont-api: remove deprecated methods where it is possible (Cache* configs, OntDT, OntologyManager)

Author: sszuev

src/main/java/com/github/owlcs/ontapi/OntologyManager.java

@@ -14,14 +14,14 @@
 
 package com.github.owlcs.ontapi;
 
-import org.apache.jena.graph.Graph;
-import org.semanticweb.owlapi.io.*;
-import org.semanticweb.owlapi.model.*;
-import org.semanticweb.owlapi.model.parameters.OntologyCopy;
 import com.github.owlcs.ontapi.config.OntConfig;
 import com.github.owlcs.ontapi.config.OntLoaderConfiguration;
 import com.github.owlcs.ontapi.config.OntWriterConfiguration;
 import com.github.owlcs.ontapi.jena.model.OntGraphModel;
+import org.apache.jena.graph.Graph;
+import org.semanticweb.owlapi.io.*;
+import org.semanticweb.owlapi.model.*;
+import org.semanticweb.owlapi.model.parameters.OntologyCopy;
 
 import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
@@ -499,45 +499,6 @@ default void clearIRIMappers() {
         getIRIMappers().clear();
     }
 
-    /**
-     * Returns document-source-mappings as stream.
-     * New (ONT-API) method.
-     *
-     * @return {@code Stream} of {@link DocumentSourceMapping}
-     * @since 1.0.1
-     * @deprecated use {@code getDocumentSourceMappers().stream()} instead
-     */
-    @Deprecated
-    default Stream<DocumentSourceMapping> documentSourceMappers() {
-        return getDocumentSourceMappers().stream();
-    }
-
-    /**
-     * Adds Document Source Mapping to the manager.
-     * New (ONT-API) method.
-     *
-     * @param mapper {@link DocumentSourceMapping}
-     * @since 1.0.1
-     * @deprecated use {@code getDocumentSourceMappers().add(mapper)} instead
-     */
-    @Deprecated
-    default void addDocumentSourceMapper(DocumentSourceMapping mapper) {
-        getDocumentSourceMappers().add(mapper);
-    }
-
-    /**
-     * Removes Document Source Mapping from the manager.
-     * New (ONT-API) method.
-     *
-     * @param mapper {@link DocumentSourceMapping}
-     * @since 1.0.1
-     * @deprecated use {@code getDocumentSourceMappers().remove(mapper)} instead
-     */
-    @Deprecated
-    default void removeDocumentSourceMapper(DocumentSourceMapping mapper) {
-        getDocumentSourceMappers().remove(mapper);
-    }
-
     /**
      * Sets the java.util.Set of OWL parsers into the manager.
      *

src/main/java/com/github/owlcs/ontapi/config/CacheControl.java

@@ -84,30 +84,4 @@ default R setModelCacheLevel(int constant, boolean b) {
         int current = getModelCacheLevel();
         return setModelCacheLevel(b ? current | constant : current & ~constant);
     }
-
-    /**
-     * Sets the model content cache level to the specified integer value.
-     *
-     * @param level non-negative integer
-     * @return {@link R}
-     * @deprecated since 1.4.2: use {@link #setModelCacheLevel(int)}
-     */
-    @Deprecated
-    default R setContentCacheLevel(int level) {
-        return setModelCacheLevel(level);
-    }
-
-    /**
-     * Turns on/off the content cache.
-     *
-     * @param b boolean
-     * @return {@link R}
-     * @see CacheSettings#useContentCache()
-     * @deprecated since 1.4.2: bad naming, use {@link #setModelCacheLevel(int, boolean)}
-     */
-    @Deprecated
-    default R setUseContentCache(boolean b) {
-        return setModelCacheLevel(CACHE_ALL, b);
-    }
-
 }

src/main/java/com/github/owlcs/ontapi/config/CacheSettings.java

@@ -210,49 +210,4 @@ default boolean useLoadNodesCache() {
     default boolean useLoadObjectsCache() {
         return getLoadObjectsCacheSize() > 0;
     }
-
-    /**
-     * Answers {@code true} iff the content caching is enabled.
-     *
-     * @return boolean
-     * @deprecated since 1.4.2: use {@link #useContentCache()} instead
-     */
-    @Deprecated
-    default boolean isContentCacheEnabled() {
-        return useContentCache();
-    }
-
-    /**
-     * Answers {@code true} iff iterator caching is enabled.
-     *
-     * @return boolean
-     * @deprecated since 1.4.2: use {@link #useIteratorCache()} instead
-     */
-    @Deprecated
-    default boolean useIteratorContentCache() {
-        return useIteratorCache();
-    }
-
-    /**
-     * Not supported anymore.
-     *
-     * @return boolean
-     * @deprecated since 1.4.2 - no such cache anymore
-     */
-    @Deprecated
-    default boolean useTriplesContentCache() {
-        throw new UnsupportedOperationException();
-    }
-
-
-    /**
-     * Gets the model content cache level.
-     *
-     * @return int
-     * @deprecated since 1.4.2 (bad naming): use {@link #getModelCacheLevel()}
-     */
-    @Deprecated
-    default int getContentCacheLevel() {
-        return getModelCacheLevel();
-    }
 }

src/main/java/com/github/owlcs/ontapi/jena/model/OntDT.java

@@ -14,12 +14,12 @@
 
 package com.github.owlcs.ontapi.jena.model;
 
+import com.github.owlcs.ontapi.jena.vocabulary.OWL;
 import org.apache.jena.datatypes.RDFDatatype;
 import org.apache.jena.datatypes.TypeMapper;
 import org.apache.jena.rdf.model.Literal;
 import org.apache.jena.rdf.model.RDFNode;
 import org.apache.jena.rdf.model.Resource;
-import com.github.owlcs.ontapi.jena.vocabulary.OWL;
 
 import java.util.Objects;
 import java.util.stream.Stream;
@@ -174,16 +174,4 @@ default OntDT annotate(OntNAP predicate, RDFNode value) {
         addAnnotation(predicate, value);
         return this;
     }
-
-    /**
-     * Lists all equivalent classes.
-     *
-     * @return {@code Stream} of equivalent {@link OntDR}s
-     * @deprecated since 1.4.2: use the method {@link #equivalentClasses()} instead
-     */
-    @Deprecated
-    default Stream<OntDR> equivalentClass() {
-        return equivalentClasses();
-    }
-
 }