Added $ldh:localGraph and $ldh:originalGraph as XSLT param documents, when are set by ProxyResourceBase (when ?uri query param is provided).

namedgraph · namedgraph · commit 669c3c727b09 · 2022-05-06T23:09:56.000+02:00
They allow distinguishing between triples coming from the local graph store and the remote document.
diff --git a/.dockerignore b/.dockerignore
@@ -1,10 +1,13 @@
+.git
+.github
 .env
 config
-hooks
-ssl
 data
+hooks
 http-tests
 node
 node_modules
+scripts
+ssl
 target
 uploads
diff --git a/src/main/java/com/atomgraph/linkeddatahub/server/filter/response/ProvenanceFilter.java b/src/main/java/com/atomgraph/linkeddatahub/server/filter/response/ProvenanceFilter.java
@@ -40,7 +40,7 @@
 
 /**
  * Records each HTTP interaction in a timestamped meta named graph.
- * The same logic can be found in Docker container's <code>split-default-graph.rq.template</code>.
+ * Currently unused.
  * 
  * @author {@literal Martynas Jusevičius <martynas@atomgraph.com>}
  */
diff --git a/src/main/java/com/atomgraph/linkeddatahub/server/model/impl/ProxyResourceBase.java b/src/main/java/com/atomgraph/linkeddatahub/server/model/impl/ProxyResourceBase.java
@@ -19,13 +19,16 @@
 import com.atomgraph.client.MediaTypes;
 import com.atomgraph.client.util.DataManager;
 import com.atomgraph.client.vocabulary.AC;
+import com.atomgraph.core.exception.BadGatewayException;
 import com.atomgraph.core.io.ModelProvider;
 import com.atomgraph.linkeddatahub.apps.model.Dataset;
 import com.atomgraph.linkeddatahub.client.filter.auth.IDTokenDelegationFilter;
 import com.atomgraph.linkeddatahub.client.filter.auth.WebIDDelegationFilter;
 import com.atomgraph.linkeddatahub.model.Agent;
+import com.atomgraph.linkeddatahub.model.Service;
 import com.atomgraph.linkeddatahub.server.security.AgentContext;
 import com.atomgraph.linkeddatahub.server.security.IDTokenSecurityContext;
+import com.atomgraph.linkeddatahub.vocabulary.LDH;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
@@ -42,6 +45,7 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
@@ -50,6 +54,8 @@
 import javax.ws.rs.core.SecurityContext;
 import javax.ws.rs.core.UriInfo;
 import javax.ws.rs.ext.Providers;
+import org.apache.jena.query.Query;
+import org.apache.jena.query.QueryFactory;
 import org.apache.jena.query.ResultSet;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
@@ -70,6 +76,8 @@ public class ProxyResourceBase extends com.atomgraph.client.model.impl.ProxyReso
     private static final Logger log = LoggerFactory.getLogger(ProxyResourceBase.class);
 
     private final UriInfo uriInfo;
+    private final ContainerRequestContext crc;
+    private final Service service;
     private final DataManager dataManager;
     private final MediaType[] readableMediaTypes;
     private final Providers providers;
@@ -82,7 +90,9 @@ public class ProxyResourceBase extends com.atomgraph.client.model.impl.ProxyReso
      * @param request current request
      * @param httpHeaders HTTP header info
      * @param mediaTypes registry of readable/writable media types
+     * @param service application's SPARQL service
      * @param securityContext JAX-RS security context
+     * @param crc request context
      * @param system system application
      * @param httpServletRequest servlet request
      * @param dataManager RDFdata manager
@@ -91,11 +101,13 @@ public class ProxyResourceBase extends com.atomgraph.client.model.impl.ProxyReso
      * @param dataset optional dataset
      */
     @Inject
