Core SNAPSHOT bump

Jena version bump to 6.0.0

Author: namedgraph

Dockerfile

@@ -1,4 +1,4 @@
-FROM maven:3.8.4-openjdk-17 AS maven
+FROM maven:3.9-eclipse-temurin-21 AS maven
 
 # download and extract Jena
 

src/main/java/com/atomgraph/linkeddatahub/client/SesameProtocolClient.java

@@ -123,7 +123,7 @@ public static MultivaluedMap<String, String> solutionMapToMultivaluedMap(QuerySo
         {
             String varName = it.next();
             RDFNode node = qsm.get(varName);
-            params.add("$" + varName, NodeFmtLib.str(node.asNode()));
+            params.add("$" + varName, NodeFmtLib.strNT(node.asNode()));
         }
 
         return params;

src/main/java/com/atomgraph/linkeddatahub/resource/Namespace.java

@@ -46,14 +46,12 @@
 import jakarta.ws.rs.core.Response.Status;
 import jakarta.ws.rs.core.SecurityContext;
 import jakarta.ws.rs.core.UriInfo;
-import org.apache.jena.iri.IRI;
-import org.apache.jena.iri.IRIFactory;
+import org.apache.jena.irix.IRIx;
 import org.apache.jena.ontology.Ontology;
 import org.apache.jena.query.DatasetFactory;
 import org.apache.jena.query.Query;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
-import org.apache.jena.riot.system.Checker;
 import org.apache.jena.update.UpdateRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -177,15 +175,12 @@ public Response post(UpdateRequest update, @QueryParam(USING_GRAPH_URI) List<URI
      * @param classIRIStr URI string
      * @return IRI
      */
-    public static IRI checkURI(String classIRIStr)
+    public static IRIx checkURI(String classIRIStr)
     {
         if (classIRIStr == null) throw new IllegalArgumentException("URI String cannot be null");
 
-        IRI classIRI = IRIFactory.iriImplementation().create(classIRIStr);
-        // throws Exceptions on bad URIs:
-        Checker.iriViolations(classIRI);
-
-        return classIRI;
+        // IRIx.create() validates and throws IRIException on bad URIs
+        return IRIx.create(classIRIStr);
     }
 
     /**

src/main/java/com/atomgraph/linkeddatahub/server/filter/request/OntologyFilter.java

@@ -173,7 +173,7 @@ public Ontology getOntology(Application app, String uri)
                     URI ontologyURI = URI.create(uri);
                     // remove fragment and normalize
                     URI ontDocURI = new URI(ontologyURI.getScheme(), ontologyURI.getSchemeSpecificPart(), null).normalize();
-                    Model baseModel = fileManager.loadModel(uri, ontDocURI.toString(), null);
+                    Model baseModel = fileManager.loadModel(ontDocURI.toString());
                     OntModel ontModel = ModelFactory.createOntologyModel(ontModelSpec, baseModel);
                     ontModel.getDocumentManager().addModel(uri, ontModel, true);
                 }

src/main/java/com/atomgraph/linkeddatahub/server/util/OntologyModelGetter.java

@@ -34,7 +34,7 @@
  * Application's ontology model getter.
  * Loads ontology model using the configured ontology query
  */
-public class OntologyModelGetter implements org.apache.jena.rdf.model.ModelGetter
+public class OntologyModelGetter implements org.apache.jena.ontology.models.ModelGetter
 {
 
     private static final Logger log = LoggerFactory.getLogger(OntologyModelGetter.class);

src/test/java/com/atomgraph/linkeddatahub/writer/function/ConstructTest.java

@@ -0,0 +1,117 @@
+/*
+ * Copyright 2025 Martynas Jusevičius <martynas@atomgraph.com>.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.atomgraph.linkeddatahub.writer.function;
+
+import java.io.StringWriter;
+import java.net.URI;
+import net.sf.saxon.s9api.Processor;
+import net.sf.saxon.s9api.Serializer;
+import net.sf.saxon.s9api.XdmAtomicValue;
+import net.sf.saxon.s9api.XdmMap;
+import net.sf.saxon.s9api.XdmValue;
+import org.apache.jena.query.QueryParseException;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.vocabulary.RDF;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+/**
+ * Unit tests for the {@link Construct} Saxon extension function.
+ *
+ * @author Martynas Jusevičius {@literal <martynas@atomgraph.com>}
+ */
+public class ConstructTest
+{
+
+    public static final String CLASS_URI = "http://test/ontology#MyClass";
+    public static final String PROP_URI = "http://test/ontology#prop";
+    public static final String VALUE_URI = "http://test/value";
+
+    public static final String CONSTRUCT_QUERY =
+        "CONSTRUCT { ?this <" + PROP_URI + "> <" + VALUE_URI + "> } WHERE {}";
+
+    private Processor processor;
+    private Construct construct;
+
+    @Before
+    public void setUp()
+    {
+        processor = new Processor(false);
+        construct = new Construct(processor);
+    }
+
+    private XdmMap buildMap(String classUri, String... queries) throws Exception
+    {
+        XdmMap map = new XdmMap();
+        XdmAtomicValue key = new XdmAtomicValue(new URI(classUri));
+        XdmValue value = new XdmValue(java.util.Arrays.stream(queries)
+            .map(XdmAtomicValue::new)
+            .collect(java.util.stream.Collectors.toList()));
+        return map.put(key, value);
+    }
+
+    private Model parseResult(XdmValue result) throws Exception
+    {
+        StringWriter sw = new StringWriter();
+        Serializer ser = processor.newSerializer(sw);
+        ser.serializeXdmValue(result);
+        Model model = ModelFactory.createDefaultModel();
+        model.read(new java.io.StringReader(sw.toString()), null, "RDF/XML");
+        return model;
+    }
+
+    @Test
+    public void testConstruct() throws Exception
+    {
+        XdmValue result = construct.call(new XdmValue[] { buildMap(CLASS_URI, CONSTRUCT_QUERY) });
+        Model model = parseResult(result);
+
+        assertTrue(model.contains(null, RDF.type, model.createResource(CLASS_URI)));
+        assertTrue(model.contains(null, model.createProperty(PROP_URI), model.createResource(VALUE_URI)));
+    }
+
+    @Test
+    public void testMultipleConstructors() throws Exception
+    {
+        String prop2 = "http://test/ontology#prop2";
+        String value2 = "http://test/value2";
+        String query2 = "CONSTRUCT { ?this <" + prop2 + "> <" + value2 + "> } WHERE {}";
+
+        XdmValue result = construct.call(new XdmValue[] { buildMap(CLASS_URI, CONSTRUCT_QUERY, query2) });
+        Model model = parseResult(result);
+
+        assertTrue(model.contains(null, model.createProperty(PROP_URI), model.createResource(VALUE_URI)));
+        assertTrue(model.contains(null, model.createProperty(prop2), model.createResource(value2)));
+    }
+
+    @Test
+    public void testEmptyMap() throws Exception
+    {
+        XdmValue result = construct.call(new XdmValue[] { new XdmMap() });
+        Model model = parseResult(result);
+
+        assertTrue(model.isEmpty());
+    }
+
+    @Test(expected = QueryParseException.class)
+    public void testInvalidSparql() throws Exception
+    {
+        construct.call(new XdmValue[] { buildMap(CLASS_URI, "NOT VALID SPARQL") });
+    }
+
+}