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/28 13:07:50 UTC
[12/50] [abbrv] incubator-commonsrdf git commit: JsonLDFactory ->
JsonLDRDF
JsonLDFactory -> JsonLDRDF
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/430bc4d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/430bc4d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/430bc4d7
Branch: refs/heads/COMMONSRDF-7
Commit: 430bc4d7c253ab9a023c39ff0afe9e750ff422e0
Parents: defb7d8
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Sun Oct 23 00:47:13 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Sun Oct 23 00:47:13 2016 +0100
----------------------------------------------------------------------
.../apache/commons/rdf/jsonldjava/JsonLdGraphLike.java | 8 ++++----
.../apache/commons/rdf/jsonldjava/JsonLdQuadLike.java | 2 +-
.../org/apache/commons/rdf/jsonldjava/JsonLdRDF.java | 6 +++---
.../rdf/jsonldjava/experimental/JsonLdParser.java | 12 ++++++------
.../org/apache/commons/rdf/jsonldjava/package-info.java | 2 +-
.../services/org.apache.commons.rdf.api.RDFFactory | 2 +-
.../commons/rdf/jsonldjava/JsonLdFactoryTest.java | 2 +-
.../apache/commons/rdf/jsonldjava/JsonLdGraphTest.java | 2 +-
.../commons/rdf/jsonldjava/JsonLdParserBuilderTest.java | 2 +-
.../commons/rdf/jsonldjava/JsonLdServiceLoaderTest.java | 4 ++--
10 files changed, 21 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/430bc4d7/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
index 401de1f..d4417ec 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
@@ -72,7 +72,7 @@ abstract class AbstractJsonLdGraphLike<T extends TripleLike>
*/
final String bnodePrefix;
- final JsonLdFactory factory;
+ final JsonLdRDF factory;
/**
* The underlying JSON-LD {@link RDFDataset}.
@@ -89,7 +89,7 @@ abstract class AbstractJsonLdGraphLike<T extends TripleLike>
AbstractJsonLdGraphLike(RDFDataset rdfDataSet, String bnodePrefix) {
this.rdfDataSet = Objects.requireNonNull(rdfDataSet);
this.bnodePrefix = Objects.requireNonNull(bnodePrefix);
- this.factory = new JsonLdFactory(bnodePrefix);
+ this.factory = new JsonLdRDF(bnodePrefix);
}
AbstractJsonLdGraphLike(String bnodePrefix) {
@@ -161,8 +161,8 @@ abstract class AbstractJsonLdGraphLike<T extends TripleLike>
* Convert JsonLd Quad to a Commons RDF {@link Triple} or {@link org.apache.commons.rdf.api.Quad}
*
*
- * @see JsonLdFactory#asTriple(Quad)
- * @see JsonLdFactory#asQuad(Quad)
+ * @see JsonLdRDF#asTriple(Quad)
+ * @see JsonLdRDF#asQuad(Quad)
* @param jsonldQuad jsonld quad to convert
* @return converted {@link TripleLike}
*/
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/430bc4d7/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.java
index acb429a..1584f9e 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.java
@@ -32,7 +32,7 @@ public interface JsonLdQuadLike<G extends RDFTerm> extends QuadLike<G>, JsonLdTr
// Note: We always pass the blankNodePrefix and don't rely on the internal
// blankNodePrefix in this static factory
- private static JsonLdFactory rdfTermFactory = new JsonLdFactory();
+ private static JsonLdRDF rdfTermFactory = new JsonLdRDF();
private final Quad quad;
private String blankNodePrefix;
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/430bc4d7/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDF.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDF.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDF.java
index d5c49f8..bb57b1a 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDF.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDF.java
@@ -35,16 +35,16 @@ import org.apache.commons.rdf.simple.Types;
import com.github.jsonldjava.core.RDFDataset;
import com.github.jsonldjava.core.RDFDataset.Node;
-public final class JsonLdFactory implements RDF {
+public final class JsonLdRDF implements RDF {
final String bnodePrefix;
- public JsonLdFactory() {
+ public JsonLdRDF() {
// An "outside Graph" bnodePrefix
this("urn:uuid:" + UUID.randomUUID() + "#b");
}
- JsonLdFactory(String bnodePrefix) {
+ JsonLdRDF(String bnodePrefix) {
this.bnodePrefix = Objects.requireNonNull(bnodePrefix);
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/430bc4d7/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/experimental/JsonLdParser.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/experimental/JsonLdParser.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/experimental/JsonLdParser.java
index 464015f..ff3ffe8 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/experimental/JsonLdParser.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/experimental/JsonLdParser.java
@@ -32,7 +32,7 @@ import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.RDFSyntax;
import org.apache.commons.rdf.jsonldjava.JsonLdDataset;
import org.apache.commons.rdf.jsonldjava.JsonLdGraph;
-import org.apache.commons.rdf.jsonldjava.JsonLdFactory;
+import org.apache.commons.rdf.jsonldjava.JsonLdRDF;
import org.apache.commons.rdf.simple.experimental.AbstractRDFParser;
import com.github.jsonldjava.core.JsonLdError;
@@ -44,8 +44,8 @@ import com.github.jsonldjava.utils.JsonUtils;
public class JsonLdParser extends AbstractRDFParser<JsonLdParser> {
@Override
- protected JsonLdFactory createRDFTermFactory() {
- return new JsonLdFactory();
+ protected JsonLdRDF createRDFTermFactory() {
+ return new JsonLdRDF();
}
@Override
@@ -129,9 +129,9 @@ public class JsonLdParser extends AbstractRDFParser<JsonLdParser> {
}
}
- private JsonLdFactory getJsonLdFactory() {
- if (getRdfTermFactory().isPresent() && getRdfTermFactory().get() instanceof JsonLdFactory) {
- return (JsonLdFactory) getRdfTermFactory().get();
+ private JsonLdRDF getJsonLdFactory() {
+ if (getRdfTermFactory().isPresent() && getRdfTermFactory().get() instanceof JsonLdRDF) {
+ return (JsonLdRDF) getRdfTermFactory().get();
}
return createRDFTermFactory();
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/430bc4d7/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/package-info.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/package-info.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/package-info.java
index 1cb5c77..7eb323b 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/package-info.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/package-info.java
@@ -18,7 +18,7 @@
/**
* Integration with jsonld-java
*
- * @see org.apache.commons.rdf.jsonldjava.JsonLdFactory
+ * @see org.apache.commons.rdf.jsonldjava.JsonLdRDF
* @see org.apache.commons.rdf.jsonldjava.JsonLdGraph
* @see org.apache.commons.rdf.jsonldjava.JsonLdUnionGraph
* @see org.apache.commons.rdf.jsonldjava.JsonLdDataset
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/430bc4d7/jsonld-java/src/main/resources/META-INF/services/org.apache.commons.rdf.api.RDFFactory
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/resources/META-INF/services/org.apache.commons.rdf.api.RDFFactory b/jsonld-java/src/main/resources/META-INF/services/org.apache.commons.rdf.api.RDFFactory
index ecb7535..2c97ca5 100644
--- a/jsonld-java/src/main/resources/META-INF/services/org.apache.commons.rdf.api.RDFFactory
+++ b/jsonld-java/src/main/resources/META-INF/services/org.apache.commons.rdf.api.RDFFactory
@@ -1 +1 @@
-org.apache.commons.rdf.jsonldjava.JsonLdFactory
+org.apache.commons.rdf.jsonldjava.JsonLdRDF
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/430bc4d7/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdFactoryTest.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdFactoryTest.java b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdFactoryTest.java
index ea87fa8..81fb532 100644
--- a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdFactoryTest.java
+++ b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdFactoryTest.java
@@ -26,7 +26,7 @@ public class JsonLdFactoryTest extends AbstractRDFTermFactoryTest {
@Override
public RDF createFactory() {
- return new JsonLdFactory();
+ return new JsonLdRDF();
}
// TODO: Add support for checking for invalid lang/iri/blanknode IDs
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/430bc4d7/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphTest.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphTest.java b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphTest.java
index 51c768f..64e94e5 100644
--- a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphTest.java
+++ b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphTest.java
@@ -24,7 +24,7 @@ public class JsonLdGraphTest extends AbstractGraphTest {
@Override
public RDF createFactory() {
- return new JsonLdFactory();
+ return new JsonLdRDF();
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/430bc4d7/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.java b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.java
index bd3c6bb..6cdb841 100644
--- a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.java
+++ b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.java
@@ -39,7 +39,7 @@ import org.junit.Test;
public class JsonLdParserBuilderTest {
private static final String TEST_JSONLD = "/test.jsonld";
- static JsonLdFactory factory = new JsonLdFactory();
+ static JsonLdRDF factory = new JsonLdRDF();
IRI test = factory.createIRI("http://example.com/test");
IRI Type = factory.createIRI("http://example.com/Type");
IRI type = factory.createIRI("http://www.w3.org/1999/02/22-rdf-syntax-ns#type");
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/430bc4d7/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdServiceLoaderTest.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdServiceLoaderTest.java b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdServiceLoaderTest.java
index f35a41b..dd44586 100644
--- a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdServiceLoaderTest.java
+++ b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdServiceLoaderTest.java
@@ -31,10 +31,10 @@ public class JsonLdServiceLoaderTest {
public void testServiceLoaderLookup() {
ServiceLoader<RDF> loader = ServiceLoader.load(RDF.class);
for (RDF impl : loader) {
- if (impl instanceof JsonLdFactory) {
+ if (impl instanceof JsonLdRDF) {
return; // yay
}
}
- fail("JsonLdFactory not found in ServiceLoader");
+ fail("JsonLdRDF not found in ServiceLoader");
}
}