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 2A55D2009F8 for ; Fri, 3 Jun 2016 15:28:40 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2927A160A48; Fri, 3 Jun 2016 13:28:40 +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 49AF6160A11 for ; Fri, 3 Jun 2016 15:28:39 +0200 (CEST) Received: (qmail 74671 invoked by uid 500); 3 Jun 2016 13:28:38 -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 74662 invoked by uid 99); 3 Jun 2016 13:28:38 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Jun 2016 13:28:38 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 2019BC0D0F for ; Fri, 3 Jun 2016 13:28:38 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-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 (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id M650l-9xMNi0 for ; Fri, 3 Jun 2016 13:28:37 +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 1DA5C5F4E4 for ; Fri, 3 Jun 2016 13:28:35 +0000 (UTC) Received: (qmail 74609 invoked by uid 99); 3 Jun 2016 13:28:35 -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, 03 Jun 2016 13:28:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1A633E38B5; Fri, 3 Jun 2016 13:28:35 +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, 03 Jun 2016 13:28:37 -0000 Message-Id: <7651cdeb810c4f63aba25e18840c38fa@git.apache.org> In-Reply-To: <1862bbd62bf544fe85b49d606a23eb52@git.apache.org> References: <1862bbd62bf544fe85b49d606a23eb52@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/7] incubator-commonsrdf git commit: GraphImpl also static class archived-at: Fri, 03 Jun 2016 13:28:40 -0000 GraphImpl also static class Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/ed0213dd Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/ed0213dd Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/ed0213dd Branch: refs/heads/rdf4j Commit: ed0213ddc6ae5990052a1f0a7f0824dcb66b32b6 Parents: 2cde4c9 Author: Stian Soiland-Reyes Authored: Thu Jun 2 18:09:27 2016 +0100 Committer: Stian Soiland-Reyes Committed: Thu Jun 2 18:09:27 2016 +0100 ---------------------------------------------------------------------- .../commons/rdf/rdf4j/RDF4JTermFactory.java | 45 +++++++++++--------- 1 file changed, 26 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/ed0213dd/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JTermFactory.java ---------------------------------------------------------------------- diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JTermFactory.java b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JTermFactory.java index d8943db..b60c726 100644 --- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JTermFactory.java +++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JTermFactory.java @@ -356,25 +356,32 @@ public class RDF4JTermFactory implements RDFTermFactory { } } - private final class GraphImpl implements RDF4JGraph { + private final static class GraphImpl implements RDF4JGraph { private Model model; + private RDF4JTermFactory rdf4jTermFactory; GraphImpl(Model model) { - this.model = model; + this.model = model; + this.rdf4jTermFactory = new RDF4JTermFactory(); + } + + GraphImpl(Model model, RDF4JTermFactory rdf4jTermFactory) { + this.model = model; + this.rdf4jTermFactory = rdf4jTermFactory; } @Override public void add(BlankNodeOrIRI subject, org.apache.commons.rdf.api.IRI predicate, RDFTerm object) { model.add( - (Resource)asValue(subject), - (org.eclipse.rdf4j.model.IRI)asValue(predicate), - asValue(object)); + (Resource)rdf4jTermFactory.asValue(subject), + (org.eclipse.rdf4j.model.IRI)rdf4jTermFactory.asValue(predicate), + rdf4jTermFactory.asValue(object)); } @Override public void add(Triple triple) { - model.add(asStatement(triple)); + model.add(rdf4jTermFactory.asStatement(triple)); } public Model asModel() { @@ -389,42 +396,42 @@ public class RDF4JTermFactory implements RDFTermFactory { @Override public boolean contains(BlankNodeOrIRI subject, org.apache.commons.rdf.api.IRI predicate, RDFTerm object) { return model.contains( - (Resource)asValue(subject), - (org.eclipse.rdf4j.model.IRI)asValue(predicate), - asValue(object)); + (Resource)rdf4jTermFactory.asValue(subject), + (org.eclipse.rdf4j.model.IRI)rdf4jTermFactory.asValue(predicate), + rdf4jTermFactory.asValue(object)); } @Override public boolean contains(Triple triple) { - return model.contains(asStatement(triple)); + return model.contains(rdf4jTermFactory.asStatement(triple)); } @Override public Stream stream() { - return model.parallelStream().map(RDF4JTermFactory.this::asTriple); + return model.parallelStream().map(rdf4jTermFactory::asTriple); } @Override public Stream stream(BlankNodeOrIRI subject, org.apache.commons.rdf.api.IRI predicate, RDFTerm object) { return model.filter( - (Resource)asValue(subject), - (org.eclipse.rdf4j.model.IRI)asValue(predicate), - asValue(object)).parallelStream() - .map(RDF4JTermFactory.this::asTriple); + (Resource)rdf4jTermFactory.asValue(subject), + (org.eclipse.rdf4j.model.IRI)rdf4jTermFactory.asValue(predicate), + rdf4jTermFactory.asValue(object)).parallelStream() + .map(rdf4jTermFactory::asTriple); } @Override public void remove(BlankNodeOrIRI subject, org.apache.commons.rdf.api.IRI predicate, RDFTerm object) { model.remove( - (Resource)asValue(subject), - (org.eclipse.rdf4j.model.IRI)asValue(predicate), - asValue(object)); + (Resource)rdf4jTermFactory.asValue(subject), + (org.eclipse.rdf4j.model.IRI)rdf4jTermFactory.asValue(predicate), + rdf4jTermFactory.asValue(object)); } @Override public void remove(Triple triple) { - model.remove(asStatement(triple)); + model.remove(rdf4jTermFactory.asStatement(triple)); } @Override