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

[1/7] incubator-commonsrdf git commit: Add final modifier to private fields.

Repository: incubator-commonsrdf
Updated Branches:
  refs/heads/master f8c328b6e -> 56ddbdcf9


Add final modifier to private fields.

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

Branch: refs/heads/master
Commit: 4e26ac89de111ff133175f8ae4f636d17027de16
Parents: f8c328b
Author: Gary Gregory <gg...@apache.org>
Authored: Fri Nov 11 14:47:39 2016 -0800
Committer: Gary Gregory <gg...@apache.org>
Committed: Fri Nov 11 14:47:39 2016 -0800

----------------------------------------------------------------------
 .../org/apache/commons/rdf/integrationtests/AllToAllTest.java  | 4 ++--
 .../org/apache/commons/rdf/jena/impl/AbstractJenaRDFTerm.java  | 2 +-
 .../org/apache/commons/rdf/jena/impl/JenaBlankNodeImpl.java    | 2 +-
 .../java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java | 6 +++---
 .../org/apache/commons/rdf/jsonldjava/JsonLdBlankNode.java     | 2 +-
 .../java/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.java | 2 +-
 .../java/org/apache/commons/rdf/rdf4j/impl/BlankNodeImpl.java  | 4 ++--
 .../org/apache/commons/rdf/rdf4j/impl/ConvertedStatements.java | 6 +++---
 .../java/org/apache/commons/rdf/rdf4j/impl/ModelGraphImpl.java | 4 ++--
 .../main/java/org/apache/commons/rdf/rdf4j/impl/QuadImpl.java  | 2 +-
 .../java/org/apache/commons/rdf/rdf4j/impl/TripleImpl.java     | 2 +-
 .../org/apache/commons/rdf/simple/SimpleRDFTermFactory.java    | 2 +-
 .../commons/rdf/simple/experimental/RDFParseException.java     | 2 +-
 .../commons/rdf/simple/experimental/AbstractRDFParserTest.java | 4 ++--
 14 files changed, 22 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/4e26ac89/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 5589bd7..080e5b2 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
