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 5EA29200BAC for ; Wed, 26 Oct 2016 17:58:16 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5D195160AE1; Wed, 26 Oct 2016 15:58:16 +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 0A59E160B02 for ; Wed, 26 Oct 2016 17:58:13 +0200 (CEST) Received: (qmail 34182 invoked by uid 500); 26 Oct 2016 15:58:13 -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 34173 invoked by uid 99); 26 Oct 2016 15:58:13 -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; Wed, 26 Oct 2016 15:58:13 +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 A6A6FC0E5A for ; Wed, 26 Oct 2016 15:58:12 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -1.199 X-Spam-Level: X-Spam-Status: No, score=-1.199 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, 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 JapOUXqIsVQe for ; Wed, 26 Oct 2016 15:58:07 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id 557B95FC69 for ; Wed, 26 Oct 2016 15:58:02 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id C9175E85F7 for ; Wed, 26 Oct 2016 15:57:57 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 5F0263A3A5E for ; Wed, 26 Oct 2016 15:57:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r999954 [27/27] - in /websites/production/commonsrdf/content: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/org/apache/commons/rdf/jena/ apidocs/org/apache/commons/rdf/jena/class-use/ ... Date: Wed, 26 Oct 2016 15:57:54 -0000 To: commits@commonsrdf.incubator.apache.org From: stain@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20161026155757.5F0263A3A5E@svn01-us-west.apache.org> archived-at: Wed, 26 Oct 2016 15:58:16 -0000 Modified: websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/RDF4JGraph.html ============================================================================== --- websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/RDF4JGraph.html (original) +++ websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/RDF4JGraph.html Wed Oct 26 15:57:51 2016 @@ -36,131 +36,132 @@ 28 import org.apache.commons.rdf.api.Triple; 29 import org.eclipse.rdf4j.model.Model; 30 import org.eclipse.rdf4j.repository.Repository; -31 +31 import org.apache.commons.rdf.rdf4j.RDF4JFactory.Option; 32 -33 /** -34 * Marker interface for RDF4J implementations of Graph. -35 * -36 * @see RDF4JTermFactory#createGraph() -37 * @see RDF4JTermFactory#asRDFTermGraph(Model) -38 * @see RDF4JTermFactory#asRDFTermGraph(Repository, org.apache.commons.rdf.rdf4j.RDF4JTermFactory.Option...) -39 * @see RDF4JTermFactory#asRDFTermGraphUnion(Repository, org.apache.commons.rdf.rdf4j.RDF4JTermFactory.Option...) -40 * @see RDF4JDataset#getGraph() -41 * @see RDF4JDataset#getGraph(BlankNodeOrIRI) -42 */ -43 public interface RDF4JGraph extends Graph, RDF4JGraphLike<Triple> { -44 -45 /** -46 * Return a copy of the context mask as a {@link Set} of -47 * {@link RDF4JBlankNodeOrIRI} graph names. -48 * <p> -49 * If the set is not {@link Set#isEmpty()}, the mask determines which -50 * <em>contexts</em> in the corresponding RDF4J {@link Model} or -51 * {@link Repository} that this graph reflect. Modifications to the graph -52 * (e.g. {@link #add(Triple)} will be performed for all the specified -53 * contexts, while retrieval (e.g. {@link #contains(Triple)}) will succeed -54 * if the triple is in at least one of the specified contexts. -55 * <p> -56 * The context mask array may contain <code>null</code>, indicating the -57 * default context (the <em>default graph</em> in RDF datasets). -58 * <p> -59 * If the context mask is {@link Set#isEmpty()}, then this is a <em>union -60 * graph</em> which triples reflect statements in any contexts. Triples -61 * added to the graph will be added in the default context, e.g. equivalent -62 * to <code>new Resource[1]{null}</code>) in RDF4J. -63 * <p> -64 * Note that the context mask itself cannot be <code>null</code>. -65 * <p> -66 * The returned set is an immutable copy; to specify a different mask, use -67 * {@link RDF4JTermFactory#asRDFTermGraph(Repository, Set, org.apache.commons.rdf.rdf4j.RDF4JTermFactory.Option...)} -68 * -69 * @return The context mask as a set of {@link BlankNodeOrIRI} graph names, which -70 * may contain the value <code>null</code>. -71 */ -72 public Set<RDF4JBlankNodeOrIRI> getContextMask(); -73 -74 /** -75 * {@inheritDoc} -76 * <p> -77 * Note that for graphs backed by a repository ({@link #asRepository()} is -78 * present), the stream <strong>must be closed</strong> with -79 * {@link Stream#close()}. -80 * <p> -81 * This can generally achieved using a try-with-resources block, e.g.: -82 * -83 * <pre> -84 * int subjects; -85 * try (Stream&lt;RDF4JTriple&gt; s : graph.stream()) { -86 * subjects = s.map(RDF4JTriple::getSubject).distinct().count() -87 * } -88 * </pre> -89 */ -90 @Override -91 Stream<RDF4JTriple> stream(); -92 -93 /** -94 * {@inheritDoc} -95 * <p> -96 * Note that for graphs backed by a repository ({@link #asRepository()} is -97 * present), the stream <strong>must be closed</strong> with -98 * {@link Stream#close()}. -99 * <p> -100 * This can generally achieved using a try-with-resources block, e.g.: -101 * <pre> -102 * int subjects; -103 * try (Stream&lt;RDF4JTriple&gt; s : graph.stream(s,p,o)) { -104 * subjects = s.map(RDF4JTriple::getSubject).distinct().count() -105 * } -106 * </pre> -107 */ -108 @Override -109 Stream<RDF4JTriple> stream(BlankNodeOrIRI subject, IRI predicate, RDFTerm object); -110 +33 +34 /** +35 * Marker interface for RDF4J implementations of Graph. +36 * +37 * @see RDF4JFactory#createGraph() +38 * @see RDF4JFactory#asGraph(Model) +39 * @see RDF4JFactory#asGraph(Repository, Option...) +40 * @see RDF4JFactory#asGraphUnion(Repository, Option...) +41 * @see RDF4JDataset#getGraph() +42 * @see RDF4JDataset#getGraph(BlankNodeOrIRI) +43 */ +44 public interface RDF4JGraph extends Graph, RDF4JGraphLike<Triple> { +45 +46 /** +47 * Return a copy of the context mask as a {@link Set} of +48 * {@link RDF4JBlankNodeOrIRI} graph names. +49 * <p> +50 * If the set is not {@link Set#isEmpty()}, the mask determines which +51 * <em>contexts</em> in the corresponding RDF4J {@link Model} or +52 * {@link Repository} that this graph reflect. Modifications to the graph +53 * (e.g. {@link #add(Triple)} will be performed for all the specified +54 * contexts, while retrieval (e.g. {@link #contains(Triple)}) will succeed +55 * if the triple is in at least one of the specified contexts. +56 * <p> +57 * The context mask array may contain <code>null</code>, indicating the +58 * default context (the <em>default graph</em> in RDF datasets). +59 * <p> +60 * If the context mask is {@link Set#isEmpty()}, then this is a <em>union +61 * graph</em> which triples reflect statements in any contexts. Triples +62 * added to the graph will be added in the default context, e.g. equivalent +63 * to <code>new Resource[1]{null}</code>) in RDF4J. +64 * <p> +65 * Note that the context mask itself cannot be <code>null</code>. +66 * <p> +67 * The returned set is an immutable copy; to specify a different mask, use +68 * {@link RDF4JFactory#asGraph(Repository, Set, Option...)} +69 * +70 * @return The context mask as a set of {@link BlankNodeOrIRI} graph names, which +71 * may contain the value <code>null</code>. +72 */ +73 public Set<RDF4JBlankNodeOrIRI> getContextMask(); +74 +75 /** +76 * {@inheritDoc} +77 * <p> +78 * Note that for graphs backed by a repository ({@link #asRepository()} is +79 * present), the stream <strong>must be closed</strong> with +80 * {@link Stream#close()}. +81 * <p> +82 * This can generally achieved using a try-with-resources block, e.g.: +83 * +84 * <pre> +85 * int subjects; +86 * try (Stream&lt;RDF4JTriple&gt; s : graph.stream()) { +87 * subjects = s.map(RDF4JTriple::getSubject).distinct().count() +88 * } +89 * </pre> +90 */ +91 @Override +92 Stream<RDF4JTriple> stream(); +93 +94 /** +95 * {@inheritDoc} +96 * <p> +97 * Note that for graphs backed by a repository ({@link #asRepository()} is +98 * present), the stream <strong>must be closed</strong> with +99 * {@link Stream#close()}. +100 * <p> +101 * This can generally achieved using a try-with-resources block, e.g.: +102 * <pre> +103 * int subjects; +104 * try (Stream&lt;RDF4JTriple&gt; s : graph.stream(s,p,o)) { +105 * subjects = s.map(RDF4JTriple::getSubject).distinct().count() +106 * } +107 * </pre> +108 */ +109 @Override +110 Stream<RDF4JTriple> stream(BlankNodeOrIRI subject, IRI predicate, RDFTerm object); 111 -112 /** -113 * {@inheritDoc} -114 * <p> -115 * Note that for graphs backed by a repository ({@link #asRepository()} is -116 * present), the iterable <strong>must be closed</strong> with -117 * {@link ClosableIterable#close()}. -118 * <p> -119 * This can generally achieved using a try-with-resources block, e.g.: -120 * <pre> -121 * try (ClosableIterable&lt;Triple&gt; s : graph.iterate()) { -122 * for (Triple t : triples) { -123 * return t; // OK to terminate for-loop early -124 * } -125 * } -126 * </pre> -127 * If you don't use a try-with-resources block, the iterator will -128 * attempt to close the ClosableIterable -129 * when reaching the end of the iteration. -130 */ -131 @Override -132 ClosableIterable<Triple> iterate() throws ConcurrentModificationException, IllegalStateException; -133 -134 /** -135 * {@inheritDoc} -136 * <p> -137 * Note that for graphs backed by a repository ({@link #asRepository()} is -138 * present), the iterable <strong>must be closed</strong> with -139 * {@link ClosableIterable#close()}. -140 * <p> -141 * This can generally achieved using a try-with-resources block, e.g.: -142 * <pre> -143 * try (ClosableIterable&lt;Triple&gt; s : graph.iterate(s,p,o)) { -144 * for (Triple t : triples) { -145 * return t; // OK to terminate for-loop early -146 * } -147 * } -148 * </pre> -149 * If you don't use a try-with-resources block, the iterator will -150 * attempt to close the ClosableIterable -151 * when reaching the end of the iteration. -152 */ -153 @Override -154 ClosableIterable<Triple> iterate(BlankNodeOrIRI subject, IRI predicate, RDFTerm object); -155 } +112 +113 /** +114 * {@inheritDoc} +115 * <p> +116 * Note that for graphs backed by a repository ({@link #asRepository()} is +117 * present), the iterable <strong>must be closed</strong> with +118 * {@link ClosableIterable#close()}. +119 * <p> +120 * This can generally achieved using a try-with-resources block, e.g.: +121 * <pre> +122 * try (ClosableIterable&lt;Triple&gt; s : graph.iterate()) { +123 * for (Triple t : triples) { +124 * return t; // OK to terminate for-loop early +125 * } +126 * } +127 * </pre> +128 * If you don't use a try-with-resources block, the iterator will +129 * attempt to close the ClosableIterable +130 * when reaching the end of the iteration. +131 */ +132 @Override +133 ClosableIterable<Triple> iterate() throws ConcurrentModificationException, IllegalStateException; +134 +135 /** +136 * {@inheritDoc} +137 * <p> +138 * Note that for graphs backed by a repository ({@link #asRepository()} is +139 * present), the iterable <strong>must be closed</strong> with +140 * {@link ClosableIterable#close()}. +141 * <p> +142 * This can generally achieved using a try-with-resources block, e.g.: +143 * <pre> +144 * try (ClosableIterable&lt;Triple&gt; s : graph.iterate(s,p,o)) { +145 * for (Triple t : triples) { +146 * return t; // OK to terminate for-loop early +147 * } +148 * } +149 * </pre> +150 * If you don't use a try-with-resources block, the iterator will +151 * attempt to close the ClosableIterable +152 * when reaching the end of the iteration. +153 */ +154 @Override +155 ClosableIterable<Triple> iterate(BlankNodeOrIRI subject, IRI predicate, RDFTerm object); +156 }
Modified: websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/RDF4JIRI.html ============================================================================== --- websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/RDF4JIRI.html (original) +++ websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/RDF4JIRI.html Wed Oct 26 15:57:51 2016 @@ -32,7 +32,7 @@ 24 * The underlying RDF4J {@link org.eclipse.rdf4j.model.IRI} 25 * instance can be retrieved with {@link #asValue()}. 26 * -27 * @see RDF4JTermFactory#createIRI(String) +27 * @see RDF4JFactory#createIRI(String) 28 */ 29 public interface RDF4JIRI 30 extends RDF4JBlankNodeOrIRI, org.apache.commons.rdf.api.IRI { Modified: websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/RDF4JLiteral.html ============================================================================== --- websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/RDF4JLiteral.html (original) +++ websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/RDF4JLiteral.html Wed Oct 26 15:57:51 2016 @@ -32,7 +32,7 @@ 24 * The underlying RDF4J {@link org.eclipse.rdf4j.model.Literal} instance can be 25 * retrieved with {@link #asValue()}. 26 * -27 * @see RDF4JTermFactory#createLiteral(String) +27 * @see RDF4JFactory#createLiteral(String) 28 */ 29 public interface RDF4JLiteral extends RDF4JTerm, org.apache.commons.rdf.api.Literal { 30 } Modified: websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/RDF4JQuad.html ============================================================================== --- websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/RDF4JQuad.html (original) +++ websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/RDF4JQuad.html Wed Oct 26 15:57:51 2016 @@ -30,7 +30,7 @@ 22 /** 23 * Marker interface for RDF4J implementations of Quad. 24 * -25 * @see RDF4JTermFactory#createQuad(org.apache.commons.rdf.api.BlankNodeOrIRI, org.apache.commons.rdf.api.BlankNodeOrIRI, org.apache.commons.rdf.api.IRI, org.apache.commons.rdf.api.RDFTerm) +25 * @see RDF4JFactory#createQuad(org.apache.commons.rdf.api.BlankNodeOrIRI, org.apache.commons.rdf.api.BlankNodeOrIRI, org.apache.commons.rdf.api.IRI, org.apache.commons.rdf.api.RDFTerm) 26 */ 27 public interface RDF4JQuad extends Quad, RDF4JTripleLike { 28 Modified: websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/RDF4JTriple.html ============================================================================== --- websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/RDF4JTriple.html (original) +++ websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/RDF4JTriple.html Wed Oct 26 15:57:51 2016 @@ -30,7 +30,7 @@ 22 /** 23 * Marker interface for RDF4J implementations of Triple. 24 * -25 * @see RDF4JTermFactory#createTriple(org.apache.commons.rdf.api.BlankNodeOrIRI, org.apache.commons.rdf.api.IRI, org.apache.commons.rdf.api.RDFTerm) +25 * @see RDF4JFactory#createTriple(org.apache.commons.rdf.api.BlankNodeOrIRI, org.apache.commons.rdf.api.IRI, org.apache.commons.rdf.api.RDFTerm) 26 */ 27 public interface RDF4JTriple extends Triple, RDF4JTripleLike { 28 Modified: websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/experimental/RDF4JParser.html ============================================================================== --- websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/experimental/RDF4JParser.html (original) +++ websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/experimental/RDF4JParser.html Wed Oct 26 15:57:51 2016 @@ -42,7 +42,7 @@ 34 import org.apache.commons.rdf.rdf4j.RDF4JBlankNodeOrIRI; 35 import org.apache.commons.rdf.rdf4j.RDF4JDataset; 36 import org.apache.commons.rdf.rdf4j.RDF4JGraph; -37 import org.apache.commons.rdf.rdf4j.RDF4JTermFactory; +37 import org.apache.commons.rdf.rdf4j.RDF4JFactory; 38 import org.apache.commons.rdf.simple.experimental.AbstractRDFParser; 39 import org.eclipse.rdf4j.model.Model; 40 import org.eclipse.rdf4j.model.Resource; @@ -109,20 +109,20 @@ 101 } 102 } 103 -104 private RDF4JTermFactory rdf4jTermFactory; +104 private RDF4JFactory rdf4jTermFactory; 105 private ParserConfig parserConfig = new ParserConfig(); 106 107 @Override -108 protected RDF4JTermFactory createRDFTermFactory() { -109 return new RDF4JTermFactory(); +108 protected RDF4JFactory createRDFTermFactory() { +109 return new RDF4JFactory(); 110 } 111 112 @Override 113 protected RDF4JParser prepareForParsing() throws IOException, IllegalStateException { 114 RDF4JParser c = prepareForParsing(); -115 // Ensure we have an RDF4JTermFactory for conversion. +115 // Ensure we have an RDF4JFactory for conversion. 116 // We'll make a new one if user has provided a non-RDF4J factory -117 c.rdf4jTermFactory = (RDF4JTermFactory) getRdfTermFactory().filter(RDF4JTermFactory.class::isInstance) +117 c.rdf4jTermFactory = (RDF4JFactory) getRdfTermFactory().filter(RDF4JFactory.class::isInstance) 118 .orElseGet(c::createRDFTermFactory); 119 return c; 120 } Modified: websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/impl/AbstractRepositoryGraphLike.html ============================================================================== --- websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/impl/AbstractRepositoryGraphLike.html (original) +++ websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/impl/AbstractRepositoryGraphLike.html Wed Oct 26 15:57:51 2016 @@ -30,7 +30,7 @@ 22 23 import org.apache.commons.rdf.api.TripleLike; 24 import org.apache.commons.rdf.rdf4j.RDF4JGraphLike; -25 import org.apache.commons.rdf.rdf4j.RDF4JTermFactory; +25 import org.apache.commons.rdf.rdf4j.RDF4JFactory; 26 import org.eclipse.rdf4j.model.Model; 27 import org.eclipse.rdf4j.model.Statement; 28 import org.eclipse.rdf4j.repository.Repository; @@ -42,7 +42,7 @@ 34 protected final Repository repository; 35 protected final boolean includeInferred; 36 protected final boolean handleInitAndShutdown; -37 protected final RDF4JTermFactory rdf4jTermFactory; +37 protected final RDF4JFactory rdf4jTermFactory; 38 protected final UUID salt; 39 40 AbstractRepositoryGraphLike(Repository repository, UUID salt, boolean handleInitAndShutdown, boolean includeInferred) { @@ -53,7 +53,7 @@ 45 if (handleInitAndShutdown && !repository.isInitialized()) { 46 repository.initialize(); 47 } -48 rdf4jTermFactory = new RDF4JTermFactory(repository.getValueFactory(), salt); +48 rdf4jTermFactory = new RDF4JFactory(repository.getValueFactory(), salt); 49 } 50 51 @Override Modified: websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/impl/InternalRDF4JFactory.html ============================================================================== --- websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/impl/InternalRDF4JFactory.html (original) +++ websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/impl/InternalRDF4JFactory.html Wed Oct 26 15:57:51 2016 @@ -35,7 +35,7 @@ 27 import org.apache.commons.rdf.rdf4j.RDF4JLiteral; 28 import org.apache.commons.rdf.rdf4j.RDF4JQuad; 29 import org.apache.commons.rdf.rdf4j.RDF4JTerm; -30 import org.apache.commons.rdf.rdf4j.RDF4JTermFactory; +30 import org.apache.commons.rdf.rdf4j.RDF4JFactory; 31 import org.apache.commons.rdf.rdf4j.RDF4JTriple; 32 import org.eclipse.rdf4j.model.BNode; 33 import org.eclipse.rdf4j.model.IRI; @@ -50,17 +50,17 @@ 42 * <p> 43 * <strong>Internal class:</strong> This "abstract" class is intended for 44 * internal use by Commons RDF and may change in any minor update. Use instead -45 * {@link RDF4JTermFactory} methods like -46 * {@link RDF4JTermFactory#createBlankNode()}, -47 * {@link RDF4JTermFactory#asRDFTerm(org.eclipse.rdf4j.model.Value)} and -48 * {@link RDF4JTermFactory#asRDFTermGraph(Repository, org.apache.commons.rdf.rdf4j.RDF4JTermFactory.Option...)} +45 * {@link RDF4JFactory} methods like +46 * {@link RDF4JFactory#createBlankNode()}, +47 * {@link RDF4JFactory#asRDFTerm(org.eclipse.rdf4j.model.Value)} and +48 * {@link RDF4JFactory#asGraph(Repository, org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...)} 49 * <p> 50 * This class exists as a <code>public</code> bridge between the packages 51 * {@link org.apache.commons.rdf.rdf4j} and 52 * {@link org.apache.commons.rdf.rdf4j.impl} by exposing the package-public 53 * constructors. 54 * -55 * @see RDF4JTermFactory +55 * @see RDF4JFactory 56 */ 57 public abstract class InternalRDF4JFactory { 58 @@ -111,7 +111,7 @@ 103 * factory to use for adapting graph triples 104 * @return Adapted {@link RDF4JGraph} 105 */ -106 public RDF4JGraph createModelGraphImpl(Model model, RDF4JTermFactory rdf4jTermFactory) { +106 public RDF4JGraph createModelGraphImpl(Model model, RDF4JFactory rdf4jTermFactory) { 107 return new ModelGraphImpl(model, rdf4jTermFactory); 108 } 109 Modified: websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/impl/ModelGraphImpl.html ============================================================================== --- websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/impl/ModelGraphImpl.html (original) +++ websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/impl/ModelGraphImpl.html Wed Oct 26 15:57:51 2016 @@ -39,7 +39,7 @@ 31 import org.apache.commons.rdf.rdf4j.ClosableIterable; 32 import org.apache.commons.rdf.rdf4j.RDF4JBlankNodeOrIRI; 33 import org.apache.commons.rdf.rdf4j.RDF4JGraph; -34 import org.apache.commons.rdf.rdf4j.RDF4JTermFactory; +34 import org.apache.commons.rdf.rdf4j.RDF4JFactory; 35 import org.apache.commons.rdf.rdf4j.RDF4JTriple; 36 import org.eclipse.rdf4j.model.Model; 37 import org.eclipse.rdf4j.model.Resource; @@ -48,9 +48,9 @@ 40 final class ModelGraphImpl implements RDF4JGraph { 41 42 private Model model; -43 private RDF4JTermFactory rdf4jTermFactory; +43 private RDF4JFactory rdf4jTermFactory; 44 -45 ModelGraphImpl(Model model, RDF4JTermFactory rdf4jTermFactory) { +45 ModelGraphImpl(Model model, RDF4JFactory rdf4jTermFactory) { 46 this.model = model; 47 this.rdf4jTermFactory = rdf4jTermFactory; 48 } Modified: websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/impl/QuadImpl.html ============================================================================== --- websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/impl/QuadImpl.html (original) +++ websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/impl/QuadImpl.html Wed Oct 26 15:57:51 2016 @@ -34,7 +34,7 @@ 26 import org.apache.commons.rdf.api.RDFTerm; 27 import org.apache.commons.rdf.api.Triple; 28 import org.apache.commons.rdf.rdf4j.RDF4JQuad; -29 import org.apache.commons.rdf.rdf4j.RDF4JTermFactory; +29 import org.apache.commons.rdf.rdf4j.RDF4JFactory; 30 import org.eclipse.rdf4j.model.Statement; 31 32 final class QuadImpl implements Quad, RDF4JQuad { @@ -73,23 +73,23 @@ 65 if (statement.getContext() == null) { 66 return Optional.empty(); 67 } -68 BlankNodeOrIRI g = (BlankNodeOrIRI) RDF4JTermFactory.asRDFTerm(statement.getContext(), salt); +68 BlankNodeOrIRI g = (BlankNodeOrIRI) RDF4JFactory.asRDFTerm(statement.getContext(), salt); 69 return Optional.of(g); 70 } 71 72 @Override 73 public RDFTerm getObject() { -74 return RDF4JTermFactory.asRDFTerm(statement.getObject(), salt); +74 return RDF4JFactory.asRDFTerm(statement.getObject(), salt); 75 } 76 77 @Override 78 public org.apache.commons.rdf.api.IRI getPredicate() { -79 return (org.apache.commons.rdf.api.IRI) RDF4JTermFactory.asRDFTerm(statement.getPredicate(), null); +79 return (org.apache.commons.rdf.api.IRI) RDF4JFactory.asRDFTerm(statement.getPredicate(), null); 80 } 81 82 @Override 83 public BlankNodeOrIRI getSubject() { -84 return (BlankNodeOrIRI) RDF4JTermFactory.asRDFTerm(statement.getSubject(), salt); +84 return (BlankNodeOrIRI) RDF4JFactory.asRDFTerm(statement.getSubject(), salt); 85 } 86 87 @Override Modified: websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/impl/TripleImpl.html ============================================================================== --- websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/impl/TripleImpl.html (original) +++ websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/impl/TripleImpl.html Wed Oct 26 15:57:51 2016 @@ -31,7 +31,7 @@ 23 import org.apache.commons.rdf.api.BlankNodeOrIRI; 24 import org.apache.commons.rdf.api.RDFTerm; 25 import org.apache.commons.rdf.api.Triple; -26 import org.apache.commons.rdf.rdf4j.RDF4JTermFactory; +26 import org.apache.commons.rdf.rdf4j.RDF4JFactory; 27 import org.apache.commons.rdf.rdf4j.RDF4JTriple; 28 import org.eclipse.rdf4j.model.Statement; 29 @@ -62,17 +62,17 @@ 54 55 @Override 56 public RDFTerm getObject() { -57 return RDF4JTermFactory.asRDFTerm(statement.getObject(), salt); +57 return RDF4JFactory.asRDFTerm(statement.getObject(), salt); 58 } 59 60 @Override 61 public org.apache.commons.rdf.api.IRI getPredicate() { -62 return (org.apache.commons.rdf.api.IRI) RDF4JTermFactory.asRDFTerm(statement.getPredicate(), null); +62 return (org.apache.commons.rdf.api.IRI) RDF4JFactory.asRDFTerm(statement.getPredicate(), null); 63 } 64 65 @Override 66 public BlankNodeOrIRI getSubject() { -67 return (BlankNodeOrIRI) RDF4JTermFactory.asRDFTerm(statement.getSubject(), salt); +67 return (BlankNodeOrIRI) RDF4JFactory.asRDFTerm(statement.getSubject(), salt); 68 } 69 70 @Override Modified: websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/package-frame.html ============================================================================== --- websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/package-frame.html (original) +++ websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/package-frame.html Wed Oct 26 15:57:51 2016 @@ -19,7 +19,7 @@ ClosableIterable
  • - Option + Option
  • RDF4JBlankNode @@ -31,6 +31,9 @@ RDF4JDataset
  • + RDF4JFactory +
  • +
  • RDF4JGraph
  • @@ -49,9 +52,6 @@ RDF4JTerm
  • - RDF4JTermFactory -
  • -
  • RDF4JTriple
  • Modified: websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/package-summary.html ============================================================================== --- websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/package-summary.html (original) +++ websites/production/commonsrdf/content/xref/org/apache/commons/rdf/rdf4j/package-summary.html Wed Oct 26 15:57:51 2016 @@ -42,7 +42,7 @@ - Option + Option @@ -62,6 +62,11 @@ + RDF4JFactory + + + + RDF4JGraph @@ -91,11 +96,6 @@ - - RDF4JTermFactory - - - RDF4JTriple