Namespace endpoint handles queries with relative URIs

The relative URIs are resolved against the endpoint URL as the base URI
HTTP tests included

Author: namedgraph

http-tests/sparql-protocol/query/GET-ns-relative-uri.sh

@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+initialize_dataset "$END_USER_BASE_URL" "$TMP_END_USER_DATASET" "$END_USER_ENDPOINT_URL"
+initialize_dataset "$ADMIN_BASE_URL" "$TMP_ADMIN_DATASET" "$ADMIN_ENDPOINT_URL"
+purge_cache "$END_USER_VARNISH_SERVICE"
+purge_cache "$ADMIN_VARNISH_SERVICE"
+purge_cache "$FRONTEND_VARNISH_SERVICE"
+
+# create class in the namespace ontology
+
+namespace_doc="${END_USER_BASE_URL}ns"
+namespace="${namespace_doc}#"
+ontology_doc="${ADMIN_BASE_URL}ontologies/namespace/"
+class="${namespace}NewClass"
+
+add-class.sh \
+  -f "$OWNER_CERT_FILE" \
+  -p "$OWNER_CERT_PWD" \
+  -b "$ADMIN_BASE_URL" \
+  --uri "$class" \
+  --label "New class" \
+  "$ontology_doc"
+
+# clear ontology from memory
+
+clear-ontology.sh \
+  -f "$OWNER_CERT_FILE" \
+  -p "$OWNER_CERT_PWD" \
+  -b "$ADMIN_BASE_URL" \
+  --ontology "$namespace"
+
+# query using relative URI - <#NewClass> should resolve to ${namespace_doc}#NewClass
+
+curl -k -s -G \
+  -E "$OWNER_CERT_FILE":"$OWNER_CERT_PWD" \
+  -H "Accept: application/sparql-results+xml" \
+  "${namespace_doc}" \
+  --data-urlencode "query=SELECT * { <#NewClass> ?p ?o }" \
+| grep '<literal>New class</literal>' > /dev/null

http-tests/sparql-protocol/query/POST-ns-relative-uri.sh

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+initialize_dataset "$END_USER_BASE_URL" "$TMP_END_USER_DATASET" "$END_USER_ENDPOINT_URL"
+initialize_dataset "$ADMIN_BASE_URL" "$TMP_ADMIN_DATASET" "$ADMIN_ENDPOINT_URL"
+purge_cache "$END_USER_VARNISH_SERVICE"
+purge_cache "$ADMIN_VARNISH_SERVICE"
+purge_cache "$FRONTEND_VARNISH_SERVICE"
+
+# create class in the namespace ontology
+
+namespace_doc="${END_USER_BASE_URL}ns"
+namespace="${namespace_doc}#"
+ontology_doc="${ADMIN_BASE_URL}ontologies/namespace/"
+class="${namespace}NewClass"
+
+add-class.sh \
+  -f "$OWNER_CERT_FILE" \
+  -p "$OWNER_CERT_PWD" \
+  -b "$ADMIN_BASE_URL" \
+  --uri "$class" \
+  --label "New class" \
+  "$ontology_doc"
+
+# clear ontology from memory
+
+clear-ontology.sh \
+  -f "$OWNER_CERT_FILE" \
+  -p "$OWNER_CERT_PWD" \
+  -b "$ADMIN_BASE_URL" \
+  --ontology "$namespace"
+
+# query using relative URI - <#NewClass> should resolve to ${namespace_doc}#NewClass
+
+curl -k -s -X POST \
+  -E "$OWNER_CERT_FILE":"$OWNER_CERT_PWD" \
+  -H "Accept: application/sparql-results+xml" \
+  -H "Content-Type: application/x-www-form-urlencoded" \
+  "${namespace_doc}" \
+  --data-urlencode "query=SELECT * { <#NewClass> ?p ?o }" \
+| grep '<literal>New class</literal>' > /dev/null

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

@@ -51,6 +51,7 @@
 import org.apache.jena.ontology.Ontology;
 import org.apache.jena.query.DatasetFactory;
 import org.apache.jena.query.Query;
+import org.apache.jena.query.QueryFactory;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
 import org.apache.jena.riot.system.Checker;
@@ -148,6 +149,8 @@ public Response get(@QueryParam(QUERY) Query query,
             else throw new BadRequestException("SPARQL query string not provided");
         }
 
+        // re-parse query to set explicit fallback base URI
+        query = QueryFactory.create(query.toString(), getUriInfo().getAbsolutePath().toString());
         return super.get(query, defaultGraphUris, namedGraphUris);
     }
 
@@ -160,6 +163,8 @@ public Response post(@FormParam(QUERY) String queryString, @FormParam(UPDATE) St
     {
         if (updateString != null) throw new WebApplicationException("SPARQL updates are not allowed on the <ns> endpoint", Status.METHOD_NOT_ALLOWED);
 
+        // re-parse query to set explicit fallback base URI
+        queryString = QueryFactory.create(queryString, getUriInfo().getAbsolutePath().toString()).toString();
         return super.post(queryString, updateString, defaultGraphUris, namedGraphUris, usingGraphUris, usingNamedGraphUris);
     }
 

src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl

@@ -100,7 +100,6 @@ exclude-result-prefixes="#all">
 
     <xsl:output method="xhtml" encoding="UTF-8" indent="yes" omit-xml-declaration="yes" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" media-type="application/xhtml+xml"/>
 
-<!--    <xsl:param name="ldh:base" as="xs:anyURI" static="yes"/>-->
     <xsl:param name="lapp:origin" as="xs:anyURI"/>
     <xsl:param name="ldh:requestUri" as="xs:anyURI"/>
     <xsl:param name="ac:endpoint" select="resolve-uri('sparql', $ldt:base)" as="xs:anyURI"/>