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 2A980200B9A for ; Fri, 7 Oct 2016 16:22:21 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 294B4160AE8; Fri, 7 Oct 2016 14:22:21 +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 CF8D2160AF1 for ; Fri, 7 Oct 2016 16:22:19 +0200 (CEST) Received: (qmail 42027 invoked by uid 500); 7 Oct 2016 14:22:19 -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 41902 invoked by uid 99); 7 Oct 2016 14:22:19 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Oct 2016 14:22:19 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 975D6180532 for ; Fri, 7 Oct 2016 14:22:18 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-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-us.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id Mme66dMZ5vCA for ; Fri, 7 Oct 2016 14:22:16 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id E87065FD0A for ; Fri, 7 Oct 2016 14:22:15 +0000 (UTC) Received: (qmail 40776 invoked by uid 99); 7 Oct 2016 14:22:15 -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; Fri, 07 Oct 2016 14:22:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 10415E09D0; Fri, 7 Oct 2016 14:22:15 +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: Fri, 07 Oct 2016 14:22:42 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [29/50] incubator-commonsrdf git commit: Jena javadocs archived-at: Fri, 07 Oct 2016 14:22:21 -0000 Jena javadocs Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/eb391f86 Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/eb391f86 Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/eb391f86 Branch: refs/heads/master Commit: eb391f860b1aa223ae11e114d828e1f463d6fee3 Parents: b0c55bd Author: Stian Soiland-Reyes Authored: Thu Sep 29 01:10:11 2016 +0100 Committer: Stian Soiland-Reyes Committed: Thu Sep 29 01:10:11 2016 +0100 ---------------------------------------------------------------------- .../commons/rdf/jena/JenaRDFTermFactory.java | 20 ++++++++++++++++---- .../commons/rdf/jena/impl/JenaFactory.java | 5 ++--- pom.xml | 6 ++++++ 3 files changed, 24 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/eb391f86/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java ---------------------------------------------------------------------- diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java index bde5bc4..1c1be7f 100644 --- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java +++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java @@ -96,7 +96,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory { } @Override - public Dataset createDataset() { + public JenaDataset createDataset() { return JenaFactory.createDataset(getSalt()); } @@ -133,7 +133,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory { } @Override - public Quad createQuad(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) + public JenaQuad createQuad(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) throws IllegalArgumentException, UnsupportedOperationException { return JenaFactory.createQuad(subject, predicate, object, graphName); } @@ -451,7 +451,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory { * Jena quad * @return Adapted quad */ - public Quad fromJena(org.apache.jena.sparql.core.Quad quad) { + public JenaQuad fromJena(org.apache.jena.sparql.core.Quad quad) { return JenaFactory.fromJena(quad, getSalt()); } @@ -469,7 +469,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory { * A {@link UUID} salt for adapting any {@link BlankNode}s * @return Adapted quad */ - public static Quad fromJena(org.apache.jena.sparql.core.Quad quad, UUID salt) { + public static JenaQuad fromJena(org.apache.jena.sparql.core.Quad quad, UUID salt) { return JenaFactory.fromJena(quad, salt); } @@ -652,10 +652,22 @@ public final class JenaRDFTermFactory implements RDFTermFactory { return factory.createQuad(graphName, subject, predicate, object); } + /** + * Return {@link RDFSyntax} corresponding to a Jena {@link Lang}. + * + * @param lang {@link Lang} to convert + * @return Matched {@link RDFSyntax}, otherwise {@link Optional#empty()} + */ public static Optional langToRdfSyntax(Lang lang) { return RDFSyntax.byMediaType(lang.getContentType().getContentType()); } + /** + * Return Jena {@link Lang} corresponding to a {@link RDFSyntax. + * + * @param lang {@link RDFSyntax} to convert + * @return Matched {@link Lang}, otherwise {@link Optional#empty()} + */ public static Optional rdfSyntaxToLang(RDFSyntax rdfSyntax) { return Optional.ofNullable(RDFLanguages.contentTypeToLang(rdfSyntax.mediaType)); } http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/eb391f86/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaFactory.java ---------------------------------------------------------------------- diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaFactory.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaFactory.java index 0551094..3fb3c3f 100644 --- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaFactory.java +++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaFactory.java @@ -23,7 +23,6 @@ import java.util.UUID; import org.apache.commons.rdf.api.BlankNode; import org.apache.commons.rdf.api.BlankNodeOrIRI; -import org.apache.commons.rdf.api.Dataset; import org.apache.commons.rdf.api.IRI; import org.apache.commons.rdf.api.Quad; import org.apache.commons.rdf.api.RDFTerm; @@ -68,7 +67,7 @@ public class JenaFactory { public static JenaBlankNode createBlankNode(UUID salt) { return new JenaBlankNodeImpl(NodeFactory.createBlankNode(), salt); } - public static Dataset createDataset(UUID salt) { + public static JenaDataset createDataset(UUID salt) { DatasetGraph dg = DatasetGraphFactory.createGeneral(); // Or which createMethod() -- a bit confusing with lots of choice.. return new JenaDatasetImpl(dg, salt); @@ -168,7 +167,7 @@ public class JenaFactory { return new JenaGeneralizedQuad(quad, salt); } - public static Quad fromJena(org.apache.jena.sparql.core.Quad quad, UUID salt) { + public static JenaQuad fromJena(org.apache.jena.sparql.core.Quad quad, UUID salt) { return new JenaQuadImpl(quad, salt); } http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/eb391f86/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0dda6a7..512946c 100644 --- a/pom.xml +++ b/pom.xml @@ -286,6 +286,12 @@ -Xdoclint:all + + ${commons.javadoc.java.link} + https://jena.apache.org/documentation/javadoc/jena/ + https://jena.apache.org/documentation/javadoc/arq/ + http://rdf4j.org/javadoc/2.0/ +