isOwner improvements

Author: namedgraph

src/main/java/com/atomgraph/linkeddatahub/resource/acl/Access.java

@@ -46,7 +46,6 @@
 import org.apache.jena.ontology.Ontology;
 import org.apache.jena.query.ParameterizedSparqlString;
 import org.apache.jena.query.Query;
-import org.apache.jena.query.QuerySolution;
 import org.apache.jena.query.QuerySolutionMap;
 import org.apache.jena.query.ResultSetRewindable;
 import org.apache.jena.rdf.model.Model;
@@ -162,48 +161,25 @@ public Response get(@QueryParam(QUERY) Query unused,
      */
     protected boolean isOwner(Resource accessTo, Resource agent)
     {
+        if (agent == null) return false;
+
         QuerySolutionMap qsm = new QuerySolutionMap();
         qsm.add(SPIN.THIS_VAR_NAME, accessTo);
+
         ParameterizedSparqlString pss = getDocumentOwnerQuery();
         pss.setParams(qsm);
 
-        ResultSetRewindable docOwnerResult = getEndpointAccessor().select(pss.asQuery(), List.of(), List.of());
-        //loadResultSet(getApplication().getService(), getDocumentOwnerQuery(), qsm); // could use ASK query in principle
+        ResultSetRewindable ownerResult = getEndpointAccessor().select(pss.asQuery(), List.of(), List.of());
         try
         {
-            return isOwner(docOwnerResult, agent);
+            return ownerResult.hasNext() && agent.equals(ownerResult.next().getResource("owner"));
         }
         finally
         {
-            docOwnerResult.close();
+            ownerResult.close();
         }
     }
 
-    /**
-     * Checks if the given agent is the <code>acl:owner</code> of the document.
-     * 
-     * @param docOwnerResult the result set containing document metadata
-     * @param agent the agent whose ownership is checked
-     * @return true if the agent is the owner, false otherwise.
-     */
-    protected boolean isOwner(ResultSetRewindable docOwnerResult, Resource agent)
-    {
-        if (docOwnerResult == null) throw new IllegalArgumentException("ResultSet cannot be null");
-        if (agent == null) throw new IllegalArgumentException("Agent resource cannot be null");
-
-        Resource owner = null;
-
-        while (docOwnerResult.hasNext())
-        {
-            QuerySolution qs = docOwnerResult.next();
-            if (owner == null && qs.contains("owner")) owner = qs.getResource("owner");
-        }
-
-        docOwnerResult.reset();
-
-        return owner != null && owner.equals(agent);
-    }
-    
     /**
      * Creates a special <code>acl:Authorization</code> resource for an owner.
      * @param accessTo requested URI

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

@@ -48,7 +48,6 @@
 import java.util.Set;
 import org.apache.jena.query.ParameterizedSparqlString;
 import org.apache.jena.query.Query;
-import org.apache.jena.query.QuerySolution;
 import org.apache.jena.query.QuerySolutionMap;
 import org.apache.jena.query.ResultSet;
 import org.apache.jena.query.ResultSetRewindable;
@@ -246,44 +245,24 @@ public Resource getAuthorizationByMode(Model authModel, Resource accessMode)
      */
     protected boolean isOwner(Resource accessTo, Resource agent)
     {
+        if (agent == null) return false;
+
         QuerySolutionMap qsm = new QuerySolutionMap();
         qsm.add(SPIN.THIS_VAR_NAME, accessTo);
 
-        ResultSetRewindable docOwnerResult = loadResultSet(getApplication().getService(), getDocumentOwnerQuery(), qsm); // could use ASK query in principle
+        ParameterizedSparqlString pss = getDocumentOwnerQuery();
+        pss.setParams(qsm);
+
+        ResultSetRewindable ownerResult = loadResultSet(getApplication().getService(), getDocumentOwnerQuery(), qsm); // could use ASK query in principle
         try
         {
-            return isOwner(docOwnerResult, agent);
+            return ownerResult.hasNext() && agent.equals(ownerResult.next().getResource("owner"));
         }
         finally
         {
-            docOwnerResult.close();
+            ownerResult.close();
         }
     }
-    
-    /**
-     * Checks if the given agent is the <code>acl:owner</code> of the document.
-     * 
-     * @param docOwnerResult the result set containing document metadata
-     * @param agent the agent whose ownership is checked
-     * @return true if the agent is the owner, false otherwise.
-     */
-    protected boolean isOwner(ResultSetRewindable docOwnerResult, Resource agent)
-    {
-        if (docOwnerResult == null) throw new IllegalArgumentException("ResultSet cannot be null");
-        if (agent == null) throw new IllegalArgumentException("Agent resource cannot be null");
-
-        Resource owner = null;
-
-        while (docOwnerResult.hasNext())
-        {
-            QuerySolution qs = docOwnerResult.next();
-            if (owner == null && qs.contains("owner")) owner = qs.getResource("owner");
-        }
-
-        docOwnerResult.reset();
-
-        return owner != null && owner.equals(agent);
-    }
 
     /**
      * Loads RDF graph from a service.