update Jena version to 4.8.0

changelog.txt

@@ -0,0 +1,21 @@
+Removing deprecated methods and objects
+
+- openllet.query.sparqldl.jena.SparqlDLStage
+StageGeneratorGenericStar was deprecated and has been replaced by StageGeneratorGeneric.
+
+- openllet.query.sparqldl.jena.SparqlDLResultSet
+org.apache.jena.sparql.engine.binding.BindingHashMap and BindingMap are deprecated in jena 4.2, Use {@link BindingBuilder}; avoid mutable bindings.
+
+- openllet.query.sparqldl.jena.JenaIOUtils
+import org.apache.jena.riot.resultset.rw.ResultsStAX no more exists. It is a parser
+for query results in XML format. Using ResultSetMgr.readBoolean instead.
+
+- openllet.test.query.TableResult2XML
+org.apache.jena.sparql.engine.binding.BindingUtils no more exists. It was already deprecated, Use BindingLib instead
+
+- openllet.jena.PelletReasoner
+org.apache.jena.reasoner.BaseInfGraph.InfFindSafeCapabilities no more exists.
+InfFindSafeCapabilities in jena 4.2 extends AllCapabilities but overriding to
+false sizeAccurate. Thus, InfFindSafeCapability instantiation has been replaced
+with capabilities created by AllCapabilities.create factory method, with
+sizeAccurate=false.

module-core/src/main/java/openllet/core/tableau/completion/rule/MaxCardinalityRule.java

@@ -53,7 +53,8 @@ public void apply(final Individual ind)
 		if (!ind.canApply(Node.MAX))
 			return;
 
-		final List<ATermAppl> maxCardinality = ind.getTypes(Node.MAX);
+		//use a copy of maxCardinality in order to avoid concurrent modification exception
+        final List<ATermAppl> maxCardinality = new ArrayList<>(ind.getTypes(Node.MAX));
 		for (final ATermAppl mc : maxCardinality)
 		{
 			applyMaxRule(ind, mc);

module-jena/src/main/java/openllet/jena/PelletInfGraph.java

@@ -35,7 +35,6 @@
 import java.util.Set;
 import java.util.logging.Logger;
 
-import org.apache.jena.graph.Factory;
 import org.apache.jena.graph.Graph;
 import org.apache.jena.graph.Node;
 import org.apache.jena.graph.Triple;
@@ -50,6 +49,7 @@
 import org.apache.jena.reasoner.StandardValidityReport;
 import org.apache.jena.reasoner.TriplePattern;
 import org.apache.jena.reasoner.ValidityReport;
+import org.apache.jena.sparql.graph.GraphFactory;
 import org.apache.jena.util.iterator.ExtendedIterator;
 import org.apache.jena.util.iterator.UniqueFilter;
 import org.apache.jena.vocabulary.OWL;
@@ -92,7 +92,7 @@ public class PelletInfGraph extends BaseInfGraph
 
 	public PelletInfGraph(final KnowledgeBase kb, final PelletReasoner pellet, final GraphLoader loader)
 	{
-		this(kb, Factory.createDefaultGraph(), pellet, loader);
+		this(kb, GraphFactory.createDefaultGraph(), pellet, loader);
 	}
 
 	public PelletInfGraph(final Graph graph, final PelletReasoner pellet, final GraphLoader loader)
@@ -382,7 +382,7 @@ public Graph explain(final Triple pattern)
 
 		prepare();
 
-		final Graph explanationGraph = Factory.createDefaultGraph();
+		final Graph explanationGraph = GraphFactory.createDefaultGraph();
 
 		_logger.fine(() -> "Explain " + pattern);
 

module-jena/src/main/java/openllet/jena/graph/loader/DefaultGraphLoader.java

@@ -52,11 +52,11 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.jena.graph.Factory;
 import org.apache.jena.graph.Graph;
 import org.apache.jena.graph.Node;
 import org.apache.jena.graph.Triple;
 import org.apache.jena.rdf.model.Property;
+import org.apache.jena.sparql.graph.GraphFactory;
 import org.apache.jena.util.iterator.ClosableIterator;
 import org.apache.jena.vocabulary.OWL;
 import org.apache.jena.vocabulary.RDF;
@@ -142,7 +142,7 @@ public class DefaultGraphLoader implements GraphLoader
 
 	private static final EnumSet<BuiltinTerm> OWL_MEMBERS_TYPES = EnumSet.of(BuiltinTerm.OWL_AllDifferent, BuiltinTerm.OWL2_AllDisjointClasses, BuiltinTerm.OWL2_AllDisjointProperties);
 
-	private static final Graph EMPTY_GRAPH = Factory.createGraphMem();
+	private static final Graph EMPTY_GRAPH = GraphFactory.createGraphMem();
 
 	public static QNameProvider _qnames = new QNameProvider();
 

module-jena/src/main/java/openllet/query/sparqldl/jena/JenaIOUtils.java

@@ -13,7 +13,8 @@
 import org.apache.jena.query.ResultSet;
 import org.apache.jena.query.ResultSetFactory;
 import org.apache.jena.rdf.model.ResourceFactory;
-import org.apache.jena.riot.resultset.rw.ResultsStAX;
+import org.apache.jena.riot.ResultSetMgr;
+import org.apache.jena.riot.resultset.ResultSetLang;
 import org.apache.jena.sparql.resultset.ResultsFormat;
 import org.apache.jena.util.FileManager;
 
@@ -76,7 +77,7 @@ public static boolean parseAskResult(final String resultURI) throws IOException
 		if (resultURI.endsWith("srx"))
 			try (var in = new FileInputStream(resultURI.substring(5)))
 			{
-				return ResultsStAX.read(in, null, null).getBooleanResult();
+				return ResultSetMgr.readBoolean(in, ResultSetLang.RS_XML);
 			}
 		else
 			if (resultURI.endsWith("ttl") || resultURI.endsWith("rdf"))

module-jena/src/main/java/openllet/query/sparqldl/jena/ResultSetImpl.java

@@ -0,0 +1,24 @@
+package openllet.query.sparqldl.jena;
+
+import org.apache.jena.query.QuerySolution;
+import org.apache.jena.query.ResultSet;
+
+import java.util.function.Consumer;
+
+/**
+ * @author Cristiano Longo
+ */
+public abstract class ResultSetImpl implements ResultSet {
+
+    @Override
+    public void forEachRemaining(Consumer<? super QuerySolution> consumer) {
+        while(hasNext())
+            consumer.accept(next());
+    }
+
+    @Override
+    public void close() {
+        // do nothing, override it if there are underlying resources that need to be closed
+    }
+
+}

module-jena/src/main/java/openllet/query/sparqldl/jena/SlicedResultSet.java

@@ -23,7 +23,7 @@
  *
  * @author Evren Sirin
  */
-public class SlicedResultSet implements ResultSet
+public class SlicedResultSet extends ResultSetImpl
 {
 	private final ResultSet _results;
 	private int _row;

module-jena/src/main/java/openllet/query/sparqldl/jena/SortedResultSet.java

@@ -29,7 +29,7 @@
  *
  * @author Evren Sirin
  */
-public class SortedResultSet implements ResultSet
+public class SortedResultSet extends ResultSetImpl
 {
 	private final List<Binding> sortedRows;
 	private final Iterator<Binding> iterator;