Additional javadocs

Author: acoburn

acp/src/main/java/com/inrupt/client/acp/Matcher.java

@@ -20,10 +20,10 @@
  */
 package com.inrupt.client.acp;
 
-import static com.inrupt.client.vocabulary.RDF.type;
+import static com.inrupt.client.acp.AccessControlResource.asIRI;
 
-import com.inrupt.client.spi.RDFFactory;
 import com.inrupt.client.vocabulary.ACP;
+import com.inrupt.client.vocabulary.RDF;
 import com.inrupt.rdf.wrapping.commons.TermMappings;
 import com.inrupt.rdf.wrapping.commons.ValueMappings;
 import com.inrupt.rdf.wrapping.commons.WrapperIRI;
@@ -33,48 +33,74 @@
 
 import org.apache.commons.rdf.api.Graph;
 import org.apache.commons.rdf.api.IRI;
-import org.apache.commons.rdf.api.RDF;
 import org.apache.commons.rdf.api.RDFTerm;
 
+/**
+ * A Matcher type for use with Access Control Policies.
+ *
+ * <p>A matcher is associated with {@link Policy} objects, defining
+ * agents, clients, issuers or verifiable credential (vc) types.
+ */
 public class Matcher extends WrapperIRI {
 
-    static final RDF rdf = RDFFactory.getInstance();
-
-    public Matcher(final RDFTerm original, final Graph graph) {
-        super(original, graph);
-        graph.add((IRI) original, rdf.createIRI(type.toString()), rdf.createIRI(ACP.Matcher.toString()));
+    /**
+     * Create a new Matcher.
+     *
+     * @param identifier the matcher identifier
+     * @param graph the underlying graph
+     */
+    public Matcher(final RDFTerm identifier, final Graph graph) {
+        super(identifier, graph);
+        graph.add((IRI) identifier, asIRI(RDF.type), asIRI(ACP.Matcher));
     }
 
+
+    /**
+     * Retrieve the acp:vc values.
+     *
+     * @return a collection of verifiable credential types
+     */
     public Set<URI> vc() {
-        return objects(rdf.createIRI(ACP.vc.toString()),
-                TermMappings::asIri, ValueMappings::iriAsUri);
+        return objects(asIRI(ACP.vc), TermMappings::asIri, ValueMappings::iriAsUri);
     }
 
+    /**
+     * Retrieve the acp:agent values.
+     *
+     * @return a collection of agent identifiers
+     */
     public Set<URI> agent() {
-        return objects(rdf.createIRI(ACP.agent.toString()),
-                TermMappings::asIri, ValueMappings::iriAsUri);
+        return objects(asIRI(ACP.agent), TermMappings::asIri, ValueMappings::iriAsUri);
     }
 
+    /**
+     * Retrieve the acp:client values.
+     *
+     * @return a collection of client identifiers
+     */
     public Set<URI> client() {
-        return objects(rdf.createIRI(ACP.client.toString()),
-                TermMappings::asIri, ValueMappings::iriAsUri);
+        return objects(asIRI(ACP.client), TermMappings::asIri, ValueMappings::iriAsUri);
     }
 
+    /**
+     * Retrieve the acp:issuer values.
+     *
+     * @return a collection of issuer identifiers
+     */
     public Set<URI> issuer() {
-        return objects(rdf.createIRI(ACP.issuer.toString()),
-                TermMappings::asIri, ValueMappings::iriAsUri);
+        return objects(asIRI(ACP.issuer), TermMappings::asIri, ValueMappings::iriAsUri);
     }
 
     static RDFTerm asResource(final Matcher matcher, final Graph graph) {
-        graph.add(matcher, rdf.createIRI(type.toString()), rdf.createIRI(ACP.Matcher.toString()));
+        graph.add(matcher, asIRI(RDF.type), asIRI(ACP.Matcher));
         matcher.vc().forEach(vc ->
-                graph.add(matcher, rdf.createIRI(ACP.vc.toString()), rdf.createIRI(vc.toString())));
+                graph.add(matcher, asIRI(ACP.vc), asIRI(vc)));
         matcher.agent().forEach(agent ->
-                graph.add(matcher, rdf.createIRI(ACP.agent.toString()), rdf.createIRI(agent.toString())));
+                graph.add(matcher, asIRI(ACP.agent), asIRI(agent)));
         matcher.client().forEach(client ->
-                graph.add(matcher, rdf.createIRI(ACP.client.toString()), rdf.createIRI(client.toString())));
+                graph.add(matcher, asIRI(ACP.client), asIRI(client)));
         matcher.issuer().forEach(issuer ->
-                graph.add(matcher, rdf.createIRI(ACP.issuer.toString()), rdf.createIRI(issuer.toString())));
+                graph.add(matcher, asIRI(ACP.issuer), asIRI(issuer)));
         return matcher;
     }
 }

acp/src/main/java/com/inrupt/client/acp/Policy.java

@@ -43,7 +43,8 @@
  */
 public class Policy extends WrapperIRI {
 
-    /** Create a new Policy.
+    /**
+     * Create a new Policy.
      *
      * @param identifier the policy identifier
      * @param graph the underlying graph for this resource

pom.xml

@@ -206,7 +206,7 @@
               <link>https://jena.apache.org/documentation/javadoc/arq/</link>
               <link>https://www.antlr.org/api/Java/</link>
               <link>https://rdf4j.org/javadoc/5.1.0/</link>
-              <link>http://www.javadoc.io/doc/com.fasterxml.jackson.core/jackson-databind/</link>
+              <link>http://www.javadoc.io/doc/com.fasterxml.jackson.core/jackson-databind/latest/</link>
             </links>
             <header>
               <![CDATA[