Thanks for the code tidy, Gary! Anything else that is glaring..?
On 11 November 2016 at 22:55, <[email protected]> wrote: > Repository: incubator-commonsrdf > Updated Branches: > refs/heads/master 56ddbdcf9 -> d9b47b703 > > > Remove redundant superinterfaces > > Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo > Commit: > http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/d9b47b70 > Tree: > http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/d9b47b70 > Diff: > http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/d9b47b70 > > Branch: refs/heads/master > Commit: d9b47b703d35a5451e6a89f036ab6c89c667b204 > Parents: 56ddbdc > Author: Gary Gregory <[email protected]> > Authored: Fri Nov 11 14:55:53 2016 -0800 > Committer: Gary Gregory <[email protected]> > Committed: Fri Nov 11 14:55:53 2016 -0800 > > ---------------------------------------------------------------------- > .../org/apache/commons/rdf/jena/experimental/JenaRDFParser.java | 5 ++--- > .../org/apache/commons/rdf/jena/impl/AbstractJenaRDFTerm.java | 3 +-- > .../org/apache/commons/rdf/rdf4j/experimental/RDF4JParser.java | 5 ++--- > .../main/java/org/apache/commons/rdf/rdf4j/impl/QuadImpl.java | 4 ++-- > .../apache/commons/rdf/rdf4j/impl/RepositoryDatasetImpl.java | 3 +-- > .../org/apache/commons/rdf/rdf4j/impl/RepositoryGraphImpl.java | 3 +-- > .../main/java/org/apache/commons/rdf/rdf4j/impl/TripleImpl.java | 2 +- > 7 files changed, 10 insertions(+), 15 deletions(-) > ---------------------------------------------------------------------- > > > http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/d9b47b70/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 4921617..5d61962 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 > @@ -25,10 +25,9 @@ import java.util.function.Consumer; > > import org.apache.commons.rdf.api.IRI; > import org.apache.commons.rdf.api.QuadLike; > -import org.apache.commons.rdf.api.RDFTerm; > import org.apache.commons.rdf.api.RDF; > +import org.apache.commons.rdf.api.RDFTerm; > import org.apache.commons.rdf.api.TripleLike; > -import org.apache.commons.rdf.experimental.RDFParser; > import org.apache.commons.rdf.jena.JenaGraph; > import org.apache.commons.rdf.jena.JenaRDF; > import org.apache.commons.rdf.simple.experimental.AbstractRDFParser; > @@ -38,7 +37,7 @@ import org.apache.jena.riot.RDFDataMgr; > import org.apache.jena.riot.system.StreamRDF; > import org.apache.jena.riot.system.StreamRDFLib; > > -public class JenaRDFParser extends AbstractRDFParser<JenaRDFParser> > implements RDFParser { > +public class JenaRDFParser extends AbstractRDFParser<JenaRDFParser> { > > private Consumer<TripleLike> generalizedConsumerTriple; > private Consumer<QuadLike<RDFTerm>> generalizedConsumerQuad; > > http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/d9b47b70/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 18e07e3..94b8bc4 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 > @@ -18,12 +18,11 @@ > > package org.apache.commons.rdf.jena.impl; > > -import org.apache.commons.rdf.api.RDFTerm; > import org.apache.commons.rdf.jena.JenaRDFTerm; > import org.apache.jena.graph.Node; > import org.apache.jena.riot.out.NodeFmtLib; > > -class AbstractJenaRDFTerm implements JenaRDFTerm, RDFTerm { > +class AbstractJenaRDFTerm implements JenaRDFTerm { > private final Node node; > // static private PrefixMapping empty = new PrefixMappingImpl(); > > > http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/d9b47b70/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 568f5b0..53bcc00 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 > @@ -30,11 +30,10 @@ import java.util.stream.Stream; > import org.apache.commons.rdf.api.IRI; > import org.apache.commons.rdf.api.Quad; > import org.apache.commons.rdf.api.RDFSyntax; > -import org.apache.commons.rdf.experimental.RDFParser; > +import org.apache.commons.rdf.rdf4j.RDF4J; > import org.apache.commons.rdf.rdf4j.RDF4JBlankNodeOrIRI; > import org.apache.commons.rdf.rdf4j.RDF4JDataset; > import org.apache.commons.rdf.rdf4j.RDF4JGraph; > -import org.apache.commons.rdf.rdf4j.RDF4J; > import org.apache.commons.rdf.simple.experimental.AbstractRDFParser; > import org.eclipse.rdf4j.model.Model; > import org.eclipse.rdf4j.model.Resource; > @@ -57,7 +56,7 @@ import org.eclipse.rdf4j.rio.helpers.AbstractRDFHandler; > * <em>rdf4j-rio-*</em> module on the classpath. > * > */ > -public class RDF4JParser extends AbstractRDFParser<RDF4JParser> implements > RDFParser { > +public class RDF4JParser extends AbstractRDFParser<RDF4JParser> { > > private final class AddToQuadConsumer extends AbstractRDFHandler { > private final Consumer<Quad> quadTarget; > > http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/d9b47b70/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 93c02c9..1adc1e5 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 > @@ -25,11 +25,11 @@ import org.apache.commons.rdf.api.BlankNodeOrIRI; > import org.apache.commons.rdf.api.Quad; > import org.apache.commons.rdf.api.RDFTerm; > import org.apache.commons.rdf.api.Triple; > -import org.apache.commons.rdf.rdf4j.RDF4JQuad; > import org.apache.commons.rdf.rdf4j.RDF4J; > +import org.apache.commons.rdf.rdf4j.RDF4JQuad; > import org.eclipse.rdf4j.model.Statement; > > -final class QuadImpl implements Quad, RDF4JQuad { > +final class QuadImpl implements RDF4JQuad { > private transient int hashCode = 0; > private final UUID salt; > private final Statement statement; > > http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/d9b47b70/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 03590f6..6ce8b46 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 > @@ -23,7 +23,6 @@ import java.util.UUID; > import java.util.stream.Stream; > > import org.apache.commons.rdf.api.BlankNodeOrIRI; > -import org.apache.commons.rdf.api.Dataset; > import org.apache.commons.rdf.api.Graph; > import org.apache.commons.rdf.api.IRI; > import org.apache.commons.rdf.api.Quad; > @@ -39,7 +38,7 @@ import org.eclipse.rdf4j.repository.Repository; > import org.eclipse.rdf4j.repository.RepositoryConnection; > import org.eclipse.rdf4j.repository.RepositoryResult; > > -class RepositoryDatasetImpl extends AbstractRepositoryGraphLike<Quad> > implements RDF4JDataset, Dataset { > +class RepositoryDatasetImpl extends AbstractRepositoryGraphLike<Quad> > implements RDF4JDataset { > > RepositoryDatasetImpl(final Repository repository, final UUID salt, > final boolean handleInitAndShutdown, final boolean includeInferred) { > super(repository, salt, handleInitAndShutdown, includeInferred); > > http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/d9b47b70/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 2c8355f..06bcded 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 > @@ -26,7 +26,6 @@ import java.util.UUID; > import java.util.stream.Stream; > > import org.apache.commons.rdf.api.BlankNodeOrIRI; > -import org.apache.commons.rdf.api.Graph; > import org.apache.commons.rdf.api.IRI; > import org.apache.commons.rdf.api.RDFTerm; > import org.apache.commons.rdf.api.Triple; > @@ -42,7 +41,7 @@ import org.eclipse.rdf4j.repository.Repository; > import org.eclipse.rdf4j.repository.RepositoryConnection; > import org.eclipse.rdf4j.repository.RepositoryResult; > > -class RepositoryGraphImpl extends AbstractRepositoryGraphLike<Triple> > implements Graph, RDF4JGraph { > +class RepositoryGraphImpl extends AbstractRepositoryGraphLike<Triple> > implements RDF4JGraph { > > private final Resource[] contextMask; > > > http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/d9b47b70/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 1802158..c59e4ca 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 > @@ -27,7 +27,7 @@ import org.apache.commons.rdf.rdf4j.RDF4J; > import org.apache.commons.rdf.rdf4j.RDF4JTriple; > import org.eclipse.rdf4j.model.Statement; > > -final class TripleImpl implements Triple, RDF4JTriple { > +final class TripleImpl implements RDF4JTriple { > private final UUID salt; > private final Statement statement; > > -- Stian Soiland-Reyes http://orcid.org/0000-0001-9842-9718
