Merge pull request #177 from jerdebsp/master

Pushed Jena version to 5.0.0 and updated Caching library

.github/workflows/docker-image.yml

@@ -25,10 +25,10 @@ jobs:
         include:
           - package: "x86_64"
             platform: linux/amd64
-            base: eclipse-temurin:11-alpine
+            base: eclipse-temurin:17-alpine
           - package: "arm64"
             platform: linux/arm64
-            base: amazoncorretto:11-alpine3.18-jdk
+            base: amazoncorretto:17-alpine3.18-jdk
 
     steps:
       - name: lowercase image name

.github/workflows/maven-test-pr.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
         with:
-          java-version: "11"
+          java-version: "17"
           distribution: "temurin"
 
       - name: Test with Maven

pom.xml

@@ -68,7 +68,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <ver.jena>4.10.0</ver.jena>
+    <ver.jena>5.0.0</ver.jena>
     <ver.junit>4.13.2</ver.junit>
     <ver.slf4j>1.7.36</ver.slf4j>
     <ver.log4j2>2.20.0</ver.log4j2>

src/main/java/org/topbraid/jenax/functions/AbstractFunction.java

@@ -31,6 +31,7 @@
 import org.apache.jena.sparql.function.Function;
 import org.apache.jena.sparql.function.FunctionEnv;
 import org.apache.jena.sparql.sse.SSE;
+import org.apache.jena.sparql.util.Context;
 import org.apache.jena.sparql.util.FmtUtils;
 import org.topbraid.jenax.statistics.ExecStatistics;
 import org.topbraid.jenax.statistics.ExecStatisticsManager;
