You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commonsrdf.apache.org by st...@apache.org on 2016/10/03 16:40:42 UTC
[46/50] incubator-commonsrdf git commit: COMMONSRDF-36 JsonLd*Impl
made package protected
COMMONSRDF-36 JsonLd*Impl made package protected
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/492ea230
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/492ea230
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/492ea230
Branch: refs/heads/master
Commit: 492ea2302fe8503a07fd2fbf1cf115234945e315
Parents: 043a061
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Sep 28 14:47:32 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Sep 28 14:47:32 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/jsonldjava/JsonLdBlankNode.java | 2 +-
.../commons/rdf/jsonldjava/JsonLdDataset.java | 15 ++++++-----
.../commons/rdf/jsonldjava/JsonLdGraph.java | 12 ++++++---
.../commons/rdf/jsonldjava/JsonLdGraphLike.java | 22 +++++++++++----
.../commons/rdf/jsonldjava/JsonLdIRI.java | 3 +--
.../commons/rdf/jsonldjava/JsonLdLiteral.java | 3 +--
.../commons/rdf/jsonldjava/JsonLdQuad.java | 7 ++---
.../commons/rdf/jsonldjava/JsonLdQuadLike.java | 2 +-
.../rdf/jsonldjava/JsonLdRDFTermFactory.java | 28 +++++++++-----------
.../commons/rdf/jsonldjava/JsonLdTerm.java | 3 ++-
.../commons/rdf/jsonldjava/JsonLdTriple.java | 5 ++--
.../rdf/jsonldjava/JsonLdUnionGraph.java | 12 +++++----
12 files changed, 65 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/492ea230/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 e54c894..b079c14 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
@@ -22,6 +22,7 @@ import org.apache.commons.rdf.api.BlankNode;
import com.github.jsonldjava.core.RDFDataset.Node;
public interface JsonLdBlankNode extends JsonLdTerm, BlankNode {
+}
final class JsonLdBlankNodeImpl extends JsonLdTermImpl implements JsonLdBlankNode {
private String blankNodePrefix;
@@ -59,4 +60,3 @@ public interface JsonLdBlankNode extends JsonLdTerm, BlankNode {
}
}
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/492ea230/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 55b9f3c..8774cdc 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
@@ -32,17 +32,20 @@ import org.apache.commons.rdf.api.RDFTerm;
import com.github.jsonldjava.core.RDFDataset;
-public class JsonLdDataset extends JsonLdGraphLike<org.apache.commons.rdf.api.Quad> implements Dataset {
+public interface JsonLdDataset extends JsonLdGraphLike<org.apache.commons.rdf.api.Quad>, Dataset {
+}
+
+class JsonLdDatasetImpl extends AbstractJsonLdGraphLike<org.apache.commons.rdf.api.Quad> implements JsonLdDataset {
- JsonLdDataset(RDFDataset rdfDataSet) {
+ JsonLdDatasetImpl(RDFDataset rdfDataSet) {
super(rdfDataSet);
}
- JsonLdDataset(RDFDataset rdfDataset, String bnodePrefix) {
+ JsonLdDatasetImpl(RDFDataset rdfDataset, String bnodePrefix) {
super(rdfDataset, bnodePrefix);
}
- JsonLdDataset(String bnodePrefix) {
+ JsonLdDatasetImpl(String bnodePrefix) {
super(bnodePrefix);
}
@@ -58,7 +61,7 @@ public class JsonLdDataset extends JsonLdGraphLike<org.apache.commons.rdf.api.Qu
@Override
public Graph getGraph() {
- return new JsonLdGraph(rdfDataSet, Optional.empty(), bnodePrefix);
+ return new JsonLdGraphImpl(rdfDataSet, Optional.empty(), bnodePrefix);
}
@Override
@@ -67,7 +70,7 @@ public class JsonLdDataset extends JsonLdGraphLike<org.apache.commons.rdf.api.Qu
return Optional.of(getGraph());
}
return getGraphNames()
- .map(g -> (Graph)new JsonLdGraph(rdfDataSet, Optional.of(g), bnodePrefix))
+ .map(g -> (Graph)new JsonLdGraphImpl(rdfDataSet, Optional.of(g), bnodePrefix))
.findAny();
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/492ea230/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 206c82a..0a59cc3 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
@@ -34,21 +34,25 @@ import com.github.jsonldjava.core.RDFDataset;
* A {@link Graph} view of a JsonLd {@link RDFDataset}.
*
*/
-public class JsonLdGraph extends JsonLdGraphLike<org.apache.commons.rdf.api.Triple> implements Graph {
+public interface JsonLdGraph extends JsonLdGraphLike<org.apache.commons.rdf.api.Triple>, Graph {
+}
+
+class JsonLdGraphImpl extends AbstractJsonLdGraphLike<org.apache.commons.rdf.api.Triple>
+ implements JsonLdGraph {
private final Optional<BlankNodeOrIRI> graphName;
- JsonLdGraph(RDFDataset rdfDataSet) {
+ JsonLdGraphImpl(RDFDataset rdfDataSet) {
super(rdfDataSet);
this.graphName = Optional.empty();
}
- JsonLdGraph(RDFDataset rdfDataSet, Optional<BlankNodeOrIRI> graphName, String bnodePrefix) {
+ JsonLdGraphImpl(RDFDataset rdfDataSet, Optional<BlankNodeOrIRI> graphName, String bnodePrefix) {
super(rdfDataSet, bnodePrefix);
this.graphName = Objects.requireNonNull(graphName);
}
- JsonLdGraph(String bnodePrefix) {
+ JsonLdGraphImpl(String bnodePrefix) {
super(bnodePrefix);
this.graphName = Optional.empty();
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/492ea230/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 cb8e568..dced9cc 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
@@ -43,8 +43,20 @@ import com.github.jsonldjava.core.RDFDataset.Node;
*
* @param <T> specialisation of {@link TripleLike}, e.g. {@link Triple} or {@link Quad}
*/
-abstract class JsonLdGraphLike<T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm>>
- implements GraphLike<T, BlankNodeOrIRI, IRI, RDFTerm> {
+public interface JsonLdGraphLike <T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm>>
+ extends GraphLike<T, BlankNodeOrIRI, IRI, RDFTerm> {
+ /**
+ * Return the underlying JSONLD-Java {@link RDFDataset}.
+ * <p>
+ * Changes in the JSONLD-Java dataset is reflected in this class and vice
+ * versa.
+ *
+ */
+ public RDFDataset getRdfDataSet();
+}
+
+abstract class AbstractJsonLdGraphLike<T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm>>
+ implements JsonLdGraphLike<T> {
/**
* Used by {@link #bnodePrefix()} to get a unique UUID per JVM run
@@ -66,17 +78,17 @@ abstract class JsonLdGraphLike<T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm
*/
RDFDataset rdfDataSet;
- JsonLdGraphLike(RDFDataset rdfDataSet) {
+ AbstractJsonLdGraphLike(RDFDataset rdfDataSet) {
this(rdfDataSet, "urn:uuid:" + SALT + "#" + "g"+ System.identityHashCode(rdfDataSet));
}
- JsonLdGraphLike(RDFDataset rdfDataSet, String bnodePrefix) {
+ AbstractJsonLdGraphLike(RDFDataset rdfDataSet, String bnodePrefix) {
this.rdfDataSet = Objects.requireNonNull(rdfDataSet);
this.bnodePrefix = Objects.requireNonNull(bnodePrefix);
this.factory = new JsonLdRDFTermFactory(bnodePrefix);
}
- JsonLdGraphLike(String bnodePrefix) {
+ AbstractJsonLdGraphLike(String bnodePrefix) {
this(new RDFDataset(), bnodePrefix);
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/492ea230/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 aac13e6..dc94401 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
@@ -23,6 +23,7 @@ import com.github.jsonldjava.core.RDFDataset;
import com.github.jsonldjava.core.RDFDataset.Node;
public interface JsonLdIRI extends JsonLdTerm, IRI {
+}
final class JsonLdIRIImpl extends JsonLdTermImpl implements JsonLdIRI {
@@ -61,5 +62,3 @@ public interface JsonLdIRI extends JsonLdTerm, IRI {
return node.getValue().equals(other.getIRIString());
}
}
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/492ea230/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 8eba6e7..01dff6f 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
@@ -23,11 +23,11 @@ import java.util.Optional;
import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.Literal;
import org.apache.commons.rdf.simple.Types;
-import org.apache.commons.rdf.jsonldjava.JsonLdIRI.JsonLdIRIImpl;
import com.github.jsonldjava.core.RDFDataset.Node;
public interface JsonLdLiteral extends JsonLdTerm, Literal {
+}
class JsonLdLiteralImpl extends JsonLdTermImpl implements JsonLdLiteral {
@@ -97,4 +97,3 @@ public interface JsonLdLiteral extends JsonLdTerm, Literal {
}
}
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/492ea230/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 524f43c..d9a26b3 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
@@ -23,17 +23,19 @@ import org.apache.commons.rdf.api.BlankNodeOrIRI;
import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.RDFTerm;
// Note: To avoid confusion - don't import either Quad
-import org.apache.commons.rdf.jsonldjava.JsonLdQuadLike.JsonLdQuadLikeImpl;
public interface JsonLdQuad extends org.apache.commons.rdf.api.Quad {
+
/**
* Return the underlying JsonLD {@link com.github.jsonldjava.core.RDFDataset.Quad}
*
* @return The JsonLD {@link com.github.jsonldjava.core.RDFDataset.Quad}
*/
public com.github.jsonldjava.core.RDFDataset.Quad asJsonLdQuad();
-
+
+}
+
final class JsonLdQuadImpl extends JsonLdQuadLikeImpl<BlankNodeOrIRI,IRI,RDFTerm,BlankNodeOrIRI>
implements JsonLdQuad {
@@ -62,4 +64,3 @@ public interface JsonLdQuad extends org.apache.commons.rdf.api.Quad {
}
}
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/492ea230/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 224dc30..12fb95d 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
@@ -27,6 +27,7 @@ import com.github.jsonldjava.core.RDFDataset.Quad;
public interface JsonLdQuadLike<S extends RDFTerm, P extends RDFTerm, O extends RDFTerm, G extends RDFTerm> extends QuadLike<S,P,O,G> {
public Quad asJsonLdQuad();
+}
class JsonLdQuadLikeImpl<S extends RDFTerm, P extends RDFTerm, O extends RDFTerm, G extends RDFTerm> implements JsonLdQuadLike<S,P,O,G> {
@@ -72,4 +73,3 @@ public interface JsonLdQuadLike<S extends RDFTerm, P extends RDFTerm, O extends
}
}
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/492ea230/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
index 310fd24..2e586f9 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
@@ -30,10 +30,6 @@ import org.apache.commons.rdf.api.Literal;
import org.apache.commons.rdf.api.RDFTerm;
import org.apache.commons.rdf.api.RDFTermFactory;
import org.apache.commons.rdf.api.Triple;
-import org.apache.commons.rdf.jsonldjava.JsonLdBlankNode.JsonLdBlankNodeImpl;
-import org.apache.commons.rdf.jsonldjava.JsonLdLiteral.JsonLdLiteralImpl;
-import org.apache.commons.rdf.jsonldjava.JsonLdQuad.JsonLdQuadImpl;
-import org.apache.commons.rdf.jsonldjava.JsonLdTriple.JsonLdTripleImpl;
import org.apache.commons.rdf.simple.Types;
import com.github.jsonldjava.core.RDFDataset;
@@ -62,8 +58,8 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
* @param rdfDataSet JsonLd {@link RDFDataset} to adapt
* @return Adapted {@link Dataset}
*/
- public Dataset asDataset(RDFDataset rdfDataSet) {
- return new JsonLdDataset(rdfDataSet);
+ public JsonLdDataset asDataset(RDFDataset rdfDataSet) {
+ return new JsonLdDatasetImpl(rdfDataSet);
}
/**
@@ -81,8 +77,8 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
* @param rdfDataSet JsonLd {@link RDFDataset} to adapt
* @return Adapted {@link Graph} covering the <em>default graph</em>
*/
- public Graph asGraph(RDFDataset rdfDataSet) {
- return new JsonLdGraph(rdfDataSet);
+ public JsonLdGraph asGraph(RDFDataset rdfDataSet) {
+ return new JsonLdGraphImpl(rdfDataSet);
}
public Node asJsonLdNode(RDFTerm term) {
@@ -202,8 +198,8 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
* @param rdfDataSet JsonLd {@link RDFDataset} to adapt
* @return Adapted {@link Dataset}
*/
- public Graph asUnionGraph(RDFDataset rdfDataSet) {
- return new JsonLdUnionGraph(rdfDataSet);
+ public JsonLdUnionGraph asUnionGraph(RDFDataset rdfDataSet) {
+ return new JsonLdUnionGraphImpl(rdfDataSet);
}
@Override
@@ -220,18 +216,18 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
}
@Override
- public Dataset createDataset() {
- return new JsonLdDataset(bnodePrefix);
+ public JsonLdDataset createDataset() {
+ return new JsonLdDatasetImpl(bnodePrefix);
}
@Override
- public Graph createGraph() {
- return new JsonLdGraph(bnodePrefix);
+ public JsonLdGraph createGraph() {
+ return new JsonLdGraphImpl(bnodePrefix);
}
@Override
public JsonLdIRI createIRI(String iri) {
- return new JsonLdIRI.JsonLdIRIImpl(iri);
+ return new JsonLdIRIImpl(iri);
}
@Override
@@ -288,7 +284,7 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
return null; // e.g. default graph
}
if (node.isIRI()) {
- return new JsonLdIRI.JsonLdIRIImpl(node);
+ return new JsonLdIRIImpl(node);
} else if (node.isBlankNode()) {
return new JsonLdBlankNodeImpl(node, blankNodePrefix);
} else if (node.isLiteral()) {
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/492ea230/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 2f250b9..62138d2 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
@@ -29,6 +29,7 @@ public interface JsonLdTerm extends RDFTerm {
* @return JsonLd {@link Node}
*/
Node asJsonLdNode();
+}
abstract class JsonLdTermImpl implements JsonLdTerm {
final Node node;
@@ -40,4 +41,4 @@ public interface JsonLdTerm extends RDFTerm {
}
}
-}
+
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/492ea230/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 18e271c..68fe9c0 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
@@ -23,7 +23,6 @@ import org.apache.commons.rdf.api.BlankNodeOrIRI;
import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.RDFTerm;
import org.apache.commons.rdf.api.Triple;
-import org.apache.commons.rdf.jsonldjava.JsonLdQuadLike.JsonLdQuadLikeImpl;
import com.github.jsonldjava.core.RDFDataset.Quad;
@@ -35,7 +34,8 @@ public interface JsonLdTriple extends Triple {
* @return The JsonLD {@link com.github.jsonldjava.core.RDFDataset.Quad}
*/
public com.github.jsonldjava.core.RDFDataset.Quad asJsonLdQuad();
-
+}
+
final class JsonLdTripleImpl extends JsonLdQuadLikeImpl<BlankNodeOrIRI, IRI, RDFTerm, RDFTerm>
implements JsonLdTriple {
@@ -59,4 +59,3 @@ public interface JsonLdTriple extends Triple {
return Objects.hash(getSubject(), getPredicate(), getObject());
}
}
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/492ea230/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 46598ed..81b669a 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
@@ -46,17 +46,20 @@ import com.github.jsonldjava.core.RDFDataset;
* inefficient as they skip any duplicate triples from multiple
* graphs.
*/
-class JsonLdUnionGraph extends JsonLdGraphLike<org.apache.commons.rdf.api.Triple> implements Graph {
+public interface JsonLdUnionGraph extends JsonLdGraphLike<org.apache.commons.rdf.api.Triple>, Graph {
+}
+
+class JsonLdUnionGraphImpl extends AbstractJsonLdGraphLike<org.apache.commons.rdf.api.Triple> implements JsonLdUnionGraph {
- JsonLdUnionGraph(String bnodePrefix) {
+ JsonLdUnionGraphImpl(String bnodePrefix) {
super(bnodePrefix);
}
- JsonLdUnionGraph(RDFDataset rdfDataSet) {
+ JsonLdUnionGraphImpl(RDFDataset rdfDataSet) {
super(rdfDataSet);
}
- JsonLdUnionGraph(RDFDataset rdfDataSet, String bnodePrefix) {
+ JsonLdUnionGraphImpl(RDFDataset rdfDataSet, String bnodePrefix) {
super(rdfDataSet, bnodePrefix);
}
@@ -111,6 +114,5 @@ class JsonLdUnionGraph extends JsonLdGraphLike<org.apache.commons.rdf.api.Triple
// Note: Our specialized stream() already removes duplicates using .distinct()
return stream().count();
}
-
}