You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2017/10/30 14:57:22 UTC
[22/22] commons-rdf git commit: Module names, directory names,
and artifact names should match.
Module names, directory names, and artifact names should match.
Project: http://git-wip-us.apache.org/repos/asf/commons-rdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-rdf/commit/d59203ce
Tree: http://git-wip-us.apache.org/repos/asf/commons-rdf/tree/d59203ce
Diff: http://git-wip-us.apache.org/repos/asf/commons-rdf/diff/d59203ce
Branch: refs/heads/master
Commit: d59203ce07d772c791939b96af38bca32ddfc803
Parents: b73edce
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Oct 30 08:56:56 2017 -0600
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Oct 30 08:56:56 2017 -0600
----------------------------------------------------------------------
api/pom.xml | 76 --
.../org/apache/commons/rdf/api/BlankNode.java | 120 ---
.../apache/commons/rdf/api/BlankNodeOrIRI.java | 28 -
.../org/apache/commons/rdf/api/Dataset.java | 354 --------
.../java/org/apache/commons/rdf/api/Graph.java | 298 -------
.../org/apache/commons/rdf/api/GraphLike.java | 106 ---
.../java/org/apache/commons/rdf/api/IRI.java | 77 --
.../org/apache/commons/rdf/api/Literal.java | 144 ----
.../java/org/apache/commons/rdf/api/Quad.java | 240 ------
.../org/apache/commons/rdf/api/QuadLike.java | 56 --
.../java/org/apache/commons/rdf/api/RDF.java | 258 ------
.../org/apache/commons/rdf/api/RDFSyntax.java | 308 -------
.../org/apache/commons/rdf/api/RDFTerm.java | 107 ---
.../apache/commons/rdf/api/RDFTermFactory.java | 66 --
.../java/org/apache/commons/rdf/api/Triple.java | 129 ---
.../org/apache/commons/rdf/api/TripleLike.java | 64 --
.../apache/commons/rdf/api/W3CRDFSyntax.java | 206 -----
.../apache/commons/rdf/api/package-info.java | 47 --
.../commons/rdf/experimental/RDFParser.java | 485 -----------
.../commons/rdf/experimental/package-info.java | 33 -
api/src/main/resources/META-INF/LICENSE | 202 -----
api/src/main/resources/META-INF/NOTICE | 5 -
api/src/site/resources/profile.jacoco | 0
api/src/site/resources/profile.japicmp | 0
.../commons/rdf/api/AbstractBlankNodeTest.java | 208 -----
.../commons/rdf/api/AbstractDatasetTest.java | 778 ------------------
.../commons/rdf/api/AbstractGraphTest.java | 683 ----------------
.../apache/commons/rdf/api/AbstractRDFTest.java | 454 -----------
.../commons/rdf/api/DefaultDatasetTest.java | 58 --
.../commons/rdf/api/DefaultGraphTest.java | 78 --
.../apache/commons/rdf/api/DefaultQuadTest.java | 47 --
.../rdf/api/DefaultRDFTermFactoryTest.java | 63 --
.../apache/commons/rdf/api/DummyDataset.java | 110 ---
.../commons/rdf/api/DummyDatasetTest.java | 101 ---
.../org/apache/commons/rdf/api/DummyGraph.java | 85 --
.../apache/commons/rdf/api/DummyGraphTest.java | 84 --
.../org/apache/commons/rdf/api/DummyIRI.java | 47 --
.../apache/commons/rdf/api/DummyIRITest.java | 56 --
.../org/apache/commons/rdf/api/DummyQuad.java | 63 --
.../apache/commons/rdf/api/DummyQuadTest.java | 58 --
.../org/apache/commons/rdf/api/DummyTriple.java | 57 --
.../apache/commons/rdf/api/DummyTripleTest.java | 53 --
.../apache/commons/rdf/api/RDFSyntaxTest.java | 146 ----
.../test/resources/example-rdf/example.jsonld | 25 -
api/src/test/resources/example-rdf/example.nq | 3 -
api/src/test/resources/example-rdf/example.nt | 2 -
api/src/test/resources/example-rdf/example.rdf | 23 -
api/src/test/resources/example-rdf/example.trig | 3 -
api/src/test/resources/example-rdf/example.ttl | 2 -
commons-rdf-api/pom.xml | 76 ++
.../org/apache/commons/rdf/api/BlankNode.java | 120 +++
.../apache/commons/rdf/api/BlankNodeOrIRI.java | 28 +
.../org/apache/commons/rdf/api/Dataset.java | 354 ++++++++
.../java/org/apache/commons/rdf/api/Graph.java | 298 +++++++
.../org/apache/commons/rdf/api/GraphLike.java | 106 +++
.../java/org/apache/commons/rdf/api/IRI.java | 77 ++
.../org/apache/commons/rdf/api/Literal.java | 144 ++++
.../java/org/apache/commons/rdf/api/Quad.java | 240 ++++++
.../org/apache/commons/rdf/api/QuadLike.java | 56 ++
.../java/org/apache/commons/rdf/api/RDF.java | 258 ++++++
.../org/apache/commons/rdf/api/RDFSyntax.java | 308 +++++++
.../org/apache/commons/rdf/api/RDFTerm.java | 107 +++
.../apache/commons/rdf/api/RDFTermFactory.java | 66 ++
.../java/org/apache/commons/rdf/api/Triple.java | 129 +++
.../org/apache/commons/rdf/api/TripleLike.java | 64 ++
.../apache/commons/rdf/api/W3CRDFSyntax.java | 206 +++++
.../apache/commons/rdf/api/package-info.java | 47 ++
.../commons/rdf/experimental/RDFParser.java | 485 +++++++++++
.../commons/rdf/experimental/package-info.java | 33 +
.../src/main/resources/META-INF/LICENSE | 202 +++++
.../src/main/resources/META-INF/NOTICE | 5 +
.../src/site/resources/profile.jacoco | 0
.../src/site/resources/profile.japicmp | 0
.../commons/rdf/api/AbstractBlankNodeTest.java | 208 +++++
.../commons/rdf/api/AbstractDatasetTest.java | 778 ++++++++++++++++++
.../commons/rdf/api/AbstractGraphTest.java | 683 ++++++++++++++++
.../apache/commons/rdf/api/AbstractRDFTest.java | 454 +++++++++++
.../commons/rdf/api/DefaultDatasetTest.java | 58 ++
.../commons/rdf/api/DefaultGraphTest.java | 78 ++
.../apache/commons/rdf/api/DefaultQuadTest.java | 47 ++
.../rdf/api/DefaultRDFTermFactoryTest.java | 63 ++
.../apache/commons/rdf/api/DummyDataset.java | 110 +++
.../commons/rdf/api/DummyDatasetTest.java | 101 +++
.../org/apache/commons/rdf/api/DummyGraph.java | 85 ++
.../apache/commons/rdf/api/DummyGraphTest.java | 84 ++
.../org/apache/commons/rdf/api/DummyIRI.java | 47 ++
.../apache/commons/rdf/api/DummyIRITest.java | 56 ++
.../org/apache/commons/rdf/api/DummyQuad.java | 63 ++
.../apache/commons/rdf/api/DummyQuadTest.java | 58 ++
.../org/apache/commons/rdf/api/DummyTriple.java | 57 ++
.../apache/commons/rdf/api/DummyTripleTest.java | 53 ++
.../apache/commons/rdf/api/RDFSyntaxTest.java | 146 ++++
.../test/resources/example-rdf/example.jsonld | 25 +
.../src/test/resources/example-rdf/example.nq | 3 +
.../src/test/resources/example-rdf/example.nt | 2 +
.../src/test/resources/example-rdf/example.rdf | 23 +
.../src/test/resources/example-rdf/example.trig | 3 +
.../src/test/resources/example-rdf/example.ttl | 2 +
commons-rdf-examples/README.md | 36 +
commons-rdf-examples/pom.xml | 89 +++
.../src/example/IntroToRDF.java | 149 ++++
.../src/example/IntroToRDFTest.java | 30 +
.../src/example/UserGuideTest.java | 259 ++++++
commons-rdf-integration-tests/pom.xml | 60 ++
.../rdf/integrationtests/AllToAllTest.java | 171 ++++
.../rdf/integrationtests/JSONLDParsingTest.java | 164 ++++
.../src/test/resources/alice-cached.jsonld | 9 +
.../src/test/resources/alice-embedded.jsonld | 16 +
.../src/test/resources/contexts/example.jsonld | 11 +
.../src/test/resources/jarcache.json | 10 +
commons-rdf-jena/pom.xml | 112 +++
.../commons/rdf/jena/ConversionException.java | 48 ++
.../apache/commons/rdf/jena/JenaBlankNode.java | 33 +
.../apache/commons/rdf/jena/JenaDataset.java | 56 ++
.../rdf/jena/JenaGeneralizedQuadLike.java | 38 +
.../rdf/jena/JenaGeneralizedTripleLike.java | 38 +
.../org/apache/commons/rdf/jena/JenaGraph.java | 56 ++
.../org/apache/commons/rdf/jena/JenaIRI.java | 32 +
.../apache/commons/rdf/jena/JenaLiteral.java | 32 +
.../org/apache/commons/rdf/jena/JenaQuad.java | 29 +
.../apache/commons/rdf/jena/JenaQuadLike.java | 43 +
.../org/apache/commons/rdf/jena/JenaRDF.java | 799 +++++++++++++++++++
.../apache/commons/rdf/jena/JenaRDFTerm.java | 35 +
.../org/apache/commons/rdf/jena/JenaTriple.java | 27 +
.../apache/commons/rdf/jena/JenaTripleLike.java | 45 ++
.../rdf/jena/experimental/JenaRDFParser.java | 106 +++
.../rdf/jena/experimental/package-info.java | 31 +
.../rdf/jena/impl/AbstractJenaRDFTerm.java | 47 ++
.../commons/rdf/jena/impl/AbstractQuadLike.java | 198 +++++
.../rdf/jena/impl/InternalJenaFactory.java | 171 ++++
.../rdf/jena/impl/JenaBlankNodeImpl.java | 64 ++
.../commons/rdf/jena/impl/JenaDatasetImpl.java | 186 +++++
.../jena/impl/JenaGeneralizedQuadLikeImpl.java | 38 +
.../impl/JenaGeneralizedTripleLikeImpl.java | 37 +
.../commons/rdf/jena/impl/JenaGraphImpl.java | 170 ++++
.../commons/rdf/jena/impl/JenaIRIImpl.java | 64 ++
.../commons/rdf/jena/impl/JenaLiteralImpl.java | 87 ++
.../commons/rdf/jena/impl/JenaQuadImpl.java | 66 ++
.../commons/rdf/jena/impl/JenaTripleImpl.java | 66 ++
.../services/org.apache.commons.rdf.api.RDF | 1 +
.../src/site/resources/profile.jacoco | 0
.../commons/rdf/jena/DatasetJenaTest.java | 31 +
.../rdf/jena/DefaultGraphInQuadTest.java | 136 ++++
.../rdf/jena/GeneralizedRDFQuadTest.java | 127 +++
.../rdf/jena/GeneralizedRDFTripleTest.java | 85 ++
.../apache/commons/rdf/jena/JenaRDFTest.java | 30 +
.../commons/rdf/jena/JenaServiceLoaderTest.java | 40 +
.../commons/rdf/jena/TestBlankNodeJena.java | 46 ++
.../apache/commons/rdf/jena/TestGraphJena.java | 31 +
.../jena/TestJenaGraphToCommonsRDFGraph.java | 123 +++
.../commons/rdf/jena/TestRDFParserBuilder.java | 63 ++
commons-rdf-jena/src/test/resources/D.ttl | 20 +
commons-rdf-jsonld-java/pom.xml | 85 ++
.../commons/rdf/jsonldjava/JsonLdBlankNode.java | 67 ++
.../commons/rdf/jsonldjava/JsonLdDataset.java | 111 +++
.../commons/rdf/jsonldjava/JsonLdGraph.java | 112 +++
.../commons/rdf/jsonldjava/JsonLdGraphLike.java | 236 ++++++
.../commons/rdf/jsonldjava/JsonLdIRI.java | 64 ++
.../commons/rdf/jsonldjava/JsonLdLiteral.java | 101 +++
.../commons/rdf/jsonldjava/JsonLdQuad.java | 55 ++
.../commons/rdf/jsonldjava/JsonLdQuadLike.java | 80 ++
.../commons/rdf/jsonldjava/JsonLdRDF.java | 319 ++++++++
.../commons/rdf/jsonldjava/JsonLdTerm.java | 51 ++
.../commons/rdf/jsonldjava/JsonLdTriple.java | 53 ++
.../rdf/jsonldjava/JsonLdTripleLike.java | 32 +
.../rdf/jsonldjava/JsonLdUnionGraph.java | 113 +++
.../jsonldjava/experimental/JsonLdParser.java | 160 ++++
.../jsonldjava/experimental/package-info.java | 31 +
.../commons/rdf/jsonldjava/package-info.java | 27 +
.../services/org.apache.commons.rdf.api.RDF | 1 +
.../src/main/resources/test.jsonld | 26 +
.../src/site/resources/profile.jacoco | 0
.../rdf/jsonldjava/JsonLdBlankNodeTest.java | 41 +
.../rdf/jsonldjava/JsonLdComparisonTest.java | 141 ++++
.../rdf/jsonldjava/JsonLdDatasetTest.java | 30 +
.../commons/rdf/jsonldjava/JsonLdGraphTest.java | 30 +
.../rdf/jsonldjava/JsonLdParserBuilderTest.java | 105 +++
.../commons/rdf/jsonldjava/JsonLdRDFTest.java | 54 ++
.../rdf/jsonldjava/JsonLdServiceLoaderTest.java | 40 +
commons-rdf-rdf4j/README.md | 25 +
commons-rdf-rdf4j/pom.xml | 172 ++++
.../commons/rdf/rdf4j/ClosableIterable.java | 38 +
.../org/apache/commons/rdf/rdf4j/RDF4J.java | 659 +++++++++++++++
.../commons/rdf/rdf4j/RDF4JBlankNode.java | 37 +
.../commons/rdf/rdf4j/RDF4JBlankNodeOrIRI.java | 37 +
.../apache/commons/rdf/rdf4j/RDF4JDataset.java | 142 ++++
.../apache/commons/rdf/rdf4j/RDF4JGraph.java | 157 ++++
.../commons/rdf/rdf4j/RDF4JGraphLike.java | 66 ++
.../org/apache/commons/rdf/rdf4j/RDF4JIRI.java | 34 +
.../apache/commons/rdf/rdf4j/RDF4JLiteral.java | 30 +
.../org/apache/commons/rdf/rdf4j/RDF4JQuad.java | 31 +
.../org/apache/commons/rdf/rdf4j/RDF4JTerm.java | 39 +
.../apache/commons/rdf/rdf4j/RDF4JTriple.java | 30 +
.../commons/rdf/rdf4j/RDF4JTripleLike.java | 43 +
.../rdf/rdf4j/experimental/RDF4JParser.java | 237 ++++++
.../rdf/rdf4j/experimental/package-info.java | 31 +
.../commons/rdf/rdf4j/impl/AbstractRDFTerm.java | 34 +
.../rdf4j/impl/AbstractRepositoryGraphLike.java | 76 ++
.../commons/rdf/rdf4j/impl/BlankNodeImpl.java | 98 +++
.../rdf/rdf4j/impl/ConvertedStatements.java | 71 ++
.../apache/commons/rdf/rdf4j/impl/IRIImpl.java | 65 ++
.../rdf/rdf4j/impl/InternalRDF4JFactory.java | 184 +++++
.../commons/rdf/rdf4j/impl/LiteralImpl.java | 93 +++
.../commons/rdf/rdf4j/impl/ModelGraphImpl.java | 153 ++++
.../apache/commons/rdf/rdf4j/impl/QuadImpl.java | 100 +++
.../rdf/rdf4j/impl/RepositoryDatasetImpl.java | 223 ++++++
.../rdf/rdf4j/impl/RepositoryGraphImpl.java | 194 +++++
.../commons/rdf/rdf4j/impl/TripleImpl.java | 78 ++
.../apache/commons/rdf/rdf4j/package-info.java | 53 ++
.../services/org.apache.commons.rdf.api.RDF | 1 +
.../src/site/resources/profile.jacoco | 0
.../apache/commons/rdf/rdf4j/BlankNodeTest.java | 37 +
.../apache/commons/rdf/rdf4j/DatasetTest.java | 30 +
.../org/apache/commons/rdf/rdf4j/GraphTest.java | 30 +
.../commons/rdf/rdf4j/MemoryGraphTest.java | 99 +++
.../commons/rdf/rdf4j/MemoryStoreRDFTest.java | 37 +
.../commons/rdf/rdf4j/NativeStoreGraphTest.java | 182 +++++
.../rdf/rdf4j/RDF4JMethodOverloadsTest.java | 50 ++
.../rdf/rdf4j/RDF4JServiceLoaderTest.java | 40 +
.../org/apache/commons/rdf/rdf4j/RDF4JTest.java | 37 +
commons-rdf-simple/pom.xml | 74 ++
.../commons/rdf/simple/BlankNodeImpl.java | 113 +++
.../commons/rdf/simple/DatasetGraphView.java | 139 ++++
.../apache/commons/rdf/simple/DatasetImpl.java | 214 +++++
.../apache/commons/rdf/simple/GraphImpl.java | 179 +++++
.../org/apache/commons/rdf/simple/IRIImpl.java | 71 ++
.../apache/commons/rdf/simple/LiteralImpl.java | 136 ++++
.../org/apache/commons/rdf/simple/QuadImpl.java | 108 +++
.../apache/commons/rdf/simple/SimpleRDF.java | 112 +++
.../rdf/simple/SimpleRDFTermFactory.java | 78 ++
.../apache/commons/rdf/simple/TripleImpl.java | 91 +++
.../org/apache/commons/rdf/simple/Types.java | 350 ++++++++
.../simple/experimental/AbstractRDFParser.java | 571 +++++++++++++
.../simple/experimental/RDFParseException.java | 50 ++
.../rdf/simple/experimental/package-info.java | 31 +
.../apache/commons/rdf/simple/package-info.java | 38 +
.../src/main/resources/META-INF/LICENSE | 202 +++++
.../src/main/resources/META-INF/NOTICE | 5 +
.../services/org.apache.commons.rdf.api.RDF | 1 +
.../org.apache.commons.rdf.api.RDFTermFactory | 1 +
.../src/site/resources/profile.jacoco | 0
.../src/site/resources/profile.japicmp | 0
.../commons/rdf/simple/BlankNodeImplTest.java | 43 +
.../rdf/simple/DummyRDFParserBuilder.java | 93 +++
.../commons/rdf/simple/SimpleDatasetTest.java | 48 ++
.../commons/rdf/simple/SimpleGraphTest.java | 47 ++
.../commons/rdf/simple/SimpleRDFTest.java | 33 +
.../rdf/simple/SimpleServiceLoaderTest.java | 40 +
.../commons/rdf/simple/TestWritingGraph.java | 152 ++++
.../apache/commons/rdf/simple/TypesTest.java | 62 ++
.../experimental/AbstractRDFParserTest.java | 279 +++++++
examples/README.md | 36 -
examples/pom.xml | 89 ---
examples/src/example/IntroToRDF.java | 149 ----
examples/src/example/IntroToRDFTest.java | 30 -
examples/src/example/UserGuideTest.java | 259 ------
integration-tests/pom.xml | 60 --
.../rdf/integrationtests/AllToAllTest.java | 171 ----
.../rdf/integrationtests/JSONLDParsingTest.java | 164 ----
.../src/test/resources/alice-cached.jsonld | 9 -
.../src/test/resources/alice-embedded.jsonld | 16 -
.../src/test/resources/contexts/example.jsonld | 11 -
.../src/test/resources/jarcache.json | 10 -
jena/pom.xml | 112 ---
.../commons/rdf/jena/ConversionException.java | 48 --
.../apache/commons/rdf/jena/JenaBlankNode.java | 33 -
.../apache/commons/rdf/jena/JenaDataset.java | 56 --
.../rdf/jena/JenaGeneralizedQuadLike.java | 38 -
.../rdf/jena/JenaGeneralizedTripleLike.java | 38 -
.../org/apache/commons/rdf/jena/JenaGraph.java | 56 --
.../org/apache/commons/rdf/jena/JenaIRI.java | 32 -
.../apache/commons/rdf/jena/JenaLiteral.java | 32 -
.../org/apache/commons/rdf/jena/JenaQuad.java | 29 -
.../apache/commons/rdf/jena/JenaQuadLike.java | 43 -
.../org/apache/commons/rdf/jena/JenaRDF.java | 799 -------------------
.../apache/commons/rdf/jena/JenaRDFTerm.java | 35 -
.../org/apache/commons/rdf/jena/JenaTriple.java | 27 -
.../apache/commons/rdf/jena/JenaTripleLike.java | 45 --
.../rdf/jena/experimental/JenaRDFParser.java | 106 ---
.../rdf/jena/experimental/package-info.java | 31 -
.../rdf/jena/impl/AbstractJenaRDFTerm.java | 47 --
.../commons/rdf/jena/impl/AbstractQuadLike.java | 198 -----
.../rdf/jena/impl/InternalJenaFactory.java | 171 ----
.../rdf/jena/impl/JenaBlankNodeImpl.java | 64 --
.../commons/rdf/jena/impl/JenaDatasetImpl.java | 186 -----
.../jena/impl/JenaGeneralizedQuadLikeImpl.java | 38 -
.../impl/JenaGeneralizedTripleLikeImpl.java | 37 -
.../commons/rdf/jena/impl/JenaGraphImpl.java | 170 ----
.../commons/rdf/jena/impl/JenaIRIImpl.java | 64 --
.../commons/rdf/jena/impl/JenaLiteralImpl.java | 87 --
.../commons/rdf/jena/impl/JenaQuadImpl.java | 66 --
.../commons/rdf/jena/impl/JenaTripleImpl.java | 66 --
.../services/org.apache.commons.rdf.api.RDF | 1 -
jena/src/site/resources/profile.jacoco | 0
.../commons/rdf/jena/DatasetJenaTest.java | 31 -
.../rdf/jena/DefaultGraphInQuadTest.java | 136 ----
.../rdf/jena/GeneralizedRDFQuadTest.java | 127 ---
.../rdf/jena/GeneralizedRDFTripleTest.java | 85 --
.../apache/commons/rdf/jena/JenaRDFTest.java | 30 -
.../commons/rdf/jena/JenaServiceLoaderTest.java | 40 -
.../commons/rdf/jena/TestBlankNodeJena.java | 46 --
.../apache/commons/rdf/jena/TestGraphJena.java | 31 -
.../jena/TestJenaGraphToCommonsRDFGraph.java | 123 ---
.../commons/rdf/jena/TestRDFParserBuilder.java | 63 --
jena/src/test/resources/D.ttl | 20 -
jsonld-java/pom.xml | 85 --
.../commons/rdf/jsonldjava/JsonLdBlankNode.java | 67 --
.../commons/rdf/jsonldjava/JsonLdDataset.java | 111 ---
.../commons/rdf/jsonldjava/JsonLdGraph.java | 112 ---
.../commons/rdf/jsonldjava/JsonLdGraphLike.java | 236 ------
.../commons/rdf/jsonldjava/JsonLdIRI.java | 64 --
.../commons/rdf/jsonldjava/JsonLdLiteral.java | 101 ---
.../commons/rdf/jsonldjava/JsonLdQuad.java | 55 --
.../commons/rdf/jsonldjava/JsonLdQuadLike.java | 80 --
.../commons/rdf/jsonldjava/JsonLdRDF.java | 319 --------
.../commons/rdf/jsonldjava/JsonLdTerm.java | 51 --
.../commons/rdf/jsonldjava/JsonLdTriple.java | 53 --
.../rdf/jsonldjava/JsonLdTripleLike.java | 32 -
.../rdf/jsonldjava/JsonLdUnionGraph.java | 113 ---
.../jsonldjava/experimental/JsonLdParser.java | 160 ----
.../jsonldjava/experimental/package-info.java | 31 -
.../commons/rdf/jsonldjava/package-info.java | 27 -
.../services/org.apache.commons.rdf.api.RDF | 1 -
jsonld-java/src/main/resources/test.jsonld | 26 -
jsonld-java/src/site/resources/profile.jacoco | 0
.../rdf/jsonldjava/JsonLdBlankNodeTest.java | 41 -
.../rdf/jsonldjava/JsonLdComparisonTest.java | 141 ----
.../rdf/jsonldjava/JsonLdDatasetTest.java | 30 -
.../commons/rdf/jsonldjava/JsonLdGraphTest.java | 30 -
.../rdf/jsonldjava/JsonLdParserBuilderTest.java | 105 ---
.../commons/rdf/jsonldjava/JsonLdRDFTest.java | 54 --
.../rdf/jsonldjava/JsonLdServiceLoaderTest.java | 40 -
pom.xml | 12 +-
rdf4j/README.md | 25 -
rdf4j/pom.xml | 172 ----
.../commons/rdf/rdf4j/ClosableIterable.java | 38 -
.../org/apache/commons/rdf/rdf4j/RDF4J.java | 659 ---------------
.../commons/rdf/rdf4j/RDF4JBlankNode.java | 37 -
.../commons/rdf/rdf4j/RDF4JBlankNodeOrIRI.java | 37 -
.../apache/commons/rdf/rdf4j/RDF4JDataset.java | 142 ----
.../apache/commons/rdf/rdf4j/RDF4JGraph.java | 157 ----
.../commons/rdf/rdf4j/RDF4JGraphLike.java | 66 --
.../org/apache/commons/rdf/rdf4j/RDF4JIRI.java | 34 -
.../apache/commons/rdf/rdf4j/RDF4JLiteral.java | 30 -
.../org/apache/commons/rdf/rdf4j/RDF4JQuad.java | 31 -
.../org/apache/commons/rdf/rdf4j/RDF4JTerm.java | 39 -
.../apache/commons/rdf/rdf4j/RDF4JTriple.java | 30 -
.../commons/rdf/rdf4j/RDF4JTripleLike.java | 43 -
.../rdf/rdf4j/experimental/RDF4JParser.java | 237 ------
.../rdf/rdf4j/experimental/package-info.java | 31 -
.../commons/rdf/rdf4j/impl/AbstractRDFTerm.java | 34 -
.../rdf4j/impl/AbstractRepositoryGraphLike.java | 76 --
.../commons/rdf/rdf4j/impl/BlankNodeImpl.java | 98 ---
.../rdf/rdf4j/impl/ConvertedStatements.java | 71 --
.../apache/commons/rdf/rdf4j/impl/IRIImpl.java | 65 --
.../rdf/rdf4j/impl/InternalRDF4JFactory.java | 184 -----
.../commons/rdf/rdf4j/impl/LiteralImpl.java | 93 ---
.../commons/rdf/rdf4j/impl/ModelGraphImpl.java | 153 ----
.../apache/commons/rdf/rdf4j/impl/QuadImpl.java | 100 ---
.../rdf/rdf4j/impl/RepositoryDatasetImpl.java | 223 ------
.../rdf/rdf4j/impl/RepositoryGraphImpl.java | 194 -----
.../commons/rdf/rdf4j/impl/TripleImpl.java | 78 --
.../apache/commons/rdf/rdf4j/package-info.java | 53 --
.../services/org.apache.commons.rdf.api.RDF | 1 -
rdf4j/src/site/resources/profile.jacoco | 0
.../apache/commons/rdf/rdf4j/BlankNodeTest.java | 37 -
.../apache/commons/rdf/rdf4j/DatasetTest.java | 30 -
.../org/apache/commons/rdf/rdf4j/GraphTest.java | 30 -
.../commons/rdf/rdf4j/MemoryGraphTest.java | 99 ---
.../commons/rdf/rdf4j/MemoryStoreRDFTest.java | 37 -
.../commons/rdf/rdf4j/NativeStoreGraphTest.java | 182 -----
.../rdf/rdf4j/RDF4JMethodOverloadsTest.java | 50 --
.../rdf/rdf4j/RDF4JServiceLoaderTest.java | 40 -
.../org/apache/commons/rdf/rdf4j/RDF4JTest.java | 37 -
simple/pom.xml | 74 --
.../commons/rdf/simple/BlankNodeImpl.java | 113 ---
.../commons/rdf/simple/DatasetGraphView.java | 139 ----
.../apache/commons/rdf/simple/DatasetImpl.java | 214 -----
.../apache/commons/rdf/simple/GraphImpl.java | 179 -----
.../org/apache/commons/rdf/simple/IRIImpl.java | 71 --
.../apache/commons/rdf/simple/LiteralImpl.java | 136 ----
.../org/apache/commons/rdf/simple/QuadImpl.java | 108 ---
.../apache/commons/rdf/simple/SimpleRDF.java | 112 ---
.../rdf/simple/SimpleRDFTermFactory.java | 78 --
.../apache/commons/rdf/simple/TripleImpl.java | 91 ---
.../org/apache/commons/rdf/simple/Types.java | 350 --------
.../simple/experimental/AbstractRDFParser.java | 571 -------------
.../simple/experimental/RDFParseException.java | 50 --
.../rdf/simple/experimental/package-info.java | 31 -
.../apache/commons/rdf/simple/package-info.java | 38 -
simple/src/main/resources/META-INF/LICENSE | 202 -----
simple/src/main/resources/META-INF/NOTICE | 5 -
.../services/org.apache.commons.rdf.api.RDF | 1 -
.../org.apache.commons.rdf.api.RDFTermFactory | 1 -
simple/src/site/resources/profile.jacoco | 0
simple/src/site/resources/profile.japicmp | 0
.../commons/rdf/simple/BlankNodeImplTest.java | 43 -
.../rdf/simple/DummyRDFParserBuilder.java | 93 ---
.../commons/rdf/simple/SimpleDatasetTest.java | 48 --
.../commons/rdf/simple/SimpleGraphTest.java | 47 --
.../commons/rdf/simple/SimpleRDFTest.java | 33 -
.../rdf/simple/SimpleServiceLoaderTest.java | 40 -
.../commons/rdf/simple/TestWritingGraph.java | 152 ----
.../apache/commons/rdf/simple/TypesTest.java | 62 --
.../experimental/AbstractRDFParserTest.java | 279 -------
405 files changed, 20492 insertions(+), 20492 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/d59203ce/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
deleted file mode 100644
index f6e0eed..0000000
--- a/api/pom.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-rdf-parent</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>commons-rdf-api</artifactId>
- <packaging>jar</packaging>
-
- <name>Commons RDF API</name>
- <description>Commons Java API for RDF 1.1</description>
-
- <properties>
- <commons.osgi.symbolicName>org.apache.commons.rdf.api</commons.osgi.symbolicName>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>test-jar</id>
- <!-- Also expose abstract test classes -->
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>org.apache.commons.rdf.api</Bundle-SymbolicName>
- <Automatic-Module-Name>org.apache.commons.rdf.api</Automatic-Module-Name>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <distributionManagement>
- <site>
- <id>commonsrdf-api-site</id>
- <url>scm:svn:${commons.scmPubUrl}/api/</url>
- </site>
- </distributionManagement>
-
-</project>
http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/d59203ce/api/src/main/java/org/apache/commons/rdf/api/BlankNode.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/commons/rdf/api/BlankNode.java b/api/src/main/java/org/apache/commons/rdf/api/BlankNode.java
deleted file mode 100644
index 73f8afe..0000000
--- a/api/src/main/java/org/apache/commons/rdf/api/BlankNode.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.rdf.api;
-
-import java.util.UUID;
-
-/**
- * A <a href= "http://www.w3.org/TR/rdf11-concepts/#dfn-blank-node" >RDF-1.1
- * Blank Node</a>, as defined by
- * <a href= "http://www.w3.org/TR/rdf11-concepts/#section-blank-nodes" >RDF-1.1
- * Concepts and Abstract Syntax</a>, a W3C Recommendation published on 25
- * February 2014.<br>
- *
- * Note: <blockquote>
- * <a href="http://www.w3.org/TR/rdf11-concepts/#dfn-blank-node">Blank nodes</a>
- * are disjoint from IRIs and literals. Otherwise, the set of possible blank
- * nodes is arbitrary. RDF makes no reference to any internal structure of blank
- * nodes. </blockquote>
- *
- * Also note that: <blockquote> <a href=
- * "http://www.w3.org/TR/rdf11-concepts/#dfn-blank-node-identifier">Blank node
- * identifiers</a> are local identifiers that are used in some concrete RDF
- * syntaxes or RDF store implementations. They are always <em>locally
- * scoped</em> to the file or RDF store, and are <em>not</em> persistent or
- * portable identifiers for blank nodes. Blank node identifiers are <em>not</em>
- * part of the RDF abstract syntax, but are entirely dependent on the concrete
- * syntax or implementation. The syntactic restrictions on blank node
- * identifiers, if any, therefore also depend on the concrete RDF syntax or
- * implementation.
- *
- * Implementations that handle blank node identifiers in concrete syntaxes need
- * to be careful not to create the same blank node from multiple occurrences of
- * the same blank node identifier except in situations where this is supported
- * by the syntax. </blockquote>
- *
- * A BlankNode SHOULD contain a {@link UUID}-derived string as part of its
- * universally unique {@link #uniqueReference()}.
- *
- * @see RDF#createBlankNode()
- * @see RDF#createBlankNode(String)
- * @see <a href="http://www.w3.org/TR/rdf11-concepts/#dfn-blank-node">RDF-1.1
- * Blank Node</a>
- */
-public interface BlankNode extends BlankNodeOrIRI {
-
- /**
- * Return a reference for uniquely identifying the blank node.
- * <p>
- * The reference string MUST universally and uniquely identify this blank
- * node. That is, different blank nodes created separately in different JVMs
- * or from different {@link RDF} instances MUST NOT have the same reference
- * string.
- * <p>
- * The {@link #uniqueReference()} of two <code>BlankNode</code> instances
- * MUST be equal if and only if the two blank nodes are equal according to
- * {@link #equals(Object)}.
- * <p>
- * Clients should not assume any particular structure of the reference
- * string, however it is recommended that the reference string contain a
- * UUID-derived string, e.g. as returned from {@link UUID#toString()}.
- * <p>
- * <strong>IMPORTANT:</strong> This is not a
- * <a href="http://www.w3.org/TR/rdf11-concepts/#dfn-blank-node-identifier">
- * blank node identifier</a> nor a serialization/syntax label, and there are
- * no guarantees that it is a valid identifier in any concrete RDF syntax.
- * For an N-Triples compatible identifier, use {@link #ntriplesString()}.
- *
- * @return A universally unique reference to identify this {@link BlankNode}
- */
- String uniqueReference();
-
- /**
- * Check it this BlankNode is equal to another BlankNode. Two BlankNodes
- * MUST be equal if, and only if, they have the same
- * {@link #uniqueReference()}.
- * <p>
- * Implementations MUST also override {@link #hashCode()} so that two equal
- * Literals produce the same hash code.
- *
- * @param other
- * Another object
- * @return true if other is a BlankNode instance that represent the same
- * blank node
- * @see Object#equals(Object)
- */
- @Override
- public boolean equals(Object other);
-
- /**
- * Calculate a hash code for this BlankNode.
- * <p>
- * The returned hash code MUST be equal to the {@link String#hashCode()} of
- * the {@link #uniqueReference()}.
- * <p>
- * This method MUST be implemented in conjunction with
- * {@link #equals(Object)} so that two equal BlankNodes produce the same
- * hash code.
- *
- * @return a hash code value for this BlankNode.
- * @see Object#hashCode()
- */
- @Override
- public int hashCode();
-
-}
http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/d59203ce/api/src/main/java/org/apache/commons/rdf/api/BlankNodeOrIRI.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/commons/rdf/api/BlankNodeOrIRI.java b/api/src/main/java/org/apache/commons/rdf/api/BlankNodeOrIRI.java
deleted file mode 100644
index 1c6c469..0000000
--- a/api/src/main/java/org/apache/commons/rdf/api/BlankNodeOrIRI.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.rdf.api;
-
-/**
- * This interface represents the {@link RDFTerm}s that may be used in the
- * subject position of an RDF-1.1 {@link Triple} as well as the graph name
- * position of a {@link Quad}.
- * <p>
- * Instances of BlankNodeOrIRI SHOULD be a {@link BlankNode} or an {@link IRI}.
- */
-public interface BlankNodeOrIRI extends RDFTerm {
-}
http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/d59203ce/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
deleted file mode 100644
index cea8e5a..0000000
--- a/api/src/main/java/org/apache/commons/rdf/api/Dataset.java
+++ /dev/null
@@ -1,354 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.rdf.api;
-
-import java.util.ConcurrentModificationException;
-import java.util.Iterator;
-import java.util.Optional;
-import java.util.stream.Stream;
-
-/**
- * An <a href="http://www.w3.org/TR/rdf11-concepts/#dfn-rdf-dataset">RDF
- * 1.1 Dataset</a>, a set of RDF quads, as defined by
- * <a href="http://www.w3.org/TR/rdf11-concepts/#section-rdf-dataset">RDF-1.1 Concepts and Abstract
- * Syntax</a>, a W3C Recommendation published on 25 February 2014.
- *
- * @since 0.3.0-incubating
- * @see RDF#createDataset()
- */
-public interface Dataset extends AutoCloseable, GraphLike<Quad> {
-
- /**
- * Add a quad to the dataset, possibly mapping any of the components of the
- * Quad to those supported by this dataset.
- *
- * @param quad
- * The quad to add
- */
- @Override
- void add(Quad quad);
-
- /**
- * Add a quad to the dataset, possibly mapping any of the components to
- * those supported by this dataset.
- *
- * @param graphName
- * The graph the quad belongs to, or <code>null</code> for the
- * default graph
- * @param subject
- * The quad subject
- * @param predicate
- * The quad predicate
- * @param object
- * The quad object
- */
- void add(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object);
-
- /**
- * Check if dataset contains quad.
- *
- * @param quad
- * The quad to check.
- * @return True if the dataset contains the given Quad.
- */
- @Override
- boolean contains(Quad quad);
-
- /**
- * Check if dataset contains a pattern of quads.
- *
- * @param graphName
- * The graph the quad belongs to, wrapped as an {@link Optional}
- * (<code>null</code> is a wildcard, {@link Optional#empty()} is
- * the default graph)
- * @param subject
- * The quad subject (<code>null</code> is a wildcard)
- * @param predicate
- * The quad predicate (<code>null</code> is a wildcard)
- * @param object
- * The quad object (<code>null</code> is a wildcard)
- * @return True if the dataset contains any quads that match the given
- * pattern.
- */
- boolean contains(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object);
-
- /**
- * Close the dataset, relinquishing any underlying resources.
- * <p>
- * For example, this would close any open file and network streams and free
- * database locks held by the dataset implementation.
- * <p>
- * The behaviour of the other dataset methods are undefined after closing
- * the dataset.
- * <p>
- * Implementations might not need {@link #close()}, hence the default
- * implementation does nothing.
- */
- @Override
- default void close() throws Exception {
- }
-
- /**
- * Get the default graph of this dataset.
- * <p>
- * The {@link Triple}s of the default graph are equivalent to the
- * {@link Quad}s in this Dataset which has the {@link Quad#getGraphName()}
- * set to {@link Optional#empty()}.
- * <p>
- * It is unspecified if modifications to the returned Graph are reflected in
- * this Dataset.
- * <p>
- * The returned graph MAY be empty.
- *
- * @see #getGraph(BlankNodeOrIRI)
- * @return The default graph of this Dataset
- */
- Graph getGraph();
-
- /**
- * Get a named graph in this dataset.
- * <p>
- * The {@link Triple}s of the named graph are equivalent to the the Quads of
- * this Dataset which has the {@link Quad#getGraphName()} equal to the
- * provided <code>graphName</code>, or equal to {@link Optional#empty()} if
- * the provided <code>graphName</code> is <code>null</code>.
- * <p>
- * It is unspecified if modifications to the returned Graph are reflected in
- * this Dataset.
- * <p>
- * It is unspecified if requesting an unknown or empty graph will return
- * {@link Optional#empty()} or create a new empty {@link Graph}.
- *
- * @see #getGraph()
- * @see #getGraphNames()
- * @param graphName
- * The name of the graph, or <code>null</code> for the default
- * graph.
- * @return The named Graph, or {@link Optional#empty()} if the dataset do
- * not contain the named graph.
- */
- Optional<Graph> getGraph(BlankNodeOrIRI graphName);
-
- /**
- * Get the graph names in this Dataset.
- * <p>
- * The set of returned graph names is equivalent to the set of unique
- * {@link Quad#getGraphName()} of all the {@link #stream()} of this dataset
- * (excluding the default graph).
- * <p>
- * The returned {@link Stream} SHOULD NOT contain duplicate graph names.
- * <p>
- * The graph names can be used with {@link #getGraph(BlankNodeOrIRI)} to
- * retrieve the corresponding {@link Graph}, however callers should be aware
- * of any concurrent modifications to the Dataset may cause such calls to
- * return {@link Optional#empty()}.
- * <p>
- * Note that a Dataset always contains a <strong>default graph</strong>
- * which is not named, and thus is not represented in the returned Stream.
- * The default graph is accessible via {@link #getGraph()} or by using
- * {@link Optional#empty()} in the Quad access methods).
- *
- * @return A {@link Stream} of the graph names of this Dataset.
- */
- Stream<BlankNodeOrIRI> getGraphNames();
-
- /**
- * Remove a concrete quad from the dataset.
- *
- * @param quad
- * quad to remove
- */
- @Override
- void remove(Quad quad);
-
- /**
- * Remove a concrete pattern of quads from the default graph of the dataset.
- *
- * @param graphName
- * The graph the quad belongs to, wrapped as an {@link Optional}
- * (<code>null</code> is a wildcard, {@link Optional#empty()} is
- * the default graph)
- * @param subject
- * The quad subject (<code>null</code> is a wildcard)
- * @param predicate
- * The quad predicate (<code>null</code> is a wildcard)
- * @param object
- * The quad object (<code>null</code> is a wildcard)
- */
- void remove(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object);
-
- /**
- * Clear the dataset, removing all quads.
- */
- @Override
- void clear();
-
- /**
- * Number of quads contained by the dataset.
- * <p>
- * The count of a set does not include duplicates, consistent with the
- * {@link Quad#equals(Object)} equals method for each {@link Quad}.
- *
- * @return The number of quads in the dataset
- */
- @Override
- long size();
-
- /**
- * Get all quads contained by the dataset.<br>
- * <p>
- * The iteration does not contain any duplicate quads, as determined by the
- * {@link Quad#equals(Object)} method for each {@link Quad}.
- * <p>
- * The behaviour of the {@link Stream} is not specified if
- * {@link #add(Quad)}, {@link #remove(Quad)} or {@link #clear()} are called
- * on the {@link Dataset} before it terminates.
- * <p>
- * Implementations may throw {@link ConcurrentModificationException} from
- * Stream methods if they detect a conflict while the Stream is active.
- *
- * @return A {@link Stream} over all of the quads in the dataset
- */
- @Override
- Stream<? extends Quad> stream();
-
- /**
- * Get all quads contained by the dataset matched with the pattern.
- * <p>
- * The iteration does not contain any duplicate quads, as determined by the
- * {@link Quad#equals(Object)} method for each {@link Quad}.
- * <p>
- * The behaviour of the {@link Stream} is not specified if
- * {@link #add(Quad)}, {@link #remove(Quad)} or {@link #clear()} are called
- * on the {@link Dataset} before it terminates.
- * <p>
- * Implementations may throw {@link ConcurrentModificationException} from
- * Stream methods if they detect a conflict while the Stream is active.
- *
- * @param graphName
- * The graph the quad belongs to, wrapped as an {@link Optional}
- * (<code>null</code> is a wildcard, {@link Optional#empty()} is
- * the default graph)
- * @param subject
- * The quad subject (<code>null</code> is a wildcard)
- * @param predicate
- * The quad predicate (<code>null</code> is a wildcard)
- * @param object
- * The quad object (<code>null</code> is a wildcard)
- * @return A {@link Stream} over the matched quads.
- */
- Stream<? extends Quad> stream(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI subject, IRI predicate,
- RDFTerm object);
-
- /**
- * Get an Iterable for iterating over all quads in the dataset.
- * <p>
- * This method is meant to be used with a Java for-each loop, e.g.:
- *
- * <pre>
- * for (Quad t : dataset.iterate()) {
- * System.out.println(t);
- * }
- * </pre>
- *
- * The behaviour of the iterator is not specified if {@link #add(Quad)},
- * {@link #remove(Quad)} or {@link #clear()}, are called on the
- * {@link Dataset} before it terminates. It is undefined if the returned
- * {@link Iterator} supports the {@link Iterator#remove()} method.
- * <p>
- * Implementations may throw {@link ConcurrentModificationException} from
- * Iterator methods if they detect a concurrency conflict while the Iterator
- * is active.
- * <p>
- * The {@link Iterable#iterator()} must only be called once, that is the
- * Iterable must only be iterated over once. A {@link IllegalStateException}
- * may be thrown on attempt to reuse the Iterable.
- * <p>
- * The default implementation of this method will call {@link #stream()} to
- * return its {@link Stream#iterator()}.
- *
- * @return A {@link Iterable} that returns {@link Iterator} over all of the
- * quads in the dataset
- * @throws IllegalStateException
- * if the {@link Iterable} has been reused
- * @throws ConcurrentModificationException
- * if a concurrency conflict occurs while the Iterator is
- * active.
- */
- @Override
- @SuppressWarnings("unchecked")
- default Iterable<Quad> iterate() throws ConcurrentModificationException, IllegalStateException {
- return ((Stream<Quad>) stream())::iterator;
- }
-
- /**
- * Get an Iterable for iterating over the quads in the dataset that match
- * the pattern.
- * <p>
- * This method is meant to be used with a Java for-each loop, e.g.:
- *
- * <pre>
- * IRI alice = factory.createIRI("http://example.com/alice");
- * IRI knows = factory.createIRI("http://xmlns.com/foaf/0.1/");
- * for (Quad t : dataset.iterate(null, alice, knows, null)) {
- * System.out.println(t.getGraphName());
- * System.out.println(t.getObject());
- * }
- * </pre>
- * <p>
- * The behaviour of the iterator is not specified if {@link #add(Quad)},
- * {@link #remove(Quad)} or {@link #clear()}, are called on the
- * {@link Dataset} before it terminates. It is undefined if the returned
- * {@link Iterator} supports the {@link Iterator#remove()} method.
- * <p>
- * Implementations may throw {@link ConcurrentModificationException} from
- * Iterator methods if they detect a concurrency conflict while the Iterator
- * is active.
- * <p>
- * The {@link Iterable#iterator()} must only be called once, that is the
- * Iterable must only be iterated over once. A {@link IllegalStateException}
- * may be thrown on attempt to reuse the Iterable.
- * <p>
- * The default implementation of this method will call
- * {@link #stream(Optional, BlankNodeOrIRI, IRI, RDFTerm)} to return its
- * {@link Stream#iterator()}.
- *
- * @param graphName
- * The graph the quad belongs to, wrapped as an {@link Optional}
- * (<code>null</code> is a wildcard, {@link Optional#empty()} is
- * the default graph)
- * @param subject
- * The quad subject (<code>null</code> is a wildcard)
- * @param predicate
- * The quad predicate (<code>null</code> is a wildcard)
- * @param object
- * The quad object (<code>null</code> is a wildcard)
- * @return A {@link Iterable} that returns {@link Iterator} over the
- * matching quads in the dataset
- * @throws IllegalStateException
- * if the {@link Iterable} has been reused
- * @throws ConcurrentModificationException
- * if a concurrency conflict occurs while the Iterator is
- * active.
- */
- @SuppressWarnings("unchecked")
- 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/commons-rdf/blob/d59203ce/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
deleted file mode 100644
index 0df5186..0000000
--- a/api/src/main/java/org/apache/commons/rdf/api/Graph.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.rdf.api;
-
-import java.util.ConcurrentModificationException;
-import java.util.Iterator;
-import java.util.stream.Stream;
-
-/**
- * An <a href="http://www.w3.org/TR/rdf11-concepts/#section-rdf-graph"> RDF 1.1
- * Graph</a>, a set of RDF triples, as defined by
- * <a href="http://www.w3.org/TR/rdf11-concepts/" >RDF-1.1 Concepts and Abstract
- * Syntax</a>, a W3C Recommendation published on 25 February 2014.
- *
- * @see RDF#createGraph()
- */
-public interface Graph extends AutoCloseable, GraphLike<Triple> {
-
- /**
- * Add a triple to the graph, possibly mapping any of the components of the
- * Triple to those supported by this Graph.
- *
- * @param triple
- * The triple to add
- */
- @Override
- void add(Triple triple);
-
- /**
- * Add a triple to the graph, possibly mapping any of the components to
- * those supported by this Graph.
- *
- * @param subject
- * The triple subject
- * @param predicate
- * The triple predicate
- * @param object
- * The triple object
- */
- void add(BlankNodeOrIRI subject, IRI predicate, RDFTerm object);
-
- /**
- * Check if graph contains triple.
- *
- * @param triple
- * The triple to check.
- * @return True if the Graph contains the given Triple.
- */
- @Override
- boolean contains(Triple triple);
-
- /**
- * Check if graph contains a pattern of triples.
- *
- * @param subject
- * The triple subject (null is a wildcard)
- * @param predicate
- * The triple predicate (null is a wildcard)
- * @param object
- * The triple object (null is a wildcard)
- * @return True if the Graph contains any Triples that match the given
- * pattern.
- */
- boolean contains(BlankNodeOrIRI subject, IRI predicate, RDFTerm object);
-
- /**
- * Close the graph, relinquishing any underlying resources.
- * <p>
- * For example, this would close any open file and network streams and free
- * database locks held by the Graph implementation.
- * <p>
- * The behaviour of the other Graph methods are undefined after closing the
- * graph.
- * <p>
- * Implementations might not need {@link #close()}, hence the default
- * implementation does nothing.
- */
- @Override
- default void close() throws Exception {
- }
-
- /**
- * Remove a concrete triple from the graph.
- *
- * @param triple
- * triple to remove
- */
- @Override
- void remove(Triple triple);
-
- /**
- * Remove a concrete pattern of triples from the graph.
- *
- * @param subject
- * The triple subject (null is a wildcard)
- * @param predicate
- * The triple predicate (null is a wildcard)
- * @param object
- * The triple object (null is a wildcard)
- */
- void remove(BlankNodeOrIRI subject, IRI predicate, RDFTerm object);
-
- /**
- * Clear the graph, removing all triples.
- */
- @Override
- void clear();
-
- /**
- * Number of triples contained by the graph.
- * <p>
- * The count of a set does not include duplicates, consistent with the
- * {@link Triple#equals(Object)} equals method for each {@link Triple}.
- *
- * @return The number of triples in the graph
- */
- @Override
- long size();
-
- /**
- * Get all triples contained by the graph.<br>
- * <p>
- * The iteration does not contain any duplicate triples, as determined by
- * the {@link Triple#equals(Object)} method for each {@link Triple}.
- * <p>
- * The behaviour of the {@link Stream} is not specified if
- * {@link #add(Triple)}, {@link #remove(Triple)} or {@link #clear()} are
- * called on the {@link Graph} before it terminates.
- * <p>
- * Implementations may throw {@link ConcurrentModificationException} from
- * Stream methods if they detect a conflict while the Stream is active.
- *
- * @since 0.3.0-incubating
- * @return A {@link Stream} over all of the triples in the graph
- */
- @Override
- Stream<? extends Triple> stream();
-
- /**
- * Get all triples contained by the graph matched with the pattern.
- * <p>
- * The iteration does not contain any duplicate triples, as determined by
- * the {@link Triple#equals(Object)} method for each {@link Triple}.
- * <p>
- * The behaviour of the {@link Stream} is not specified if
- * {@link #add(Triple)}, {@link #remove(Triple)} or {@link #clear()} are
- * called on the {@link Graph} before it terminates.
- * <p>
- * Implementations may throw {@link ConcurrentModificationException} from
- * Stream methods if they detect a conflict while the Stream is active.
- * <p>
- *
- * @since 0.3.0-incubating
- * @param subject
- * The triple subject (null is a wildcard)
- * @param predicate
- * The triple predicate (null is a wildcard)
- * @param object
- * The triple object (null is a wildcard)
- * @return A {@link Stream} over the matched triples.
- */
- Stream<? extends Triple> stream(BlankNodeOrIRI subject, IRI predicate, RDFTerm object);
-
- /**
- * This method is deprecated, use the equivalent method {@link #stream()}
- * instead.
- *
- * @return A {@link Stream} over all triples.
- */
- @Deprecated
- default Stream<? extends Triple> getTriples() {
- return stream();
- }
-
- /**
- * This method is deprecated, use the equivalent method
- * {@link #stream(BlankNodeOrIRI, IRI, RDFTerm)} instead.
- *
- * @param subject
- * The triple subject (null is a wildcard)
- * @param predicate
- * The triple predicate (null is a wildcard)
- * @param object
- * The triple object (null is a wildcard)
- * @return A {@link Stream} over the matched triples.
- */
- @Deprecated
- default Stream<? extends Triple> getTriples(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
- return stream(subject, predicate, object);
- }
-
- /**
- * Get an Iterable for iterating over all triples in the graph.
- * <p>
- * This method is meant to be used with a Java for-each loop, e.g.:
- *
- * <pre>
- * for (Triple t : graph.iterate()) {
- * System.out.println(t);
- * }
- * </pre>
- *
- * The behaviour of the iterator is not specified if {@link #add(Triple)},
- * {@link #remove(Triple)} or {@link #clear()}, are called on the
- * {@link Graph} before it terminates. It is undefined if the returned
- * {@link Iterator} supports the {@link Iterator#remove()} method.
- * <p>
- * Implementations may throw {@link ConcurrentModificationException} from
- * Iterator methods if they detect a concurrency conflict while the Iterator
- * is active.
- * <p>
- * The {@link Iterable#iterator()} must only be called once, that is the
- * Iterable must only be iterated over once. A {@link IllegalStateException}
- * may be thrown on attempt to reuse the Iterable.
- * <p>
- * The default implementation of this method will call {@link #stream()} to return
- * its {@link Stream#iterator()}.
- *
- * @return A {@link Iterable} that returns {@link Iterator} over all of the
- * triples in the graph
- * @throws IllegalStateException
- * if the {@link Iterable} has been reused
- * @throws ConcurrentModificationException
- * if a concurrency conflict occurs while the Iterator is
- * active.
- */
- @Override
- @SuppressWarnings("unchecked")
- default Iterable<Triple> iterate() throws ConcurrentModificationException, IllegalStateException {
- return ((Stream<Triple>) stream())::iterator;
- }
-
- /**
- * Get an Iterable for iterating over the triples in the graph that match
- * the pattern.
- * <p>
- * This method is meant to be used with a Java for-each loop, e.g.:
- *
- * <pre>
- * IRI alice = factory.createIRI("http://example.com/alice");
- * IRI knows = factory.createIRI("http://xmlns.com/foaf/0.1/");
- * for (Triple t : graph.iterate(alice, knows, null)) {
- * System.out.println(t.getObject());
- * }
- * </pre>
- * <p>
- * The behaviour of the iterator is not specified if {@link #add(Triple)},
- * {@link #remove(Triple)} or {@link #clear()}, are called on the
- * {@link Graph} before it terminates. It is undefined if the returned
- * {@link Iterator} supports the {@link Iterator#remove()} method.
- * <p>
- * Implementations may throw {@link ConcurrentModificationException} from
- * Iterator methods if they detect a concurrency conflict while the Iterator
- * is active.
- * <p>
- * The {@link Iterable#iterator()} must only be called once, that is the
- * Iterable must only be iterated over once. A {@link IllegalStateException}
- * may be thrown on attempt to reuse the Iterable.
- * <p>
- * The default implementation of this method will call
- * {@link #stream(BlankNodeOrIRI, IRI, RDFTerm)} to return its
- * {@link Stream#iterator()}.
- *
- * @param subject
- * The triple subject (null is a wildcard)
- * @param predicate
- * The triple predicate (null is a wildcard)
- * @param object
- * The triple object (null is a wildcard)
- * @return A {@link Iterable} that returns {@link Iterator} over the
- * matching triples in the graph
- * @throws IllegalStateException
- * if the {@link Iterable} has been reused
- * @throws ConcurrentModificationException
- * if a concurrency conflict occurs while the Iterator is
- * active.
- */
- @SuppressWarnings("unchecked")
- 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/commons-rdf/blob/d59203ce/api/src/main/java/org/apache/commons/rdf/api/GraphLike.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/commons/rdf/api/GraphLike.java b/api/src/main/java/org/apache/commons/rdf/api/GraphLike.java
deleted file mode 100644
index e971801..0000000
--- a/api/src/main/java/org/apache/commons/rdf/api/GraphLike.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.rdf.api;
-
-import java.util.ConcurrentModificationException;
-import java.util.stream.Stream;
-
-/**
- * A "graph-like" interface that contains {@link TripleLike} statements.
- * <p>
- * Extended by {@link Graph} (for {@link Triple}) and {@link Dataset} (for
- * {@link Quad}).
- * <p>
- * Unlike {@link Graph} and {@link Dataset}, this interface can support
- * generalised {@link TripleLike} or {@link QuadLike} statements, but does not
- * imply semantics like {@link #size()} or the requirement of mapping
- * {@link RDFTerm} instances from different implementations.
- * <p>
- * As {@link TripleLike} do not have a specific {@link Object#equals(Object)}
- * semantics, the behaviour of methods like {@link #contains(TripleLike)} and
- * {@link #remove(TripleLike)} is undefined for arguments that are not object
- * identical to previously added or returned {@link TripleLike} statements.
- *
- * @param <T>
- * A {@link TripleLike} type used by the graph methods, typically
- * {@link Triple} or {@link Quad}
- *
- * @since 0.3.0-incubating
- * @see Graph
- * @see Dataset
- * @see TripleLike
- */
-public interface GraphLike<T extends TripleLike> {
-
- /**
- * Add a statement.
- *
- * @param statement
- * The TripleLike statement to add
- */
- void add(T statement);
-
- /**
- * Check if statement is contained.
- *
- * @param statement
- * The {@link TripleLike} statement to check
- * @return True if the statement is contained
- */
- boolean contains(T statement);
-
- /**
- * Add a statement.
- *
- * @param statement
- * The TripleLike statement to add
- */
- void remove(T statement);
-
- /**
- * Remove all statements.
- */
- void clear();
-
- /**
- * Number of statements.
- *
- * @return Number of statements
- */
- long size();
-
- /**
- * Return a Stream of contained statements.
- *
- * @return A {@link Stream} of {@link TripleLike} statements.
- */
- Stream<? extends T> stream();
-
- /**
- * Iterate over contained statements.
- *
- * @return An {@link Iterable} of {@link TripleLike} statements.
- * @throws IllegalStateException
- * if the {@link Iterable} has been reused
- * @throws ConcurrentModificationException
- * if a concurrency conflict occurs while the Iterator is
- * active.
- */
- Iterable<T> iterate() throws ConcurrentModificationException, IllegalStateException;
-
-}
http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/d59203ce/api/src/main/java/org/apache/commons/rdf/api/IRI.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/commons/rdf/api/IRI.java b/api/src/main/java/org/apache/commons/rdf/api/IRI.java
deleted file mode 100644
index 00605bb..0000000
--- a/api/src/main/java/org/apache/commons/rdf/api/IRI.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.rdf.api;
-
-/**
- * An <a href= "http://www.w3.org/TR/rdf11-concepts/#dfn-iri" >RDF-1.1 IRI</a>,
- * as defined by <a href= "http://www.w3.org/TR/rdf11-concepts/#section-IRIs" >RDF-1.1
- * Concepts and Abstract Syntax</a>, a W3C Recommendation published on 25
- * February 2014.
- *
- * @see RDF#createIRI(String)
- */
-public interface IRI extends BlankNodeOrIRI {
-
- /**
- * Return the IRI encoded as a native Unicode String.<br>
- *
- * The returned string must not include URL-encoding to escape non-ASCII
- * characters.
- *
- * @return The IRI encoded as a native Unicode String.
- */
- String getIRIString();
-
- /**
- * Check it this IRI is equal to another IRI. <blockquote>
- * <a href="http://www.w3.org/TR/rdf11-concepts/#section-IRIs">IRI
- * equality</a>: Two IRIs are equal if and only if they are equivalent under
- * Simple String Comparison according to section 5.1 of [RFC3987]. Further
- * normalization MUST NOT be performed when comparing IRIs for equality.
- * </blockquote>
- *
- * Two IRI instances are equal if and only if their {@link #getIRIString()}
- * are equal.
- *
- * Implementations MUST also override {@link #hashCode()} so that two equal
- * IRIs produce the same hash code.
- *
- * @param other
- * Another object
- * @return true if other is an IRI and is equal to this
- * @see Object#equals(Object)
- */
- @Override
- public boolean equals(Object other);
-
- /**
- * Calculate a hash code for this IRI.
- * <p>
- * The returned hash code MUST be equal to the {@link String#hashCode()} of
- * the {@link #getIRIString()}.
- * <p>
- * This method MUST be implemented in conjunction with
- * {@link #equals(Object)} so that two equal IRIs produce the same hash
- * code.
- *
- * @return a hash code value for this IRI.
- * @see Object#hashCode()
- */
- @Override
- public int hashCode();
-}
http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/d59203ce/api/src/main/java/org/apache/commons/rdf/api/Literal.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/commons/rdf/api/Literal.java b/api/src/main/java/org/apache/commons/rdf/api/Literal.java
deleted file mode 100644
index a5a0df6..0000000
--- a/api/src/main/java/org/apache/commons/rdf/api/Literal.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.rdf.api;
-
-import java.io.Serializable;
-import java.util.Locale;
-import java.util.Objects;
-import java.util.Optional;
-
-/**
- * An <a href= "https://www.w3.org/TR/rdf11-concepts/#dfn-literal"
- * >RDF-1.1 Literal</a>, as defined by
- * <a href= "http://www.w3.org/TR/rdf11-concepts/#section-Graph-Literal"
- * >RDF-1.1 Concepts and Abstract Syntax</a>, a W3C Recommendation published on
- * 25 February 2014.
- *
- * @see RDF#createLiteral(String)
- * @see RDF#createLiteral(String, IRI)
- * @see RDF#createLiteral(String, String)
- */
-public interface Literal extends RDFTerm {
-
- /**
- * The lexical form of this literal, represented by a
- * <a href="http://www.unicode.org/versions/latest/">Unicode string</a>.
- *
- * @return The lexical form of this literal.
- * @see <a href=
- * "http://www.w3.org/TR/rdf11-concepts/#dfn-lexical-form">RDF-1.1
- * Literal lexical form</a>
- */
- String getLexicalForm();
-
- /**
- * The IRI identifying the datatype that determines how the lexical form
- * maps to a literal value.
- *
- * If the datatype IRI is
- * <a href="http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
- * >http://www.w3.org/1999/02/22-rdf-syntax-ns#langString</a>,
- * {@link #getLanguageTag()} must not return {@link Optional#empty()}, and
- * it must return a valid
- * <a href="http://tools.ietf.org/html/bcp47">BCP47</a> language tag.
- *
- * @return The datatype IRI for this literal.
- * @see <a href=
- * "http://www.w3.org/TR/rdf11-concepts/#dfn-datatype-iri">RDF-1.1
- * Literal datatype IRI</a>
- */
- IRI getDatatype();
-
- /**
- * If and only if the datatype IRI is
- * <a href="http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
- * >http://www.w3.org/1999/02/22-rdf-syntax-ns#langString</a>, the language
- * tag for this Literal is a non-empty language tag as defined by
- * <a href="http://tools.ietf.org/html/bcp47">BCP47</a>.<br>
- * If the datatype IRI is not
- * <a href="http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
- * >http://www.w3.org/1999/02/22-rdf-syntax-ns#langString</a>, this method
- * must return {@link Optional#empty()}.
- * <p>
- * The value space of language tags is always in lower case; although
- * RDF implementations MAY convert all language tags to lower case,
- * safe comparisons of language tags should be done using
- * {@link String#toLowerCase(Locale)} with the locale
- * {@link Locale#ROOT}.
- * <p>
- * Implementation note: If your application requires {@link Serializable}
- * objects, it is best not to store an {@link Optional} in a field. It is
- * recommended to use {@link Optional#ofNullable(Object)} to create the
- * return value for this method.
- *
- * @return The {@link Optional} language tag for this literal. If
- * {@link Optional#isPresent()} returns true, the value returned by
- * {@link Optional#get()} must be a non-empty language tag string
- * conforming to BCP47.
- * @see <a href=
- * "http://www.w3.org/TR/rdf11-concepts/#dfn-language-tag">RDF-1.1
- * Literal language tag</a>
- */
- Optional<String> getLanguageTag();
-
- /**
- * Check it this Literal is equal to another Literal.
- * <blockquote>
- * <a href="http://www.w3.org/TR/rdf11-concepts/#dfn-literal-term">Literal
- * term equality</a>:
- * Two literals are term-equal (the same RDF literal) if
- * and only if the two lexical forms, the two datatype IRIs, and the two
- * language tags (if any) compare equal, character by character. Thus, two
- * literals can have the same value without being the same RDF term.
- * </blockquote>
- * As the value space for language tags is lower-space, if they are present,
- * they MUST be compared character by character
- * using the equivalent of {@link String#toLowerCase(java.util.Locale)} with
- * the locale {@link Locale#ROOT}.
- * <p>
- * Implementations MUST also override {@link #hashCode()} so that two equal
- * Literals produce the same hash code.
- *
- * @param other
- * Another object
- * @return true if other is a Literal and is equal to this
- * @see Object#equals(Object)
- */
- @Override
- public boolean equals(Object other);
-
- /**
- * Calculate a hash code for this Literal.
- * <p>
- * The returned hash code MUST be equal to the result of
- * {@link Objects#hash(Object...)} with the arguments
- * {@link #getLexicalForm()}, {@link #getDatatype()},
- * {@link #getLanguageTag()}<code>.map(s->s.toLowerString(Locale.ROOT))</code>.
- * <p>
- * This method MUST be implemented in conjunction with
- * {@link #equals(Object)} so that two equal Literals produce the same hash
- * code.
- *
- * @return a hash code value for this Literal.
- * @see Object#hashCode()
- * @see Objects#hash(Object...)
- */
- @Override
- public int hashCode();
-
-}
http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/d59203ce/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
deleted file mode 100644
index c007aff..0000000
--- a/api/src/main/java/org/apache/commons/rdf/api/Quad.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.rdf.api;
-
-import java.util.Objects;
-import java.util.Optional;
-
-/**
- * A Quad is a statement in a
- * <a href= "http://www.w3.org/TR/rdf11-concepts/#section-dataset" >RDF-1.1
- * Dataset</a>, as defined by <a href=
- * "https://www.w3.org/TR/2014/NOTE-rdf11-datasets-20140225/#quad-semantics"
- * >RDF-1.1 Concepts and Abstract Syntax</a>, a W3C Working Group Note published
- * on 25 February 2014.
- * <p>
- * A <code>Quad</code> object in Commons RDF is considered
- * <strong>immutable</strong>, that is, over its life time it will have
- * consistent behaviour for its {@link #equals(Object)}, and the instances
- * returned from {@link #getGraphName()}, {@link #getSubject()},
- * {@link #getPredicate()}, {@link #getObject()} and {@link #asTriple()} will
- * have consistent {@link Object#equals(Object)} behaviour.
- * <p>
- * Note that <code>Quad</code> methods are not required to return object
- * identical (<code>==</code>) instances as long as they are equivalent
- * according to {@link Object#equals(Object)}. Specialisations of
- * <code>Quad</code> may provide additional methods that are documented to be
- * mutable.
- * <p>
- * <code>Quad</code> methods are <strong>thread-safe</strong>, however
- * specialisations may provide additional methods that are documented to not be
- * thread-safe.
- * <p>
- * <code>Quad</code>s can be safely used in hashing collections like
- * {@link java.util.HashSet} and {@link java.util.HashMap}.
- * <p>
- * Any <code>Quad</code> can be used interchangeably across Commons RDF
- * implementations.
- *
- * @since 0.3.0-incubating
- * @see Dataset
- * @see RDF#createQuad(BlankNodeOrIRI,BlankNodeOrIRI,IRI,RDFTerm)
- * @see <a href="http://www.w3.org/TR/2014/NOTE-rdf11-datasets-20140225/">RDF
- * 1.1: On Semantics of RDF Datasets</a>
- * @see <a href="http://www.w3.org/TR/rdf11-concepts/#section-dataset"> </a>
- */
-public interface Quad extends QuadLike<BlankNodeOrIRI> {
-
- /**
- * The graph name (graph label) of this quad, if present.
- *
- * If {@link Optional#isPresent()}, then the {@link Optional#get()} is
- * either a {@link BlankNode} or an {@link IRI}, indicating the
- * <a href="https://www.w3.org/TR/rdf11-concepts/#dfn-named-graph">graph
- * name</a> of this Quad. If the graph name is not present, e.g. the value
- * is {@link Optional#empty()}, it indicates that this Quad is in the
- * <a href="https://www.w3.org/TR/rdf11-concepts/#dfn-default-graph">default
- * graph</a>.
- *
- * @return If {@link Optional#isPresent()}, the graph name
- * {@link BlankNodeOrIRI} of this quad, otherwise
- * {@link Optional#empty()}, indicating the default graph.
- *
- * @see <a href="https://www.w3.org/TR/rdf11-concepts/#dfn-rdf-dataset">RDF-
- * 1.1 Dataset</a>
- */
- @Override
- Optional<BlankNodeOrIRI> getGraphName();
-
- /**
- * The subject of this quad, which may be either a {@link BlankNode} or an
- * {@link IRI}, which are represented in Commons RDF by the interface
- * {@link BlankNodeOrIRI}.
- *
- * @return The subject {@link BlankNodeOrIRI} of this quad.
- * @see <a href="http://www.w3.org/TR/rdf11-concepts/#dfn-subject">RDF-1.1
- * Triple subject</a>
- */
- @Override
- BlankNodeOrIRI getSubject();
-
- /**
- * The predicate {@link IRI} of this quad.
- *
- * @return The predicate {@link IRI} of this quad.
- * @see <a href="http://www.w3.org/TR/rdf11-concepts/#dfn-predicate">RDF-1.1
- * Triple predicate</a>
- */
- @Override
- IRI getPredicate();
-
- /**
- * The object of this quad, which may be either a {@link BlankNode}, an
- * {@link IRI}, or a {@link Literal}, which are represented in Commons RDF
- * by the interface {@link RDFTerm}.
- *
- * @return The object {@link RDFTerm} of this quad.
- * @see <a href="http://www.w3.org/TR/rdf11-concepts/#dfn-object">RDF-1.1
- * Triple object</a>
- */
- @Override
- RDFTerm getObject();
-
- /**
- * Adapt this Quad to a Triple.
- * <p>
- * The returned {@link Triple} will have equivalent values returned from the
- * methods {@link TripleLike#getSubject()},
- * {@link TripleLike#getPredicate()} and {@link TripleLike#getObject()}.
- * <p>
- * The returned {@link Triple} MUST NOT be {@link #equals(Object)} to this
- * {@link Quad}, even if this quad has a default graph
- * {@link #getGraphName()} value of {@link Optional#empty()}, but MUST
- * follow the {@link Triple#equals(Object)} semantics. This means that the
- * following MUST be true:
- *
- * <pre>
- * Quad q1, q2;
- * if (q1.equals(q2)) {
- * assert (q1.asTriple().equals(q2.asTriple()));
- * } else if (q1.asTriple().equals(q2.asTriple())) {
- * assert (q1.getSubject().equals(q2.getSubject()));
- * assert (q1.getPredicate().equals(q2.getPredicate()));
- * assert (q1.getObject().equals(q2.getObject()));
- * assert (!q1.getGraphName().equals(q2.getGraphName()));
- * }
- * </pre>
- *
- * The <code>default</code> implementation of this method return a proxy
- * {@link Triple} instance that keeps a reference to this {@link Quad} to
- * call the underlying {@link TripleLike} methods, but supplies a
- * {@link Triple} compatible implementation of {@link Triple#equals(Object)}
- * and {@link Triple#hashCode()}. Implementations may override this method,
- * e.g. for a more efficient solution.
- *
- * @return A {@link Triple} that contains the same {@link TripleLike}
- * properties as this Quad.
- */
- default Triple asTriple() {
- return new Triple() {
- @Override
- public BlankNodeOrIRI getSubject() {
- return Quad.this.getSubject();
- }
-
- @Override
- public IRI getPredicate() {
- return Quad.this.getPredicate();
- }
-
- @Override
- public RDFTerm getObject() {
- return Quad.this.getObject();
- }
-
- @Override
- public boolean equals(final Object obj) {
- if (obj == this) {
- return true;
- }
- if (!(obj instanceof Triple)) {
- return false;
- }
- final Triple other = (Triple) obj;
- return Objects.equals(getSubject(), other.getSubject())
- && Objects.equals(getPredicate(), other.getPredicate())
- && Objects.equals(getObject(), other.getObject());
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(getSubject(), getPredicate(), getObject());
- }
- };
- }
-
- /**
- * Check it this Quad is equal to another Quad.
- * <p>
- * Two Quads are equal if and only if their {@link #getGraphName()},
- * {@link #getSubject()}, {@link #getPredicate()} and {@link #getObject()}
- * are equal.
- * </p>
- * <p>
- * Implementations MUST also override {@link #hashCode()} so that two equal
- * Quads produce the same hash code.
- * </p>
- * <p>
- * Note that a {@link Quad} MUST NOT be equal to a {@link Triple}, even if
- * this Quad's {@link #getGraphName()} is {@link Optional#empty()}. To test
- * triple-like equivalence, callers can use:
- * </p>
- *
- * <pre>
- * Quad q1;
- * Triple t2;
- * q1.asTriple().equals(t2));
- * </pre>
- *
- * @param other
- * Another object
- * @return true if other is a Quad and is equal to this
- * @see Object#equals(Object)
- */
- @Override
- public boolean equals(Object other);
-
- /**
- * Calculate a hash code for this Quad.
- * <p>
- * The returned hash code MUST be equal to the result of
- * {@link Objects#hash(Object...)} with the arguments {@link #getSubject()},
- * {@link #getPredicate()}, {@link #getObject()}, {@link #getGraphName()}.
- * <p>
- * This method MUST be implemented in conjunction with
- * {@link #equals(Object)} so that two equal {@link Quad}s produce the same
- * hash code.
- *
- * @return a hash code value for this Quad.
- * @see Object#hashCode()
- * @see Objects#hash(Object...)
- */
- @Override
- public int hashCode();
-
-}
http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/d59203ce/api/src/main/java/org/apache/commons/rdf/api/QuadLike.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/commons/rdf/api/QuadLike.java b/api/src/main/java/org/apache/commons/rdf/api/QuadLike.java
deleted file mode 100644
index eab92ec..0000000
--- a/api/src/main/java/org/apache/commons/rdf/api/QuadLike.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.rdf.api;
-
-import java.util.Optional;
-
-/**
- * A generalised "quad-like" interface, extended by {@link Quad}.
- * <p>
- * A QuadLike statement has at least a {@link #getSubject()},
- * {@link #getPredicate()}, {@link #getObject()} and {@link #getGraphName()},
- * but unlike a {@link Quad} does not have a formalised
- * {@link Quad#equals(Object)} or {@link Quad#hashCode()} semantics and is not
- * required to be <em>immutable</em> or <em>thread-safe</em>. This interface can
- * also be used for <em>generalised quads</em> (e.g. a {@link BlankNode} as
- * predicate).
- * <p>
- * Implementations should specialise which specific {@link RDFTerm} types they
- * return by overriding {@link #getSubject()}, {@link #getPredicate()},
- * {@link #getObject()} and {@link #getGraphName()}.
- *
- * @since 0.3.0-incubating
- * @see Quad
- */
-public interface QuadLike<G extends RDFTerm> extends TripleLike {
-
- /**
- * The graph name (graph label) of this statement, if present.
- * <p>
- * If {@link Optional#isPresent()}, then the {@link Optional#get()} indicate
- * the graph name of this statement. If the graph name is not present,e.g.
- * the value is {@link Optional#empty()}, it indicates that this Quad is in
- * the default graph.
- *
- * @return If {@link Optional#isPresent()}, the graph name of this quad,
- * otherwise {@link Optional#empty()}, indicating the default graph.
- * The graph name is typically an {@link IRI} or {@link BlankNode}.
- */
- Optional<G> getGraphName();
-
-}