@@ -44,10 +45,8 @@
 public abstract class AbstractFunction implements Function {
 
 	@Override
-    public void build(String uri, ExprList args) {
-	}
+	public void build(String var1, ExprList var2, Context var3){}
 
-
 	@Override
     public NodeValue exec(Binding binding, ExprList args, String uri, FunctionEnv env) {
 		Node[] nodes = new Node[args.size()];

src/main/java/org/topbraid/jenax/util/JenaUtil.java

@@ -29,8 +29,8 @@
 import java.util.function.BiFunction;
 
 import org.apache.jena.enhanced.EnhGraph;
-import org.apache.jena.graph.Factory;
 import org.apache.jena.graph.Graph;
+import org.apache.jena.graph.GraphMemFactory;
 import org.apache.jena.graph.Node;
 import org.apache.jena.graph.compose.MultiUnion;
 import org.apache.jena.ontology.OntModel;
@@ -78,6 +78,7 @@
 import org.apache.jena.sparql.syntax.syntaxtransform.ExprTransformNodeElement;
 import org.apache.jena.sparql.syntax.syntaxtransform.QueryTransformOps;
 import org.apache.jena.sparql.util.Context;
+import org.apache.jena.sparql.util.NodeCmp;
 import org.apache.jena.sparql.util.NodeFactoryExtra;
 import org.apache.jena.sparql.util.NodeUtils;
 import org.apache.jena.util.iterator.ExtendedIterator;
@@ -317,7 +318,7 @@ public static Model createDefaultModel() {
 	 * @return a new memory graph
 	 */
 	public static Graph createMemoryGraph() {
-		return Factory.createDefaultGraph();
+		return GraphMemFactory.createDefaultGraph();
 	}
 
 
@@ -1240,7 +1241,7 @@ public static void sort(List<Resource> nodes) {
 		Collections.sort(nodes, new Comparator<Resource>() {
 			@Override
 			public int compare(Resource o1, Resource o2) {
-		        return NodeUtils.compareRDFTerms(o1.asNode(), o2.asNode());
+		        return NodeCmp.compareRDFTerms(o1.asNode(), o2.asNode());
 			}
 		});
 	}

src/main/java/org/topbraid/jenax/util/JenaUtilHelper.java

@@ -18,14 +18,14 @@
 
 import java.util.Iterator;
 
-import org.apache.jena.graph.Factory;
 import org.apache.jena.graph.Graph;
 import org.apache.jena.graph.compose.MultiUnion;
 import org.apache.jena.mem.GraphMemBase;
 import org.apache.jena.ontology.OntModel;
 import org.apache.jena.ontology.OntModelSpec;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.sparql.graph.GraphFactory;
 
 /**
  * This is an extension point for the SPIN library
@@ -72,7 +72,7 @@ public MultiUnion createMultiUnion(Graph[] graphs) {
 	 * @return the default Graph
 	 */
 	public Graph createDefaultGraph() {
-		return Factory.createDefaultGraph();
+		return GraphFactory.createDefaultGraph();
 	}
 
 

src/main/java/org/topbraid/shacl/arq/SHACLARQFunction.java

@@ -102,12 +102,6 @@ protected void addParameters(SHParameterizable parameterizable) {
 		}
 	}
 
-
-	@Override
-    public void build(String uri, ExprList args) {
-	}
-
-
 	@Override
     public org.apache.jena.sparql.function.Function create(String uri) {
 		return this;

src/main/java/org/topbraid/shacl/arq/functions/SHACLSPARQLARQFunction.java

@@ -29,6 +29,7 @@
 import org.apache.jena.sparql.expr.ExprEvalException;
 import org.apache.jena.sparql.expr.ExprList;
 import org.apache.jena.sparql.expr.NodeValue;
+import org.apache.jena.sparql.util.Context;
 import org.topbraid.jenax.util.ARQFactory;
 import org.topbraid.jenax.util.DatasetWithDifferentDefaultModel;
 import org.topbraid.jenax.util.JenaUtil;
@@ -54,7 +55,10 @@ public class SHACLSPARQLARQFunction extends SHACLARQFunction {
 	private org.apache.jena.query.Query arqQuery;
 
 	private String queryString;
-
+
+	@Override
+	public void build(String var1, ExprList var2, Context var3) {
+	}
 
 	/**
 	 * Constructs a new SHACLSPARQLARQFunction based on a given sh:ConstraintComponent
@@ -106,11 +110,6 @@ public SHACLSPARQLARQFunction(SHSPARQLFunction shaclFunction) {
 
 		addParameters(shaclFunction);
 	}
-
-
-	@Override
-    public void build(String uri, ExprList args) {
-	}
 
 
 	@Override

src/main/java/org/topbraid/shacl/optimize/OntologyOptimizations.java

@@ -16,23 +16,22 @@
  */
 package org.topbraid.shacl.optimize;
 
-import com.github.jsonldjava.shaded.com.google.common.cache.Cache;
-import com.github.jsonldjava.shaded.com.google.common.cache.CacheBuilder;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.Cache;
+
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
 import java.util.function.Function;
 
 import org.apache.jena.graph.Graph;
 import org.apache.jena.graph.Node;
 import org.apache.jena.rdf.model.Model;
 import org.topbraid.jenax.util.ARQFactory;
-import org.topbraid.jenax.util.ExceptionUtil;
 import org.topbraid.jenax.util.JenaUtil;
 import org.topbraid.shacl.engine.ShapesGraph;
 import org.topbraid.shacl.engine.ShapesGraphFactory;
 
+
 /**
  * A singleton managing Ontology-based optimizations, to be used (for example) with OptimizedMultiUnions.
  * The contract is that such optimization Objects need to register themselves so that they can
@@ -79,37 +78,33 @@ public String getKeyIfEnabledFor(Graph graph) {
 	}
 
 	private static final int capacity = 10000;
-	
-	private Cache<Object,Object> cache = CacheBuilder.
-			newBuilder().
-			maximumSize(capacity).
-			build();
-	
-	
+
+	private Cache<Object, Object> cache = Caffeine
+			.newBuilder()
+			.maximumSize(capacity)
+			.build();
+
+
 	public ClassMetadata getClassMetadata(Node cls, Graph graph, String graphKey) {
 		Object cacheKey = ClassMetadata.createKey(cls, graphKey);
-		return (ClassMetadata) getOrComputeObject(cacheKey, () -> new ClassMetadata(cls, graphKey));
+
+		ClassMetadata cachedMetadata = (ClassMetadata) getOrComputeObject(cacheKey, (key) -> {
+			return new ClassMetadata((Node) key, graphKey);
+		});
+
+		return cachedMetadata;
 	}
-
-
+
+
+
 	public Object getObject(Object key) {
 		return cache.getIfPresent(key);
 	}
 
 
 	// Legacy version with Function parameter
 	public Object getOrComputeObject(Object key, Function<Object,Object> function) {
-		return getOrComputeObject(key, () -> function.apply(key));
-	}
-
-
-	public Object getOrComputeObject(Object key, Callable<Object> callable) {
-		try {
-			return cache.get(key, callable);
-		} catch (ExecutionException ex) {
-			log.error("Failed to populate OntologyOptimizations with key " + key, ex);
-			throw ExceptionUtil.throwUnchecked(ex);
-		}
+		return cache.get(key, function);
 	}
 
 	public ShapesGraph getCachableShapesGraph(String uri) {

src/main/java/org/topbraid/shacl/util/SHACLUtil.java

@@ -503,7 +503,7 @@ public static List<SHNodeShape> getAllShapesAtClassOrShape(Resource clsOrShape)
 		String key = OntologyOptimizations.get().getKeyIfEnabledFor(clsOrShape.getModel().getGraph());
 		if(key != null) {
 			key += ".getAllShapesAtClassOrShape(" + clsOrShape + ")";
-			return (List<SHNodeShape>) OntologyOptimizations.get().getOrComputeObject(key, () -> {				
+			return (List<SHNodeShape>) OntologyOptimizations.get().getOrComputeObject(key, (cacheKey) -> {
 				List<SHNodeShape> results = new LinkedList<SHNodeShape>();
 				addAllShapesAtClassOrShape(clsOrShape, results, new HashSet<Resource>());
 				return results;
@@ -515,8 +515,9 @@ public static List<SHNodeShape> getAllShapesAtClassOrShape(Resource clsOrShape)
 			return results;
 		}
 	}
-
-
+
+
+
 	private static void addAllShapesAtClassOrShape(Resource clsOrShape, List<SHNodeShape> results, Set<Resource> reached) {
 		addDirectShapesAtClassOrShape(clsOrShape, results);
 		reached.add(clsOrShape);