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/14 12:48:03 UTC
svn commit: r999421 [7/13] - in /websites/production/commonsrdf/content: ./
apidocs/ apidocs/org/apache/commons/rdf/api/
apidocs/org/apache/commons/rdf/api/class-use/
apidocs/org/apache/commons/rdf/jena/
apidocs/org/apache/commons/rdf/jena/class-use/ a...
Modified: websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/api/TripleLike.html
==============================================================================
--- websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/api/TripleLike.html (original)
+++ websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/api/TripleLike.html Fri Oct 14 12:48:01 2016
@@ -37,46 +37,39 @@
<span class="sourceLineNo">029</span> * used for <em>generalised triples</em> (e.g. a {@link BlankNode} as predicate).<a name="line.29"></a>
<span class="sourceLineNo">030</span> * <p><a name="line.30"></a>
<span class="sourceLineNo">031</span> * Implementations should specialise which specific {@link RDFTerm} types they<a name="line.31"></a>
-<span class="sourceLineNo">032</span> * return for {@link #getSubject()}, {@link #getPredicate()} and<a name="line.32"></a>
+<span class="sourceLineNo">032</span> * return by overriding {@link #getSubject()}, {@link #getPredicate()} and<a name="line.32"></a>
<span class="sourceLineNo">033</span> * {@link #getObject()}.<a name="line.33"></a>
<span class="sourceLineNo">034</span> * <a name="line.34"></a>
-<span class="sourceLineNo">035</span> * @param <S><a name="line.35"></a>
-<span class="sourceLineNo">036</span> * The type of subjects in the statements, typically<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * {@link BlankNodeOrIRI}<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * @param <P><a name="line.38"></a>
-<span class="sourceLineNo">039</span> * The type of predicates in the statements, typically {@link IRI}<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * @param <O><a name="line.40"></a>
-<span class="sourceLineNo">041</span> * The type of objects in the statements, typically {@link RDFTerm}<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * <a name="line.42"></a>
-<span class="sourceLineNo">043</span> * @since 0.3.0-incubating<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * @see Triple<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * @see Quad<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * @see QuadLike<a name="line.46"></a>
-<span class="sourceLineNo">047</span> */<a name="line.47"></a>
-<span class="sourceLineNo">048</span>public interface TripleLike<S extends RDFTerm, P extends RDFTerm, O extends RDFTerm> {<a name="line.48"></a>
+<span class="sourceLineNo">035</span> * <a name="line.35"></a>
+<span class="sourceLineNo">036</span> * @since 0.3.0-incubating<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * @see Triple<a name="line.37"></a>
+<span class="sourceLineNo">038</span> * @see Quad<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * @see QuadLike<a name="line.39"></a>
+<span class="sourceLineNo">040</span> */<a name="line.40"></a>
+<span class="sourceLineNo">041</span>public interface TripleLike {<a name="line.41"></a>
+<span class="sourceLineNo">042</span><a name="line.42"></a>
+<span class="sourceLineNo">043</span> /**<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * The subject of this statement.<a name="line.44"></a>
+<span class="sourceLineNo">045</span> *<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * @return The subject, typically an {@link IRI} or {@link BlankNode}.<a name="line.46"></a>
+<span class="sourceLineNo">047</span> */<a name="line.47"></a>
+<span class="sourceLineNo">048</span> RDFTerm getSubject();<a name="line.48"></a>
<span class="sourceLineNo">049</span><a name="line.49"></a>
<span class="sourceLineNo">050</span> /**<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * The subject of this statement.<a name="line.51"></a>
+<span class="sourceLineNo">051</span> * The predicate of this statement.<a name="line.51"></a>
<span class="sourceLineNo">052</span> *<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * @return The subject, typically an {@link IRI} or {@link BlankNode}.<a name="line.53"></a>
+<span class="sourceLineNo">053</span> * @return The predicate, typically an {@link IRI}.<a name="line.53"></a>
<span class="sourceLineNo">054</span> */<a name="line.54"></a>
-<span class="sourceLineNo">055</span> S getSubject();<a name="line.55"></a>
+<span class="sourceLineNo">055</span> RDFTerm getPredicate();<a name="line.55"></a>
<span class="sourceLineNo">056</span><a name="line.56"></a>
<span class="sourceLineNo">057</span> /**<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * The predicate of this statement.<a name="line.58"></a>
+<span class="sourceLineNo">058</span> * The object of this statement.<a name="line.58"></a>
<span class="sourceLineNo">059</span> *<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * @return The predicate, typically an {@link IRI}.<a name="line.60"></a>
-<span class="sourceLineNo">061</span> */<a name="line.61"></a>
-<span class="sourceLineNo">062</span> P getPredicate();<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span> /**<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * The object of this statement.<a name="line.65"></a>
-<span class="sourceLineNo">066</span> *<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * @return The object, typically an {@link IRI}, {@link BlankNode} or<a name="line.67"></a>
-<span class="sourceLineNo">068</span> * {@link Literal}.<a name="line.68"></a>
-<span class="sourceLineNo">069</span> */<a name="line.69"></a>
-<span class="sourceLineNo">070</span> O getObject();<a name="line.70"></a>
-<span class="sourceLineNo">071</span>}<a name="line.71"></a>
+<span class="sourceLineNo">060</span> * @return The object, typically an {@link IRI}, {@link BlankNode} or<a name="line.60"></a>
+<span class="sourceLineNo">061</span> * {@link Literal}.<a name="line.61"></a>
+<span class="sourceLineNo">062</span> */<a name="line.62"></a>
+<span class="sourceLineNo">063</span> RDFTerm getObject();<a name="line.63"></a>
+<span class="sourceLineNo">064</span>}<a name="line.64"></a>
Modified: websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jena/JenaGeneralizedQuadLike.html
==============================================================================
--- websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jena/JenaGeneralizedQuadLike.html (original)
+++ websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jena/JenaGeneralizedQuadLike.html Fri Oct 14 12:48:01 2016
@@ -42,7 +42,7 @@
<span class="sourceLineNo">034</span> * <a name="line.34"></a>
<span class="sourceLineNo">035</span> * @see JenaGeneralizedTripleLike<a name="line.35"></a>
<span class="sourceLineNo">036</span> */<a name="line.36"></a>
-<span class="sourceLineNo">037</span>public interface JenaGeneralizedQuadLike extends JenaQuadLike<RDFTerm, RDFTerm, RDFTerm, RDFTerm> {<a name="line.37"></a>
+<span class="sourceLineNo">037</span>public interface JenaGeneralizedQuadLike extends JenaQuadLike<RDFTerm> {<a name="line.37"></a>
<span class="sourceLineNo">038</span>}<a name="line.38"></a>
Modified: websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jena/JenaGeneralizedTripleLike.html
==============================================================================
--- websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jena/JenaGeneralizedTripleLike.html (original)
+++ websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jena/JenaGeneralizedTripleLike.html Fri Oct 14 12:48:01 2016
@@ -43,7 +43,7 @@
<span class="sourceLineNo">035</span> * @see JenaGeneralizedQuadLike<a name="line.35"></a>
<span class="sourceLineNo">036</span> */<a name="line.36"></a>
<span class="sourceLineNo">037</span>public interface JenaGeneralizedTripleLike<a name="line.37"></a>
-<span class="sourceLineNo">038</span> extends JenaTripleLike<RDFTerm, RDFTerm, RDFTerm> { <a name="line.38"></a>
+<span class="sourceLineNo">038</span> extends JenaTripleLike { <a name="line.38"></a>
<span class="sourceLineNo">039</span>}<a name="line.39"></a>
Modified: websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jena/JenaQuad.html
==============================================================================
--- websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jena/JenaQuad.html (original)
+++ websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jena/JenaQuad.html Fri Oct 14 12:48:01 2016
@@ -26,18 +26,16 @@
<span class="sourceLineNo">018</span>package org.apache.commons.rdf.jena;<a name="line.18"></a>
<span class="sourceLineNo">019</span><a name="line.19"></a>
<span class="sourceLineNo">020</span>import org.apache.commons.rdf.api.BlankNodeOrIRI;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import org.apache.commons.rdf.api.IRI;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import org.apache.commons.rdf.api.RDFTerm;<a name="line.22"></a>
-<span class="sourceLineNo">023</span><a name="line.23"></a>
-<span class="sourceLineNo">024</span>/** <a name="line.24"></a>
-<span class="sourceLineNo">025</span> * A Jena-backed {@link org.apache.commons.rdf.api.Quad}.<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * <p><a name="line.26"></a>
-<span class="sourceLineNo">027</span> * The underlying Jena {@link org.apache.jena.sparql.core.Quad}<a name="line.27"></a>
-<span class="sourceLineNo">028</span> * can be accessed with {@link #asJenaQuad()}.<a name="line.28"></a>
-<span class="sourceLineNo">029</span> */<a name="line.29"></a>
-<span class="sourceLineNo">030</span>public interface JenaQuad extends org.apache.commons.rdf.api.Quad, <a name="line.30"></a>
-<span class="sourceLineNo">031</span> JenaQuadLike<BlankNodeOrIRI,IRI,RDFTerm,BlankNodeOrIRI> { <a name="line.31"></a>
-<span class="sourceLineNo">032</span>}<a name="line.32"></a>
+<span class="sourceLineNo">021</span><a name="line.21"></a>
+<span class="sourceLineNo">022</span>/** <a name="line.22"></a>
+<span class="sourceLineNo">023</span> * A Jena-backed {@link org.apache.commons.rdf.api.Quad}.<a name="line.23"></a>
+<span class="sourceLineNo">024</span> * <p><a name="line.24"></a>
+<span class="sourceLineNo">025</span> * The underlying Jena {@link org.apache.jena.sparql.core.Quad}<a name="line.25"></a>
+<span class="sourceLineNo">026</span> * can be accessed with {@link #asJenaQuad()}.<a name="line.26"></a>
+<span class="sourceLineNo">027</span> */<a name="line.27"></a>
+<span class="sourceLineNo">028</span>public interface JenaQuad extends org.apache.commons.rdf.api.Quad, <a name="line.28"></a>
+<span class="sourceLineNo">029</span> JenaQuadLike<BlankNodeOrIRI> { <a name="line.29"></a>
+<span class="sourceLineNo">030</span>}<a name="line.30"></a>
Modified: websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jena/JenaQuadLike.html
==============================================================================
--- websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jena/JenaQuadLike.html (original)
+++ websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jena/JenaQuadLike.html Fri Oct 14 12:48:01 2016
@@ -40,8 +40,8 @@
<span class="sourceLineNo">032</span> * @see JenaGeneralizedQuadLike<a name="line.32"></a>
<span class="sourceLineNo">033</span> * <a name="line.33"></a>
<span class="sourceLineNo">034</span> */<a name="line.34"></a>
-<span class="sourceLineNo">035</span>public interface JenaQuadLike<S extends RDFTerm, P extends RDFTerm, O extends RDFTerm, G extends RDFTerm> <a name="line.35"></a>
-<span class="sourceLineNo">036</span> extends JenaTripleLike<S,P,O>, QuadLike<S,P,O,G> {<a name="line.36"></a>
+<span class="sourceLineNo">035</span>public interface JenaQuadLike<G extends RDFTerm> <a name="line.35"></a>
+<span class="sourceLineNo">036</span> extends JenaTripleLike, QuadLike<G> {<a name="line.36"></a>
<span class="sourceLineNo">037</span><a name="line.37"></a>
<span class="sourceLineNo">038</span> /**<a name="line.38"></a>
<span class="sourceLineNo">039</span> * Return the adapted Jena quad<a name="line.39"></a>
Modified: websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jena/JenaRDFTermFactory.html
==============================================================================
--- websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jena/JenaRDFTermFactory.html (original)
+++ websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jena/JenaRDFTermFactory.html Fri Oct 14 12:48:01 2016
@@ -311,7 +311,7 @@
<span class="sourceLineNo">303</span> * @throws ConversionException<a name="line.303"></a>
<span class="sourceLineNo">304</span> * if any of the triple's nodes are not concrete<a name="line.304"></a>
<span class="sourceLineNo">305</span> */<a name="line.305"></a>
-<span class="sourceLineNo">306</span> public JenaTripleLike<RDFTerm, RDFTerm, RDFTerm> fromJenaGeneralized(org.apache.jena.graph.Triple triple) throws ConversionException {<a name="line.306"></a>
+<span class="sourceLineNo">306</span> public JenaTripleLike fromJenaGeneralized(org.apache.jena.graph.Triple triple) throws ConversionException {<a name="line.306"></a>
<span class="sourceLineNo">307</span> return internalJenaFactory.fromJenaGeneralized(triple, getSalt());<a name="line.307"></a>
<span class="sourceLineNo">308</span> }<a name="line.308"></a>
<span class="sourceLineNo">309</span><a name="line.309"></a>
@@ -341,7 +341,7 @@
<span class="sourceLineNo">333</span> * @throws ConversionException<a name="line.333"></a>
<span class="sourceLineNo">334</span> * if any of the quad nodes are not concrete<a name="line.334"></a>
<span class="sourceLineNo">335</span> */<a name="line.335"></a>
-<span class="sourceLineNo">336</span> public JenaQuadLike<RDFTerm, RDFTerm, RDFTerm, RDFTerm> fromJenaGeneralized(org.apache.jena.sparql.core.Quad quad) throws ConversionException {<a name="line.336"></a>
+<span class="sourceLineNo">336</span> public JenaQuadLike<RDFTerm> fromJenaGeneralized(org.apache.jena.sparql.core.Quad quad) throws ConversionException {<a name="line.336"></a>
<span class="sourceLineNo">337</span> return internalJenaFactory.fromJenaGeneralized(quad, getSalt());<a name="line.337"></a>
<span class="sourceLineNo">338</span> }<a name="line.338"></a>
<span class="sourceLineNo">339</span> <a name="line.339"></a>
@@ -575,7 +575,7 @@
<span class="sourceLineNo">567</span> * @return A {@link StreamRDF} that will stream generalized triples to the<a name="line.567"></a>
<span class="sourceLineNo">568</span> * consumer<a name="line.568"></a>
<span class="sourceLineNo">569</span> */<a name="line.569"></a>
-<span class="sourceLineNo">570</span> public StreamRDF streamJenaToGeneralizedTriple(Consumer<TripleLike<RDFTerm, RDFTerm, RDFTerm>> generalizedConsumer) {<a name="line.570"></a>
+<span class="sourceLineNo">570</span> public StreamRDF streamJenaToGeneralizedTriple(Consumer<TripleLike> generalizedConsumer) {<a name="line.570"></a>
<span class="sourceLineNo">571</span> return new StreamRDFBase() { <a name="line.571"></a>
<span class="sourceLineNo">572</span> @Override<a name="line.572"></a>
<span class="sourceLineNo">573</span> public void triple(org.apache.jena.graph.Triple triple) {<a name="line.573"></a>
@@ -600,7 +600,7 @@
<span class="sourceLineNo">592</span> * @return A {@link StreamRDF} that will stream generalized quads to the<a name="line.592"></a>
<span class="sourceLineNo">593</span> * consumer<a name="line.593"></a>
<span class="sourceLineNo">594</span> */<a name="line.594"></a>
-<span class="sourceLineNo">595</span> public StreamRDF streamJenaToGeneralizedQuad(Consumer<QuadLike<RDFTerm, RDFTerm, RDFTerm, RDFTerm>> generalizedConsumer) {<a name="line.595"></a>
+<span class="sourceLineNo">595</span> public StreamRDF streamJenaToGeneralizedQuad(Consumer<QuadLike<RDFTerm>> generalizedConsumer) {<a name="line.595"></a>
<span class="sourceLineNo">596</span> return new StreamRDFBase() {<a name="line.596"></a>
<span class="sourceLineNo">597</span> @Override<a name="line.597"></a>
<span class="sourceLineNo">598</span> public void quad(org.apache.jena.sparql.core.Quad quad) {<a name="line.598"></a>
Modified: websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jena/JenaTriple.html
==============================================================================
--- websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jena/JenaTriple.html (original)
+++ websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jena/JenaTriple.html Fri Oct 14 12:48:01 2016
@@ -25,18 +25,14 @@
<span class="sourceLineNo">017</span> */<a name="line.17"></a>
<span class="sourceLineNo">018</span>package org.apache.commons.rdf.jena;<a name="line.18"></a>
<span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import org.apache.commons.rdf.api.BlankNodeOrIRI;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import org.apache.commons.rdf.api.IRI;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import org.apache.commons.rdf.api.RDFTerm;<a name="line.22"></a>
-<span class="sourceLineNo">023</span><a name="line.23"></a>
-<span class="sourceLineNo">024</span>/** <a name="line.24"></a>
-<span class="sourceLineNo">025</span> * A Jena-backed {@link org.apache.commons.rdf.api.Triple}.<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * <p><a name="line.26"></a>
-<span class="sourceLineNo">027</span> * The underlying Jena {@link org.apache.jena.graph.Triple}<a name="line.27"></a>
-<span class="sourceLineNo">028</span> * can be accessed with {@link #asJenaTriple()}.<a name="line.28"></a>
-<span class="sourceLineNo">029</span> */<a name="line.29"></a>
-<span class="sourceLineNo">030</span>public interface JenaTriple extends org.apache.commons.rdf.api.Triple, JenaTripleLike<BlankNodeOrIRI, IRI, RDFTerm> {<a name="line.30"></a>
-<span class="sourceLineNo">031</span>}<a name="line.31"></a>
+<span class="sourceLineNo">020</span>/** <a name="line.20"></a>
+<span class="sourceLineNo">021</span> * A Jena-backed {@link org.apache.commons.rdf.api.Triple}.<a name="line.21"></a>
+<span class="sourceLineNo">022</span> * <p><a name="line.22"></a>
+<span class="sourceLineNo">023</span> * The underlying Jena {@link org.apache.jena.graph.Triple}<a name="line.23"></a>
+<span class="sourceLineNo">024</span> * can be accessed with {@link #asJenaTriple()}.<a name="line.24"></a>
+<span class="sourceLineNo">025</span> */<a name="line.25"></a>
+<span class="sourceLineNo">026</span>public interface JenaTriple extends org.apache.commons.rdf.api.Triple, JenaTripleLike {<a name="line.26"></a>
+<span class="sourceLineNo">027</span>}<a name="line.27"></a>
Modified: websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jena/JenaTripleLike.html
==============================================================================
--- websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jena/JenaTripleLike.html (original)
+++ websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jena/JenaTripleLike.html Fri Oct 14 12:48:01 2016
@@ -26,33 +26,32 @@
<span class="sourceLineNo">018</span><a name="line.18"></a>
<span class="sourceLineNo">019</span>package org.apache.commons.rdf.jena;<a name="line.19"></a>
<span class="sourceLineNo">020</span><a name="line.20"></a>
-<span class="sourceLineNo">021</span>import org.apache.commons.rdf.api.RDFTerm;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import org.apache.commons.rdf.api.TripleLike;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.jena.graph.Triple;<a name="line.23"></a>
-<span class="sourceLineNo">024</span><a name="line.24"></a>
-<span class="sourceLineNo">025</span>/**<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * A {@link TripleLike} wrapper of a Jena {@link Triple}.<a name="line.26"></a>
-<span class="sourceLineNo">027</span> * <p><a name="line.27"></a>
-<span class="sourceLineNo">028</span> * This is a marker interface common to its specializations {@link JenaTriple},<a name="line.28"></a>
-<span class="sourceLineNo">029</span> * {@link JenaGeneralizedTripleLike}, {@link JenaQuad} and<a name="line.29"></a>
-<span class="sourceLineNo">030</span> * {@link JenaGeneralizedQuadLike}.<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * <a name="line.31"></a>
-<span class="sourceLineNo">032</span> * @see JenaTriple<a name="line.32"></a>
-<span class="sourceLineNo">033</span> * @see JenaGeneralizedTripleLike<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * @see JenaQuad<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * @see JenaGeneralizedQuadLike<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * <a name="line.36"></a>
-<span class="sourceLineNo">037</span> */<a name="line.37"></a>
-<span class="sourceLineNo">038</span>public interface JenaTripleLike<S extends RDFTerm, P extends RDFTerm, O extends RDFTerm> <a name="line.38"></a>
-<span class="sourceLineNo">039</span> extends org.apache.commons.rdf.api.TripleLike<S,P,O> {<a name="line.39"></a>
-<span class="sourceLineNo">040</span><a name="line.40"></a>
-<span class="sourceLineNo">041</span> /**<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * Return the adapted Jena triple<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * <a name="line.43"></a>
-<span class="sourceLineNo">044</span> * @return Adapted Jena {@link Triple}.<a name="line.44"></a>
-<span class="sourceLineNo">045</span> */<a name="line.45"></a>
-<span class="sourceLineNo">046</span> Triple asJenaTriple();<a name="line.46"></a>
-<span class="sourceLineNo">047</span>}<a name="line.47"></a>
+<span class="sourceLineNo">021</span>import org.apache.commons.rdf.api.TripleLike;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import org.apache.jena.graph.Triple;<a name="line.22"></a>
+<span class="sourceLineNo">023</span><a name="line.23"></a>
+<span class="sourceLineNo">024</span>/**<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * A {@link TripleLike} wrapper of a Jena {@link Triple}.<a name="line.25"></a>
+<span class="sourceLineNo">026</span> * <p><a name="line.26"></a>
+<span class="sourceLineNo">027</span> * This is a marker interface common to its specializations {@link JenaTriple},<a name="line.27"></a>
+<span class="sourceLineNo">028</span> * {@link JenaGeneralizedTripleLike}, {@link JenaQuad} and<a name="line.28"></a>
+<span class="sourceLineNo">029</span> * {@link JenaGeneralizedQuadLike}.<a name="line.29"></a>
+<span class="sourceLineNo">030</span> * <a name="line.30"></a>
+<span class="sourceLineNo">031</span> * @see JenaTriple<a name="line.31"></a>
+<span class="sourceLineNo">032</span> * @see JenaGeneralizedTripleLike<a name="line.32"></a>
+<span class="sourceLineNo">033</span> * @see JenaQuad<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * @see JenaGeneralizedQuadLike<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * <a name="line.35"></a>
+<span class="sourceLineNo">036</span> */<a name="line.36"></a>
+<span class="sourceLineNo">037</span>public interface JenaTripleLike <a name="line.37"></a>
+<span class="sourceLineNo">038</span> extends org.apache.commons.rdf.api.TripleLike {<a name="line.38"></a>
+<span class="sourceLineNo">039</span><a name="line.39"></a>
+<span class="sourceLineNo">040</span> /**<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * Return the adapted Jena triple<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * <a name="line.42"></a>
+<span class="sourceLineNo">043</span> * @return Adapted Jena {@link Triple}.<a name="line.43"></a>
+<span class="sourceLineNo">044</span> */<a name="line.44"></a>
+<span class="sourceLineNo">045</span> Triple asJenaTriple();<a name="line.45"></a>
+<span class="sourceLineNo">046</span>}<a name="line.46"></a>
Modified: websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jena/experimental/JenaRDFParser.html
==============================================================================
--- websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jena/experimental/JenaRDFParser.html (original)
+++ websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jena/experimental/JenaRDFParser.html Fri Oct 14 12:48:01 2016
@@ -48,21 +48,21 @@
<span class="sourceLineNo">040</span><a name="line.40"></a>
<span class="sourceLineNo">041</span>public class JenaRDFParser extends AbstractRDFParser<JenaRDFParser> implements RDFParser {<a name="line.41"></a>
<span class="sourceLineNo">042</span><a name="line.42"></a>
-<span class="sourceLineNo">043</span> private Consumer<TripleLike<RDFTerm, RDFTerm, RDFTerm>> generalizedConsumerTriple;<a name="line.43"></a>
-<span class="sourceLineNo">044</span> private Consumer<QuadLike<RDFTerm, RDFTerm, RDFTerm, RDFTerm>> generalizedConsumerQuad;<a name="line.44"></a>
+<span class="sourceLineNo">043</span> private Consumer<TripleLike> generalizedConsumerTriple;<a name="line.43"></a>
+<span class="sourceLineNo">044</span> private Consumer<QuadLike<RDFTerm>> generalizedConsumerQuad;<a name="line.44"></a>
<span class="sourceLineNo">045</span><a name="line.45"></a>
<span class="sourceLineNo">046</span> protected RDFTermFactory createRDFTermFactory() {<a name="line.46"></a>
<span class="sourceLineNo">047</span> return new JenaRDFTermFactory();<a name="line.47"></a>
<span class="sourceLineNo">048</span> }<a name="line.48"></a>
<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span> public JenaRDFParser targetGeneralizedTriple(Consumer<TripleLike<RDFTerm,RDFTerm,RDFTerm>> consumer) {<a name="line.50"></a>
+<span class="sourceLineNo">050</span> public JenaRDFParser targetGeneralizedTriple(Consumer<TripleLike> consumer) {<a name="line.50"></a>
<span class="sourceLineNo">051</span> JenaRDFParser c = this.clone();<a name="line.51"></a>
<span class="sourceLineNo">052</span> c.resetTarget(); <a name="line.52"></a>
<span class="sourceLineNo">053</span> c.generalizedConsumerTriple = consumer;<a name="line.53"></a>
<span class="sourceLineNo">054</span> return c;<a name="line.54"></a>
<span class="sourceLineNo">055</span> }<a name="line.55"></a>
<span class="sourceLineNo">056</span><a name="line.56"></a>
-<span class="sourceLineNo">057</span> public JenaRDFParser targetGeneralizedQuad(Consumer<QuadLike<RDFTerm,RDFTerm,RDFTerm,RDFTerm>> consumer) {<a name="line.57"></a>
+<span class="sourceLineNo">057</span> public JenaRDFParser targetGeneralizedQuad(Consumer<QuadLike<RDFTerm>> consumer) {<a name="line.57"></a>
<span class="sourceLineNo">058</span> JenaRDFParser c = this.clone();<a name="line.58"></a>
<span class="sourceLineNo">059</span> c.resetTarget(); <a name="line.59"></a>
<span class="sourceLineNo">060</span> c.generalizedConsumerQuad = consumer;<a name="line.60"></a>
Modified: websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdGraph.html
==============================================================================
--- websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdGraph.html (original)
+++ websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdGraph.html Fri Oct 14 12:48:01 2016
@@ -42,10 +42,10 @@
<span class="sourceLineNo">034</span> * A {@link Graph} view of a JsonLd {@link RDFDataset}.<a name="line.34"></a>
<span class="sourceLineNo">035</span> * <a name="line.35"></a>
<span class="sourceLineNo">036</span> */<a name="line.36"></a>
-<span class="sourceLineNo">037</span>public interface JsonLdGraph extends JsonLdGraphLike<org.apache.commons.rdf.api.Triple>, Graph {<a name="line.37"></a>
+<span class="sourceLineNo">037</span>public interface JsonLdGraph extends JsonLdGraphLike<Triple>, Graph {<a name="line.37"></a>
<span class="sourceLineNo">038</span>}<a name="line.38"></a>
<span class="sourceLineNo">039</span><a name="line.39"></a>
-<span class="sourceLineNo">040</span>class JsonLdGraphImpl extends AbstractJsonLdGraphLike<org.apache.commons.rdf.api.Triple> <a name="line.40"></a>
+<span class="sourceLineNo">040</span>class JsonLdGraphImpl extends AbstractJsonLdGraphLike<Triple> <a name="line.40"></a>
<span class="sourceLineNo">041</span> implements JsonLdGraph {<a name="line.41"></a>
<span class="sourceLineNo">042</span><a name="line.42"></a>
<span class="sourceLineNo">043</span> private final Optional<BlankNodeOrIRI> graphName;<a name="line.43"></a>
Modified: websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.html
==============================================================================
--- websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.html (original)
+++ websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.html Fri Oct 14 12:48:01 2016
@@ -54,8 +54,8 @@
<span class="sourceLineNo">046</span> * specialisation of {@link TripleLike}, e.g. {@link Triple} or<a name="line.46"></a>
<span class="sourceLineNo">047</span> * {@link org.apache.commons.rdf.api.Quad}<a name="line.47"></a>
<span class="sourceLineNo">048</span> */<a name="line.48"></a>
-<span class="sourceLineNo">049</span>public interface JsonLdGraphLike <T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm>><a name="line.49"></a>
-<span class="sourceLineNo">050</span> extends GraphLike<T, BlankNodeOrIRI, IRI, RDFTerm> {<a name="line.50"></a>
+<span class="sourceLineNo">049</span>public interface JsonLdGraphLike <T extends TripleLike><a name="line.49"></a>
+<span class="sourceLineNo">050</span> extends GraphLike<T> {<a name="line.50"></a>
<span class="sourceLineNo">051</span> /**<a name="line.51"></a>
<span class="sourceLineNo">052</span> * Return the underlying JSONLD-Java {@link RDFDataset}.<a name="line.52"></a>
<span class="sourceLineNo">053</span> * <p><a name="line.53"></a>
@@ -67,7 +67,7 @@
<span class="sourceLineNo">059</span> public RDFDataset getRdfDataSet();<a name="line.59"></a>
<span class="sourceLineNo">060</span>}<a name="line.60"></a>
<span class="sourceLineNo">061</span><a name="line.61"></a>
-<span class="sourceLineNo">062</span>abstract class AbstractJsonLdGraphLike<T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm>><a name="line.62"></a>
+<span class="sourceLineNo">062</span>abstract class AbstractJsonLdGraphLike<T extends TripleLike><a name="line.62"></a>
<span class="sourceLineNo">063</span> implements JsonLdGraphLike<T> {<a name="line.63"></a>
<span class="sourceLineNo">064</span> <a name="line.64"></a>
<span class="sourceLineNo">065</span> /** <a name="line.65"></a>
@@ -112,120 +112,122 @@
<span class="sourceLineNo">104</span> org.apache.commons.rdf.api.Quad q = (org.apache.commons.rdf.api.Quad)t;<a name="line.104"></a>
<span class="sourceLineNo">105</span> graphName = q.getGraphName().orElse(null);<a name="line.105"></a>
<span class="sourceLineNo">106</span> }<a name="line.106"></a>
-<span class="sourceLineNo">107</span> add(graphName, t.getSubject(), t.getPredicate(), t.getObject());<a name="line.107"></a>
-<span class="sourceLineNo">108</span> } <a name="line.108"></a>
-<span class="sourceLineNo">109</span><a name="line.109"></a>
-<span class="sourceLineNo">110</span> void add(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {<a name="line.110"></a>
-<span class="sourceLineNo">111</span> String g = factory.asJsonLdString(graphName);<a name="line.111"></a>
-<span class="sourceLineNo">112</span> String s = factory.asJsonLdString(subject);<a name="line.112"></a>
-<span class="sourceLineNo">113</span> String p = factory.asJsonLdString(predicate); <a name="line.113"></a>
-<span class="sourceLineNo">114</span> if (object instanceof BlankNodeOrIRI) {<a name="line.114"></a>
-<span class="sourceLineNo">115</span> String o = factory.asJsonLdString((BlankNodeOrIRI)object);<a name="line.115"></a>
-<span class="sourceLineNo">116</span> rdfDataSet.addQuad(s,p,o,g);<a name="line.116"></a>
-<span class="sourceLineNo">117</span> } else if(object instanceof Literal) { <a name="line.117"></a>
-<span class="sourceLineNo">118</span> Literal literal = (Literal) object;<a name="line.118"></a>
-<span class="sourceLineNo">119</span> String language = literal.getLanguageTag().orElse(null);<a name="line.119"></a>
-<span class="sourceLineNo">120</span> String datatype = literal.getDatatype().getIRIString();<a name="line.120"></a>
-<span class="sourceLineNo">121</span> rdfDataSet.addQuad(s,p,literal.getLexicalForm(), datatype, language, g);<a name="line.121"></a>
-<span class="sourceLineNo">122</span> } <a name="line.122"></a>
-<span class="sourceLineNo">123</span> }<a name="line.123"></a>
-<span class="sourceLineNo">124</span> <a name="line.124"></a>
-<span class="sourceLineNo">125</span> public void close() {<a name="line.125"></a>
-<span class="sourceLineNo">126</span> // Drop the memory reference, but don't clear it<a name="line.126"></a>
-<span class="sourceLineNo">127</span> rdfDataSet = null; <a name="line.127"></a>
-<span class="sourceLineNo">128</span> } <a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span> @Override<a name="line.130"></a>
-<span class="sourceLineNo">131</span> public void clear() { <a name="line.131"></a>
-<span class="sourceLineNo">132</span> filteredGraphs(null).forEach(s -> s.clear());<a name="line.132"></a>
-<span class="sourceLineNo">133</span> // In theory we could use<a name="line.133"></a>
-<span class="sourceLineNo">134</span> //rdfDataSet.clear();<a name="line.134"></a>
-<span class="sourceLineNo">135</span> // but then we would need to also do<a name="line.135"></a>
-<span class="sourceLineNo">136</span> //rdfDataSet.put("@default", new ArrayList());<a name="line.136"></a>
-<span class="sourceLineNo">137</span> // .. both of which seems to be touching too much on JsonLd-Java's internal structure<a name="line.137"></a>
-<span class="sourceLineNo">138</span> }<a name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span> @Override<a name="line.140"></a>
-<span class="sourceLineNo">141</span> public boolean contains(T tripleOrQuad) { <a name="line.141"></a>
-<span class="sourceLineNo">142</span> return stream().anyMatch(Predicate.isEqual(tripleOrQuad));<a name="line.142"></a>
-<span class="sourceLineNo">143</span> }<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span> public RDFDataset getRdfDataSet() {<a name="line.145"></a>
-<span class="sourceLineNo">146</span> return rdfDataSet;<a name="line.146"></a>
-<span class="sourceLineNo">147</span> }<a name="line.147"></a>
-<span class="sourceLineNo">148</span><a name="line.148"></a>
-<span class="sourceLineNo">149</span> <a name="line.149"></a>
-<span class="sourceLineNo">150</span> @Override<a name="line.150"></a>
-<span class="sourceLineNo">151</span> public Stream<? extends T> stream() {<a name="line.151"></a>
-<span class="sourceLineNo">152</span> return rdfDataSet.graphNames().parallelStream()<a name="line.152"></a>
-<span class="sourceLineNo">153</span> .map(rdfDataSet::getQuads)<a name="line.153"></a>
-<span class="sourceLineNo">154</span> .flatMap(List<RDFDataset.Quad>::parallelStream)<a name="line.154"></a>
-<span class="sourceLineNo">155</span> .map(this::asTripleOrQuad);<a name="line.155"></a>
-<span class="sourceLineNo">156</span> }<a name="line.156"></a>
-<span class="sourceLineNo">157</span> <a name="line.157"></a>
-<span class="sourceLineNo">158</span> /**<a name="line.158"></a>
-<span class="sourceLineNo">159</span> * Convert JsonLd Quad to a Commons RDF {@link Triple} or {@link org.apache.commons.rdf.api.Quad}<a name="line.159"></a>
-<span class="sourceLineNo">160</span> * <a name="line.160"></a>
-<span class="sourceLineNo">161</span> * <a name="line.161"></a>
-<span class="sourceLineNo">162</span> * @see JsonLdRDFTermFactory#asTriple(Quad)<a name="line.162"></a>
-<span class="sourceLineNo">163</span> * @see JsonLdRDFTermFactory#asQuad(Quad)<a name="line.163"></a>
-<span class="sourceLineNo">164</span> * @param jsonldQuad jsonld quad to convert<a name="line.164"></a>
-<span class="sourceLineNo">165</span> * @return converted {@link TripleLike}<a name="line.165"></a>
-<span class="sourceLineNo">166</span> */<a name="line.166"></a>
-<span class="sourceLineNo">167</span> abstract T asTripleOrQuad(RDFDataset.Quad jsonldQuad);<a name="line.167"></a>
-<span class="sourceLineNo">168</span><a name="line.168"></a>
-<span class="sourceLineNo">169</span> // This will be made public in JsonLdDataset<a name="line.169"></a>
-<span class="sourceLineNo">170</span> // and is used by the other methods.<a name="line.170"></a>
-<span class="sourceLineNo">171</span> boolean contains(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI s, IRI p, RDFTerm o) {<a name="line.171"></a>
-<span class="sourceLineNo">172</span> return filteredGraphs(graphName).flatMap(List::stream).anyMatch(quadFilter(s,p,o));<a name="line.172"></a>
-<span class="sourceLineNo">173</span> }<a name="line.173"></a>
-<span class="sourceLineNo">174</span><a name="line.174"></a>
-<span class="sourceLineNo">175</span> Stream<List<RDFDataset.Quad>> filteredGraphs(Optional<BlankNodeOrIRI> graphName) {<a name="line.175"></a>
-<span class="sourceLineNo">176</span> return rdfDataSet.graphNames().parallelStream()<a name="line.176"></a>
-<span class="sourceLineNo">177</span> // if graphName == null (wildcard), select all graphs, <a name="line.177"></a>
-<span class="sourceLineNo">178</span> // otherwise check its jsonld string<a name="line.178"></a>
-<span class="sourceLineNo">179</span> // (including @default for default graph)<a name="line.179"></a>
-<span class="sourceLineNo">180</span> .filter(g -> graphName == null ||<a name="line.180"></a>
-<span class="sourceLineNo">181</span> g.equals(graphName.map(factory::asJsonLdString).orElse("@default")))<a name="line.181"></a>
-<span class="sourceLineNo">182</span> // remove the quads which match our filter (which could have nulls as wildcards) <a name="line.182"></a>
-<span class="sourceLineNo">183</span> .map(rdfDataSet::getQuads);<a name="line.183"></a>
-<span class="sourceLineNo">184</span> }<a name="line.184"></a>
-<span class="sourceLineNo">185</span><a name="line.185"></a>
-<span class="sourceLineNo">186</span> String graphNameAsJsonLdString(T tripleOrQuad) { <a name="line.186"></a>
-<span class="sourceLineNo">187</span> if (tripleOrQuad instanceof org.apache.commons.rdf.api.Quad) {<a name="line.187"></a>
-<span class="sourceLineNo">188</span> org.apache.commons.rdf.api.Quad quad = (org.apache.commons.rdf.api.Quad)tripleOrQuad;<a name="line.188"></a>
-<span class="sourceLineNo">189</span> return quad.getGraphName().map(factory::asJsonLdString).orElse("@default"); <a name="line.189"></a>
-<span class="sourceLineNo">190</span> } <a name="line.190"></a>
-<span class="sourceLineNo">191</span> return "@default";<a name="line.191"></a>
-<span class="sourceLineNo">192</span> }<a name="line.192"></a>
-<span class="sourceLineNo">193</span> <a name="line.193"></a>
-<span class="sourceLineNo">194</span> <a name="line.194"></a>
-<span class="sourceLineNo">195</span> Predicate<RDFDataset.Quad> quadFilter(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {<a name="line.195"></a>
-<span class="sourceLineNo">196</span> Optional<Node> subjectNode = Optional.ofNullable(subject).map(factory::asJsonLdNode);<a name="line.196"></a>
-<span class="sourceLineNo">197</span> Optional<Node> predicateNode = Optional.ofNullable(predicate).map(factory::asJsonLdNode);<a name="line.197"></a>
-<span class="sourceLineNo">198</span> Optional<Node> objectNode = Optional.ofNullable(object).map(factory::asJsonLdNode);<a name="line.198"></a>
-<span class="sourceLineNo">199</span> <a name="line.199"></a>
-<span class="sourceLineNo">200</span> return q -> {<a name="line.200"></a>
-<span class="sourceLineNo">201</span> if (subjectNode.isPresent() && subjectNode.get().compareTo(q.getSubject()) != 0) {<a name="line.201"></a>
-<span class="sourceLineNo">202</span> return false;<a name="line.202"></a>
-<span class="sourceLineNo">203</span> }<a name="line.203"></a>
-<span class="sourceLineNo">204</span> if (predicateNode.isPresent() && predicateNode.get().compareTo(q.getPredicate()) != 0) { <a name="line.204"></a>
-<span class="sourceLineNo">205</span> return false;<a name="line.205"></a>
-<span class="sourceLineNo">206</span> }<a name="line.206"></a>
-<span class="sourceLineNo">207</span> if (objectNode.isPresent() && objectNode.get().compareTo(q.getObject()) != 0) {<a name="line.207"></a>
-<span class="sourceLineNo">208</span> return false;<a name="line.208"></a>
-<span class="sourceLineNo">209</span> }<a name="line.209"></a>
-<span class="sourceLineNo">210</span> return true; <a name="line.210"></a>
-<span class="sourceLineNo">211</span> };<a name="line.211"></a>
-<span class="sourceLineNo">212</span> }<a name="line.212"></a>
-<span class="sourceLineNo">213</span> <a name="line.213"></a>
-<span class="sourceLineNo">214</span> // NOTE: This is made public in JsonLdDataset and is used by the other remove methods.<a name="line.214"></a>
-<span class="sourceLineNo">215</span> void remove(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {<a name="line.215"></a>
-<span class="sourceLineNo">216</span> // remove the quads which match our filter (which could have nulls as wildcards) <a name="line.216"></a>
-<span class="sourceLineNo">217</span> filteredGraphs(graphName).forEach(t -> t.removeIf(quadFilter(subject, predicate, object)));<a name="line.217"></a>
-<span class="sourceLineNo">218</span> }<a name="line.218"></a>
-<span class="sourceLineNo">219</span> <a name="line.219"></a>
-<span class="sourceLineNo">220</span>}<a name="line.220"></a>
+<span class="sourceLineNo">107</span> // FIXME: JSON-LD's rdfDataSet.addQuad method does not support <a name="line.107"></a>
+<span class="sourceLineNo">108</span> // generalized RDF, so we have to do a naive cast here<a name="line.108"></a>
+<span class="sourceLineNo">109</span> add(graphName, (BlankNodeOrIRI)t.getSubject(), (IRI)t.getPredicate(), t.getObject());<a name="line.109"></a>
+<span class="sourceLineNo">110</span> } <a name="line.110"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
+<span class="sourceLineNo">112</span> void add(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {<a name="line.112"></a>
+<span class="sourceLineNo">113</span> String g = factory.asJsonLdString(graphName);<a name="line.113"></a>
+<span class="sourceLineNo">114</span> String s = factory.asJsonLdString(subject);<a name="line.114"></a>
+<span class="sourceLineNo">115</span> String p = factory.asJsonLdString(predicate); <a name="line.115"></a>
+<span class="sourceLineNo">116</span> if (object instanceof BlankNodeOrIRI) {<a name="line.116"></a>
+<span class="sourceLineNo">117</span> String o = factory.asJsonLdString((BlankNodeOrIRI)object);<a name="line.117"></a>
+<span class="sourceLineNo">118</span> rdfDataSet.addQuad(s,p,o,g);<a name="line.118"></a>
+<span class="sourceLineNo">119</span> } else if(object instanceof Literal) { <a name="line.119"></a>
+<span class="sourceLineNo">120</span> Literal literal = (Literal) object;<a name="line.120"></a>
+<span class="sourceLineNo">121</span> String language = literal.getLanguageTag().orElse(null);<a name="line.121"></a>
+<span class="sourceLineNo">122</span> String datatype = literal.getDatatype().getIRIString();<a name="line.122"></a>
+<span class="sourceLineNo">123</span> rdfDataSet.addQuad(s,p,literal.getLexicalForm(), datatype, language, g);<a name="line.123"></a>
+<span class="sourceLineNo">124</span> } <a name="line.124"></a>
+<span class="sourceLineNo">125</span> }<a name="line.125"></a>
+<span class="sourceLineNo">126</span> <a name="line.126"></a>
+<span class="sourceLineNo">127</span> public void close() {<a name="line.127"></a>
+<span class="sourceLineNo">128</span> // Drop the memory reference, but don't clear it<a name="line.128"></a>
+<span class="sourceLineNo">129</span> rdfDataSet = null; <a name="line.129"></a>
+<span class="sourceLineNo">130</span> } <a name="line.130"></a>
+<span class="sourceLineNo">131</span><a name="line.131"></a>
+<span class="sourceLineNo">132</span> @Override<a name="line.132"></a>
+<span class="sourceLineNo">133</span> public void clear() { <a name="line.133"></a>
+<span class="sourceLineNo">134</span> filteredGraphs(null).forEach(s -> s.clear());<a name="line.134"></a>
+<span class="sourceLineNo">135</span> // In theory we could use<a name="line.135"></a>
+<span class="sourceLineNo">136</span> //rdfDataSet.clear();<a name="line.136"></a>
+<span class="sourceLineNo">137</span> // but then we would need to also do<a name="line.137"></a>
+<span class="sourceLineNo">138</span> //rdfDataSet.put("@default", new ArrayList());<a name="line.138"></a>
+<span class="sourceLineNo">139</span> // .. both of which seems to be touching too much on JsonLd-Java's internal structure<a name="line.139"></a>
+<span class="sourceLineNo">140</span> }<a name="line.140"></a>
+<span class="sourceLineNo">141</span><a name="line.141"></a>
+<span class="sourceLineNo">142</span> @Override<a name="line.142"></a>
+<span class="sourceLineNo">143</span> public boolean contains(T tripleOrQuad) { <a name="line.143"></a>
+<span class="sourceLineNo">144</span> return stream().anyMatch(Predicate.isEqual(tripleOrQuad));<a name="line.144"></a>
+<span class="sourceLineNo">145</span> }<a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span> public RDFDataset getRdfDataSet() {<a name="line.147"></a>
+<span class="sourceLineNo">148</span> return rdfDataSet;<a name="line.148"></a>
+<span class="sourceLineNo">149</span> }<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span> <a name="line.151"></a>
+<span class="sourceLineNo">152</span> @Override<a name="line.152"></a>
+<span class="sourceLineNo">153</span> public Stream<? extends T> stream() {<a name="line.153"></a>
+<span class="sourceLineNo">154</span> return rdfDataSet.graphNames().parallelStream()<a name="line.154"></a>
+<span class="sourceLineNo">155</span> .map(rdfDataSet::getQuads)<a name="line.155"></a>
+<span class="sourceLineNo">156</span> .flatMap(List<RDFDataset.Quad>::parallelStream)<a name="line.156"></a>
+<span class="sourceLineNo">157</span> .map(this::asTripleOrQuad);<a name="line.157"></a>
+<span class="sourceLineNo">158</span> }<a name="line.158"></a>
+<span class="sourceLineNo">159</span> <a name="line.159"></a>
+<span class="sourceLineNo">160</span> /**<a name="line.160"></a>
+<span class="sourceLineNo">161</span> * Convert JsonLd Quad to a Commons RDF {@link Triple} or {@link org.apache.commons.rdf.api.Quad}<a name="line.161"></a>
+<span class="sourceLineNo">162</span> * <a name="line.162"></a>
+<span class="sourceLineNo">163</span> * <a name="line.163"></a>
+<span class="sourceLineNo">164</span> * @see JsonLdRDFTermFactory#asTriple(Quad)<a name="line.164"></a>
+<span class="sourceLineNo">165</span> * @see JsonLdRDFTermFactory#asQuad(Quad)<a name="line.165"></a>
+<span class="sourceLineNo">166</span> * @param jsonldQuad jsonld quad to convert<a name="line.166"></a>
+<span class="sourceLineNo">167</span> * @return converted {@link TripleLike}<a name="line.167"></a>
+<span class="sourceLineNo">168</span> */<a name="line.168"></a>
+<span class="sourceLineNo">169</span> abstract T asTripleOrQuad(RDFDataset.Quad jsonldQuad);<a name="line.169"></a>
+<span class="sourceLineNo">170</span><a name="line.170"></a>
+<span class="sourceLineNo">171</span> // This will be made public in JsonLdDataset<a name="line.171"></a>
+<span class="sourceLineNo">172</span> // and is used by the other methods.<a name="line.172"></a>
+<span class="sourceLineNo">173</span> boolean contains(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI s, IRI p, RDFTerm o) {<a name="line.173"></a>
+<span class="sourceLineNo">174</span> return filteredGraphs(graphName).flatMap(List::stream).anyMatch(quadFilter(s,p,o));<a name="line.174"></a>
+<span class="sourceLineNo">175</span> }<a name="line.175"></a>
+<span class="sourceLineNo">176</span><a name="line.176"></a>
+<span class="sourceLineNo">177</span> Stream<List<RDFDataset.Quad>> filteredGraphs(Optional<BlankNodeOrIRI> graphName) {<a name="line.177"></a>
+<span class="sourceLineNo">178</span> return rdfDataSet.graphNames().parallelStream()<a name="line.178"></a>
+<span class="sourceLineNo">179</span> // if graphName == null (wildcard), select all graphs, <a name="line.179"></a>
+<span class="sourceLineNo">180</span> // otherwise check its jsonld string<a name="line.180"></a>
+<span class="sourceLineNo">181</span> // (including @default for default graph)<a name="line.181"></a>
+<span class="sourceLineNo">182</span> .filter(g -> graphName == null ||<a name="line.182"></a>
+<span class="sourceLineNo">183</span> g.equals(graphName.map(factory::asJsonLdString).orElse("@default")))<a name="line.183"></a>
+<span class="sourceLineNo">184</span> // remove the quads which match our filter (which could have nulls as wildcards) <a name="line.184"></a>
+<span class="sourceLineNo">185</span> .map(rdfDataSet::getQuads);<a name="line.185"></a>
+<span class="sourceLineNo">186</span> }<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span> String graphNameAsJsonLdString(T tripleOrQuad) { <a name="line.188"></a>
+<span class="sourceLineNo">189</span> if (tripleOrQuad instanceof org.apache.commons.rdf.api.Quad) {<a name="line.189"></a>
+<span class="sourceLineNo">190</span> org.apache.commons.rdf.api.Quad quad = (org.apache.commons.rdf.api.Quad)tripleOrQuad;<a name="line.190"></a>
+<span class="sourceLineNo">191</span> return quad.getGraphName().map(factory::asJsonLdString).orElse("@default"); <a name="line.191"></a>
+<span class="sourceLineNo">192</span> } <a name="line.192"></a>
+<span class="sourceLineNo">193</span> return "@default";<a name="line.193"></a>
+<span class="sourceLineNo">194</span> }<a name="line.194"></a>
+<span class="sourceLineNo">195</span> <a name="line.195"></a>
+<span class="sourceLineNo">196</span> <a name="line.196"></a>
+<span class="sourceLineNo">197</span> Predicate<RDFDataset.Quad> quadFilter(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {<a name="line.197"></a>
+<span class="sourceLineNo">198</span> Optional<Node> subjectNode = Optional.ofNullable(subject).map(factory::asJsonLdNode);<a name="line.198"></a>
+<span class="sourceLineNo">199</span> Optional<Node> predicateNode = Optional.ofNullable(predicate).map(factory::asJsonLdNode);<a name="line.199"></a>
+<span class="sourceLineNo">200</span> Optional<Node> objectNode = Optional.ofNullable(object).map(factory::asJsonLdNode);<a name="line.200"></a>
+<span class="sourceLineNo">201</span> <a name="line.201"></a>
+<span class="sourceLineNo">202</span> return q -> {<a name="line.202"></a>
+<span class="sourceLineNo">203</span> if (subjectNode.isPresent() && subjectNode.get().compareTo(q.getSubject()) != 0) {<a name="line.203"></a>
+<span class="sourceLineNo">204</span> return false;<a name="line.204"></a>
+<span class="sourceLineNo">205</span> }<a name="line.205"></a>
+<span class="sourceLineNo">206</span> if (predicateNode.isPresent() && predicateNode.get().compareTo(q.getPredicate()) != 0) { <a name="line.206"></a>
+<span class="sourceLineNo">207</span> return false;<a name="line.207"></a>
+<span class="sourceLineNo">208</span> }<a name="line.208"></a>
+<span class="sourceLineNo">209</span> if (objectNode.isPresent() && objectNode.get().compareTo(q.getObject()) != 0) {<a name="line.209"></a>
+<span class="sourceLineNo">210</span> return false;<a name="line.210"></a>
+<span class="sourceLineNo">211</span> }<a name="line.211"></a>
+<span class="sourceLineNo">212</span> return true; <a name="line.212"></a>
+<span class="sourceLineNo">213</span> };<a name="line.213"></a>
+<span class="sourceLineNo">214</span> }<a name="line.214"></a>
+<span class="sourceLineNo">215</span> <a name="line.215"></a>
+<span class="sourceLineNo">216</span> // NOTE: This is made public in JsonLdDataset and is used by the other remove methods.<a name="line.216"></a>
+<span class="sourceLineNo">217</span> void remove(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {<a name="line.217"></a>
+<span class="sourceLineNo">218</span> // remove the quads which match our filter (which could have nulls as wildcards) <a name="line.218"></a>
+<span class="sourceLineNo">219</span> filteredGraphs(graphName).forEach(t -> t.removeIf(quadFilter(subject, predicate, object)));<a name="line.219"></a>
+<span class="sourceLineNo">220</span> }<a name="line.220"></a>
+<span class="sourceLineNo">221</span> <a name="line.221"></a>
+<span class="sourceLineNo">222</span>}<a name="line.222"></a>
Modified: websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdQuad.html
==============================================================================
--- websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdQuad.html (original)
+++ websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdQuad.html Fri Oct 14 12:48:01 2016
@@ -32,46 +32,38 @@
<span class="sourceLineNo">024</span>import org.apache.commons.rdf.api.RDFTerm;<a name="line.24"></a>
<span class="sourceLineNo">025</span>// Note: To avoid confusion - don't import either Quad<a name="line.25"></a>
<span class="sourceLineNo">026</span><a name="line.26"></a>
-<span class="sourceLineNo">027</span>public interface JsonLdQuad extends org.apache.commons.rdf.api.Quad {<a name="line.27"></a>
+<span class="sourceLineNo">027</span>public interface JsonLdQuad extends org.apache.commons.rdf.api.Quad, JsonLdTripleLike {<a name="line.27"></a>
<span class="sourceLineNo">028</span><a name="line.28"></a>
-<span class="sourceLineNo">029</span> <a name="line.29"></a>
-<span class="sourceLineNo">030</span> /**<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * Return the underlying JsonLD {@link com.github.jsonldjava.core.RDFDataset.Quad}<a name="line.31"></a>
-<span class="sourceLineNo">032</span> * <a name="line.32"></a>
-<span class="sourceLineNo">033</span> * @return The JsonLD {@link com.github.jsonldjava.core.RDFDataset.Quad}<a name="line.33"></a>
-<span class="sourceLineNo">034</span> */<a name="line.34"></a>
-<span class="sourceLineNo">035</span> public com.github.jsonldjava.core.RDFDataset.Quad asJsonLdQuad();<a name="line.35"></a>
-<span class="sourceLineNo">036</span><a name="line.36"></a>
-<span class="sourceLineNo">037</span>}<a name="line.37"></a>
-<span class="sourceLineNo">038</span><a name="line.38"></a>
-<span class="sourceLineNo">039</span> final class JsonLdQuadImpl extends JsonLdQuadLikeImpl<BlankNodeOrIRI,IRI,RDFTerm,BlankNodeOrIRI> <a name="line.39"></a>
-<span class="sourceLineNo">040</span> implements JsonLdQuad {<a name="line.40"></a>
-<span class="sourceLineNo">041</span> <a name="line.41"></a>
-<span class="sourceLineNo">042</span> JsonLdQuadImpl(com.github.jsonldjava.core.RDFDataset.Quad quad, String blankNodePrefix) {<a name="line.42"></a>
-<span class="sourceLineNo">043</span> super(quad, blankNodePrefix); <a name="line.43"></a>
-<span class="sourceLineNo">044</span> }<a name="line.44"></a>
-<span class="sourceLineNo">045</span> <a name="line.45"></a>
-<span class="sourceLineNo">046</span> @Override<a name="line.46"></a>
-<span class="sourceLineNo">047</span> public boolean equals(Object obj) {<a name="line.47"></a>
-<span class="sourceLineNo">048</span> if (obj == this) {<a name="line.48"></a>
-<span class="sourceLineNo">049</span> return true;<a name="line.49"></a>
-<span class="sourceLineNo">050</span> }<a name="line.50"></a>
-<span class="sourceLineNo">051</span> if (! (obj instanceof org.apache.commons.rdf.api.Quad)) {<a name="line.51"></a>
-<span class="sourceLineNo">052</span> return false;<a name="line.52"></a>
-<span class="sourceLineNo">053</span> }<a name="line.53"></a>
-<span class="sourceLineNo">054</span> org.apache.commons.rdf.api.Quad other = (org.apache.commons.rdf.api.Quad) obj;<a name="line.54"></a>
-<span class="sourceLineNo">055</span> return getGraphName().equals(other.getGraphName()) &&<a name="line.55"></a>
-<span class="sourceLineNo">056</span> getSubject().equals(other.getSubject()) && <a name="line.56"></a>
-<span class="sourceLineNo">057</span> getPredicate().equals(other.getPredicate()) && <a name="line.57"></a>
-<span class="sourceLineNo">058</span> getObject().equals(other.getObject());<a name="line.58"></a>
-<span class="sourceLineNo">059</span> }<a name="line.59"></a>
-<span class="sourceLineNo">060</span> <a name="line.60"></a>
-<span class="sourceLineNo">061</span> @Override<a name="line.61"></a>
-<span class="sourceLineNo">062</span> public int hashCode() {<a name="line.62"></a>
-<span class="sourceLineNo">063</span> return Objects.hash(getGraphName(), getSubject(), getPredicate(), getObject());<a name="line.63"></a>
-<span class="sourceLineNo">064</span> } <a name="line.64"></a>
-<span class="sourceLineNo">065</span> } <a name="line.65"></a>
-<span class="sourceLineNo">066</span> <a name="line.66"></a>
+<span class="sourceLineNo">029</span>}<a name="line.29"></a>
+<span class="sourceLineNo">030</span><a name="line.30"></a>
+<span class="sourceLineNo">031</span> final class JsonLdQuadImpl extends JsonLdQuadLikeImpl<BlankNodeOrIRI,IRI,RDFTerm,BlankNodeOrIRI> <a name="line.31"></a>
+<span class="sourceLineNo">032</span> implements JsonLdQuad {<a name="line.32"></a>
+<span class="sourceLineNo">033</span> <a name="line.33"></a>
+<span class="sourceLineNo">034</span> JsonLdQuadImpl(com.github.jsonldjava.core.RDFDataset.Quad quad, String blankNodePrefix) {<a name="line.34"></a>
+<span class="sourceLineNo">035</span> super(quad, blankNodePrefix); <a name="line.35"></a>
+<span class="sourceLineNo">036</span> }<a name="line.36"></a>
+<span class="sourceLineNo">037</span> <a name="line.37"></a>
+<span class="sourceLineNo">038</span> @Override<a name="line.38"></a>
+<span class="sourceLineNo">039</span> public boolean equals(Object obj) {<a name="line.39"></a>
+<span class="sourceLineNo">040</span> if (obj == this) {<a name="line.40"></a>
+<span class="sourceLineNo">041</span> return true;<a name="line.41"></a>
+<span class="sourceLineNo">042</span> }<a name="line.42"></a>
+<span class="sourceLineNo">043</span> if (! (obj instanceof org.apache.commons.rdf.api.Quad)) {<a name="line.43"></a>
+<span class="sourceLineNo">044</span> return false;<a name="line.44"></a>
+<span class="sourceLineNo">045</span> }<a name="line.45"></a>
+<span class="sourceLineNo">046</span> org.apache.commons.rdf.api.Quad other = (org.apache.commons.rdf.api.Quad) obj;<a name="line.46"></a>
+<span class="sourceLineNo">047</span> return getGraphName().equals(other.getGraphName()) &&<a name="line.47"></a>
+<span class="sourceLineNo">048</span> getSubject().equals(other.getSubject()) && <a name="line.48"></a>
+<span class="sourceLineNo">049</span> getPredicate().equals(other.getPredicate()) && <a name="line.49"></a>
+<span class="sourceLineNo">050</span> getObject().equals(other.getObject());<a name="line.50"></a>
+<span class="sourceLineNo">051</span> }<a name="line.51"></a>
+<span class="sourceLineNo">052</span> <a name="line.52"></a>
+<span class="sourceLineNo">053</span> @Override<a name="line.53"></a>
+<span class="sourceLineNo">054</span> public int hashCode() {<a name="line.54"></a>
+<span class="sourceLineNo">055</span> return Objects.hash(getGraphName(), getSubject(), getPredicate(), getObject());<a name="line.55"></a>
+<span class="sourceLineNo">056</span> } <a name="line.56"></a>
+<span class="sourceLineNo">057</span> } <a name="line.57"></a>
+<span class="sourceLineNo">058</span> <a name="line.58"></a>
Modified: websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.html
==============================================================================
--- websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.html (original)
+++ websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.html Fri Oct 14 12:48:01 2016
@@ -32,55 +32,54 @@
<span class="sourceLineNo">024</span><a name="line.24"></a>
<span class="sourceLineNo">025</span>import com.github.jsonldjava.core.RDFDataset.Quad;<a name="line.25"></a>
<span class="sourceLineNo">026</span><a name="line.26"></a>
-<span class="sourceLineNo">027</span>public interface JsonLdQuadLike<S extends RDFTerm, P extends RDFTerm, O extends RDFTerm, G extends RDFTerm> extends QuadLike<S,P,O,G> {<a name="line.27"></a>
+<span class="sourceLineNo">027</span>public interface JsonLdQuadLike<G extends RDFTerm> extends QuadLike<G>, JsonLdTripleLike {<a name="line.27"></a>
<span class="sourceLineNo">028</span> <a name="line.28"></a>
-<span class="sourceLineNo">029</span> public Quad asJsonLdQuad();<a name="line.29"></a>
-<span class="sourceLineNo">030</span>}<a name="line.30"></a>
-<span class="sourceLineNo">031</span> <a name="line.31"></a>
-<span class="sourceLineNo">032</span> class JsonLdQuadLikeImpl<S extends RDFTerm, P extends RDFTerm, O extends RDFTerm, G extends RDFTerm> implements JsonLdQuadLike<S,P,O,G> {<a name="line.32"></a>
-<span class="sourceLineNo">033</span> <a name="line.33"></a>
-<span class="sourceLineNo">034</span> // Note: We always pass the blankNodePrefix and don't rely on the internal<a name="line.34"></a>
-<span class="sourceLineNo">035</span> // blankNodePrefix in this static factory<a name="line.35"></a>
-<span class="sourceLineNo">036</span> private static JsonLdRDFTermFactory rdfTermFactory = new JsonLdRDFTermFactory();<a name="line.36"></a>
-<span class="sourceLineNo">037</span> <a name="line.37"></a>
-<span class="sourceLineNo">038</span> private final Quad quad;<a name="line.38"></a>
-<span class="sourceLineNo">039</span> private String blankNodePrefix;<a name="line.39"></a>
-<span class="sourceLineNo">040</span> <a name="line.40"></a>
-<span class="sourceLineNo">041</span> JsonLdQuadLikeImpl(Quad jsonldQuad, String blankNodePrefix) {<a name="line.41"></a>
-<span class="sourceLineNo">042</span> this.quad = jsonldQuad;<a name="line.42"></a>
-<span class="sourceLineNo">043</span> this.blankNodePrefix = blankNodePrefix; <a name="line.43"></a>
-<span class="sourceLineNo">044</span> }<a name="line.44"></a>
-<span class="sourceLineNo">045</span> <a name="line.45"></a>
-<span class="sourceLineNo">046</span> @SuppressWarnings("unchecked") <a name="line.46"></a>
-<span class="sourceLineNo">047</span> @Override<a name="line.47"></a>
-<span class="sourceLineNo">048</span> public Optional<G> getGraphName() {<a name="line.48"></a>
-<span class="sourceLineNo">049</span> G g = (G) rdfTermFactory.asRDFTerm(quad.getGraph(), blankNodePrefix);<a name="line.49"></a>
-<span class="sourceLineNo">050</span> return Optional.ofNullable(g);<a name="line.50"></a>
-<span class="sourceLineNo">051</span> }<a name="line.51"></a>
-<span class="sourceLineNo">052</span> <a name="line.52"></a>
-<span class="sourceLineNo">053</span> @SuppressWarnings("unchecked")<a name="line.53"></a>
-<span class="sourceLineNo">054</span> @Override<a name="line.54"></a>
-<span class="sourceLineNo">055</span> public S getSubject() {<a name="line.55"></a>
-<span class="sourceLineNo">056</span> return (S) rdfTermFactory.asRDFTerm(quad.getSubject(), blankNodePrefix);<a name="line.56"></a>
-<span class="sourceLineNo">057</span> }<a name="line.57"></a>
-<span class="sourceLineNo">058</span> <a name="line.58"></a>
-<span class="sourceLineNo">059</span> @SuppressWarnings("unchecked")<a name="line.59"></a>
-<span class="sourceLineNo">060</span> @Override<a name="line.60"></a>
-<span class="sourceLineNo">061</span> public P getPredicate() {<a name="line.61"></a>
-<span class="sourceLineNo">062</span> return (P) rdfTermFactory.asRDFTerm(quad.getPredicate(), blankNodePrefix);<a name="line.62"></a>
-<span class="sourceLineNo">063</span> }<a name="line.63"></a>
-<span class="sourceLineNo">064</span> <a name="line.64"></a>
-<span class="sourceLineNo">065</span> @SuppressWarnings("unchecked")<a name="line.65"></a>
-<span class="sourceLineNo">066</span> @Override<a name="line.66"></a>
-<span class="sourceLineNo">067</span> public O getObject() {<a name="line.67"></a>
-<span class="sourceLineNo">068</span> return (O) rdfTermFactory.asRDFTerm(quad.getObject(), blankNodePrefix);<a name="line.68"></a>
-<span class="sourceLineNo">069</span> }<a name="line.69"></a>
-<span class="sourceLineNo">070</span> <a name="line.70"></a>
-<span class="sourceLineNo">071</span> public Quad asJsonLdQuad() {<a name="line.71"></a>
-<span class="sourceLineNo">072</span> return quad;<a name="line.72"></a>
-<span class="sourceLineNo">073</span> }<a name="line.73"></a>
-<span class="sourceLineNo">074</span> }<a name="line.74"></a>
-<span class="sourceLineNo">075</span><a name="line.75"></a>
+<span class="sourceLineNo">029</span>}<a name="line.29"></a>
+<span class="sourceLineNo">030</span> <a name="line.30"></a>
+<span class="sourceLineNo">031</span> class JsonLdQuadLikeImpl<S extends RDFTerm, P extends RDFTerm, O extends RDFTerm, G extends RDFTerm> implements JsonLdQuadLike<G> {<a name="line.31"></a>
+<span class="sourceLineNo">032</span> <a name="line.32"></a>
+<span class="sourceLineNo">033</span> // Note: We always pass the blankNodePrefix and don't rely on the internal<a name="line.33"></a>
+<span class="sourceLineNo">034</span> // blankNodePrefix in this static factory<a name="line.34"></a>
+<span class="sourceLineNo">035</span> private static JsonLdRDFTermFactory rdfTermFactory = new JsonLdRDFTermFactory();<a name="line.35"></a>
+<span class="sourceLineNo">036</span> <a name="line.36"></a>
+<span class="sourceLineNo">037</span> private final Quad quad;<a name="line.37"></a>
+<span class="sourceLineNo">038</span> private String blankNodePrefix;<a name="line.38"></a>
+<span class="sourceLineNo">039</span> <a name="line.39"></a>
+<span class="sourceLineNo">040</span> JsonLdQuadLikeImpl(Quad jsonldQuad, String blankNodePrefix) {<a name="line.40"></a>
+<span class="sourceLineNo">041</span> this.quad = jsonldQuad;<a name="line.41"></a>
+<span class="sourceLineNo">042</span> this.blankNodePrefix = blankNodePrefix; <a name="line.42"></a>
+<span class="sourceLineNo">043</span> }<a name="line.43"></a>
+<span class="sourceLineNo">044</span> <a name="line.44"></a>
+<span class="sourceLineNo">045</span> @SuppressWarnings("unchecked") <a name="line.45"></a>
+<span class="sourceLineNo">046</span> @Override<a name="line.46"></a>
+<span class="sourceLineNo">047</span> public Optional<G> getGraphName() {<a name="line.47"></a>
+<span class="sourceLineNo">048</span> G g = (G) rdfTermFactory.asRDFTerm(quad.getGraph(), blankNodePrefix);<a name="line.48"></a>
+<span class="sourceLineNo">049</span> return Optional.ofNullable(g);<a name="line.49"></a>
+<span class="sourceLineNo">050</span> }<a name="line.50"></a>
+<span class="sourceLineNo">051</span> <a name="line.51"></a>
+<span class="sourceLineNo">052</span> @SuppressWarnings("unchecked")<a name="line.52"></a>
+<span class="sourceLineNo">053</span> @Override<a name="line.53"></a>
+<span class="sourceLineNo">054</span> public S getSubject() {<a name="line.54"></a>
+<span class="sourceLineNo">055</span> return (S) rdfTermFactory.asRDFTerm(quad.getSubject(), blankNodePrefix);<a name="line.55"></a>
+<span class="sourceLineNo">056</span> }<a name="line.56"></a>
+<span class="sourceLineNo">057</span> <a name="line.57"></a>
+<span class="sourceLineNo">058</span> @SuppressWarnings("unchecked")<a name="line.58"></a>
+<span class="sourceLineNo">059</span> @Override<a name="line.59"></a>
+<span class="sourceLineNo">060</span> public P getPredicate() {<a name="line.60"></a>
+<span class="sourceLineNo">061</span> return (P) rdfTermFactory.asRDFTerm(quad.getPredicate(), blankNodePrefix);<a name="line.61"></a>
+<span class="sourceLineNo">062</span> }<a name="line.62"></a>
+<span class="sourceLineNo">063</span> <a name="line.63"></a>
+<span class="sourceLineNo">064</span> @SuppressWarnings("unchecked")<a name="line.64"></a>
+<span class="sourceLineNo">065</span> @Override<a name="line.65"></a>
+<span class="sourceLineNo">066</span> public O getObject() {<a name="line.66"></a>
+<span class="sourceLineNo">067</span> return (O) rdfTermFactory.asRDFTerm(quad.getObject(), blankNodePrefix);<a name="line.67"></a>
+<span class="sourceLineNo">068</span> }<a name="line.68"></a>
+<span class="sourceLineNo">069</span> <a name="line.69"></a>
+<span class="sourceLineNo">070</span> public Quad asJsonLdQuad() {<a name="line.70"></a>
+<span class="sourceLineNo">071</span> return quad;<a name="line.71"></a>
+<span class="sourceLineNo">072</span> }<a name="line.72"></a>
+<span class="sourceLineNo">073</span> }<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
Modified: websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdTriple.html
==============================================================================
--- websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdTriple.html (original)
+++ websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdTriple.html Fri Oct 14 12:48:01 2016
@@ -34,39 +34,34 @@
<span class="sourceLineNo">026</span><a name="line.26"></a>
<span class="sourceLineNo">027</span>import com.github.jsonldjava.core.RDFDataset.Quad;<a name="line.27"></a>
<span class="sourceLineNo">028</span><a name="line.28"></a>
-<span class="sourceLineNo">029</span>public interface JsonLdTriple extends Triple {<a name="line.29"></a>
+<span class="sourceLineNo">029</span>public interface JsonLdTriple extends Triple, JsonLdTripleLike {<a name="line.29"></a>
<span class="sourceLineNo">030</span><a name="line.30"></a>
-<span class="sourceLineNo">031</span> /**<a name="line.31"></a>
-<span class="sourceLineNo">032</span> * Return the underlying JsonLD {@link com.github.jsonldjava.core.RDFDataset.Quad}<a name="line.32"></a>
-<span class="sourceLineNo">033</span> * <a name="line.33"></a>
-<span class="sourceLineNo">034</span> * @return The JsonLD {@link com.github.jsonldjava.core.RDFDataset.Quad}<a name="line.34"></a>
-<span class="sourceLineNo">035</span> */<a name="line.35"></a>
-<span class="sourceLineNo">036</span> public com.github.jsonldjava.core.RDFDataset.Quad asJsonLdQuad();<a name="line.36"></a>
-<span class="sourceLineNo">037</span>}<a name="line.37"></a>
-<span class="sourceLineNo">038</span> <a name="line.38"></a>
-<span class="sourceLineNo">039</span> final class JsonLdTripleImpl extends JsonLdQuadLikeImpl<BlankNodeOrIRI, IRI, RDFTerm, RDFTerm><a name="line.39"></a>
-<span class="sourceLineNo">040</span> implements JsonLdTriple {<a name="line.40"></a>
-<span class="sourceLineNo">041</span> <a name="line.41"></a>
-<span class="sourceLineNo">042</span> JsonLdTripleImpl(Quad quad, String blankNodePrefix) {<a name="line.42"></a>
-<span class="sourceLineNo">043</span> super(quad, blankNodePrefix);<a name="line.43"></a>
-<span class="sourceLineNo">044</span> }<a name="line.44"></a>
-<span class="sourceLineNo">045</span> <a name="line.45"></a>
-<span class="sourceLineNo">046</span> @Override<a name="line.46"></a>
-<span class="sourceLineNo">047</span> public boolean equals(Object obj) {<a name="line.47"></a>
-<span class="sourceLineNo">048</span> if (! (obj instanceof Triple)) {<a name="line.48"></a>
-<span class="sourceLineNo">049</span> return false;<a name="line.49"></a>
-<span class="sourceLineNo">050</span> }<a name="line.50"></a>
-<span class="sourceLineNo">051</span> Triple other = (Triple) obj;<a name="line.51"></a>
-<span class="sourceLineNo">052</span> return getSubject().equals(other.getSubject()) && <a name="line.52"></a>
-<span class="sourceLineNo">053</span> getPredicate().equals(other.getPredicate()) && <a name="line.53"></a>
-<span class="sourceLineNo">054</span> getObject().equals(other.getObject());<a name="line.54"></a>
+<span class="sourceLineNo">031</span><a name="line.31"></a>
+<span class="sourceLineNo">032</span>}<a name="line.32"></a>
+<span class="sourceLineNo">033</span> <a name="line.33"></a>
+<span class="sourceLineNo">034</span> final class JsonLdTripleImpl extends JsonLdQuadLikeImpl<BlankNodeOrIRI, IRI, RDFTerm, RDFTerm><a name="line.34"></a>
+<span class="sourceLineNo">035</span> implements JsonLdTriple {<a name="line.35"></a>
+<span class="sourceLineNo">036</span> <a name="line.36"></a>
+<span class="sourceLineNo">037</span> JsonLdTripleImpl(Quad quad, String blankNodePrefix) {<a name="line.37"></a>
+<span class="sourceLineNo">038</span> super(quad, blankNodePrefix);<a name="line.38"></a>
+<span class="sourceLineNo">039</span> }<a name="line.39"></a>
+<span class="sourceLineNo">040</span> <a name="line.40"></a>
+<span class="sourceLineNo">041</span> @Override<a name="line.41"></a>
+<span class="sourceLineNo">042</span> public boolean equals(Object obj) {<a name="line.42"></a>
+<span class="sourceLineNo">043</span> if (! (obj instanceof Triple)) {<a name="line.43"></a>
+<span class="sourceLineNo">044</span> return false;<a name="line.44"></a>
+<span class="sourceLineNo">045</span> }<a name="line.45"></a>
+<span class="sourceLineNo">046</span> Triple other = (Triple) obj;<a name="line.46"></a>
+<span class="sourceLineNo">047</span> return getSubject().equals(other.getSubject()) && <a name="line.47"></a>
+<span class="sourceLineNo">048</span> getPredicate().equals(other.getPredicate()) && <a name="line.48"></a>
+<span class="sourceLineNo">049</span> getObject().equals(other.getObject());<a name="line.49"></a>
+<span class="sourceLineNo">050</span> }<a name="line.50"></a>
+<span class="sourceLineNo">051</span> <a name="line.51"></a>
+<span class="sourceLineNo">052</span> @Override<a name="line.52"></a>
+<span class="sourceLineNo">053</span> public int hashCode() {<a name="line.53"></a>
+<span class="sourceLineNo">054</span> return Objects.hash(getSubject(), getPredicate(), getObject());<a name="line.54"></a>
<span class="sourceLineNo">055</span> }<a name="line.55"></a>
-<span class="sourceLineNo">056</span> <a name="line.56"></a>
-<span class="sourceLineNo">057</span> @Override<a name="line.57"></a>
-<span class="sourceLineNo">058</span> public int hashCode() {<a name="line.58"></a>
-<span class="sourceLineNo">059</span> return Objects.hash(getSubject(), getPredicate(), getObject());<a name="line.59"></a>
-<span class="sourceLineNo">060</span> }<a name="line.60"></a>
-<span class="sourceLineNo">061</span> }<a name="line.61"></a>
+<span class="sourceLineNo">056</span> }<a name="line.56"></a>
Added: websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdTripleLike.html
==============================================================================
--- websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdTripleLike.html (added)
+++ websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdTripleLike.html Fri Oct 14 12:48:01 2016
@@ -0,0 +1,86 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+<title>Source code</title>
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+</head>
+<body>
+<div class="sourceContainer">
+<pre><span class="sourceLineNo">001</span>package org.apache.commons.rdf.jsonldjava;<a name="line.1"></a>
+<span class="sourceLineNo">002</span><a name="line.2"></a>
+<span class="sourceLineNo">003</span>import org.apache.commons.rdf.api.TripleLike;<a name="line.3"></a>
+<span class="sourceLineNo">004</span><a name="line.4"></a>
+<span class="sourceLineNo">005</span>public interface JsonLdTripleLike extends TripleLike {<a name="line.5"></a>
+<span class="sourceLineNo">006</span><a name="line.6"></a>
+<span class="sourceLineNo">007</span> /**<a name="line.7"></a>
+<span class="sourceLineNo">008</span> * Return the underlying JsonLD {@link com.github.jsonldjava.core.RDFDataset.Quad}<a name="line.8"></a>
+<span class="sourceLineNo">009</span> * <a name="line.9"></a>
+<span class="sourceLineNo">010</span> * @return The JsonLD {@link com.github.jsonldjava.core.RDFDataset.Quad}<a name="line.10"></a>
+<span class="sourceLineNo">011</span> */<a name="line.11"></a>
+<span class="sourceLineNo">012</span> public com.github.jsonldjava.core.RDFDataset.Quad asJsonLdQuad();<a name="line.12"></a>
+<span class="sourceLineNo">013</span><a name="line.13"></a>
+<span class="sourceLineNo">014</span>}<a name="line.14"></a>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>
\ No newline at end of file