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 6032E200AF7 for ; Tue, 14 Jun 2016 17:45:06 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5EDD7160A06; Tue, 14 Jun 2016 15:45:06 +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 87F69160A56 for ; Tue, 14 Jun 2016 17:45:05 +0200 (CEST) Received: (qmail 60584 invoked by uid 500); 14 Jun 2016 15:45:04 -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 60575 invoked by uid 99); 14 Jun 2016 15:45:04 -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; Tue, 14 Jun 2016 15:45:04 +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 57317C028E for ; Tue, 14 Jun 2016 15:45:04 +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 mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id TvHkIIddrkPp for ; Tue, 14 Jun 2016 15:45:02 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with SMTP id 162115FE51 for ; Tue, 14 Jun 2016 15:45:01 +0000 (UTC) Received: (qmail 60308 invoked by uid 99); 14 Jun 2016 15:45:01 -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; Tue, 14 Jun 2016 15:45:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 447FEEAD8E; Tue, 14 Jun 2016 15:45:01 +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: Tue, 14 Jun 2016 15:45:06 -0000 Message-Id: <43d2cc56e0124c98bc06f036e234f8ca@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/8] incubator-commonsrdf git commit: Use contextFilter for graph modifications archived-at: Tue, 14 Jun 2016 15:45:06 -0000 Use contextFilter for graph modifications Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/4dab5103 Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/4dab5103 Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/4dab5103 Branch: refs/heads/rdf4j Commit: 4dab5103d56f396dd17a3dd67f0980c0bad525c4 Parents: b6e938c Author: Stian Soiland-Reyes Authored: Tue Jun 14 16:40:37 2016 +0100 Committer: Stian Soiland-Reyes Committed: Tue Jun 14 16:40:37 2016 +0100 ---------------------------------------------------------------------- .../apache/commons/rdf/rdf4j/RDF4JGraph.java | 4 ++ .../rdf4j/impl/AbstractRepositoryGraphLike.java | 46 +------------------ .../rdf/rdf4j/impl/RepositoryDatasetImpl.java | 46 ++++++++++++++++++- .../rdf/rdf4j/impl/RepositoryGraphImpl.java | 48 ++++++++++++++++++++ 4 files changed, 98 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/4dab5103/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JGraph.java ---------------------------------------------------------------------- diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JGraph.java b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JGraph.java index d7cb50e..5333f31 100644 --- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JGraph.java +++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JGraph.java @@ -19,11 +19,15 @@ package org.apache.commons.rdf.rdf4j; import org.apache.commons.rdf.api.Graph; import org.apache.commons.rdf.api.Triple; +import org.apache.commons.rdf.rdf4j.impl.ModelGraphImpl; +import org.apache.commons.rdf.rdf4j.impl.RepositoryGraphImpl; /** * Marker interface for RDF4J implementations of Graph. * + * @see ModelGraphImpl + * @see RepositoryGraphImpl */ public interface RDF4JGraph extends Graph, RDF4JGraphLike { http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/4dab5103/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/AbstractRepositoryGraphLike.java ---------------------------------------------------------------------- diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/AbstractRepositoryGraphLike.java b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/AbstractRepositoryGraphLike.java index b048674..bd47436 100644 --- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/AbstractRepositoryGraphLike.java +++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/AbstractRepositoryGraphLike.java @@ -61,51 +61,7 @@ public abstract class AbstractRepositoryGraphLike imp super(repository); } + + @Override + public void add(Quad tripleLike) { + Statement statement = rdf4jTermFactory.asStatement(tripleLike); + try (RepositoryConnection conn = getRepositoryConnection()) { + conn.add(statement); + conn.commit(); + } + } + + + @Override + public boolean contains(Quad tripleLike) { + Statement statement = rdf4jTermFactory.asStatement(tripleLike); + try (RepositoryConnection conn = getRepositoryConnection()) { + return conn.hasStatement(statement, includeInferred); + } + } + + @Override + public void remove(Quad tripleLike) { + Statement statement = rdf4jTermFactory.asStatement(tripleLike); + try (RepositoryConnection conn = getRepositoryConnection()) { + conn.remove(statement); + conn.commit(); + } + } + + @Override + public void clear() { + try (RepositoryConnection conn = getRepositoryConnection()) { + conn.clear(); + conn.commit(); + } + } + + @Override + public long size() { + try (RepositoryConnection conn = getRepositoryConnection()) { + return conn.size(); + } + } + + @Override public void add(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) { Resource context = (Resource) rdf4jTermFactory.asValue(graphName); @@ -128,7 +172,7 @@ public class RepositoryDatasetImpl extends AbstractRepositoryGraphLike imp @Override public Graph getGraph() { - // TODO: Specify default context only + // TODO: Specify default context only? (the below will give the union graph) return new RepositoryGraphImpl(repository, includeInferred); } http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/4dab5103/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/RepositoryGraphImpl.java ---------------------------------------------------------------------- diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/RepositoryGraphImpl.java b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/RepositoryGraphImpl.java index 574ddb1..2950579 100644 --- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/RepositoryGraphImpl.java +++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/RepositoryGraphImpl.java @@ -48,6 +48,54 @@ public class RepositoryGraphImpl extends AbstractRepositoryGraphLike imp this.contextFilter = contextFilter; } + + @Override + public void add(Triple tripleLike) { + Statement statement = rdf4jTermFactory.asStatement(tripleLike); + try (RepositoryConnection conn = getRepositoryConnection()) { + conn.add(statement, contextFilter); + conn.commit(); + } + } + + + @Override + public boolean contains(Triple tripleLike) { + Statement statement = rdf4jTermFactory.asStatement(tripleLike); + try (RepositoryConnection conn = getRepositoryConnection()) { + return conn.hasStatement(statement, includeInferred, contextFilter); + } + } + + @Override + public void remove(Triple tripleLike) { + Statement statement = rdf4jTermFactory.asStatement(tripleLike); + try (RepositoryConnection conn = getRepositoryConnection()) { + conn.remove(statement, contextFilter); + conn.commit(); + } + } + + @Override + public void clear() { + try (RepositoryConnection conn = getRepositoryConnection()) { + conn.clear(contextFilter); + conn.commit(); + } + } + + @Override + public long size() { + try (RepositoryConnection conn = getRepositoryConnection()) { + if (! includeInferred && contextFilter.length == 0) { + return conn.size(); + } else { + return stream().count(); + } + } + } + + @Override public void add(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) { Resource subj = (Resource) rdf4jTermFactory.asValue(subject);