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:50 UTC

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

Add final modifier to method parameters.

Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/756cbe02
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/756cbe02
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/756cbe02

Branch: refs/heads/master
Commit: 756cbe02dbe814691535ee98d9f6ac9e961212ff
Parents: 4e26ac8
Author: Gary Gregory <gg...@apache.org>
Authored: Fri Nov 11 14:48:15 2016 -0800
Committer: Gary Gregory <gg...@apache.org>
Committed: Fri Nov 11 14:48:15 2016 -0800

----------------------------------------------------------------------
 .../org/apache/commons/rdf/api/Dataset.java     |  4 +-
 .../java/org/apache/commons/rdf/api/Graph.java  |  4 +-
 .../java/org/apache/commons/rdf/api/Quad.java   |  2 +-
 .../org/apache/commons/rdf/api/RDFSyntax.java   |  6 +-
 .../apache/commons/rdf/api/RDFTermFactory.java  | 12 ++--
 .../commons/rdf/experimental/RDFParser.java     |  4 +-
 .../commons/rdf/api/AbstractDatasetTest.java    | 10 +--
 .../commons/rdf/api/AbstractGraphTest.java      | 10 +--
 .../apache/commons/rdf/api/DummyDataset.java    | 18 ++---
 .../org/apache/commons/rdf/api/DummyGraph.java  | 14 ++--
 .../org/apache/commons/rdf/api/DummyIRI.java    |  4 +-
 .../org/apache/commons/rdf/api/DummyQuad.java   |  4 +-
 .../org/apache/commons/rdf/api/DummyTriple.java |  4 +-
 .../rdf/integrationtests/AllToAllTest.java      |  2 +-
 .../commons/rdf/jena/ConversionException.java   |  6 +-
 .../org/apache/commons/rdf/jena/JenaRDF.java    | 74 ++++++++++----------
 .../rdf/jena/experimental/JenaRDFParser.java    |  4 +-
 .../rdf/jena/impl/AbstractJenaRDFTerm.java      |  2 +-
 .../commons/rdf/jena/impl/AbstractQuadLike.java |  8 +--
 .../rdf/jena/impl/InternalJenaFactory.java      | 42 +++++------
 .../rdf/jena/impl/JenaBlankNodeImpl.java        |  4 +-
 .../commons/rdf/jena/impl/JenaDatasetImpl.java  | 22 +++---
 .../jena/impl/JenaGeneralizedQuadLikeImpl.java  |  4 +-
 .../impl/JenaGeneralizedTripleLikeImpl.java     |  4 +-
 .../commons/rdf/jena/impl/JenaGraphImpl.java    | 22 +++---
 .../commons/rdf/jena/impl/JenaIRIImpl.java      |  6 +-
 .../commons/rdf/jena/impl/JenaLiteralImpl.java  |  4 +-
 .../commons/rdf/jena/impl/JenaQuadImpl.java     |  6 +-
 .../commons/rdf/jena/impl/JenaTripleImpl.java   |  6 +-
 .../commons/rdf/jena/TestBlankNodeJena.java     |  2 +-
 .../commons/rdf/jsonldjava/JsonLdBlankNode.java |  4 +-
 .../commons/rdf/jsonldjava/JsonLdDataset.java   | 22 +++---
 .../commons/rdf/jsonldjava/JsonLdGraph.java     | 22 +++---
 .../commons/rdf/jsonldjava/JsonLdGraphLike.java | 22 +++---
 .../commons/rdf/jsonldjava/JsonLdIRI.java       |  6 +-
 .../commons/rdf/jsonldjava/JsonLdLiteral.java   |  4 +-
 .../commons/rdf/jsonldjava/JsonLdQuad.java      |  4 +-
 .../commons/rdf/jsonldjava/JsonLdQuadLike.java  |  2 +-
 .../commons/rdf/jsonldjava/JsonLdRDF.java       | 34 ++++-----
 .../commons/rdf/jsonldjava/JsonLdTerm.java      |  2 +-
 .../commons/rdf/jsonldjava/JsonLdTriple.java    |  4 +-
 .../rdf/jsonldjava/JsonLdUnionGraph.java        | 18 ++---
 .../jsonldjava/experimental/JsonLdParser.java   |  6 +-
 .../rdf/jsonldjava/JsonLdBlankNodeTest.java     |  2 +-
 .../rdf/jsonldjava/JsonLdParserBuilderTest.java |  2 +-
 .../org/apache/commons/rdf/rdf4j/RDF4J.java     | 42 +++++------
 .../rdf/rdf4j/experimental/RDF4JParser.java     | 12 ++--
 .../commons/rdf/rdf4j/impl/AbstractRDFTerm.java |  2 +-
 .../rdf4j/impl/AbstractRepositoryGraphLike.java |  4 +-
 .../commons/rdf/rdf4j/impl/BlankNodeImpl.java   |  6 +-
 .../rdf/rdf4j/impl/ConvertedStatements.java     |  4 +-
 .../apache/commons/rdf/rdf4j/impl/IRIImpl.java  |  4 +-
 .../rdf/rdf4j/impl/InternalRDF4JFactory.java    | 20 +++---
 .../commons/rdf/rdf4j/impl/LiteralImpl.java     |  4 +-
 .../commons/rdf/rdf4j/impl/ModelGraphImpl.java  | 20 +++---
 .../apache/commons/rdf/rdf4j/impl/QuadImpl.java |  4 +-
 .../rdf/rdf4j/impl/RepositoryDatasetImpl.java   | 28 ++++----
 .../rdf/rdf4j/impl/RepositoryGraphImpl.java     | 22 +++---
 .../commons/rdf/rdf4j/impl/TripleImpl.java      |  4 +-
 .../apache/commons/rdf/rdf4j/BlankNodeTest.java |  2 +-
 .../commons/rdf/rdf4j/MemoryGraphTest.java      | 14 ++--
 .../commons/rdf/rdf4j/NativeStoreGraphTest.java | 14 ++--
 .../commons/rdf/simple/BlankNodeImpl.java       |  4 +-
 .../commons/rdf/simple/DatasetGraphView.java    | 18 ++---
 .../apache/commons/rdf/simple/DatasetImpl.java  | 22 +++---
 .../apache/commons/rdf/simple/GraphImpl.java    | 18 ++---
 .../org/apache/commons/rdf/simple/IRIImpl.java  |  4 +-
 .../apache/commons/rdf/simple/LiteralImpl.java  |  8 +--
 .../org/apache/commons/rdf/simple/QuadImpl.java |  4 +-
 .../apache/commons/rdf/simple/SimpleRDF.java    | 14 ++--
 .../rdf/simple/SimpleRDFTermFactory.java        | 12 ++--
 .../apache/commons/rdf/simple/TripleImpl.java   |  4 +-
 .../org/apache/commons/rdf/simple/Types.java    |  6 +-
 .../simple/experimental/AbstractRDFParser.java  | 30 ++++----
 .../simple/experimental/RDFParseException.java  |  8 +--
 .../commons/rdf/simple/BlankNodeImplTest.java   |  2 +-
 .../commons/rdf/simple/TestWritingGraph.java    |  2 +-
 .../experimental/AbstractRDFParserTest.java     |  4 +-
 78 files changed, 417 insertions(+), 417 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/api/src/main/java/org/apache/commons/rdf/api/Dataset.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/commons/rdf/api/Dataset.java b/api/src/main/java/org/apache/commons/rdf/api/Dataset.java
