You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commonsrdf.apache.org by gg...@apache.org on 2016/11/11 22:50:49 UTC

[3/7] incubator-commonsrdf git commit: Add final modifier to method parameters.

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdIRI.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdIRI.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdIRI.java
index f7c1707..616ffc7 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdIRI.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdIRI.java
@@ -27,14 +27,14 @@ public interface JsonLdIRI extends JsonLdTerm, IRI {
 
 final class JsonLdIRIImpl extends JsonLdTermImpl implements JsonLdIRI {
 
-    JsonLdIRIImpl(Node node) {
+    JsonLdIRIImpl(final Node node) {
         super(node);
         if (!node.isIRI()) {
             throw new IllegalArgumentException("Node is not an IRI:" + node);
         }
     }
 
-    JsonLdIRIImpl(String iri) {
+    JsonLdIRIImpl(final String iri) {
         super(new RDFDataset.IRI(iri));
     }
 
@@ -54,7 +54,7 @@ final class JsonLdIRIImpl extends JsonLdTermImpl implements JsonLdIRI {
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (!(obj instanceof IRI)) {
             return false;
         }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java
index afb7da2..8155374 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java
@@ -31,7 +31,7 @@ public interface JsonLdLiteral extends JsonLdTerm, Literal {
 
 class JsonLdLiteralImpl extends JsonLdTermImpl implements JsonLdLiteral {
 
-    JsonLdLiteralImpl(Node node) {
+    JsonLdLiteralImpl(final Node node) {
         super(node);
         if (!node.isLiteral()) {
             throw new IllegalArgumentException("Node is not a Literal:" + node);
@@ -82,7 +82,7 @@ class JsonLdLiteralImpl extends JsonLdTermImpl implements JsonLdLiteral {
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (obj instanceof JsonLdLiteral) {
             JsonLdLiteral other = (JsonLdLiteral) obj;
             return asJsonLdNode().compareTo(other.asJsonLdNode()) == 0;

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuad.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuad.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuad.java
index 9b39514..3fe9a41 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuad.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuad.java
@@ -31,12 +31,12 @@ public interface JsonLdQuad extends org.apache.commons.rdf.api.Quad, JsonLdTripl
 final class JsonLdQuadImpl extends JsonLdQuadLikeImpl<BlankNodeOrIRI, IRI, RDFTerm, BlankNodeOrIRI>
         implements JsonLdQuad {
 
-    JsonLdQuadImpl(com.github.jsonldjava.core.RDFDataset.Quad quad, String blankNodePrefix) {
+    JsonLdQuadImpl(final com.github.jsonldjava.core.RDFDataset.Quad quad, final String blankNodePrefix) {
         super(quad, blankNodePrefix);
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (obj == this) {
             return true;
         }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.java
index 116873e..496bbad 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.java
@@ -38,7 +38,7 @@ class JsonLdQuadLikeImpl<S extends RDFTerm, P extends RDFTerm, O extends RDFTerm
     private final Quad quad;
     private final String blankNodePrefix;
 
-    JsonLdQuadLikeImpl(Quad jsonldQuad, String blankNodePrefix) {
+    JsonLdQuadLikeImpl(final Quad jsonldQuad, final String blankNodePrefix) {
         this.quad = jsonldQuad;
         this.blankNodePrefix = blankNodePrefix;
     }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDF.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDF.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDF.java
index 66b9f4b..a28984d 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDF.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDF.java
@@ -47,7 +47,7 @@ public final class JsonLdRDF implements RDF {
         this("urn:uuid:" + UUID.randomUUID() + "#b");
     }
 
-    JsonLdRDF(String bnodePrefix) {
+    JsonLdRDF(final String bnodePrefix) {
         this.bnodePrefix = Objects.requireNonNull(bnodePrefix);
     }
 
@@ -62,7 +62,7 @@ public final class JsonLdRDF implements RDF {
      *            JsonLd {@link RDFDataset} to adapt
      * @return Adapted {@link Dataset}
      */
-    public JsonLdDataset asDataset(RDFDataset rdfDataSet) {
+    public JsonLdDataset asDataset(final RDFDataset rdfDataSet) {
         return new JsonLdDatasetImpl(rdfDataSet);
     }
 
@@ -82,11 +82,11 @@ public final class JsonLdRDF implements RDF {
      *            JsonLd {@link RDFDataset} to adapt
      * @return Adapted {@link Graph} covering the <em>default graph</em>
      */
-    public JsonLdGraph asGraph(RDFDataset rdfDataSet) {
+    public JsonLdGraph asGraph(final RDFDataset rdfDataSet) {
         return new JsonLdGraphImpl(rdfDataSet);
     }
 
-    public Node asJsonLdNode(RDFTerm term) {
+    public Node asJsonLdNode(final RDFTerm term) {
         if (term instanceof JsonLdBlankNode) {
             JsonLdBlankNode jsonLdBlankNode = (JsonLdBlankNode) term;
             if (jsonLdBlankNode.uniqueReference().startsWith(bnodePrefix)) {
@@ -128,7 +128,7 @@ public final class JsonLdRDF implements RDF {
      *            Commons RDF {@link org.apache.commons.rdf.api.Quad} to adapt
      * @return Adapted JsonLd {@link com.github.jsonldjava.core.RDFDataset.Quad}
      */
-    public RDFDataset.Quad asJsonLdQuad(org.apache.commons.rdf.api.Quad quad) {
+    public RDFDataset.Quad asJsonLdQuad(final org.apache.commons.rdf.api.Quad quad) {
         BlankNodeOrIRI g = quad.getGraphName().orElse(null);
         return createJsonLdQuad(g, quad.getSubject(), quad.getPredicate(), quad.getObject());
     }
@@ -141,7 +141,7 @@ public final class JsonLdRDF implements RDF {
      *            Commons RDF {@link Triple} to adapt
      * @return Adapted JsonLd {@link com.github.jsonldjava.core.RDFDataset.Quad}
      */
-    public RDFDataset.Quad asJsonLdQuad(Triple triple) {
+    public RDFDataset.Quad asJsonLdQuad(final Triple triple) {
         return createJsonLdQuad(null, triple.getSubject(), triple.getPredicate(), triple.getObject());
     }
 
@@ -209,7 +209,7 @@ public final class JsonLdRDF implements RDF {
      *            JsonLd {@link RDFDataset} to adapt
      * @return Adapted {@link Dataset}
      */
-    public JsonLdUnionGraph asUnionGraph(RDFDataset rdfDataSet) {
+    public JsonLdUnionGraph asUnionGraph(final RDFDataset rdfDataSet) {
         return new JsonLdUnionGraphImpl(rdfDataSet);
     }
 
@@ -220,7 +220,7 @@ public final class JsonLdRDF implements RDF {
     }
 
     @Override
-    public JsonLdBlankNode createBlankNode(String name) {
+    public JsonLdBlankNode createBlankNode(final String name) {
         String id = "_:" + name;
         // TODO: Check if name is valid JSON-LD BlankNode identifier
         return new JsonLdBlankNodeImpl(new RDFDataset.BlankNode(id), bnodePrefix);
@@ -237,37 +237,37 @@ public final class JsonLdRDF implements RDF {
     }
 
     @Override
-    public JsonLdIRI createIRI(String iri) {
+    public JsonLdIRI createIRI(final String iri) {
         return new JsonLdIRIImpl(iri);
     }
 
     @Override
-    public JsonLdLiteral createLiteral(String literal) {
+    public JsonLdLiteral createLiteral(final String literal) {
         return new JsonLdLiteralImpl(new RDFDataset.Literal(literal, null, null));
     }
 
     @Override
-    public JsonLdLiteral createLiteral(String literal, IRI dataType) {
+    public JsonLdLiteral createLiteral(final String literal, final IRI dataType) {
         return new JsonLdLiteralImpl(new RDFDataset.Literal(literal, dataType.getIRIString(), null));
     }
 
     @Override
-    public JsonLdLiteral createLiteral(String literal, String language) {
+    public JsonLdLiteral createLiteral(final String literal, final String language) {
         return new JsonLdLiteralImpl(new RDFDataset.Literal(literal, Types.RDF_LANGSTRING.getIRIString(), language));
     }
 
     @Override
-    public JsonLdQuad createQuad(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object)
+    public JsonLdQuad createQuad(final BlankNodeOrIRI graphName, final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object)
             throws IllegalArgumentException, UnsupportedOperationException {
         return new JsonLdQuadImpl(createJsonLdQuad(graphName, subject, predicate, object), bnodePrefix);
     }
 
     @Override
-    public JsonLdTriple createTriple(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public JsonLdTriple createTriple(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         return new JsonLdTripleImpl(createJsonLdQuad(null, subject, predicate, object), bnodePrefix);
     }
 
-    String asJsonLdString(BlankNodeOrIRI blankNodeOrIRI) {
+    String asJsonLdString(final BlankNodeOrIRI blankNodeOrIRI) {
         if (blankNodeOrIRI == null) {
             return null;
         }
@@ -291,7 +291,7 @@ public final class JsonLdRDF implements RDF {
         }
     }
 
-    JsonLdTerm asRDFTerm(final Node node, String blankNodePrefix) {
+    JsonLdTerm asRDFTerm(final Node node, final String blankNodePrefix) {
         if (node == null) {
             return null; // e.g. default graph
         }
@@ -311,7 +311,7 @@ public final class JsonLdRDF implements RDF {
         }
     }
 
-    RDFDataset.Quad createJsonLdQuad(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    RDFDataset.Quad createJsonLdQuad(final BlankNodeOrIRI graphName, final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         return new RDFDataset.Quad(asJsonLdNode(subject), asJsonLdNode(predicate), asJsonLdNode(object),
                 asJsonLdString(graphName));
     }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTerm.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTerm.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTerm.java
index 3600a27..01f3ae0 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTerm.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTerm.java
@@ -34,7 +34,7 @@ public interface JsonLdTerm extends RDFTerm {
 abstract class JsonLdTermImpl implements JsonLdTerm {
     final Node node;
 
-    JsonLdTermImpl(Node node) {
+    JsonLdTermImpl(final Node node) {
         this.node = node;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTriple.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTriple.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTriple.java
index de880a8..727eb04 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTriple.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTriple.java
@@ -32,12 +32,12 @@ public interface JsonLdTriple extends Triple, JsonLdTripleLike {
 
 final class JsonLdTripleImpl extends JsonLdQuadLikeImpl<BlankNodeOrIRI, IRI, RDFTerm, RDFTerm> implements JsonLdTriple {
 
-    JsonLdTripleImpl(Quad quad, String blankNodePrefix) {
+    JsonLdTripleImpl(final Quad quad, final String blankNodePrefix) {
         super(quad, blankNodePrefix);
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (!(obj instanceof Triple)) {
             return false;
         }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java
index 5fafefd..7a4319a 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java
@@ -50,41 +50,41 @@ public interface JsonLdUnionGraph extends JsonLdGraphLike<org.apache.commons.rdf
 class JsonLdUnionGraphImpl extends AbstractJsonLdGraphLike<org.apache.commons.rdf.api.Triple>
         implements JsonLdUnionGraph {
 
-    JsonLdUnionGraphImpl(String bnodePrefix) {
+    JsonLdUnionGraphImpl(final String bnodePrefix) {
         super(bnodePrefix);
     }
 
-    JsonLdUnionGraphImpl(RDFDataset rdfDataSet) {
+    JsonLdUnionGraphImpl(final RDFDataset rdfDataSet) {
         super(rdfDataSet);
     }
 
-    JsonLdUnionGraphImpl(RDFDataset rdfDataSet, String bnodePrefix) {
+    JsonLdUnionGraphImpl(final RDFDataset rdfDataSet, final String bnodePrefix) {
         super(rdfDataSet, bnodePrefix);
     }
 
     @Override
-    public void add(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public void add(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         super.add(null, subject, predicate, object);
     }
 
     @Override
-    public boolean contains(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public boolean contains(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         return super.contains(null, subject, predicate, object);
     }
 
     @Override
-    public void remove(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public void remove(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         super.remove(null, subject, predicate, object);
     }
 
     @Override
-    public void remove(Triple t) {
+    public void remove(final Triple t) {
         // Remove from ALL graphs, not just default graph
         super.remove(null, t.getSubject(), t.getPredicate(), t.getObject());
     }
 
     @Override
-    public Stream<JsonLdTriple> stream(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public Stream<JsonLdTriple> stream(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         return filteredGraphs(null).flatMap(List::stream).filter(quadFilter(subject, predicate, object))
                 .map(factory::asTriple)
                 // Make sure we don't have duplicate triples
@@ -100,7 +100,7 @@ class JsonLdUnionGraphImpl extends AbstractJsonLdGraphLike<org.apache.commons.rd
     }
 
     @Override
-    JsonLdTriple asTripleOrQuad(com.github.jsonldjava.core.RDFDataset.Quad jsonldQuad) {
+    JsonLdTriple asTripleOrQuad(final com.github.jsonldjava.core.RDFDataset.Quad jsonldQuad) {
         return factory.asTriple(jsonldQuad);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/experimental/JsonLdParser.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/experimental/JsonLdParser.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/experimental/JsonLdParser.java
index f7ab4c8..94fd981 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/experimental/JsonLdParser.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/experimental/JsonLdParser.java
@@ -49,7 +49,7 @@ public class JsonLdParser extends AbstractRDFParser<JsonLdParser> {
     }
 
     @Override
-    public JsonLdParser contentType(RDFSyntax rdfSyntax) throws IllegalArgumentException {
+    public JsonLdParser contentType(final RDFSyntax rdfSyntax) throws IllegalArgumentException {
         if (rdfSyntax != null && rdfSyntax != RDFSyntax.JSONLD) {
             throw new IllegalArgumentException("Unsupported contentType: " + rdfSyntax);
         }
@@ -57,7 +57,7 @@ public class JsonLdParser extends AbstractRDFParser<JsonLdParser> {
     }
 
     @Override
-    public JsonLdParser contentType(String contentType) throws IllegalArgumentException {
+    public JsonLdParser contentType(final String contentType) throws IllegalArgumentException {
         JsonLdParser c = super.contentType(contentType);
         if (c.getContentType().filter(Predicate.isEqual(RDFSyntax.JSONLD).negate()).isPresent()) {
             throw new IllegalArgumentException("Unsupported contentType: " + contentType);
@@ -65,7 +65,7 @@ public class JsonLdParser extends AbstractRDFParser<JsonLdParser> {
         return c;
     }
 
-    private static URL asURL(IRI iri) throws IllegalStateException {
+    private static URL asURL(final IRI iri) throws IllegalStateException {
         try {
             return new URI(iri.getIRIString()).toURL();
         } catch (MalformedURLException | URISyntaxException e) {

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.java b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.java
index fce0893..f0baa64 100644
--- a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.java
+++ b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.java
@@ -34,7 +34,7 @@ public class JsonLdBlankNodeTest extends AbstractBlankNodeTest {
     }
 
     @Override
-    protected BlankNode getBlankNode(String identifier) {
+    protected BlankNode getBlankNode(final String identifier) {
         return new JsonLdBlankNodeImpl(new RDFDataset.BlankNode("_:" + identifier), fixedPrefix);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.java b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.java
index d6cda65..330447f 100644
--- a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.java
+++ b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.java
@@ -84,7 +84,7 @@ public class JsonLdParserBuilderTest {
         checkGraph(g);
     }
 
-    private void checkGraph(Graph g) {
+    private void checkGraph(final Graph g) {
         assertTrue(g.contains(test, type, Type));
         // Should not include statements from the named graph
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4J.java
----------------------------------------------------------------------
diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4J.java b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4J.java
index 8df26e0..e6f0db4 100644
--- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4J.java
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4J.java
@@ -142,7 +142,7 @@ public final class RDF4J implements RDF {
      * @param valueFactory
      *            The RDF4J {@link ValueFactory} to use
      */
-    public RDF4J(ValueFactory valueFactory) {
+    public RDF4J(final ValueFactory valueFactory) {
         this(valueFactory, UUID.randomUUID());
     }
 
@@ -157,7 +157,7 @@ public final class RDF4J implements RDF {
      *            {@link BlankNode}s for the purpose of
      *            {@link BlankNode#uniqueReference()}
      */
-    public RDF4J(UUID salt) {
+    public RDF4J(final UUID salt) {
         this(SimpleValueFactory.getInstance(), salt);
     }
 
@@ -174,7 +174,7 @@ public final class RDF4J implements RDF {
      *            {@link BlankNode}s for the purpose of
      *            {@link BlankNode#uniqueReference()}
      */
-    public RDF4J(ValueFactory valueFactory, UUID salt) {
+    public RDF4J(final ValueFactory valueFactory, final UUID salt) {
         this.valueFactory = valueFactory;
         this.salt = salt;
     }
@@ -228,7 +228,7 @@ public final class RDF4J implements RDF {
      * @throws IllegalArgumentException
      *             if the value is not a BNode, Literal or IRI
      */
-    public RDF4JTerm asRDFTerm(Value value) {
+    public RDF4JTerm asRDFTerm(final Value value) {
         return asRDFTerm(value, salt);
     }
 
@@ -255,7 +255,7 @@ public final class RDF4J implements RDF {
      * @throws IllegalArgumentException
      *             if the value is not a BNode, Literal or IRI
      */
-    public static RDF4JTerm asRDFTerm(final Value value, UUID salt) {
+    public static RDF4JTerm asRDFTerm(final Value value, final UUID salt) {
         if (value instanceof BNode) {
             return rdf4j.createBlankNodeImpl((BNode) value, salt);
         }
@@ -284,7 +284,7 @@ public final class RDF4J implements RDF {
      *            Zero or more {@link Option}
      * @return A {@link Dataset} backed by the RDF4J repository.
      */
-    public RDF4JDataset asDataset(Repository repository, Option... options) {
+    public RDF4JDataset asDataset(final Repository repository, final Option... options) {
         EnumSet<Option> opts = optionSet(options);
         return rdf4j.createRepositoryDatasetImpl(repository, opts.contains(Option.handleInitAndShutdown),
                 opts.contains(Option.includeInferred));
@@ -299,7 +299,7 @@ public final class RDF4J implements RDF {
      *            RDF4J {@link Model} to adapt.
      * @return Adapted {@link Graph}.
      */
-    public RDF4JGraph asGraph(Model model) {
+    public RDF4JGraph asGraph(final Model model) {
         return rdf4j.createModelGraphImpl(model, this);
     }
 
@@ -322,7 +322,7 @@ public final class RDF4J implements RDF {
      *            Zero or more {@link Option}
      * @return A {@link Graph} backed by the RDF4J repository.
      */
-    public RDF4JGraph asGraph(Repository repository, Option... options) {
+    public RDF4JGraph asGraph(final Repository repository, final Option... options) {
         EnumSet<Option> opts = optionSet(options);
         return rdf4j.createRepositoryGraphImpl(repository, opts.contains(Option.handleInitAndShutdown),
                 opts.contains(Option.includeInferred), new Resource[] { null }); // default
@@ -342,7 +342,7 @@ public final class RDF4J implements RDF {
      *            Zero or more {@link Option}
      * @return A union {@link Graph} backed by the RDF4J repository.
      */
-    public RDF4JGraph asGraphUnion(Repository repository, Option... options) {
+    public RDF4JGraph asGraphUnion(final Repository repository, final Option... options) {
         EnumSet<Option> opts = optionSet(options);
         return rdf4j.createRepositoryGraphImpl(repository, opts.contains(Option.handleInitAndShutdown),
                 opts.contains(Option.includeInferred), new Resource[] {}); // union
@@ -375,7 +375,7 @@ public final class RDF4J implements RDF {
      *            Zero or more {@link Option}s
      * @return A {@link Graph} backed by the RDF4J repository.
      */
-    public RDF4JGraph asGraph(Repository repository, Set<? extends BlankNodeOrIRI> contexts, Option... option) {
+    public RDF4JGraph asGraph(final Repository repository, final Set<? extends BlankNodeOrIRI> contexts, final Option... option) {
         EnumSet<Option> opts = optionSet(option);
         /** NOTE: asValue() deliberately CAN handle <code>null</code> */
         Resource[] resources = contexts.stream().map(g -> (Resource) asValue(g)).toArray(Resource[]::new);
@@ -398,7 +398,7 @@ public final class RDF4J implements RDF {
      *            A {@link Triple} or {@link Quad} to adapt
      * @return A corresponding {@link Statement}
      */
-    public Statement asStatement(TripleLike tripleLike) {
+    public Statement asStatement(final TripleLike tripleLike) {
         if (tripleLike instanceof RDF4JTripleLike) {
             // Return original statement - this covers both RDF4JQuad and
             // RDF4JTriple
@@ -462,7 +462,7 @@ public final class RDF4J implements RDF {
      *            RDFTerm to adapt to RDF4J Value
      * @return Adapted RDF4J {@link Value}
      */
-    public Value asValue(RDFTerm term) {
+    public Value asValue(final RDFTerm term) {
         if (term == null) {
             return null;
         }
@@ -503,7 +503,7 @@ public final class RDF4J implements RDF {
     }
 
     @Override
-    public RDF4JBlankNode createBlankNode(String name) {
+    public RDF4JBlankNode createBlankNode(final String name) {
         BNode bnode = getValueFactory().createBNode(name);
         return (RDF4JBlankNode) asRDFTerm(bnode);
     }
@@ -530,18 +530,18 @@ public final class RDF4J implements RDF {
     }
 
     @Override
-    public RDF4JIRI createIRI(String iri) throws IllegalArgumentException {
+    public RDF4JIRI createIRI(final String iri) throws IllegalArgumentException {
         return (RDF4JIRI) asRDFTerm(getValueFactory().createIRI(iri));
     }
 
     @Override
-    public RDF4JLiteral createLiteral(String lexicalForm) throws IllegalArgumentException {
+    public RDF4JLiteral createLiteral(final String lexicalForm) throws IllegalArgumentException {
         org.eclipse.rdf4j.model.Literal lit = getValueFactory().createLiteral(lexicalForm);
         return (RDF4JLiteral) asRDFTerm(lit);
     }
 
     @Override
-    public org.apache.commons.rdf.api.Literal createLiteral(String lexicalForm, org.apache.commons.rdf.api.IRI dataType)
+    public org.apache.commons.rdf.api.Literal createLiteral(final String lexicalForm, final org.apache.commons.rdf.api.IRI dataType)
             throws IllegalArgumentException {
         org.eclipse.rdf4j.model.IRI iri = getValueFactory().createIRI(dataType.getIRIString());
         org.eclipse.rdf4j.model.Literal lit = getValueFactory().createLiteral(lexicalForm, iri);
@@ -549,14 +549,14 @@ public final class RDF4J implements RDF {
     }
 
     @Override
-    public org.apache.commons.rdf.api.Literal createLiteral(String lexicalForm, String languageTag)
+    public org.apache.commons.rdf.api.Literal createLiteral(final String lexicalForm, final String languageTag)
             throws IllegalArgumentException {
         org.eclipse.rdf4j.model.Literal lit = getValueFactory().createLiteral(lexicalForm, languageTag);
         return (org.apache.commons.rdf.api.Literal) asRDFTerm(lit);
     }
 
     @Override
-    public RDF4JTriple createTriple(BlankNodeOrIRI subject, org.apache.commons.rdf.api.IRI predicate, RDFTerm object)
+    public RDF4JTriple createTriple(final BlankNodeOrIRI subject, final org.apache.commons.rdf.api.IRI predicate, final RDFTerm object)
             throws IllegalArgumentException {
         final Statement statement = getValueFactory().createStatement(
                 (org.eclipse.rdf4j.model.Resource) asValue(subject), (org.eclipse.rdf4j.model.IRI) asValue(predicate),
@@ -565,8 +565,8 @@ public final class RDF4J implements RDF {
     }
 
     @Override
-    public Quad createQuad(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, org.apache.commons.rdf.api.IRI predicate,
-            RDFTerm object) throws IllegalArgumentException {
+    public Quad createQuad(final BlankNodeOrIRI graphName, final BlankNodeOrIRI subject, final org.apache.commons.rdf.api.IRI predicate,
+            final RDFTerm object) throws IllegalArgumentException {
         final Statement statement = getValueFactory().createStatement(
                 (org.eclipse.rdf4j.model.Resource) asValue(subject), (org.eclipse.rdf4j.model.IRI) asValue(predicate),
                 asValue(object), (org.eclipse.rdf4j.model.Resource) asValue(graphName));
@@ -577,7 +577,7 @@ public final class RDF4J implements RDF {
         return valueFactory;
     }
 
-    private EnumSet<Option> optionSet(Option... options) {
+    private EnumSet<Option> optionSet(final Option... options) {
         EnumSet<Option> opts = EnumSet.noneOf(Option.class);
         opts.addAll(Arrays.asList(options));
         return opts;

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/experimental/RDF4JParser.java
----------------------------------------------------------------------
diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/experimental/RDF4JParser.java b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/experimental/RDF4JParser.java
index bbbda84..f88d597 100644
--- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/experimental/RDF4JParser.java
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/experimental/RDF4JParser.java
@@ -62,12 +62,12 @@ public class RDF4JParser extends AbstractRDFParser<RDF4JParser> implements RDFPa
     private final class AddToQuadConsumer extends AbstractRDFHandler {
         private final Consumer<Quad> quadTarget;
 
-        private AddToQuadConsumer(Consumer<Quad> quadTarget) {
+        private AddToQuadConsumer(final Consumer<Quad> quadTarget) {
             this.quadTarget = quadTarget;
         }
 
         @Override
-        public void handleStatement(org.eclipse.rdf4j.model.Statement st)
+        public void handleStatement(final org.eclipse.rdf4j.model.Statement st)
                 throws org.eclipse.rdf4j.rio.RDFHandlerException {
             // TODO: if getRdfTermFactory() is a non-rdf4j factory, should
             // we use factory.createQuad() instead?
@@ -87,18 +87,18 @@ public class RDF4JParser extends AbstractRDFParser<RDF4JParser> implements RDFPa
     private final static class AddToModel extends AbstractRDFHandler {
         private final Model model;
 
-        public AddToModel(Model model) {
+        public AddToModel(final Model model) {
             this.model = model;
         }
 
         @Override
-        public void handleStatement(org.eclipse.rdf4j.model.Statement st)
+        public void handleStatement(final org.eclipse.rdf4j.model.Statement st)
                 throws org.eclipse.rdf4j.rio.RDFHandlerException {
             model.add(st);
         }
 
         @Override
-        public void handleNamespace(String prefix, String uri) throws RDFHandlerException {
+        public void handleNamespace(final String prefix, final String uri) throws RDFHandlerException {
             model.setNamespace(prefix, uri);
         }
     }
@@ -187,7 +187,7 @@ public class RDF4JParser extends AbstractRDFParser<RDF4JParser> implements RDFPa
      * @param parserConfig
      *            Parser configuration
      */
-    public void setParserConfig(ParserConfig parserConfig) {
+    public void setParserConfig(final ParserConfig parserConfig) {
         this.parserConfig = parserConfig;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/AbstractRDFTerm.java
----------------------------------------------------------------------
diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/AbstractRDFTerm.java b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/AbstractRDFTerm.java
index 3262d01..ea847b0 100644
--- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/AbstractRDFTerm.java
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/AbstractRDFTerm.java
@@ -23,7 +23,7 @@ import org.eclipse.rdf4j.model.Value;
 abstract class AbstractRDFTerm<T extends Value> implements RDF4JTerm {
     T value;
 
-    AbstractRDFTerm(T value) {
+    AbstractRDFTerm(final T value) {
         this.value = value;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/AbstractRepositoryGraphLike.java
----------------------------------------------------------------------
diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/AbstractRepositoryGraphLike.java b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/AbstractRepositoryGraphLike.java
index 1a18557..21eef04 100644
--- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/AbstractRepositoryGraphLike.java
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/AbstractRepositoryGraphLike.java
@@ -36,8 +36,8 @@ abstract class AbstractRepositoryGraphLike<T extends TripleLike> implements RDF4
     protected final RDF4J rdf4jTermFactory;
     protected final UUID salt;
 
-    AbstractRepositoryGraphLike(Repository repository, UUID salt, boolean handleInitAndShutdown,
-            boolean includeInferred) {
+    AbstractRepositoryGraphLike(final Repository repository, final UUID salt, final boolean handleInitAndShutdown,
+            final boolean includeInferred) {
         this.repository = repository;
         this.salt = salt;
         this.includeInferred = includeInferred;

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/BlankNodeImpl.java
----------------------------------------------------------------------
diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/BlankNodeImpl.java b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/BlankNodeImpl.java
index 181a763..b1ae874 100644
--- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/BlankNodeImpl.java
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/BlankNodeImpl.java
@@ -31,7 +31,7 @@ final class BlankNodeImpl extends AbstractRDFTerm<BNode> implements RDF4JBlankNo
     private final long saltUUIDleast;
     private final long saltUUIDmost;
 
-    BlankNodeImpl(BNode bNode, UUID salt) {
+    BlankNodeImpl(final BNode bNode, final UUID salt) {
         super(bNode);
         // Space-efficient storage of salt UUID
         saltUUIDmost = salt.getMostSignificantBits();
@@ -39,7 +39,7 @@ final class BlankNodeImpl extends AbstractRDFTerm<BNode> implements RDF4JBlankNo
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (obj == this) {
             return true;
         }
@@ -60,7 +60,7 @@ final class BlankNodeImpl extends AbstractRDFTerm<BNode> implements RDF4JBlankNo
         return hashCode = uniqueReference().hashCode();
     }
 
-    private boolean isValidBlankNodeLabel(String id) {
+    private boolean isValidBlankNodeLabel(final String id) {
         // FIXME: Replace with a regular expression?
         if (id.isEmpty()) {
             return false;

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/ConvertedStatements.java
----------------------------------------------------------------------
diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/ConvertedStatements.java b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/ConvertedStatements.java
index f1089d7..6c3af99 100644
--- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/ConvertedStatements.java
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/ConvertedStatements.java
@@ -34,8 +34,8 @@ final class ConvertedStatements<T> implements ClosableIterable<T> {
     private final RepositoryResult<Statement> results;
     private final Function<Statement, T> statementAdapter;
 
-    ConvertedStatements(Supplier<RepositoryConnection> repositoryConnector, Function<Statement, T> statementAdapter,
-            Resource subj, org.eclipse.rdf4j.model.IRI pred, Value obj, Resource... contexts) {
+    ConvertedStatements(final Supplier<RepositoryConnection> repositoryConnector, final Function<Statement, T> statementAdapter,
+            final Resource subj, final org.eclipse.rdf4j.model.IRI pred, final Value obj, final Resource... contexts) {
         this.statementAdapter = statementAdapter;
         this.conn = repositoryConnector.get();
         this.results = conn.getStatements(subj, pred, obj, contexts);

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/IRIImpl.java
----------------------------------------------------------------------
diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/IRIImpl.java b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/IRIImpl.java
index 001919b..e92c03b 100644
--- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/IRIImpl.java
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/IRIImpl.java
@@ -21,12 +21,12 @@ import org.apache.commons.rdf.rdf4j.RDF4JIRI;
 
 final class IRIImpl extends AbstractRDFTerm<org.eclipse.rdf4j.model.IRI> implements RDF4JIRI {
 
-    IRIImpl(org.eclipse.rdf4j.model.IRI iri) {
+    IRIImpl(final org.eclipse.rdf4j.model.IRI iri) {
         super(iri);
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (obj == this) {
             return true;
         }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/InternalRDF4JFactory.java
----------------------------------------------------------------------
diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/InternalRDF4JFactory.java b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/InternalRDF4JFactory.java
index 25a7620..f344bf1 100644
--- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/InternalRDF4JFactory.java
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/InternalRDF4JFactory.java
@@ -66,7 +66,7 @@ public abstract class InternalRDF4JFactory {
      *            combination with {@link BNode#getID()}
      * @return Adapted {@link RDF4JBlankNode}
      */
-    public RDF4JBlankNode createBlankNodeImpl(BNode bNode, UUID salt) {
+    public RDF4JBlankNode createBlankNodeImpl(final BNode bNode, final UUID salt) {
         return new BlankNodeImpl(bNode, salt);
     }
 
@@ -77,7 +77,7 @@ public abstract class InternalRDF4JFactory {
      *            RDF4J {@link IRI} to adapt
      * @return Adapted {@link RDF4JIRI}
      */
-    public RDF4JIRI createIRIImpl(IRI iri) {
+    public RDF4JIRI createIRIImpl(final IRI iri) {
         return new IRIImpl(iri);
     }
 
@@ -88,7 +88,7 @@ public abstract class InternalRDF4JFactory {
      *            RDF4J {@link Literal}
      * @return Adapted {@link RDF4JLiteral}
      */
-    public RDF4JLiteral createLiteralImpl(Literal literal) {
+    public RDF4JLiteral createLiteralImpl(final Literal literal) {
         return new LiteralImpl(literal);
     }
 
@@ -103,7 +103,7 @@ public abstract class InternalRDF4JFactory {
      *            factory to use for adapting graph triples
      * @return Adapted {@link RDF4JGraph}
      */
-    public RDF4JGraph createModelGraphImpl(Model model, RDF4J rdf4jTermFactory) {
+    public RDF4JGraph createModelGraphImpl(final Model model, final RDF4J rdf4jTermFactory) {
         return new ModelGraphImpl(model, rdf4jTermFactory);
     }
 
@@ -116,7 +116,7 @@ public abstract class InternalRDF4JFactory {
      *            {@link UUID} for adapting any {@link BNode}s
      * @return Adapted {@link RDF4JQuad}
      */
-    public RDF4JQuad createQuadImpl(Statement statement, UUID salt) {
+    public RDF4JQuad createQuadImpl(final Statement statement, final UUID salt) {
         return new QuadImpl(statement, salt);
     }
 
@@ -137,8 +137,8 @@ public abstract class InternalRDF4JFactory {
      * 
      * @return Adapted {@link RDF4JDataset}
      */
-    public RDF4JDataset createRepositoryDatasetImpl(Repository repository, boolean handleInitAndShutdown,
-            boolean includeInferred) {
+    public RDF4JDataset createRepositoryDatasetImpl(final Repository repository, final boolean handleInitAndShutdown,
+            final boolean includeInferred) {
         return new RepositoryDatasetImpl(repository, UUID.randomUUID(), handleInitAndShutdown, includeInferred);
     }
 
@@ -162,8 +162,8 @@ public abstract class InternalRDF4JFactory {
      *            <code>(Resource[]) null</code>.
      * @return Adapted {@link RDF4JGraph}
      */
-    public RDF4JGraph createRepositoryGraphImpl(Repository repository, boolean handleInitAndShutdown,
-            boolean includeInferred, Resource... contextMask) {
+    public RDF4JGraph createRepositoryGraphImpl(final Repository repository, final boolean handleInitAndShutdown,
+            final boolean includeInferred, final Resource... contextMask) {
         return new RepositoryGraphImpl(repository, UUID.randomUUID(), handleInitAndShutdown, includeInferred,
                 contextMask);
     }
@@ -177,7 +177,7 @@ public abstract class InternalRDF4JFactory {
      *            {@link UUID} for adapting any {@link BNode}s
      * @return Adapted {@link RDF4JTriple}
      */
-    public RDF4JTriple createTripleImpl(Statement statement, UUID salt) {
+    public RDF4JTriple createTripleImpl(final Statement statement, final UUID salt) {
         return new TripleImpl(statement, salt);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/LiteralImpl.java
----------------------------------------------------------------------
diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/LiteralImpl.java b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/LiteralImpl.java
index 487cc9b..2dcbb43 100644
--- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/LiteralImpl.java
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/LiteralImpl.java
@@ -28,12 +28,12 @@ final class LiteralImpl extends AbstractRDFTerm<org.eclipse.rdf4j.model.Literal>
 
     private static final String QUOTE = "\"";
 
-    LiteralImpl(org.eclipse.rdf4j.model.Literal literal) {
+    LiteralImpl(final org.eclipse.rdf4j.model.Literal literal) {
         super(literal);
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (obj == this) {
             return true;
         }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/ModelGraphImpl.java
----------------------------------------------------------------------
diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/ModelGraphImpl.java b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/ModelGraphImpl.java
index ad1ed69..1239e59 100644
--- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/ModelGraphImpl.java
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/ModelGraphImpl.java
@@ -42,19 +42,19 @@ final class ModelGraphImpl implements RDF4JGraph {
     private final Model model;
     private final RDF4J rdf4jTermFactory;
 
-    ModelGraphImpl(Model model, RDF4J rdf4jTermFactory) {
+    ModelGraphImpl(final Model model, final RDF4J rdf4jTermFactory) {
         this.model = model;
         this.rdf4jTermFactory = rdf4jTermFactory;
     }
 
     @Override
-    public void add(BlankNodeOrIRI subject, org.apache.commons.rdf.api.IRI predicate, RDFTerm object) {
+    public void add(final BlankNodeOrIRI subject, final org.apache.commons.rdf.api.IRI predicate, final RDFTerm object) {
         model.add((Resource) rdf4jTermFactory.asValue(subject),
                 (org.eclipse.rdf4j.model.IRI) rdf4jTermFactory.asValue(predicate), rdf4jTermFactory.asValue(object));
     }
 
     @Override
-    public void add(Triple triple) {
+    public void add(final Triple triple) {
         model.add(rdf4jTermFactory.asStatement(triple));
     }
 
@@ -74,24 +74,24 @@ final class ModelGraphImpl implements RDF4JGraph {
     }
 
     @Override
-    public boolean contains(BlankNodeOrIRI subject, org.apache.commons.rdf.api.IRI predicate, RDFTerm object) {
+    public boolean contains(final BlankNodeOrIRI subject, final org.apache.commons.rdf.api.IRI predicate, final RDFTerm object) {
         return model.contains((Resource) rdf4jTermFactory.asValue(subject),
                 (org.eclipse.rdf4j.model.IRI) rdf4jTermFactory.asValue(predicate), rdf4jTermFactory.asValue(object));
     }
 
     @Override
-    public boolean contains(Triple triple) {
+    public boolean contains(final Triple triple) {
         return model.contains(rdf4jTermFactory.asStatement(triple));
     }
 
     @Override
-    public void remove(BlankNodeOrIRI subject, org.apache.commons.rdf.api.IRI predicate, RDFTerm object) {
+    public void remove(final BlankNodeOrIRI subject, final org.apache.commons.rdf.api.IRI predicate, final RDFTerm object) {
         model.remove((Resource) rdf4jTermFactory.asValue(subject),
                 (org.eclipse.rdf4j.model.IRI) rdf4jTermFactory.asValue(predicate), rdf4jTermFactory.asValue(object));
     }
 
     @Override
-    public void remove(Triple triple) {
+    public void remove(final Triple triple) {
         model.remove(rdf4jTermFactory.asStatement(triple));
     }
 
@@ -113,8 +113,8 @@ final class ModelGraphImpl implements RDF4JGraph {
     }
 
     @Override
-    public Stream<RDF4JTriple> stream(BlankNodeOrIRI subject, org.apache.commons.rdf.api.IRI predicate,
-            RDFTerm object) {
+    public Stream<RDF4JTriple> stream(final BlankNodeOrIRI subject, final org.apache.commons.rdf.api.IRI predicate,
+            final RDFTerm object) {
         return model.filter((Resource) rdf4jTermFactory.asValue(subject),
                 (org.eclipse.rdf4j.model.IRI) rdf4jTermFactory.asValue(predicate), rdf4jTermFactory.asValue(object))
                 .parallelStream().map(rdf4jTermFactory::asTriple);
@@ -128,7 +128,7 @@ final class ModelGraphImpl implements RDF4JGraph {
     }
 
     @Override
-    public ClosableIterable<Triple> iterate(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public ClosableIterable<Triple> iterate(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         return new ClosableIterable<Triple>() {
             @SuppressWarnings("unchecked")
             @Override

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/QuadImpl.java
----------------------------------------------------------------------
diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/QuadImpl.java b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/QuadImpl.java
index 5dc36c4..c1e8a25 100644
--- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/QuadImpl.java
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/QuadImpl.java
@@ -34,7 +34,7 @@ final class QuadImpl implements Quad, RDF4JQuad {
     private final UUID salt;
     private final Statement statement;
 
-    QuadImpl(Statement statement, UUID salt) {
+    QuadImpl(final Statement statement, final UUID salt) {
         this.statement = statement;
         this.salt = salt;
     }
@@ -50,7 +50,7 @@ final class QuadImpl implements Quad, RDF4JQuad {
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (obj instanceof Quad) {
             Quad quad = (Quad) obj;
             return getGraphName().equals(quad.getGraphName()) &&

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/RepositoryDatasetImpl.java
----------------------------------------------------------------------
diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/RepositoryDatasetImpl.java b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/RepositoryDatasetImpl.java
index 4d6b5b8..7241e3e 100644
--- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/RepositoryDatasetImpl.java
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/RepositoryDatasetImpl.java
@@ -41,12 +41,12 @@ import org.eclipse.rdf4j.repository.RepositoryResult;
 
 class RepositoryDatasetImpl extends AbstractRepositoryGraphLike<Quad> implements RDF4JDataset, Dataset {
 
-    RepositoryDatasetImpl(Repository repository, UUID salt, boolean handleInitAndShutdown, boolean includeInferred) {
+    RepositoryDatasetImpl(final Repository repository, final UUID salt, final boolean handleInitAndShutdown, final boolean includeInferred) {
         super(repository, salt, handleInitAndShutdown, includeInferred);
     }
 
     @Override
-    public void add(Quad tripleLike) {
+    public void add(final Quad tripleLike) {
         Statement statement = rdf4jTermFactory.asStatement(tripleLike);
         try (RepositoryConnection conn = getRepositoryConnection()) {
             conn.add(statement);
@@ -55,7 +55,7 @@ class RepositoryDatasetImpl extends AbstractRepositoryGraphLike<Quad> implements
     }
 
     @Override
-    public boolean contains(Quad tripleLike) {
+    public boolean contains(final Quad tripleLike) {
         Statement statement = rdf4jTermFactory.asStatement(tripleLike);
         try (RepositoryConnection conn = getRepositoryConnection()) {
             return conn.hasStatement(statement, includeInferred);
@@ -63,7 +63,7 @@ class RepositoryDatasetImpl extends AbstractRepositoryGraphLike<Quad> implements
     }
 
     @Override
-    public void remove(Quad tripleLike) {
+    public void remove(final Quad tripleLike) {
         Statement statement = rdf4jTermFactory.asStatement(tripleLike);
         try (RepositoryConnection conn = getRepositoryConnection()) {
             conn.remove(statement);
@@ -92,7 +92,7 @@ class RepositoryDatasetImpl extends AbstractRepositoryGraphLike<Quad> implements
     }
 
     @Override
-    public void add(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public void add(final BlankNodeOrIRI graphName, final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         Resource context = (Resource) rdf4jTermFactory.asValue(graphName);
         Resource subj = (Resource) rdf4jTermFactory.asValue(subject);
         org.eclipse.rdf4j.model.IRI pred = (org.eclipse.rdf4j.model.IRI) rdf4jTermFactory.asValue(predicate);
@@ -104,7 +104,7 @@ class RepositoryDatasetImpl extends AbstractRepositoryGraphLike<Quad> implements
     }
 
     @Override
-    public boolean contains(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public boolean contains(final Optional<BlankNodeOrIRI> graphName, final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         Resource subj = (Resource) rdf4jTermFactory.asValue(subject);
         org.eclipse.rdf4j.model.IRI pred = (org.eclipse.rdf4j.model.IRI) rdf4jTermFactory.asValue(predicate);
         Value obj = rdf4jTermFactory.asValue(object);
@@ -114,7 +114,7 @@ class RepositoryDatasetImpl extends AbstractRepositoryGraphLike<Quad> implements
         }
     }
 
-    private Resource[] asContexts(Optional<BlankNodeOrIRI> graphName) {
+    private Resource[] asContexts(final Optional<BlankNodeOrIRI> graphName) {
         Resource[] contexts;
         if (graphName == null) {
             // no contexts == any contexts
@@ -128,7 +128,7 @@ class RepositoryDatasetImpl extends AbstractRepositoryGraphLike<Quad> implements
     }
 
     @Override
-    public void remove(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public void remove(final Optional<BlankNodeOrIRI> graphName, final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         Resource subj = (Resource) rdf4jTermFactory.asValue(subject);
         org.eclipse.rdf4j.model.IRI pred = (org.eclipse.rdf4j.model.IRI) rdf4jTermFactory.asValue(predicate);
         Value obj = rdf4jTermFactory.asValue(object);
@@ -146,8 +146,8 @@ class RepositoryDatasetImpl extends AbstractRepositoryGraphLike<Quad> implements
     }
 
     @Override
-    public Stream<RDF4JQuad> stream(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI subject, IRI predicate,
-            RDFTerm object) {
+    public Stream<RDF4JQuad> stream(final Optional<BlankNodeOrIRI> graphName, final BlankNodeOrIRI subject, final IRI predicate,
+            final RDFTerm object) {
         Resource subj = (Resource) rdf4jTermFactory.asValue(subject);
         org.eclipse.rdf4j.model.IRI pred = (org.eclipse.rdf4j.model.IRI) rdf4jTermFactory.asValue(predicate);
         Value obj = rdf4jTermFactory.asValue(object);
@@ -181,8 +181,8 @@ class RepositoryDatasetImpl extends AbstractRepositoryGraphLike<Quad> implements
     }
 
     @Override
-    public ClosableIterable<Quad> iterate(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI subject, IRI predicate,
-            RDFTerm object) throws ConcurrentModificationException, IllegalStateException {
+    public ClosableIterable<Quad> iterate(final Optional<BlankNodeOrIRI> graphName, final BlankNodeOrIRI subject, final IRI predicate,
+            final RDFTerm object) throws ConcurrentModificationException, IllegalStateException {
         Resource[] contexts = asContexts(graphName);
         Resource subj = (Resource) rdf4jTermFactory.asValue(subject);
         org.eclipse.rdf4j.model.IRI pred = (org.eclipse.rdf4j.model.IRI) rdf4jTermFactory.asValue(predicate);
@@ -192,7 +192,7 @@ class RepositoryDatasetImpl extends AbstractRepositoryGraphLike<Quad> implements
     }
 
     @Override
-    protected RDF4JQuad asTripleLike(Statement s) {
+    protected RDF4JQuad asTripleLike(final Statement s) {
         return rdf4jTermFactory.asQuad(s);
     }
 
@@ -205,7 +205,7 @@ class RepositoryDatasetImpl extends AbstractRepositoryGraphLike<Quad> implements
     }
 
     @Override
-    public Optional<Graph> getGraph(BlankNodeOrIRI graphName) {
+    public Optional<Graph> getGraph(final BlankNodeOrIRI graphName) {
         // NOTE: May be null to indicate default context
         Resource context = (Resource) rdf4jTermFactory.asValue(graphName);
         // NOTE: We carry over the 'salt' as the graph's BlankNode should be

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/RepositoryGraphImpl.java
----------------------------------------------------------------------
diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/RepositoryGraphImpl.java b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/RepositoryGraphImpl.java
index 6e4d936..6791978 100644
--- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/RepositoryGraphImpl.java
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/RepositoryGraphImpl.java
@@ -46,14 +46,14 @@ class RepositoryGraphImpl extends AbstractRepositoryGraphLike<Triple> implements
 
     private final Resource[] contextMask;
 
-    RepositoryGraphImpl(Repository repository, UUID salt, boolean handleInitAndShutdown, boolean includeInferred,
-            Resource... contextMask) {
+    RepositoryGraphImpl(final Repository repository, final UUID salt, final boolean handleInitAndShutdown, final boolean includeInferred,
+            final Resource... contextMask) {
         super(repository, salt, handleInitAndShutdown, includeInferred);
         this.contextMask = Objects.requireNonNull(contextMask);
     }
 
     @Override
-    public void add(Triple tripleLike) {
+    public void add(final Triple tripleLike) {
         Statement statement = rdf4jTermFactory.asStatement(tripleLike);
         try (RepositoryConnection conn = getRepositoryConnection()) {
             conn.add(statement, contextMask);
@@ -62,7 +62,7 @@ class RepositoryGraphImpl extends AbstractRepositoryGraphLike<Triple> implements
     }
 
     @Override
-    public boolean contains(Triple tripleLike) {
+    public boolean contains(final Triple tripleLike) {
         Statement statement = rdf4jTermFactory.asStatement(tripleLike);
         try (RepositoryConnection conn = getRepositoryConnection()) {
             return conn.hasStatement(statement, includeInferred, contextMask);
@@ -70,7 +70,7 @@ class RepositoryGraphImpl extends AbstractRepositoryGraphLike<Triple> implements
     }
 
     @Override
-    public void remove(Triple tripleLike) {
+    public void remove(final Triple tripleLike) {
         Statement statement = rdf4jTermFactory.asStatement(tripleLike);
         try (RepositoryConnection conn = getRepositoryConnection()) {
             conn.remove(statement, contextMask);
@@ -100,7 +100,7 @@ class RepositoryGraphImpl extends AbstractRepositoryGraphLike<Triple> implements
     }
 
     @Override
-    public void add(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public void add(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         Resource subj = (Resource) rdf4jTermFactory.asValue(subject);
         org.eclipse.rdf4j.model.IRI pred = (org.eclipse.rdf4j.model.IRI) rdf4jTermFactory.asValue(predicate);
         Value obj = rdf4jTermFactory.asValue(object);
@@ -111,7 +111,7 @@ class RepositoryGraphImpl extends AbstractRepositoryGraphLike<Triple> implements
     }
 
     @Override
-    public boolean contains(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public boolean contains(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         Resource subj = (Resource) rdf4jTermFactory.asValue(subject);
         org.eclipse.rdf4j.model.IRI pred = (org.eclipse.rdf4j.model.IRI) rdf4jTermFactory.asValue(predicate);
         Value obj = rdf4jTermFactory.asValue(object);
@@ -121,7 +121,7 @@ class RepositoryGraphImpl extends AbstractRepositoryGraphLike<Triple> implements
     }
 
     @Override
-    public void remove(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public void remove(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         Resource subj = (Resource) rdf4jTermFactory.asValue(subject);
         org.eclipse.rdf4j.model.IRI pred = (org.eclipse.rdf4j.model.IRI) rdf4jTermFactory.asValue(predicate);
         Value obj = rdf4jTermFactory.asValue(object);
@@ -137,7 +137,7 @@ class RepositoryGraphImpl extends AbstractRepositoryGraphLike<Triple> implements
     }
 
     @Override
-    public ClosableIterable<Triple> iterate(BlankNodeOrIRI subject, IRI predicate, RDFTerm object)
+    public ClosableIterable<Triple> iterate(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object)
             throws ConcurrentModificationException, IllegalStateException {
         Resource subj = (Resource) rdf4jTermFactory.asValue(subject);
         org.eclipse.rdf4j.model.IRI pred = (org.eclipse.rdf4j.model.IRI) rdf4jTermFactory.asValue(predicate);
@@ -152,7 +152,7 @@ class RepositoryGraphImpl extends AbstractRepositoryGraphLike<Triple> implements
     }
 
     @Override
-    public Stream<RDF4JTriple> stream(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public Stream<RDF4JTriple> stream(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         Resource subj = (Resource) rdf4jTermFactory.asValue(subject);
         org.eclipse.rdf4j.model.IRI pred = (org.eclipse.rdf4j.model.IRI) rdf4jTermFactory.asValue(predicate);
         Value obj = rdf4jTermFactory.asValue(object);
@@ -179,7 +179,7 @@ class RepositoryGraphImpl extends AbstractRepositoryGraphLike<Triple> implements
     }
 
     @Override
-    protected RDF4JTriple asTripleLike(Statement statement) {
+    protected RDF4JTriple asTripleLike(final Statement statement) {
         return rdf4jTermFactory.asTriple(statement);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/TripleImpl.java
----------------------------------------------------------------------
diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/TripleImpl.java b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/TripleImpl.java
index 64ed327..7fdfa0f 100644
--- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/TripleImpl.java
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/TripleImpl.java
@@ -31,7 +31,7 @@ final class TripleImpl implements Triple, RDF4JTriple {
     private final UUID salt;
     private final Statement statement;
 
-    TripleImpl(Statement statement, UUID salt) {
+    TripleImpl(final Statement statement, final UUID salt) {
         this.statement = statement;
         this.salt = salt;
     }
@@ -42,7 +42,7 @@ final class TripleImpl implements Triple, RDF4JTriple {
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (obj instanceof Triple) {
             Triple triple = (Triple) obj;
             return getSubject().equals(triple.getSubject()) && getPredicate().equals(triple.getPredicate())

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/BlankNodeTest.java
----------------------------------------------------------------------
diff --git a/rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/BlankNodeTest.java b/rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/BlankNodeTest.java
index f068040..485330c 100644
--- a/rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/BlankNodeTest.java
+++ b/rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/BlankNodeTest.java
@@ -30,7 +30,7 @@ public class BlankNodeTest extends AbstractBlankNodeTest {
     }
 
     @Override
-    protected BlankNode getBlankNode(String identifier) {
+    protected BlankNode getBlankNode(final String identifier) {
         return factory.createBlankNode(identifier);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/MemoryGraphTest.java
----------------------------------------------------------------------
diff --git a/rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/MemoryGraphTest.java b/rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/MemoryGraphTest.java
index f0d64c3..fd3ac83 100644
--- a/rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/MemoryGraphTest.java
+++ b/rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/MemoryGraphTest.java
@@ -43,7 +43,7 @@ public class MemoryGraphTest extends AbstractGraphTest {
         }
 
         @Override
-        public RDF4JBlankNode createBlankNode(String name) {
+        public RDF4JBlankNode createBlankNode(final String name) {
             return rdf4jFactory.createBlankNode(name);
         }
 
@@ -53,32 +53,32 @@ public class MemoryGraphTest extends AbstractGraphTest {
         }
 
         @Override
-        public RDF4JIRI createIRI(String iri) throws IllegalArgumentException, UnsupportedOperationException {
+        public RDF4JIRI createIRI(final String iri) throws IllegalArgumentException, UnsupportedOperationException {
             return rdf4jFactory.createIRI(iri);
         }
 
         @Override
-        public RDF4JLiteral createLiteral(String lexicalForm) {
+        public RDF4JLiteral createLiteral(final String lexicalForm) {
             return rdf4jFactory.createLiteral(lexicalForm);
         }
 
         @Override
-        public Literal createLiteral(String lexicalForm, IRI dataType) {
+        public Literal createLiteral(final String lexicalForm, final IRI dataType) {
             return rdf4jFactory.createLiteral(lexicalForm, dataType);
         }
 
         @Override
-        public Literal createLiteral(String lexicalForm, String languageTag) {
+        public Literal createLiteral(final String lexicalForm, final String languageTag) {
             return rdf4jFactory.createLiteral(lexicalForm, languageTag);
         }
 
         @Override
-        public RDF4JTriple createTriple(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+        public RDF4JTriple createTriple(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
             return rdf4jFactory.createTriple(subject, predicate, object);
         }
 
         @Override
-        public Quad createQuad(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+        public Quad createQuad(final BlankNodeOrIRI graphName, final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
             return rdf4jFactory.createQuad(graphName, subject, predicate, object);
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/NativeStoreGraphTest.java
----------------------------------------------------------------------
diff --git a/rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/NativeStoreGraphTest.java b/rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/NativeStoreGraphTest.java
index 9fd2dcf..7f56ae4 100644
--- a/rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/NativeStoreGraphTest.java
+++ b/rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/NativeStoreGraphTest.java
@@ -76,37 +76,37 @@ public class NativeStoreGraphTest extends AbstractGraphTest {
         }
 
         @Override
-        public RDF4JBlankNode createBlankNode(String name) {
+        public RDF4JBlankNode createBlankNode(final String name) {
             return rdf4jFactory.createBlankNode(name);
         }
 
         @Override
-        public RDF4JIRI createIRI(String iri) throws IllegalArgumentException, UnsupportedOperationException {
+        public RDF4JIRI createIRI(final String iri) throws IllegalArgumentException, UnsupportedOperationException {
             return rdf4jFactory.createIRI(iri);
         }
 
         @Override
-        public RDF4JLiteral createLiteral(String lexicalForm) {
+        public RDF4JLiteral createLiteral(final String lexicalForm) {
             return rdf4jFactory.createLiteral(lexicalForm);
         }
 
         @Override
-        public Literal createLiteral(String lexicalForm, IRI dataType) {
+        public Literal createLiteral(final String lexicalForm, final IRI dataType) {
             return rdf4jFactory.createLiteral(lexicalForm, dataType);
         }
 
         @Override
-        public Literal createLiteral(String lexicalForm, String languageTag) {
+        public Literal createLiteral(final String lexicalForm, final String languageTag) {
             return rdf4jFactory.createLiteral(lexicalForm, languageTag);
         }
 
         @Override
-        public RDF4JTriple createTriple(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+        public RDF4JTriple createTriple(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
             return rdf4jFactory.createTriple(subject, predicate, object);
         }
 
         @Override
-        public Quad createQuad(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object)
+        public Quad createQuad(final BlankNodeOrIRI graphName, final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object)
                 throws IllegalArgumentException {
             return rdf4jFactory.createQuad(graphName, subject, predicate, object);
         }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/simple/src/main/java/org/apache/commons/rdf/simple/BlankNodeImpl.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/BlankNodeImpl.java b/simple/src/main/java/org/apache/commons/rdf/simple/BlankNodeImpl.java
index 1e2dfca..9a2d2fd 100644
--- a/simple/src/main/java/org/apache/commons/rdf/simple/BlankNodeImpl.java
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/BlankNodeImpl.java
@@ -39,7 +39,7 @@ final class BlankNodeImpl implements BlankNode, SimpleRDFTerm {
         this(SALT, Long.toString(COUNTER.incrementAndGet()));
     }
 
-    public BlankNodeImpl(UUID uuidSalt, String name) {
+    public BlankNodeImpl(final UUID uuidSalt, final String name) {
         if (Objects.requireNonNull(name).isEmpty()) {
             throw new IllegalArgumentException("Invalid blank node id: " + name);
         }
@@ -88,7 +88,7 @@ final class BlankNodeImpl implements BlankNode, SimpleRDFTerm {
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (this == obj) {
             return true;
         }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/simple/src/main/java/org/apache/commons/rdf/simple/DatasetGraphView.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/DatasetGraphView.java b/simple/src/main/java/org/apache/commons/rdf/simple/DatasetGraphView.java
index cc6f4b4..631f6fd 100644
--- a/simple/src/main/java/org/apache/commons/rdf/simple/DatasetGraphView.java
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/DatasetGraphView.java
@@ -56,13 +56,13 @@ public class DatasetGraphView implements Graph {
     private final BlankNodeOrIRI namedGraph;
     private final Dataset dataset;
 
-    public DatasetGraphView(Dataset dataset) {
+    public DatasetGraphView(final Dataset dataset) {
         this.dataset = dataset;
         this.namedGraph = null;
         this.unionGraph = true;
     }
 
-    public DatasetGraphView(Dataset dataset, BlankNodeOrIRI namedGraph) {
+    public DatasetGraphView(final Dataset dataset, final BlankNodeOrIRI namedGraph) {
         this.dataset = dataset;
         this.namedGraph = namedGraph;
         this.unionGraph = false;
@@ -75,17 +75,17 @@ public class DatasetGraphView implements Graph {
     }
 
     @Override
-    public void add(Triple triple) {
+    public void add(final Triple triple) {
         dataset.add(namedGraph, triple.getSubject(), triple.getPredicate(), triple.getObject());
     }
 
     @Override
-    public void add(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public void add(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         dataset.add(namedGraph, subject, predicate, object);
     }
 
     @Override
-    public boolean contains(Triple triple) {
+    public boolean contains(final Triple triple) {
         return dataset.contains(unionOrNamedGraph(), triple.getSubject(), triple.getPredicate(), triple.getObject());
     }
 
@@ -97,17 +97,17 @@ public class DatasetGraphView implements Graph {
     }
 
     @Override
-    public boolean contains(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public boolean contains(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         return dataset.contains(unionOrNamedGraph(), subject, predicate, object);
     }
 
     @Override
-    public void remove(Triple triple) {
+    public void remove(final Triple triple) {
         dataset.remove(unionOrNamedGraph(), triple.getSubject(), triple.getPredicate(), triple.getObject());
     }
 
     @Override
-    public void remove(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public void remove(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         dataset.remove(unionOrNamedGraph(), subject, predicate, object);
     }
 
@@ -127,7 +127,7 @@ public class DatasetGraphView implements Graph {
     }
 
     @Override
-    public Stream<? extends Triple> stream(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public Stream<? extends Triple> stream(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         Stream<Triple> stream = dataset.stream(unionOrNamedGraph(), subject, predicate, object).map(Quad::asTriple);
         if (unionGraph) {
             // remove duplicates

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/simple/src/main/java/org/apache/commons/rdf/simple/DatasetImpl.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/DatasetImpl.java b/simple/src/main/java/org/apache/commons/rdf/simple/DatasetImpl.java
index 94241e5..736146f 100644
--- a/simple/src/main/java/org/apache/commons/rdf/simple/DatasetImpl.java
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/DatasetImpl.java
@@ -48,12 +48,12 @@ final class DatasetImpl implements Dataset {
     private final Set<Quad> quads = new HashSet<>();
     private final SimpleRDF factory;
 
-    DatasetImpl(SimpleRDF simpleRDF) {
+    DatasetImpl(final SimpleRDF simpleRDF) {
         this.factory = simpleRDF;
     }
 
     @Override
-    public void add(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public void add(final BlankNodeOrIRI graphName, final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         BlankNodeOrIRI newGraphName = (BlankNodeOrIRI) internallyMap(graphName);
         BlankNodeOrIRI newSubject = (BlankNodeOrIRI) internallyMap(subject);
         IRI newPredicate = (IRI) internallyMap(predicate);
@@ -63,7 +63,7 @@ final class DatasetImpl implements Dataset {
     }
 
     @Override
-    public void add(Quad quad) {
+    public void add(final Quad quad) {
         BlankNodeOrIRI newGraph = (BlankNodeOrIRI) internallyMap(quad.getGraphName().orElse(null));
         BlankNodeOrIRI newSubject = (BlankNodeOrIRI) internallyMap(quad.getSubject());
         IRI newPredicate = (IRI) internallyMap(quad.getPredicate());
@@ -80,7 +80,7 @@ final class DatasetImpl implements Dataset {
         }
     }
 
-    private <T extends RDFTerm> RDFTerm internallyMap(T object) {
+    private <T extends RDFTerm> RDFTerm internallyMap(final T object) {
         if (object == null || object instanceof SimpleRDFTerm) {
             return object;
         }
@@ -112,12 +112,12 @@ final class DatasetImpl implements Dataset {
     }
 
     @Override
-    public boolean contains(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public boolean contains(final Optional<BlankNodeOrIRI> graphName, final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         return stream(graphName, subject, predicate, object).findAny().isPresent();
     }
 
     @Override
-    public boolean contains(Quad quad) {
+    public boolean contains(final Quad quad) {
         return quads.contains(Objects.requireNonNull(quad));
     }
 
@@ -127,8 +127,8 @@ final class DatasetImpl implements Dataset {
     }
 
     @Override
-    public Stream<Quad> stream(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI subject, IRI predicate,
-            RDFTerm object) {
+    public Stream<Quad> stream(final Optional<BlankNodeOrIRI> graphName, final BlankNodeOrIRI subject, final IRI predicate,
+            final RDFTerm object) {
         final Optional<BlankNodeOrIRI> newGraphName;
         if (graphName == null) { 
             // Avoid Optional<Optional<BlankNodeOrIRI>> ...
@@ -163,7 +163,7 @@ final class DatasetImpl implements Dataset {
     }
 
     @Override
-    public void remove(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public void remove(final Optional<BlankNodeOrIRI> graphName, final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         Stream<Quad> toRemove = stream(graphName, subject, predicate, object);
         for (Quad t : toRemove.collect(Collectors.toList())) {
             // Avoid ConcurrentModificationException in ArrayList
@@ -172,7 +172,7 @@ final class DatasetImpl implements Dataset {
     }
 
     @Override
-    public void remove(Quad quad) {
+    public void remove(final Quad quad) {
         quads.remove(Objects.requireNonNull(quad));
     }
 
@@ -201,7 +201,7 @@ final class DatasetImpl implements Dataset {
     }
 
     @Override
-    public Optional<Graph> getGraph(BlankNodeOrIRI graphName) {
+    public Optional<Graph> getGraph(final BlankNodeOrIRI graphName) {
         return Optional.of(new DatasetGraphView(this, graphName));
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/simple/src/main/java/org/apache/commons/rdf/simple/GraphImpl.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/GraphImpl.java b/simple/src/main/java/org/apache/commons/rdf/simple/GraphImpl.java
index 41739b8..268f78a 100644
--- a/simple/src/main/java/org/apache/commons/rdf/simple/GraphImpl.java
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/GraphImpl.java
@@ -39,12 +39,12 @@ final class GraphImpl implements Graph {
     private final Set<Triple> triples = new HashSet<>();
     private final SimpleRDF factory;
 
-    GraphImpl(SimpleRDF simpleRDF) {
+    GraphImpl(final SimpleRDF simpleRDF) {
         this.factory = simpleRDF;
     }
 
     @Override
-    public void add(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public void add(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         BlankNodeOrIRI newSubject = (BlankNodeOrIRI) internallyMap(subject);
         IRI newPredicate = (IRI) internallyMap(predicate);
         RDFTerm newObject = internallyMap(object);
@@ -53,11 +53,11 @@ final class GraphImpl implements Graph {
     }
 
     @Override
-    public void add(Triple triple) {
+    public void add(final Triple triple) {
         triples.add(internallyMap(triple));
     }
 
-    private <T extends RDFTerm> RDFTerm internallyMap(T object) {
+    private <T extends RDFTerm> RDFTerm internallyMap(final T object) {
         if (object == null || object instanceof SimpleRDFTerm) {
             // No need to re-map our own objects.
             // We support null as internallyMap() is also used by the filters,
@@ -87,7 +87,7 @@ final class GraphImpl implements Graph {
         }
     }
 
-    private Triple internallyMap(Triple triple) {
+    private Triple internallyMap(final Triple triple) {
         BlankNodeOrIRI newSubject = (BlankNodeOrIRI) internallyMap(triple.getSubject());
         IRI newPredicate = (IRI) internallyMap(triple.getPredicate());
         RDFTerm newObject = internallyMap(triple.getObject());
@@ -107,12 +107,12 @@ final class GraphImpl implements Graph {
     }
 
     @Override
-    public boolean contains(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public boolean contains(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         return stream(subject, predicate, object).findFirst().isPresent();
     }
 
     @Override
-    public boolean contains(Triple triple) {
+    public boolean contains(final Triple triple) {
         return triples.contains(internallyMap(triple));
     }
 
@@ -148,7 +148,7 @@ final class GraphImpl implements Graph {
     }
 
     @Override
-    public void remove(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public void remove(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         Stream<Triple> toRemove = stream(subject, predicate, object);
         for (Triple t : toRemove.collect(Collectors.toList())) {
             // Avoid ConcurrentModificationException in ArrayList
@@ -157,7 +157,7 @@ final class GraphImpl implements Graph {
     }
 
     @Override
-    public void remove(Triple triple) {
+    public void remove(final Triple triple) {
         triples.remove(internallyMap(triple));
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/simple/src/main/java/org/apache/commons/rdf/simple/IRIImpl.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/IRIImpl.java b/simple/src/main/java/org/apache/commons/rdf/simple/IRIImpl.java
index 8c81913..67b2ef9 100644
--- a/simple/src/main/java/org/apache/commons/rdf/simple/IRIImpl.java
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/IRIImpl.java
@@ -28,7 +28,7 @@ final class IRIImpl implements IRI, SimpleRDF.SimpleRDFTerm {
 
     private final String iri;
 
-    public IRIImpl(String iri) {
+    public IRIImpl(final String iri) {
         // should throw IllegalArgumentException on most illegal IRIs
         URI.create(iri);
         // NOTE: We don't keep the URI as it uses outdated RFC2396 and will get
@@ -52,7 +52,7 @@ final class IRIImpl implements IRI, SimpleRDF.SimpleRDFTerm {
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (this == obj) {
             return true;
         }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/simple/src/main/java/org/apache/commons/rdf/simple/LiteralImpl.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/LiteralImpl.java b/simple/src/main/java/org/apache/commons/rdf/simple/LiteralImpl.java
index 4d3bf31..38ada61 100644
--- a/simple/src/main/java/org/apache/commons/rdf/simple/LiteralImpl.java
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/LiteralImpl.java
@@ -36,11 +36,11 @@ final class LiteralImpl implements Literal, SimpleRDF.SimpleRDFTerm {
     private final String languageTag;
     private final String lexicalForm;
 
-    public LiteralImpl(String literal) {
+    public LiteralImpl(final String literal) {
         this(literal, Types.XSD_STRING);
     }
 
-    public LiteralImpl(String lexicalForm, IRI dataType) {
+    public LiteralImpl(final String lexicalForm, final IRI dataType) {
         this.lexicalForm = Objects.requireNonNull(lexicalForm);
         this.dataType = Types.get(Objects.requireNonNull(dataType)).orElse(dataType);
         if (Types.RDF_LANGSTRING.equals(this.dataType)) {
@@ -50,7 +50,7 @@ final class LiteralImpl implements Literal, SimpleRDF.SimpleRDFTerm {
         this.languageTag = null;
     }
 
-    public LiteralImpl(String literal, String languageTag) {
+    public LiteralImpl(final String literal, final String languageTag) {
         this.lexicalForm = Objects.requireNonNull(literal);
         this.languageTag = Objects.requireNonNull(languageTag).toLowerCase(Locale.ENGLISH);
         if (languageTag.isEmpty()) {
@@ -117,7 +117,7 @@ final class LiteralImpl implements Literal, SimpleRDF.SimpleRDFTerm {
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (this == obj) {
             return true;
         }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/simple/src/main/java/org/apache/commons/rdf/simple/QuadImpl.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/QuadImpl.java b/simple/src/main/java/org/apache/commons/rdf/simple/QuadImpl.java
index 5092a56..d62d17c 100644
--- a/simple/src/main/java/org/apache/commons/rdf/simple/QuadImpl.java
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/QuadImpl.java
@@ -51,7 +51,7 @@ final class QuadImpl implements Quad {
      * @param object
      *            object of triple
      */
-    public QuadImpl(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public QuadImpl(final BlankNodeOrIRI graphName, final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         this.graphName = graphName; // possibly null
         this.subject = Objects.requireNonNull(subject);
         this.predicate = Objects.requireNonNull(predicate);
@@ -91,7 +91,7 @@ final class QuadImpl implements Quad {
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (!(obj instanceof Quad)) {
             return false;
         }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/simple/src/main/java/org/apache/commons/rdf/simple/SimpleRDF.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/SimpleRDF.java b/simple/src/main/java/org/apache/commons/rdf/simple/SimpleRDF.java
index 1292dc7..e871079 100644
--- a/simple/src/main/java/org/apache/commons/rdf/simple/SimpleRDF.java
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/SimpleRDF.java
@@ -61,7 +61,7 @@ public class SimpleRDF implements RDF {
     }
 
     @Override
-    public BlankNode createBlankNode(String name) {
+    public BlankNode createBlankNode(final String name) {
         return new BlankNodeImpl(SALT, name);
     }
 
@@ -78,34 +78,34 @@ public class SimpleRDF implements RDF {
     }
 
     @Override
-    public IRI createIRI(String iri) {
+    public IRI createIRI(final String iri) {
         IRI result = new IRIImpl(iri);
         // Reuse any IRI objects already created in Types
         return Types.get(result).orElse(result);
     }
 
     @Override
-    public Literal createLiteral(String literal) {
+    public Literal createLiteral(final String literal) {
         return new LiteralImpl(literal);
     }
 
     @Override
-    public Literal createLiteral(String literal, IRI dataType) {
+    public Literal createLiteral(final String literal, final IRI dataType) {
         return new LiteralImpl(literal, dataType);
     }
 
     @Override
-    public Literal createLiteral(String literal, String language) {
+    public Literal createLiteral(final String literal, final String language) {
         return new LiteralImpl(literal, language);
     }
 
     @Override
-    public Triple createTriple(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public Triple createTriple(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         return new TripleImpl(subject, predicate, object);
     }
 
     @Override
-    public Quad createQuad(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object)
+    public Quad createQuad(final BlankNodeOrIRI graphName, final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object)
             throws IllegalArgumentException {
         return new QuadImpl(graphName, subject, predicate, object);
     }