You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commonsrdf.apache.org by st...@apache.org on 2016/10/23 00:59:49 UTC
[06/22] incubator-commonsrdf git commit: SimpleRDFTermFactory ->
SimpleRDFFactory
SimpleRDFTermFactory -> SimpleRDFFactory
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/08fbb929
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/08fbb929
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/08fbb929
Branch: refs/heads/COMMONSRDF-46
Commit: 08fbb929286d96adb52dfa1946e346900d1f06c5
Parents: 2f4a276
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Oct 19 17:37:56 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Oct 19 17:37:56 2016 +0100
----------------------------------------------------------------------
examples/src/example/UserGuideTest.java | 6 +-
.../commons/rdf/simple/BlankNodeImpl.java | 2 +-
.../apache/commons/rdf/simple/DatasetImpl.java | 8 +-
.../apache/commons/rdf/simple/GraphImpl.java | 8 +-
.../org/apache/commons/rdf/simple/IRIImpl.java | 2 +-
.../apache/commons/rdf/simple/LiteralImpl.java | 2 +-
.../org/apache/commons/rdf/simple/QuadImpl.java | 2 +-
.../commons/rdf/simple/SimpleRDFFactory.java | 114 +++++++++++++++++++
.../rdf/simple/SimpleRDFTermFactory.java | 113 ------------------
.../apache/commons/rdf/simple/TripleImpl.java | 2 +-
.../org/apache/commons/rdf/simple/Types.java | 2 +-
.../simple/experimental/AbstractRDFParser.java | 8 +-
.../apache/commons/rdf/simple/package-info.java | 6 +-
.../org.apache.commons.rdf.api.RDFTermFactory | 2 +-
.../commons/rdf/simple/DefaultGraphTest.java | 2 +-
.../commons/rdf/simple/SimpleGraphTest.java | 4 +-
.../SimpleNoRelativeIRIRDFTermFactoryTest.java | 2 +-
.../simple/SimpleRDFTermFactoryLookupTest.java | 2 +-
.../rdf/simple/SimpleRDFTermFactoryTest.java | 2 +-
.../commons/rdf/simple/TestWritingGraph.java | 2 +-
.../experimental/AbstractRDFParserTest.java | 4 +-
21 files changed, 148 insertions(+), 147 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/08fbb929/examples/src/example/UserGuideTest.java
----------------------------------------------------------------------
diff --git a/examples/src/example/UserGuideTest.java b/examples/src/example/UserGuideTest.java
index 44623b3..c9487e3 100644
--- a/examples/src/example/UserGuideTest.java
+++ b/examples/src/example/UserGuideTest.java
@@ -35,7 +35,7 @@ import org.apache.commons.rdf.api.RDFTerm;
import org.apache.commons.rdf.api.RDFFactory;
import org.apache.commons.rdf.api.Triple;
import org.apache.commons.rdf.api.TripleLike;
-import org.apache.commons.rdf.simple.SimpleRDFTermFactory;
+import org.apache.commons.rdf.simple.SimpleRDFFactory;
import org.apache.commons.rdf.simple.Types;
import org.junit.Before;
import org.junit.Test;
@@ -46,7 +46,7 @@ public class UserGuideTest {
@Before
public void factory() {
- factory = new SimpleRDFTermFactory();
+ factory = new SimpleRDFFactory();
}
@Test
@@ -89,7 +89,7 @@ public class UserGuideTest {
System.out.println(b1.ntriplesString());
System.out.println(b1.equals(factory.createBlankNode("b1")));
- System.out.println(b1.equals(new SimpleRDFTermFactory().createBlankNode("b1")));
+ System.out.println(b1.equals(new SimpleRDFFactory().createBlankNode("b1")));
System.out.println(bnode.uniqueReference());
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/08fbb929/simple/src/main/java/org/apache/commons/rdf/simple/BlankNodeImpl.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/BlankNodeImpl.java b/simple/src/main/java/org/apache/commons/rdf/simple/BlankNodeImpl.java
index dab2f12..fbbdb26 100644
--- a/simple/src/main/java/org/apache/commons/rdf/simple/BlankNodeImpl.java
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/BlankNodeImpl.java
@@ -23,7 +23,7 @@ import java.util.UUID;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.commons.rdf.api.BlankNode;
-import org.apache.commons.rdf.simple.SimpleRDFTermFactory.SimpleRDFTerm;
+import org.apache.commons.rdf.simple.SimpleRDFFactory.SimpleRDFTerm;
/**
* A simple implementation of BlankNode.
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/08fbb929/simple/src/main/java/org/apache/commons/rdf/simple/DatasetImpl.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/DatasetImpl.java b/simple/src/main/java/org/apache/commons/rdf/simple/DatasetImpl.java
index c372012..78f1981 100644
--- a/simple/src/main/java/org/apache/commons/rdf/simple/DatasetImpl.java
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/DatasetImpl.java
@@ -33,7 +33,7 @@ import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.Literal;
import org.apache.commons.rdf.api.Quad;
import org.apache.commons.rdf.api.RDFTerm;
-import org.apache.commons.rdf.simple.SimpleRDFTermFactory.SimpleRDFTerm;
+import org.apache.commons.rdf.simple.SimpleRDFFactory.SimpleRDFTerm;
/**
* A simple, memory-based implementation of Dataset.
@@ -46,10 +46,10 @@ final class DatasetImpl implements Dataset {
private static final int TO_STRING_MAX = 10;
private final Set<Quad> quads = new HashSet<Quad>();
- private final SimpleRDFTermFactory factory;
+ private final SimpleRDFFactory factory;
- DatasetImpl(SimpleRDFTermFactory simpleRDFTermFactory) {
- this.factory = simpleRDFTermFactory;
+ DatasetImpl(SimpleRDFFactory simpleRDFFactory) {
+ this.factory = simpleRDFFactory;
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/08fbb929/simple/src/main/java/org/apache/commons/rdf/simple/GraphImpl.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/GraphImpl.java b/simple/src/main/java/org/apache/commons/rdf/simple/GraphImpl.java
index 779b1ad..1173d53 100644
--- a/simple/src/main/java/org/apache/commons/rdf/simple/GraphImpl.java
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/GraphImpl.java
@@ -18,7 +18,7 @@
package org.apache.commons.rdf.simple;
import org.apache.commons.rdf.api.*;
-import org.apache.commons.rdf.simple.SimpleRDFTermFactory.SimpleRDFTerm;
+import org.apache.commons.rdf.simple.SimpleRDFFactory.SimpleRDFTerm;
import java.util.HashSet;
import java.util.Objects;
@@ -38,10 +38,10 @@ final class GraphImpl implements Graph {
private static final int TO_STRING_MAX = 10;
private final Set<Triple> triples = new HashSet<Triple>();
- private final SimpleRDFTermFactory factory;
+ private final SimpleRDFFactory factory;
- GraphImpl(SimpleRDFTermFactory simpleRDFTermFactory) {
- this.factory = simpleRDFTermFactory;
+ GraphImpl(SimpleRDFFactory simpleRDFFactory) {
+ this.factory = simpleRDFFactory;
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/08fbb929/simple/src/main/java/org/apache/commons/rdf/simple/IRIImpl.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/IRIImpl.java b/simple/src/main/java/org/apache/commons/rdf/simple/IRIImpl.java
index fdec0ac..c3ef547 100644
--- a/simple/src/main/java/org/apache/commons/rdf/simple/IRIImpl.java
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/IRIImpl.java
@@ -24,7 +24,7 @@ import java.net.URI;
/**
* A simple implementation of IRI.
*/
-final class IRIImpl implements IRI, SimpleRDFTermFactory.SimpleRDFTerm {
+final class IRIImpl implements IRI, SimpleRDFFactory.SimpleRDFTerm {
private final String iri;
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/08fbb929/simple/src/main/java/org/apache/commons/rdf/simple/LiteralImpl.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/LiteralImpl.java b/simple/src/main/java/org/apache/commons/rdf/simple/LiteralImpl.java
index 3d6874a..b3f7042 100644
--- a/simple/src/main/java/org/apache/commons/rdf/simple/LiteralImpl.java
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/LiteralImpl.java
@@ -28,7 +28,7 @@ import org.apache.commons.rdf.api.Literal;
/**
* A simple implementation of Literal.
*/
-final class LiteralImpl implements Literal, SimpleRDFTermFactory.SimpleRDFTerm {
+final class LiteralImpl implements Literal, SimpleRDFFactory.SimpleRDFTerm {
private static final String QUOTE = "\"";
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/08fbb929/simple/src/main/java/org/apache/commons/rdf/simple/QuadImpl.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/QuadImpl.java b/simple/src/main/java/org/apache/commons/rdf/simple/QuadImpl.java
index 54921bb..54c5fc1 100644
--- a/simple/src/main/java/org/apache/commons/rdf/simple/QuadImpl.java
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/QuadImpl.java
@@ -40,7 +40,7 @@ final class QuadImpl implements Quad {
* Construct Quad from its constituent parts.
* <p>
* The objects are not changed. All mapping of BNode objects is done in
- * {@link SimpleRDFTermFactory#createQuad(BlankNodeOrIRI, BlankNodeOrIRI, IRI, RDFTerm)}.
+ * {@link SimpleRDFFactory#createQuad(BlankNodeOrIRI, BlankNodeOrIRI, IRI, RDFTerm)}.
*
* @param graphName graphName of triple
* @param subject subject of triple
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/08fbb929/simple/src/main/java/org/apache/commons/rdf/simple/SimpleRDFFactory.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/SimpleRDFFactory.java b/simple/src/main/java/org/apache/commons/rdf/simple/SimpleRDFFactory.java
new file mode 100644
index 0000000..4b89603
--- /dev/null
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/SimpleRDFFactory.java
@@ -0,0 +1,114 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.rdf.simple;
+
+import java.util.UUID;
+
+import org.apache.commons.rdf.api.BlankNode;
+import org.apache.commons.rdf.api.BlankNodeOrIRI;
+import org.apache.commons.rdf.api.Dataset;
+import org.apache.commons.rdf.api.Graph;
+import org.apache.commons.rdf.api.IRI;
+import org.apache.commons.rdf.api.Literal;
+import org.apache.commons.rdf.api.Quad;
+import org.apache.commons.rdf.api.RDFTerm;
+import org.apache.commons.rdf.api.RDFFactory;
+import org.apache.commons.rdf.api.Triple;
+
+/**
+ * A simple implementation of RDFFactory.
+ * <p>
+ * The {@link RDFTerm}, {@link Triple}, {@link Quad}, {@link Graph}
+ * and {@link Dataset} instances created by this factory are
+ * simple in-memory Implementations that are not thread-safe or efficient, but
+ * which may be useful for testing and prototyping purposes.
+ */
+public class SimpleRDFFactory implements RDFFactory {
+
+ /**
+ * Marker interface to say that this RDFTerm is part of the
+ * Simple implementation. Used by {@link GraphImpl} to avoid
+ * double remapping.
+ * <p>
+ * This method is package protected to avoid any third-party
+ * subclasses.
+ *
+ */
+ static interface SimpleRDFTerm extends RDFTerm {
+ }
+
+ /** Unique salt per instance, for {@link #createBlankNode(String)}
+ */
+ private final UUID SALT = UUID.randomUUID();
+
+ @Override
+ public BlankNode createBlankNode() {
+ return new BlankNodeImpl();
+ }
+
+ @Override
+ public BlankNode createBlankNode(String name) {
+ return new BlankNodeImpl(SALT, name);
+ }
+
+ @Override
+ public Graph createGraph() {
+ // Creates a GraphImpl object using this object as the factory for
+ // delegating all object creation to
+ return new GraphImpl(this);
+ }
+
+ @Override
+ public Dataset createDataset() throws UnsupportedOperationException {
+ return new DatasetImpl(this);
+ }
+
+ @Override
+ public IRI createIRI(String iri) {
+ IRI result = new IRIImpl(iri);
+ // Reuse any IRI objects already created in Types
+ return Types.get(result).orElse(result);
+ }
+
+ @Override
+ public Literal createLiteral(String literal) {
+ return new LiteralImpl(literal);
+ }
+
+ @Override
+ public Literal createLiteral(String literal, IRI dataType) {
+ return new LiteralImpl(literal, dataType);
+ }
+
+ @Override
+ public Literal createLiteral(String literal, String language) {
+ return new LiteralImpl(literal, language);
+ }
+
+ @Override
+ public Triple createTriple(BlankNodeOrIRI subject, IRI predicate,
+ RDFTerm object) {
+ return new TripleImpl(subject, predicate, object);
+ }
+
+ @Override
+ public Quad createQuad(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object)
+ throws IllegalArgumentException {
+ return new QuadImpl(graphName, subject, predicate, object);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/08fbb929/simple/src/main/java/org/apache/commons/rdf/simple/SimpleRDFTermFactory.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/SimpleRDFTermFactory.java b/simple/src/main/java/org/apache/commons/rdf/simple/SimpleRDFTermFactory.java
deleted file mode 100644
index 4aee07a..0000000
--- a/simple/src/main/java/org/apache/commons/rdf/simple/SimpleRDFTermFactory.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.rdf.simple;
-
-import java.util.UUID;
-
-import org.apache.commons.rdf.api.BlankNode;
-import org.apache.commons.rdf.api.BlankNodeOrIRI;
-import org.apache.commons.rdf.api.Dataset;
-import org.apache.commons.rdf.api.Graph;
-import org.apache.commons.rdf.api.IRI;
-import org.apache.commons.rdf.api.Literal;
-import org.apache.commons.rdf.api.Quad;
-import org.apache.commons.rdf.api.RDFTerm;
-import org.apache.commons.rdf.api.RDFFactory;
-import org.apache.commons.rdf.api.Triple;
-
-/**
- * A simple implementation of RDFFactory.
- * <p>
- * The {@link RDFTerm} and {@link Graph} instances created by this factory are
- * simple in-memory Implementations that are not thread-safe or efficient, but
- * which may be useful for testing and prototyping purposes.
- */
-public class SimpleRDFTermFactory implements RDFFactory {
-
- /**
- * Marker interface to say that this RDFTerm is part of the
- * Simple implementation. Used by {@link GraphImpl} to avoid
- * double remapping.
- * <p>
- * This method is package protected to avoid any third-party
- * subclasses.
- *
- */
- static interface SimpleRDFTerm extends RDFTerm {
- }
-
- /** Unique salt per instance, for {@link #createBlankNode(String)}
- */
- private final UUID SALT = UUID.randomUUID();
-
- @Override
- public BlankNode createBlankNode() {
- return new BlankNodeImpl();
- }
-
- @Override
- public BlankNode createBlankNode(String name) {
- return new BlankNodeImpl(SALT, name);
- }
-
- @Override
- public Graph createGraph() {
- // Creates a GraphImpl object using this object as the factory for
- // delegating all object creation to
- return new GraphImpl(this);
- }
-
- @Override
- public Dataset createDataset() throws UnsupportedOperationException {
- return new DatasetImpl(this);
- }
-
- @Override
- public IRI createIRI(String iri) {
- IRI result = new IRIImpl(iri);
- // Reuse any IRI objects already created in Types
- return Types.get(result).orElse(result);
- }
-
- @Override
- public Literal createLiteral(String literal) {
- return new LiteralImpl(literal);
- }
-
- @Override
- public Literal createLiteral(String literal, IRI dataType) {
- return new LiteralImpl(literal, dataType);
- }
-
- @Override
- public Literal createLiteral(String literal, String language) {
- return new LiteralImpl(literal, language);
- }
-
- @Override
- public Triple createTriple(BlankNodeOrIRI subject, IRI predicate,
- RDFTerm object) {
- return new TripleImpl(subject, predicate, object);
- }
-
- @Override
- public Quad createQuad(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object)
- throws IllegalArgumentException, UnsupportedOperationException {
- return new QuadImpl(graphName, subject, predicate, object);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/08fbb929/simple/src/main/java/org/apache/commons/rdf/simple/TripleImpl.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/TripleImpl.java b/simple/src/main/java/org/apache/commons/rdf/simple/TripleImpl.java
index 9da2bed..bc7f103 100644
--- a/simple/src/main/java/org/apache/commons/rdf/simple/TripleImpl.java
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/TripleImpl.java
@@ -37,7 +37,7 @@ final class TripleImpl implements Triple {
* Construct Triple from its constituent parts.
* <p>
* The objects are not changed. All mapping of BNode objects is done in
- * {@link SimpleRDFTermFactory#createTriple(BlankNodeOrIRI, IRI, RDFTerm)}.
+ * {@link SimpleRDFFactory#createTriple(BlankNodeOrIRI, IRI, RDFTerm)}.
*
* @param subject subject of triple
* @param predicate predicate of triple
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/08fbb929/simple/src/main/java/org/apache/commons/rdf/simple/Types.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/Types.java b/simple/src/main/java/org/apache/commons/rdf/simple/Types.java
index 3e3f640..8ad6df8 100644
--- a/simple/src/main/java/org/apache/commons/rdf/simple/Types.java
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/Types.java
@@ -27,7 +27,7 @@ import java.util.Set;
/**
* Types from the RDF and XML Schema vocabularies.
*/
-public final class Types implements IRI, SimpleRDFTermFactory.SimpleRDFTerm {
+public final class Types implements IRI, SimpleRDFFactory.SimpleRDFTerm {
/**
* <tt>http://www.w3.org/1999/02/22-rdf-syntax-ns#HTML</tt>
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/08fbb929/simple/src/main/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParser.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParser.java b/simple/src/main/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParser.java
index ef93136..a37a3c4 100644
--- a/simple/src/main/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParser.java
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParser.java
@@ -35,7 +35,7 @@ import org.apache.commons.rdf.api.Quad;
import org.apache.commons.rdf.api.RDFSyntax;
import org.apache.commons.rdf.api.RDFFactory;
import org.apache.commons.rdf.experimental.RDFParser;
-import org.apache.commons.rdf.simple.SimpleRDFTermFactory;
+import org.apache.commons.rdf.simple.SimpleRDFFactory;
/**
* Abstract RDFParser
@@ -63,7 +63,7 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>>
private static final ExecutorService threadpool = Executors.newCachedThreadPool(r -> new Thread(threadGroup, r));
// Basically only used for creating IRIs
- private static RDFFactory internalRdfTermFactory = new SimpleRDFTermFactory();
+ private static RDFFactory internalRdfTermFactory = new SimpleRDFFactory();
/**
* Get the set {@link RDFFactory}, if any.
@@ -418,7 +418,7 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>>
// parseSynchronously()
AbstractRDFParser<T> c = clone();
- // Use a fresh SimpleRDFTermFactory for each parse
+ // Use a fresh SimpleRDFFactory for each parse
if (!c.rdfTermFactory.isPresent()) {
c.rdfTermFactory = Optional.of(createRDFTermFactory());
}
@@ -515,7 +515,7 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>>
* @return A new {@link RDFFactory}
*/
protected RDFFactory createRDFTermFactory() {
- return new SimpleRDFTermFactory();
+ return new SimpleRDFFactory();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/08fbb929/simple/src/main/java/org/apache/commons/rdf/simple/package-info.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/package-info.java b/simple/src/main/java/org/apache/commons/rdf/simple/package-info.java
index 626154f..5405cef 100644
--- a/simple/src/main/java/org/apache/commons/rdf/simple/package-info.java
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/package-info.java
@@ -28,10 +28,10 @@
* testing and simple usage (e.g. prototyping).
* <p>
* To use this implementation, create an instance of
- * {@link org.apache.commons.rdf.simple.SimpleRDFTermFactory}
+ * {@link org.apache.commons.rdf.simple.SimpleRDFFactory}
* and use methods like
- * {@link org.apache.commons.rdf.simple.SimpleRDFTermFactory#createGraph} and
- * {@link org.apache.commons.rdf.simple.SimpleRDFTermFactory#createIRI(String)}.
+ * {@link org.apache.commons.rdf.simple.SimpleRDFFactory#createGraph} and
+ * {@link org.apache.commons.rdf.simple.SimpleRDFFactory#createIRI(String)}.
* <p>
* The {@link org.apache.commons.rdf.simple.Types} class provide constant
* {@link org.apache.commons.rdf.api.IRI}s of the common RDF XML datatypes.
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/08fbb929/simple/src/main/resources/META-INF/services/org.apache.commons.rdf.api.RDFTermFactory
----------------------------------------------------------------------
diff --git a/simple/src/main/resources/META-INF/services/org.apache.commons.rdf.api.RDFTermFactory b/simple/src/main/resources/META-INF/services/org.apache.commons.rdf.api.RDFTermFactory
index cc53468..17d9680 100644
--- a/simple/src/main/resources/META-INF/services/org.apache.commons.rdf.api.RDFTermFactory
+++ b/simple/src/main/resources/META-INF/services/org.apache.commons.rdf.api.RDFTermFactory
@@ -1 +1 @@
-org.apache.commons.rdf.simple.SimpleRDFTermFactory
\ No newline at end of file
+org.apache.commons.rdf.simple.SimpleRDFFactory
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/08fbb929/simple/src/test/java/org/apache/commons/rdf/simple/DefaultGraphTest.java
----------------------------------------------------------------------
diff --git a/simple/src/test/java/org/apache/commons/rdf/simple/DefaultGraphTest.java b/simple/src/test/java/org/apache/commons/rdf/simple/DefaultGraphTest.java
index 4b100b3..ab2cf50 100644
--- a/simple/src/test/java/org/apache/commons/rdf/simple/DefaultGraphTest.java
+++ b/simple/src/test/java/org/apache/commons/rdf/simple/DefaultGraphTest.java
@@ -36,7 +36,7 @@ public class DefaultGraphTest extends AbstractGraphTest {
return new RDFFactory() {
@Override
public Graph createGraph() throws UnsupportedOperationException {
- return new GraphImpl(new SimpleRDFTermFactory());
+ return new GraphImpl(new SimpleRDFFactory());
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/08fbb929/simple/src/test/java/org/apache/commons/rdf/simple/SimpleGraphTest.java
----------------------------------------------------------------------
diff --git a/simple/src/test/java/org/apache/commons/rdf/simple/SimpleGraphTest.java b/simple/src/test/java/org/apache/commons/rdf/simple/SimpleGraphTest.java
index e5de520..3872f11 100644
--- a/simple/src/test/java/org/apache/commons/rdf/simple/SimpleGraphTest.java
+++ b/simple/src/test/java/org/apache/commons/rdf/simple/SimpleGraphTest.java
@@ -25,13 +25,13 @@ import org.junit.Assume;
import org.junit.Test;
/**
- * Test SimpleRDFTermFactory with AbstractGraphTest
+ * Test SimpleRDFFactory with AbstractGraphTest
*/
public class SimpleGraphTest extends AbstractGraphTest {
@Override
public RDFFactory createFactory() {
- return new SimpleRDFTermFactory();
+ return new SimpleRDFFactory();
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/08fbb929/simple/src/test/java/org/apache/commons/rdf/simple/SimpleNoRelativeIRIRDFTermFactoryTest.java
----------------------------------------------------------------------
diff --git a/simple/src/test/java/org/apache/commons/rdf/simple/SimpleNoRelativeIRIRDFTermFactoryTest.java b/simple/src/test/java/org/apache/commons/rdf/simple/SimpleNoRelativeIRIRDFTermFactoryTest.java
index 5c35de6..752c465 100644
--- a/simple/src/test/java/org/apache/commons/rdf/simple/SimpleNoRelativeIRIRDFTermFactoryTest.java
+++ b/simple/src/test/java/org/apache/commons/rdf/simple/SimpleNoRelativeIRIRDFTermFactoryTest.java
@@ -33,7 +33,7 @@ public class SimpleNoRelativeIRIRDFTermFactoryTest extends
AbstractRDFTermFactoryTest {
@Override
public RDFFactory createFactory() {
- return new SimpleRDFTermFactory() {
+ return new SimpleRDFFactory() {
@Override
public IRI createIRI(String iri) {
if (!URI.create(iri).isAbsolute()) {
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/08fbb929/simple/src/test/java/org/apache/commons/rdf/simple/SimpleRDFTermFactoryLookupTest.java
----------------------------------------------------------------------
diff --git a/simple/src/test/java/org/apache/commons/rdf/simple/SimpleRDFTermFactoryLookupTest.java b/simple/src/test/java/org/apache/commons/rdf/simple/SimpleRDFTermFactoryLookupTest.java
index 96f64ca..179b7ef 100644
--- a/simple/src/test/java/org/apache/commons/rdf/simple/SimpleRDFTermFactoryLookupTest.java
+++ b/simple/src/test/java/org/apache/commons/rdf/simple/SimpleRDFTermFactoryLookupTest.java
@@ -36,7 +36,7 @@ public class SimpleRDFTermFactoryLookupTest {
Iterator<RDFFactory> iterator = loader.iterator();
RDFFactory factory = iterator.next();
- assertTrue(factory instanceof SimpleRDFTermFactory);
+ assertTrue(factory instanceof SimpleRDFFactory);
assertFalse(iterator.hasNext());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/08fbb929/simple/src/test/java/org/apache/commons/rdf/simple/SimpleRDFTermFactoryTest.java
----------------------------------------------------------------------
diff --git a/simple/src/test/java/org/apache/commons/rdf/simple/SimpleRDFTermFactoryTest.java b/simple/src/test/java/org/apache/commons/rdf/simple/SimpleRDFTermFactoryTest.java
index 0cfabb4..bd3b5ad 100644
--- a/simple/src/test/java/org/apache/commons/rdf/simple/SimpleRDFTermFactoryTest.java
+++ b/simple/src/test/java/org/apache/commons/rdf/simple/SimpleRDFTermFactoryTest.java
@@ -27,7 +27,7 @@ public class SimpleRDFTermFactoryTest extends AbstractRDFTermFactoryTest {
@Override
public RDFFactory createFactory() {
- return new SimpleRDFTermFactory();
+ return new SimpleRDFFactory();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/08fbb929/simple/src/test/java/org/apache/commons/rdf/simple/TestWritingGraph.java
----------------------------------------------------------------------
diff --git a/simple/src/test/java/org/apache/commons/rdf/simple/TestWritingGraph.java b/simple/src/test/java/org/apache/commons/rdf/simple/TestWritingGraph.java
index 1ed2e8f..57ee24a 100644
--- a/simple/src/test/java/org/apache/commons/rdf/simple/TestWritingGraph.java
+++ b/simple/src/test/java/org/apache/commons/rdf/simple/TestWritingGraph.java
@@ -57,7 +57,7 @@ public class TestWritingGraph {
@BeforeClass
public static void createGraph() throws Exception {
- factory = new SimpleRDFTermFactory();
+ factory = new SimpleRDFFactory();
graph = factory.createGraph();
IRI subject = factory.createIRI("subj");
IRI predicate = factory.createIRI("pred");
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/08fbb929/simple/src/test/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParserTest.java
----------------------------------------------------------------------
diff --git a/simple/src/test/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParserTest.java b/simple/src/test/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParserTest.java
index f003c09..ee26a2c 100644
--- a/simple/src/test/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParserTest.java
+++ b/simple/src/test/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParserTest.java
@@ -38,7 +38,7 @@ import org.apache.commons.rdf.api.RDFFactory;
import org.apache.commons.rdf.api.Triple;
import org.apache.commons.rdf.experimental.RDFParser;
import org.apache.commons.rdf.simple.DummyRDFParserBuilder;
-import org.apache.commons.rdf.simple.SimpleRDFTermFactory;
+import org.apache.commons.rdf.simple.SimpleRDFFactory;
import org.apache.commons.rdf.simple.Types;
import org.junit.After;
import org.junit.Before;
@@ -48,7 +48,7 @@ import org.junit.rules.ExpectedException;
public class AbstractRDFParserTest {
- private RDFFactory factory = new SimpleRDFTermFactory();
+ private RDFFactory factory = new SimpleRDFFactory();
private DummyRDFParserBuilder dummyParser = new DummyRDFParserBuilder();
private Path testNt;