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/09/29 00:16:37 UTC
[01/19] incubator-commonsrdf git commit: COMMONSRDF-33 Avoid .settings
Repository: incubator-commonsrdf
Updated Branches:
refs/heads/jena-jsonld-rdf4j-integration 549872958 -> c991d0562
COMMONSRDF-33 Avoid .settings
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/059aa82d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/059aa82d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/059aa82d
Branch: refs/heads/jena-jsonld-rdf4j-integration
Commit: 059aa82d1c83fede7bfd27b54b1634e96a7ab644
Parents: c52979b
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Sep 28 14:56:22 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Sep 28 14:56:22 2016 +0100
----------------------------------------------------------------------
jena/.settings/org.eclipse.core.resources.prefs | 6 ------
jena/.settings/org.eclipse.jdt.core.prefs | 5 -----
jena/.settings/org.eclipse.m2e.core.prefs | 4 ----
3 files changed, 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/059aa82d/jena/.settings/org.eclipse.core.resources.prefs
----------------------------------------------------------------------
diff --git a/jena/.settings/org.eclipse.core.resources.prefs b/jena/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 29abf99..0000000
--- a/jena/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/059aa82d/jena/.settings/org.eclipse.jdt.core.prefs
----------------------------------------------------------------------
diff --git a/jena/.settings/org.eclipse.jdt.core.prefs b/jena/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 714351a..0000000
--- a/jena/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/059aa82d/jena/.settings/org.eclipse.m2e.core.prefs
----------------------------------------------------------------------
diff --git a/jena/.settings/org.eclipse.m2e.core.prefs b/jena/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f..0000000
--- a/jena/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
[16/19] incubator-commonsrdf git commit: Jena javadocs
Posted by st...@apache.org.
Jena javadocs
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/eb391f86
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/eb391f86
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/eb391f86
Branch: refs/heads/jena-jsonld-rdf4j-integration
Commit: eb391f860b1aa223ae11e114d828e1f463d6fee3
Parents: b0c55bd
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Sep 29 01:10:11 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Sep 29 01:10:11 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/jena/JenaRDFTermFactory.java | 20 ++++++++++++++++----
.../commons/rdf/jena/impl/JenaFactory.java | 5 ++---
pom.xml | 6 ++++++
3 files changed, 24 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/eb391f86/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
index bde5bc4..1c1be7f 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
@@ -96,7 +96,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
}
@Override
- public Dataset createDataset() {
+ public JenaDataset createDataset() {
return JenaFactory.createDataset(getSalt());
}
@@ -133,7 +133,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
}
@Override
- public Quad createQuad(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object)
+ public JenaQuad createQuad(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object)
throws IllegalArgumentException, UnsupportedOperationException {
return JenaFactory.createQuad(subject, predicate, object, graphName);
}
@@ -451,7 +451,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* Jena quad
* @return Adapted quad
*/
- public Quad fromJena(org.apache.jena.sparql.core.Quad quad) {
+ public JenaQuad fromJena(org.apache.jena.sparql.core.Quad quad) {
return JenaFactory.fromJena(quad, getSalt());
}
@@ -469,7 +469,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* A {@link UUID} salt for adapting any {@link BlankNode}s
* @return Adapted quad
*/
- public static Quad fromJena(org.apache.jena.sparql.core.Quad quad, UUID salt) {
+ public static JenaQuad fromJena(org.apache.jena.sparql.core.Quad quad, UUID salt) {
return JenaFactory.fromJena(quad, salt);
}
@@ -652,10 +652,22 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
return factory.createQuad(graphName, subject, predicate, object);
}
+ /**
+ * Return {@link RDFSyntax} corresponding to a Jena {@link Lang}.
+ *
+ * @param lang {@link Lang} to convert
+ * @return Matched {@link RDFSyntax}, otherwise {@link Optional#empty()}
+ */
public static Optional<RDFSyntax> langToRdfSyntax(Lang lang) {
return RDFSyntax.byMediaType(lang.getContentType().getContentType());
}
+ /**
+ * Return Jena {@link Lang} corresponding to a {@link RDFSyntax.
+ *
+ * @param lang {@link RDFSyntax} to convert
+ * @return Matched {@link Lang}, otherwise {@link Optional#empty()}
+ */
public static Optional<Lang> rdfSyntaxToLang(RDFSyntax rdfSyntax) {
return Optional.ofNullable(RDFLanguages.contentTypeToLang(rdfSyntax.mediaType));
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/eb391f86/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaFactory.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaFactory.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaFactory.java
index 0551094..3fb3c3f 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaFactory.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaFactory.java
@@ -23,7 +23,6 @@ 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.IRI;
import org.apache.commons.rdf.api.Quad;
import org.apache.commons.rdf.api.RDFTerm;
@@ -68,7 +67,7 @@ public class JenaFactory {
public static JenaBlankNode createBlankNode(UUID salt) {
return new JenaBlankNodeImpl(NodeFactory.createBlankNode(), salt);
}
- public static Dataset createDataset(UUID salt) {
+ public static JenaDataset createDataset(UUID salt) {
DatasetGraph dg = DatasetGraphFactory.createGeneral();
// Or which createMethod() -- a bit confusing with lots of choice..
return new JenaDatasetImpl(dg, salt);
@@ -168,7 +167,7 @@ public class JenaFactory {
return new JenaGeneralizedQuad<RDFTerm,RDFTerm,RDFTerm,RDFTerm>(quad, salt);
}
- public static Quad fromJena(org.apache.jena.sparql.core.Quad quad, UUID salt) {
+ public static JenaQuad fromJena(org.apache.jena.sparql.core.Quad quad, UUID salt) {
return new JenaQuadImpl(quad, salt);
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/eb391f86/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0dda6a7..512946c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -286,6 +286,12 @@
</executions>
<configuration>
<additionalparam>-Xdoclint:all</additionalparam>
+ <links>
+ <link>${commons.javadoc.java.link}</link>
+ <link>https://jena.apache.org/documentation/javadoc/jena/</link>
+ <link>https://jena.apache.org/documentation/javadoc/arq/</link>
+ <link>http://rdf4j.org/javadoc/2.0/</link>
+ </links>
</configuration>
</plugin>
<!--
[05/19] incubator-commonsrdf git commit: conform to -Xdoclint:all
Posted by st...@apache.org.
conform to -Xdoclint:all
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/5afd0bd6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/5afd0bd6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/5afd0bd6
Branch: refs/heads/jena-jsonld-rdf4j-integration
Commit: 5afd0bd686d717c9b16943bd393fcb49cabd5fd6
Parents: e0d3191
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Sep 28 23:18:45 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Sep 28 23:18:45 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/commons/rdf/api/Graph.java | 5 ++
.../java/org/apache/commons/rdf/api/Quad.java | 4 +-
.../commons/rdf/experimental/RDFParser.java | 8 +--
.../commons/rdf/experimental/package-info.java | 1 -
pom.xml | 4 +-
.../simple/experimental/AbstractRDFParser.java | 54 +++++++++++++-------
.../rdf/simple/experimental/package-info.java | 11 ++--
7 files changed, 53 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/5afd0bd6/api/src/main/java/org/apache/commons/rdf/api/Graph.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/commons/rdf/api/Graph.java b/api/src/main/java/org/apache/commons/rdf/api/Graph.java
index 6106bab..7340e86 100644
--- a/api/src/main/java/org/apache/commons/rdf/api/Graph.java
+++ b/api/src/main/java/org/apache/commons/rdf/api/Graph.java
@@ -158,6 +158,7 @@ public interface Graph extends AutoCloseable,GraphLike<Triple, BlankNodeOrIRI, I
* This method is deprecated, use the equivalent method
* {@link #stream()} instead.
*
+ * @return A {@link Stream} over all triples.
*/
@Deprecated
default Stream<? extends Triple> getTriples() {
@@ -168,6 +169,10 @@ public interface Graph extends AutoCloseable,GraphLike<Triple, BlankNodeOrIRI, I
* This method is deprecated, use the equivalent method
* {@link #stream(BlankNodeOrIRI, IRI, RDFTerm)} instead.
*
+ * @param subject The triple subject (null is a wildcard)
+ * @param predicate The triple predicate (null is a wildcard)
+ * @param object The triple object (null is a wildcard)
+ * @return A {@link Stream} over the matched triples.
*/
@Deprecated
default Stream<? extends Triple> getTriples(BlankNodeOrIRI subject, IRI predicate,
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/5afd0bd6/api/src/main/java/org/apache/commons/rdf/api/Quad.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/commons/rdf/api/Quad.java b/api/src/main/java/org/apache/commons/rdf/api/Quad.java
index 951f593..d52a3c3 100644
--- a/api/src/main/java/org/apache/commons/rdf/api/Quad.java
+++ b/api/src/main/java/org/apache/commons/rdf/api/Quad.java
@@ -43,10 +43,10 @@ public interface Quad extends QuadLike<BlankNodeOrIRI,IRI,RDFTerm,BlankNodeOrIRI
* If {@link Optional#isPresent()}, then the {@link Optional#get()} is
* either a {@link BlankNode} or an {@link IRI}, indicating the
* <a href="https://www.w3.org/TR/rdf11-concepts/#dfn-named-graph">graph
- * name of this Quad. If the graph name is not present, e.g. the value is
+ * name</a> of this Quad. If the graph name is not present, e.g. the value is
* {@link Optional#empty()}, it indicates that this Quad is in the
* <a href="https://www.w3.org/TR/rdf11-concepts/#dfn-default-graph">default
- * graph.
+ * graph</a>.
*
* @return If {@link Optional#isPresent()}, the graph name
* {@link BlankNodeOrIRI} of this quad, otherwise
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/5afd0bd6/api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java b/api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java
index dd6bcf0..d0b8776 100644
--- a/api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java
+++ b/api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java
@@ -72,7 +72,7 @@ import org.apache.commons.rdf.api.Triple;
* or a cloned builder with the modified settings applied.
* Implementations are however encouraged to be immutable,
* thread-safe and document this. As an example starting point, see
- * {@link org.apache.commons.rdf.simple.AbstractRDFParserBuilder}.
+ * <code>org.apache.commons.rdf.simple.AbstractRDFParser</code>.
* <p>
* Example usage:
* </p>
@@ -128,7 +128,7 @@ public interface RDFParser {
* <p>
* The character set of the RDFSyntax is assumed to be
* {@link StandardCharsets#UTF_8} unless overridden within the document
- * (e.g. <?xml version="1.0" encoding="iso-8859-1"?></code> in
+ * (e.g. {@code <?xml version="1.0" encoding="iso-8859-1"?>} in
* {@link RDFSyntax#RDFXML}).
* <p>
* This method will override any contentType set with
@@ -259,8 +259,10 @@ public interface RDFParser {
* <p>
* This method is typically called with a functional consumer, for example:
* <pre>
+ * {@code
* List<Quad> quads = new ArrayList<Quad>;
* parserBuilder.target(quads::add).parse();
+ * }
* </pre>
*
* @param consumer
@@ -472,7 +474,7 @@ public interface RDFParser {
* parsing succeeded.
* <p>
* If an exception occurs during parsing, (e.g. {@link IOException} or
- * {@link org.apache.commons.rdf.simple.RDFParseException}),
+ * <code>org.apache.commons.rdf.simple.experimental.RDFParseException</code>),
* it should be indicated as the
* {@link java.util.concurrent.ExecutionException#getCause()} in the
* {@link java.util.concurrent.ExecutionException} thrown on
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/5afd0bd6/api/src/main/java/org/apache/commons/rdf/experimental/package-info.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/commons/rdf/experimental/package-info.java b/api/src/main/java/org/apache/commons/rdf/experimental/package-info.java
index 5f24ddc..5b9e489 100644
--- a/api/src/main/java/org/apache/commons/rdf/experimental/package-info.java
+++ b/api/src/main/java/org/apache/commons/rdf/experimental/package-info.java
@@ -24,7 +24,6 @@
* <p>
* When class/interface has stabilized, it will move to the
* {@link org.apache.commons.rdf.api} package.
- * <p>
* <ul>
* <li>{@link RDFParser} - a builder-like interface for parsing RDF to a
* {@link org.apache.commons.rdf.api.Graph} or
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/5afd0bd6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f9b85fc..4920284 100644
--- a/pom.xml
+++ b/pom.xml
@@ -281,7 +281,7 @@
</execution>
</executions>
<configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
+ <additionalparam>-Xdoclint:all</additionalparam>
</configuration>
</plugin>
<!--
@@ -448,7 +448,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
+ <additionalparam>-Xdoclint:all</additionalparam>
</configuration>
<reportSets>
<reportSet><!-- by default, id = "default" -->
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/5afd0bd6/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 8111f09..9b07699 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
@@ -67,6 +67,9 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>>
/**
* Get the set {@link RDFTermFactory}, if any.
+ *
+ * @return The {@link RDFTermFactory} to use, or {@link Optional#empty()} if
+ * it has not been set
*/
public Optional<RDFTermFactory> getRdfTermFactory() {
return rdfTermFactory;
@@ -75,9 +78,11 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>>
/**
* Get the set content-type {@link RDFSyntax}, if any.
* <p>
- * If this is {@link Optional#isPresent()}, then
- * {@link #getContentType()} contains the
- * value of {@link RDFSyntax#mediaType}.
+ * If this is {@link Optional#isPresent()}, then {@link #getContentType()}
+ * contains the value of {@link RDFSyntax#mediaType}.
+ *
+ * @return The {@link RDFSyntax} of the content type, or
+ * {@link Optional#empty()} if it has not been set
*/
public Optional<RDFSyntax> getContentTypeSyntax() {
return contentTypeSyntax;
@@ -86,11 +91,13 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>>
/**
* Get the set content-type String, if any.
* <p>
- * If this is {@link Optional#isPresent()} and
- * is recognized by {@link RDFSyntax#byMediaType(String)}, then
- * the corresponding {@link RDFSyntax} is set on
- * {@link #getContentType()}, otherwise that is
- * {@link Optional#empty()}.
+ * If this is {@link Optional#isPresent()} and is recognized by
+ * {@link RDFSyntax#byMediaType(String)}, then the corresponding
+ * {@link RDFSyntax} is set on {@link #getContentType()}, otherwise that is
+ * {@link Optional#empty()}.
+ *
+ * @return The Content-Type IANA media type, e.g. <code>text/turtle</code>,
+ * or {@link Optional#empty()} if it has not been set
*/
public final Optional<String> getContentType() {
return contentType;
@@ -99,8 +106,11 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>>
/**
* Get the target to consume parsed Quads.
* <p>
- * From the call to {@link #parseSynchronusly()}, this
- * method is always {@link Optional#isPresent()}.
+ * From the call to {@link #parseSynchronusly()}, this will be a
+ * non-<code>null</code> value (as a target is a required setting).
+ *
+ * @return The target consumer of {@link Quad}s, or <code>null</code> if it
+ * has not yet been set.
*
*/
public Consumer<Quad> getTarget() {
@@ -143,8 +153,8 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>>
/**
* Get the set base {@link IRI}, if present.
- * <p>
*
+ * @return The base {@link IRI}, or {@link Optional#empty()} if it has not been set
*/
public Optional<IRI> getBase() {
return base;
@@ -156,6 +166,8 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>>
* If this is {@link Optional#isPresent()}, then
* {@link #getSourceFile()} and {@link #getSourceIri()}
* are {@link Optional#empty()}.
+ *
+ * @return The source {@link InputStream}, or {@link Optional#empty()} if it has not been set
*/
public Optional<InputStream> getSourceInputStream() {
return sourceInputStream;
@@ -167,6 +179,8 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>>
* If this is {@link Optional#isPresent()}, then
* {@link #getSourceInputStream()} and {@link #getSourceIri()}
* are {@link Optional#empty()}.
+ *
+ * @return The source {@link Path}, or {@link Optional#empty()} if it has not been set
*/
public Optional<Path> getSourceFile() {
return sourceFile;
@@ -176,8 +190,10 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>>
* Get the set source {@link Path}.
* <p>
* If this is {@link Optional#isPresent()}, then
- * {@link #getSourceInputStream()} and {@link #getSourceInputStream()()}
+ * {@link #getSourceInputStream()} and {@link #getSourceInputStream()}
* are {@link Optional#empty()}.
+ *
+ * @return The source {@link IRI}, or {@link Optional#empty()} if it has not been set
*/
public Optional<IRI> getSourceIri() {
return sourceIri;
@@ -283,11 +299,12 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>>
/**
* Check if an iri is absolute.
* <p>
- * Used by {@link #source(String)} and {@link #base(String)}
+ * Used by {@link #source(String)} and {@link #base(String)}.
*
- * @param iri
+ * @param iri IRI to check
+ * @throws IllegalArgumentException If the IRI is not absolute
*/
- protected void checkIsAbsolute(IRI iri) {
+ protected void checkIsAbsolute(IRI iri) throws IllegalArgumentException {
if (!URI.create(iri.getIRIString()).isAbsolute()) {
throw new IllegalArgumentException("IRI is not absolute: " + iri);
}
@@ -327,7 +344,7 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>>
*
* @throws IllegalStateException if base is required, but not set.
*/
- protected void checkBaseRequired() {
+ protected void checkBaseRequired() throws IllegalStateException {
if (!base.isPresent() && sourceInputStream.isPresent()
&& !contentTypeSyntax.filter(t -> t == RDFSyntax.NQUADS || t == RDFSyntax.NTRIPLES).isPresent()) {
throw new IllegalStateException("base iri required for inputstream source");
@@ -347,12 +364,11 @@ public abstract class AbstractRDFParser<T extends AbstractRDFParser<T>>
sourceFile = Optional.empty();
}
-
/**
- * Reset all optional target* fields to Optional.empty()</code>
+ * Reset all optional target* fields to {@link Optional#empty()}.
* <p>
* Note that the consumer set for {@link #getTarget()} is
- * NOT reset.
+ * <strong>note</strong> reset.
* <p>
* Subclasses should override this and call <code>super.resetTarget()</code>
* if they need to reset any additional target* fields.
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/5afd0bd6/simple/src/main/java/org/apache/commons/rdf/simple/experimental/package-info.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/experimental/package-info.java b/simple/src/main/java/org/apache/commons/rdf/simple/experimental/package-info.java
index 5196f42..c5f4a42 100644
--- a/simple/src/main/java/org/apache/commons/rdf/simple/experimental/package-info.java
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/experimental/package-info.java
@@ -18,17 +18,14 @@
/**
* Experimental Commons RDF Simple implementations.
* <p>
- * Classes in this package should be considered <strong>at
- * risk</strong>; they might change or be removed in the next minor update of
- * Commons RDF.
+ * Classes in this package should be considered <strong>at risk</strong>; they
+ * might change or be removed in the next minor update of Commons RDF.
* <p>
* When a class has stabilized, it will move to the
* {@link org.apache.commons.rdf.simple} package.
- * <p>
* <ul>
- * <li>{@link AbstractRDFParser} - an abstract helper class
- * for implementations of
- * {@link org.apache.commons.rdf.api.experimental.RDFParser}.</li>
+ * <li>{@link AbstractRDFParser} - an abstract helper class for implementations
+ * of {@link org.apache.commons.rdf.experimental.RDFParser}.</li>
* </ul>
*/
package org.apache.commons.rdf.simple.experimental;
\ No newline at end of file
[19/19] incubator-commonsrdf git commit: Merge branch 'jena' into
jena-jsonld-rdf4j-integration
Posted by st...@apache.org.
Merge branch 'jena' into jena-jsonld-rdf4j-integration
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/c991d056
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/c991d056
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/c991d056
Branch: refs/heads/jena-jsonld-rdf4j-integration
Commit: c991d0562e21ecc49ddb607ec308f3a5b7e13bed
Parents: 489ed91 c763ffa
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Sep 29 01:14:05 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Sep 29 01:14:05 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[09/19] incubator-commonsrdf git commit: Merge branch 'jsonld-java'
into jena-jsonld-rdf4j-integration
Posted by st...@apache.org.
Merge branch 'jsonld-java' into jena-jsonld-rdf4j-integration
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/8296419a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/8296419a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/8296419a
Branch: refs/heads/jena-jsonld-rdf4j-integration
Commit: 8296419afd9705b23dbbf938d199ec927714c7bb
Parents: 9bfc39f 11a6a33
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Sep 28 23:33:23 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Sep 28 23:33:23 2016 +0100
----------------------------------------------------------------------
.../apache/commons/rdf/jsonldjava/JsonLdGraphLike.java | 8 ++++++--
.../apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java | 2 +-
.../rdf/jsonldjava/experimental/package-info.java | 12 ++++++------
.../commons/rdf/jsonldjava/JsonLdBlankNodeTest.java | 1 -
4 files changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
[15/19] incubator-commonsrdf git commit: Merge branch 'jena' into
jena-jsonld-rdf4j-integration
Posted by st...@apache.org.
Merge branch 'jena' into jena-jsonld-rdf4j-integration
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/28e38cad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/28e38cad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/28e38cad
Branch: refs/heads/jena-jsonld-rdf4j-integration
Commit: 28e38cad831eb32da5d78582b534dfaf7e062564
Parents: b7dec9b b0c55bd
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Sep 29 00:50:06 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Sep 29 00:50:06 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/jena/JenaRDFTermFactory.java | 202 ++++++++++++++-----
.../rdf/jena/experimental/package-info.java | 3 +-
2 files changed, 149 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
[13/19] incubator-commonsrdf git commit: Merge branch 'master' into
jena
Posted by st...@apache.org.
Merge branch 'master' into jena
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/70db409c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/70db409c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/70db409c
Branch: refs/heads/jena-jsonld-rdf4j-integration
Commit: 70db409c0bf07376dad188b88a8ed8ce89a6b81e
Parents: a423c41 5afd0bd
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Sep 28 23:59:07 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Sep 28 23:59:07 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/commons/rdf/api/Graph.java | 5 ++
.../java/org/apache/commons/rdf/api/Quad.java | 4 +-
.../commons/rdf/experimental/RDFParser.java | 8 +--
.../commons/rdf/experimental/package-info.java | 1 -
pom.xml | 4 +-
.../simple/experimental/AbstractRDFParser.java | 54 +++++++++++++-------
.../rdf/simple/experimental/package-info.java | 11 ++--
7 files changed, 53 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/70db409c/pom.xml
----------------------------------------------------------------------
[10/19] incubator-commonsrdf git commit: Merge branch 'master' into
rdf4j
Posted by st...@apache.org.
Merge branch 'master' into rdf4j
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/13c491e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/13c491e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/13c491e1
Branch: refs/heads/jena-jsonld-rdf4j-integration
Commit: 13c491e10d11d2638eca4e85b57390f6661b421d
Parents: 0a9c075 5afd0bd
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Sep 28 23:47:03 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Sep 28 23:47:03 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/commons/rdf/api/Graph.java | 5 ++
.../java/org/apache/commons/rdf/api/Quad.java | 4 +-
.../commons/rdf/experimental/RDFParser.java | 8 +--
.../commons/rdf/experimental/package-info.java | 1 -
pom.xml | 4 +-
.../simple/experimental/AbstractRDFParser.java | 54 +++++++++++++-------
.../rdf/simple/experimental/package-info.java | 11 ++--
7 files changed, 53 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/13c491e1/pom.xml
----------------------------------------------------------------------
[06/19] incubator-commonsrdf git commit: Merge branch 'master' into
jena-jsonld-rdf4j-integration
Posted by st...@apache.org.
Merge branch 'master' into jena-jsonld-rdf4j-integration
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/27e80654
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/27e80654
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/27e80654
Branch: refs/heads/jena-jsonld-rdf4j-integration
Commit: 27e80654d917efc3d79c54f8596b20b6af3b8734
Parents: 5498729 5afd0bd
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Sep 28 23:27:27 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Sep 28 23:27:27 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/commons/rdf/api/Graph.java | 5 ++
.../java/org/apache/commons/rdf/api/Quad.java | 4 +-
.../commons/rdf/experimental/RDFParser.java | 8 +--
.../commons/rdf/experimental/package-info.java | 1 -
pom.xml | 4 +-
.../simple/experimental/AbstractRDFParser.java | 54 +++++++++++++-------
.../rdf/simple/experimental/package-info.java | 11 ++--
7 files changed, 53 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/27e80654/pom.xml
----------------------------------------------------------------------
[07/19] incubator-commonsrdf git commit: Merge branch 'jena' into
jena-jsonld-rdf4j-integration
Posted by st...@apache.org.
Merge branch 'jena' into jena-jsonld-rdf4j-integration
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/9bfc39fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/9bfc39fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/9bfc39fc
Branch: refs/heads/jena-jsonld-rdf4j-integration
Commit: 9bfc39fce3dfd78d824c93c381b663efe43009f3
Parents: 27e8065 a423c41
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Sep 28 23:27:30 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Sep 28 23:27:30 2016 +0100
----------------------------------------------------------------------
jena/.settings/org.eclipse.core.resources.prefs | 6 ------
jena/.settings/org.eclipse.jdt.core.prefs | 5 -----
jena/.settings/org.eclipse.m2e.core.prefs | 4 ----
jena/src/test/resources/log4j.properties | 15 +++++++++++++++
4 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
[04/19] incubator-commonsrdf git commit: Corrected javadoc
Posted by st...@apache.org.
Corrected javadoc
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/3262b542
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/3262b542
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/3262b542
Branch: refs/heads/jena-jsonld-rdf4j-integration
Commit: 3262b542501b7bb89887f87f9443cafd78c4a734
Parents: 63da05c
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Sep 28 18:24:19 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Sep 28 18:24:19 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/commons/rdf/experimental/RDFParser.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/3262b542/api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java b/api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java
index dd6bcf0..8a9acf6 100644
--- a/api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java
+++ b/api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java
@@ -72,7 +72,7 @@ import org.apache.commons.rdf.api.Triple;
* or a cloned builder with the modified settings applied.
* Implementations are however encouraged to be immutable,
* thread-safe and document this. As an example starting point, see
- * {@link org.apache.commons.rdf.simple.AbstractRDFParserBuilder}.
+ * {@link org.apache.commons.rdf.simple.AbstractRDFParser}.
* <p>
* Example usage:
* </p>
[02/19] incubator-commonsrdf git commit: COMMONSRDF-33
log4j.properties ASF license header
Posted by st...@apache.org.
COMMONSRDF-33 log4j.properties ASF license header
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/a423c41a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/a423c41a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/a423c41a
Branch: refs/heads/jena-jsonld-rdf4j-integration
Commit: a423c41ac1b280d845a64c0f2494cb6e7f0d4f53
Parents: 059aa82
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Sep 28 14:57:02 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Sep 28 14:57:02 2016 +0100
----------------------------------------------------------------------
jena/src/test/resources/log4j.properties | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/a423c41a/jena/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/jena/src/test/resources/log4j.properties b/jena/src/test/resources/log4j.properties
index 5cedb50..794559f 100644
--- a/jena/src/test/resources/log4j.properties
+++ b/jena/src/test/resources/log4j.properties
@@ -1,3 +1,18 @@
+## 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.
log4j.rootLogger=INFO, stdlog
log4j.appender.stdlog=org.apache.log4j.ConsoleAppender
[14/19] incubator-commonsrdf git commit: COMMONSRDF-33 JavaDoc
enhancement
Posted by st...@apache.org.
COMMONSRDF-33 JavaDoc enhancement
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/b0c55bda
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/b0c55bda
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/b0c55bda
Branch: refs/heads/jena-jsonld-rdf4j-integration
Commit: b0c55bda2f1381b1b245228d8310c0cf8e7b5035
Parents: 70db409
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Sep 29 00:49:33 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Sep 29 00:49:33 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/jena/JenaRDFTermFactory.java | 202 ++++++++++++++-----
.../rdf/jena/experimental/package-info.java | 3 +-
2 files changed, 149 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/b0c55bda/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
index 7359acb..bde5bc4 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
@@ -41,6 +41,7 @@ import org.apache.jena.datatypes.xsd.XSDDatatype;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.riot.Lang;
+import org.apache.jena.riot.RDFDataMgr;
import org.apache.jena.riot.RDFLanguages;
import org.apache.jena.riot.system.StreamRDF;
import org.apache.jena.riot.system.StreamRDFBase;
@@ -153,6 +154,9 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* @see #fromJena(RDFTermFactory, org.apache.jena.graph.Triple)
*
* @param subject The subject of the statement
+ * @param predicate The predicate of the statement
+ * @param object The object of the statement
+
*
* @return Adapted {@link TripleLike}. Note that the generalized triple does
* <strong>not</strong> implement {@link Triple#equals(Object)} or
@@ -181,6 +185,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* @param node
* The Jena Node to adapt. It's {@link Node#isConcrete()} must be
* <code>true</code>.
+ * @return Adapted {@link JenaRDFTerm}
* @throws ConversionException
* if the node is not concrete.
*/
@@ -206,6 +211,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* @param salt
* UUID salt for the purpose of
* {@link BlankNode#uniqueReference()}
+ * @return Adapted {@link JenaRDFTerm}
* @throws ConversionException
* if the node is not concrete.
*/
@@ -214,7 +220,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
}
/**
- * Convert from Jena {@link Node} to any RDFCommons implementation.
+ * Convert from Jena {@link Node} to any Commons RDF implementation.
* <p>
* Note that if the {@link Node#isBlank()}, then the factory's
* {@link RDFTermFactory#createBlankNode(String)} will be used, meaning
@@ -228,6 +234,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* @param node
* The Jena Node to adapt. It's {@link Node#isConcrete()} must be
* <code>true</code>.
+ * @return Adapted {@link RDFTerm}
* @throws ConversionException
* if the node is not concrete.
*/
@@ -269,8 +276,8 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* @see #fromJena(RDFTermFactory, org.apache.jena.graph.Triple)
*
* @param triple
- * Jena triple
- * @return Adapted triple
+ * Jena {@link org.apache.jena.graph.Triple} to adapt
+ * @return Adapted {@link JenaTriple}
* @throws ConversionException
* if any of the triple's nodes are not concrete or the triple
* is a generalized triple
@@ -393,8 +400,8 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
}
/**
- * Convert from Jena {@link org.apache.jena.graph.Triple} to any RDFCommons
- * implementation.
+ * Convert from Jena {@link org.apache.jena.graph.Triple} to a Commons RDF
+ * {@link Triple}.
* <p>
* Note that if any of the triple's nodes {@link Node#isBlank()}, then the factory's
* {@link RDFTermFactory#createBlankNode(String)} will be used, meaning
@@ -467,18 +474,22 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
}
/**
- * Adapt an existing Jena {@link org.apache.jena.graph.Graph} to CommonsRDF {@link Graph}.
+ * Adapt an existing Jena {@link org.apache.jena.graph.Graph} to CommonsRDF
+ * {@link Graph}.
* <p>
- * This does not
- * take a copy, changes to the CommonsRDF Graph are reflected in the jena
- * graph, which is accessible from {@link JenaGraph#asJenaGraph()}.
+ * This does not take a copy, changes to the CommonsRDF Graph are reflected
+ * in the jena graph, which is accessible from
+ * {@link JenaGraph#asJenaGraph()}.
* <p>
* If the graph contains any {@link Node#isBlank()}, then any corresponding
- * {@link BlankNode} will use a {@link UUID} salt from this
- * {@link JenaRDFTermFactory} instance
- * in combination with {@link Node#getBlankNodeId()}
- * for the purpose of its {@link BlankNode#uniqueReference()}.
-
+ * {@link BlankNode} will use a {@link UUID} salt from this
+ * {@link JenaRDFTermFactory} instance in combination with
+ * {@link Node#getBlankNodeId()} for the purpose of its
+ * {@link BlankNode#uniqueReference()}.
+ *
+ * @param graph
+ * Jena {@link org.apache.jena.graph.Graph} to adapt
+ * @return Adapted {@link JenaGraph}
*/
public JenaGraph fromJena(org.apache.jena.graph.Graph graph) {
return JenaFactory.fromJena(graph, getSalt());
@@ -495,27 +506,32 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* {@link JenaRDFTermFactory} instance
* in combination with {@link Node#getBlankNodeId()}
* for the purpose of its {@link BlankNode#uniqueReference()}.
-
+ * @param model
+ * Jena {@link org.apache.jena.rdf.model.Model} to adapt
+ * @return Adapted {@link JenaGraph}
*/
public JenaGraph fromJena(org.apache.jena.rdf.model.Model model) {
return JenaFactory.fromJena(model, getSalt());
}
/**
- * Adapt an existing Jena {@link org.apache.jena.graph.Graph} to CommonsRDF {@link Graph}.
+ * Adapt an existing Jena {@link org.apache.jena.graph.Graph} to CommonsRDF
+ * {@link Graph}.
* <p>
- * This does not
- * take a copy, changes to the CommonsRDF Graph are reflected in the jena
- * graph, which is accessible from {@link JenaGraph#asJenaGraph()}.
+ * This does not take a copy, changes to the CommonsRDF Graph are reflected
+ * in the jena graph, which is accessible from
+ * {@link JenaGraph#asJenaGraph()}.
* <p>
* If the graph contains any {@link Node#isBlank()}, then any corresponding
- * {@link BlankNode} will use the provided {@link UUID} salt
- * in combination with {@link Node#getBlankNodeId()}
- * for the purpose of its {@link BlankNode#uniqueReference()}.
+ * {@link BlankNode} will use the provided {@link UUID} salt in combination
+ * with {@link Node#getBlankNodeId()} for the purpose of its
+ * {@link BlankNode#uniqueReference()}.
*
- * @param graph Jena graph to adapt
- * @param salt A {@link UUID} salt for adapting any {@link BlankNode}s
- * @return Adapted graph
+ * @param graph
+ * Jena {@link org.apache.jena.graph.Graph} to adapt
+ * @param salt
+ * A {@link UUID} salt for adapting any {@link BlankNode}s
+ * @return Adapted {@link JenaGraph}
*/
public static JenaGraph fromJena(org.apache.jena.graph.Graph graph, UUID salt) {
return JenaFactory.fromJena(graph, salt);
@@ -534,8 +550,8 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* in combination with {@link Node#getBlankNodeId()}
* for the purpose of its {@link BlankNode#uniqueReference()}.
*
- * @param datasetGraph Jena dataset graph to adapt
- * @return Adapted dataset
+ * @param datasetGraph Jena {@link DatasetGraph} to adapt
+ * @return Adapted {@link JenaDataset}
*/
public JenaDataset fromJena(DatasetGraph datasetGraph) {
return JenaFactory.fromJena(datasetGraph, getSalt());
@@ -554,44 +570,46 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* in combination with {@link Node#getBlankNodeId()}
* for the purpose of its {@link BlankNode#uniqueReference()}.
*
- * @param datasetGraph Jena dataset graph to adapt
- * @return Adapted dataset
+ * @param datasetGraph Jena {@link org.apache.jena.query.Dataset} to adapt
+ * @return Adapted {@link JenaDataset}
*/
public JenaDataset fromJena(org.apache.jena.query.Dataset datasetGraph) {
return JenaFactory.fromJena(datasetGraph.asDatasetGraph(), getSalt());
}
/**
- * Adapt an existing Jena {@link DatasetGraph} to CommonsRDF {@link Dataset}.
+ * Adapt an existing Jena {@link DatasetGraph} to CommonsRDF
+ * {@link Dataset}.
* <p>
- * This does not
- * take a copy, changes to the CommonsRDF Dataset are reflected in the jena
- * dataset graph, which is accessible from {@link JenaDataset#asJenaDatasetGraph()}.
+ * This does not take a copy, changes to the CommonsRDF Dataset are
+ * reflected in the jena dataset graph, which is accessible from
+ * {@link JenaDataset#asJenaDatasetGraph()}.
* <p>
- * If the dataset contains any {@link Node#isBlank()}, then any corresponding
- * {@link BlankNode} will use the provided {@link UUID} salt
- * in combination with {@link Node#getBlankNodeId()}
- * for the purpose of its {@link BlankNode#uniqueReference()}.
+ * If the dataset contains any {@link Node#isBlank()}, then any
+ * corresponding {@link BlankNode} will use the provided {@link UUID} salt
+ * in combination with {@link Node#getBlankNodeId()} for the purpose of its
+ * {@link BlankNode#uniqueReference()}.
*
- * @param datasetGraph Jena dataset graph to adapt
- * @param salt A {@link UUID} salt for adapting any {@link BlankNode}s
- * @return Adapted dataset
+ * @param datasetGraph
+ * Jena {@link DatasetGraph} to adapt
+ * @param salt
+ * A {@link UUID} salt for adapting any {@link BlankNode}s
+ * @return Adapted {@link JenaDataset}
*/
public static JenaDataset fromJena(DatasetGraph datasetGraph, UUID salt) {
return JenaFactory.fromJena(datasetGraph, salt);
}
/**
- * Convert from Jena to any RDFCommons implementation. This is a copy, even
- * if the factory is a RDFTermFactoryJena. Use
+ * Convert from Jena to any Commons RDF implementation. This is a copy, even
+ * if the factory is a JenaRDFTermFactory. Use
* {@link #fromJena(org.apache.jena.graph.Graph)} for a wrapper.
+ *
+ * @param factory {@link RDFTermFactory} to use for creating {@link RDFTerm}s
+ * @param graph Jena {@link org.apache.jena.graph.Graph} to copy
+ * @return Converted Graph
*/
public static Graph fromJena(RDFTermFactory factory, org.apache.jena.graph.Graph graph) {
- if (factory instanceof JenaRDFTermFactory) {
- // No need to convert, just wrap
- return ((JenaRDFTermFactory)factory).fromJena(graph);
- }
-
Graph g = factory.createGraph();
graph.find(Node.ANY, Node.ANY, Node.ANY).forEachRemaining(t -> {
g.add(fromJena(factory, t));
@@ -599,6 +617,29 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
return g;
}
+ /**
+ * Convert from Jena {@link org.apache.jena.sparql.core.Quad} to a Commons
+ * RDF {@link Quad}.
+ * <p>
+ * Note that if any of the quad's nodes {@link Node#isBlank()}, then the
+ * factory's {@link RDFTermFactory#createBlankNode(String)} will be used,
+ * meaning that care should be taken if reusing an {@link RDFTermFactory}
+ * instance for multiple conversion sessions.
+ *
+ * @see #fromJena(org.apache.jena.sparql.core.Quad)
+ * @see #fromJena(org.apache.jena.sparql.core.Quad, UUID)
+ * @see #fromJenaGeneralized(org.apache.jena.sparql.core.Quad)
+ *
+ * @param factory
+ * {@link RDFTermFactory} to use for creating the {@link Triple}
+ * and its {@link RDFTerm}s.
+ * @param quad
+ * Jena {@link org.apache.jena.sparql.core.Quad} to adapt
+ * @return Converted {@link Quad}
+ * @throws ConversionException
+ * if any of the quad's nodes are not concrete or the quad
+ * is a generalized quad
+ */
public static Quad fromJena(RDFTermFactory factory, org.apache.jena.sparql.core.Quad quad) {
if (factory instanceof JenaRDFTermFactory) {
// No need to convert, just wrap
@@ -620,8 +661,19 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
}
/**
- * Create a {@link StreamRDF} that inserts into any RDFCommons
- * implementation of Graph
+ * Create a {@link StreamRDF} instance that inserts the converted
+ * {@link Quad}s. into a the provided {@link Consumer}.
+ * <p>
+ * The returned {@link StreamRDF} can be used for instance with Jena's
+ * {@link RDFDataMgr#parse(StreamRDF, String)}.
+ *
+ * @param factory
+ * {@link RDFTermFactory} to use for creating {@link RDFTerm}s
+ * and {@link Quad}s.
+ * @param consumer
+ * A {@link Consumer} of {@link Quad}s
+ * @return A {@link StreamRDF} that will stream converted quads to the
+ * consumer
*/
public static StreamRDF streamJenaToCommonsRDF(RDFTermFactory factory, Consumer<Quad> consumer) {
return new StreamRDFBase() {
@@ -633,8 +685,20 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
}
/**
- * Create a {@link StreamRDF} that inserts into any RDFCommons
- * implementation of Graph
+ * Create a {@link StreamRDF} instance that inserts generalized
+ * {@link TripleLike}s. into a the provided {@link Consumer}.
+ * <p>
+ * A generalized triple allows any {@link RDFTerm} for
+ * {@link TripleLike#getSubject()}, {@link TripleLike#getPredicate()} and
+ * {@link TripleLike#getObject()}.
+ * <p>
+ * The returned {@link StreamRDF} can be used for instance with Jena's
+ * {@link RDFDataMgr#parse(StreamRDF, String)}.
+ *
+ * @param generalizedConsumer
+ * A {@link Consumer} of generalized {@link TripleLike}s
+ * @return A {@link StreamRDF} that will stream generalized triples to the
+ * consumer
*/
public StreamRDF streamJenaToGeneralizedTriple(Consumer<TripleLike<RDFTerm, RDFTerm, RDFTerm>> generalizedConsumer) {
return new StreamRDFBase() {
@@ -646,8 +710,20 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
}
/**
- * Create a {@link StreamRDF} that inserts into any RDFCommons
- * implementation of Graph
+ * Create a {@link StreamRDF} instance that inserts generalized
+ * {@link QuadLike}s. into a the provided {@link Consumer}.
+ * <p>
+ * A generalized quad allows any {@link RDFTerm} for
+ * {@link QuadLike#getSubject()}, {@link TripleLike#getPredicate()},
+ * {@link QuadLike#getObject()} and {@link QuadLike#getGraphName()} .
+ * <p>
+ * The returned {@link StreamRDF} can be used for instance with Jena's
+ * {@link RDFDataMgr#parse(StreamRDF, String)}.
+ *
+ * @param generalizedConsumer
+ * A {@link Consumer} of generalized {@link QuadLike}s
+ * @return A {@link StreamRDF} that will stream generalized quads to the
+ * consumer
*/
public StreamRDF streamJenaToGeneralizedQuad(Consumer<QuadLike<RDFTerm, RDFTerm, RDFTerm, RDFTerm>> generalizedConsumer) {
return new StreamRDFBase() {
@@ -662,6 +738,9 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* Convert a CommonsRDF Graph to a Jena Graph. If the Graph was from Jena
* originally, return that original object else create a copy using Jena
* objects.
+ *
+ * @param graph Commons RDF {@link Graph} to convert
+ * @return Converted Jena {@link org.apache.jena.graph.Graph}
*/
public static org.apache.jena.graph.Graph toJena(Graph graph) {
if (graph instanceof JenaGraph)
@@ -675,6 +754,9 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* Convert a CommonsRDF RDFTerm to a Jena Node. If the RDFTerm was from Jena
* originally, return that original object, else create a copy using Jena
* objects.
+ *
+ * @param term Commons RDF {@link RDFTerm} to convert
+ * @return Converted Jena {@link Node}
*/
public static Node toJena(RDFTerm term) {
if (term == null) {
@@ -709,6 +791,9 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* <p>
* If the triple was from Jena originally, return that original object, else
* create a copy using Jena objects.
+ *
+ * @param triple Commons RDF {@link Triple} to convert
+ * @return Converted Jena {@link org.apache.jena.graph.Triple}
*/
public static org.apache.jena.graph.Triple toJena(Triple triple) {
if (triple instanceof JenaTriple)
@@ -726,6 +811,9 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* <p>
* If the quad was from Jena originally, return that original object,
* otherwise create a copy using Jena objects.
+ *
+ * @param quad Commons RDF {@link Quad} to convert
+ * @return Converted Jena {@link org.apache.jena.sparql.core.Quad}
*/
public static org.apache.jena.sparql.core.Quad toJena(Quad quad) {
if (quad instanceof JenaQuad) {
@@ -754,10 +842,16 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
}
/**
- * Return the {@link UUID} salt.
+ * Return the {@link UUID} salt used by this factory.
* <p>
* The salt is used for the purposes of {@link BlankNode} identity, see
* {@link BlankNode#uniqueReference()} for details.
+ * <p>
+ * This salt can be used with the constructor
+ * {@link JenaRDFTermFactory#JenaRDFTermFactory(UUID)} or
+ * methods like {@link #fromJena(Node, UUID)} and
+ * {@link #fromJena(org.apache.jena.graph.Triple, UUID)}
+ * to ensure consistent {@link BlankNode}s.
*
* @return The {@link UUID} used as salt
*/
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/b0c55bda/jena/src/main/java/org/apache/commons/rdf/jena/experimental/package-info.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/experimental/package-info.java b/jena/src/main/java/org/apache/commons/rdf/jena/experimental/package-info.java
index 9fe39f4..aa2201d 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/experimental/package-info.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/experimental/package-info.java
@@ -24,11 +24,10 @@
* <p>
* When a class has stabilized, it will move to the
* {@link org.apache.commons.rdf.jena} package.
- * <p>
* <ul>
* <li>{@link JenaRDFParser} - a Jena-backed
* implementations of
- * {@link org.apache.commons.rdf.api.experimental.RDFParser}.</li>
+ * {@link org.apache.commons.rdf.experimental.RDFParser}.</li>
* </ul>
*/
package org.apache.commons.rdf.jena.experimental;
\ No newline at end of file
[12/19] incubator-commonsrdf git commit: Merge branch 'rdf4j' into
jena-jsonld-rdf4j-integration
Posted by st...@apache.org.
Merge branch 'rdf4j' into jena-jsonld-rdf4j-integration
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/b7dec9b0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/b7dec9b0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/b7dec9b0
Branch: refs/heads/jena-jsonld-rdf4j-integration
Commit: b7dec9b0237f529674b3bdbc36c10276bf56a5a3
Parents: 8296419 06711f9
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Sep 28 23:56:42 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Sep 28 23:56:42 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/rdf4j/RDF4JTermFactory.java | 33 +++++++++++---------
.../rdf/rdf4j/experimental/package-info.java | 3 +-
2 files changed, 19 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
[08/19] incubator-commonsrdf git commit: Merge branch 'master' into
jsonld-java
Posted by st...@apache.org.
Merge branch 'master' into jsonld-java
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/11a6a332
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/11a6a332
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/11a6a332
Branch: refs/heads/jena-jsonld-rdf4j-integration
Commit: 11a6a3323c38a3adab5f405e92d30d2ec9afbc66
Parents: 3262b54 5afd0bd
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Sep 28 23:31:57 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Sep 28 23:31:57 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/commons/rdf/api/Graph.java | 5 ++
.../java/org/apache/commons/rdf/api/Quad.java | 4 +-
.../commons/rdf/experimental/RDFParser.java | 8 +--
.../commons/rdf/experimental/package-info.java | 1 -
pom.xml | 4 +-
.../simple/experimental/AbstractRDFParser.java | 54 +++++++++++++-------
.../rdf/simple/experimental/package-info.java | 11 ++--
7 files changed, 53 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/11a6a332/pom.xml
----------------------------------------------------------------------
[03/19] incubator-commonsrdf git commit: COMMONSRDF-36 syntax improve
Javadoc syntax
Posted by st...@apache.org.
COMMONSRDF-36 syntax improve Javadoc syntax
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/63da05c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/63da05c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/63da05c0
Branch: refs/heads/jena-jsonld-rdf4j-integration
Commit: 63da05c09673305f24ccc7fd8654681a7e505ab4
Parents: 492ea23
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Sep 28 18:23:20 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Sep 28 18:23:20 2016 +0100
----------------------------------------------------------------------
.../apache/commons/rdf/jsonldjava/JsonLdGraphLike.java | 8 ++++++--
.../apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java | 2 +-
.../rdf/jsonldjava/experimental/package-info.java | 12 ++++++------
.../commons/rdf/jsonldjava/JsonLdBlankNodeTest.java | 1 -
4 files changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/63da05c0/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 dced9cc..1e3df61 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
@@ -39,9 +39,12 @@ import com.github.jsonldjava.core.RDFDataset.Node;
/**
* Common abstract {@link GraphLike}.
* <p>
- * Specialised by {@link JsonLdGraph}, {@link JsonLdUnionGraph} and {@link JsonLdDataset}.
+ * Specialised by {@link JsonLdGraph}, {@link JsonLdUnionGraph} and
+ * {@link JsonLdDataset}.
*
- * @param <T> specialisation of {@link TripleLike}, e.g. {@link Triple} or {@link Quad}
+ * @param <T>
+ * specialisation of {@link TripleLike}, e.g. {@link Triple} or
+ * {@link org.apache.commons.rdf.api.Quad}
*/
public interface JsonLdGraphLike <T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm>>
extends GraphLike<T, BlankNodeOrIRI, IRI, RDFTerm> {
@@ -51,6 +54,7 @@ public interface JsonLdGraphLike <T extends TripleLike<BlankNodeOrIRI, IRI, RDFT
* Changes in the JSONLD-Java dataset is reflected in this class and vice
* versa.
*
+ * @return The underlying JSONLD-JAva RDFDataset
*/
public RDFDataset getRdfDataSet();
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/63da05c0/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java
index 81b669a..b27e66a 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java
@@ -29,7 +29,7 @@ import org.apache.commons.rdf.api.Triple;
import com.github.jsonldjava.core.RDFDataset;
/**
- * A <strong>union graph</em> representation of a JsonLd {@link RDFDataset}.
+ * A <strong>union graph</strong> representation of a JsonLd {@link RDFDataset}.
* <p>
* A union graph contains all the triples of the dataset, irregardless of their
* graph names.
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/63da05c0/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/experimental/package-info.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/experimental/package-info.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/experimental/package-info.java
index fbd595e..67de964 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/experimental/package-info.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/experimental/package-info.java
@@ -16,19 +16,19 @@
* limitations under the License.
*/
/**
- * Experimental Commons RDF RDF4J implementations.
+ * Experimental Commons RDF JSONLD-Java implementations.
* <p>
* Classes in this package should be considered <strong>at
* risk</strong>; they might change or be removed in the next minor update of
* Commons RDF.
* <p>
* When a class has stabilized, it will move to the
- * {@link org.apache.commons.rdf.rdf4j} package.
- * <p>
+ * {@link org.apache.commons.rdf.jsonldjava} package.
* <ul>
- * <li>{@link RDF4JParser} - an RDF4J-backed
- * implementations of
- * {@link org.apache.commons.rdf.api.experimental.RDFParser}.</li>
+ * <li>{@link JsonLdParser} - an JSONLD-Java-backed
+ * implementations of
+ * {@link org.apache.commons.rdf.experimental.RDFParser}.
+ * </li>
* </ul>
*/
package org.apache.commons.rdf.jsonldjava.experimental;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/63da05c0/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.java b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.java
index 5bc83e7..0bf8fb6 100644
--- a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.java
+++ b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.java
@@ -4,7 +4,6 @@ import java.util.UUID;
import org.apache.commons.rdf.api.AbstractBlankNodeTest;
import org.apache.commons.rdf.api.BlankNode;
-import org.apache.commons.rdf.jsonldjava.JsonLdBlankNode.JsonLdBlankNodeImpl;
import com.github.jsonldjava.core.RDFDataset;
[18/19] incubator-commonsrdf git commit: Corrected javadoc (again..:))
Posted by st...@apache.org.
Corrected javadoc (again..:))
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/c763ffa7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/c763ffa7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/c763ffa7
Branch: refs/heads/jena-jsonld-rdf4j-integration
Commit: c763ffa75c434dde98844986029b097ad89ca70e
Parents: eb391f8
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Sep 29 01:13:06 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Sep 29 01:13:36 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/c763ffa7/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
index 1c1be7f..d8406b8 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
@@ -663,9 +663,9 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
}
/**
- * Return Jena {@link Lang} corresponding to a {@link RDFSyntax.
+ * Return Jena {@link Lang} corresponding to a {@link RDFSyntax}.
*
- * @param lang {@link RDFSyntax} to convert
+ * @param rdfSyntax {@link RDFSyntax} to convert
* @return Matched {@link Lang}, otherwise {@link Optional#empty()}
*/
public static Optional<Lang> rdfSyntaxToLang(RDFSyntax rdfSyntax) {
[17/19] incubator-commonsrdf git commit: Merge branch 'jena' into
jena-jsonld-rdf4j-integration
Posted by st...@apache.org.
Merge branch 'jena' into jena-jsonld-rdf4j-integration
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/489ed917
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/489ed917
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/489ed917
Branch: refs/heads/jena-jsonld-rdf4j-integration
Commit: 489ed91795a423453e6a2919728d976d4cdec9d2
Parents: 28e38ca eb391f8
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Sep 29 01:10:31 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Sep 29 01:10:31 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/jena/JenaRDFTermFactory.java | 20 ++++++++++++++++----
.../commons/rdf/jena/impl/JenaFactory.java | 5 ++---
pom.xml | 6 ++++++
3 files changed, 24 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/489ed917/pom.xml
----------------------------------------------------------------------
[11/19] incubator-commonsrdf git commit: Javadoc tweaks
Posted by st...@apache.org.
Javadoc tweaks
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/06711f9c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/06711f9c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/06711f9c
Branch: refs/heads/jena-jsonld-rdf4j-integration
Commit: 06711f9c2832609680b9775de39456b5b2b71ccb
Parents: 13c491e
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Sep 28 23:55:59 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Sep 28 23:55:59 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/rdf4j/RDF4JTermFactory.java | 33 +++++++++++---------
.../rdf/rdf4j/experimental/package-info.java | 3 +-
2 files changed, 19 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/06711f9c/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JTermFactory.java
----------------------------------------------------------------------
diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JTermFactory.java b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JTermFactory.java
index 55a8046..32044f1 100644
--- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JTermFactory.java
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JTermFactory.java
@@ -101,10 +101,8 @@ import org.eclipse.rdf4j.repository.Repository;
public class RDF4JTermFactory implements RDFTermFactory {
/**
- *
* Adapt a RDF4J {@link Value} as a Commons RDF {@link RDFTerm}.
* <p>
- * <p>
* The value will be of the same kind as the term, e.g. a
* {@link org.eclipse.rdf4j.model.BNode} is converted to a
* {@link org.apache.commons.rdf.api.BlankNode}, a
@@ -113,15 +111,19 @@ public class RDF4JTermFactory implements RDFTermFactory {
* {@link org.eclipse.rdf4j.model.Literal}. is converted to a
* {@link org.apache.commons.rdf.api.Literal}
*
- * @param value The RDF4J {@link Value} to convert.
+ * @param value
+ * The RDF4J {@link Value} to convert.
* @param salt
* A {@link UUID} salt to use for uniquely mapping any
* {@link BNode}s. The salt should typically be the same for
* multiple statements in the same {@link Repository} or
* {@link Model} to ensure {@link BlankNode#equals(Object)} and
* {@link BlankNode#uniqueReference()} works as intended.
+ * @param <T>
+ * The subclass of {@link Value}, e.g. {@link BNode}
* @return A {@link RDFTerm} that corresponds to the RDF4J value
- * @throws IllegalArgumentException if the value is not a BNode, Literal or IRI
+ * @throws IllegalArgumentException
+ * if the value is not a BNode, Literal or IRI
*/
@SuppressWarnings("unchecked")
public static <T extends Value> RDF4JTerm<T> asRDFTerm(final T value, UUID salt) {
@@ -213,7 +215,6 @@ public class RDF4JTermFactory implements RDFTermFactory {
*
* Adapt a RDF4J {@link Value} as a Commons RDF {@link RDFTerm}.
* <p>
- * <p>
* The value will be of the same kind as the term, e.g. a
* {@link org.eclipse.rdf4j.model.BNode} is converted to a
* {@link org.apache.commons.rdf.api.BlankNode}, a
@@ -235,6 +236,8 @@ public class RDF4JTermFactory implements RDFTermFactory {
* instance is used per RDF4J repository/model.
*
* @param value The RDF4J {@link Value} to convert.
+ * @param <T>
+ * The subclass of {@link Value}, e.g. {@link BNode}
* @return A {@link RDFTerm} that corresponds to the RDF4J value
* @throws IllegalArgumentException if the value is not a BNode, Literal or IRI
*/
@@ -358,19 +361,19 @@ public class RDF4JTermFactory implements RDFTermFactory {
/**
* Adapt a RDF4J {@link Statement} as a Commons RDF {@link Triple}.
* <p>
- * For the purpose of {@link BlankNode} equivalence, this
- * method will use an internal salt UUID that is unique per instance of
- * {@link RDF4JTermFactory}.
+ * For the purpose of {@link BlankNode} equivalence, this method will use an
+ * internal salt UUID that is unique per instance of
+ * {@link RDF4JTermFactory}.
* <p>
- * <strong>NOTE:</strong> If combining RDF4J statements from
- * multiple repositories or models, then their {@link BNode}s
- * may have the same {@link BNode#getID()}, which with this method
- * would become equivalent according to {@link BlankNode#equals(Object)} and
- * {@link BlankNode#uniqueReference()},
- * unless a separate {@link RDF4JTermFactory}
- * instance is used per RDF4J repository/model.
+ * <strong>NOTE:</strong> If combining RDF4J statements from multiple
+ * repositories or models, then their {@link BNode}s may have the same
+ * {@link BNode#getID()}, which with this method would become equivalent
+ * according to {@link BlankNode#equals(Object)} and
+ * {@link BlankNode#uniqueReference()}, unless a separate
+ * {@link RDF4JTermFactory} instance is used per RDF4J repository/model.
*
* @param statement
+ * The RDF4J {@link Statement} to adapt.
* @return A {@link RDF4JTriple} that is equivalent to the statement
*/
public RDF4JTriple asTriple(final Statement statement) {
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/06711f9c/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/experimental/package-info.java
----------------------------------------------------------------------
diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/experimental/package-info.java b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/experimental/package-info.java
index 192a148..217d003 100644
--- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/experimental/package-info.java
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/experimental/package-info.java
@@ -24,11 +24,10 @@
* <p>
* When a class has stabilized, it will move to the
* {@link org.apache.commons.rdf.rdf4j} package.
- * <p>
* <ul>
* <li>{@link RDF4JParser} - an RDF4J-backed
* implementations of
- * {@link org.apache.commons.rdf.api.experimental.RDFParser}.</li>
+ * {@link org.apache.commons.rdf.experimental.RDFParser}.</li>
* </ul>
*/
package org.apache.commons.rdf.rdf4j.experimental;
\ No newline at end of file