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/07 14:22:42 UTC

[29/50] incubator-commonsrdf git commit: Jena javadocs

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/master
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>
             <!--