-    public ProxyResourceBase(@Context UriInfo uriInfo, @Context Request request, @Context HttpHeaders httpHeaders, MediaTypes mediaTypes, @Context SecurityContext securityContext,
+    public ProxyResourceBase(@Context UriInfo uriInfo, @Context Request request, @Context HttpHeaders httpHeaders, MediaTypes mediaTypes,
+            Optional<Service> service,
+            @Context SecurityContext securityContext, @Context ContainerRequestContext crc,
             com.atomgraph.linkeddatahub.Application system, @Context HttpServletRequest httpServletRequest, DataManager dataManager, Optional<AgentContext> agentContext,
             @Context Providers providers, Optional<Dataset> dataset)
     {
-        this(uriInfo, request, httpHeaders, mediaTypes, securityContext,
+        this(uriInfo, request, httpHeaders, mediaTypes, service, securityContext, crc,
                 uriInfo.getQueryParameters().getFirst(AC.uri.getLocalName()) == null ? 
                     dataset.isEmpty() ? null : dataset.get().getProxied(uriInfo.getAbsolutePath())
                     :
@@ -113,7 +125,9 @@ public ProxyResourceBase(@Context UriInfo uriInfo, @Context Request request, @Co
      * @param request current request
      * @param httpHeaders HTTP header info
      * @param mediaTypes registry of readable/writable media types
+     * @param service application's SPARQL service
      * @param securityContext JAX-RS security context
+     * @param crc request context
      * @param uri <code>uri</code> URL param
      * @param endpoint <code>endpoint</code> URL param
      * @param accept <code>accept</code> URL param
@@ -124,13 +138,17 @@ public ProxyResourceBase(@Context UriInfo uriInfo, @Context Request request, @Co
      * @param agentContext authenticated agent's context
      * @param providers registry of JAX-RS providers
      */
-    protected ProxyResourceBase(@Context UriInfo uriInfo, @Context Request request, @Context HttpHeaders httpHeaders, MediaTypes mediaTypes, @Context SecurityContext securityContext,
+    protected ProxyResourceBase(@Context UriInfo uriInfo, @Context Request request, @Context HttpHeaders httpHeaders, MediaTypes mediaTypes,
+            Optional<Service> service,
+            @Context SecurityContext securityContext, @Context ContainerRequestContext crc,
             @QueryParam("uri") URI uri, @QueryParam("endpoint") URI endpoint, @QueryParam("accept") MediaType accept, @QueryParam("mode") URI mode,
             com.atomgraph.linkeddatahub.Application system, @Context HttpServletRequest httpServletRequest, DataManager dataManager, Optional<AgentContext> agentContext,
             @Context Providers providers)
     {
         super(uriInfo, request, httpHeaders, mediaTypes, uri, endpoint, accept, mode, system.getClient(), httpServletRequest);
         this.uriInfo = uriInfo;
+        this.service = service.get();
+        this.crc = crc;
         this.dataManager = dataManager;
         this.providers = providers;
         this.system = system;
@@ -186,7 +204,28 @@ public Response get(WebTarget target)
                 throw new BadRequestException(ex);
             }
 
-        return super.get(target);
+        Query query = QueryFactory.create("DESCRIBE <" + target.getUri() + ">");
+        Model localModel = getService().getSPARQLClient().loadModel(query);
+        getContainerRequestContext().setProperty(LDH.localGraph.getURI(), localModel);
+
+        try
+        {
+            Response response = super.get(target);
+            
+            if (response.getEntity() instanceof Model model)
+            {
+                getContainerRequestContext().setProperty(LDH.originalGraph.getURI(), ModelFactory.createDefaultModel().add(model)); // local model without the remote model
+                model.add(localModel); // append the local model to the remote model
+            }
+            
+            return response;
+        }
+        catch (BadGatewayException ex) // fallback to the local model in case of error
+        {
+            getContainerRequestContext().setProperty(LDH.originalGraph.getURI(), ModelFactory.createDefaultModel());
+            if (!localModel.isEmpty()) return getResponse(localModel);
+            else throw ex;
+        }
     }
     
     /**
@@ -242,6 +281,26 @@ public List<Locale> getLanguages()
         return getSystem().getSupportedLanguages();
     }
     
+    /**
+     * Returns the SPARQL service of the current application.
+     * 
+     * @return service resource
+     */
+    public Service getService()
+    {
+        return service;
+    }
+    
+    /**
+     * Returns request context.
+     * 
+     * @return request context
+     */
+    public ContainerRequestContext getContainerRequestContext()
+    {
+        return crc;
+    }
+    
     /**
      * Returns request URI information.
      * 
diff --git a/src/main/java/com/atomgraph/linkeddatahub/vocabulary/LDH.java b/src/main/java/com/atomgraph/linkeddatahub/vocabulary/LDH.java
@@ -106,5 +106,11 @@ public static String getURI()
     
     /** Create graph property */
     public static final DatatypeProperty createGraph = m_model.createDatatypeProperty( NS + "createGraph" );
+    
+    /** Local graph property */
+    public static final DatatypeProperty localGraph = m_model.createDatatypeProperty( NS + "localGraph" );
+
+    /** Original graph property */
+    public static final DatatypeProperty originalGraph = m_model.createDatatypeProperty( NS + "originalGraph" );
 
 }
diff --git a/src/main/java/com/atomgraph/linkeddatahub/writer/ModelXSLTWriterBase.java b/src/main/java/com/atomgraph/linkeddatahub/writer/ModelXSLTWriterBase.java
@@ -49,6 +49,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import javax.inject.Inject;
+import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.EntityTag;
 import javax.ws.rs.core.MediaType;
@@ -97,6 +98,7 @@ public abstract class ModelXSLTWriterBase extends com.atomgraph.client.writer.Mo
     @Inject javax.inject.Provider<DataManager> dataManager;
     @Inject javax.inject.Provider<XsltExecutableSupplier> xsltExecSupplier;
     @Inject javax.inject.Provider<List<Mode>> modes;
+    @Inject javax.inject.Provider<ContainerRequestContext> crc;
 
     private final MessageDigest messageDigest;
     
@@ -184,6 +186,15 @@ public <T extends XdmValue> Map<QName, XdmValue> getParameters(MultivaluedMap<St
                 params.put(new QName("", "", "Referer"), new XdmAtomicValue(referer)); // TO-DO: move to ac: namespace
             }
 
+            Object localModel = getContainerRequestContext().getProperty(LDH.localGraph.getURI());
+            if (localModel instanceof Model model)
+                params.put(new QName("ldh", LDH.localGraph.getNameSpace(), LDH.localGraph.getLocalName()),
+                    getXsltExecutable().getProcessor().newDocumentBuilder().build(getSource(model)));
+            Object originalModel = getContainerRequestContext().getProperty(LDH.originalGraph.getURI());
+            if (originalModel instanceof Model model)
+                params.put(new QName("ldh", LDH.originalGraph.getNameSpace(), LDH.originalGraph.getLocalName()),
+                    getXsltExecutable().getProcessor().newDocumentBuilder().build(getSource(model)));
+            
             params.put(new QName("ldhc", LDHC.webIDSignUp.getNameSpace(), LDHC.webIDSignUp.getLocalName()), new XdmAtomicValue(getSystem().isWebIDSignUp()));
             if (getSystem().getProperty(Google.clientID.getURI()) != null)
                 params.put(new QName("google", Google.clientID.getNameSpace(), Google.clientID.getLocalName()), new XdmAtomicValue((String)getSystem().getProperty(Google.clientID.getURI())));
@@ -364,4 +375,14 @@ public MessageDigest getMessageDigest()
         return messageDigest;
     }
     
+    /**
+     * Returns request context.
+     * 
+     * @return request context
+     */
+    public ContainerRequestContext getContainerRequestContext()
+    {
+        return crc.get();
+    }
+    
 }
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl
@@ -112,6 +112,8 @@ exclude-result-prefixes="#all">
     <xsl:param name="acl:agent" as="xs:anyURI?"/>
     <xsl:param name="acl:mode" select="$foaf:Agent[doc-available($ldh:absolutePath)]//*[acl:accessToClass/@rdf:resource = (key('resources', $ldh:absolutePath, document($ldh:absolutePath))/rdf:type/@rdf:resource, key('resources', $ldh:absolutePath, document($ldh:absolutePath))/rdf:type/@rdf:resource/ldh:listSuperClasses(.))]/acl:mode/@rdf:resource" as="xs:anyURI*"/>
     <xsl:param name="ldh:createGraph" select="false()" as="xs:boolean"/>
+    <xsl:param name="ldh:localGraph" as="document-node()?"/>
+    <xsl:param name="ldh:originalGraph" as="document-node()?"/>
     <xsl:param name="ldh:ajaxRendering" select="true()" as="xs:boolean"/> <!-- TO-DO: rename to ldhc:ajaxRendering? -->
     <xsl:param name="ldhc:webIDSignUp" as="xs:boolean"/>
     <xsl:param name="google:clientID" as="xs:string?"/>
@@ -803,13 +805,13 @@ exclude-result-prefixes="#all">
     <!-- don't show document-level tabs if the response returned an error or if we're in EditMode -->
     <xsl:template match="rdf:RDF[key('resources-by-type', '&http;Response')] | rdf:RDF[$ac:forClass or $ac:mode = '&ac;EditMode']" mode="bs2:ModeTabs" priority="1"/>
     
-    <xsl:template match="*[*][@rdf:about = ac:uri()]" mode="bs2:PropertyList">
-        <xsl:variable name="query-string" select="'DESCRIBE &lt;' || ac:uri() || '&gt;'" as="xs:string"/>
-        <xsl:variable name="local-doc" select="document(ac:build-uri($ac:endpoint, map{ 'query': $query-string }))"/>
+    <xsl:template match="*[*][@rdf:about = ac:uri()][$ldh:originalGraph][$ldh:localGraph]" mode="bs2:PropertyList">
+        <xsl:variable name="original-doc" select="$ldh:originalGraph"/>
+        <xsl:variable name="local-doc" select="$ldh:localGraph"/>
 
         <xsl:variable name="triples-original" as="map(xs:string, element())">
             <xsl:map>
-                <xsl:for-each select="*">
+                <xsl:for-each select="$original-doc/rdf:RDF/rdf:Description/*">
                     <xsl:map-entry key="concat(../@rdf:about, '|', namespace-uri(), local-name(), '|', @rdf:resource, @rdf:nodeID, if (text() castable as xs:float) then xs:float(text()) else text(), '|', @rdf:datatype, @xml:lang)" select="."/>
                 </xsl:for-each>
             </xsl:map>

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`
`41`	`41`	`/**`
`42`	`42`	`* Records each HTTP interaction in a timestamped meta named graph.`
`43`		`- * The same logic can be found in Docker container's <code>split-default-graph.rq.template</code>.`
	`43`	`+ * Currently unused.`
`44`	`44`	`*`
`45`	`45`	`* @author {@literal Martynas Jusevičius <martynas@atomgraph.com>}`
`46`	`46`	`*/`