@@ -44,8 +44,8 @@ import org.junit.runners.Parameterized.Parameters;
 @RunWith(Parameterized.class)
 public class AllToAllTest {
 
-    private RDF nodeFactory;
-    private RDF graphFactory;
+    private final RDF nodeFactory;
+    private final RDF graphFactory;
 
     public AllToAllTest(Class<? extends RDF> from, Class<? extends RDF> to)
             throws InstantiationException, IllegalAccessException {

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/4e26ac89/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 cd370f8..bc22a67 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
@@ -24,7 +24,7 @@ import org.apache.jena.graph.Node;
 import org.apache.jena.riot.out.NodeFmtLib;
 
 class AbstractJenaRDFTerm implements JenaRDFTerm, RDFTerm {
-    private Node node;
+    private final Node node;
     // static private PrefixMapping empty = new PrefixMappingImpl();
 
     protected AbstractJenaRDFTerm(Node node) {

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/4e26ac89/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 08a5880..46a65fe 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
@@ -26,7 +26,7 @@ import org.apache.jena.graph.Node;
 
 class JenaBlankNodeImpl extends AbstractJenaRDFTerm implements JenaBlankNode {
 
-    private UUID salt;
+    private final UUID salt;
 
     JenaBlankNodeImpl(Node node, UUID salt) {
         super(node);

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/4e26ac89/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 1b4edb9..f8103cd 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
@@ -43,9 +43,9 @@ import org.apache.jena.sparql.core.GraphView;
 
 class JenaDatasetImpl implements JenaDataset {
 
-    private DatasetGraph graph;
-    private UUID salt;
-    private JenaRDF factory;
+    private final DatasetGraph graph;
+    private final UUID salt;
+    private final JenaRDF factory;
 
     JenaDatasetImpl(DatasetGraph graph, UUID salt) {
         this.graph = graph;

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/4e26ac89/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 66c8cba..c626df2 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
@@ -25,7 +25,7 @@ public interface JsonLdBlankNode extends JsonLdTerm, BlankNode {
 }
 
 final class JsonLdBlankNodeImpl extends JsonLdTermImpl implements JsonLdBlankNode {
-    private String blankNodePrefix;
+    private final String blankNodePrefix;
 
     JsonLdBlankNodeImpl(Node node, String blankNodePrefix) {
         super(node);

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/4e26ac89/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 3a55fdb..116873e 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
@@ -36,7 +36,7 @@ class JsonLdQuadLikeImpl<S extends RDFTerm, P extends RDFTerm, O extends RDFTerm
     private static JsonLdRDF rdfTermFactory = new JsonLdRDF();
 
     private final Quad quad;
-    private String blankNodePrefix;
+    private final String blankNodePrefix;
 
     JsonLdQuadLikeImpl(Quad jsonldQuad, String blankNodePrefix) {
         this.quad = jsonldQuad;

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/4e26ac89/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 c14697c..181a763 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
@@ -28,8 +28,8 @@ import org.eclipse.rdf4j.rio.turtle.TurtleUtil;
 final class BlankNodeImpl extends AbstractRDFTerm<BNode> implements RDF4JBlankNode {
 
     private transient int hashCode = 0;
-    private long saltUUIDleast;
-    private long saltUUIDmost;
+    private final long saltUUIDleast;
+    private final long saltUUIDmost;
 
     BlankNodeImpl(BNode bNode, UUID salt) {
         super(bNode);

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/4e26ac89/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 f199b8f..f1089d7 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
@@ -30,9 +30,9 @@ import org.eclipse.rdf4j.repository.RepositoryResult;
 
 final class ConvertedStatements<T> implements ClosableIterable<T> {
 
-    private RepositoryConnection conn;
-    private RepositoryResult<Statement> results;
-    private Function<Statement, T> statementAdapter;
+    private final RepositoryConnection conn;
+    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) {

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/4e26ac89/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 d9ea22a..ad1ed69 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
@@ -39,8 +39,8 @@ import org.eclipse.rdf4j.repository.Repository;
 
 final class ModelGraphImpl implements RDF4JGraph {
 
-    private Model model;
-    private RDF4J rdf4jTermFactory;
+    private final Model model;
+    private final RDF4J rdf4jTermFactory;
 
     ModelGraphImpl(Model model, RDF4J rdf4jTermFactory) {
         this.model = model;

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/4e26ac89/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 228b4f0..5dc36c4 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
@@ -31,7 +31,7 @@ import org.eclipse.rdf4j.model.Statement;
 
 final class QuadImpl implements Quad, RDF4JQuad {
     private transient int hashCode = 0;
-    private UUID salt;
+    private final UUID salt;
     private final Statement statement;
 
     QuadImpl(Statement statement, UUID salt) {

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/4e26ac89/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 4ed3946..64ed327 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
@@ -28,7 +28,7 @@ import org.apache.commons.rdf.rdf4j.RDF4JTriple;
 import org.eclipse.rdf4j.model.Statement;
 
 final class TripleImpl implements Triple, RDF4JTriple {
-    private UUID salt;
+    private final UUID salt;
     private final Statement statement;
 
     TripleImpl(Statement statement, UUID salt) {

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/4e26ac89/simple/src/main/java/org/apache/commons/rdf/simple/SimpleRDFTermFactory.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/SimpleRDFTermFactory.java b/simple/src/main/java/org/apache/commons/rdf/simple/SimpleRDFTermFactory.java
index c526b46..f5c476b 100644
--- a/simple/src/main/java/org/apache/commons/rdf/simple/SimpleRDFTermFactory.java
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/SimpleRDFTermFactory.java
@@ -34,7 +34,7 @@ import org.apache.commons.rdf.api.Triple;
 @Deprecated
 public class SimpleRDFTermFactory implements RDFTermFactory {
 
-    private SimpleRDF factory = new SimpleRDF();
+    private final SimpleRDF factory = new SimpleRDF();
 
     @Override
     public BlankNode createBlankNode() {

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/4e26ac89/simple/src/main/java/org/apache/commons/rdf/simple/experimental/RDFParseException.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/experimental/RDFParseException.java b/simple/src/main/java/org/apache/commons/rdf/simple/experimental/RDFParseException.java
index aedab78..c88642b 100644
--- a/simple/src/main/java/org/apache/commons/rdf/simple/experimental/RDFParseException.java
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/experimental/RDFParseException.java
@@ -22,7 +22,7 @@ import org.apache.commons.rdf.experimental.RDFParser;
 
 public class RDFParseException extends Exception {
     private static final long serialVersionUID = 5427752643780702976L;
-    private RDFParser builder;
+    private final RDFParser builder;
 
     public RDFParseException(RDFParser builder) {
         super();

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/4e26ac89/simple/src/test/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParserTest.java
----------------------------------------------------------------------
diff --git a/simple/src/test/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParserTest.java b/simple/src/test/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParserTest.java
index 12e58bd..d3b62b9 100644
--- a/simple/src/test/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParserTest.java
+++ b/simple/src/test/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParserTest.java
@@ -48,9 +48,9 @@ import org.junit.rules.ExpectedException;
 
 public class AbstractRDFParserTest {
 
-    private RDF factory = new SimpleRDF();
+    private final RDF factory = new SimpleRDF();
 
-    private DummyRDFParserBuilder dummyParser = new DummyRDFParserBuilder();
+    private final DummyRDFParserBuilder dummyParser = new DummyRDFParserBuilder();
     private Path testNt;
     private Path testTtl;
     private Path testXml;


[7/7] incubator-commonsrdf git commit: Add final modifier to local variables.

Posted by gg...@apache.org.
Add final modifier to local variables.

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

Branch: refs/heads/master
Commit: 56ddbdcf9faee3232b7ad5bc4dc68615f44b97a4
Parents: 756cbe0
Author: Gary Gregory <gg...@apache.org>
Authored: Fri Nov 11 14:48:46 2016 -0800
Committer: Gary Gregory <gg...@apache.org>
Committed: Fri Nov 11 14:48:46 2016 -0800

----------------------------------------------------------------------
 .../java/org/apache/commons/rdf/api/Quad.java   |   2 +-
 .../commons/rdf/api/AbstractBlankNodeTest.java  |  48 ++++-----
 .../commons/rdf/api/AbstractDatasetTest.java    | 102 +++++++++----------
 .../commons/rdf/api/AbstractGraphTest.java      |  92 ++++++++---------
 .../apache/commons/rdf/api/AbstractRDFTest.java |  72 ++++++-------
 .../commons/rdf/api/DefaultDatasetTest.java     |   4 +-
 .../commons/rdf/api/DefaultGraphTest.java       |   4 +-
 .../apache/commons/rdf/api/DefaultQuadTest.java |   4 +-
 .../apache/commons/rdf/api/DummyQuadTest.java   |   2 +-
 .../apache/commons/rdf/api/DummyTripleTest.java |   2 +-
 .../rdf/integrationtests/AllToAllTest.java      |  48 ++++-----
 .../org/apache/commons/rdf/jena/JenaRDF.java    |  26 ++---
 .../rdf/jena/experimental/JenaRDFParser.java    |  12 +--
 .../commons/rdf/jena/impl/AbstractQuadLike.java |   4 +-
 .../rdf/jena/impl/InternalJenaFactory.java      |   2 +-
 .../rdf/jena/impl/JenaBlankNodeImpl.java        |   2 +-
 .../commons/rdf/jena/impl/JenaDatasetImpl.java  |  16 +--
 .../commons/rdf/jena/impl/JenaGraphImpl.java    |   6 +-
 .../commons/rdf/jena/impl/JenaIRIImpl.java      |   2 +-
 .../commons/rdf/jena/impl/JenaLiteralImpl.java  |   4 +-
 .../commons/rdf/jena/impl/JenaQuadImpl.java     |   2 +-
 .../commons/rdf/jena/impl/JenaTripleImpl.java   |   2 +-
 .../commons/rdf/jena/JenaServiceLoaderTest.java |   4 +-
 .../jena/TestJenaGraphToCommonsRDFGraph.java    |  30 +++---
 .../commons/rdf/jena/TestRDFParserBuilder.java  |   4 +-
 .../commons/rdf/jsonldjava/JsonLdBlankNode.java |   2 +-
 .../commons/rdf/jsonldjava/JsonLdGraph.java     |   2 +-
 .../commons/rdf/jsonldjava/JsonLdGraphLike.java |  24 ++---
 .../commons/rdf/jsonldjava/JsonLdIRI.java       |   2 +-
 .../commons/rdf/jsonldjava/JsonLdLiteral.java   |   6 +-
 .../commons/rdf/jsonldjava/JsonLdQuad.java      |   2 +-
 .../commons/rdf/jsonldjava/JsonLdQuadLike.java  |   2 +-
 .../commons/rdf/jsonldjava/JsonLdRDF.java       |  20 ++--
 .../commons/rdf/jsonldjava/JsonLdTriple.java    |   2 +-
 .../jsonldjava/experimental/JsonLdParser.java   |  22 ++--
 .../rdf/jsonldjava/JsonLdParserBuilderTest.java |  12 +--
 .../rdf/jsonldjava/JsonLdServiceLoaderTest.java |   4 +-
 .../org/apache/commons/rdf/rdf4j/RDF4J.java     |  48 ++++-----
 .../rdf/rdf4j/experimental/RDF4JParser.java     |  36 +++----
 .../commons/rdf/rdf4j/impl/BlankNodeImpl.java   |   4 +-
 .../rdf/rdf4j/impl/ConvertedStatements.java     |   2 +-
 .../apache/commons/rdf/rdf4j/impl/IRIImpl.java  |   4 +-
 .../commons/rdf/rdf4j/impl/LiteralImpl.java     |   4 +-
 .../commons/rdf/rdf4j/impl/ModelGraphImpl.java  |   4 +-
 .../apache/commons/rdf/rdf4j/impl/QuadImpl.java |   4 +-
 .../rdf/rdf4j/impl/RepositoryDatasetImpl.java   |  60 +++++------
 .../rdf/rdf4j/impl/RepositoryGraphImpl.java     |  44 ++++----
 .../commons/rdf/rdf4j/impl/TripleImpl.java      |   2 +-
 .../commons/rdf/rdf4j/MemoryGraphTest.java      |   4 +-
 .../commons/rdf/rdf4j/NativeStoreGraphTest.java |   6 +-
 .../rdf/rdf4j/RDF4JServiceLoaderTest.java       |   4 +-
 .../commons/rdf/simple/BlankNodeImpl.java       |   4 +-
 .../commons/rdf/simple/DatasetGraphView.java    |   2 +-
 .../apache/commons/rdf/simple/DatasetImpl.java  |  32 +++---
 .../apache/commons/rdf/simple/GraphImpl.java    |  26 ++---
 .../org/apache/commons/rdf/simple/IRIImpl.java  |   2 +-
 .../apache/commons/rdf/simple/LiteralImpl.java  |   6 +-
 .../org/apache/commons/rdf/simple/QuadImpl.java |   2 +-
 .../apache/commons/rdf/simple/SimpleRDF.java    |   2 +-
 .../apache/commons/rdf/simple/TripleImpl.java   |   2 +-
 .../org/apache/commons/rdf/simple/Types.java    |   4 +-
 .../simple/experimental/AbstractRDFParser.java  |  32 +++---
 .../rdf/simple/DummyRDFParserBuilder.java       |   6 +-
 .../rdf/simple/SimpleServiceLoaderTest.java     |   4 +-
 .../commons/rdf/simple/TestWritingGraph.java    |  32 +++---
 .../experimental/AbstractRDFParserTest.java     |  52 +++++-----
 66 files changed, 516 insertions(+), 514 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 c018769..c007aff 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
@@ -175,7 +175,7 @@ public interface Quad extends QuadLike<BlankNodeOrIRI> {
                 if (!(obj instanceof Triple)) {
                     return false;
                 }
-                Triple other = (Triple) obj;
+                final Triple other = (Triple) obj;
                 return Objects.equals(getSubject(), other.getSubject())
                         && Objects.equals(getPredicate(), other.getPredicate())
                         && Objects.equals(getObject(), other.getObject());

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/api/src/test/java/org/apache/commons/rdf/api/AbstractBlankNodeTest.java
----------------------------------------------------------------------
diff --git a/api/src/test/java/org/apache/commons/rdf/api/AbstractBlankNodeTest.java b/api/src/test/java/org/apache/commons/rdf/api/AbstractBlankNodeTest.java
index 31593c5..c123cdc 100644
--- a/api/src/test/java/org/apache/commons/rdf/api/AbstractBlankNodeTest.java
+++ b/api/src/test/java/org/apache/commons/rdf/api/AbstractBlankNodeTest.java
@@ -58,7 +58,7 @@ public abstract class AbstractBlankNodeTest {
      */
     @Test
     public final void testInternalIdentifier() {
-        BlankNode testNull = new BlankNode() {
+        final BlankNode testNull = new BlankNode() {
             @Override
             public String ntriplesString() {
                 return null;
@@ -69,11 +69,11 @@ public abstract class AbstractBlankNodeTest {
                 return null;
             }
         };
-        BlankNode testAutomatic1 = getBlankNode();
-        BlankNode testAutomatic2 = getBlankNode();
-        BlankNode testManual3a = getBlankNode("3");
-        BlankNode testManual3b = getBlankNode("3");
-        BlankNode testManual4 = getBlankNode("4");
+        final BlankNode testAutomatic1 = getBlankNode();
+        final BlankNode testAutomatic2 = getBlankNode();
+        final BlankNode testManual3a = getBlankNode("3");
+        final BlankNode testManual3b = getBlankNode("3");
+        final BlankNode testManual4 = getBlankNode("4");
 
         // Test against our fake stub
         assertNotEquals(testNull.uniqueReference(), testAutomatic1.uniqueReference());
@@ -96,7 +96,7 @@ public abstract class AbstractBlankNodeTest {
      */
     @Test
     public final void testEquals() {
-        BlankNode testNull = new BlankNode() {
+        final BlankNode testNull = new BlankNode() {
             @Override
             public String ntriplesString() {
                 return null;
@@ -107,11 +107,11 @@ public abstract class AbstractBlankNodeTest {
                 return null;
             }
         };
-        BlankNode testAutomatic1 = getBlankNode();
-        BlankNode testAutomatic2 = getBlankNode();
-        BlankNode testManual3a = getBlankNode("3");
-        BlankNode testManual3b = getBlankNode("3");
-        BlankNode testManual4 = getBlankNode("4");
+        final BlankNode testAutomatic1 = getBlankNode();
+        final BlankNode testAutomatic2 = getBlankNode();
+        final BlankNode testManual3a = getBlankNode("3");
+        final BlankNode testManual3b = getBlankNode("3");
+        final BlankNode testManual4 = getBlankNode("4");
 
         // Test against our fake stub
         assertNotEquals(testNull, testAutomatic1);
@@ -134,7 +134,7 @@ public abstract class AbstractBlankNodeTest {
      */
     @Test
     public final void testHashCode() {
-        BlankNode testNull = new BlankNode() {
+        final BlankNode testNull = new BlankNode() {
             @Override
             public String ntriplesString() {
                 return null;
@@ -145,11 +145,11 @@ public abstract class AbstractBlankNodeTest {
                 return null;
             }
         };
-        BlankNode testAutomatic1 = getBlankNode();
-        BlankNode testAutomatic2 = getBlankNode();
-        BlankNode testManual3a = getBlankNode("3");
-        BlankNode testManual3b = getBlankNode("3");
-        BlankNode testManual4 = getBlankNode("4");
+        final BlankNode testAutomatic1 = getBlankNode();
+        final BlankNode testAutomatic2 = getBlankNode();
+        final BlankNode testManual3a = getBlankNode("3");
+        final BlankNode testManual3b = getBlankNode("3");
+        final BlankNode testManual4 = getBlankNode("4");
 
         // Test against our fake stub
         assertNotEquals(testNull.hashCode(), testAutomatic1.hashCode());
@@ -172,7 +172,7 @@ public abstract class AbstractBlankNodeTest {
      */
     @Test
     public final void testNtriplesString() {
-        BlankNode testNull = new BlankNode() {
+        final BlankNode testNull = new BlankNode() {
             @Override
             public String ntriplesString() {
                 return null;
@@ -183,11 +183,11 @@ public abstract class AbstractBlankNodeTest {
                 return null;
             }
         };
-        BlankNode testAutomatic1 = getBlankNode();
-        BlankNode testAutomatic2 = getBlankNode();
-        BlankNode testManual3a = getBlankNode("3");
-        BlankNode testManual3b = getBlankNode("3");
-        BlankNode testManual4 = getBlankNode("4");
+        final BlankNode testAutomatic1 = getBlankNode();
+        final BlankNode testAutomatic2 = getBlankNode();
+        final BlankNode testManual3a = getBlankNode("3");
+        final BlankNode testManual3b = getBlankNode("3");
+        final BlankNode testManual4 = getBlankNode("4");
 
         // Test against our fake stub
         assertNotEquals(testNull.ntriplesString(), testAutomatic1.ntriplesString());

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 eab09b7..505994f 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
@@ -129,8 +129,8 @@ public abstract class AbstractDatasetTest {
     @Test
     public void iterate() throws Exception {
         Assume.assumeTrue(dataset.size() > 0);
-        List<Quad> quads = new ArrayList<>();
-        for (Quad t : dataset.iterate()) {
+        final List<Quad> quads = new ArrayList<>();
+        for (final Quad t : dataset.iterate()) {
             quads.add(t);
         }
         assertEquals(dataset.size(), quads.size());
@@ -138,12 +138,12 @@ public abstract class AbstractDatasetTest {
         //assertTrue(quads.contains(bobNameQuad));
         // java.util.List won't do any BlankNode mapping, so 
         // instead bobNameQuad of let's check for an IRI-centric quad 
-        Quad q = factory.createQuad(graph1, alice, name, aliceName);
+        final Quad q = factory.createQuad(graph1, alice, name, aliceName);
         quads.contains(q);
 
         // aborted iteration
-        Iterable<Quad> iterate = dataset.iterate();
-        Iterator<Quad> it = iterate.iterator();
+        final Iterable<Quad> iterate = dataset.iterate();
+        final Iterator<Quad> it = iterate.iterator();
 
         assertTrue(it.hasNext());
         it.next();
@@ -152,8 +152,8 @@ public abstract class AbstractDatasetTest {
         // second iteration - should start from fresh and
         // get the same count
         long count = 0;
-        Iterable<Quad> iterable = dataset.iterate();
-        for (@SuppressWarnings("unused")
+        final Iterable<Quad> iterable = dataset.iterate();
+        for (@SuppressWarnings("unused") final
         Quad t : iterable) {
             count++;
         }
@@ -171,18 +171,18 @@ public abstract class AbstractDatasetTest {
 
     @Test
     public void iterateFilter() throws Exception {
-        List<RDFTerm> friends = new ArrayList<>();
-        IRI alice = factory.createIRI("http://example.com/alice");
-        IRI knows = factory.createIRI("http://xmlns.com/foaf/0.1/knows");
-        for (Quad t : dataset.iterate(null, alice, knows, null)) {
+        final List<RDFTerm> friends = new ArrayList<>();
+        final IRI alice = factory.createIRI("http://example.com/alice");
+        final IRI knows = factory.createIRI("http://xmlns.com/foaf/0.1/knows");
+        for (final Quad t : dataset.iterate(null, alice, knows, null)) {
             friends.add(t.getObject());
         }
         assertEquals(1, friends.size());
         assertEquals(bob, friends.get(0));
 
         // .. can we iterate over zero hits?
-        Iterable<Quad> iterate = dataset.iterate(Optional.of(graph2), bob, knows, alice);
-        for (Quad unexpected : iterate) {
+        final Iterable<Quad> iterate = dataset.iterate(Optional.of(graph2), bob, knows, alice);
+        for (final Quad unexpected : iterate) {
             fail("Unexpected quad " + unexpected);
         }
         // closeIterable(iterate);
@@ -195,26 +195,26 @@ public abstract class AbstractDatasetTest {
         assertTrue(dataset.contains(Optional.of(graph1), alice, knows, bob));
 
         try (Stream<? extends Quad> stream = dataset.stream()) {
-            Optional<? extends Quad> first = stream.skip(4).findFirst();
+            final Optional<? extends Quad> first = stream.skip(4).findFirst();
             Assume.assumeTrue(first.isPresent());
-            Quad existingQuad = first.get();
+            final Quad existingQuad = first.get();
             assertTrue(dataset.contains(existingQuad));
         }
 
-        Quad nonExistingQuad = factory.createQuad(graph2, bob, knows, alice);
+        final Quad nonExistingQuad = factory.createQuad(graph2, bob, knows, alice);
         assertFalse(dataset.contains(nonExistingQuad));
 
         // An existing quad
-        Quad quad = factory.createQuad(graph1, alice, knows, bob);
+        final Quad quad = factory.createQuad(graph1, alice, knows, bob);
         // FIXME: Should not this always be true?
          assertTrue(dataset.contains(quad));
     }
 
     @Test
     public void remove() throws Exception {
-        long fullSize = dataset.size();
+        final long fullSize = dataset.size();
         dataset.remove(Optional.of(graph1), alice, knows, bob);
-        long shrunkSize = dataset.size();
+        final long shrunkSize = dataset.size();
         assertEquals(1, fullSize - shrunkSize);
 
         dataset.remove(Optional.of(graph1), alice, knows, bob);
@@ -233,7 +233,7 @@ public abstract class AbstractDatasetTest {
 
         Quad otherQuad;
         try (Stream<? extends Quad> stream = dataset.stream()) {
-            Optional<? extends Quad> anyQuad = stream.findAny();
+            final Optional<? extends Quad> anyQuad = stream.findAny();
             Assume.assumeTrue(anyQuad.isPresent());
             otherQuad = anyQuad.get();
         }
@@ -281,7 +281,7 @@ public abstract class AbstractDatasetTest {
     public void getQuadsQuery() throws Exception {
 
         try (Stream<? extends Quad> stream = dataset.stream(Optional.of(graph1), alice, null, null)) {
-            long aliceCount = stream.count();
+            final long aliceCount = stream.count();
             assertTrue(aliceCount > 0);
             Assume.assumeNotNull(aliceName);
             assertEquals(3, aliceCount);
@@ -300,11 +300,11 @@ public abstract class AbstractDatasetTest {
     @Test
     public void addBlankNodesFromMultipleDatasets() {
             // Create two separate Dataset instances
-            Dataset g1 = createDataset1();
-            Dataset g2 = createDataset2();
+            final Dataset g1 = createDataset1();
+            final Dataset g2 = createDataset2();
 
             // and add them to a new Dataset g3
-            Dataset g3 = factory.createDataset();
+            final Dataset g3 = factory.createDataset();
             addAllQuads(g1, g3);
             addAllQuads(g2, g3);
 
@@ -319,7 +319,7 @@ public abstract class AbstractDatasetTest {
             // HashMap!)
 
             // look up BlankNodes by name
-            IRI name = factory.createIRI("http://xmlns.com/foaf/0.1/name");
+            final IRI name = factory.createIRI("http://xmlns.com/foaf/0.1/name");
             try (Stream<? extends Quad> stream = g3.stream(null, null, name, null)) {
                 stream.parallel().forEach(t -> whoIsWho.put(t.getObject().ntriplesString(), t.getSubject()));
             }
@@ -328,13 +328,13 @@ public abstract class AbstractDatasetTest {
             // and contains 4 unique values
             assertEquals(4, new HashSet<>(whoIsWho.values()).size());
 
-            BlankNodeOrIRI b1Alice = whoIsWho.get("\"Alice\"");
+            final BlankNodeOrIRI b1Alice = whoIsWho.get("\"Alice\"");
             assertNotNull(b1Alice);
-            BlankNodeOrIRI b2Bob = whoIsWho.get("\"Bob\"");
+            final BlankNodeOrIRI b2Bob = whoIsWho.get("\"Bob\"");
             assertNotNull(b2Bob);
-            BlankNodeOrIRI b1Charlie = whoIsWho.get("\"Charlie\"");
+            final BlankNodeOrIRI b1Charlie = whoIsWho.get("\"Charlie\"");
             assertNotNull(b1Charlie);
-            BlankNodeOrIRI b2Dave = whoIsWho.get("\"Dave\"");
+            final BlankNodeOrIRI b2Dave = whoIsWho.get("\"Dave\"");
             assertNotNull(b2Dave);
 
             // All blank nodes should differ
@@ -347,7 +347,7 @@ public abstract class AbstractDatasetTest {
 
             // And we should be able to query with them again
             // as we got them back from g3
-            IRI hasChild = factory.createIRI("http://example.com/hasChild");
+            final IRI hasChild = factory.createIRI("http://example.com/hasChild");
             // FIXME: Check graph2 BlankNode in these ..?
             assertTrue(g3.contains(null, b1Alice, hasChild, b2Bob));
             assertTrue(g3.contains(null, b2Dave, hasChild, b1Charlie));
@@ -398,17 +398,17 @@ public abstract class AbstractDatasetTest {
      * uniqueReference
      */
     private Dataset createDataset1() {
-        RDF factory1 = createFactory();
+        final RDF factory1 = createFactory();
 
-        IRI name = factory1.createIRI("http://xmlns.com/foaf/0.1/name");
-        Dataset g1 = factory1.createDataset();
-        BlankNode b1 = createOwnBlankNode("b1", "0240eaaa-d33e-4fc0-a4f1-169d6ced3680");
+        final IRI name = factory1.createIRI("http://xmlns.com/foaf/0.1/name");
+        final Dataset g1 = factory1.createDataset();
+        final BlankNode b1 = createOwnBlankNode("b1", "0240eaaa-d33e-4fc0-a4f1-169d6ced3680");
         g1.add(b1, b1, name, factory1.createLiteral("Alice"));
 
-        BlankNode b2 = createOwnBlankNode("b2", "9de7db45-0ce7-4b0f-a1ce-c9680ffcfd9f");
+        final BlankNode b2 = createOwnBlankNode("b2", "9de7db45-0ce7-4b0f-a1ce-c9680ffcfd9f");
         g1.add(b2, b2, name, factory1.createLiteral("Bob"));
 
-        IRI hasChild = factory1.createIRI("http://example.com/hasChild");
+        final IRI hasChild = factory1.createIRI("http://example.com/hasChild");
         g1.add(null, b1, hasChild, b2);
 
         return g1;
@@ -444,25 +444,25 @@ public abstract class AbstractDatasetTest {
                 if (!(obj instanceof BlankNode)) {
                     return false;
                 }
-                BlankNode other = (BlankNode) obj;
+                final BlankNode other = (BlankNode) obj;
                 return uuid.equals(other.uniqueReference());
             }
         };
     }
 
     private Dataset createDataset2() {
-        RDF factory2 = createFactory();
-        IRI name = factory2.createIRI("http://xmlns.com/foaf/0.1/name");
+        final RDF factory2 = createFactory();
+        final IRI name = factory2.createIRI("http://xmlns.com/foaf/0.1/name");
 
-        Dataset g2 = factory2.createDataset();
+        final Dataset g2 = factory2.createDataset();
 
-        BlankNode b1 = createOwnBlankNode("b1", "bc8d3e45-a08f-421d-85b3-c25b373abf87");
+        final BlankNode b1 = createOwnBlankNode("b1", "bc8d3e45-a08f-421d-85b3-c25b373abf87");
         g2.add(b1, b1, name, factory2.createLiteral("Charlie"));
 
-        BlankNode b2 = createOwnBlankNode("b2", "2209097a-5078-4b03-801a-6a2d2f50d739");
+        final BlankNode b2 = createOwnBlankNode("b2", "2209097a-5078-4b03-801a-6a2d2f50d739");
         g2.add(b2, b2, name, factory2.createLiteral("Dave"));
 
-        IRI hasChild = factory2.createIRI("http://example.com/hasChild");
+        final IRI hasChild = factory2.createIRI("http://example.com/hasChild");
         // NOTE: Opposite direction of loadDataset1
         g2.add(b2, b2, hasChild, b1);
         return g2;
@@ -476,11 +476,11 @@ public abstract class AbstractDatasetTest {
      */
     @Test
     public void getGraphNames() throws Exception {
-        Set<BlankNodeOrIRI> names = dataset.getGraphNames().collect(Collectors.toSet());        
+        final Set<BlankNodeOrIRI> names = dataset.getGraphNames().collect(Collectors.toSet());        
         assertTrue("Can't find graph name " + graph1, names.contains(graph1));
         assertTrue("Found no quads in graph1", dataset.contains(Optional.of(graph1), null, null, null));
         
-        Optional<BlankNodeOrIRI> graphName2 = dataset.getGraphNames().filter(BlankNode.class::isInstance).findAny();
+        final Optional<BlankNodeOrIRI> graphName2 = dataset.getGraphNames().filter(BlankNode.class::isInstance).findAny();
         assertTrue("Could not find graph2-like BlankNode", graphName2.isPresent()); 
         assertTrue("Found no quads in graph2", dataset.contains(graphName2, null, null, null));
 
@@ -491,7 +491,7 @@ public abstract class AbstractDatasetTest {
     
     @Test
     public void getGraph() throws Exception {
-        Graph defaultGraph = dataset.getGraph();
+        final Graph defaultGraph = dataset.getGraph();
         // TODO: Can we assume the default graph was empty before our new triples?
         assertEquals(2, defaultGraph.size());
         assertTrue(defaultGraph.contains(alice, isPrimaryTopicOf, graph1));
@@ -503,7 +503,7 @@ public abstract class AbstractDatasetTest {
     @Test
     public void getGraphNull() throws Exception {
         // Default graph should be present
-        Graph defaultGraph = dataset.getGraph(null).get();
+        final Graph defaultGraph = dataset.getGraph(null).get();
         // TODO: Can we assume the default graph was empty before our new triples?
         assertEquals(2, defaultGraph.size());
         assertTrue(defaultGraph.contains(alice, isPrimaryTopicOf, graph1));
@@ -515,7 +515,7 @@ public abstract class AbstractDatasetTest {
     @Test
     public void getGraph1() throws Exception {
         // graph1 should be present
-        Graph g1 = dataset.getGraph(graph1).get();
+        final Graph g1 = dataset.getGraph(graph1).get();
         assertEquals(4, g1.size());
         
         assertTrue(g1.contains(alice, name, aliceName));
@@ -528,12 +528,12 @@ public abstract class AbstractDatasetTest {
     public void getGraph2() throws Exception {
         // graph2 should be present, even if is named by a BlankNode
         // We'll look up the potentially mapped graph2 blanknode
-        BlankNodeOrIRI graph2Name = (BlankNodeOrIRI) dataset.stream(Optional.empty(), bob, isPrimaryTopicOf, null)
+        final BlankNodeOrIRI graph2Name = (BlankNodeOrIRI) dataset.stream(Optional.empty(), bob, isPrimaryTopicOf, null)
                 .map(Quad::getObject).findAny().get();
         
-        Graph g2 = dataset.getGraph(graph2Name).get();
+        final Graph g2 = dataset.getGraph(graph2Name).get();
         assertEquals(4, g2.size());
-        Triple bobNameTriple = bobNameQuad.asTriple();
+        final Triple bobNameTriple = bobNameQuad.asTriple();
         assertTrue(g2.contains(bobNameTriple));
         assertTrue(g2.contains(bob, member, bnode1));
         assertTrue(g2.contains(bob, member, bnode2));

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 bfb47c6..7e32676 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
@@ -90,7 +90,7 @@ public abstract class AbstractGraphTest {
         try {
             bnode1 = factory.createBlankNode("org1");
             bnode2 = factory.createBlankNode("org2");
-        } catch (UnsupportedOperationException ex) {
+        } catch (final UnsupportedOperationException ex) {
             // leave as null
         }
 
@@ -99,7 +99,7 @@ public abstract class AbstractGraphTest {
             companyName = factory.createLiteral("A company");
             aliceName = factory.createLiteral("Alice");
             bobName = factory.createLiteral("Bob", "en-US");
-        } catch (UnsupportedOperationException ex) {
+        } catch (final UnsupportedOperationException ex) {
             // leave as null
         }
 
@@ -115,7 +115,7 @@ public abstract class AbstractGraphTest {
         if (bobName != null) {
             try {
                 bobNameTriple = factory.createTriple(bob, name, bobName);
-            } catch (UnsupportedOperationException ex) {
+            } catch (final UnsupportedOperationException ex) {
                 // leave as null
             }
             if (bobNameTriple != null) {
@@ -145,8 +145,8 @@ public abstract class AbstractGraphTest {
 
         Assume.assumeTrue(graph.size() > 0);
 
-        List<Triple> triples = new ArrayList<>();
-        for (Triple t : graph.iterate()) {
+        final List<Triple> triples = new ArrayList<>();
+        for (final Triple t : graph.iterate()) {
             triples.add(t);
         }
         assertEquals(graph.size(), triples.size());
@@ -155,8 +155,8 @@ public abstract class AbstractGraphTest {
         }
 
         // aborted iteration
-        Iterable<Triple> iterate = graph.iterate();
-        Iterator<Triple> it = iterate.iterator();
+        final Iterable<Triple> iterate = graph.iterate();
+        final Iterator<Triple> it = iterate.iterator();
 
         assertTrue(it.hasNext());
         it.next();
@@ -165,8 +165,8 @@ public abstract class AbstractGraphTest {
         // second iteration - should start from fresh and
         // get the same count
         long count = 0;
-        Iterable<Triple> iterable = graph.iterate();
-        for (@SuppressWarnings("unused")
+        final Iterable<Triple> iterable = graph.iterate();
+        for (@SuppressWarnings("unused") final
         Triple t : iterable) {
             count++;
         }
@@ -184,18 +184,18 @@ public abstract class AbstractGraphTest {
 
     @Test
     public void iterateFilter() throws Exception {
-        List<RDFTerm> friends = new ArrayList<>();
-        IRI alice = factory.createIRI("http://example.com/alice");
-        IRI knows = factory.createIRI("http://xmlns.com/foaf/0.1/knows");
-        for (Triple t : graph.iterate(alice, knows, null)) {
+        final List<RDFTerm> friends = new ArrayList<>();
+        final IRI alice = factory.createIRI("http://example.com/alice");
+        final IRI knows = factory.createIRI("http://xmlns.com/foaf/0.1/knows");
+        for (final Triple t : graph.iterate(alice, knows, null)) {
             friends.add(t.getObject());
         }
         assertEquals(1, friends.size());
         assertEquals(bob, friends.get(0));
 
         // .. can we iterate over zero hits?
-        Iterable<Triple> iterate = graph.iterate(bob, knows, alice);
-        for (Triple unexpected : iterate) {
+        final Iterable<Triple> iterate = graph.iterate(bob, knows, alice);
+        for (final Triple unexpected : iterate) {
             fail("Unexpected triple " + unexpected);
         }
         // closeIterable(iterate);
@@ -208,19 +208,19 @@ public abstract class AbstractGraphTest {
         assertTrue(graph.contains(alice, knows, bob));
 
         try (Stream<? extends Triple> stream = graph.stream()) {
-            Optional<? extends Triple> first = stream.skip(4).findFirst();
+            final Optional<? extends Triple> first = stream.skip(4).findFirst();
             Assume.assumeTrue(first.isPresent());
-            Triple existingTriple = first.get();
+            final Triple existingTriple = first.get();
             assertTrue(graph.contains(existingTriple));
         }
 
-        Triple nonExistingTriple = factory.createTriple(bob, knows, alice);
+        final Triple nonExistingTriple = factory.createTriple(bob, knows, alice);
         assertFalse(graph.contains(nonExistingTriple));
 
         Triple triple = null;
         try {
             triple = factory.createTriple(alice, knows, bob);
-        } catch (UnsupportedOperationException ex) {
+        } catch (final UnsupportedOperationException ex) {
         }
         if (triple != null) {
             // FIXME: Should not this always be true?
@@ -230,9 +230,9 @@ public abstract class AbstractGraphTest {
 
     @Test
     public void remove() throws Exception {
-        long fullSize = graph.size();
+        final long fullSize = graph.size();
         graph.remove(alice, knows, bob);
-        long shrunkSize = graph.size();
+        final long shrunkSize = graph.size();
         assertEquals(1, fullSize - shrunkSize);
 
         graph.remove(alice, knows, bob);
@@ -251,7 +251,7 @@ public abstract class AbstractGraphTest {
 
         Triple otherTriple;
         try (Stream<? extends Triple> stream = graph.stream()) {
-            Optional<? extends Triple> anyTriple = stream.findAny();
+            final Optional<? extends Triple> anyTriple = stream.findAny();
             Assume.assumeTrue(anyTriple.isPresent());
             otherTriple = anyTriple.get();
         }
@@ -298,7 +298,7 @@ public abstract class AbstractGraphTest {
     public void getTriplesQuery() throws Exception {
 
         try (Stream<? extends Triple> stream = graph.stream(alice, null, null)) {
-            long aliceCount = stream.count();
+            final long aliceCount = stream.count();
             assertTrue(aliceCount > 0);
             Assume.assumeNotNull(aliceName);
             assertEquals(3, aliceCount);
@@ -319,11 +319,11 @@ public abstract class AbstractGraphTest {
 
         try {
             // Create two separate Graph instances
-            Graph g1 = createGraph1();
-            Graph g2 = createGraph2();
+            final Graph g1 = createGraph1();
+            final Graph g2 = createGraph2();
 
             // and add them to a new Graph g3
-            Graph g3 = factory.createGraph();
+            final Graph g3 = factory.createGraph();
             addAllTriples(g1, g3);
             addAllTriples(g2, g3);
 
@@ -338,7 +338,7 @@ public abstract class AbstractGraphTest {
             // HashMap!)
 
             // look up BlankNodes by name
-            IRI name = factory.createIRI("http://xmlns.com/foaf/0.1/name");
+            final IRI name = factory.createIRI("http://xmlns.com/foaf/0.1/name");
             try (Stream<? extends Triple> stream = g3.stream(null, name, null)) {
                 stream.parallel().forEach(t -> whoIsWho.put(t.getObject().ntriplesString(), t.getSubject()));
             }
@@ -347,13 +347,13 @@ public abstract class AbstractGraphTest {
             // and contains 4 unique values
             assertEquals(4, new HashSet<>(whoIsWho.values()).size());
 
-            BlankNodeOrIRI b1Alice = whoIsWho.get("\"Alice\"");
+            final BlankNodeOrIRI b1Alice = whoIsWho.get("\"Alice\"");
             assertNotNull(b1Alice);
-            BlankNodeOrIRI b2Bob = whoIsWho.get("\"Bob\"");
+            final BlankNodeOrIRI b2Bob = whoIsWho.get("\"Bob\"");
             assertNotNull(b2Bob);
-            BlankNodeOrIRI b1Charlie = whoIsWho.get("\"Charlie\"");
+            final BlankNodeOrIRI b1Charlie = whoIsWho.get("\"Charlie\"");
             assertNotNull(b1Charlie);
-            BlankNodeOrIRI b2Dave = whoIsWho.get("\"Dave\"");
+            final BlankNodeOrIRI b2Dave = whoIsWho.get("\"Dave\"");
             assertNotNull(b2Dave);
 
             // All blank nodes should differ
@@ -366,7 +366,7 @@ public abstract class AbstractGraphTest {
 
             // And we should be able to query with them again
             // as we got them back from g3
-            IRI hasChild = factory.createIRI("http://example.com/hasChild");
+            final IRI hasChild = factory.createIRI("http://example.com/hasChild");
             assertTrue(g3.contains(b1Alice, hasChild, b2Bob));
             assertTrue(g3.contains(b2Dave, hasChild, b1Charlie));
             // But not
@@ -380,7 +380,7 @@ public abstract class AbstractGraphTest {
             // and these don't have any children (as far as we know)
             assertFalse(g3.contains(b2Bob, hasChild, null));
             assertFalse(g3.contains(b1Charlie, hasChild, null));
-        } catch (UnsupportedOperationException ex) {
+        } catch (final UnsupportedOperationException ex) {
             Assume.assumeNoException(ex);
         }
     }
@@ -419,17 +419,17 @@ public abstract class AbstractGraphTest {
      * uniqueReference
      */
     private Graph createGraph1() {
-        RDF factory1 = createFactory();
+        final RDF factory1 = createFactory();
 
-        IRI name = factory1.createIRI("http://xmlns.com/foaf/0.1/name");
-        Graph g1 = factory1.createGraph();
-        BlankNode b1 = createOwnBlankNode("b1", "0240eaaa-d33e-4fc0-a4f1-169d6ced3680");
+        final IRI name = factory1.createIRI("http://xmlns.com/foaf/0.1/name");
+        final Graph g1 = factory1.createGraph();
+        final BlankNode b1 = createOwnBlankNode("b1", "0240eaaa-d33e-4fc0-a4f1-169d6ced3680");
         g1.add(b1, name, factory1.createLiteral("Alice"));
 
-        BlankNode b2 = createOwnBlankNode("b2", "9de7db45-0ce7-4b0f-a1ce-c9680ffcfd9f");
+        final BlankNode b2 = createOwnBlankNode("b2", "9de7db45-0ce7-4b0f-a1ce-c9680ffcfd9f");
         g1.add(b2, name, factory1.createLiteral("Bob"));
 
-        IRI hasChild = factory1.createIRI("http://example.com/hasChild");
+        final IRI hasChild = factory1.createIRI("http://example.com/hasChild");
         g1.add(b1, hasChild, b2);
 
         return g1;
@@ -465,25 +465,25 @@ public abstract class AbstractGraphTest {
                 if (!(obj instanceof BlankNode)) {
                     return false;
                 }
-                BlankNode other = (BlankNode) obj;
+                final BlankNode other = (BlankNode) obj;
                 return uuid.equals(other.uniqueReference());
             }
         };
     }
 
     private Graph createGraph2() {
-        RDF factory2 = createFactory();
-        IRI name = factory2.createIRI("http://xmlns.com/foaf/0.1/name");
+        final RDF factory2 = createFactory();
+        final IRI name = factory2.createIRI("http://xmlns.com/foaf/0.1/name");
 
-        Graph g2 = factory2.createGraph();
+        final Graph g2 = factory2.createGraph();
 
-        BlankNode b1 = createOwnBlankNode("b1", "bc8d3e45-a08f-421d-85b3-c25b373abf87");
+        final BlankNode b1 = createOwnBlankNode("b1", "bc8d3e45-a08f-421d-85b3-c25b373abf87");
         g2.add(b1, name, factory2.createLiteral("Charlie"));
 
-        BlankNode b2 = createOwnBlankNode("b2", "2209097a-5078-4b03-801a-6a2d2f50d739");
+        final BlankNode b2 = createOwnBlankNode("b2", "2209097a-5078-4b03-801a-6a2d2f50d739");
         g2.add(b2, name, factory2.createLiteral("Dave"));
 
-        IRI hasChild = factory2.createIRI("http://example.com/hasChild");
+        final IRI hasChild = factory2.createIRI("http://example.com/hasChild");
         // NOTE: Opposite direction of loadGraph1
         g2.add(b2, hasChild, b1);
         return g2;

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/api/src/test/java/org/apache/commons/rdf/api/AbstractRDFTest.java
----------------------------------------------------------------------
diff --git a/api/src/test/java/org/apache/commons/rdf/api/AbstractRDFTest.java b/api/src/test/java/org/apache/commons/rdf/api/AbstractRDFTest.java
index bd3865a..85e7b61 100644
--- a/api/src/test/java/org/apache/commons/rdf/api/AbstractRDFTest.java
+++ b/api/src/test/java/org/apache/commons/rdf/api/AbstractRDFTest.java
@@ -56,9 +56,9 @@ public abstract class AbstractRDFTest {
 
     @Test
     public void testCreateBlankNode() throws Exception {
-        BlankNode bnode = factory.createBlankNode();
+        final BlankNode bnode = factory.createBlankNode();
 
-        BlankNode bnode2 = factory.createBlankNode();
+        final BlankNode bnode2 = factory.createBlankNode();
         assertNotEquals("Second blank node has not got a unique internal identifier", bnode.uniqueReference(),
                 bnode2.uniqueReference());
     }
@@ -67,7 +67,7 @@ public abstract class AbstractRDFTest {
     public void testCreateBlankNodeIdentifierEmpty() throws Exception {
         try {
             factory.createBlankNode("");
-        } catch (IllegalArgumentException e) {
+        } catch (final IllegalArgumentException e) {
             // Expected exception
         }
     }
@@ -116,12 +116,12 @@ public abstract class AbstractRDFTest {
 
     @Test
     public void testCreateGraph() {
-        Graph graph = factory.createGraph();
+        final Graph graph = factory.createGraph();
 
         assertEquals("Graph was not empty", 0, graph.size());
         graph.add(factory.createBlankNode(), factory.createIRI("http://example.com/"), factory.createBlankNode());
 
-        Graph graph2 = factory.createGraph();
+        final Graph graph2 = factory.createGraph();
         assertNotSame(graph, graph2);
         assertEquals("Graph was empty after adding", 1, graph.size());
         assertEquals("New graph was not empty", 0, graph2.size());
@@ -129,33 +129,33 @@ public abstract class AbstractRDFTest {
 
     @Test
     public void testCreateIRI() throws Exception {
-        IRI example = factory.createIRI("http://example.com/");
+        final IRI example = factory.createIRI("http://example.com/");
 
         assertEquals("http://example.com/", example.getIRIString());
         assertEquals("<http://example.com/>", example.ntriplesString());
 
-        IRI term = factory.createIRI("http://example.com/vocab#term");
+        final IRI term = factory.createIRI("http://example.com/vocab#term");
         assertEquals("http://example.com/vocab#term", term.getIRIString());
         assertEquals("<http://example.com/vocab#term>", term.ntriplesString());
 
         // and now for the international fun!
 
-        IRI latin1 = factory.createIRI("http://acc�nt.example.com/premi�re");
+        final IRI latin1 = factory.createIRI("http://acc�nt.example.com/premi�re");
         assertEquals("http://acc�nt.example.com/premi�re", latin1.getIRIString());
         assertEquals("<http://acc�nt.example.com/premi�re>", latin1.ntriplesString());
 
-        IRI cyrillic = factory.createIRI("http://example.\u0438\u0441\u043f\u044b\u0442\u0430\u043d\u0438\u0435/\u041a\u0438\u0440\u0438\u043b\u043b\u0438\u0446\u0430");
+        final IRI cyrillic = factory.createIRI("http://example.\u0438\u0441\u043f\u044b\u0442\u0430\u043d\u0438\u0435/\u041a\u0438\u0440\u0438\u043b\u043b\u0438\u0446\u0430");
         assertEquals("http://example.\u0438\u0441\u043f\u044b\u0442\u0430\u043d\u0438\u0435/\u041a\u0438\u0440\u0438\u043b\u043b\u0438\u0446\u0430", cyrillic.getIRIString());
         assertEquals("<http://example.\u0438\u0441\u043f\u044b\u0442\u0430\u043d\u0438\u0435/\u041a\u0438\u0440\u0438\u043b\u043b\u0438\u0446\u0430>", cyrillic.ntriplesString());
 
-        IRI deseret = factory.createIRI("http://\U00010400.example.com/\U00010400");
+        final IRI deseret = factory.createIRI("http://\U00010400.example.com/\U00010400");
         assertEquals("http://\U00010400.example.com/\U00010400", deseret.getIRIString());
         assertEquals("<http://\U00010400.example.com/\U00010400>", deseret.ntriplesString());
     }
 
     @Test
     public void testCreateLiteral() throws Exception {
-        Literal example = factory.createLiteral("Example");
+        final Literal example = factory.createLiteral("Example");
         assertEquals("Example", example.getLexicalForm());
         assertFalse(example.getLanguageTag().isPresent());
         assertEquals("http://www.w3.org/2001/XMLSchema#string", example.getDatatype().getIRIString());
@@ -165,7 +165,7 @@ public abstract class AbstractRDFTest {
 
     @Test
     public void testCreateLiteralDateTime() throws Exception {
-        Literal dateTime = factory.createLiteral("2014-12-27T00:50:00T-0600",
+        final Literal dateTime = factory.createLiteral("2014-12-27T00:50:00T-0600",
                 factory.createIRI("http://www.w3.org/2001/XMLSchema#dateTime"));
         assertEquals("2014-12-27T00:50:00T-0600", dateTime.getLexicalForm());
         assertFalse(dateTime.getLanguageTag().isPresent());
@@ -176,7 +176,7 @@ public abstract class AbstractRDFTest {
 
     @Test
     public void testCreateLiteralLang() throws Exception {
-        Literal example = factory.createLiteral("Example", "en");
+        final Literal example = factory.createLiteral("Example", "en");
 
         assertEquals("Example", example.getLexicalForm());
         assertEquals("en", example.getLanguageTag().get());
@@ -187,7 +187,7 @@ public abstract class AbstractRDFTest {
     @Test
     public void testCreateLiteralLangISO693_3() throws Exception {
         // see https://issues.apache.org/jira/browse/JENA-827
-        Literal vls = factory.createLiteral("Herbert Van de Sompel", "vls"); // JENA-827
+        final Literal vls = factory.createLiteral("Herbert Van de Sompel", "vls"); // JENA-827
 
         assertEquals("vls", vls.getLanguageTag().get());
         assertEquals("http://www.w3.org/1999/02/22-rdf-syntax-ns#langString", vls.getDatatype().getIRIString());
@@ -196,7 +196,7 @@ public abstract class AbstractRDFTest {
 
     @Test
     public void testCreateLiteralString() throws Exception {
-        Literal example = factory.createLiteral("Example",
+        final Literal example = factory.createLiteral("Example",
                 factory.createIRI("http://www.w3.org/2001/XMLSchema#string"));
         assertEquals("Example", example.getLexicalForm());
         assertFalse(example.getLanguageTag().isPresent());
@@ -207,10 +207,10 @@ public abstract class AbstractRDFTest {
 
     @Test
     public void testCreateTripleBnodeBnode() {
-        BlankNode subject = factory.createBlankNode("b1");
-        IRI predicate = factory.createIRI("http://example.com/pred");
-        BlankNode object = factory.createBlankNode("b2");
-        Triple triple = factory.createTriple(subject, predicate, object);
+        final BlankNode subject = factory.createBlankNode("b1");
+        final IRI predicate = factory.createIRI("http://example.com/pred");
+        final BlankNode object = factory.createBlankNode("b2");
+        final Triple triple = factory.createTriple(subject, predicate, object);
 
         // bnode equivalence should be OK as we used the same
         // factory and have not yet inserted Triple into a Graph
@@ -221,10 +221,10 @@ public abstract class AbstractRDFTest {
 
     @Test
     public void testCreateTripleBnodeIRI() {
-        BlankNode subject = factory.createBlankNode("b1");
-        IRI predicate = factory.createIRI("http://example.com/pred");
-        IRI object = factory.createIRI("http://example.com/obj");
-        Triple triple = factory.createTriple(subject, predicate, object);
+        final BlankNode subject = factory.createBlankNode("b1");
+        final IRI predicate = factory.createIRI("http://example.com/pred");
+        final IRI object = factory.createIRI("http://example.com/obj");
+        final Triple triple = factory.createTriple(subject, predicate, object);
 
         // bnode equivalence should be OK as we used the same
         // factory and have not yet inserted Triple into a Graph
@@ -235,10 +235,10 @@ public abstract class AbstractRDFTest {
 
     @Test
     public void testCreateTripleBnodeTriple() {
-        BlankNode subject = factory.createBlankNode();
-        IRI predicate = factory.createIRI("http://example.com/pred");
-        Literal object = factory.createLiteral("Example", "en");
-        Triple triple = factory.createTriple(subject, predicate, object);
+        final BlankNode subject = factory.createBlankNode();
+        final IRI predicate = factory.createIRI("http://example.com/pred");
+        final Literal object = factory.createLiteral("Example", "en");
+        final Triple triple = factory.createTriple(subject, predicate, object);
 
         // bnode equivalence should be OK as we used the same
         // factory and have not yet inserted Triple into a Graph
@@ -252,7 +252,7 @@ public abstract class AbstractRDFTest {
         BlankNode withColon;
         try {
             withColon = factory.createBlankNode("with:colon");
-        } catch (IllegalArgumentException ex) {
+        } catch (final IllegalArgumentException ex) {
             // Good!
             return;
         }
@@ -276,35 +276,35 @@ public abstract class AbstractRDFTest {
 
     @Test(expected = Exception.class)
     public void testInvalidTriplePredicate() {
-        BlankNode subject = factory.createBlankNode("b1");
-        BlankNode predicate = factory.createBlankNode("b2");
-        BlankNode object = factory.createBlankNode("b3");
+        final BlankNode subject = factory.createBlankNode("b1");
+        final BlankNode predicate = factory.createBlankNode("b2");
+        final BlankNode object = factory.createBlankNode("b3");
         factory.createTriple(subject, (IRI) predicate, object);
     }
 
     @Test
     public void hashCodeBlankNode() throws Exception {
-        BlankNode bnode1 = factory.createBlankNode();
+        final BlankNode bnode1 = factory.createBlankNode();
         assertEquals(bnode1.uniqueReference().hashCode(), bnode1.hashCode());
     }
 
     @Test
     public void hashCodeIRI() throws Exception {
-        IRI iri = factory.createIRI("http://example.com/");
+        final IRI iri = factory.createIRI("http://example.com/");
         assertEquals(iri.getIRIString().hashCode(), iri.hashCode());
     }
 
     @Test
     public void hashCodeLiteral() throws Exception {
-        Literal literal = factory.createLiteral("Hello");
+        final Literal literal = factory.createLiteral("Hello");
         assertEquals(Objects.hash(literal.getLexicalForm(), literal.getDatatype(), literal.getLanguageTag()),
                 literal.hashCode());
     }
 
     @Test
     public void hashCodeTriple() throws Exception {
-        IRI iri = factory.createIRI("http://example.com/");
-        Triple triple = factory.createTriple(iri, iri, iri);
+        final IRI iri = factory.createIRI("http://example.com/");
+        final Triple triple = factory.createTriple(iri, iri, iri);
         assertEquals(Objects.hash(iri, iri, iri), triple.hashCode());
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/api/src/test/java/org/apache/commons/rdf/api/DefaultDatasetTest.java
----------------------------------------------------------------------
diff --git a/api/src/test/java/org/apache/commons/rdf/api/DefaultDatasetTest.java b/api/src/test/java/org/apache/commons/rdf/api/DefaultDatasetTest.java
index 22262da..024c2cf 100644
--- a/api/src/test/java/org/apache/commons/rdf/api/DefaultDatasetTest.java
+++ b/api/src/test/java/org/apache/commons/rdf/api/DefaultDatasetTest.java
@@ -36,7 +36,7 @@ public class DefaultDatasetTest {
     public void defaultIterate() throws Exception {
         assertFalse(dataset.streamCalled);
         assertFalse(dataset.filteredStreamCalled);
-        for (Quad t : dataset.iterate()) {
+        for (final Quad t : dataset.iterate()) {
             assertEquals(t, new DummyQuad());
         }
         assertTrue(dataset.streamCalled);
@@ -47,7 +47,7 @@ public class DefaultDatasetTest {
     public void defaultFilteredIterate() throws Exception {
         assertFalse(dataset.streamCalled);
         assertFalse(dataset.filteredStreamCalled);
-        for (Quad t : dataset.iterate(null, null, new DummyIRI(2), null)) {
+        for (final Quad t : dataset.iterate(null, null, new DummyIRI(2), null)) {
             assertEquals(t, new DummyQuad());
         }
         assertTrue(dataset.filteredStreamCalled);

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/api/src/test/java/org/apache/commons/rdf/api/DefaultGraphTest.java
----------------------------------------------------------------------
diff --git a/api/src/test/java/org/apache/commons/rdf/api/DefaultGraphTest.java b/api/src/test/java/org/apache/commons/rdf/api/DefaultGraphTest.java
index 14a32f0..8d6f337 100644
--- a/api/src/test/java/org/apache/commons/rdf/api/DefaultGraphTest.java
+++ b/api/src/test/java/org/apache/commons/rdf/api/DefaultGraphTest.java
@@ -56,7 +56,7 @@ public class DefaultGraphTest {
     public void defaultIterate() throws Exception {
         assertFalse(graph.streamCalled);
         assertFalse(graph.filteredStreamCalled);
-        for (Triple t : graph.iterate()) {
+        for (final Triple t : graph.iterate()) {
             assertEquals(t, new DummyTriple());
         }
         assertTrue(graph.streamCalled);
@@ -67,7 +67,7 @@ public class DefaultGraphTest {
     public void defaultFilteredIterate() throws Exception {
         assertFalse(graph.streamCalled);
         assertFalse(graph.filteredStreamCalled);
-        for (Triple t : graph.iterate(null, new DummyIRI(2), null)) {
+        for (final Triple t : graph.iterate(null, new DummyIRI(2), null)) {
             assertEquals(t, new DummyTriple());
         }
         assertTrue(graph.filteredStreamCalled);

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/api/src/test/java/org/apache/commons/rdf/api/DefaultQuadTest.java
----------------------------------------------------------------------
diff --git a/api/src/test/java/org/apache/commons/rdf/api/DefaultQuadTest.java b/api/src/test/java/org/apache/commons/rdf/api/DefaultQuadTest.java
index 53ba26d..00d66b5 100644
--- a/api/src/test/java/org/apache/commons/rdf/api/DefaultQuadTest.java
+++ b/api/src/test/java/org/apache/commons/rdf/api/DefaultQuadTest.java
@@ -26,8 +26,8 @@ import org.junit.Test;
 public class DefaultQuadTest {
     @Test
     public void asQuad() throws Exception {
-        Quad q = new DummyQuad();
-        Triple t = q.asTriple();
+        final Quad q = new DummyQuad();
+        final Triple t = q.asTriple();
         assertEquals(t, t);
         assertNotEquals(t,  q);
         assertEquals(t, new DummyTriple());

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/api/src/test/java/org/apache/commons/rdf/api/DummyQuadTest.java
----------------------------------------------------------------------
diff --git a/api/src/test/java/org/apache/commons/rdf/api/DummyQuadTest.java b/api/src/test/java/org/apache/commons/rdf/api/DummyQuadTest.java
index 17f33bb..560e3fb 100644
--- a/api/src/test/java/org/apache/commons/rdf/api/DummyQuadTest.java
+++ b/api/src/test/java/org/apache/commons/rdf/api/DummyQuadTest.java
@@ -51,7 +51,7 @@ public class DummyQuadTest {
     
     @Test
     public void testHashCode() {
-        int expected = Objects.hash(quad.getSubject(), quad.getPredicate(), quad.getObject(), quad.getGraphName()); 
+        final int expected = Objects.hash(quad.getSubject(), quad.getPredicate(), quad.getObject(), quad.getGraphName()); 
         assertEquals(expected, quad.hashCode());
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/api/src/test/java/org/apache/commons/rdf/api/DummyTripleTest.java
----------------------------------------------------------------------
diff --git a/api/src/test/java/org/apache/commons/rdf/api/DummyTripleTest.java b/api/src/test/java/org/apache/commons/rdf/api/DummyTripleTest.java
index 0fae349..449de6e 100644
--- a/api/src/test/java/org/apache/commons/rdf/api/DummyTripleTest.java
+++ b/api/src/test/java/org/apache/commons/rdf/api/DummyTripleTest.java
@@ -46,7 +46,7 @@ public class DummyTripleTest {
     
     @Test
     public void testHashCode() {
-        int expected = Objects.hash(triple.getSubject(), triple.getPredicate(), triple.getObject()); 
+        final int expected = Objects.hash(triple.getSubject(), triple.getPredicate(), triple.getObject()); 
         assertEquals(expected, triple.hashCode());
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 1fe8dd0..f6082b7 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
@@ -56,10 +56,10 @@ public class AllToAllTest {
     @SuppressWarnings("rawtypes")
     @Parameters(name = "{index}: {0}->{1}")
     public static Collection<Object[]> data() {
-        List<Class> factories = Arrays.asList(SimpleRDF.class, JenaRDF.class, RDF4J.class, JsonLdRDF.class);
-        Collection<Object[]> allToAll = new ArrayList<>();
-        for (Class from : factories) {
-            for (Class to : factories) {
+        final List<Class> factories = Arrays.asList(SimpleRDF.class, JenaRDF.class, RDF4J.class, JsonLdRDF.class);
+        final Collection<Object[]> allToAll = new ArrayList<>();
+        for (final Class from : factories) {
+            for (final Class to : factories) {
                 // NOTE: we deliberately include self-to-self here
                 // to test two instances of the same implementation
                 allToAll.add(new Object[] { from, to });
@@ -78,16 +78,16 @@ public class AllToAllTest {
      */
     @Test
     public void addTermsFromOtherFactory() throws Exception {
-        Graph g = graphFactory.createGraph();
-        BlankNode s = nodeFactory.createBlankNode();
-        IRI p = nodeFactory.createIRI("http://example.com/p");
-        Literal o = nodeFactory.createLiteral("Hello");
+        final Graph g = graphFactory.createGraph();
+        final BlankNode s = nodeFactory.createBlankNode();
+        final IRI p = nodeFactory.createIRI("http://example.com/p");
+        final Literal o = nodeFactory.createLiteral("Hello");
 
         g.add(s, p, o);
 
         // blankNode should still work with g.contains()
         assertTrue(g.contains(s, p, o));
-        Triple t1 = g.stream().findAny().get();
+        final Triple t1 = g.stream().findAny().get();
 
         // Can't make assumptions about BlankNode equality - it might
         // have been mapped to a different BlankNode.uniqueReference()
@@ -96,7 +96,7 @@ public class AllToAllTest {
         assertEquals(p, t1.getPredicate());
         assertEquals(o, t1.getObject());
 
-        IRI s2 = nodeFactory.createIRI("http://example.com/s2");
+        final IRI s2 = nodeFactory.createIRI("http://example.com/s2");
         g.add(s2, p, s);
         assertTrue(g.contains(s2, p, s));
 
@@ -104,14 +104,14 @@ public class AllToAllTest {
         // (even if it has a different identifier), e.g.
         // we should be able to do:
 
-        Triple t2 = g.stream(s2, p, null).findAny().get();
+        final Triple t2 = g.stream(s2, p, null).findAny().get();
 
-        BlankNode bnode = (BlankNode) t2.getObject();
+        final BlankNode bnode = (BlankNode) t2.getObject();
         // And that (possibly adapted) BlankNode object should
         // match the subject of t1 statement
         assertEquals(bnode, t1.getSubject());
         // And can be used as a key:
-        Triple t3 = g.stream(bnode, p, null).findAny().get();
+        final Triple t3 = g.stream(bnode, p, null).findAny().get();
         assertEquals(t1, t3);
     }
 
@@ -125,12 +125,12 @@ public class AllToAllTest {
      */
     @Test
     public void addTriplesFromOtherFactory() throws Exception {
-        Graph g = graphFactory.createGraph();
-        BlankNode s = nodeFactory.createBlankNode();
-        IRI p = nodeFactory.createIRI("http://example.com/p");
-        Literal o = nodeFactory.createLiteral("Hello");
+        final Graph g = graphFactory.createGraph();
+        final BlankNode s = nodeFactory.createBlankNode();
+        final IRI p = nodeFactory.createIRI("http://example.com/p");
+        final Literal o = nodeFactory.createLiteral("Hello");
 
-        Triple srcT1 = nodeFactory.createTriple(s, p, o);
+        final Triple srcT1 = nodeFactory.createTriple(s, p, o);
         // This should work even with BlankNode as they are from the same
         // factory
         assertEquals(s, srcT1.getSubject());
@@ -140,7 +140,7 @@ public class AllToAllTest {
 
         // what about the blankNode within?
         assertTrue(g.contains(srcT1));
-        Triple t1 = g.stream().findAny().get();
+        final Triple t1 = g.stream().findAny().get();
 
         // Can't make assumptions about BlankNode equality - it might
         // have been mapped to a different BlankNode.uniqueReference()
@@ -149,8 +149,8 @@ public class AllToAllTest {
         assertEquals(p, t1.getPredicate());
         assertEquals(o, t1.getObject());
 
-        IRI s2 = nodeFactory.createIRI("http://example.com/s2");
-        Triple srcT2 = nodeFactory.createTriple(s2, p, s);
+        final IRI s2 = nodeFactory.createIRI("http://example.com/s2");
+        final Triple srcT2 = nodeFactory.createTriple(s2, p, s);
         g.add(srcT2);
         assertTrue(g.contains(srcT2));
 
@@ -158,14 +158,14 @@ public class AllToAllTest {
         // (even if it has a different identifier), e.g.
         // we should be able to do:
 
-        Triple t2 = g.stream(s2, p, null).findAny().get();
+        final Triple t2 = g.stream(s2, p, null).findAny().get();
 
-        BlankNode bnode = (BlankNode) t2.getObject();
+        final BlankNode bnode = (BlankNode) t2.getObject();
         // And that (possibly adapted) BlankNode object should
         // match the subject of t1 statement
         assertEquals(bnode, t1.getSubject());
         // And can be used as a key:
-        Triple t3 = g.stream(bnode, p, null).findAny().get();
+        final Triple t3 = g.stream(bnode, p, null).findAny().get();
         assertEquals(t1, t3);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 5ca8f66..92c0adb 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
@@ -266,14 +266,14 @@ public final class JenaRDF implements RDF {
             return factory.createIRI(node.getURI());
         }
         if (node.isLiteral()) {
-            String lang = node.getLiteralLanguage();
+            final String lang = node.getLiteralLanguage();
             if (lang != null && !lang.isEmpty()) {
                 return factory.createLiteral(node.getLiteralLexicalForm(), lang);
             }
             if (node.getLiteralDatatype().equals(XSDDatatype.XSDstring)) {
                 return factory.createLiteral(node.getLiteralLexicalForm());
             }
-            IRI dt = factory.createIRI(node.getLiteralDatatype().getURI());
+            final IRI dt = factory.createIRI(node.getLiteralDatatype().getURI());
             return factory.createLiteral(node.getLiteralLexicalForm(), dt);
         }
         if (node.isBlank()) {
@@ -392,10 +392,10 @@ public final class JenaRDF implements RDF {
         try {
             subject = (BlankNodeOrIRI) asRDFTerm(factory, triple.getSubject());
             predicate = (IRI) asRDFTerm(factory, triple.getPredicate());
-        } catch (ClassCastException ex) {
+        } catch (final ClassCastException ex) {
             throw new ConversionException("Can't convert generalized triple: " + triple, ex);
         }
-        RDFTerm object = asRDFTerm(factory, triple.getObject());
+        final RDFTerm object = asRDFTerm(factory, triple.getObject());
         return factory.createTriple(subject, predicate, object);
     }
 
@@ -529,10 +529,10 @@ public final class JenaRDF implements RDF {
             // No need to convert, just wrap
             return ((JenaRDF) factory).asQuad(quad);
         }
-        BlankNodeOrIRI graphName = (BlankNodeOrIRI) (asRDFTerm(factory, quad.getGraph()));
-        BlankNodeOrIRI subject = (BlankNodeOrIRI) (asRDFTerm(factory, quad.getSubject()));
-        IRI predicate = (IRI) (asRDFTerm(factory, quad.getPredicate()));
-        RDFTerm object = asRDFTerm(factory, quad.getObject());
+        final BlankNodeOrIRI graphName = (BlankNodeOrIRI) (asRDFTerm(factory, quad.getGraph()));
+        final BlankNodeOrIRI subject = (BlankNodeOrIRI) (asRDFTerm(factory, quad.getSubject()));
+        final IRI predicate = (IRI) (asRDFTerm(factory, quad.getPredicate()));
+        final RDFTerm object = asRDFTerm(factory, quad.getObject());
         return factory.createQuad(graphName, subject, predicate, object);
     }
 
@@ -645,7 +645,7 @@ public final class JenaRDF implements RDF {
         if (graph instanceof JenaGraph) {
             return ((JenaGraph) graph).asJenaGraph();
         }
-        org.apache.jena.graph.Graph g = GraphFactory.createGraphMem();
+        final org.apache.jena.graph.Graph g = GraphFactory.createGraphMem();
         graph.stream().forEach(t -> g.add(asJenaTriple(t)));
         return g;
     }
@@ -675,14 +675,14 @@ public final class JenaRDF implements RDF {
         }
 
         if (term instanceof Literal) {
-            Literal lit = (Literal) term;
-            RDFDatatype dt = NodeFactory.getType(lit.getDatatype().getIRIString());
-            String lang = lit.getLanguageTag().orElse("");
+            final Literal lit = (Literal) term;
+            final RDFDatatype dt = NodeFactory.getType(lit.getDatatype().getIRIString());
+            final String lang = lit.getLanguageTag().orElse("");
             return NodeFactory.createLiteral(lit.getLexicalForm(), lang, dt);
         }
 
         if (term instanceof BlankNode) {
-            String id = ((BlankNode) term).uniqueReference();
+            final String id = ((BlankNode) term).uniqueReference();
             return NodeFactory.createBlankNode(id);
         }
         throw new ConversionException("Not a concrete RDF Term: " + term);

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 12eea05..4921617 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
@@ -49,14 +49,14 @@ public class JenaRDFParser extends AbstractRDFParser<JenaRDFParser> implements R
     }
 
     public JenaRDFParser targetGeneralizedTriple(final Consumer<TripleLike> consumer) {
-        JenaRDFParser c = this.clone();
+        final JenaRDFParser c = this.clone();
         c.resetTarget();
         c.generalizedConsumerTriple = consumer;
         return c;
     }
 
     public JenaRDFParser targetGeneralizedQuad(final Consumer<QuadLike<RDFTerm>> consumer) {
-        JenaRDFParser c = this.clone();
+        final JenaRDFParser c = this.clone();
         c.resetTarget();
         c.generalizedConsumerQuad = consumer;
         return c;
@@ -72,9 +72,9 @@ public class JenaRDFParser extends AbstractRDFParser<JenaRDFParser> implements R
     @Override
     protected void parseSynchronusly() throws IOException {
         StreamRDF dest;
-        JenaRDF jenaRDF = getJenaFactory();
+        final JenaRDF jenaRDF = getJenaFactory();
         if (getTargetGraph().isPresent() && getTargetGraph().get() instanceof JenaGraph) {
-            Graph jenaGraph = ((JenaGraph) getTargetGraph().get()).asJenaGraph();
+            final Graph jenaGraph = ((JenaGraph) getTargetGraph().get()).asJenaGraph();
             dest = StreamRDFLib.graph(jenaGraph);
         } else {
             if (generalizedConsumerQuad != null) {
@@ -86,8 +86,8 @@ public class JenaRDFParser extends AbstractRDFParser<JenaRDFParser> implements R
             }
         }
 
-        Lang lang = getContentTypeSyntax().flatMap(jenaRDF::asJenaLang).orElse(null);
-        String baseStr = getBase().map(IRI::getIRIString).orElse(null);
+        final Lang lang = getContentTypeSyntax().flatMap(jenaRDF::asJenaLang).orElse(null);
+        final String baseStr = getBase().map(IRI::getIRIString).orElse(null);
 
         if (getSourceIri().isPresent()) {
             RDFDataMgr.parse(dest, getSourceIri().get().toString(), baseStr, lang, null);

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 81e7d17..9a4c94b 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
@@ -90,7 +90,7 @@ abstract class AbstractQuadLike<S extends RDFTerm, P extends RDFTerm, O extends
 
     @Override
     public org.apache.jena.sparql.core.Quad asJenaQuad() {
-        JenaRDF factory = new JenaRDF();
+        final JenaRDF factory = new JenaRDF();
         if (quad == null) {
             quad = org.apache.jena.sparql.core.Quad.create(factory.asJenaNode(graphName.orElse(null)),
                     factory.asJenaNode(subject), factory.asJenaNode(predicate), factory.asJenaNode(object));
@@ -100,7 +100,7 @@ abstract class AbstractQuadLike<S extends RDFTerm, P extends RDFTerm, O extends
 
     @Override
     public org.apache.jena.graph.Triple asJenaTriple() {
-        JenaRDF factory = new JenaRDF();
+        final JenaRDF factory = new JenaRDF();
         if (triple == null) {
             triple = org.apache.jena.graph.Triple.create(factory.asJenaNode(subject), factory.asJenaNode(predicate),
                     factory.asJenaNode(object));

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 80a9d3d..f465309 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
@@ -71,7 +71,7 @@ public abstract class InternalJenaFactory {
     }
 
     public JenaDataset createDataset(final UUID salt) {
-        DatasetGraph dg = DatasetGraphFactory.createGeneral();
+        final DatasetGraph dg = DatasetGraphFactory.createGeneral();
         // Or which createMethod() -- a bit confusing with lots of choice..
         return new JenaDatasetImpl(dg, salt);
     }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 d8eaa23..89ed5b6 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
@@ -47,7 +47,7 @@ class JenaBlankNodeImpl extends AbstractJenaRDFTerm implements JenaBlankNode {
         if (!(other instanceof BlankNode)) {
             return false;
         }
-        BlankNode bNode = (BlankNode) other;
+        final BlankNode bNode = (BlankNode) other;
         return uniqueReference().equals(bNode.uniqueReference());
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 ddebc19..9e4eac2 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
@@ -122,7 +122,7 @@ class JenaDatasetImpl implements JenaDataset {
 
     @Override
     public long size() {
-        long quads = Iter.asStream(graph.listGraphNodes())
+        final long quads = Iter.asStream(graph.listGraphNodes())
                 .map(graph::getGraph)
                 .collect(Collectors.summingLong(org.apache.jena.graph.Graph::size));
         return quads + graph.getDefaultGraph().size();
@@ -130,45 +130,45 @@ class JenaDatasetImpl implements JenaDataset {
 
     @Override
     public Stream<? extends Quad> stream() {
-        JenaRDF factory = new JenaRDF(salt);
+        final JenaRDF factory = new JenaRDF(salt);
         return Iter.asStream(graph.find(ANY, ANY, ANY, ANY), true).map(factory::asQuad);
     }
 
     @Override
     public Stream<? extends Quad> stream(final Optional<BlankNodeOrIRI> g, final BlankNodeOrIRI s, final IRI p, final RDFTerm o) {
-        JenaRDF factory = new JenaRDF(salt);
+        final JenaRDF factory = new JenaRDF(salt);
         return Iter.asStream(graph.find(toJenaPattern(g), toJenaPattern(s), toJenaPattern(p), toJenaPattern(o)), true)
                 .map(factory::asQuad);
     }
 
     @Override
     public String toString() {
-        StringWriter sw = new StringWriter();
+        final StringWriter sw = new StringWriter();
         RDFDataMgr.write(sw, graph, Lang.NT);
         return sw.toString();
     }
 
     @Override
     public Graph getGraph() {
-        GraphView g = GraphView.createDefaultGraph(graph);
+        final GraphView g = GraphView.createDefaultGraph(graph);
         return new JenaGraphImpl(g, salt);
     }
 
     @Override
     public JenaGraph getUnionGraph() {
-        GraphView gv = GraphView.createUnionGraph(graph);
+        final GraphView gv = GraphView.createUnionGraph(graph);
         return new JenaGraphImpl(gv, salt);
     }
 
     @Override
     public Optional<Graph> getGraph(final BlankNodeOrIRI graphName) {
-        GraphView gv = GraphView.createNamedGraph(graph, factory.asJenaNode(graphName));
+        final GraphView gv = GraphView.createNamedGraph(graph, factory.asJenaNode(graphName));
         return Optional.of(new JenaGraphImpl(gv, salt));
     }
 
     @Override
     public Stream<BlankNodeOrIRI> getGraphNames() {
-        JenaRDF factory = new JenaRDF(salt);
+        final JenaRDF factory = new JenaRDF(salt);
         return Iter.asStream(graph.listGraphNodes()).map(node -> (BlankNodeOrIRI) factory.asRDFTerm(node));
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 6454ac3..e3805b6 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
@@ -116,13 +116,13 @@ class JenaGraphImpl implements JenaGraph {
 
     @Override
     public Stream<? extends Triple> stream() {
-        JenaRDF factory = new JenaRDF(salt);
+        final JenaRDF factory = new JenaRDF(salt);
         return Iter.asStream(graph.find(null, null, null), true).map(factory::asTriple);
     }
 
     @Override
     public Stream<? extends Triple> stream(final BlankNodeOrIRI s, final IRI p, final RDFTerm o) {
-        JenaRDF factory = new JenaRDF(salt);
+        final JenaRDF factory = new JenaRDF(salt);
         return Iter.asStream(graph.find(toJenaAny(s), toJenaAny(p), toJenaAny(o)), true).map(factory::asTriple);
     }
 
@@ -135,7 +135,7 @@ class JenaGraphImpl implements JenaGraph {
 
     @Override
     public String toString() {
-        StringWriter sw = new StringWriter();
+        final StringWriter sw = new StringWriter();
         RDFDataMgr.write(sw, graph, Lang.NT);
         return sw.toString();
     }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 36f8880..77de68a 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
@@ -48,7 +48,7 @@ class JenaIRIImpl extends AbstractJenaRDFTerm implements JenaIRI {
         if (!(other instanceof IRI)) {
             return false;
         }
-        IRI iri = (IRI) other;
+        final IRI iri = (IRI) other;
         return getIRIString().equals(iri.getIRIString());
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 637c51f..faee060 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
@@ -49,7 +49,7 @@ class JenaLiteralImpl extends AbstractJenaRDFTerm implements JenaLiteral {
         if (!(other instanceof Literal)) {
             return false;
         }
-        Literal literal = (Literal) other;
+        final Literal literal = (Literal) other;
         return getLexicalForm().equals(literal.getLexicalForm()) && getLanguageTag().equals(literal.getLanguageTag())
                 && getDatatype().equals(literal.getDatatype());
     }
@@ -61,7 +61,7 @@ class JenaLiteralImpl extends AbstractJenaRDFTerm implements JenaLiteral {
 
     @Override
     public Optional<String> getLanguageTag() {
-        String x = asJenaNode().getLiteralLanguage();
+        final String x = asJenaNode().getLiteralLanguage();
         if (x == null || x.isEmpty()) {
             return Optional.empty();
         }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 491b80d..4bdbf77 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
@@ -53,7 +53,7 @@ class JenaQuadImpl extends AbstractQuadLike<BlankNodeOrIRI, IRI, RDFTerm, BlankN
         if (!(other instanceof Quad)) {
             return false;
         }
-        Quad quad = (Quad) other;
+        final Quad quad = (Quad) other;
         return getGraphName().equals(quad.getGraphName()) && getSubject().equals(quad.getSubject())
                 && getPredicate().equals(quad.getPredicate()) && getObject().equals(quad.getObject());
     }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 b18c3d0..cc268d5 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
@@ -53,7 +53,7 @@ class JenaTripleImpl extends AbstractQuadLike<BlankNodeOrIRI, IRI, RDFTerm, RDFT
         if (!(other instanceof Triple)) {
             return false;
         }
-        Triple triple = (Triple) other;
+        final Triple triple = (Triple) other;
         return getSubject().equals(triple.getSubject()) && getPredicate().equals(triple.getPredicate())
                 && getObject().equals(triple.getObject());
     }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/jena/src/test/java/org/apache/commons/rdf/jena/JenaServiceLoaderTest.java
----------------------------------------------------------------------
diff --git a/jena/src/test/java/org/apache/commons/rdf/jena/JenaServiceLoaderTest.java b/jena/src/test/java/org/apache/commons/rdf/jena/JenaServiceLoaderTest.java
index dc0c8bd..ed99876 100644
--- a/jena/src/test/java/org/apache/commons/rdf/jena/JenaServiceLoaderTest.java
+++ b/jena/src/test/java/org/apache/commons/rdf/jena/JenaServiceLoaderTest.java
@@ -29,8 +29,8 @@ public class JenaServiceLoaderTest {
 
     @Test
     public void testServiceLoaderLookup() {
-        ServiceLoader<RDF> loader = ServiceLoader.load(RDF.class);
-        for (RDF impl : loader) {
+        final ServiceLoader<RDF> loader = ServiceLoader.load(RDF.class);
+        for (final RDF impl : loader) {
             if (impl instanceof JenaRDF) {
                 return; // yay
             }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
----------------------------------------------------------------------
diff --git a/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java b/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
index 632cce9..00e01e0 100644
--- a/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
+++ b/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
@@ -59,35 +59,35 @@ public class TestJenaGraphToCommonsRDFGraph {
 
     @Test
     public void jenaToCommonsRDF() throws Exception {
-        org.apache.jena.graph.Graph jGraph = GraphFactory.createGraphMem();
+        final org.apache.jena.graph.Graph jGraph = GraphFactory.createGraphMem();
         RDFDataMgr.read(jGraph, turtleFile.toUri().toString());
 
-        JenaRDF factory = new JenaRDF();
+        final JenaRDF factory = new JenaRDF();
 
         // "graph" is a CommonsRDF graph
-        Graph graph = factory.asGraph(jGraph);
+        final Graph graph = factory.asGraph(jGraph);
 
         // The below check expected statements from D.ttl
 
-        JenaIRI p = factory.createIRI("http://example.com/p");
-        JenaIRI s = factory.createIRI("http://example.com/s");
-        JenaLiteral literal123 = factory.createLiteral("123", Types.XSD_INTEGER);
+        final JenaIRI p = factory.createIRI("http://example.com/p");
+        final JenaIRI s = factory.createIRI("http://example.com/s");
+        final JenaLiteral literal123 = factory.createLiteral("123", Types.XSD_INTEGER);
         assertTrue(graph.contains(s, p, literal123));
 
-        JenaIRI p1 = factory.createIRI("http://example.com/p1");
+        final JenaIRI p1 = factory.createIRI("http://example.com/p1");
         // Let's look up the BlankNode
-        BlankNodeOrIRI bnode1 = graph.stream(null, p1, null).findFirst().map(Triple::getSubject).get();
+        final BlankNodeOrIRI bnode1 = graph.stream(null, p1, null).findFirst().map(Triple::getSubject).get();
         assertTrue(bnode1 instanceof BlankNode);
 
         // Verify we can use BlankNode in query again
-        RDFTerm obj = graph.stream(bnode1, p1, null).findFirst().map(Triple::getObject).get();
+        final RDFTerm obj = graph.stream(bnode1, p1, null).findFirst().map(Triple::getObject).get();
 
         // Let's look up also that nested blank node
         assertTrue(obj instanceof BlankNode);
-        BlankNode bnode2 = (BlankNode) obj;
+        final BlankNode bnode2 = (BlankNode) obj;
 
-        JenaIRI q = factory.createIRI("http://example.com/q");
-        JenaLiteral literalR = factory.createLiteral("r", "en");
+        final JenaIRI q = factory.createIRI("http://example.com/q");
+        final JenaLiteral literalR = factory.createLiteral("r", "en");
         assertTrue(graph.contains(bnode2, q, literalR));
 
         // Can we add the same triple again as s/p/o
@@ -102,9 +102,9 @@ public class TestJenaGraphToCommonsRDFGraph {
         assertEquals(3, graph.size());
 
         // Add to CommonsRDF Graph
-        JenaIRI s2 = factory.createIRI("http://example/s2");
-        JenaIRI p2 = factory.createIRI("http://example/p2");
-        JenaLiteral foo = factory.createLiteral("foo");
+        final JenaIRI s2 = factory.createIRI("http://example/s2");
+        final JenaIRI p2 = factory.createIRI("http://example/p2");
+        final JenaLiteral foo = factory.createLiteral("foo");
         graph.add(s2, p2, foo);
         assertEquals(4, graph.size());
         assertTrue(graph.contains(s2, p2, foo));

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/jena/src/test/java/org/apache/commons/rdf/jena/TestRDFParserBuilder.java
----------------------------------------------------------------------
diff --git a/jena/src/test/java/org/apache/commons/rdf/jena/TestRDFParserBuilder.java b/jena/src/test/java/org/apache/commons/rdf/jena/TestRDFParserBuilder.java
index da60602..c1bf41e 100644
--- a/jena/src/test/java/org/apache/commons/rdf/jena/TestRDFParserBuilder.java
+++ b/jena/src/test/java/org/apache/commons/rdf/jena/TestRDFParserBuilder.java
@@ -54,8 +54,8 @@ public class TestRDFParserBuilder {
 
     @Test
     public void parseTurtle() throws Exception {
-        Graph g = new JenaRDF().createGraph();
-        Future<ParseResult> gFuture = new JenaRDFParser().contentType(RDFSyntax.TURTLE).source(turtleFile).target(g)
+        final Graph g = new JenaRDF().createGraph();
+        final Future<ParseResult> gFuture = new JenaRDFParser().contentType(RDFSyntax.TURTLE).source(turtleFile).target(g)
                 .parse();
         gFuture.get(5, TimeUnit.SECONDS);
         assertEquals(3, g.size());

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 a9b13e2..c508e6b 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
@@ -51,7 +51,7 @@ final class JsonLdBlankNodeImpl extends JsonLdTermImpl implements JsonLdBlankNod
         if (!(obj instanceof BlankNode)) {
             return false;
         }
-        BlankNode other = (BlankNode) obj;
+        final BlankNode other = (BlankNode) obj;
         return uniqueReference().equals(other.uniqueReference());
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 fe91536..d4addfb 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
@@ -95,7 +95,7 @@ class JsonLdGraphImpl extends AbstractJsonLdGraphLike<Triple> implements JsonLdG
 
     @Override
     public long size() {
-        String g = graphName.map(factory::asJsonLdString).orElse("@default");
+        final String g = graphName.map(factory::asJsonLdString).orElse("@default");
         return Optional.ofNullable(rdfDataSet.getQuads(g)).map(List::size).orElse(0);
     }
 


[5/7] incubator-commonsrdf git commit: Add final modifier to local variables.

Posted by gg...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/simple/src/main/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParser.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParser.java b/simple/src/main/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParser.java
index 9576b4a..1157dc5 100644
--- a/simple/src/main/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParser.java
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParser.java
@@ -219,7 +219,7 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>> implemen
     public T clone() {
         try {
             return (T) super.clone();
-        } catch (CloneNotSupportedException e) {
+        } catch (final CloneNotSupportedException e) {
             throw new RuntimeException(e);
         }
     }
@@ -231,14 +231,14 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>> implemen
 
     @Override
     public T rdfTermFactory(final RDF rdfTermFactory) {
-        AbstractRDFParser<T> c = clone();
+        final AbstractRDFParser<T> c = clone();
         c.rdfTermFactory = Optional.ofNullable(rdfTermFactory);
         return c.asT();
     }
 
     @Override
     public T contentType(final RDFSyntax rdfSyntax) throws IllegalArgumentException {
-        AbstractRDFParser<T> c = clone();
+        final AbstractRDFParser<T> c = clone();
         c.contentTypeSyntax = Optional.ofNullable(rdfSyntax);
         c.contentType = c.contentTypeSyntax.map(syntax -> syntax.mediaType);
         return c.asT();
@@ -246,7 +246,7 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>> implemen
 
     @Override
     public T contentType(final String contentType) throws IllegalArgumentException {
-        AbstractRDFParser<T> c = clone();
+        final AbstractRDFParser<T> c = clone();
         c.contentType = Optional.ofNullable(contentType);
         c.contentTypeSyntax = c.contentType.flatMap(RDFSyntax::byMediaType);
         return c.asT();
@@ -254,7 +254,7 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>> implemen
 
     @Override
     public T base(final IRI base) {
-        AbstractRDFParser<T> c = clone();
+        final AbstractRDFParser<T> c = clone();
         c.base = Optional.ofNullable(base);
         c.base.ifPresent(i -> checkIsAbsolute(i));
         return c.asT();
@@ -267,7 +267,7 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>> implemen
 
     @Override
     public T source(final InputStream inputStream) {
-        AbstractRDFParser<T> c = clone();
+        final AbstractRDFParser<T> c = clone();
         c.resetSource();
         c.sourceInputStream = Optional.ofNullable(inputStream);
         return c.asT();
@@ -275,7 +275,7 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>> implemen
 
     @Override
     public T source(final Path file) {
-        AbstractRDFParser<T> c = clone();
+        final AbstractRDFParser<T> c = clone();
         c.resetSource();
         c.sourceFile = Optional.ofNullable(file);
         return c.asT();
@@ -283,7 +283,7 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>> implemen
 
     @Override
     public T source(final IRI iri) {
-        AbstractRDFParser<T> c = clone();
+        final AbstractRDFParser<T> c = clone();
         c.resetSource();
         c.sourceIri = Optional.ofNullable(iri);
         c.sourceIri.ifPresent(i -> checkIsAbsolute(i));
@@ -292,7 +292,7 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>> implemen
 
     @Override
     public T source(final String iri) throws IllegalArgumentException {
-        AbstractRDFParser<T> c = clone();
+        final AbstractRDFParser<T> c = clone();
         c.resetSource();
         c.sourceIri = Optional.ofNullable(iri).map(internalRdfTermFactory::createIRI);
         c.sourceIri.ifPresent(i -> checkIsAbsolute(i));
@@ -428,7 +428,7 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>> implemen
 
         // We'll make a clone of our current state which will be passed to
         // parseSynchronously()
-        AbstractRDFParser<T> c = clone();
+        final AbstractRDFParser<T> c = clone();
 
         // Use a fresh SimpleRDF for each parse
         if (!c.rdfTermFactory.isPresent()) {
@@ -437,7 +437,7 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>> implemen
         // sourceFile, but no base? Let's follow any symlinks and use
         // the file:/// URI
         if (c.sourceFile.isPresent() && !c.base.isPresent()) {
-            URI baseUri = c.sourceFile.get().toRealPath().toUri();
+            final URI baseUri = c.sourceFile.get().toRealPath().toUri();
             c.base = Optional.of(internalRdfTermFactory.createIRI(baseUri.toString()));
         }
 
@@ -502,12 +502,12 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>> implemen
      *         {@link Optional#empty()} if the path has no extension
      */
     private static Optional<String> fileExtension(final Path path) {
-        Path fileName = path.getFileName();
+        final Path fileName = path.getFileName();
         if (fileName == null) {
             return Optional.empty();
         }
-        String filenameStr = fileName.toString();
-        int last = filenameStr.lastIndexOf(".");
+        final String filenameStr = fileName.toString();
+        final int last = filenameStr.lastIndexOf(".");
         if (last > -1) {
             return Optional.of(filenameStr.substring(last));
         }
@@ -541,7 +541,7 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>> implemen
 
     @Override
     public T target(final Consumer<Quad> consumer) {
-        AbstractRDFParser<T> c = clone();
+        final AbstractRDFParser<T> c = clone();
         c.resetTarget();
         c.target = consumer;
         return c.asT();
@@ -550,6 +550,7 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>> implemen
     @Override
     public T target(final Dataset dataset) {
         @SuppressWarnings({ "rawtypes", "unchecked" })
+        final
         AbstractRDFParser<T> c = (AbstractRDFParser) RDFParser.super.target(dataset);
         c.resetTarget();
         c.targetDataset = Optional.of(dataset);
@@ -559,6 +560,7 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>> implemen
     @Override
     public T target(final Graph graph) {
         @SuppressWarnings({ "rawtypes", "unchecked" }) // super calls our
+        final
                                                        // .clone()
         AbstractRDFParser<T> c = (AbstractRDFParser) RDFParser.super.target(graph);
         c.resetTarget();

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/simple/src/test/java/org/apache/commons/rdf/simple/DummyRDFParserBuilder.java
----------------------------------------------------------------------
diff --git a/simple/src/test/java/org/apache/commons/rdf/simple/DummyRDFParserBuilder.java b/simple/src/test/java/org/apache/commons/rdf/simple/DummyRDFParserBuilder.java
index afb2129..02f37f4 100644
--- a/simple/src/test/java/org/apache/commons/rdf/simple/DummyRDFParserBuilder.java
+++ b/simple/src/test/java/org/apache/commons/rdf/simple/DummyRDFParserBuilder.java
@@ -52,12 +52,12 @@ public class DummyRDFParserBuilder extends AbstractRDFParser<DummyRDFParserBuild
     @Override
     protected void parseSynchronusly() throws IOException, IllegalStateException, RDFParseException {
         // From parseSynchronusly both of these are always present
-        RDF factory = getRdfTermFactory().get();
-        Consumer<Quad> t = getTarget();
+        final RDF factory = getRdfTermFactory().get();
+        final Consumer<Quad> t = getTarget();
 
         // well - each parsing is unique. This should hopefully
         // catch any accidental double parsing
-        IRI parsing = factory.createIRI("urn:uuid:" + UUID.randomUUID());
+        final IRI parsing = factory.createIRI("urn:uuid:" + UUID.randomUUID());
         t.accept(factory.createQuad(null, parsing, factory.createIRI("http://example.com/greeting"),
                 factory.createLiteral("Hello world")));
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/simple/src/test/java/org/apache/commons/rdf/simple/SimpleServiceLoaderTest.java
----------------------------------------------------------------------
diff --git a/simple/src/test/java/org/apache/commons/rdf/simple/SimpleServiceLoaderTest.java b/simple/src/test/java/org/apache/commons/rdf/simple/SimpleServiceLoaderTest.java
index 4e37199..c79746e 100644
--- a/simple/src/test/java/org/apache/commons/rdf/simple/SimpleServiceLoaderTest.java
+++ b/simple/src/test/java/org/apache/commons/rdf/simple/SimpleServiceLoaderTest.java
@@ -29,8 +29,8 @@ public class SimpleServiceLoaderTest {
 
     @Test
     public void testServiceLoaderLookup() {
-        ServiceLoader<RDF> loader = ServiceLoader.load(RDF.class);
-        for (RDF impl : loader) {
+        final ServiceLoader<RDF> loader = ServiceLoader.load(RDF.class);
+        for (final RDF impl : loader) {
             if (impl instanceof SimpleRDF) {
                 return; // yay
             }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/simple/src/test/java/org/apache/commons/rdf/simple/TestWritingGraph.java
----------------------------------------------------------------------
diff --git a/simple/src/test/java/org/apache/commons/rdf/simple/TestWritingGraph.java b/simple/src/test/java/org/apache/commons/rdf/simple/TestWritingGraph.java
index add7d75..4f28af7 100644
--- a/simple/src/test/java/org/apache/commons/rdf/simple/TestWritingGraph.java
+++ b/simple/src/test/java/org/apache/commons/rdf/simple/TestWritingGraph.java
@@ -59,9 +59,9 @@ public class TestWritingGraph {
     public static void createGraph() throws Exception {
         factory = new SimpleRDF();
         graph = factory.createGraph();
-        IRI subject = factory.createIRI("subj");
-        IRI predicate = factory.createIRI("pred");
-        List<IRI> types = new ArrayList<>(Types.values());
+        final IRI subject = factory.createIRI("subj");
+        final IRI predicate = factory.createIRI("pred");
+        final List<IRI> types = new ArrayList<>(Types.values());
         // Ensure we don't try to create a literal with rdf:langString but
         // without a language tag
         types.remove(Types.RDF_LANGSTRING);
@@ -92,9 +92,9 @@ public class TestWritingGraph {
 
     @Test
     public void countQuery() {
-        IRI subject = factory.createIRI("subj");
-        IRI predicate = factory.createIRI("pred");
-        long count = graph.stream(subject, predicate, null).unordered().parallel().count();
+        final IRI subject = factory.createIRI("subj");
+        final IRI predicate = factory.createIRI("pred");
+        final long count = graph.stream(subject, predicate, null).unordered().parallel().count();
         // System.out.println("Counted - " + count);
         assertEquals(count, TRIPLES);
     }
@@ -106,45 +106,45 @@ public class TestWritingGraph {
 
     @Test
     public void writeGraphFromStream() throws Exception {
-        Path graphFile = Files.createTempFile("graph", ".nt");
+        final Path graphFile = Files.createTempFile("graph", ".nt");
         if (KEEP_FILES) {
             System.out.println("From stream: " + graphFile);
         } else {
             graphFile.toFile().deleteOnExit();
         }
 
-        Stream<CharSequence> stream = graph.stream().map(TestWritingGraph::tripleAsString);
+        final Stream<CharSequence> stream = graph.stream().map(TestWritingGraph::tripleAsString);
         Files.write(graphFile, stream::iterator, StandardCharsets.UTF_8);
     }
 
     @Test
     public void writeGraphFromStreamFiltered() throws Exception {
-        Path graphFile = Files.createTempFile("graph", ".nt");
+        final Path graphFile = Files.createTempFile("graph", ".nt");
         if (KEEP_FILES) {
             System.out.println("Filtered stream: " + graphFile);
         } else {
             graphFile.toFile().deleteOnExit();
         }
 
-        IRI subject = factory.createIRI("subj");
-        IRI predicate = factory.createIRI("pred");
-        Stream<CharSequence> stream = graph.stream(subject, predicate, null).map(TestWritingGraph::tripleAsString);
+        final IRI subject = factory.createIRI("subj");
+        final IRI predicate = factory.createIRI("pred");
+        final Stream<CharSequence> stream = graph.stream(subject, predicate, null).map(TestWritingGraph::tripleAsString);
         Files.write(graphFile, stream::iterator, StandardCharsets.UTF_8);
 
     }
 
     @Test
     public void writeGraphFromStreamFilteredNoMatches() throws Exception {
-        Path graphFile = Files.createTempFile("graph-empty-", ".nt");
+        final Path graphFile = Files.createTempFile("graph-empty-", ".nt");
         if (KEEP_FILES) {
             System.out.println("Filtered stream: " + graphFile);
         } else {
             graphFile.toFile().deleteOnExit();
         }
 
-        IRI subject = factory.createIRI("nonexistent");
-        IRI predicate = factory.createIRI("pred");
-        Stream<CharSequence> stream = graph.stream(subject, predicate, null).map(Object::toString);
+        final IRI subject = factory.createIRI("nonexistent");
+        final IRI predicate = factory.createIRI("pred");
+        final Stream<CharSequence> stream = graph.stream(subject, predicate, null).map(Object::toString);
         Files.write(graphFile, stream::iterator, StandardCharsets.UTF_8);
 
     }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/simple/src/test/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParserTest.java
----------------------------------------------------------------------
diff --git a/simple/src/test/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParserTest.java b/simple/src/test/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParserTest.java
index 222d820..12061ed 100644
--- a/simple/src/test/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParserTest.java
+++ b/simple/src/test/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParserTest.java
@@ -81,18 +81,18 @@ public class AbstractRDFParserTest {
 
     private void checkGraph(final Graph g) throws Exception {
         assertTrue(g.size() > 0);
-        IRI greeting = factory.createIRI("http://example.com/greeting");
+        final IRI greeting = factory.createIRI("http://example.com/greeting");
         // Should only have parsed once!
         assertEquals(1, g.stream(null, greeting, null).count());
-        Triple triple = g.stream(null, greeting, null).findAny().get();
+        final Triple triple = g.stream(null, greeting, null).findAny().get();
         assertTrue(triple.getSubject() instanceof IRI);
-        IRI parsing = (IRI) triple.getSubject();
+        final IRI parsing = (IRI) triple.getSubject();
         assertTrue(parsing.getIRIString().startsWith("urn:uuid:"));
 
         assertEquals("http://example.com/greeting", triple.getPredicate().getIRIString());
 
         assertTrue(triple.getObject() instanceof Literal);
-        Literal literal = (Literal) triple.getObject();
+        final Literal literal = (Literal) triple.getObject();
         assertEquals("Hello world", literal.getLexicalForm());
         assertFalse(literal.getLanguageTag().isPresent());
         assertEquals(Types.XSD_STRING, literal.getDatatype());
@@ -108,8 +108,8 @@ public class AbstractRDFParserTest {
 
     @Test
     public void parseFile() throws Exception {
-        Graph g = factory.createGraph();
-        RDFParser parser = dummyParser.source(testNt).target(g);
+        final Graph g = factory.createGraph();
+        final RDFParser parser = dummyParser.source(testNt).target(g);
         parser.parse().get(5, TimeUnit.SECONDS);
         checkGraph(g);
         // FIXME: this could potentially break if the equivalent of /tmp
@@ -133,8 +133,8 @@ public class AbstractRDFParserTest {
     @Test
     public void parseBaseAndContentTypeNoSource() throws Exception {
         // Can set the other options, even without source()
-        IRI base = dummyParser.createRDFTermFactory().createIRI("http://www.example.org/test.rdf");
-        RDFParser parser = dummyParser.base(base).contentType(RDFSyntax.RDFXML);
+        final IRI base = dummyParser.createRDFTermFactory().createIRI("http://www.example.org/test.rdf");
+        final RDFParser parser = dummyParser.base(base).contentType(RDFSyntax.RDFXML);
         thrown.expect(IllegalStateException.class);
         thrown.expectMessage("No source has been set");
         // but .parse() should fail
@@ -145,7 +145,7 @@ public class AbstractRDFParserTest {
     public void parseFileMissing() throws Exception {
         Files.delete(testNt);
         // This should not fail yet
-        RDFParser parser = dummyParser.source(testNt);
+        final RDFParser parser = dummyParser.source(testNt);
         // but here:
         thrown.expect(IOException.class);
         parser.parse();
@@ -153,8 +153,8 @@ public class AbstractRDFParserTest {
 
     @Test
     public void parseFileContentType() throws Exception {
-        Graph g = factory.createGraph();
-        RDFParser parser = dummyParser.source(testNt).contentType(RDFSyntax.NTRIPLES).target(g);
+        final Graph g = factory.createGraph();
+        final RDFParser parser = dummyParser.source(testNt).contentType(RDFSyntax.NTRIPLES).target(g);
         parser.parse().get(5, TimeUnit.SECONDS);
         checkGraph(g);
         // FIXME: this could potentially break if the equivalent of /tmp
@@ -176,9 +176,9 @@ public class AbstractRDFParserTest {
 
     @Test
     public void parseInputStreamFailsIfBaseMissing() throws Exception {
-        InputStream inputStream = new ByteArrayInputStream(new byte[0]);
+        final InputStream inputStream = new ByteArrayInputStream(new byte[0]);
         // Should not fail at this point
-        RDFParser parser = dummyParser.source(inputStream);
+        final RDFParser parser = dummyParser.source(inputStream);
         // but here:
         thrown.expect(IllegalStateException.class);
         thrown.expectMessage("base iri required for inputstream source");
@@ -187,10 +187,10 @@ public class AbstractRDFParserTest {
 
     @Test
     public void parseInputStreamWithBase() throws Exception {
-        InputStream inputStream = new ByteArrayInputStream(new byte[0]);
-        IRI base = dummyParser.createRDFTermFactory().createIRI("http://www.example.org/test.rdf");
-        Graph g = factory.createGraph();
-        RDFParser parser = dummyParser.source(inputStream).base(base).target(g);
+        final InputStream inputStream = new ByteArrayInputStream(new byte[0]);
+        final IRI base = dummyParser.createRDFTermFactory().createIRI("http://www.example.org/test.rdf");
+        final Graph g = factory.createGraph();
+        final RDFParser parser = dummyParser.source(inputStream).base(base).target(g);
         parser.parse().get(5, TimeUnit.SECONDS);
         checkGraph(g);
         assertEquals("<http://www.example.org/test.rdf>", firstPredicate(g, "base"));
@@ -203,9 +203,9 @@ public class AbstractRDFParserTest {
 
     @Test
     public void parseInputStreamWithNQuads() throws Exception {
-        InputStream inputStream = new ByteArrayInputStream(new byte[0]);
-        Graph g = factory.createGraph();
-        RDFParser parser = dummyParser.source(inputStream).contentType(RDFSyntax.NQUADS).target(g);
+        final InputStream inputStream = new ByteArrayInputStream(new byte[0]);
+        final Graph g = factory.createGraph();
+        final RDFParser parser = dummyParser.source(inputStream).contentType(RDFSyntax.NQUADS).target(g);
         parser.parse().get(5, TimeUnit.SECONDS);
         checkGraph(g);
         assertNull(firstPredicate(g, "base"));
@@ -218,9 +218,9 @@ public class AbstractRDFParserTest {
 
     @Test
     public void parseIRI() throws Exception {
-        IRI iri = dummyParser.createRDFTermFactory().createIRI("http://www.example.net/test.ttl");
-        Graph g = factory.createGraph();
-        RDFParser parser = dummyParser.source(iri).target(g);
+        final IRI iri = dummyParser.createRDFTermFactory().createIRI("http://www.example.net/test.ttl");
+        final Graph g = factory.createGraph();
+        final RDFParser parser = dummyParser.source(iri).target(g);
         parser.parse().get(5, TimeUnit.SECONDS);
         checkGraph(g);
         assertEquals("<http://www.example.net/test.ttl>", firstPredicate(g, "source"));
@@ -236,9 +236,9 @@ public class AbstractRDFParserTest {
 
     @Test
     public void parseIRIBaseContentType() throws Exception {
-        IRI iri = dummyParser.createRDFTermFactory().createIRI("http://www.example.net/test.ttl");
-        Graph g = factory.createGraph();
-        RDFParser parser = dummyParser.source(iri).base(iri).contentType(RDFSyntax.TURTLE).target(g);
+        final IRI iri = dummyParser.createRDFTermFactory().createIRI("http://www.example.net/test.ttl");
+        final Graph g = factory.createGraph();
+        final RDFParser parser = dummyParser.source(iri).base(iri).contentType(RDFSyntax.TURTLE).target(g);
         parser.parse().get(5, TimeUnit.SECONDS);
         checkGraph(g);
         assertEquals("<http://www.example.net/test.ttl>", firstPredicate(g, "source"));


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

Posted by gg...@apache.org.
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);
     }


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

Posted by gg...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/simple/src/main/java/org/apache/commons/rdf/simple/SimpleRDFTermFactory.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/SimpleRDFTermFactory.java b/simple/src/main/java/org/apache/commons/rdf/simple/SimpleRDFTermFactory.java
index f5c476b..676f284 100644
--- a/simple/src/main/java/org/apache/commons/rdf/simple/SimpleRDFTermFactory.java
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/SimpleRDFTermFactory.java
@@ -42,7 +42,7 @@ public class SimpleRDFTermFactory implements RDFTermFactory {
     }
 
     @Override
-    public BlankNode createBlankNode(String name) {
+    public BlankNode createBlankNode(final String name) {
         return factory.createBlankNode(name);
     }
 
@@ -52,27 +52,27 @@ public class SimpleRDFTermFactory implements RDFTermFactory {
     }
 
     @Override
-    public IRI createIRI(String iri) {
+    public IRI createIRI(final String iri) {
         return factory.createIRI(iri);
     }
 
     @Override
-    public Literal createLiteral(String literal) {
+    public Literal createLiteral(final String literal) {
         return factory.createLiteral(literal);
     }
 
     @Override
-    public Literal createLiteral(String literal, IRI dataType) {
+    public Literal createLiteral(final String literal, final IRI dataType) {
         return factory.createLiteral(literal, dataType);
     }
 
     @Override
-    public Literal createLiteral(String literal, String language) {
+    public Literal createLiteral(final String literal, final String language) {
         return factory.createLiteral(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 factory.createTriple(subject, predicate, object);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/simple/src/main/java/org/apache/commons/rdf/simple/TripleImpl.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/TripleImpl.java b/simple/src/main/java/org/apache/commons/rdf/simple/TripleImpl.java
index 35ce1cc..dd1c152 100644
--- a/simple/src/main/java/org/apache/commons/rdf/simple/TripleImpl.java
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/TripleImpl.java
@@ -46,7 +46,7 @@ final class TripleImpl implements Triple {
      * @param object
      *            object of triple
      */
-    public TripleImpl(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public TripleImpl(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
         this.subject = Objects.requireNonNull(subject);
         this.predicate = Objects.requireNonNull(predicate);
         this.object = Objects.requireNonNull(object);
@@ -79,7 +79,7 @@ final class TripleImpl 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/simple/src/main/java/org/apache/commons/rdf/simple/Types.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/Types.java b/simple/src/main/java/org/apache/commons/rdf/simple/Types.java
index cf4d2e1..986e1f1 100644
--- a/simple/src/main/java/org/apache/commons/rdf/simple/Types.java
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/Types.java
@@ -287,7 +287,7 @@ public final class Types implements IRI, SimpleRDF.SimpleRDFTerm {
 
     private final IRI field;
 
-    private Types(String field) {
+    private Types(final String field) {
         this.field = new IRIImpl(field);
     }
 
@@ -302,7 +302,7 @@ public final class Types implements IRI, SimpleRDF.SimpleRDFTerm {
     }
 
     @Override
-    public boolean equals(Object other) {
+    public boolean equals(final Object other) {
         return this.field.equals(other);
     }
 
@@ -335,7 +335,7 @@ public final class Types implements IRI, SimpleRDF.SimpleRDFTerm {
      * @return An {@link Optional} containing the IRI from this collection or
      *         {@link Optional#empty()} if it is not present here.
      */
-    public static Optional<IRI> get(IRI nextIRI) {
+    public static Optional<IRI> get(final IRI nextIRI) {
         if (ALL_TYPES.contains(nextIRI)) {
             // If we know about this IRI, then look through our set to find the
             // object that matches and return it

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/simple/src/main/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParser.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParser.java b/simple/src/main/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParser.java
index 584bff3..9576b4a 100644
--- a/simple/src/main/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParser.java
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParser.java
@@ -230,14 +230,14 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>> implemen
     }
 
     @Override
-    public T rdfTermFactory(RDF rdfTermFactory) {
+    public T rdfTermFactory(final RDF rdfTermFactory) {
         AbstractRDFParser<T> c = clone();
         c.rdfTermFactory = Optional.ofNullable(rdfTermFactory);
         return c.asT();
     }
 
     @Override
-    public T contentType(RDFSyntax rdfSyntax) throws IllegalArgumentException {
+    public T contentType(final RDFSyntax rdfSyntax) throws IllegalArgumentException {
         AbstractRDFParser<T> c = clone();
         c.contentTypeSyntax = Optional.ofNullable(rdfSyntax);
         c.contentType = c.contentTypeSyntax.map(syntax -> syntax.mediaType);
@@ -245,7 +245,7 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>> implemen
     }
 
     @Override
-    public T contentType(String contentType) throws IllegalArgumentException {
+    public T contentType(final String contentType) throws IllegalArgumentException {
         AbstractRDFParser<T> c = clone();
         c.contentType = Optional.ofNullable(contentType);
         c.contentTypeSyntax = c.contentType.flatMap(RDFSyntax::byMediaType);
@@ -253,7 +253,7 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>> implemen
     }
 
     @Override
-    public T base(IRI base) {
+    public T base(final IRI base) {
         AbstractRDFParser<T> c = clone();
         c.base = Optional.ofNullable(base);
         c.base.ifPresent(i -> checkIsAbsolute(i));
@@ -261,12 +261,12 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>> implemen
     }
 
     @Override
-    public T base(String base) throws IllegalArgumentException {
+    public T base(final String base) throws IllegalArgumentException {
         return base(internalRdfTermFactory.createIRI(base));
     }
 
     @Override
-    public T source(InputStream inputStream) {
+    public T source(final InputStream inputStream) {
         AbstractRDFParser<T> c = clone();
         c.resetSource();
         c.sourceInputStream = Optional.ofNullable(inputStream);
@@ -274,7 +274,7 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>> implemen
     }
 
     @Override
-    public T source(Path file) {
+    public T source(final Path file) {
         AbstractRDFParser<T> c = clone();
         c.resetSource();
         c.sourceFile = Optional.ofNullable(file);
@@ -282,7 +282,7 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>> implemen
     }
 
     @Override
-    public T source(IRI iri) {
+    public T source(final IRI iri) {
         AbstractRDFParser<T> c = clone();
         c.resetSource();
         c.sourceIri = Optional.ofNullable(iri);
@@ -291,7 +291,7 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>> implemen
     }
 
     @Override
-    public T source(String iri) throws IllegalArgumentException {
+    public T source(final String iri) throws IllegalArgumentException {
         AbstractRDFParser<T> c = clone();
         c.resetSource();
         c.sourceIri = Optional.ofNullable(iri).map(internalRdfTermFactory::createIRI);
@@ -309,7 +309,7 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>> implemen
      * @throws IllegalArgumentException
      *             If the IRI is not absolute
      */
-    protected void checkIsAbsolute(IRI iri) throws IllegalArgumentException {
+    protected void checkIsAbsolute(final IRI iri) throws IllegalArgumentException {
         if (!URI.create(iri.getIRIString()).isAbsolute()) {
             throw new IllegalArgumentException("IRI is not absolute: " + iri);
         }
@@ -484,7 +484,7 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>> implemen
      *         {@link RDFSyntax#fileExtension}, otherwise
      *         {@link Optional#empty()}.
      */
-    protected static Optional<RDFSyntax> guessRDFSyntax(Path path) {
+    protected static Optional<RDFSyntax> guessRDFSyntax(final Path path) {
         return fileExtension(path).flatMap(RDFSyntax::byFileExtension);
     }
 
@@ -501,7 +501,7 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>> implemen
      * @return File extension (including the leading <code>.</code>, or
      *         {@link Optional#empty()} if the path has no extension
      */
-    private static Optional<String> fileExtension(Path path) {
+    private static Optional<String> fileExtension(final Path path) {
         Path fileName = path.getFileName();
         if (fileName == null) {
             return Optional.empty();
@@ -540,7 +540,7 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>> implemen
     }
 
     @Override
-    public T target(Consumer<Quad> consumer) {
+    public T target(final Consumer<Quad> consumer) {
         AbstractRDFParser<T> c = clone();
         c.resetTarget();
         c.target = consumer;
@@ -548,7 +548,7 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>> implemen
     }
 
     @Override
-    public T target(Dataset dataset) {
+    public T target(final Dataset dataset) {
         @SuppressWarnings({ "rawtypes", "unchecked" })
         AbstractRDFParser<T> c = (AbstractRDFParser) RDFParser.super.target(dataset);
         c.resetTarget();
@@ -557,7 +557,7 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>> implemen
     }
 
     @Override
-    public T target(Graph graph) {
+    public T target(final Graph graph) {
         @SuppressWarnings({ "rawtypes", "unchecked" }) // super calls our
                                                        // .clone()
         AbstractRDFParser<T> c = (AbstractRDFParser) RDFParser.super.target(graph);

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/simple/src/main/java/org/apache/commons/rdf/simple/experimental/RDFParseException.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/experimental/RDFParseException.java b/simple/src/main/java/org/apache/commons/rdf/simple/experimental/RDFParseException.java
index c88642b..16bdbc9 100644
--- a/simple/src/main/java/org/apache/commons/rdf/simple/experimental/RDFParseException.java
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/experimental/RDFParseException.java
@@ -24,22 +24,22 @@ public class RDFParseException extends Exception {
     private static final long serialVersionUID = 5427752643780702976L;
     private final RDFParser builder;
 
-    public RDFParseException(RDFParser builder) {
+    public RDFParseException(final RDFParser builder) {
         super();
         this.builder = builder;
     }
 
-    public RDFParseException(RDFParser builder, String message, Throwable cause) {
+    public RDFParseException(final RDFParser builder, final String message, final Throwable cause) {
         super(message, cause);
         this.builder = builder;
     }
 
-    public RDFParseException(RDFParser builder, String message) {
+    public RDFParseException(final RDFParser builder, final String message) {
         super(message);
         this.builder = builder;
     }
 
-    public RDFParseException(RDFParser builder, Throwable cause) {
+    public RDFParseException(final RDFParser builder, final Throwable cause) {
         super(cause);
         this.builder = builder;
     }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/simple/src/test/java/org/apache/commons/rdf/simple/BlankNodeImplTest.java
----------------------------------------------------------------------
diff --git a/simple/src/test/java/org/apache/commons/rdf/simple/BlankNodeImplTest.java b/simple/src/test/java/org/apache/commons/rdf/simple/BlankNodeImplTest.java
index 677fb75..aa2359a 100644
--- a/simple/src/test/java/org/apache/commons/rdf/simple/BlankNodeImplTest.java
+++ b/simple/src/test/java/org/apache/commons/rdf/simple/BlankNodeImplTest.java
@@ -36,7 +36,7 @@ public class BlankNodeImplTest extends AbstractBlankNodeTest {
     }
 
     @Override
-    protected BlankNode getBlankNode(String identifier) {
+    protected BlankNode getBlankNode(final String identifier) {
         return new BlankNodeImpl(SALT, identifier);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/simple/src/test/java/org/apache/commons/rdf/simple/TestWritingGraph.java
----------------------------------------------------------------------
diff --git a/simple/src/test/java/org/apache/commons/rdf/simple/TestWritingGraph.java b/simple/src/test/java/org/apache/commons/rdf/simple/TestWritingGraph.java
index 3badaf7..add7d75 100644
--- a/simple/src/test/java/org/apache/commons/rdf/simple/TestWritingGraph.java
+++ b/simple/src/test/java/org/apache/commons/rdf/simple/TestWritingGraph.java
@@ -99,7 +99,7 @@ public class TestWritingGraph {
         assertEquals(count, TRIPLES);
     }
 
-    public static String tripleAsString(Triple t) {
+    public static String tripleAsString(final Triple t) {
         return t.getSubject().ntriplesString() + " " + t.getPredicate().ntriplesString() + " "
                 + t.getObject().ntriplesString() + " .";
     }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/756cbe02/simple/src/test/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParserTest.java
----------------------------------------------------------------------
diff --git a/simple/src/test/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParserTest.java b/simple/src/test/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParserTest.java
index d3b62b9..222d820 100644
--- a/simple/src/test/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParserTest.java
+++ b/simple/src/test/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParserTest.java
@@ -79,7 +79,7 @@ public class AbstractRDFParserTest {
         assertFalse(AbstractRDFParser.guessRDFSyntax(testXml).isPresent());
     }
 
-    private void checkGraph(Graph g) throws Exception {
+    private void checkGraph(final Graph g) throws Exception {
         assertTrue(g.size() > 0);
         IRI greeting = factory.createIRI("http://example.com/greeting");
         // Should only have parsed once!
@@ -166,7 +166,7 @@ public class AbstractRDFParserTest {
         assertEquals("\"application/n-triples\"", firstPredicate(g, "contentType"));
     }
 
-    private String firstPredicate(Graph g, String pred) {
+    private String firstPredicate(final Graph g, final String pred) {
         return g.stream(null, factory.createIRI("http://example.com/" + pred), null).map(Triple::getObject)
                 .map(RDFTerm::ntriplesString).findAny().orElse(null);
     }


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

Posted by gg...@apache.org.
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)));



[6/7] incubator-commonsrdf git commit: Add final modifier to local variables.

Posted by gg...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 7424f3d..1549109 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
@@ -99,7 +99,7 @@ abstract class AbstractJsonLdGraphLike<T extends TripleLike> implements JsonLdGr
         // add triples to default graph by default
         BlankNodeOrIRI graphName = null;
         if (t instanceof org.apache.commons.rdf.api.Quad) {
-            org.apache.commons.rdf.api.Quad q = (org.apache.commons.rdf.api.Quad) t;
+            final org.apache.commons.rdf.api.Quad q = (org.apache.commons.rdf.api.Quad) t;
             graphName = q.getGraphName().orElse(null);
         }
         // FIXME: JSON-LD's rdfDataSet.addQuad method does not support
@@ -108,16 +108,16 @@ abstract class AbstractJsonLdGraphLike<T extends TripleLike> implements JsonLdGr
     }
 
     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);
+        final String g = factory.asJsonLdString(graphName);
+        final String s = factory.asJsonLdString(subject);
+        final String p = factory.asJsonLdString(predicate);
         if (object instanceof BlankNodeOrIRI) {
-            String o = factory.asJsonLdString((BlankNodeOrIRI) object);
+            final String o = factory.asJsonLdString((BlankNodeOrIRI) object);
             rdfDataSet.addQuad(s, p, o, g);
         } else if (object instanceof Literal) {
-            Literal literal = (Literal) object;
-            String language = literal.getLanguageTag().orElse(null);
-            String datatype = literal.getDatatype().getIRIString();
+            final Literal literal = (Literal) object;
+            final String language = literal.getLanguageTag().orElse(null);
+            final String datatype = literal.getDatatype().getIRIString();
             rdfDataSet.addQuad(s, p, literal.getLexicalForm(), datatype, language, g);
         }
     }
@@ -186,16 +186,16 @@ abstract class AbstractJsonLdGraphLike<T extends TripleLike> implements JsonLdGr
 
     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;
+            final org.apache.commons.rdf.api.Quad quad = (org.apache.commons.rdf.api.Quad) tripleOrQuad;
             return quad.getGraphName().map(factory::asJsonLdString).orElse("@default");
         }
         return "@default";
     }
 
     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);
+        final Optional<Node> subjectNode = Optional.ofNullable(subject).map(factory::asJsonLdNode);
+        final Optional<Node> predicateNode = Optional.ofNullable(predicate).map(factory::asJsonLdNode);
+        final Optional<Node> objectNode = Optional.ofNullable(object).map(factory::asJsonLdNode);
 
         return q -> {
             if (subjectNode.isPresent() && subjectNode.get().compareTo(q.getSubject()) != 0) {

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 616ffc7..134fd94 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
@@ -58,7 +58,7 @@ final class JsonLdIRIImpl extends JsonLdTermImpl implements JsonLdIRI {
         if (!(obj instanceof IRI)) {
             return false;
         }
-        IRI other = (IRI) obj;
+        final IRI other = (IRI) obj;
         return node.getValue().equals(other.getIRIString());
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 8155374..2414087 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
@@ -40,7 +40,7 @@ class JsonLdLiteralImpl extends JsonLdTermImpl implements JsonLdLiteral {
 
     @Override
     public String ntriplesString() {
-        StringBuilder sb = new StringBuilder();
+        final StringBuilder sb = new StringBuilder();
         sb.append('"');
         // Escape special characters
         sb.append(getLexicalForm().replace("\\", "\\\\"). // escaped to \\
@@ -84,11 +84,11 @@ class JsonLdLiteralImpl extends JsonLdTermImpl implements JsonLdLiteral {
     @Override
     public boolean equals(final Object obj) {
         if (obj instanceof JsonLdLiteral) {
-            JsonLdLiteral other = (JsonLdLiteral) obj;
+            final JsonLdLiteral other = (JsonLdLiteral) obj;
             return asJsonLdNode().compareTo(other.asJsonLdNode()) == 0;
         }
         if (obj instanceof Literal) {
-            Literal other = (Literal) obj;
+            final Literal other = (Literal) obj;
             return getLexicalForm().equals(other.getLexicalForm()) && getDatatype().equals(other.getDatatype())
                     && getLanguageTag().equals(other.getLanguageTag());
         }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 3fe9a41..bf37c6c 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
@@ -43,7 +43,7 @@ final class JsonLdQuadImpl extends JsonLdQuadLikeImpl<BlankNodeOrIRI, IRI, RDFTe
         if (!(obj instanceof org.apache.commons.rdf.api.Quad)) {
             return false;
         }
-        org.apache.commons.rdf.api.Quad other = (org.apache.commons.rdf.api.Quad) obj;
+        final org.apache.commons.rdf.api.Quad other = (org.apache.commons.rdf.api.Quad) obj;
         return getGraphName().equals(other.getGraphName()) && getSubject().equals(other.getSubject())
                 && getPredicate().equals(other.getPredicate()) && getObject().equals(other.getObject());
     }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 496bbad..b008bab 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
@@ -46,7 +46,7 @@ class JsonLdQuadLikeImpl<S extends RDFTerm, P extends RDFTerm, O extends RDFTerm
     @SuppressWarnings("unchecked")
     @Override
     public Optional<G> getGraphName() {
-        G g = (G) rdfTermFactory.asRDFTerm(quad.getGraph(), blankNodePrefix);
+        final G g = (G) rdfTermFactory.asRDFTerm(quad.getGraph(), blankNodePrefix);
         return Optional.ofNullable(g);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 a28984d..816cf2f 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
@@ -88,7 +88,7 @@ public final class JsonLdRDF implements RDF {
 
     public Node asJsonLdNode(final RDFTerm term) {
         if (term instanceof JsonLdBlankNode) {
-            JsonLdBlankNode jsonLdBlankNode = (JsonLdBlankNode) term;
+            final JsonLdBlankNode jsonLdBlankNode = (JsonLdBlankNode) term;
             if (jsonLdBlankNode.uniqueReference().startsWith(bnodePrefix)) {
                 // Only return blank nodes 'as is' if they have the same prefix
                 return jsonLdBlankNode.asJsonLdNode();
@@ -101,7 +101,7 @@ public final class JsonLdRDF implements RDF {
             return new RDFDataset.IRI(((IRI) term).getIRIString());
         }
         if (term instanceof BlankNode) {
-            String ref = ((BlankNode) term).uniqueReference();
+            final String ref = ((BlankNode) term).uniqueReference();
             if (ref.startsWith(bnodePrefix)) {
                 // one of our own (but no longer a JsonLdBlankNode),
                 // we can recover the label after our unique prefix
@@ -109,11 +109,11 @@ public final class JsonLdRDF implements RDF {
             }
             // The "foreign" unique reference might not be a valid bnode string,
             // we'll convert to a UUID
-            UUID uuid = UUID.nameUUIDFromBytes(ref.getBytes(StandardCharsets.UTF_8));
+            final UUID uuid = UUID.nameUUIDFromBytes(ref.getBytes(StandardCharsets.UTF_8));
             return new RDFDataset.BlankNode("_:" + uuid);
         }
         if (term instanceof Literal) {
-            Literal literal = (Literal) term;
+            final Literal literal = (Literal) term;
             return new RDFDataset.Literal(literal.getLexicalForm(), literal.getDatatype().getIRIString(),
                     literal.getLanguageTag().orElse(null));
         }
@@ -129,7 +129,7 @@ public final class JsonLdRDF implements RDF {
      * @return Adapted JsonLd {@link com.github.jsonldjava.core.RDFDataset.Quad}
      */
     public RDFDataset.Quad asJsonLdQuad(final org.apache.commons.rdf.api.Quad quad) {
-        BlankNodeOrIRI g = quad.getGraphName().orElse(null);
+        final BlankNodeOrIRI g = quad.getGraphName().orElse(null);
         return createJsonLdQuad(g, quad.getSubject(), quad.getPredicate(), quad.getObject());
     }
 
@@ -215,13 +215,13 @@ public final class JsonLdRDF implements RDF {
 
     @Override
     public JsonLdBlankNode createBlankNode() {
-        String id = "_:" + UUID.randomUUID().toString();
+        final String id = "_:" + UUID.randomUUID().toString();
         return new JsonLdBlankNodeImpl(new RDFDataset.BlankNode(id), bnodePrefix);
     }
 
     @Override
     public JsonLdBlankNode createBlankNode(final String name) {
-        String id = "_:" + name;
+        final String id = "_:" + name;
         // TODO: Check if name is valid JSON-LD BlankNode identifier
         return new JsonLdBlankNodeImpl(new RDFDataset.BlankNode(id), bnodePrefix);
     }
@@ -274,8 +274,8 @@ public final class JsonLdRDF implements RDF {
         if (blankNodeOrIRI instanceof IRI) {
             return ((IRI) blankNodeOrIRI).getIRIString();
         } else if (blankNodeOrIRI instanceof BlankNode) {
-            BlankNode blankNode = (BlankNode) blankNodeOrIRI;
-            String ref = blankNode.uniqueReference();
+            final BlankNode blankNode = (BlankNode) blankNodeOrIRI;
+            final String ref = blankNode.uniqueReference();
             if (ref.startsWith(bnodePrefix)) {
                 // One of ours (but possibly not a JsonLdBlankNode) -
                 // we can use the suffix directly
@@ -283,7 +283,7 @@ public final class JsonLdRDF implements RDF {
             } else {
                 // Map to unique bnode identifier, e.g.
                 // _:0dbd92ee-ab1a-45e7-bba2-7ade54f87ec5
-                UUID uuid = UUID.nameUUIDFromBytes(ref.getBytes(StandardCharsets.UTF_8));
+                final UUID uuid = UUID.nameUUIDFromBytes(ref.getBytes(StandardCharsets.UTF_8));
                 return "_:" + uuid;
             }
         } else {

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 727eb04..4211c8f 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
@@ -41,7 +41,7 @@ final class JsonLdTripleImpl extends JsonLdQuadLikeImpl<BlankNodeOrIRI, IRI, RDF
         if (!(obj instanceof Triple)) {
             return false;
         }
-        Triple other = (Triple) obj;
+        final Triple other = (Triple) obj;
         return getSubject().equals(other.getSubject()) && getPredicate().equals(other.getPredicate())
                 && getObject().equals(other.getObject());
     }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 94fd981..430df02 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
@@ -58,7 +58,7 @@ public class JsonLdParser extends AbstractRDFParser<JsonLdParser> {
 
     @Override
     public JsonLdParser contentType(final String contentType) throws IllegalArgumentException {
-        JsonLdParser c = super.contentType(contentType);
+        final JsonLdParser c = super.contentType(contentType);
         if (c.getContentType().filter(Predicate.isEqual(RDFSyntax.JSONLD).negate()).isPresent()) {
             throw new IllegalArgumentException("Unsupported contentType: " + contentType);
         }
@@ -82,8 +82,8 @@ public class JsonLdParser extends AbstractRDFParser<JsonLdParser> {
 
     @Override
     protected void parseSynchronusly() throws IOException {
-        Object json = readSource();
-        JsonLdOptions options = new JsonLdOptions();
+        final Object json = readSource();
+        final JsonLdOptions options = new JsonLdOptions();
         getBase().map(IRI::getIRIString).ifPresent(options::setBase);
         // TODO: base from readSource() (after redirection and Content-Location
         // header)
@@ -93,26 +93,26 @@ public class JsonLdParser extends AbstractRDFParser<JsonLdParser> {
         RDFDataset rdfDataset;
         try {
             rdfDataset = (RDFDataset) JsonLdProcessor.toRDF(json, options);
-        } catch (JsonLdError e) {
+        } catch (final JsonLdError e) {
             throw new IOException("Could not parse Json-LD", e);
         }
         if (getTargetGraph().isPresent()) {
-            Graph intoGraph = getTargetGraph().get();
+            final Graph intoGraph = getTargetGraph().get();
             if (intoGraph instanceof JsonLdGraph && !intoGraph.contains(null, null, null)) {
                 // Empty graph, we can just move over the map content directly:
-                JsonLdGraph jsonLdGraph = (JsonLdGraph) intoGraph;
+                final JsonLdGraph jsonLdGraph = (JsonLdGraph) intoGraph;
                 jsonLdGraph.getRdfDataSet().putAll(rdfDataset);
                 return;
                 // otherwise we have to merge as normal
             }
             // TODO: Modify JsonLdProcessor to have an actual triple callback
-            Graph parsedGraph = getJsonLdFactory().asGraph(rdfDataset);
+            final Graph parsedGraph = getJsonLdFactory().asGraph(rdfDataset);
             // sequential() as we don't know if destination is thread safe :-/
             parsedGraph.stream().sequential().forEach(intoGraph::add);
         } else if (getTargetDataset().isPresent()) {
-            Dataset intoDataset = getTargetDataset().get();
+            final Dataset intoDataset = getTargetDataset().get();
             if (intoDataset instanceof JsonLdDataset && !intoDataset.contains(null, null, null, null)) {
-                JsonLdDataset jsonLdDataset = (JsonLdDataset) intoDataset;
+                final JsonLdDataset jsonLdDataset = (JsonLdDataset) intoDataset;
                 // Empty - we can just do a brave replace!
                 jsonLdDataset.getRdfDataSet().putAll(rdfDataset);
                 return;
@@ -121,11 +121,11 @@ public class JsonLdParser extends AbstractRDFParser<JsonLdParser> {
                 // map blank nodes etc, so we'll fall back to normal Dataset
                 // appending.
             }
-            Dataset fromDataset = getJsonLdFactory().asDataset(rdfDataset);
+            final Dataset fromDataset = getJsonLdFactory().asDataset(rdfDataset);
             // .sequential() as we don't know if destination is thread-safe :-/
             fromDataset.stream().sequential().forEach(intoDataset::add);
         } else {
-            Dataset fromDataset = getJsonLdFactory().asDataset(rdfDataset);
+            final Dataset fromDataset = getJsonLdFactory().asDataset(rdfDataset);
             // No need for .sequential() here
             fromDataset.stream().forEach(getTarget());
         }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 330447f..17adfcb 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
@@ -52,30 +52,30 @@ public class JsonLdParserBuilderTest {
 
     @Test
     public void parseByUrl() throws Exception {
-        URL url = getClass().getResource(TEST_JSONLD);
+        final URL url = getClass().getResource(TEST_JSONLD);
         assertNotNull("Test resource not found: " + TEST_JSONLD, url);
-        IRI iri = factory.createIRI(url.toString());
-        Graph g = factory.createGraph();
+        final IRI iri = factory.createIRI(url.toString());
+        final Graph g = factory.createGraph();
         new JsonLdParser().contentType(RDFSyntax.JSONLD).source(iri).target(g).parse().get(10, TimeUnit.SECONDS);
         checkGraph(g);
     }
 
     @Test
     public void parseByPath() throws Exception {
-        Path path = Files.createTempFile("test", ".jsonld");
+        final Path path = Files.createTempFile("test", ".jsonld");
         path.toFile().deleteOnExit();
         try (InputStream is = getClass().getResourceAsStream(TEST_JSONLD)) {
             assertNotNull("Test resource not found: " + TEST_JSONLD, is);
             Files.copy(is, path, StandardCopyOption.REPLACE_EXISTING);
         }
-        Graph g = factory.createGraph();
+        final Graph g = factory.createGraph();
         new JsonLdParser().contentType(RDFSyntax.JSONLD).source(path).target(g).parse().get(10, TimeUnit.SECONDS);
         checkGraph(g);
     }
 
     @Test
     public void parseByStream() throws Exception {
-        Graph g = factory.createGraph();
+        final Graph g = factory.createGraph();
         try (InputStream is = getClass().getResourceAsStream(TEST_JSONLD)) {
             assertNotNull("Test resource not found: " + TEST_JSONLD, is);
             new JsonLdParser().base("http://example.com/base/").contentType(RDFSyntax.JSONLD).source(is).target(g)

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdServiceLoaderTest.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdServiceLoaderTest.java b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdServiceLoaderTest.java
index e23fc3d..7e5a483 100644
--- a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdServiceLoaderTest.java
+++ b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdServiceLoaderTest.java
@@ -29,8 +29,8 @@ public class JsonLdServiceLoaderTest {
 
     @Test
     public void testServiceLoaderLookup() {
-        ServiceLoader<RDF> loader = ServiceLoader.load(RDF.class);
-        for (RDF impl : loader) {
+        final ServiceLoader<RDF> loader = ServiceLoader.load(RDF.class);
+        for (final RDF impl : loader) {
             if (impl instanceof JsonLdRDF) {
                 return; // yay
             }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 e6f0db4..2d39bbd 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
@@ -285,7 +285,7 @@ public final class RDF4J implements RDF {
      * @return A {@link Dataset} backed by the RDF4J repository.
      */
     public RDF4JDataset asDataset(final Repository repository, final Option... options) {
-        EnumSet<Option> opts = optionSet(options);
+        final EnumSet<Option> opts = optionSet(options);
         return rdf4j.createRepositoryDatasetImpl(repository, opts.contains(Option.handleInitAndShutdown),
                 opts.contains(Option.includeInferred));
     }
@@ -323,7 +323,7 @@ public final class RDF4J implements RDF {
      * @return A {@link Graph} backed by the RDF4J repository.
      */
     public RDF4JGraph asGraph(final Repository repository, final Option... options) {
-        EnumSet<Option> opts = optionSet(options);
+        final EnumSet<Option> opts = optionSet(options);
         return rdf4j.createRepositoryGraphImpl(repository, opts.contains(Option.handleInitAndShutdown),
                 opts.contains(Option.includeInferred), new Resource[] { null }); // default
                                                                                  // graph
@@ -343,7 +343,7 @@ public final class RDF4J implements RDF {
      * @return A union {@link Graph} backed by the RDF4J repository.
      */
     public RDF4JGraph asGraphUnion(final Repository repository, final Option... options) {
-        EnumSet<Option> opts = optionSet(options);
+        final EnumSet<Option> opts = optionSet(options);
         return rdf4j.createRepositoryGraphImpl(repository, opts.contains(Option.handleInitAndShutdown),
                 opts.contains(Option.includeInferred), new Resource[] {}); // union
                                                                            // graph
@@ -376,9 +376,9 @@ public final class RDF4J implements RDF {
      * @return A {@link Graph} backed by the RDF4J repository.
      */
     public RDF4JGraph asGraph(final Repository repository, final Set<? extends BlankNodeOrIRI> contexts, final Option... option) {
-        EnumSet<Option> opts = optionSet(option);
+        final 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);
+        final Resource[] resources = contexts.stream().map(g -> (Resource) asValue(g)).toArray(Resource[]::new);
         return rdf4j.createRepositoryGraphImpl(Objects.requireNonNull(repository),
                 opts.contains(Option.handleInitAndShutdown), opts.contains(Option.includeInferred), resources);
     }
@@ -405,13 +405,13 @@ public final class RDF4J implements RDF {
             return ((RDF4JTripleLike) tripleLike).asStatement();
         }
 
-        org.eclipse.rdf4j.model.Resource subject = (org.eclipse.rdf4j.model.Resource) asValue(tripleLike.getSubject());
-        org.eclipse.rdf4j.model.IRI predicate = (org.eclipse.rdf4j.model.IRI) asValue(tripleLike.getPredicate());
-        Value object = asValue(tripleLike.getObject());
+        final org.eclipse.rdf4j.model.Resource subject = (org.eclipse.rdf4j.model.Resource) asValue(tripleLike.getSubject());
+        final org.eclipse.rdf4j.model.IRI predicate = (org.eclipse.rdf4j.model.IRI) asValue(tripleLike.getPredicate());
+        final Value object = asValue(tripleLike.getObject());
 
         org.eclipse.rdf4j.model.Resource context = null;
         if (tripleLike instanceof Quad) {
-            Quad quad = (Quad) tripleLike;
+            final Quad quad = (Quad) tripleLike;
             context = (org.eclipse.rdf4j.model.Resource) asValue(quad.getGraphName().orElse(null));
         }
 
@@ -472,22 +472,22 @@ public final class RDF4J implements RDF {
             return ((RDF4JTerm) term).asValue();
         }
         if (term instanceof org.apache.commons.rdf.api.IRI) {
-            org.apache.commons.rdf.api.IRI iri = (org.apache.commons.rdf.api.IRI) term;
+            final org.apache.commons.rdf.api.IRI iri = (org.apache.commons.rdf.api.IRI) term;
             return getValueFactory().createIRI(iri.getIRIString());
         }
         if (term instanceof org.apache.commons.rdf.api.Literal) {
-            org.apache.commons.rdf.api.Literal literal = (org.apache.commons.rdf.api.Literal) term;
-            String label = literal.getLexicalForm();
+            final org.apache.commons.rdf.api.Literal literal = (org.apache.commons.rdf.api.Literal) term;
+            final String label = literal.getLexicalForm();
             if (literal.getLanguageTag().isPresent()) {
-                String lang = literal.getLanguageTag().get();
+                final String lang = literal.getLanguageTag().get();
                 return getValueFactory().createLiteral(label, lang);
             }
-            org.eclipse.rdf4j.model.IRI dataType = (org.eclipse.rdf4j.model.IRI) asValue(literal.getDatatype());
+            final org.eclipse.rdf4j.model.IRI dataType = (org.eclipse.rdf4j.model.IRI) asValue(literal.getDatatype());
             return getValueFactory().createLiteral(label, dataType);
         }
         if (term instanceof BlankNode) {
             // This is where it gets tricky to support round trips!
-            BlankNode blankNode = (BlankNode) term;
+            final BlankNode blankNode = (BlankNode) term;
             // FIXME: The uniqueReference might not be a valid BlankNode
             // identifier..
             // does it have to be in RDF4J?
@@ -498,13 +498,13 @@ public final class RDF4J implements RDF {
 
     @Override
     public RDF4JBlankNode createBlankNode() {
-        BNode bnode = getValueFactory().createBNode();
+        final BNode bnode = getValueFactory().createBNode();
         return (RDF4JBlankNode) asRDFTerm(bnode);
     }
 
     @Override
     public RDF4JBlankNode createBlankNode(final String name) {
-        BNode bnode = getValueFactory().createBNode(name);
+        final BNode bnode = getValueFactory().createBNode(name);
         return (RDF4JBlankNode) asRDFTerm(bnode);
     }
 
@@ -519,8 +519,8 @@ public final class RDF4J implements RDF {
      */
     @Override
     public RDF4JDataset createDataset() {
-        Sail sail = new MemoryStore();
-        Repository repository = new SailRepository(sail);
+        final Sail sail = new MemoryStore();
+        final Repository repository = new SailRepository(sail);
         return rdf4j.createRepositoryDatasetImpl(repository, true, false);
     }
 
@@ -536,22 +536,22 @@ public final class RDF4J implements RDF {
 
     @Override
     public RDF4JLiteral createLiteral(final String lexicalForm) throws IllegalArgumentException {
-        org.eclipse.rdf4j.model.Literal lit = getValueFactory().createLiteral(lexicalForm);
+        final org.eclipse.rdf4j.model.Literal lit = getValueFactory().createLiteral(lexicalForm);
         return (RDF4JLiteral) asRDFTerm(lit);
     }
 
     @Override
     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);
+        final org.eclipse.rdf4j.model.IRI iri = getValueFactory().createIRI(dataType.getIRIString());
+        final org.eclipse.rdf4j.model.Literal lit = getValueFactory().createLiteral(lexicalForm, iri);
         return (org.apache.commons.rdf.api.Literal) asRDFTerm(lit);
     }
 
     @Override
     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);
+        final org.eclipse.rdf4j.model.Literal lit = getValueFactory().createLiteral(lexicalForm, languageTag);
         return (org.apache.commons.rdf.api.Literal) asRDFTerm(lit);
     }
 
@@ -578,7 +578,7 @@ public final class RDF4J implements RDF {
     }
 
     private EnumSet<Option> optionSet(final Option... options) {
-        EnumSet<Option> opts = EnumSet.noneOf(Option.class);
+        final 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/56ddbdcf/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 f88d597..568f5b0 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
@@ -113,7 +113,7 @@ public class RDF4JParser extends AbstractRDFParser<RDF4JParser> implements RDFPa
 
     @Override
     protected RDF4JParser prepareForParsing() throws IOException, IllegalStateException {
-        RDF4JParser c = super.prepareForParsing();
+        final RDF4JParser c = super.prepareForParsing();
         // Ensure we have an RDF4J for conversion.
         // We'll make a new one if user has provided a non-RDF4J factory
         c.rdf4jTermFactory = (RDF4J) getRdfTermFactory().filter(RDF4J.class::isInstance)
@@ -123,13 +123,13 @@ public class RDF4JParser extends AbstractRDFParser<RDF4JParser> implements RDFPa
 
     @Override
     protected void parseSynchronusly() throws IOException {
-        Optional<RDFFormat> formatByMimeType = getContentType().flatMap(Rio::getParserFormatForMIMEType);
-        String base = getBase().map(IRI::getIRIString).orElse(null);
+        final Optional<RDFFormat> formatByMimeType = getContentType().flatMap(Rio::getParserFormatForMIMEType);
+        final String base = getBase().map(IRI::getIRIString).orElse(null);
 
-        ParserConfig parserConfig = getParserConfig();
+        final ParserConfig parserConfig = getParserConfig();
         // TODO: Should we need to set anything?
-        RDFLoader loader = new RDFLoader(parserConfig, rdf4jTermFactory.getValueFactory());
-        RDFHandler rdfHandler = makeRDFHandler();
+        final RDFLoader loader = new RDFLoader(parserConfig, rdf4jTermFactory.getValueFactory());
+        final RDFHandler rdfHandler = makeRDFHandler();
         if (getSourceFile().isPresent()) {
             // NOTE: While we could have used
             // loader.load(sourcePath.toFile()
@@ -139,12 +139,12 @@ public class RDF4JParser extends AbstractRDFParser<RDF4JParser> implements RDFPa
             // we'll always do it with our own input stream
             //
             // That means we may have to guess format by extensions:
-            Optional<RDFFormat> formatByFilename = getSourceFile().map(Path::getFileName).map(Path::toString)
+            final Optional<RDFFormat> formatByFilename = getSourceFile().map(Path::getFileName).map(Path::toString)
                     .flatMap(Rio::getParserFormatForFileName);
             // TODO: for the excited.. what about the extension after following
             // symlinks?
 
-            RDFFormat format = formatByMimeType.orElse(formatByFilename.orElse(null));
+            final RDFFormat format = formatByMimeType.orElse(formatByFilename.orElse(null));
             try (InputStream in = Files.newInputStream(getSourceFile().get())) {
                 loader.load(in, base, format, rdfHandler);
             }
@@ -152,11 +152,11 @@ public class RDF4JParser extends AbstractRDFParser<RDF4JParser> implements RDFPa
             try {
                 // TODO: Handle international IRIs properly
                 // (Unicode support for for hostname, path and query)
-                URL url = new URL(getSourceIri().get().getIRIString());
+                final URL url = new URL(getSourceIri().get().getIRIString());
                 // TODO: This probably does not support https:// -> http://
                 // redirections
                 loader.load(url, base, formatByMimeType.orElse(null), makeRDFHandler());
-            } catch (MalformedURLException ex) {
+            } catch (final MalformedURLException ex) {
                 throw new IOException("Can't handle source URL: " + getSourceIri().get(), ex);
             }
         }
@@ -199,33 +199,33 @@ public class RDF4JParser extends AbstractRDFParser<RDF4JParser> implements RDFPa
 
         if (getTargetDataset().filter(RDF4JDataset.class::isInstance).isPresent()) {
             // One of us, we can add them as Statements directly
-            RDF4JDataset dataset = (RDF4JDataset) getTargetDataset().get();
+            final RDF4JDataset dataset = (RDF4JDataset) getTargetDataset().get();
             if (dataset.asRepository().isPresent()) {
                 return new RDFInserter(dataset.asRepository().get().getConnection());
             }
             if (dataset.asModel().isPresent()) {
-                Model model = dataset.asModel().get();
+                final Model model = dataset.asModel().get();
                 return new AddToModel(model);
             }
             // Not backed by Repository or Model?
             // Third-party RDF4JDataset subclass, so we'll fall through to the
             // getTarget() handling further down
         } else if (getTargetGraph().filter(RDF4JGraph.class::isInstance).isPresent()) {
-            RDF4JGraph graph = (RDF4JGraph) getTargetGraph().get();
+            final RDF4JGraph graph = (RDF4JGraph) getTargetGraph().get();
 
             if (graph.asRepository().isPresent()) {
-                RDFInserter inserter = new RDFInserter(graph.asRepository().get().getConnection());
+                final RDFInserter inserter = new RDFInserter(graph.asRepository().get().getConnection());
                 if (!graph.getContextMask().isEmpty()) {
-                    Stream<RDF4JBlankNodeOrIRI> b = graph.getContextMask().stream();
-                    Stream<Resource> c = b.map(RDF4JBlankNodeOrIRI::asValue);
-                    Resource[] contexts = c.toArray(Resource[]::new);
+                    final Stream<RDF4JBlankNodeOrIRI> b = graph.getContextMask().stream();
+                    final Stream<Resource> c = b.map(RDF4JBlankNodeOrIRI::asValue);
+                    final Resource[] contexts = c.toArray(Resource[]::new);
                     inserter.enforceContext(contexts);
                 }
                 return inserter;
             }
             if (graph.asModel().isPresent() && graph.getContextMask().isEmpty()) {
                 // the model accepts any quad
-                Model model = graph.asModel().get();
+                final Model model = graph.asModel().get();
                 return new AddToModel(model);
             }
             // else - fall through

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 b1ae874..7120273 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
@@ -46,7 +46,7 @@ final class BlankNodeImpl extends AbstractRDFTerm<BNode> implements RDF4JBlankNo
         // NOTE: Do NOT use Bnode.equals() as it has a more generous
         // equality based only on the value.getID();
         if (obj instanceof BlankNode) {
-            BlankNode blankNode = (BlankNode) obj;
+            final BlankNode blankNode = (BlankNode) obj;
             return uniqueReference().equals(blankNode.uniqueReference());
         }
         return false;
@@ -87,7 +87,7 @@ final class BlankNodeImpl extends AbstractRDFTerm<BNode> implements RDF4JBlankNo
 
     @Override
     public String uniqueReference() {
-        UUID uuid = new UUID(saltUUIDmost, saltUUIDleast);
+        final UUID uuid = new UUID(saltUUIDmost, saltUUIDleast);
         return "urn:uuid:" + uuid + "#" + value.getID();
     }
     

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 6c3af99..6d8cd57 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
@@ -55,7 +55,7 @@ final class ConvertedStatements<T> implements ClosableIterable<T> {
     private final class ConvertedIterator implements Iterator<T> {
         @Override
         public boolean hasNext() {
-            boolean hasNext = results.hasNext();
+            final boolean hasNext = results.hasNext();
             if (!hasNext) {
                 close();
             }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 e92c03b..e2522d6 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
@@ -31,11 +31,11 @@ final class IRIImpl extends AbstractRDFTerm<org.eclipse.rdf4j.model.IRI> impleme
             return true;
         }
         if (obj instanceof IRIImpl) {
-            IRIImpl impl = (IRIImpl) obj;
+            final IRIImpl impl = (IRIImpl) obj;
             return asValue().equals(impl.asValue());
         }
         if (obj instanceof org.apache.commons.rdf.api.IRI) {
-            org.apache.commons.rdf.api.IRI iri = (org.apache.commons.rdf.api.IRI) obj;
+            final org.apache.commons.rdf.api.IRI iri = (org.apache.commons.rdf.api.IRI) obj;
             return value.toString().equals(iri.getIRIString());
         }
         return false;

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 2dcbb43..16d70b8 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
@@ -38,7 +38,7 @@ final class LiteralImpl extends AbstractRDFTerm<org.eclipse.rdf4j.model.Literal>
             return true;
         }
         if (obj instanceof org.apache.commons.rdf.api.Literal) {
-            org.apache.commons.rdf.api.Literal other = (org.apache.commons.rdf.api.Literal) obj;
+            final org.apache.commons.rdf.api.Literal other = (org.apache.commons.rdf.api.Literal) obj;
             return getLexicalForm().equals(other.getLexicalForm()) && getDatatype().equals(other.getDatatype())
                     && getLanguageTag().equals(other.getLanguageTag());
 
@@ -69,7 +69,7 @@ final class LiteralImpl extends AbstractRDFTerm<org.eclipse.rdf4j.model.Literal>
     @Override
     public String ntriplesString() {
         // TODO: Use a more efficient StringBuffer
-        String escaped = QUOTE + TurtleUtil.encodeString(value.getLabel()) + QUOTE;
+        final String escaped = QUOTE + TurtleUtil.encodeString(value.getLabel()) + QUOTE;
         if (value.getLanguage().isPresent()) {
             return escaped + "@" + value.getLanguage().get();
         }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 1239e59..f8753fb 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
@@ -97,7 +97,7 @@ final class ModelGraphImpl implements RDF4JGraph {
 
     @Override
     public long size() {
-        int size = model.size();
+        final int size = model.size();
         if (size < Integer.MAX_VALUE) {
             return size;
         } else {
@@ -134,7 +134,7 @@ final class ModelGraphImpl implements RDF4JGraph {
             @Override
             public Iterator<Triple> iterator() {
                 // double-cast to fight Java generics..
-                Stream<? extends Triple> s = stream(subject, predicate, object);
+                final Stream<? extends Triple> s = stream(subject, predicate, object);
                 return (Iterator<Triple>) s.iterator();
             }
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 c1e8a25..93c02c9 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
@@ -52,7 +52,7 @@ final class QuadImpl implements Quad, RDF4JQuad {
     @Override
     public boolean equals(final Object obj) {
         if (obj instanceof Quad) {
-            Quad quad = (Quad) obj;
+            final Quad quad = (Quad) obj;
             return getGraphName().equals(quad.getGraphName()) &&
                     getSubject().equals(quad.getSubject()) && 
                     getPredicate().equals(quad.getPredicate()) &&
@@ -66,7 +66,7 @@ final class QuadImpl implements Quad, RDF4JQuad {
         if (statement.getContext() == null) {
             return Optional.empty();
         }
-        BlankNodeOrIRI g = (BlankNodeOrIRI) RDF4J.asRDFTerm(statement.getContext(), salt);
+        final BlankNodeOrIRI g = (BlankNodeOrIRI) RDF4J.asRDFTerm(statement.getContext(), salt);
         return Optional.of(g);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 7241e3e..03590f6 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
@@ -47,7 +47,7 @@ class RepositoryDatasetImpl extends AbstractRepositoryGraphLike<Quad> implements
 
     @Override
     public void add(final Quad tripleLike) {
-        Statement statement = rdf4jTermFactory.asStatement(tripleLike);
+        final Statement statement = rdf4jTermFactory.asStatement(tripleLike);
         try (RepositoryConnection conn = getRepositoryConnection()) {
             conn.add(statement);
             conn.commit();
@@ -56,7 +56,7 @@ class RepositoryDatasetImpl extends AbstractRepositoryGraphLike<Quad> implements
 
     @Override
     public boolean contains(final Quad tripleLike) {
-        Statement statement = rdf4jTermFactory.asStatement(tripleLike);
+        final Statement statement = rdf4jTermFactory.asStatement(tripleLike);
         try (RepositoryConnection conn = getRepositoryConnection()) {
             return conn.hasStatement(statement, includeInferred);
         }
@@ -64,7 +64,7 @@ class RepositoryDatasetImpl extends AbstractRepositoryGraphLike<Quad> implements
 
     @Override
     public void remove(final Quad tripleLike) {
-        Statement statement = rdf4jTermFactory.asStatement(tripleLike);
+        final Statement statement = rdf4jTermFactory.asStatement(tripleLike);
         try (RepositoryConnection conn = getRepositoryConnection()) {
             conn.remove(statement);
             conn.commit();
@@ -93,10 +93,10 @@ class RepositoryDatasetImpl extends AbstractRepositoryGraphLike<Quad> implements
 
     @Override
     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);
-        Value obj = rdf4jTermFactory.asValue(object);
+        final Resource context = (Resource) rdf4jTermFactory.asValue(graphName);
+        final Resource subj = (Resource) rdf4jTermFactory.asValue(subject);
+        final org.eclipse.rdf4j.model.IRI pred = (org.eclipse.rdf4j.model.IRI) rdf4jTermFactory.asValue(predicate);
+        final Value obj = rdf4jTermFactory.asValue(object);
         try (RepositoryConnection conn = getRepositoryConnection()) {
             conn.add(subj, pred, obj, context);
             conn.commit();
@@ -105,10 +105,10 @@ class RepositoryDatasetImpl extends AbstractRepositoryGraphLike<Quad> implements
 
     @Override
     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);
-        Resource[] contexts = asContexts(graphName);
+        final Resource subj = (Resource) rdf4jTermFactory.asValue(subject);
+        final org.eclipse.rdf4j.model.IRI pred = (org.eclipse.rdf4j.model.IRI) rdf4jTermFactory.asValue(predicate);
+        final Value obj = rdf4jTermFactory.asValue(object);
+        final Resource[] contexts = asContexts(graphName);
         try (RepositoryConnection conn = getRepositoryConnection()) {
             return conn.hasStatement(subj, pred, obj, includeInferred, contexts);
         }
@@ -120,8 +120,8 @@ class RepositoryDatasetImpl extends AbstractRepositoryGraphLike<Quad> implements
             // no contexts == any contexts
             contexts = new Resource[0];
         } else {
-            BlankNodeOrIRI g = graphName.orElse(null);
-            Resource context = (Resource) rdf4jTermFactory.asValue(g);
+            final BlankNodeOrIRI g = graphName.orElse(null);
+            final Resource context = (Resource) rdf4jTermFactory.asValue(g);
             contexts = new Resource[] { context };
         }
         return contexts;
@@ -129,10 +129,10 @@ class RepositoryDatasetImpl extends AbstractRepositoryGraphLike<Quad> implements
 
     @Override
     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);
-        Resource[] contexts = asContexts(graphName);
+        final Resource subj = (Resource) rdf4jTermFactory.asValue(subject);
+        final org.eclipse.rdf4j.model.IRI pred = (org.eclipse.rdf4j.model.IRI) rdf4jTermFactory.asValue(predicate);
+        final Value obj = rdf4jTermFactory.asValue(object);
+        final Resource[] contexts = asContexts(graphName);
 
         try (RepositoryConnection conn = getRepositoryConnection()) {
             conn.remove(subj, pred, obj, contexts);
@@ -148,18 +148,18 @@ class RepositoryDatasetImpl extends AbstractRepositoryGraphLike<Quad> implements
     @Override
     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);
-        Resource[] contexts = asContexts(graphName);
+        final Resource subj = (Resource) rdf4jTermFactory.asValue(subject);
+        final org.eclipse.rdf4j.model.IRI pred = (org.eclipse.rdf4j.model.IRI) rdf4jTermFactory.asValue(predicate);
+        final Value obj = rdf4jTermFactory.asValue(object);
+        final Resource[] contexts = asContexts(graphName);
 
         // NOTE: We can't do the usual try..with closing of the
         // RepositoryConnection here as it will have to be closed outside
         // by the user of the returned stream
-        RepositoryConnection conn = getRepositoryConnection();
+        final RepositoryConnection conn = getRepositoryConnection();
         Stream<RDF4JQuad> stream = null;
         try {
-            RepositoryResult<Statement> statements = conn.getStatements(subj, pred, obj, includeInferred, contexts);
+            final RepositoryResult<Statement> statements = conn.getStatements(subj, pred, obj, includeInferred, contexts);
             // NOTE: Iterations.stream should close RepositoryResult as long as
             // our caller closes the stream
             stream = Iterations.stream(statements).map(rdf4jTermFactory::asQuad);
@@ -183,10 +183,10 @@ class RepositoryDatasetImpl extends AbstractRepositoryGraphLike<Quad> implements
     @Override
     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);
-        Value obj = rdf4jTermFactory.asValue(object);
+        final Resource[] contexts = asContexts(graphName);
+        final Resource subj = (Resource) rdf4jTermFactory.asValue(subject);
+        final org.eclipse.rdf4j.model.IRI pred = (org.eclipse.rdf4j.model.IRI) rdf4jTermFactory.asValue(predicate);
+        final Value obj = rdf4jTermFactory.asValue(object);
         return new ConvertedStatements<>(this::getRepositoryConnection, rdf4jTermFactory::asQuad, subj, pred, obj,
                 contexts);
     }
@@ -207,7 +207,7 @@ class RepositoryDatasetImpl extends AbstractRepositoryGraphLike<Quad> implements
     @Override
     public Optional<Graph> getGraph(final BlankNodeOrIRI graphName) {
         // NOTE: May be null to indicate default context
-        Resource context = (Resource) rdf4jTermFactory.asValue(graphName);
+        final Resource context = (Resource) rdf4jTermFactory.asValue(graphName);
         // NOTE: We carry over the 'salt' as the graph's BlankNode should be
         // equal to our BlankNodes
         return Optional.of(new RepositoryGraphImpl(repository, salt, false, includeInferred, context));
@@ -215,8 +215,8 @@ class RepositoryDatasetImpl extends AbstractRepositoryGraphLike<Quad> implements
 
     @Override
     public Stream<BlankNodeOrIRI> getGraphNames() {
-       RepositoryConnection conn = getRepositoryConnection();
-       RepositoryResult<Resource> contexts = conn.getContextIDs();
+       final RepositoryConnection conn = getRepositoryConnection();
+       final RepositoryResult<Resource> contexts = conn.getContextIDs();
         return Iterations.stream(contexts).map(g -> (BlankNodeOrIRI) rdf4jTermFactory.asRDFTerm(g))
                 .onClose(conn::close);
     }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 6791978..2c8355f 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
@@ -54,7 +54,7 @@ class RepositoryGraphImpl extends AbstractRepositoryGraphLike<Triple> implements
 
     @Override
     public void add(final Triple tripleLike) {
-        Statement statement = rdf4jTermFactory.asStatement(tripleLike);
+        final Statement statement = rdf4jTermFactory.asStatement(tripleLike);
         try (RepositoryConnection conn = getRepositoryConnection()) {
             conn.add(statement, contextMask);
             conn.commit();
@@ -63,7 +63,7 @@ class RepositoryGraphImpl extends AbstractRepositoryGraphLike<Triple> implements
 
     @Override
     public boolean contains(final Triple tripleLike) {
-        Statement statement = rdf4jTermFactory.asStatement(tripleLike);
+        final Statement statement = rdf4jTermFactory.asStatement(tripleLike);
         try (RepositoryConnection conn = getRepositoryConnection()) {
             return conn.hasStatement(statement, includeInferred, contextMask);
         }
@@ -71,7 +71,7 @@ class RepositoryGraphImpl extends AbstractRepositoryGraphLike<Triple> implements
 
     @Override
     public void remove(final Triple tripleLike) {
-        Statement statement = rdf4jTermFactory.asStatement(tripleLike);
+        final Statement statement = rdf4jTermFactory.asStatement(tripleLike);
         try (RepositoryConnection conn = getRepositoryConnection()) {
             conn.remove(statement, contextMask);
             conn.commit();
@@ -101,9 +101,9 @@ class RepositoryGraphImpl extends AbstractRepositoryGraphLike<Triple> implements
 
     @Override
     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);
+        final Resource subj = (Resource) rdf4jTermFactory.asValue(subject);
+        final org.eclipse.rdf4j.model.IRI pred = (org.eclipse.rdf4j.model.IRI) rdf4jTermFactory.asValue(predicate);
+        final Value obj = rdf4jTermFactory.asValue(object);
         try (RepositoryConnection conn = getRepositoryConnection()) {
             conn.add(subj, pred, obj, contextMask);
             conn.commit();
@@ -112,9 +112,9 @@ class RepositoryGraphImpl extends AbstractRepositoryGraphLike<Triple> implements
 
     @Override
     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);
+        final Resource subj = (Resource) rdf4jTermFactory.asValue(subject);
+        final org.eclipse.rdf4j.model.IRI pred = (org.eclipse.rdf4j.model.IRI) rdf4jTermFactory.asValue(predicate);
+        final Value obj = rdf4jTermFactory.asValue(object);
         try (RepositoryConnection conn = getRepositoryConnection()) {
             return conn.hasStatement(subj, pred, obj, includeInferred, contextMask);
         }
@@ -122,9 +122,9 @@ class RepositoryGraphImpl extends AbstractRepositoryGraphLike<Triple> implements
 
     @Override
     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);
+        final Resource subj = (Resource) rdf4jTermFactory.asValue(subject);
+        final org.eclipse.rdf4j.model.IRI pred = (org.eclipse.rdf4j.model.IRI) rdf4jTermFactory.asValue(predicate);
+        final Value obj = rdf4jTermFactory.asValue(object);
         try (RepositoryConnection conn = getRepositoryConnection()) {
             conn.remove(subj, pred, obj, contextMask);
             conn.commit();
@@ -139,9 +139,9 @@ class RepositoryGraphImpl extends AbstractRepositoryGraphLike<Triple> implements
     @Override
     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);
-        Value obj = rdf4jTermFactory.asValue(object);
+        final Resource subj = (Resource) rdf4jTermFactory.asValue(subject);
+        final org.eclipse.rdf4j.model.IRI pred = (org.eclipse.rdf4j.model.IRI) rdf4jTermFactory.asValue(predicate);
+        final Value obj = rdf4jTermFactory.asValue(object);
         return new ConvertedStatements<>(this::getRepositoryConnection, rdf4jTermFactory::asTriple, subj, pred,
                 obj, contextMask);
     }
@@ -153,17 +153,17 @@ class RepositoryGraphImpl extends AbstractRepositoryGraphLike<Triple> implements
 
     @Override
     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);
+        final Resource subj = (Resource) rdf4jTermFactory.asValue(subject);
+        final org.eclipse.rdf4j.model.IRI pred = (org.eclipse.rdf4j.model.IRI) rdf4jTermFactory.asValue(predicate);
+        final Value obj = rdf4jTermFactory.asValue(object);
 
         // NOTE: We can't do the usual try..with closing of the
         // RepositoryConnection here as it will have to be closed outside
         // by the user of the returned stream
-        RepositoryConnection conn = getRepositoryConnection();
+        final RepositoryConnection conn = getRepositoryConnection();
         Stream<RDF4JTriple> stream = null;
         try {
-            RepositoryResult<Statement> statements = conn.getStatements(subj, pred, obj, includeInferred, contextMask);
+            final RepositoryResult<Statement> statements = conn.getStatements(subj, pred, obj, includeInferred, contextMask);
             // NOTE: Iterations.stream should close RepositoryResult as long as
             // our caller closes the stream
             stream = Iterations.stream(statements).map(this::asTripleLike);
@@ -185,8 +185,8 @@ class RepositoryGraphImpl extends AbstractRepositoryGraphLike<Triple> implements
 
     @Override
     public Set<RDF4JBlankNodeOrIRI> getContextMask() {
-        Set<RDF4JBlankNodeOrIRI> mask = new HashSet<>();
-        for (Resource s : contextMask) {
+        final Set<RDF4JBlankNodeOrIRI> mask = new HashSet<>();
+        for (final Resource s : contextMask) {
             mask.add((RDF4JBlankNodeOrIRI) rdf4jTermFactory.asRDFTerm(s));
         }
         return Collections.unmodifiableSet(mask);

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 7fdfa0f..1802158 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
@@ -44,7 +44,7 @@ final class TripleImpl implements Triple, RDF4JTriple {
     @Override
     public boolean equals(final Object obj) {
         if (obj instanceof Triple) {
-            Triple triple = (Triple) obj;
+            final Triple triple = (Triple) obj;
             return getSubject().equals(triple.getSubject()) && getPredicate().equals(triple.getPredicate())
                     && getObject().equals(triple.getObject());
         }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 fd3ac83..597c7d7 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
@@ -84,8 +84,8 @@ public class MemoryGraphTest extends AbstractGraphTest {
 
         @Override
         public RDF4JGraph createGraph() {
-            Sail sail = new MemoryStore();
-            Repository repository = new SailRepository(sail);
+            final Sail sail = new MemoryStore();
+            final Repository repository = new SailRepository(sail);
             repository.initialize();
             return rdf4jFactory.asGraph(repository);
         }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 7f56ae4..c496338 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
@@ -58,7 +58,7 @@ public class NativeStoreGraphTest extends AbstractGraphTest {
         public RDF4JGraph createGraph() {
             // We re-use the repository connection, but use a different context
             // every time
-            Set<RDF4JBlankNode> context = Collections.singleton(rdf4jFactory.createBlankNode());
+            final Set<RDF4JBlankNode> context = Collections.singleton(rdf4jFactory.createBlankNode());
             return rdf4jFactory.asGraph(getRepository(), context);
         }
 
@@ -118,7 +118,7 @@ public class NativeStoreGraphTest extends AbstractGraphTest {
     private SailRepository repository;
 
     public void createRepository() throws IOException {
-        Sail sail = new NativeStore(tempDir.newFolder());
+        final Sail sail = new NativeStore(tempDir.newFolder());
         repository = new SailRepository(sail);
         repository.initialize();
     }
@@ -127,7 +127,7 @@ public class NativeStoreGraphTest extends AbstractGraphTest {
         if (repository == null) {
             try {
                 createRepository();
-            } catch (IOException e) {
+            } catch (final IOException e) {
                 throw new UncheckedIOException(e);
             }
         }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/RDF4JServiceLoaderTest.java
----------------------------------------------------------------------
diff --git a/rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/RDF4JServiceLoaderTest.java b/rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/RDF4JServiceLoaderTest.java
index fffa134..f07a0cb 100644
--- a/rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/RDF4JServiceLoaderTest.java
+++ b/rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/RDF4JServiceLoaderTest.java
@@ -29,8 +29,8 @@ public class RDF4JServiceLoaderTest {
 
     @Test
     public void testServiceLoaderLookup() {
-        ServiceLoader<RDF> loader = ServiceLoader.load(RDF.class);
-        for (RDF impl : loader) {
+        final ServiceLoader<RDF> loader = ServiceLoader.load(RDF.class);
+        for (final RDF impl : loader) {
             if (impl instanceof RDF4J) {
                 return; // yay
             }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 9a2d2fd..f604f3e 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
@@ -48,7 +48,7 @@ final class BlankNodeImpl implements BlankNode, SimpleRDFTerm {
         // Both the scope and the id are used to create the UUID, ensuring that
         // a caller can reliably create the same bnode if necessary by sending
         // in the same scope to RDF.createBlankNode(String)
-        String uuidInput = "urn:uuid:" + uuidSalt + "#" + name;
+        final String uuidInput = "urn:uuid:" + uuidSalt + "#" + name;
 
         // The above is not a good value for this.id, as the id
         // needs to be further escaped for
@@ -99,7 +99,7 @@ final class BlankNodeImpl implements BlankNode, SimpleRDFTerm {
         if (!(obj instanceof BlankNodeImpl)) {
             return false;
         }
-        BlankNodeImpl other = (BlankNodeImpl) obj;
+        final BlankNodeImpl other = (BlankNodeImpl) obj;
         if (uniqueReference == null) {
             if (other.uniqueReference != null) {
                 return false;

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 631f6fd..15515f2 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
@@ -128,7 +128,7 @@ public class DatasetGraphView implements Graph {
 
     @Override
     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);
+        final Stream<Triple> stream = dataset.stream(unionOrNamedGraph(), subject, predicate, object).map(Quad::asTriple);
         if (unionGraph) {
             // remove duplicates
             return stream.distinct();

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 736146f..b1f6bdf 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
@@ -54,20 +54,20 @@ final class DatasetImpl implements Dataset {
 
     @Override
     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);
-        RDFTerm newObject = internallyMap(object);
-        Quad result = factory.createQuad(newGraphName, newSubject, newPredicate, newObject);
+        final BlankNodeOrIRI newGraphName = (BlankNodeOrIRI) internallyMap(graphName);
+        final BlankNodeOrIRI newSubject = (BlankNodeOrIRI) internallyMap(subject);
+        final IRI newPredicate = (IRI) internallyMap(predicate);
+        final RDFTerm newObject = internallyMap(object);
+        final Quad result = factory.createQuad(newGraphName, newSubject, newPredicate, newObject);
         quads.add(result);
     }
 
     @Override
     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());
-        RDFTerm newObject = internallyMap(quad.getObject());
+        final BlankNodeOrIRI newGraph = (BlankNodeOrIRI) internallyMap(quad.getGraphName().orElse(null));
+        final BlankNodeOrIRI newSubject = (BlankNodeOrIRI) internallyMap(quad.getSubject());
+        final IRI newPredicate = (IRI) internallyMap(quad.getPredicate());
+        final RDFTerm newObject = internallyMap(quad.getObject());
         // Check if any of the object references changed during the mapping, to
         // avoid creating a new Quad object if possible
         if (newGraph == quad.getGraphName().orElse(null) && newSubject == quad.getSubject()
@@ -75,7 +75,7 @@ final class DatasetImpl implements Dataset {
             quads.add(quad);
         } else {
             // Make a new Quad with our mapped instances
-            Quad result = factory.createQuad(newGraph, newSubject, newPredicate, newObject);
+            final Quad result = factory.createQuad(newGraph, newSubject, newPredicate, newObject);
             quads.add(result);
         }
     }
@@ -85,17 +85,17 @@ final class DatasetImpl implements Dataset {
             return object;
         }
         if (object instanceof BlankNode && !(object instanceof BlankNodeImpl)) {
-            BlankNode blankNode = (BlankNode) object;
+            final BlankNode blankNode = (BlankNode) object;
             // This guarantees that adding the same BlankNode multiple times to
             // this graph will generate a local object that is mapped to an
             // equivalent object, based on the code in the package private
             // BlankNodeImpl class
             return factory.createBlankNode(blankNode.uniqueReference());
         } else if (object instanceof IRI && !(object instanceof IRIImpl)) {
-            IRI iri = (IRI) object;
+            final IRI iri = (IRI) object;
             return factory.createIRI(iri.getIRIString());
         } else if (object instanceof Literal && !(object instanceof LiteralImpl)) {
-            Literal literal = (Literal) object;
+            final Literal literal = (Literal) object;
             if (literal.getLanguageTag().isPresent()) {
                 return factory.createLiteral(literal.getLexicalForm(), literal.getLanguageTag().get());
             } else {
@@ -164,8 +164,8 @@ final class DatasetImpl implements Dataset {
 
     @Override
     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())) {
+        final Stream<Quad> toRemove = stream(graphName, subject, predicate, object);
+        for (final Quad t : toRemove.collect(Collectors.toList())) {
             // Avoid ConcurrentModificationException in ArrayList
             remove(t);
         }
@@ -183,7 +183,7 @@ final class DatasetImpl implements Dataset {
 
     @Override
     public String toString() {
-        String s = stream().limit(TO_STRING_MAX).map(Object::toString).collect(Collectors.joining("\n"));
+        final String s = stream().limit(TO_STRING_MAX).map(Object::toString).collect(Collectors.joining("\n"));
         if (size() > TO_STRING_MAX) {
             return s + "\n# ... +" + (size() - TO_STRING_MAX) + " more";
         } else {

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 268f78a..2c3bee4 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
@@ -45,10 +45,10 @@ final class GraphImpl implements Graph {
 
     @Override
     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);
-        Triple result = factory.createTriple(newSubject, newPredicate, newObject);
+        final BlankNodeOrIRI newSubject = (BlankNodeOrIRI) internallyMap(subject);
+        final IRI newPredicate = (IRI) internallyMap(predicate);
+        final RDFTerm newObject = internallyMap(object);
+        final Triple result = factory.createTriple(newSubject, newPredicate, newObject);
         triples.add(result);
     }
 
@@ -66,17 +66,17 @@ final class GraphImpl implements Graph {
             return object;
         }
         if (object instanceof BlankNode) {
-            BlankNode blankNode = (BlankNode) object;
+            final BlankNode blankNode = (BlankNode) object;
             // This guarantees that adding the same BlankNode multiple times to
             // this graph will generate a local object that is mapped to an
             // equivalent object, based on the code in the package private
             // BlankNodeImpl class
             return factory.createBlankNode(blankNode.uniqueReference());
         } else if (object instanceof IRI) {
-            IRI iri = (IRI) object;
+            final IRI iri = (IRI) object;
             return factory.createIRI(iri.getIRIString());
         } else if (object instanceof Literal) {
-            Literal literal = (Literal) object;
+            final Literal literal = (Literal) object;
             if (literal.getLanguageTag().isPresent()) {
                 return factory.createLiteral(literal.getLexicalForm(), literal.getLanguageTag().get());
             } else {
@@ -88,9 +88,9 @@ final class GraphImpl implements Graph {
     }
 
     private Triple internallyMap(final Triple triple) {
-        BlankNodeOrIRI newSubject = (BlankNodeOrIRI) internallyMap(triple.getSubject());
-        IRI newPredicate = (IRI) internallyMap(triple.getPredicate());
-        RDFTerm newObject = internallyMap(triple.getObject());
+        final BlankNodeOrIRI newSubject = (BlankNodeOrIRI) internallyMap(triple.getSubject());
+        final IRI newPredicate = (IRI) internallyMap(triple.getPredicate());
+        final RDFTerm newObject = internallyMap(triple.getObject());
         // Check if any of the object references changed during the mapping, to
         // avoid creating a new Triple object if possible
         if (newSubject == triple.getSubject() && newPredicate == triple.getPredicate()
@@ -149,8 +149,8 @@ final class GraphImpl implements Graph {
 
     @Override
     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())) {
+        final Stream<Triple> toRemove = stream(subject, predicate, object);
+        for (final Triple t : toRemove.collect(Collectors.toList())) {
             // Avoid ConcurrentModificationException in ArrayList
             remove(t);
         }
@@ -168,7 +168,7 @@ final class GraphImpl implements Graph {
 
     @Override
     public String toString() {
-        String s = stream().limit(TO_STRING_MAX).map(Object::toString).collect(Collectors.joining("\n"));
+        final String s = stream().limit(TO_STRING_MAX).map(Object::toString).collect(Collectors.joining("\n"));
         if (size() > TO_STRING_MAX) {
             return s + "\n# ... +" + (size() - TO_STRING_MAX) + " more";
         } else {

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 67b2ef9..114eef1 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
@@ -59,7 +59,7 @@ final class IRIImpl implements IRI, SimpleRDF.SimpleRDFTerm {
         if (obj == null || !(obj instanceof IRI)) {
             return false;
         }
-        IRI other = (IRI) obj;
+        final IRI other = (IRI) obj;
         return getIRIString().equals(other.getIRIString());
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 38ada61..3cca4c6 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
@@ -60,7 +60,7 @@ final class LiteralImpl implements Literal, SimpleRDF.SimpleRDFTerm {
         }
         try {
             new Locale.Builder().setLanguageTag(languageTag);
-        } catch (IllformedLocaleException ex) {
+        } catch (final IllformedLocaleException ex) {
             throw new IllegalArgumentException("Invalid languageTag: " + languageTag, ex);
         }
 
@@ -85,7 +85,7 @@ final class LiteralImpl implements Literal, SimpleRDF.SimpleRDFTerm {
 
     @Override
     public String ntriplesString() {
-        StringBuilder sb = new StringBuilder();
+        final StringBuilder sb = new StringBuilder();
         sb.append(QUOTE);
         // Escape special characters
         sb.append(getLexicalForm().replace("\\", "\\\\"). // escaped to \\
@@ -124,7 +124,7 @@ final class LiteralImpl implements Literal, SimpleRDF.SimpleRDFTerm {
         if (obj == null || !(obj instanceof Literal)) {
             return false;
         }
-        Literal literal = (Literal) obj;
+        final Literal literal = (Literal) obj;
         return getDatatype().equals(literal.getDatatype()) && getLexicalForm().equals(literal.getLexicalForm())
                 && getLanguageTag().equals(literal.getLanguageTag());
     }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 d62d17c..51bef69 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
@@ -95,7 +95,7 @@ final class QuadImpl implements Quad {
         if (!(obj instanceof Quad)) {
             return false;
         }
-        Quad other = (Quad) obj;
+        final Quad other = (Quad) obj;
         return getGraphName().equals(other.getGraphName()) && getSubject().equals(other.getSubject())
                 && getPredicate().equals(other.getPredicate()) && getObject().equals(other.getObject());
     }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/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 e871079..6f6b2a5 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
@@ -79,7 +79,7 @@ public class SimpleRDF implements RDF {
 
     @Override
     public IRI createIRI(final String iri) {
-        IRI result = new IRIImpl(iri);
+        final IRI result = new IRIImpl(iri);
         // Reuse any IRI objects already created in Types
         return Types.get(result).orElse(result);
     }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/simple/src/main/java/org/apache/commons/rdf/simple/TripleImpl.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/TripleImpl.java b/simple/src/main/java/org/apache/commons/rdf/simple/TripleImpl.java
index dd1c152..ef527ce 100644
--- a/simple/src/main/java/org/apache/commons/rdf/simple/TripleImpl.java
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/TripleImpl.java
@@ -83,7 +83,7 @@ final class TripleImpl implements Triple {
         if (!(obj instanceof Triple)) {
             return false;
         }
-        Triple other = (Triple) obj;
+        final Triple other = (Triple) obj;
         return getSubject().equals(other.getSubject()) && getPredicate().equals(other.getPredicate())
                 && getObject().equals(other.getObject());
     }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56ddbdcf/simple/src/main/java/org/apache/commons/rdf/simple/Types.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/Types.java b/simple/src/main/java/org/apache/commons/rdf/simple/Types.java
index 986e1f1..308de71 100644
--- a/simple/src/main/java/org/apache/commons/rdf/simple/Types.java
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/Types.java
@@ -240,7 +240,7 @@ public final class Types implements IRI, SimpleRDF.SimpleRDFTerm {
     private static final Set<IRI> ALL_TYPES;
 
     static {
-        Set<IRI> tempTypes = new LinkedHashSet<>();
+        final Set<IRI> tempTypes = new LinkedHashSet<>();
         tempTypes.add(RDF_HTML);
         tempTypes.add(RDF_LANGSTRING);
         tempTypes.add(RDF_PLAINLITERAL);
@@ -339,7 +339,7 @@ public final class Types implements IRI, SimpleRDF.SimpleRDFTerm {
         if (ALL_TYPES.contains(nextIRI)) {
             // If we know about this IRI, then look through our set to find the
             // object that matches and return it
-            for (IRI nextType : ALL_TYPES) {
+            for (final IRI nextType : ALL_TYPES) {
                 if (nextType.equals(nextIRI)) {
                     return Optional.of(nextType);
                 }