PATCH gets sent from settings form

Author: namedgraph

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

@@ -16,13 +16,21 @@
  */
 package com.atomgraph.linkeddatahub.resource;
 
+import com.atomgraph.core.util.ModelUtils;
 import com.atomgraph.linkeddatahub.apps.model.Application;
+import com.atomgraph.linkeddatahub.server.io.ValidatingModelProvider;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.BadRequestException;
 import jakarta.ws.rs.GET;
+import jakarta.ws.rs.InternalServerErrorException;
 import jakarta.ws.rs.NotFoundException;
 import jakarta.ws.rs.PATCH;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.EntityTag;
+import jakarta.ws.rs.core.Request;
 import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.MessageBodyReader;
+import jakarta.ws.rs.ext.Providers;
 import java.io.IOException;
 import org.apache.jena.query.Dataset;
 import org.apache.jena.query.DatasetFactory;
@@ -44,18 +52,24 @@ public class Settings
 
     private final Application application;
     private final com.atomgraph.linkeddatahub.Application system;
+    private final Providers providers;
+    private final Request request;
 
     /**
      * Constructs the Settings endpoint.
      *
      * @param application the current dataspace application
      * @param system the system application
+     * @param providers JAX-RS provider registry
+     * @param request JAX-RS request context
      */
     @Inject
-    public Settings(Application application, com.atomgraph.linkeddatahub.Application system)
+    public Settings(Application application, com.atomgraph.linkeddatahub.Application system, @Context Providers providers, @Context Request request)
     {
         this.application = application;
         this.system = system;
+        this.providers = providers;
+        this.request = request;
     }
 
     /**
@@ -76,7 +90,13 @@ public Response get()
 
         if (log.isDebugEnabled()) log.debug("Retrieved settings for dataspace <{}>", getApplication().getURI());
 
-        return Response.ok(dataspaceModel).build();
+        EntityTag entityTag = getEntityTag(dataspaceModel);
+        Response.ResponseBuilder rb = getRequest().evaluatePreconditions(entityTag);
+        if (rb != null) return rb.build();
+
+        return Response.ok(dataspaceModel).
+            tag(entityTag).
+            build();
     }
 
     /**
@@ -103,6 +123,16 @@ public Response patch(UpdateRequest updateRequest) throws IOException
         Dataset dataset = DatasetFactory.wrap(dataspaceModel);
         UpdateAction.execute(updateRequest, dataset);
 
+        // if PATCH results in an empty model, reject it as Bad Request
+        if (dataspaceModel.isEmpty())
+        {
+            if (log.isWarnEnabled()) log.warn("PATCH resulted in empty dataspace model for <{}>", getApplication().getURI());
+            throw new BadRequestException("PATCH cannot result in empty dataspace model");
+        }
+
+        // validate the updated model
+        validate(dataspaceModel);
+
         // Write the updated model back to the context dataset file
         getSystem().updateDataspace(getApplication(), dataspaceModel);
 
@@ -131,4 +161,49 @@ public com.atomgraph.linkeddatahub.Application getSystem()
         return system;
     }
 
+    /**
+     * Returns the JAX-RS providers registry.
+     *
+     * @return the providers
+     */
+    public Providers getProviders()
+    {
+        return providers;
+    }
+
+    /**
+     * Validates model against SPIN and SHACL constraints.
+     *
+     * @param model RDF model
+     * @return validated model
+     */
+    public Model validate(Model model)
+    {
+        MessageBodyReader<Model> reader = getProviders().getMessageBodyReader(Model.class, null, null, com.atomgraph.core.MediaType.APPLICATION_NTRIPLES_TYPE);
+        if (reader instanceof ValidatingModelProvider validatingModelProvider) return validatingModelProvider.processRead(model);
+
+        throw new InternalServerErrorException("Could not obtain ValidatingModelProvider instance");
+    }
+
+    /**
+     * Returns the JAX-RS request context.
+     *
+     * @return the request
+     */
+    public Request getRequest()
+    {
+        return request;
+    }
+
+    /**
+     * Generates an ETag for the given model.
+     *
+     * @param model RDF model
+     * @return entity tag
+     */
+    public EntityTag getEntityTag(Model model)
+    {
+        return new EntityTag(Long.toHexString(ModelUtils.hashModel(model)));
+    }
+
 }

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

@@ -457,7 +457,8 @@ WHERE
             </xsl:document>
         </xsl:variable>
         <xsl:sequence select="map:merge(($context, map{
-            'document': $document
+            'document': $document,
+            'action': if (map:contains($context, 'action')) then $context('action') else ldh:href(ac:absolute-path(ldh:base-uri($document)), map{})
         }), map{ 'duplicates': 'use-last' })"/>
     </xsl:function>
 
@@ -514,7 +515,7 @@ WHERE
         <xsl:variable name="shapes" select="$context('shapes')" as="document-node()"/>
         <xsl:variable name="object-metadata" select="$context('object-metadata')" as="document-node()?"/>
         <xsl:variable name="method" select="$context('method')" as="xs:string"/>
-        <xsl:variable name="action" select="ldh:href(ac:absolute-path(ldh:base-uri($document)), map{})" as="xs:anyURI"/>
+        <xsl:variable name="action" select="$context('action')" as="xs:anyURI"/>
 
         <xsl:for-each select="$block">
             <xsl:variable name="form" as="node()*">
@@ -652,13 +653,13 @@ WHERE
 
     <xsl:template match="div[contains-token(@class, 'modal-constructor')]//form[contains-token(@class, 'form-horizontal')][upper-case(@method) = 'PATCH']" mode="ixsl:onsubmit" priority="2">
         <xsl:param name="block" select="ancestor::div[contains-token(@class, 'modal-constructor')]" as="element()"/>
+        <xsl:param name="about" select="$block/@about" as="xs:anyURI"/>
         <xsl:sequence select="ixsl:call(ixsl:event(), 'preventDefault', [])"/>
         <xsl:variable name="form" select="." as="element()"/>
         <xsl:variable name="method" select="upper-case(@method)" as="xs:string"/>
         <xsl:variable name="id" select="ixsl:get($form, 'id')" as="xs:string"/>
         <xsl:variable name="action" select="ixsl:get($form, 'action')" as="xs:anyURI"/>
         <xsl:variable name="enctype" select="ixsl:get($form, 'enctype')" as="xs:string"/>
-        <xsl:variable name="about" select="$block/@about" as="xs:anyURI"/>
         <xsl:variable name="etag" select="ixsl:get(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || ac:absolute-path(ldh:base-uri(.)) || '`'), 'etag')" as="xs:string"/>
 
         <ixsl:set-style name="cursor" select="'progress'" object="ixsl:page()//body"/>

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

@@ -745,10 +745,10 @@ LIMIT   10
 
         <xsl:for-each select="$content-body">
             <xsl:result-document href="?." method="ixsl:append-content">
-                <div class="modal modal-constructor fade in">                
+                <div class="modal modal-constructor fade in" about="{$lapp:application}">
                     <div class="modal-header">
                         <button type="button" class="close">&#215;</button>
-                        
+
                         <legend>
                             <xsl:value-of>
                                 <xsl:apply-templates select="key('resources', 'application-settings', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $ac:contextUri)))" mode="ac:label"/>
@@ -770,7 +770,8 @@ LIMIT   10
             'request': $request,
             'block': $block,
             'about': $lapp:application,
-            'method': $method
+            'method': $method,
+            'action': resolve-uri('settings', ldt:base())
           }"/>
         <ixsl:promise select="
           ixsl:http-request($context('request'))