Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 112DB200B98 for ; Mon, 3 Oct 2016 18:40:07 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 10252160ADC; Mon, 3 Oct 2016 16:40:07 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 07BA1160ACD for ; Mon, 3 Oct 2016 18:40:05 +0200 (CEST) Received: (qmail 88468 invoked by uid 500); 3 Oct 2016 16:40:05 -0000 Mailing-List: contact commits-help@commonsrdf.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commonsrdf.incubator.apache.org Delivered-To: mailing list commits@commonsrdf.incubator.apache.org Received: (qmail 88419 invoked by uid 99); 3 Oct 2016 16:40:05 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Oct 2016 16:40:05 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id C208ECC13B for ; Mon, 3 Oct 2016 16:40:04 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.219 X-Spam-Level: X-Spam-Status: No, score=-6.219 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id ii7-anoT4hch for ; Mon, 3 Oct 2016 16:40:03 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id A68F660D62 for ; Mon, 3 Oct 2016 16:40:01 +0000 (UTC) Received: (qmail 86776 invoked by uid 99); 3 Oct 2016 16:39:58 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Oct 2016 16:39:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 42783E00D6; Mon, 3 Oct 2016 16:39:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stain@apache.org To: commits@commonsrdf.incubator.apache.org Date: Mon, 03 Oct 2016 16:40:22 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [26/50] incubator-commonsrdf git commit: import of JsonLd*Impl archived-at: Mon, 03 Oct 2016 16:40:07 -0000 import of JsonLd*Impl Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/f2bcb3d2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/f2bcb3d2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/f2bcb3d2 Branch: refs/heads/master Commit: f2bcb3d23079b5b3eeeb2889d4346142ea2772c7 Parents: a87270a Author: Stian Soiland-Reyes Authored: Fri Sep 9 09:48:37 2016 +0100 Committer: Stian Soiland-Reyes Committed: Fri Sep 9 09:48:37 2016 +0100 ---------------------------------------------------------------------- .../commons/rdf/jsonldjava/JsonLdLiteral.java | 3 ++- .../rdf/jsonldjava/JsonLdRDFTermFactory.java | 25 ++++++++++++-------- 2 files changed, 17 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/f2bcb3d2/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 025128e..befc410 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,6 +23,7 @@ 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; @@ -65,7 +66,7 @@ public interface JsonLdLiteral extends JsonLdTerm, Literal { @Override public IRI getDatatype() { - return new JsonLdIRI.JsonLdIRIImpl(node.getDatatype()); + return new JsonLdIRIImpl(node.getDatatype()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/f2bcb3d2/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 12ab13d..607e319 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,11 +30,16 @@ import org.apache.commons.rdf.api.RDFTermFactory; import org.apache.commons.rdf.api.Triple; import org.apache.commons.rdf.api.TripleLike; import org.apache.commons.rdf.simple.Types; +import org.apache.commons.rdf.jsonldjava.JsonLdBlankNode.JsonLdBlankNodeImpl; +import org.apache.commons.rdf.jsonldjava.JsonLdTriple.JsonLdTripleImpl; +import org.apache.commons.rdf.jsonldjava.JsonLdQuad.JsonLdQuadImpl; +import org.apache.commons.rdf.jsonldjava.JsonLdLiteral.JsonLdLiteralImpl; import com.github.jsonldjava.core.RDFDataset; import com.github.jsonldjava.core.RDFDataset.Node; -final class JsonLdRDFTermFactory implements RDFTermFactory { + +public final class JsonLdRDFTermFactory implements RDFTermFactory { public JsonLdRDFTermFactory() { // An "outside Graph" bnodePrefix @@ -60,41 +65,41 @@ final class JsonLdRDFTermFactory implements RDFTermFactory { @Override public JsonLdBlankNode createBlankNode() { String id = "_:" + UUID.randomUUID().toString(); - return new JsonLdBlankNode.JsonLdBlankNodeImpl(new RDFDataset.BlankNode(id), bnodePrefix); + return new JsonLdBlankNodeImpl(new RDFDataset.BlankNode(id), bnodePrefix); } @Override public JsonLdBlankNode createBlankNode(String name) { String id = "_:" + name; // TODO: Check if name is valid JSON-LD BlankNode identifier - return new JsonLdBlankNode.JsonLdBlankNodeImpl(new RDFDataset.BlankNode(id), bnodePrefix); + return new JsonLdBlankNodeImpl(new RDFDataset.BlankNode(id), bnodePrefix); } @Override public JsonLdTriple createTriple(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) { - return new JsonLdTriple.JsonLdTripleImpl(asJsonLdQuad(subject, predicate, object), bnodePrefix); + return new JsonLdTripleImpl(asJsonLdQuad(subject, predicate, object), bnodePrefix); } public Triple asTriple(final RDFDataset.Quad quad) { - return new JsonLdTriple.JsonLdTripleImpl(quad, bnodePrefix); + return new JsonLdTripleImpl(quad, bnodePrefix); } @Override public JsonLdQuad createQuad(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) throws IllegalArgumentException, UnsupportedOperationException { - return new JsonLdQuad.JsonLdQuadImpl(asJsonLdQuad(graphName, subject, predicate, object), bnodePrefix); + return new JsonLdQuadImpl(asJsonLdQuad(graphName, subject, predicate, object), bnodePrefix); } @Override public JsonLdLiteral createLiteral(String literal) { - return new JsonLdLiteral.JsonLdLiteralImpl(new RDFDataset.Literal(literal, null, null)); + return new JsonLdLiteralImpl(new RDFDataset.Literal(literal, null, null)); } @Override public JsonLdLiteral createLiteral(String literal, IRI dataType) { - return new JsonLdLiteral.JsonLdLiteralImpl(new RDFDataset.Literal(literal, dataType.getIRIString(), null)); } + return new JsonLdLiteralImpl(new RDFDataset.Literal(literal, dataType.getIRIString(), null)); } @Override public JsonLdLiteral createLiteral(String literal, String language) { - return new JsonLdLiteral.JsonLdLiteralImpl(new RDFDataset.Literal(literal, Types.RDF_LANGSTRING.getIRIString(), language)); + return new JsonLdLiteralImpl(new RDFDataset.Literal(literal, Types.RDF_LANGSTRING.getIRIString(), language)); } @@ -151,7 +156,7 @@ final class JsonLdRDFTermFactory implements RDFTermFactory { if (node.isIRI()) { return new JsonLdIRI.JsonLdIRIImpl(node); } else if (node.isBlankNode()) { - return new JsonLdBlankNode.JsonLdBlankNodeImpl(node, blankNodePrefix); + return new JsonLdBlankNodeImpl(node, blankNodePrefix); } else if (node.isLiteral()) { // TODO: Our own JsonLdLiteral if (node.getLanguage() != null) {