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 2CA11200B38 for ; Fri, 8 Jul 2016 13:53:52 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2B51E160A7D; Fri, 8 Jul 2016 11:53:52 +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 537C1160A58 for ; Fri, 8 Jul 2016 13:53:51 +0200 (CEST) Received: (qmail 76263 invoked by uid 500); 8 Jul 2016 11:53:50 -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 76254 invoked by uid 99); 8 Jul 2016 11:53:50 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Jul 2016 11:53:50 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 0585E1A5274 for ; Fri, 8 Jul 2016 11:53:49 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 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=-1.426] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id G6VqPbVc14kY for ; Fri, 8 Jul 2016 11:53:48 +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 48CCC5FBBD for ; Fri, 8 Jul 2016 11:53:47 +0000 (UTC) Received: (qmail 76195 invoked by uid 99); 8 Jul 2016 11:53:46 -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, 08 Jul 2016 11:53:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2FD3AEC22C; Fri, 8 Jul 2016 11:53:46 +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, 08 Jul 2016 11:53:53 -0000 Message-Id: <008580c8ac454b56b40f29ccbbd84b0b@git.apache.org> In-Reply-To: <1e02012c62714fa082a213c5074909af@git.apache.org> References: <1e02012c62714fa082a213c5074909af@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [9/9] incubator-commonsrdf git commit: javadoc improvements archived-at: Fri, 08 Jul 2016 11:53:52 -0000 javadoc improvements Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/0f349723 Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/0f349723 Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/0f349723 Branch: refs/heads/jena Commit: 0f349723de52c5a9cbc78f70edd41f40c355631b Parents: 0475259 Author: Stian Soiland-Reyes Authored: Fri Jul 8 12:53:32 2016 +0100 Committer: Stian Soiland-Reyes Committed: Fri Jul 8 12:53:32 2016 +0100 ---------------------------------------------------------------------- .../java/org/apache/commons/rdf/jena/JenaAny.java | 16 ++++++++++++++++ .../org/apache/commons/rdf/jena/JenaBlankNode.java | 6 ++++++ .../java/org/apache/commons/rdf/jena/JenaIRI.java | 6 ++++++ .../org/apache/commons/rdf/jena/JenaLiteral.java | 6 ++++++ .../org/apache/commons/rdf/jena/JenaVariable.java | 15 +++++++++++++++ .../org/apache/commons/rdf/jena/impl/AnyImpl.java | 5 +++++ .../apache/commons/rdf/jena/impl/VariableImpl.java | 13 +++++++++++++ 7 files changed, 67 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/0f349723/jena/src/main/java/org/apache/commons/rdf/jena/JenaAny.java ---------------------------------------------------------------------- diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaAny.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaAny.java index b6c32fd..5b6f398 100644 --- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaAny.java +++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaAny.java @@ -18,6 +18,22 @@ package org.apache.commons.rdf.jena; +import org.apache.jena.graph.Node; + +/** + * A placeholder for "any" RDFTerm. + *

+ * Equivalent to [] in SPARQL. This is a Jena-specific + * RDFTerm extension used in SPARQL queries. + *

+ * Note that any JenaAny is {@link Object#equals(Object)} equal to + * any other JenaAny - in practice there is only a singleton instance - + * but every ocurrance of JenaAny in a generalized statement + * would independently represent "any" RDFTerm. + * + * @see Node#ANY + * + */ public interface JenaAny extends JenaRDFTerm { } http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/0f349723/jena/src/main/java/org/apache/commons/rdf/jena/JenaBlankNode.java ---------------------------------------------------------------------- diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaBlankNode.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaBlankNode.java index 099821f..4777dda 100644 --- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaBlankNode.java +++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaBlankNode.java @@ -19,7 +19,13 @@ package org.apache.commons.rdf.jena; import org.apache.commons.rdf.api.BlankNode; +import org.apache.jena.graph.Node; +/** + * A Jena-backed {@link BlankNode}. + * + * @see Node#isBlank() + */ public interface JenaBlankNode extends JenaRDFTerm, BlankNode { } http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/0f349723/jena/src/main/java/org/apache/commons/rdf/jena/JenaIRI.java ---------------------------------------------------------------------- diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaIRI.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaIRI.java index ee58465..b16acd8 100644 --- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaIRI.java +++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaIRI.java @@ -19,7 +19,13 @@ package org.apache.commons.rdf.jena; import org.apache.commons.rdf.api.IRI; +import org.apache.jena.graph.Node; +/** + * A Jena-backed {@link IRI}. + * + * @see Node#isURI() + */ public interface JenaIRI extends JenaRDFTerm, IRI { } http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/0f349723/jena/src/main/java/org/apache/commons/rdf/jena/JenaLiteral.java ---------------------------------------------------------------------- diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaLiteral.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaLiteral.java index 7d0757b..df0c697 100644 --- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaLiteral.java +++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaLiteral.java @@ -19,7 +19,13 @@ package org.apache.commons.rdf.jena; import org.apache.commons.rdf.api.Literal; +import org.apache.jena.graph.Node; +/** + * A Jena-backed {@link Literal} + * + * @see Node#isLiteral() + */ public interface JenaLiteral extends JenaRDFTerm, Literal { } http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/0f349723/jena/src/main/java/org/apache/commons/rdf/jena/JenaVariable.java ---------------------------------------------------------------------- diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaVariable.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaVariable.java index 218272f..099018f 100644 --- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaVariable.java +++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaVariable.java @@ -17,7 +17,22 @@ */ package org.apache.commons.rdf.jena; +import org.apache.commons.rdf.api.BlankNode; +import org.apache.jena.graph.Node; +/** + * A placeholder for a variable RDFTerm. + *

+ * Equivalent to ?variable in SPARQL. This is a Jena-specific + * RDFTerm extension used in SPARQL queries. + *

+ * Note that any JenaVariable is {@link Object#equals(Object)} equal to + * any other JenaVariable if they have the same {@link #getVariableName()}. There + * is no equivalent of {@link BlankNode#uniqueReference()} and actual equality depend + * on the SPARQL query using the variable. + * + * @see Node#isVariable() + */ public interface JenaVariable extends JenaRDFTerm { public String getVariableName(); http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/0f349723/jena/src/main/java/org/apache/commons/rdf/jena/impl/AnyImpl.java ---------------------------------------------------------------------- diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/AnyImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/AnyImpl.java index a468f43..e2d3809 100644 --- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/AnyImpl.java +++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/AnyImpl.java @@ -45,5 +45,10 @@ public class AnyImpl implements JenaRDFTerm, JenaAny { public Node asJenaNode() { return Node.ANY; } + + @Override + public boolean equals(Object obj) { + return obj == this || obj instanceof JenaAny; + } } http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/0f349723/jena/src/main/java/org/apache/commons/rdf/jena/impl/VariableImpl.java ---------------------------------------------------------------------- diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/VariableImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/VariableImpl.java index 130462a..b72ecde 100644 --- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/VariableImpl.java +++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/VariableImpl.java @@ -18,6 +18,8 @@ package org.apache.commons.rdf.jena.impl; +import java.util.Objects; + import org.apache.commons.rdf.jena.JenaRDFTerm; import org.apache.commons.rdf.jena.JenaVariable; import org.apache.jena.graph.Node; @@ -47,5 +49,16 @@ public class VariableImpl implements JenaRDFTerm, JenaVariable { public Node asJenaNode() { return node; } + + @Override + public boolean equals(Object obj) { + if (obj == this) { + return true; + } + if (! (obj instanceof JenaVariable)) { + return false; + } + return Objects.equals(getVariableName(), ((JenaVariable)obj).getVariableName()); + } }