index 26179d8..531e311 100644
--- a/api/src/main/java/org/apache/commons/rdf/api/Dataset.java
+++ b/api/src/main/java/org/apache/commons/rdf/api/Dataset.java
@@ -347,8 +347,8 @@ public interface Dataset extends AutoCloseable, GraphLike<Quad> {
      *             active.
      */
     @SuppressWarnings("unchecked")
-    default Iterable<Quad> iterate(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI subject, IRI predicate,
-            RDFTerm object) throws ConcurrentModificationException, IllegalStateException {
+    default Iterable<Quad> iterate(final Optional<BlankNodeOrIRI> graphName, final BlankNodeOrIRI subject, final IRI predicate,
+            final RDFTerm object) throws ConcurrentModificationException, IllegalStateException {
         return ((Stream<Quad>) stream(graphName, subject, predicate, object))::iterator;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/api/src/main/java/org/apache/commons/rdf/api/Graph.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/commons/rdf/api/Graph.java b/api/src/main/java/org/apache/commons/rdf/api/Graph.java
index 056d393..0df5186 100644
--- a/api/src/main/java/org/apache/commons/rdf/api/Graph.java
+++ b/api/src/main/java/org/apache/commons/rdf/api/Graph.java
@@ -200,7 +200,7 @@ public interface Graph extends AutoCloseable, GraphLike<Triple> {
      * @return A {@link Stream} over the matched triples.
      */
     @Deprecated
-    default Stream<? extends Triple> getTriples(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    default Stream<? extends Triple> getTriples(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         return stream(subject, predicate, object);
     }
 
@@ -291,7 +291,7 @@ public interface Graph extends AutoCloseable, GraphLike<Triple> {
      *             active.
      */
     @SuppressWarnings("unchecked")
-    default Iterable<Triple> iterate(BlankNodeOrIRI subject, IRI predicate, RDFTerm object)
+    default Iterable<Triple> iterate(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object)
             throws ConcurrentModificationException, IllegalStateException {
         return ((Stream<Triple>) stream(subject, predicate, object))::iterator;
     }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/api/src/main/java/org/apache/commons/rdf/api/Quad.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/commons/rdf/api/Quad.java b/api/src/main/java/org/apache/commons/rdf/api/Quad.java
index b0cd65e..c018769 100644
--- a/api/src/main/java/org/apache/commons/rdf/api/Quad.java
+++ b/api/src/main/java/org/apache/commons/rdf/api/Quad.java
@@ -168,7 +168,7 @@ public interface Quad extends QuadLike<BlankNodeOrIRI> {
             }
 
             @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/api/src/main/java/org/apache/commons/rdf/api/RDFSyntax.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/commons/rdf/api/RDFSyntax.java b/api/src/main/java/org/apache/commons/rdf/api/RDFSyntax.java
index 2637a96..2948437 100644
--- a/api/src/main/java/org/apache/commons/rdf/api/RDFSyntax.java
+++ b/api/src/main/java/org/apache/commons/rdf/api/RDFSyntax.java
@@ -141,7 +141,7 @@ public enum RDFSyntax {
         return name;
     }
 
-    private RDFSyntax(String name, String mediaType, String fileExtension, boolean supportsDataset) {
+    private RDFSyntax(final String name, final String mediaType, final String fileExtension, final boolean supportsDataset) {
         this.name = name;
         this.mediaType = mediaType;
         this.fileExtension = fileExtension;
@@ -167,7 +167,7 @@ public enum RDFSyntax {
      *         {@link Optional#empty()} indicating that no matching syntax was
      *         found.
      */
-    public static Optional<RDFSyntax> byMediaType(String mediaType) {
+    public static Optional<RDFSyntax> byMediaType(final String mediaType) {
         final String type = mediaType.toLowerCase(Locale.ENGLISH).split("\\s*[;,]", 2)[0];
         return Arrays.stream(RDFSyntax.values()).filter(t -> t.mediaType.equals(type)).findAny();
     }
@@ -186,7 +186,7 @@ public enum RDFSyntax {
      *         {@link Optional#empty()} indicating that no matching file
      *         extension was found.
      */
-    public static Optional<RDFSyntax> byFileExtension(String fileExtension) {
+    public static Optional<RDFSyntax> byFileExtension(final String fileExtension) {
         final String ext = fileExtension.toLowerCase(Locale.ENGLISH);
         return Arrays.stream(RDFSyntax.values()).filter(t -> t.fileExtension.equals(ext)).findAny();
     }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/api/src/main/java/org/apache/commons/rdf/api/RDFTermFactory.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/commons/rdf/api/RDFTermFactory.java b/api/src/main/java/org/apache/commons/rdf/api/RDFTermFactory.java
index f245cce..321eebb 100644
--- a/api/src/main/java/org/apache/commons/rdf/api/RDFTermFactory.java
+++ b/api/src/main/java/org/apache/commons/rdf/api/RDFTermFactory.java
@@ -32,7 +32,7 @@ public interface RDFTermFactory {
         throw new UnsupportedOperationException("createBlankNode() not supported");
     }
 
-    default BlankNode createBlankNode(String name) throws UnsupportedOperationException {
+    default BlankNode createBlankNode(final String name) throws UnsupportedOperationException {
         throw new UnsupportedOperationException("createBlankNode(String) not supported");
     }
 
@@ -40,25 +40,25 @@ public interface RDFTermFactory {
         throw new UnsupportedOperationException("createGraph() not supported");
     }
 
-    default IRI createIRI(String iri) throws IllegalArgumentException, UnsupportedOperationException {
+    default IRI createIRI(final String iri) throws IllegalArgumentException, UnsupportedOperationException {
         throw new UnsupportedOperationException("createIRI(String) not supported");
     }
 
-    default Literal createLiteral(String lexicalForm) throws IllegalArgumentException, UnsupportedOperationException {
+    default Literal createLiteral(final String lexicalForm) throws IllegalArgumentException, UnsupportedOperationException {
         throw new UnsupportedOperationException("createLiteral(String) not supported");
     }
 
-    default Literal createLiteral(String lexicalForm, IRI dataType)
+    default Literal createLiteral(final String lexicalForm, final IRI dataType)
             throws IllegalArgumentException, UnsupportedOperationException {
         throw new UnsupportedOperationException("createLiteral(String) not supported");
     }
 
-    default Literal createLiteral(String lexicalForm, String languageTag)
+    default Literal createLiteral(final String lexicalForm, final String languageTag)
             throws IllegalArgumentException, UnsupportedOperationException {
         throw new UnsupportedOperationException("createLiteral(String,String) not supported");
     }
 
-    default Triple createTriple(BlankNodeOrIRI subject, IRI predicate, RDFTerm object)
+    default Triple createTriple(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object)
             throws IllegalArgumentException, UnsupportedOperationException {
         throw new UnsupportedOperationException("createTriple(BlankNodeOrIRI,IRI,RDFTerm) not supported");
     }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java b/api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java
index 6c93998..1b4ac2e 100644
--- a/api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java
+++ b/api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java
@@ -189,7 +189,7 @@ public interface RDFParser {
      * @return An {@link RDFParser} that will insert triples into the specified
      *         graph.
      */
-    default RDFParser target(Graph graph) {
+    default RDFParser target(final Graph graph) {
         return target(q -> {
             if (!q.getGraphName().isPresent()) {
                 graph.add(q.asTriple());
@@ -219,7 +219,7 @@ public interface RDFParser {
      * @return An {@link RDFParser} that will insert triples into the specified
      *         dataset.
      */
-    default RDFParser target(Dataset dataset) {
+    default RDFParser target(final Dataset dataset) {
         return target(dataset::add);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/api/src/test/java/org/apache/commons/rdf/api/AbstractDatasetTest.java
----------------------------------------------------------------------
diff --git a/api/src/test/java/org/apache/commons/rdf/api/AbstractDatasetTest.java b/api/src/test/java/org/apache/commons/rdf/api/AbstractDatasetTest.java
index b853b32..eab09b7 100644
--- a/api/src/test/java/org/apache/commons/rdf/api/AbstractDatasetTest.java
+++ b/api/src/test/java/org/apache/commons/rdf/api/AbstractDatasetTest.java
@@ -163,7 +163,7 @@ public abstract class AbstractDatasetTest {
     /**
      * Special quad closing for RDF4J.
      */
-    private void closeIterable(Iterable<Quad> iterate) throws Exception {
+    private void closeIterable(final Iterable<Quad> iterate) throws Exception {
         if (iterate instanceof AutoCloseable) {
             ((AutoCloseable) iterate).close();
         }
@@ -364,7 +364,7 @@ public abstract class AbstractDatasetTest {
             assertFalse(g3.contains(null, b1Charlie, hasChild, null));
     }
 
-    private void notEquals(BlankNodeOrIRI node1, BlankNodeOrIRI node2) {
+    private void notEquals(final BlankNodeOrIRI node1, final BlankNodeOrIRI node2) {
         assertFalse(node1.equals(node2));
         // in which case we should be able to assume
         // (as they are in the same dataset)
@@ -382,7 +382,7 @@ public abstract class AbstractDatasetTest {
      * @param target
      *            Target Dataset where quads will be added
      */
-    private void addAllQuads(Dataset source, Dataset target) {
+    private void addAllQuads(final Dataset source, final Dataset target) {
 
         // unordered() as we don't need to preserve quad order
         // sequential() as we don't (currently) require target Dataset to be
@@ -422,7 +422,7 @@ public abstract class AbstractDatasetTest {
      * @param name
      * @return
      */
-    private BlankNode createOwnBlankNode(String name, String uuid) {
+    private BlankNode createOwnBlankNode(final String name, final String uuid) {
         return new BlankNode() {
             @Override
             public String ntriplesString() {                
@@ -440,7 +440,7 @@ public abstract class AbstractDatasetTest {
             }
 
             @Override
-            public boolean equals(Object obj) {
+            public boolean equals(final Object obj) {
                 if (!(obj instanceof BlankNode)) {
                     return false;
                 }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/api/src/test/java/org/apache/commons/rdf/api/AbstractGraphTest.java
----------------------------------------------------------------------
diff --git a/api/src/test/java/org/apache/commons/rdf/api/AbstractGraphTest.java b/api/src/test/java/org/apache/commons/rdf/api/AbstractGraphTest.java
index a9b1b3e..bfb47c6 100644
--- a/api/src/test/java/org/apache/commons/rdf/api/AbstractGraphTest.java
+++ b/api/src/test/java/org/apache/commons/rdf/api/AbstractGraphTest.java
@@ -176,7 +176,7 @@ public abstract class AbstractGraphTest {
     /**
      * Special triple closing for RDF4J.
      */
-    private void closeIterable(Iterable<Triple> iterate) throws Exception {
+    private void closeIterable(final Iterable<Triple> iterate) throws Exception {
         if (iterate instanceof AutoCloseable) {
             ((AutoCloseable) iterate).close();
         }
@@ -385,7 +385,7 @@ public abstract class AbstractGraphTest {
         }
     }
 
-    private void notEquals(BlankNodeOrIRI node1, BlankNodeOrIRI node2) {
+    private void notEquals(final BlankNodeOrIRI node1, final BlankNodeOrIRI node2) {
         assertFalse(node1.equals(node2));
         // in which case we should be able to assume
         // (as they are in the same graph)
@@ -403,7 +403,7 @@ public abstract class AbstractGraphTest {
      * @param target
      *            Target Graph where triples will be added
      */
-    private void addAllTriples(Graph source, Graph target) {
+    private void addAllTriples(final Graph source, final Graph target) {
 
         // unordered() as we don't need to preserve triple order
         // sequential() as we don't (currently) require target Graph to be
@@ -443,7 +443,7 @@ public abstract class AbstractGraphTest {
      * @param name
      * @return
      */
-    private BlankNode createOwnBlankNode(String name, String uuid) {
+    private BlankNode createOwnBlankNode(final String name, final String uuid) {
         return new BlankNode() {
             @Override
             public String ntriplesString() {
@@ -461,7 +461,7 @@ public abstract class AbstractGraphTest {
             }
 
             @Override
-            public boolean equals(Object obj) {
+            public boolean equals(final Object obj) {
                 if (!(obj instanceof BlankNode)) {
                     return false;
                 }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/api/src/test/java/org/apache/commons/rdf/api/DummyDataset.java
----------------------------------------------------------------------
diff --git a/api/src/test/java/org/apache/commons/rdf/api/DummyDataset.java b/api/src/test/java/org/apache/commons/rdf/api/DummyDataset.java
index 0cfbc69..c3c103a 100644
--- a/api/src/test/java/org/apache/commons/rdf/api/DummyDataset.java
+++ b/api/src/test/java/org/apache/commons/rdf/api/DummyDataset.java
@@ -27,39 +27,39 @@ class DummyDataset implements Dataset {
     boolean filteredStreamCalled;
     
     @Override
-    public void add(Quad Quad) {
+    public void add(final Quad Quad) {
         if (! contains(Quad)) {
             throw new IllegalStateException("DummyDataset can't be modified");
         }
     }
     
     @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) {
         if (! contains(Optional.ofNullable(graphName), subject, predicate, object)) { 
             throw new IllegalStateException("DummyDataset can't be modified");
         }
     }
     
     @Override
-    public boolean contains(Quad Quad) {
+    public boolean contains(final Quad Quad) {
         return Quad.equals(new DummyQuad());
     }
     
     @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 (graphName == null || ! graphName.isPresent()) &&
                 (subject == null || subject.equals(new DummyIRI(1))) && 
                 (predicate == null || predicate.equals(new DummyIRI(2))) && 
                 (object == null || object.equals(new DummyIRI(3)));
     }
     @Override
-    public void remove(Quad Quad) {
+    public void remove(final Quad Quad) {
         if (contains(Quad)) {
             throw new IllegalStateException("DummyDataset can't be modified");
         }
     }
     @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) {
         if (contains(graphName, subject, predicate, object)) {
             throw new IllegalStateException("DummyDataset can't be modified");
         }
@@ -79,8 +79,8 @@ class DummyDataset implements Dataset {
     }
 
     @Override
-    public Stream<? extends Quad> stream(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI subject, IRI predicate,
-            RDFTerm object) {
+    public Stream<? extends Quad> stream(final Optional<BlankNodeOrIRI> graphName, final BlankNodeOrIRI subject, final IRI predicate,
+            final RDFTerm object) {
         filteredStreamCalled = true;
         if (contains(graphName, subject, predicate, object)) { 
             return Stream.of(new DummyQuad());
@@ -95,7 +95,7 @@ class DummyDataset implements Dataset {
     }
 
     @Override
-    public Optional<Graph> getGraph(BlankNodeOrIRI graphName) {
+    public Optional<Graph> getGraph(final BlankNodeOrIRI graphName) {
         if (graphName == null) { 
             return Optional.of(getGraph());
         } else {

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/api/src/test/java/org/apache/commons/rdf/api/DummyGraph.java
----------------------------------------------------------------------
diff --git a/api/src/test/java/org/apache/commons/rdf/api/DummyGraph.java b/api/src/test/java/org/apache/commons/rdf/api/DummyGraph.java
index d33ffa9..1dc0e31 100644
--- a/api/src/test/java/org/apache/commons/rdf/api/DummyGraph.java
+++ b/api/src/test/java/org/apache/commons/rdf/api/DummyGraph.java
@@ -26,35 +26,35 @@ class DummyGraph implements Graph {
     boolean filteredStreamCalled;
     
     @Override
-    public void add(Triple triple) {
+    public void add(final Triple triple) {
         if (! contains(triple)) {
             throw new IllegalStateException("DummyGraph can't be modified");
         }
     }
     @Override
-    public void add(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public void add(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         if (! contains(subject, predicate, object)) { 
             throw new IllegalStateException("DummyGraph can't be modified");
         }
     }
     @Override
-    public boolean contains(Triple triple) {
+    public boolean contains(final Triple triple) {
         return triple.equals(new DummyTriple());
     }
     @Override
-    public boolean contains(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public boolean contains(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         return (subject == null || subject.equals(new DummyIRI(1))) && 
                 (predicate == null || predicate.equals(new DummyIRI(2))) && 
                 (object == null || object.equals(new DummyIRI(3)));
     }
     @Override
-    public void remove(Triple triple) {
+    public void remove(final Triple triple) {
         if (contains(triple)) {
             throw new IllegalStateException("DummyGraph can't be modified");
         }
     }
     @Override
-    public void remove(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public void remove(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         if (contains(subject, predicate, object)) {
             throw new IllegalStateException("DummyGraph can't be modified");
         }
@@ -74,7 +74,7 @@ class DummyGraph 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) {
         filteredStreamCalled = true;
         if (contains(subject, predicate, object)) { 
             return Stream.of(new DummyTriple());

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/api/src/test/java/org/apache/commons/rdf/api/DummyIRI.java
----------------------------------------------------------------------
diff --git a/api/src/test/java/org/apache/commons/rdf/api/DummyIRI.java b/api/src/test/java/org/apache/commons/rdf/api/DummyIRI.java
index c9fe083..6d05981 100644
--- a/api/src/test/java/org/apache/commons/rdf/api/DummyIRI.java
+++ b/api/src/test/java/org/apache/commons/rdf/api/DummyIRI.java
@@ -21,7 +21,7 @@ class DummyIRI implements IRI {
     static final String EXAMPLE_COM = "http://example.com/";
     final int i;
 
-    public DummyIRI(int i) {
+    public DummyIRI(final int i) {
         this.i = i;
     }
 
@@ -36,7 +36,7 @@ class DummyIRI implements IRI {
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         return (obj instanceof IRI) && ((IRI) obj).getIRIString().equals(EXAMPLE_COM + i);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/api/src/test/java/org/apache/commons/rdf/api/DummyQuad.java
----------------------------------------------------------------------
diff --git a/api/src/test/java/org/apache/commons/rdf/api/DummyQuad.java b/api/src/test/java/org/apache/commons/rdf/api/DummyQuad.java
index f964d2a..7c24c74 100644
--- a/api/src/test/java/org/apache/commons/rdf/api/DummyQuad.java
+++ b/api/src/test/java/org/apache/commons/rdf/api/DummyQuad.java
@@ -40,7 +40,7 @@ class DummyQuad implements Quad {
         return new DummyIRI(3);
     }
 
-    private static List<RDFTerm> quadList(Quad q) {
+    private static List<RDFTerm> quadList(final Quad q) {
          return Arrays.asList(
              q.getGraphName().orElse(null),
              q.getSubject(),
@@ -49,7 +49,7 @@ class DummyQuad 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/api/src/test/java/org/apache/commons/rdf/api/DummyTriple.java
----------------------------------------------------------------------
diff --git a/api/src/test/java/org/apache/commons/rdf/api/DummyTriple.java b/api/src/test/java/org/apache/commons/rdf/api/DummyTriple.java
index 9994bcb..38eaf6e 100644
--- a/api/src/test/java/org/apache/commons/rdf/api/DummyTriple.java
+++ b/api/src/test/java/org/apache/commons/rdf/api/DummyTriple.java
@@ -35,7 +35,7 @@ class DummyTriple implements Triple {
         return new DummyIRI(3);
     }
 
-    private static List<RDFTerm> tripleList(Triple q) {
+    private static List<RDFTerm> tripleList(final Triple q) {
          return Arrays.asList(             
              q.getSubject(),
              q.getPredicate(),
@@ -43,7 +43,7 @@ class DummyTriple implements Triple {
     }
 
     @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/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
----------------------------------------------------------------------
diff --git a/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java b/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
index 080e5b2..1fe8dd0 100644
--- a/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
+++ b/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
@@ -47,7 +47,7 @@ public class AllToAllTest {
     private final RDF nodeFactory;
     private final RDF graphFactory;
 
-    public AllToAllTest(Class<? extends RDF> from, Class<? extends RDF> to)
+    public AllToAllTest(final Class<? extends RDF> from, final Class<? extends RDF> to)
             throws InstantiationException, IllegalAccessException {
         this.nodeFactory = from.newInstance();
         this.graphFactory = to.newInstance();

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/jena/src/main/java/org/apache/commons/rdf/jena/ConversionException.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/ConversionException.java b/jena/src/main/java/org/apache/commons/rdf/jena/ConversionException.java
index 20bc44c..6800c30 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/ConversionException.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/ConversionException.java
@@ -34,15 +34,15 @@ public class ConversionException extends RuntimeException {
         super();
     }
 
-    public ConversionException(String message) {
+    public ConversionException(final String message) {
         super(message);
     }
 
-    public ConversionException(Throwable cause) {
+    public ConversionException(final Throwable cause) {
         super(cause);
     }
 
-    public ConversionException(String message, Throwable cause) {
+    public ConversionException(final String message, final Throwable cause) {
         super(message, cause);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDF.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDF.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDF.java
index 1bc4cbe..5ca8f66 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDF.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDF.java
@@ -100,7 +100,7 @@ public final class JenaRDF implements RDF {
      * @param salt
      *            {@link UUID} to use as salt for {@link BlankNode} equality
      */
-    public JenaRDF(UUID salt) {
+    public JenaRDF(final UUID salt) {
         this.salt = salt;
     }
 
@@ -110,7 +110,7 @@ public final class JenaRDF implements RDF {
     }
 
     @Override
-    public JenaBlankNode createBlankNode(String name) {
+    public JenaBlankNode createBlankNode(final String name) {
         return internalJenaFactory.createBlankNode(name, salt());
     }
 
@@ -125,34 +125,34 @@ public final class JenaRDF implements RDF {
     }
 
     @Override
-    public JenaIRI createIRI(String iri) {
+    public JenaIRI createIRI(final String iri) {
         validateIRI(iri);
         return internalJenaFactory.createIRI(iri);
     }
 
     @Override
-    public JenaLiteral createLiteral(String lexicalForm) {
+    public JenaLiteral createLiteral(final String lexicalForm) {
         return internalJenaFactory.createLiteral(lexicalForm);
     }
 
     @Override
-    public JenaLiteral createLiteral(String lexicalForm, IRI dataType) {
+    public JenaLiteral createLiteral(final String lexicalForm, final IRI dataType) {
         return internalJenaFactory.createLiteralDT(lexicalForm, dataType.getIRIString());
     }
 
     @Override
-    public JenaLiteral createLiteral(String lexicalForm, String languageTag) {
+    public JenaLiteral createLiteral(final String lexicalForm, final String languageTag) {
         validateLang(languageTag);
         return internalJenaFactory.createLiteralLang(lexicalForm, languageTag);
     }
 
     @Override
-    public JenaTriple createTriple(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public JenaTriple createTriple(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         return internalJenaFactory.createTriple(subject, predicate, object);
     }
 
     @Override
-    public JenaQuad createQuad(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object)
+    public JenaQuad createQuad(final BlankNodeOrIRI graphName, final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object)
             throws IllegalArgumentException, UnsupportedOperationException {
         return internalJenaFactory.createQuad(subject, predicate, object, graphName);
     }
@@ -177,7 +177,7 @@ public final class JenaRDF implements RDF {
      *         does <strong>not</strong> implement {@link Triple#equals(Object)}
      *         or {@link Triple#hashCode()}.
      */
-    public JenaGeneralizedTripleLike createGeneralizedTriple(RDFTerm subject, RDFTerm predicate, RDFTerm object) {
+    public JenaGeneralizedTripleLike createGeneralizedTriple(final RDFTerm subject, final RDFTerm predicate, final RDFTerm object) {
         return internalJenaFactory.createGeneralizedTriple(subject, predicate, object);
     }
 
@@ -203,8 +203,8 @@ public final class JenaRDF implements RDF {
      *         <strong>not</strong> implement {@link Quad#equals(Object)} or
      *         {@link Quad#hashCode()}.
      */
-    public JenaGeneralizedQuadLike createGeneralizedQuad(RDFTerm subject, RDFTerm predicate, RDFTerm object,
-            RDFTerm graphName) {
+    public JenaGeneralizedQuadLike createGeneralizedQuad(final RDFTerm subject, final RDFTerm predicate, final RDFTerm object,
+            final RDFTerm graphName) {
         return internalJenaFactory.createGeneralizedQuad(subject, predicate, object, graphName);
     }
 
@@ -229,7 +229,7 @@ public final class JenaRDF implements RDF {
      *             {@link RDFTerm}, e.g. if the node is not concrete or
      *             represents a variable in Jena.
      */
-    public JenaRDFTerm asRDFTerm(Node node) throws ConversionException {
+    public JenaRDFTerm asRDFTerm(final Node node) throws ConversionException {
         return internalJenaFactory.createRDFTerm(node, salt());
     }
 
@@ -254,7 +254,7 @@ public final class JenaRDF implements RDF {
      *             {@link RDFTerm}, e.g. if the node is not concrete or
      *             represents a variable in Jena.
      */
-    public static RDFTerm asRDFTerm(RDF factory, Node node) {
+    public static RDFTerm asRDFTerm(final RDF factory, final Node node) {
         if (node == null) {
             return null;
         }
@@ -300,7 +300,7 @@ public final class JenaRDF implements RDF {
      *             if any of the triple's nodes are not concrete or the triple
      *             is a generalized triple
      */
-    public JenaTriple asTriple(org.apache.jena.graph.Triple triple) throws ConversionException {
+    public JenaTriple asTriple(final org.apache.jena.graph.Triple triple) throws ConversionException {
         return internalJenaFactory.createTriple(triple, salt());
     }
 
@@ -328,7 +328,7 @@ public final class JenaRDF implements RDF {
      * @throws ConversionException
      *             if any of the triple's nodes are not concrete
      */
-    public JenaTripleLike asGeneralizedTriple(org.apache.jena.graph.Triple triple) throws ConversionException {
+    public JenaTripleLike asGeneralizedTriple(final org.apache.jena.graph.Triple triple) throws ConversionException {
         return internalJenaFactory.createGeneralizedTriple(triple, salt());
     }
 
@@ -357,7 +357,7 @@ public final class JenaRDF implements RDF {
      * @throws ConversionException
      *             if any of the quad nodes are not concrete
      */
-    public JenaQuadLike<RDFTerm> asGeneralizedQuad(org.apache.jena.sparql.core.Quad quad) throws ConversionException {
+    public JenaQuadLike<RDFTerm> asGeneralizedQuad(final org.apache.jena.sparql.core.Quad quad) throws ConversionException {
         return internalJenaFactory.createGeneralizedQuad(quad, salt());
     }
 
@@ -382,7 +382,7 @@ public final class JenaRDF implements RDF {
      *             if any of the triple's nodes are not concrete or the triple
      *             is a generalized triple
      */
-    public static Triple asTriple(RDF factory, org.apache.jena.graph.Triple triple) throws ConversionException {
+    public static Triple asTriple(final RDF factory, final org.apache.jena.graph.Triple triple) throws ConversionException {
         if (factory instanceof JenaRDF) {
             // No need to convert, just wrap
             return ((JenaRDF) factory).asTriple(triple);
@@ -412,7 +412,7 @@ public final class JenaRDF implements RDF {
      *            Jena quad
      * @return Adapted quad
      */
-    public JenaQuad asQuad(org.apache.jena.sparql.core.Quad quad) {
+    public JenaQuad asQuad(final org.apache.jena.sparql.core.Quad quad) {
         return internalJenaFactory.createQuad(quad, salt());
     }
 
@@ -433,7 +433,7 @@ public final class JenaRDF implements RDF {
      *            Jena {@link org.apache.jena.graph.Graph} to adapt
      * @return Adapted {@link JenaGraph}
      */
-    public JenaGraph asGraph(org.apache.jena.graph.Graph graph) {
+    public JenaGraph asGraph(final org.apache.jena.graph.Graph graph) {
         return internalJenaFactory.createGraph(graph, salt());
     }
 
@@ -454,7 +454,7 @@ public final class JenaRDF implements RDF {
      *            Jena {@link org.apache.jena.rdf.model.Model} to adapt
      * @return Adapted {@link JenaGraph}
      */
-    public JenaGraph asGraph(org.apache.jena.rdf.model.Model model) {
+    public JenaGraph asGraph(final org.apache.jena.rdf.model.Model model) {
         return internalJenaFactory.createGraph(model, salt());
     }
 
@@ -476,7 +476,7 @@ public final class JenaRDF implements RDF {
      *            Jena {@link DatasetGraph} to adapt
      * @return Adapted {@link JenaDataset}
      */
-    public JenaDataset asDataset(DatasetGraph datasetGraph) {
+    public JenaDataset asDataset(final DatasetGraph datasetGraph) {
         return internalJenaFactory.createDataset(datasetGraph, salt());
     }
 
@@ -498,7 +498,7 @@ public final class JenaRDF implements RDF {
      *            Jena {@link org.apache.jena.query.Dataset} to adapt
      * @return Adapted {@link JenaDataset}
      */
-    public JenaDataset asDataset(org.apache.jena.query.Dataset datasetGraph) {
+    public JenaDataset asDataset(final org.apache.jena.query.Dataset datasetGraph) {
         return internalJenaFactory.createDataset(datasetGraph.asDatasetGraph(), salt());
     }
 
@@ -524,7 +524,7 @@ public final class JenaRDF implements RDF {
      *             if any of the quad's nodes are not concrete or the quad is a
      *             generalized quad
      */
-    public static Quad asQuad(RDF factory, org.apache.jena.sparql.core.Quad quad) {
+    public static Quad asQuad(final RDF factory, final org.apache.jena.sparql.core.Quad quad) {
         if (factory instanceof JenaRDF) {
             // No need to convert, just wrap
             return ((JenaRDF) factory).asQuad(quad);
@@ -543,7 +543,7 @@ public final class JenaRDF implements RDF {
      *            {@link Lang} to convert
      * @return Matched {@link RDFSyntax}, otherwise {@link Optional#empty()}
      */
-    public Optional<RDFSyntax> asRDFSyntax(Lang lang) {
+    public Optional<RDFSyntax> asRDFSyntax(final Lang lang) {
         return RDFSyntax.byMediaType(lang.getContentType().getContentType());
     }
 
@@ -554,7 +554,7 @@ public final class JenaRDF implements RDF {
      *            {@link RDFSyntax} to convert
      * @return Matched {@link Lang}, otherwise {@link Optional#empty()}
      */
-    public Optional<Lang> asJenaLang(RDFSyntax rdfSyntax) {
+    public Optional<Lang> asJenaLang(final RDFSyntax rdfSyntax) {
         return Optional.ofNullable(RDFLanguages.contentTypeToLang(rdfSyntax.mediaType));
     }
 
@@ -573,10 +573,10 @@ public final class JenaRDF implements RDF {
      * @return A {@link StreamRDF} that will stream converted quads to the
      *         consumer
      */
-    public static StreamRDF streamJenaToQuad(RDF factory, Consumer<Quad> consumer) {
+    public static StreamRDF streamJenaToQuad(final RDF factory, final Consumer<Quad> consumer) {
         return new StreamRDFBase() {
             @Override
-            public void quad(org.apache.jena.sparql.core.Quad quad) {
+            public void quad(final org.apache.jena.sparql.core.Quad quad) {
                 consumer.accept(asQuad(factory, quad));
             }
         };
@@ -598,10 +598,10 @@ public final class JenaRDF implements RDF {
      * @return A {@link StreamRDF} that will stream generalized triples to the
      *         consumer
      */
-    public StreamRDF streamJenaToGeneralizedTriple(Consumer<TripleLike> generalizedConsumer) {
+    public StreamRDF streamJenaToGeneralizedTriple(final Consumer<TripleLike> generalizedConsumer) {
         return new StreamRDFBase() {
             @Override
-            public void triple(org.apache.jena.graph.Triple triple) {
+            public void triple(final org.apache.jena.graph.Triple triple) {
                 generalizedConsumer.accept(asGeneralizedTriple(triple));
             }
         };
@@ -623,10 +623,10 @@ public final class JenaRDF implements RDF {
      * @return A {@link StreamRDF} that will stream generalized quads to the
      *         consumer
      */
-    public StreamRDF streamJenaToGeneralizedQuad(Consumer<QuadLike<RDFTerm>> generalizedConsumer) {
+    public StreamRDF streamJenaToGeneralizedQuad(final Consumer<QuadLike<RDFTerm>> generalizedConsumer) {
         return new StreamRDFBase() {
             @Override
-            public void quad(org.apache.jena.sparql.core.Quad quad) {
+            public void quad(final org.apache.jena.sparql.core.Quad quad) {
                 generalizedConsumer.accept(asGeneralizedQuad(quad));
             }
         };
@@ -641,7 +641,7 @@ public final class JenaRDF implements RDF {
      *            Commons RDF {@link Graph} to convert
      * @return Converted Jena {@link org.apache.jena.graph.Graph}
      */
-    public org.apache.jena.graph.Graph asJenaGraph(Graph graph) {
+    public org.apache.jena.graph.Graph asJenaGraph(final Graph graph) {
         if (graph instanceof JenaGraph) {
             return ((JenaGraph) graph).asJenaGraph();
         }
@@ -659,7 +659,7 @@ public final class JenaRDF implements RDF {
      *            Commons RDF {@link RDFTerm} to convert
      * @return Converted Jena {@link Node}
      */
-    public Node asJenaNode(RDFTerm term) {
+    public Node asJenaNode(final RDFTerm term) {
         if (term == null) {
             return null;
         }
@@ -699,7 +699,7 @@ public final class JenaRDF implements RDF {
      *            Commons RDF {@link Triple} to convert
      * @return Converted Jena {@link org.apache.jena.graph.Triple}
      */
-    public org.apache.jena.graph.Triple asJenaTriple(Triple triple) {
+    public org.apache.jena.graph.Triple asJenaTriple(final Triple triple) {
         if (triple instanceof JenaTriple) {
             return ((JenaTriple) triple).asJenaTriple();
         }
@@ -719,7 +719,7 @@ public final class JenaRDF implements RDF {
      *            Commons RDF {@link Quad} to convert
      * @return Converted Jena {@link org.apache.jena.sparql.core.Quad}
      */
-    public org.apache.jena.sparql.core.Quad asJenaQuad(Quad quad) {
+    public org.apache.jena.sparql.core.Quad asJenaQuad(final Quad quad) {
         if (quad instanceof JenaQuad) {
             return ((JenaQuad) quad).asJenaQuad();
         }
@@ -731,7 +731,7 @@ public final class JenaRDF implements RDF {
     }
 
     // Some simple validations - full IRI parsing is not cheap.
-    private void validateIRI(String iri) {
+    private void validateIRI(final String iri) {
         if (iri.contains(" ")) {
             throw new IllegalArgumentException();
         }
@@ -743,7 +743,7 @@ public final class JenaRDF implements RDF {
         }
     }
 
-    private static void validateLang(String languageTag) {
+    private static void validateLang(final String languageTag) {
         if (languageTag.contains(" ")) {
             throw new IllegalArgumentException("Invalid language tag: " + languageTag);
         }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/jena/src/main/java/org/apache/commons/rdf/jena/experimental/JenaRDFParser.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/experimental/JenaRDFParser.java b/jena/src/main/java/org/apache/commons/rdf/jena/experimental/JenaRDFParser.java
index fa3f4b3..12eea05 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/experimental/JenaRDFParser.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/experimental/JenaRDFParser.java
@@ -48,14 +48,14 @@ public class JenaRDFParser extends AbstractRDFParser<JenaRDFParser> implements R
         return new JenaRDF();
     }
 
-    public JenaRDFParser targetGeneralizedTriple(Consumer<TripleLike> consumer) {
+    public JenaRDFParser targetGeneralizedTriple(final Consumer<TripleLike> consumer) {
         JenaRDFParser c = this.clone();
         c.resetTarget();
         c.generalizedConsumerTriple = consumer;
         return c;
     }
 
-    public JenaRDFParser targetGeneralizedQuad(Consumer<QuadLike<RDFTerm>> consumer) {
+    public JenaRDFParser targetGeneralizedQuad(final Consumer<QuadLike<RDFTerm>> consumer) {
         JenaRDFParser c = this.clone();
         c.resetTarget();
         c.generalizedConsumerQuad = consumer;

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractJenaRDFTerm.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractJenaRDFTerm.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractJenaRDFTerm.java
index bc22a67..18e07e3 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractJenaRDFTerm.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractJenaRDFTerm.java
@@ -27,7 +27,7 @@ class AbstractJenaRDFTerm implements JenaRDFTerm, RDFTerm {
     private final Node node;
     // static private PrefixMapping empty = new PrefixMappingImpl();
 
-    protected AbstractJenaRDFTerm(Node node) {
+    protected AbstractJenaRDFTerm(final Node node) {
         this.node = node;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractQuadLike.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractQuadLike.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractQuadLike.java
index 691eeee..81e7d17 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractQuadLike.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractQuadLike.java
@@ -59,19 +59,19 @@ abstract class AbstractQuadLike<S extends RDFTerm, P extends RDFTerm, O extends
     org.apache.jena.sparql.core.Quad quad = null;
     org.apache.jena.graph.Triple triple = null;
 
-    AbstractQuadLike(S subject, P predicate, O object, Optional<G> graphName) {
+    AbstractQuadLike(final S subject, final P predicate, final O object, final Optional<G> graphName) {
         this.subject = Objects.requireNonNull(subject);
         this.predicate = Objects.requireNonNull(predicate);
         this.object = Objects.requireNonNull(object);
         this.graphName = Objects.requireNonNull(graphName);
     }
 
-    AbstractQuadLike(S subject, P predicate, O object) {
+    AbstractQuadLike(final S subject, final P predicate, final O object) {
         this(subject, predicate, object, Optional.empty());
     }
 
     @SuppressWarnings("unchecked")
-    AbstractQuadLike(org.apache.jena.sparql.core.Quad quad, UUID salt) {
+    AbstractQuadLike(final org.apache.jena.sparql.core.Quad quad, final UUID salt) {
         this.quad = Objects.requireNonNull(quad);
         this.subject = (S) internalJenaFactory.createRDFTerm(quad.getSubject(), salt);
         this.predicate = (P) internalJenaFactory.createRDFTerm(quad.getPredicate(), salt);
@@ -80,7 +80,7 @@ abstract class AbstractQuadLike<S extends RDFTerm, P extends RDFTerm, O extends
     }
 
     @SuppressWarnings("unchecked")
-    AbstractQuadLike(org.apache.jena.graph.Triple triple, UUID salt) {
+    AbstractQuadLike(final org.apache.jena.graph.Triple triple, final UUID salt) {
         this.triple = Objects.requireNonNull(triple);
         this.subject = (S) internalJenaFactory.createRDFTerm(triple.getSubject(), salt);
         this.predicate = (P) internalJenaFactory.createRDFTerm(triple.getPredicate(), salt);

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/jena/src/main/java/org/apache/commons/rdf/jena/impl/InternalJenaFactory.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/InternalJenaFactory.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/InternalJenaFactory.java
index aa11572..80a9d3d 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/InternalJenaFactory.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/InternalJenaFactory.java
@@ -58,78 +58,78 @@ import org.apache.jena.sparql.graph.GraphFactory;
  */
 public abstract class InternalJenaFactory {
 
-    public JenaBlankNode createBlankNode(String id, UUID salt) {
+    public JenaBlankNode createBlankNode(final String id, final UUID salt) {
         return new JenaBlankNodeImpl(NodeFactory.createBlankNode(id), salt);
     }
 
-    public JenaBlankNode createBlankNode(UUID salt) {
+    public JenaBlankNode createBlankNode(final UUID salt) {
         return new JenaBlankNodeImpl(NodeFactory.createBlankNode(), salt);
     }
 
-    public JenaDataset createDataset(DatasetGraph datasetGraph, UUID salt) {
+    public JenaDataset createDataset(final DatasetGraph datasetGraph, final UUID salt) {
         return new JenaDatasetImpl(datasetGraph, salt);
     }
 
-    public JenaDataset createDataset(UUID salt) {
+    public JenaDataset createDataset(final UUID salt) {
         DatasetGraph dg = DatasetGraphFactory.createGeneral();
         // Or which createMethod() -- a bit confusing with lots of choice..
         return new JenaDatasetImpl(dg, salt);
     }
 
-    public JenaGeneralizedQuadLike createGeneralizedQuad(org.apache.jena.sparql.core.Quad quad, UUID salt) {
+    public JenaGeneralizedQuadLike createGeneralizedQuad(final org.apache.jena.sparql.core.Quad quad, final UUID salt) {
         return new JenaGeneralizedQuadLikeImpl(quad, salt);
     }
 
-    public JenaGeneralizedQuadLike createGeneralizedQuad(RDFTerm subject, RDFTerm predicate, RDFTerm object,
-            RDFTerm graphName) {
+    public JenaGeneralizedQuadLike createGeneralizedQuad(final RDFTerm subject, final RDFTerm predicate, final RDFTerm object,
+            final RDFTerm graphName) {
         return new JenaGeneralizedQuadLikeImpl(subject, predicate, object, Optional.ofNullable(graphName));
     }
 
-    public JenaGeneralizedTripleLike createGeneralizedTriple(org.apache.jena.graph.Triple triple, UUID salt) {
+    public JenaGeneralizedTripleLike createGeneralizedTriple(final org.apache.jena.graph.Triple triple, final UUID salt) {
         return new JenaGeneralizedTripleLikeImpl(triple, salt);
     }
 
-    public JenaGeneralizedTripleLike createGeneralizedTriple(RDFTerm subject, RDFTerm predicate, RDFTerm object) {
+    public JenaGeneralizedTripleLike createGeneralizedTriple(final RDFTerm subject, final RDFTerm predicate, final RDFTerm object) {
         return new JenaGeneralizedTripleLikeImpl(subject, predicate, object);
     }
 
-    public JenaGraph createGraph(Model model, UUID salt) {
+    public JenaGraph createGraph(final Model model, final UUID salt) {
         return new JenaGraphImpl(model, salt);
     }
 
-    public JenaGraph createGraph(org.apache.jena.graph.Graph graph, UUID salt) {
+    public JenaGraph createGraph(final org.apache.jena.graph.Graph graph, final UUID salt) {
         return new JenaGraphImpl(graph, salt);
     }
 
-    public JenaGraph createGraph(UUID salt) {
+    public JenaGraph createGraph(final UUID salt) {
         return new JenaGraphImpl(GraphFactory.createDefaultGraph(), salt);
     }
 
-    public JenaIRI createIRI(String iriStr) {
+    public JenaIRI createIRI(final String iriStr) {
         return new JenaIRIImpl(iriStr);
     }
 
-    public JenaLiteral createLiteral(String lexStr) {
+    public JenaLiteral createLiteral(final String lexStr) {
         return new JenaLiteralImpl(NodeFactory.createLiteral(lexStr));
     }
 
-    public JenaLiteral createLiteralDT(String lexStr, String datatypeIRI) {
+    public JenaLiteral createLiteralDT(final String lexStr, final String datatypeIRI) {
         return new JenaLiteralImpl(NodeFactory.createLiteral(lexStr, NodeFactory.getType(datatypeIRI)));
     }
 
-    public JenaLiteral createLiteralLang(String lexStr, String langTag) {
+    public JenaLiteral createLiteralLang(final String lexStr, final String langTag) {
         return new JenaLiteralImpl(NodeFactory.createLiteral(lexStr, langTag));
     }
 
-    public JenaQuad createQuad(BlankNodeOrIRI subject, IRI predicate, RDFTerm object, BlankNodeOrIRI graphName) {
+    public JenaQuad createQuad(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object, final BlankNodeOrIRI graphName) {
         return new JenaQuadImpl(subject, predicate, object, Optional.ofNullable(graphName));
     }
 
-    public JenaQuad createQuad(org.apache.jena.sparql.core.Quad quad, UUID salt) {
+    public JenaQuad createQuad(final org.apache.jena.sparql.core.Quad quad, final UUID salt) {
         return new JenaQuadImpl(quad, salt);
     }
 
-    public JenaRDFTerm createRDFTerm(Node node, UUID salt) throws ConversionException {
+    public JenaRDFTerm createRDFTerm(final Node node, final UUID salt) throws ConversionException {
         if (!node.isConcrete()) {
             throw new ConversionException("Node is not a concrete RDF Term: " + node);
         }
@@ -153,11 +153,11 @@ public abstract class InternalJenaFactory {
         throw new ConversionException("Unrecognized node type: " + node);
     }
 
-    public JenaTriple createTriple(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public JenaTriple createTriple(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         return new JenaTripleImpl(subject, predicate, object);
     }
 
-    public JenaTriple createTriple(org.apache.jena.graph.Triple triple, UUID salt) {
+    public JenaTriple createTriple(final org.apache.jena.graph.Triple triple, final UUID salt) {
         return new JenaTripleImpl(triple, salt);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaBlankNodeImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaBlankNodeImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaBlankNodeImpl.java
index 46a65fe..d8eaa23 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaBlankNodeImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaBlankNodeImpl.java
@@ -28,7 +28,7 @@ class JenaBlankNodeImpl extends AbstractJenaRDFTerm implements JenaBlankNode {
 
     private final UUID salt;
 
-    JenaBlankNodeImpl(Node node, UUID salt) {
+    JenaBlankNodeImpl(final Node node, final UUID salt) {
         super(node);
         if (!node.isBlank()) {
             throw new IllegalArgumentException("Node is not a blank node: " + node);
@@ -37,7 +37,7 @@ class JenaBlankNodeImpl extends AbstractJenaRDFTerm implements JenaBlankNode {
     }
 
     @Override
-    public boolean equals(Object other) {
+    public boolean equals(final Object other) {
         if (other == this) {
             return true;
         }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java
index f8103cd..ddebc19 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java
@@ -47,20 +47,20 @@ class JenaDatasetImpl implements JenaDataset {
     private final UUID salt;
     private final JenaRDF factory;
 
-    JenaDatasetImpl(DatasetGraph graph, UUID salt) {
+    JenaDatasetImpl(final DatasetGraph graph, final UUID salt) {
         this.graph = graph;
         this.salt = salt;
         this.factory = new JenaRDF(salt);
     }
 
     @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) {
         graph.add(org.apache.jena.sparql.core.Quad.create(factory.asJenaNode(graphName), factory.asJenaNode(subject),
                 factory.asJenaNode(predicate), factory.asJenaNode(object)));
     }
 
     @Override
-    public void add(Quad quad) {
+    public void add(final Quad quad) {
         graph.add(factory.asJenaQuad(quad));
     }
 
@@ -80,12 +80,12 @@ class JenaDatasetImpl implements JenaDataset {
     }
 
     @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 graph.contains(toJenaPattern(graphName), toJenaPattern(subject), toJenaPattern(predicate),
                 toJenaPattern(object));
     }
 
-    private Node toJenaPattern(Optional<? extends RDFTerm> graphName) {
+    private Node toJenaPattern(final Optional<? extends RDFTerm> graphName) {
         // In theory we could have done:
         // factory.toJena(graphName.orElse(internalJenaFactory::createAnyVariable))
         // but because of generics casting rules that doesn't work :(
@@ -97,7 +97,7 @@ class JenaDatasetImpl implements JenaDataset {
         return factory.asJenaNode(graphName.orElse(null));
     }
 
-    private Node toJenaPattern(RDFTerm term) {
+    private Node toJenaPattern(final RDFTerm term) {
         if (term == null) {
             return ANY;
         }
@@ -105,18 +105,18 @@ class JenaDatasetImpl implements JenaDataset {
     }
 
     @Override
-    public boolean contains(Quad quad) {
+    public boolean contains(final Quad quad) {
         return graph.contains(factory.asJenaQuad(quad));
     }
 
     @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) {
         graph.deleteAny(toJenaPattern(graphName), toJenaPattern(subject),
                 toJenaPattern(predicate), toJenaPattern(object));
     }
 
     @Override
-    public void remove(Quad quad) {
+    public void remove(final Quad quad) {
         graph.delete(factory.asJenaQuad(quad));
     }
 
@@ -135,7 +135,7 @@ class JenaDatasetImpl implements JenaDataset {
     }
 
     @Override
-    public Stream<? extends Quad> stream(Optional<BlankNodeOrIRI> g, BlankNodeOrIRI s, IRI p, RDFTerm o) {
+    public Stream<? extends Quad> stream(final Optional<BlankNodeOrIRI> g, final BlankNodeOrIRI s, final IRI p, final RDFTerm o) {
         JenaRDF factory = new JenaRDF(salt);
         return Iter.asStream(graph.find(toJenaPattern(g), toJenaPattern(s), toJenaPattern(p), toJenaPattern(o)), true)
                 .map(factory::asQuad);
@@ -161,7 +161,7 @@ class JenaDatasetImpl implements JenaDataset {
     }
 
     @Override
-    public Optional<Graph> getGraph(BlankNodeOrIRI graphName) {
+    public Optional<Graph> getGraph(final BlankNodeOrIRI graphName) {
         GraphView gv = GraphView.createNamedGraph(graph, factory.asJenaNode(graphName));
         return Optional.of(new JenaGraphImpl(gv, salt));
     }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedQuadLikeImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedQuadLikeImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedQuadLikeImpl.java
index 65eaae5..cff48f3 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedQuadLikeImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedQuadLikeImpl.java
@@ -27,11 +27,11 @@ import org.apache.jena.sparql.core.Quad;
 class JenaGeneralizedQuadLikeImpl extends AbstractQuadLike<RDFTerm, RDFTerm, RDFTerm, RDFTerm>
         implements JenaGeneralizedQuadLike {
 
-    JenaGeneralizedQuadLikeImpl(RDFTerm subject, RDFTerm predicate, RDFTerm object, Optional<RDFTerm> ofNullable) {
+    JenaGeneralizedQuadLikeImpl(final RDFTerm subject, final RDFTerm predicate, final RDFTerm object, final Optional<RDFTerm> ofNullable) {
         super(subject, predicate, object, ofNullable);
     }
 
-    JenaGeneralizedQuadLikeImpl(Quad quad, UUID salt) {
+    JenaGeneralizedQuadLikeImpl(final Quad quad, final UUID salt) {
         super(quad, salt);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedTripleLikeImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedTripleLikeImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedTripleLikeImpl.java
index a54075a..374717d 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedTripleLikeImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedTripleLikeImpl.java
@@ -26,11 +26,11 @@ import org.apache.jena.graph.Triple;
 class JenaGeneralizedTripleLikeImpl extends AbstractQuadLike<RDFTerm, RDFTerm, RDFTerm, RDFTerm>
         implements JenaGeneralizedTripleLike {
 
-    JenaGeneralizedTripleLikeImpl(RDFTerm subject, RDFTerm predicate, RDFTerm object) {
+    JenaGeneralizedTripleLikeImpl(final RDFTerm subject, final RDFTerm predicate, final RDFTerm object) {
         super(subject, predicate, object);
     }
 
-    JenaGeneralizedTripleLikeImpl(Triple triple, UUID salt) {
+    JenaGeneralizedTripleLikeImpl(final Triple triple, final UUID salt) {
         super(triple, salt);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGraphImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGraphImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGraphImpl.java
index 40b7280..6454ac3 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGraphImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGraphImpl.java
@@ -42,13 +42,13 @@ class JenaGraphImpl implements JenaGraph {
     private final transient JenaRDF factory;
     private Model model;
 
-    JenaGraphImpl(org.apache.jena.graph.Graph graph, UUID salt) {
+    JenaGraphImpl(final org.apache.jena.graph.Graph graph, final UUID salt) {
         this.graph = graph;
         this.salt = salt;
         this.factory = new JenaRDF(salt);
     }
 
-    JenaGraphImpl(Model model, UUID salt) {
+    JenaGraphImpl(final Model model, final UUID salt) {
         this.model = model;
         this.graph = model.getGraph();
         this.salt = salt;
@@ -56,13 +56,13 @@ class JenaGraphImpl implements JenaGraph {
     }
 
     @Override
-    public void add(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public void add(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         graph.add(org.apache.jena.graph.Triple.create(factory.asJenaNode(subject), factory.asJenaNode(predicate),
                 factory.asJenaNode(object)));
     }
 
     @Override
-    public void add(Triple triple) {
+    public void add(final Triple triple) {
         graph.add(factory.asJenaTriple(triple));
     }
 
@@ -82,22 +82,22 @@ class JenaGraphImpl implements JenaGraph {
     }
 
     @Override
-    public boolean contains(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public boolean contains(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         return graph.contains(toJenaPattern(subject), toJenaPattern(predicate), toJenaPattern(object));
     }
 
     @Override
-    public boolean contains(Triple triple) {
+    public boolean contains(final Triple triple) {
         return graph.contains(factory.asJenaTriple(triple));
     }
 
     @Override
-    public void remove(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public void remove(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         graph.delete(org.apache.jena.graph.Triple.create(toJenaPattern(subject), toJenaPattern(predicate),
                 toJenaPattern(object)));
     }
 
-    private Node toJenaPattern(RDFTerm pattern) {
+    private Node toJenaPattern(final RDFTerm pattern) {
         if (pattern == null) { 
             return Node.ANY;
         }
@@ -105,7 +105,7 @@ class JenaGraphImpl implements JenaGraph {
     }
 
     @Override
-    public void remove(Triple triple) {
+    public void remove(final Triple triple) {
         graph.delete(factory.asJenaTriple(triple));
     }
 
@@ -121,12 +121,12 @@ class JenaGraphImpl implements JenaGraph {
     }
 
     @Override
-    public Stream<? extends Triple> stream(BlankNodeOrIRI s, IRI p, RDFTerm o) {
+    public Stream<? extends Triple> stream(final BlankNodeOrIRI s, final IRI p, final RDFTerm o) {
         JenaRDF factory = new JenaRDF(salt);
         return Iter.asStream(graph.find(toJenaAny(s), toJenaAny(p), toJenaAny(o)), true).map(factory::asTriple);
     }
 
-    private Node toJenaAny(RDFTerm term) {
+    private Node toJenaAny(final RDFTerm term) {
         if (term == null) {
             return Node.ANY;
         }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaIRIImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaIRIImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaIRIImpl.java
index 69e1b97..36f8880 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaIRIImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaIRIImpl.java
@@ -25,7 +25,7 @@ import org.apache.jena.graph.NodeFactory;
 
 class JenaIRIImpl extends AbstractJenaRDFTerm implements JenaIRI {
 
-    JenaIRIImpl(Node node) {
+    JenaIRIImpl(final Node node) {
         super(node);
         if (!node.isURI()) {
             throw new IllegalArgumentException("Node is not a blank node: " + node);
@@ -33,12 +33,12 @@ class JenaIRIImpl extends AbstractJenaRDFTerm implements JenaIRI {
 
     }
 
-    JenaIRIImpl(String iriStr) {
+    JenaIRIImpl(final String iriStr) {
         super(NodeFactory.createURI(iriStr));
     }
 
     @Override
-    public boolean equals(Object other) {
+    public boolean equals(final Object other) {
         if (other == this) {
             return true;
         }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaLiteralImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaLiteralImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaLiteralImpl.java
index 5891f8b..637c51f 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaLiteralImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaLiteralImpl.java
@@ -31,7 +31,7 @@ class JenaLiteralImpl extends AbstractJenaRDFTerm implements JenaLiteral {
     private static InternalJenaFactory internalJenaFactory = new InternalJenaFactory() {
     };
 
-    JenaLiteralImpl(Node node) {
+    JenaLiteralImpl(final Node node) {
         super(node);
         if (!node.isLiteral()) {
             throw new IllegalArgumentException("Node is not a literal: " + node);
@@ -39,7 +39,7 @@ class JenaLiteralImpl extends AbstractJenaRDFTerm implements JenaLiteral {
     }
 
     @Override
-    public boolean equals(Object other) {
+    public boolean equals(final Object other) {
         if (other == this) {
             return true;
         }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaQuadImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaQuadImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaQuadImpl.java
index 4da0133..491b80d 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaQuadImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaQuadImpl.java
@@ -31,11 +31,11 @@ import org.apache.commons.rdf.jena.JenaQuad;
 
 class JenaQuadImpl extends AbstractQuadLike<BlankNodeOrIRI, IRI, RDFTerm, BlankNodeOrIRI> implements JenaQuad {
 
-    JenaQuadImpl(BlankNodeOrIRI subject, IRI predicate, RDFTerm object, Optional<BlankNodeOrIRI> graphName) {
+    JenaQuadImpl(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object, final Optional<BlankNodeOrIRI> graphName) {
         super(subject, predicate, object, graphName);
     }
 
-    JenaQuadImpl(org.apache.jena.sparql.core.Quad quad, UUID salt) {
+    JenaQuadImpl(final org.apache.jena.sparql.core.Quad quad, final UUID salt) {
         super(quad, salt);
         // Check the conversion
         if ((graphName.isPresent() && !(graphName.get() instanceof BlankNodeOrIRI))
@@ -46,7 +46,7 @@ class JenaQuadImpl extends AbstractQuadLike<BlankNodeOrIRI, IRI, RDFTerm, BlankN
     }
 
     @Override
-    public boolean equals(Object other) {
+    public boolean equals(final Object other) {
         if (other == this) {
             return true;
         }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaTripleImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaTripleImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaTripleImpl.java
index 54f8a39..b18c3d0 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaTripleImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaTripleImpl.java
@@ -30,11 +30,11 @@ import org.apache.commons.rdf.jena.JenaTriple;
 
 class JenaTripleImpl extends AbstractQuadLike<BlankNodeOrIRI, IRI, RDFTerm, RDFTerm> implements JenaTriple {
 
-    JenaTripleImpl(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    JenaTripleImpl(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         super(subject, predicate, object);
     }
 
-    JenaTripleImpl(org.apache.jena.graph.Triple triple, UUID salt) throws ConversionException {
+    JenaTripleImpl(final org.apache.jena.graph.Triple triple, final UUID salt) throws ConversionException {
         super(triple, salt);
         // Check the conversion
         if (!(subject instanceof BlankNodeOrIRI) || !(predicate instanceof IRI) || !(object instanceof RDFTerm)) {
@@ -43,7 +43,7 @@ class JenaTripleImpl extends AbstractQuadLike<BlankNodeOrIRI, IRI, RDFTerm, RDFT
     }
 
     @Override
-    public boolean equals(Object other) {
+    public boolean equals(final Object other) {
         if (other == this) {
             return true;
         }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/jena/src/test/java/org/apache/commons/rdf/jena/TestBlankNodeJena.java
----------------------------------------------------------------------
diff --git a/jena/src/test/java/org/apache/commons/rdf/jena/TestBlankNodeJena.java b/jena/src/test/java/org/apache/commons/rdf/jena/TestBlankNodeJena.java
index 49470c0..d797015 100644
--- a/jena/src/test/java/org/apache/commons/rdf/jena/TestBlankNodeJena.java
+++ b/jena/src/test/java/org/apache/commons/rdf/jena/TestBlankNodeJena.java
@@ -40,7 +40,7 @@ public class TestBlankNodeJena extends AbstractBlankNodeTest {
     }
 
     @Override
-    protected BlankNode getBlankNode(String identifier) {
+    protected BlankNode getBlankNode(final String identifier) {
         return internalJenaFactory.createBlankNode(identifier, SALT);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNode.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNode.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNode.java
index c626df2..a9b13e2 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNode.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNode.java
@@ -27,7 +27,7 @@ public interface JsonLdBlankNode extends JsonLdTerm, BlankNode {
 final class JsonLdBlankNodeImpl extends JsonLdTermImpl implements JsonLdBlankNode {
     private final String blankNodePrefix;
 
-    JsonLdBlankNodeImpl(Node node, String blankNodePrefix) {
+    JsonLdBlankNodeImpl(final Node node, final String blankNodePrefix) {
         super(node);
         this.blankNodePrefix = blankNodePrefix;
         if (!node.isBlankNode()) {
@@ -47,7 +47,7 @@ final class JsonLdBlankNodeImpl extends JsonLdTermImpl implements JsonLdBlankNod
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (!(obj instanceof BlankNode)) {
             return false;
         }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
index 6b65ab5..8788860 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
@@ -37,25 +37,25 @@ public interface JsonLdDataset extends JsonLdGraphLike<org.apache.commons.rdf.ap
 
 class JsonLdDatasetImpl extends AbstractJsonLdGraphLike<org.apache.commons.rdf.api.Quad> implements JsonLdDataset {
 
-    JsonLdDatasetImpl(RDFDataset rdfDataSet) {
+    JsonLdDatasetImpl(final RDFDataset rdfDataSet) {
         super(rdfDataSet);
     }
 
-    JsonLdDatasetImpl(RDFDataset rdfDataset, String bnodePrefix) {
+    JsonLdDatasetImpl(final RDFDataset rdfDataset, final String bnodePrefix) {
         super(rdfDataset, bnodePrefix);
     }
 
-    JsonLdDatasetImpl(String bnodePrefix) {
+    JsonLdDatasetImpl(final String bnodePrefix) {
         super(bnodePrefix);
     }
 
     @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) {
         super.add(graphName, subject, predicate, object);
     }
 
     @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 super.contains(graphName, subject, predicate, object);
     }
 
@@ -65,7 +65,7 @@ class JsonLdDatasetImpl extends AbstractJsonLdGraphLike<org.apache.commons.rdf.a
     }
 
     @Override
-    public Optional<Graph> getGraph(BlankNodeOrIRI graphName) {
+    public Optional<Graph> getGraph(final BlankNodeOrIRI graphName) {
         if (graphName == null) {
             return Optional.of(getGraph());
         }
@@ -81,18 +81,18 @@ class JsonLdDatasetImpl extends AbstractJsonLdGraphLike<org.apache.commons.rdf.a
     }
 
     @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) {
         super.remove(graphName, subject, predicate, object);
     }
 
     @Override
-    public void remove(Quad q) {
+    public void remove(final Quad q) {
         remove(q.getGraphName(), q.getSubject(), q.getPredicate(), q.getObject());
     }
 
     @Override
-    public Stream<? extends Quad> stream(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI subject, IRI predicate,
-            RDFTerm object) {
+    public Stream<? extends Quad> stream(final Optional<BlankNodeOrIRI> graphName, final BlankNodeOrIRI subject, final IRI predicate,
+            final RDFTerm object) {
         return filteredGraphs(graphName).flatMap(List::stream).filter(quadFilter(subject, predicate, object))
                 .map(factory::asQuad);
     }
@@ -104,7 +104,7 @@ class JsonLdDatasetImpl extends AbstractJsonLdGraphLike<org.apache.commons.rdf.a
     }
 
     @Override
-    Quad asTripleOrQuad(com.github.jsonldjava.core.RDFDataset.Quad jsonldQuad) {
+    Quad asTripleOrQuad(final com.github.jsonldjava.core.RDFDataset.Quad jsonldQuad) {
         return factory.asQuad(jsonldQuad);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
index 42061a1..fe91536 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
@@ -41,17 +41,17 @@ class JsonLdGraphImpl extends AbstractJsonLdGraphLike<Triple> implements JsonLdG
 
     private final Optional<BlankNodeOrIRI> graphName;
 
-    JsonLdGraphImpl(RDFDataset rdfDataSet) {
+    JsonLdGraphImpl(final RDFDataset rdfDataSet) {
         super(rdfDataSet);
         this.graphName = Optional.empty();
     }
 
-    JsonLdGraphImpl(RDFDataset rdfDataSet, Optional<BlankNodeOrIRI> graphName, String bnodePrefix) {
+    JsonLdGraphImpl(final RDFDataset rdfDataSet, final Optional<BlankNodeOrIRI> graphName, final String bnodePrefix) {
         super(rdfDataSet, bnodePrefix);
         this.graphName = Objects.requireNonNull(graphName);
     }
 
-    JsonLdGraphImpl(String bnodePrefix) {
+    JsonLdGraphImpl(final String bnodePrefix) {
         super(bnodePrefix);
         this.graphName = Optional.empty();
     }
@@ -62,33 +62,33 @@ class JsonLdGraphImpl extends AbstractJsonLdGraphLike<Triple> implements JsonLdG
     }
 
     @Override
-    public void add(Triple t) {
+    public void add(final Triple t) {
         // Ensure it's added in the correct graph
         super.add(graphName.orElse(null), t.getSubject(), t.getPredicate(), t.getObject());
     }
 
     @Override
-    public void add(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public void add(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         super.add(graphName.orElse(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(graphName, subject, predicate, object);
     }
 
     @Override
-    public boolean contains(Triple t) {
+    public boolean contains(final Triple t) {
         return contains(graphName, t.getSubject(), t.getPredicate(), t.getObject());
     }
 
     @Override
-    public void remove(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public void remove(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         super.remove(graphName, subject, predicate, object);
     }
 
     @Override
-    public void remove(Triple t) {
+    public void remove(final Triple t) {
         // Only remove from the particular graph
         remove(graphName, t.getSubject(), t.getPredicate(), t.getObject());
     }
@@ -100,13 +100,13 @@ class JsonLdGraphImpl extends AbstractJsonLdGraphLike<Triple> implements JsonLdG
     }
 
     @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(graphName).flatMap(List::stream).filter(quadFilter(subject, predicate, object))
                 .map(factory::asTriple);
     }
 
     @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/JsonLdGraphLike.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
index dcc61b2..7424f3d 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
@@ -80,22 +80,22 @@ abstract class AbstractJsonLdGraphLike<T extends TripleLike> implements JsonLdGr
      */
     RDFDataset rdfDataSet;
 
-    AbstractJsonLdGraphLike(RDFDataset rdfDataSet) {
+    AbstractJsonLdGraphLike(final RDFDataset rdfDataSet) {
         this(rdfDataSet, "urn:uuid:" + SALT + "#" + "g" + System.identityHashCode(rdfDataSet));
     }
 
-    AbstractJsonLdGraphLike(RDFDataset rdfDataSet, String bnodePrefix) {
+    AbstractJsonLdGraphLike(final RDFDataset rdfDataSet, final String bnodePrefix) {
         this.rdfDataSet = Objects.requireNonNull(rdfDataSet);
         this.bnodePrefix = Objects.requireNonNull(bnodePrefix);
         this.factory = new JsonLdRDF(bnodePrefix);
     }
 
-    AbstractJsonLdGraphLike(String bnodePrefix) {
+    AbstractJsonLdGraphLike(final String bnodePrefix) {
         this(new RDFDataset(), bnodePrefix);
     }
 
     @Override
-    public void add(T t) {
+    public void add(final T t) {
         // add triples to default graph by default
         BlankNodeOrIRI graphName = null;
         if (t instanceof org.apache.commons.rdf.api.Quad) {
@@ -107,7 +107,7 @@ abstract class AbstractJsonLdGraphLike<T extends TripleLike> implements JsonLdGr
         add(graphName, (BlankNodeOrIRI) t.getSubject(), (IRI) t.getPredicate(), t.getObject());
     }
 
-    void add(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    void add(final BlankNodeOrIRI graphName, final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         String g = factory.asJsonLdString(graphName);
         String s = factory.asJsonLdString(subject);
         String p = factory.asJsonLdString(predicate);
@@ -139,7 +139,7 @@ abstract class AbstractJsonLdGraphLike<T extends TripleLike> implements JsonLdGr
     }
 
     @Override
-    public boolean contains(T tripleOrQuad) {
+    public boolean contains(final T tripleOrQuad) {
         return stream().anyMatch(Predicate.isEqual(tripleOrQuad));
     }
 
@@ -169,11 +169,11 @@ abstract class AbstractJsonLdGraphLike<T extends TripleLike> implements JsonLdGr
 
     // This will be made public in JsonLdDataset
     // and is used by the other methods.
-    boolean contains(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI s, IRI p, RDFTerm o) {
+    boolean contains(final Optional<BlankNodeOrIRI> graphName, final BlankNodeOrIRI s, final IRI p, final RDFTerm o) {
         return filteredGraphs(graphName).flatMap(List::stream).anyMatch(quadFilter(s, p, o));
     }
 
-    Stream<List<RDFDataset.Quad>> filteredGraphs(Optional<BlankNodeOrIRI> graphName) {
+    Stream<List<RDFDataset.Quad>> filteredGraphs(final Optional<BlankNodeOrIRI> graphName) {
         return rdfDataSet.graphNames().parallelStream()
                 // if graphName == null (wildcard), select all graphs,
                 // otherwise check its jsonld string
@@ -184,7 +184,7 @@ abstract class AbstractJsonLdGraphLike<T extends TripleLike> implements JsonLdGr
                 .map(rdfDataSet::getQuads);
     }
 
-    String graphNameAsJsonLdString(T tripleOrQuad) {
+    String graphNameAsJsonLdString(final T tripleOrQuad) {
         if (tripleOrQuad instanceof org.apache.commons.rdf.api.Quad) {
             org.apache.commons.rdf.api.Quad quad = (org.apache.commons.rdf.api.Quad) tripleOrQuad;
             return quad.getGraphName().map(factory::asJsonLdString).orElse("@default");
@@ -192,7 +192,7 @@ abstract class AbstractJsonLdGraphLike<T extends TripleLike> implements JsonLdGr
         return "@default";
     }
 
-    Predicate<RDFDataset.Quad> quadFilter(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    Predicate<RDFDataset.Quad> quadFilter(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         Optional<Node> subjectNode = Optional.ofNullable(subject).map(factory::asJsonLdNode);
         Optional<Node> predicateNode = Optional.ofNullable(predicate).map(factory::asJsonLdNode);
         Optional<Node> objectNode = Optional.ofNullable(object).map(factory::asJsonLdNode);
@@ -213,7 +213,7 @@ abstract class AbstractJsonLdGraphLike<T extends TripleLike> implements JsonLdGr
 
     // NOTE: This is made public in JsonLdDataset and is used by the other
     // remove methods.
-    void remove(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    void remove(final Optional<BlankNodeOrIRI> graphName, final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         // remove the quads which match our filter (which could have nulls as
         // wildcards)
         filteredGraphs(graphName).forEach(t -> t.removeIf(quadFilter(subject, predicate, object)));