Repository: incubator-commonsrdf Updated Branches: refs/heads/master 0bb936968 -> 351c2965b
RDF4J asRDFTermDataset -> asDataset() ..and friends Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/351c2965 Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/351c2965 Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/351c2965 Branch: refs/heads/master Commit: 351c2965b5cc0694fc4b21b21e99a8ac80bcde83 Parents: 0bb9369 Author: Stian Soiland-Reyes <st...@apache.org> Authored: Sun Oct 23 03:11:07 2016 +0100 Committer: Stian Soiland-Reyes <st...@apache.org> Committed: Sun Oct 23 03:11:07 2016 +0100 ---------------------------------------------------------------------- .../apache/commons/rdf/rdf4j/RDF4JDataset.java | 2 +- .../apache/commons/rdf/rdf4j/RDF4JFactory.java | 22 ++++++++++---------- .../apache/commons/rdf/rdf4j/RDF4JGraph.java | 8 +++---- .../rdf/rdf4j/impl/InternalRDF4JFactory.java | 2 +- .../apache/commons/rdf/rdf4j/package-info.java | 4 ++-- .../commons/rdf/rdf4j/MemoryGraphTest.java | 2 +- .../commons/rdf/rdf4j/NativeStoreGraphTest.java | 2 +- 7 files changed, 21 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/351c2965/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java ---------------------------------------------------------------------- diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java index 2066c34..87803fa 100644 --- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java +++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java @@ -31,7 +31,7 @@ import org.apache.commons.rdf.api.RDFTerm; * Marker interface for RDF4J implementations of Dataset. * * @see RDF4JFactory#createDataset() - * @see RDF4JFactory#asRDFTermDataset(org.eclipse.rdf4j.repository.Repository, org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...) + * @see RDF4JFactory#asDataset(org.eclipse.rdf4j.repository.Repository, org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...) */ public interface RDF4JDataset extends Dataset, RDF4JGraphLike<Quad> { http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/351c2965/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JFactory.java ---------------------------------------------------------------------- diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JFactory.java b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JFactory.java index 7d4eabe..e435167 100644 --- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JFactory.java +++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JFactory.java @@ -64,12 +64,12 @@ import org.eclipse.rdf4j.sail.memory.MemoryStore; * {@link BNode#getID()}. * <p> * {@link #createGraph()} creates a new Graph backed by {@link LinkedHashModel}. - * To use other models, see {@link #asRDFTermGraph(Model)}. + * To use other models, see {@link #asGraph(Model)}. * <p> * To adapt a RDF4J {@link Repository} as a {@link Dataset} or {@link Graph}, - * use {@link #asRDFTermDataset(Repository, Option...)} + * use {@link #asDataset(Repository, Option...)} * or - * {@link #asRDFTermGraph(Repository, Option...)}. + * {@link #asGraph(Repository, Option...)}. * <p> * {@link #asTriple(Statement)} can be used to convert a RDF4J {@link Statement} * to a Commons RDF {@link Triple}, and equivalent {@link #asQuad(Statement)} to @@ -93,9 +93,9 @@ import org.eclipse.rdf4j.sail.memory.MemoryStore; * the same {@link BNode#getID()}, converting them with the above methods might * cause accidental {@link BlankNode} equivalence. Note that the {@link Graph} * and {@link Dataset} adapter methods like - * {@link #asRDFTermDataset(Repository, Option...)} + * {@link #asDataset(Repository, Option...)} * and - * {@link #asRDFTermGraph(Repository, Option...)} + * {@link #asGraph(Repository, Option...)} * therefore uses a unique {@link RDF4JFactory} internally. * */ @@ -286,7 +286,7 @@ public final class RDF4JFactory implements RDFTermFactory { * Zero or more {@link Option} * @return A {@link Dataset} backed by the RDF4J repository. */ - public RDF4JDataset asRDFTermDataset(Repository repository, Option... options) { + public RDF4JDataset asDataset(Repository repository, Option... options) { EnumSet<Option> opts = optionSet(options); return rdf4j.createRepositoryDatasetImpl(repository, opts.contains(Option.handleInitAndShutdown), @@ -302,7 +302,7 @@ public final class RDF4JFactory implements RDFTermFactory { * RDF4J {@link Model} to adapt. * @return Adapted {@link Graph}. */ - public RDF4JGraph asRDFTermGraph(Model model) { + public RDF4JGraph asGraph(Model model) { return rdf4j.createModelGraphImpl(model, this); } @@ -326,7 +326,7 @@ public final class RDF4JFactory implements RDFTermFactory { * Zero or more {@link Option} * @return A {@link Graph} backed by the RDF4J repository. */ - public RDF4JGraph asRDFTermGraph(Repository repository, Option... options) { + public RDF4JGraph asGraph(Repository repository, Option... options) { EnumSet<Option> opts = optionSet(options); return rdf4j.createRepositoryGraphImpl(repository, opts.contains(Option.handleInitAndShutdown), @@ -347,7 +347,7 @@ public final class RDF4JFactory implements RDFTermFactory { * Zero or more {@link Option} * @return A union {@link Graph} backed by the RDF4J repository. */ - public RDF4JGraph asRDFTermGraphUnion(Repository repository, Option... options) { + public RDF4JGraph asGraphUnion(Repository repository, Option... options) { EnumSet<Option> opts = optionSet(options); return rdf4j.createRepositoryGraphImpl(repository, opts.contains(Option.handleInitAndShutdown), @@ -382,7 +382,7 @@ public final class RDF4JFactory implements RDFTermFactory { * Zero or more {@link Option}s * @return A {@link Graph} backed by the RDF4J repository. */ - public RDF4JGraph asRDFTermGraph(Repository repository, Set<? extends BlankNodeOrIRI> contexts, + public RDF4JGraph asGraph(Repository repository, Set<? extends BlankNodeOrIRI> contexts, Option... option) { EnumSet<Option> opts = optionSet(option); /** NOTE: asValue() deliberately CAN handle <code>null</code> */ @@ -538,7 +538,7 @@ public final class RDF4JFactory implements RDFTermFactory { @Override public RDF4JGraph createGraph() { - return asRDFTermGraph(new LinkedHashModel()); + return asGraph(new LinkedHashModel()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/351c2965/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 b7ef9a2..70edd3f 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 @@ -34,9 +34,9 @@ import org.eclipse.rdf4j.repository.Repository; * Marker interface for RDF4J implementations of Graph. * * @see RDF4JFactory#createGraph() - * @see RDF4JFactory#asRDFTermGraph(Model) - * @see RDF4JFactory#asRDFTermGraph(Repository, org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...) - * @see RDF4JFactory#asRDFTermGraphUnion(Repository, org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...) + * @see RDF4JFactory#asGraph(Model) + * @see RDF4JFactory#asGraph(Repository, org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...) + * @see RDF4JFactory#asGraphUnion(Repository, org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...) * @see RDF4JDataset#getGraph() * @see RDF4JDataset#getGraph(BlankNodeOrIRI) */ @@ -64,7 +64,7 @@ public interface RDF4JGraph extends Graph, RDF4JGraphLike<Triple> { * Note that the context mask itself cannot be <code>null</code>. * <p> * The returned set is an immutable copy; to specify a different mask, use - * {@link RDF4JFactory#asRDFTermGraph(Repository, Set, org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...)} + * {@link RDF4JFactory#asGraph(Repository, Set, org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...)} * * @return The context mask as a set of {@link BlankNodeOrIRI} graph names, which * may contain the value <code>null</code>. http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/351c2965/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/InternalRDF4JFactory.java ---------------------------------------------------------------------- diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/InternalRDF4JFactory.java b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/InternalRDF4JFactory.java index 7744e01..b43c15f 100644 --- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/InternalRDF4JFactory.java +++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/InternalRDF4JFactory.java @@ -45,7 +45,7 @@ import org.eclipse.rdf4j.repository.Repository; * {@link RDF4JFactory} methods like * {@link RDF4JFactory#createBlankNode()}, * {@link RDF4JFactory#asRDFTerm(org.eclipse.rdf4j.model.Value)} and - * {@link RDF4JFactory#asRDFTermGraph(Repository, org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...)} + * {@link RDF4JFactory#asGraph(Repository, org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...)} * <p> * This class exists as a <code>public</code> bridge between the packages * {@link org.apache.commons.rdf.rdf4j} and http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/351c2965/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/package-info.java ---------------------------------------------------------------------- diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/package-info.java b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/package-info.java index f17a499..1d5e677 100644 --- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/package-info.java +++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/package-info.java @@ -32,9 +32,9 @@ * {@link org.eclipse.rdf4j.repository.Repository} instances can be adapted to * Commons RDF {@link org.apache.commons.rdf.api.Graph} and * {@link org.apache.commons.rdf.api.Dataset}, e.g. using - * {@link org.apache.commons.rdf.rdf4j.RDF4JFactory#asRDFTermGraph(org.eclipse.rdf4j.model.Model)} + * {@link org.apache.commons.rdf.rdf4j.RDF4JFactory#asGraph(org.eclipse.rdf4j.model.Model)} * or - * {@link org.apache.commons.rdf.rdf4j.RDF4JFactory#asRDFTermDataset(org.eclipse.rdf4j.repository.Repository, org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...)} + * {@link org.apache.commons.rdf.rdf4j.RDF4JFactory#asDataset(org.eclipse.rdf4j.repository.Repository, org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...)} * The returned adapted graph/dataset is directly mapped, so changes are * propagated both ways. For convenience, the marker interface * {@link org.apache.commons.rdf.rdf4j.RDF4JGraph} and http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/351c2965/rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/MemoryGraphTest.java ---------------------------------------------------------------------- diff --git a/rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/MemoryGraphTest.java b/rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/MemoryGraphTest.java index c275e67..3a57138 100644 --- a/rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/MemoryGraphTest.java +++ b/rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/MemoryGraphTest.java @@ -77,7 +77,7 @@ public class MemoryGraphTest extends AbstractGraphTest { Sail sail = new MemoryStore(); Repository repository = new SailRepository(sail); repository.initialize(); - return rdf4jFactory.asRDFTermGraph(repository); + return rdf4jFactory.asGraph(repository); } } http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/351c2965/rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/NativeStoreGraphTest.java ---------------------------------------------------------------------- diff --git a/rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/NativeStoreGraphTest.java b/rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/NativeStoreGraphTest.java index 77ee128..ccabf72 100644 --- a/rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/NativeStoreGraphTest.java +++ b/rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/NativeStoreGraphTest.java @@ -57,7 +57,7 @@ public class NativeStoreGraphTest extends AbstractGraphTest { public RDF4JGraph createGraph() { // We re-use the repository connection, but use a different context every time Set<RDF4JBlankNode> context = Collections.singleton(rdf4jFactory.createBlankNode()); - return rdf4jFactory.asRDFTermGraph(getRepository(), context); + return rdf4jFactory.asGraph(getRepository(), context); } // Delegate methods
