You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@commons.apache.org by st...@apache.org on 2017/02/09 00:35:29 UTC
svn commit: r1006435 [4/18] - in
/websites/production/commons/content/proper/commons-rdf-parent: ./ apidocs/
apidocs/org/apache/commons/rdf/api/
apidocs/org/apache/commons/rdf/api/class-use/
apidocs/org/apache/commons/rdf/jena/ apidocs/org/apache/commo...
Modified: websites/production/commons/content/proper/commons-rdf-parent/apidocs/src-html/org/apache/commons/rdf/jena/impl/InternalJenaFactory.html
==============================================================================
--- websites/production/commons/content/proper/commons-rdf-parent/apidocs/src-html/org/apache/commons/rdf/jena/impl/InternalJenaFactory.html (original)
+++ websites/production/commons/content/proper/commons-rdf-parent/apidocs/src-html/org/apache/commons/rdf/jena/impl/InternalJenaFactory.html Thu Feb 9 00:35:28 2017
@@ -167,7 +167,7 @@
<span class="sourceLineNo">159</span> }<a name="line.159"></a>
<span class="sourceLineNo">160</span> throw new ConversionException("Unrecognized node type: " + node);<a name="line.160"></a>
<span class="sourceLineNo">161</span> }<a name="line.161"></a>
-<span class="sourceLineNo">162</span><a name="line.162"></a>
+<span class="sourceLineNo">162</span> <a name="line.162"></a>
<span class="sourceLineNo">163</span> public JenaTriple createTriple(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {<a name="line.163"></a>
<span class="sourceLineNo">164</span> return new JenaTripleImpl(subject, predicate, object);<a name="line.164"></a>
<span class="sourceLineNo">165</span> }<a name="line.165"></a>
Modified: websites/production/commons/content/proper/commons-rdf-parent/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.html
==============================================================================
--- websites/production/commons/content/proper/commons-rdf-parent/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.html (original)
+++ websites/production/commons/content/proper/commons-rdf-parent/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.html Thu Feb 9 00:35:28 2017
@@ -212,22 +212,36 @@
<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<a name="line.214"></a>
-<span class="sourceLineNo">215</span> // remove methods.<a name="line.215"></a>
-<span class="sourceLineNo">216</span> void remove(final Optional<BlankNodeOrIRI> graphName, final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {<a name="line.216"></a>
-<span class="sourceLineNo">217</span> // remove the quads which match our filter (which could have nulls as<a name="line.217"></a>
-<span class="sourceLineNo">218</span> // 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>
+<span class="sourceLineNo">207</span> if (objectNode.isPresent()) {<a name="line.207"></a>
+<span class="sourceLineNo">208</span> if (object instanceof Literal && q.getObject().isLiteral()) { <a name="line.208"></a>
+<span class="sourceLineNo">209</span> // Special handling for COMMONSRDF-56, COMMONSRDF-51:<a name="line.209"></a>
+<span class="sourceLineNo">210</span> // Less efficient wrapper to a Commons RDF Literal so <a name="line.210"></a>
+<span class="sourceLineNo">211</span> // we can use our RDF 1.1-compliant .equals()<a name="line.211"></a>
+<span class="sourceLineNo">212</span> RDFTerm otherObj = factory.asRDFTerm(q.getObject());<a name="line.212"></a>
+<span class="sourceLineNo">213</span> if (! (object.equals(otherObj))) {<a name="line.213"></a>
+<span class="sourceLineNo">214</span> return false;<a name="line.214"></a>
+<span class="sourceLineNo">215</span> }<a name="line.215"></a>
+<span class="sourceLineNo">216</span> } else {<a name="line.216"></a>
+<span class="sourceLineNo">217</span> // JSONLD-Java's .compareTo can handle IRI, BlankNode and type-mismatch<a name="line.217"></a>
+<span class="sourceLineNo">218</span> if (objectNode.get().compareTo(q.getObject()) != 0) {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> return false;<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>
+<span class="sourceLineNo">223</span> // All patterns checked, must be good!<a name="line.223"></a>
+<span class="sourceLineNo">224</span> return true;<a name="line.224"></a>
+<span class="sourceLineNo">225</span> };<a name="line.225"></a>
+<span class="sourceLineNo">226</span> }<a name="line.226"></a>
+<span class="sourceLineNo">227</span><a name="line.227"></a>
+<span class="sourceLineNo">228</span> // NOTE: This is made public in JsonLdDataset and is used by the other<a name="line.228"></a>
+<span class="sourceLineNo">229</span> // remove methods.<a name="line.229"></a>
+<span class="sourceLineNo">230</span> void remove(final Optional<BlankNodeOrIRI> graphName, final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {<a name="line.230"></a>
+<span class="sourceLineNo">231</span> // remove the quads which match our filter (which could have nulls as<a name="line.231"></a>
+<span class="sourceLineNo">232</span> // wildcards)<a name="line.232"></a>
+<span class="sourceLineNo">233</span> filteredGraphs(graphName).forEach(t -> t.removeIf(quadFilter(subject, predicate, object)));<a name="line.233"></a>
+<span class="sourceLineNo">234</span> }<a name="line.234"></a>
+<span class="sourceLineNo">235</span><a name="line.235"></a>
+<span class="sourceLineNo">236</span>}<a name="line.236"></a>
Modified: websites/production/commons/content/proper/commons-rdf-parent/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.html
==============================================================================
--- websites/production/commons/content/proper/commons-rdf-parent/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.html (original)
+++ websites/production/commons/content/proper/commons-rdf-parent/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.html Thu Feb 9 00:35:28 2017
@@ -25,85 +25,88 @@
<span class="sourceLineNo">017</span> */<a name="line.17"></a>
<span class="sourceLineNo">018</span>package org.apache.commons.rdf.jsonldjava;<a name="line.18"></a>
<span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import java.util.Objects;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import java.util.Optional;<a name="line.21"></a>
-<span class="sourceLineNo">022</span><a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.commons.rdf.api.IRI;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.commons.rdf.api.Literal;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.commons.rdf.simple.Types;<a name="line.25"></a>
-<span class="sourceLineNo">026</span><a name="line.26"></a>
-<span class="sourceLineNo">027</span>import com.github.jsonldjava.core.RDFDataset.Node;<a name="line.27"></a>
-<span class="sourceLineNo">028</span><a name="line.28"></a>
-<span class="sourceLineNo">029</span>public interface JsonLdLiteral extends JsonLdTerm, Literal {<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 JsonLdLiteralImpl extends JsonLdTermImpl implements JsonLdLiteral {<a name="line.32"></a>
-<span class="sourceLineNo">033</span><a name="line.33"></a>
-<span class="sourceLineNo">034</span> JsonLdLiteralImpl(final Node node) {<a name="line.34"></a>
-<span class="sourceLineNo">035</span> super(node);<a name="line.35"></a>
-<span class="sourceLineNo">036</span> if (!node.isLiteral()) {<a name="line.36"></a>
-<span class="sourceLineNo">037</span> throw new IllegalArgumentException("Node is not a Literal:" + node);<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><a name="line.40"></a>
-<span class="sourceLineNo">041</span> @Override<a name="line.41"></a>
-<span class="sourceLineNo">042</span> public String ntriplesString() {<a name="line.42"></a>
-<span class="sourceLineNo">043</span> final StringBuilder sb = new StringBuilder();<a name="line.43"></a>
-<span class="sourceLineNo">044</span> sb.append('"');<a name="line.44"></a>
-<span class="sourceLineNo">045</span> // Escape special characters<a name="line.45"></a>
-<span class="sourceLineNo">046</span> sb.append(getLexicalForm().replace("\\", "\\\\"). // escaped to \\<a name="line.46"></a>
-<span class="sourceLineNo">047</span> replace("\"", "\\\""). // escaped to \"<a name="line.47"></a>
-<span class="sourceLineNo">048</span> replace("\r", "\\r"). // escaped to \r<a name="line.48"></a>
-<span class="sourceLineNo">049</span> replace("\n", "\\n")); // escaped to \n<a name="line.49"></a>
-<span class="sourceLineNo">050</span> sb.append('"');<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span> if (getLanguageTag().isPresent()) {<a name="line.52"></a>
-<span class="sourceLineNo">053</span> sb.append("@");<a name="line.53"></a>
-<span class="sourceLineNo">054</span> sb.append(getLanguageTag().get());<a name="line.54"></a>
-<span class="sourceLineNo">055</span> } else if (!getDatatype().equals(Types.XSD_STRING)) {<a name="line.55"></a>
-<span class="sourceLineNo">056</span> sb.append("^^");<a name="line.56"></a>
-<span class="sourceLineNo">057</span> sb.append(getDatatype().ntriplesString());<a name="line.57"></a>
-<span class="sourceLineNo">058</span> }<a name="line.58"></a>
-<span class="sourceLineNo">059</span> return sb.toString();<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> @Override<a name="line.62"></a>
-<span class="sourceLineNo">063</span> public String getLexicalForm() {<a name="line.63"></a>
-<span class="sourceLineNo">064</span> return node.getValue();<a name="line.64"></a>
+<span class="sourceLineNo">020</span>import java.util.Locale;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import java.util.Objects;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import java.util.Optional;<a name="line.22"></a>
+<span class="sourceLineNo">023</span><a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.commons.rdf.api.IRI;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.commons.rdf.api.Literal;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.commons.rdf.simple.Types;<a name="line.26"></a>
+<span class="sourceLineNo">027</span><a name="line.27"></a>
+<span class="sourceLineNo">028</span>import com.github.jsonldjava.core.RDFDataset.Node;<a name="line.28"></a>
+<span class="sourceLineNo">029</span><a name="line.29"></a>
+<span class="sourceLineNo">030</span>public interface JsonLdLiteral extends JsonLdTerm, Literal {<a name="line.30"></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>class JsonLdLiteralImpl extends JsonLdTermImpl implements JsonLdLiteral {<a name="line.33"></a>
+<span class="sourceLineNo">034</span><a name="line.34"></a>
+<span class="sourceLineNo">035</span> JsonLdLiteralImpl(final Node node) {<a name="line.35"></a>
+<span class="sourceLineNo">036</span> super(node);<a name="line.36"></a>
+<span class="sourceLineNo">037</span> if (!node.isLiteral()) {<a name="line.37"></a>
+<span class="sourceLineNo">038</span> throw new IllegalArgumentException("Node is not a Literal:" + node);<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><a name="line.41"></a>
+<span class="sourceLineNo">042</span> private static String lowerCase(String langTag) { <a name="line.42"></a>
+<span class="sourceLineNo">043</span> return langTag.toLowerCase(Locale.ROOT);<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 String ntriplesString() {<a name="line.47"></a>
+<span class="sourceLineNo">048</span> final StringBuilder sb = new StringBuilder();<a name="line.48"></a>
+<span class="sourceLineNo">049</span> sb.append('"');<a name="line.49"></a>
+<span class="sourceLineNo">050</span> // Escape special characters<a name="line.50"></a>
+<span class="sourceLineNo">051</span> sb.append(getLexicalForm().replace("\\", "\\\\"). // escaped to \\<a name="line.51"></a>
+<span class="sourceLineNo">052</span> replace("\"", "\\\""). // escaped to \"<a name="line.52"></a>
+<span class="sourceLineNo">053</span> replace("\r", "\\r"). // escaped to \r<a name="line.53"></a>
+<span class="sourceLineNo">054</span> replace("\n", "\\n")); // escaped to \n<a name="line.54"></a>
+<span class="sourceLineNo">055</span> sb.append('"');<a name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span> if (getLanguageTag().isPresent()) {<a name="line.57"></a>
+<span class="sourceLineNo">058</span> sb.append("@");<a name="line.58"></a>
+<span class="sourceLineNo">059</span> sb.append(getLanguageTag().get());<a name="line.59"></a>
+<span class="sourceLineNo">060</span> } else if (!getDatatype().equals(Types.XSD_STRING)) {<a name="line.60"></a>
+<span class="sourceLineNo">061</span> sb.append("^^");<a name="line.61"></a>
+<span class="sourceLineNo">062</span> sb.append(getDatatype().ntriplesString());<a name="line.62"></a>
+<span class="sourceLineNo">063</span> }<a name="line.63"></a>
+<span class="sourceLineNo">064</span> return sb.toString();<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">067</span> @Override<a name="line.67"></a>
-<span class="sourceLineNo">068</span> public IRI getDatatype() {<a name="line.68"></a>
-<span class="sourceLineNo">069</span> return new JsonLdIRIImpl(node.getDatatype());<a name="line.69"></a>
+<span class="sourceLineNo">068</span> public String getLexicalForm() {<a name="line.68"></a>
+<span class="sourceLineNo">069</span> return node.getValue();<a name="line.69"></a>
<span class="sourceLineNo">070</span> }<a name="line.70"></a>
<span class="sourceLineNo">071</span><a name="line.71"></a>
<span class="sourceLineNo">072</span> @Override<a name="line.72"></a>
-<span class="sourceLineNo">073</span> public Optional<String> getLanguageTag() {<a name="line.73"></a>
-<span class="sourceLineNo">074</span> return Optional.ofNullable(node.getLanguage());<a name="line.74"></a>
+<span class="sourceLineNo">073</span> public IRI getDatatype() {<a name="line.73"></a>
+<span class="sourceLineNo">074</span> return new JsonLdIRIImpl(node.getDatatype());<a name="line.74"></a>
<span class="sourceLineNo">075</span> }<a name="line.75"></a>
<span class="sourceLineNo">076</span><a name="line.76"></a>
<span class="sourceLineNo">077</span> @Override<a name="line.77"></a>
-<span class="sourceLineNo">078</span> public int hashCode() {<a name="line.78"></a>
-<span class="sourceLineNo">079</span> // Should be the same as<a name="line.79"></a>
-<span class="sourceLineNo">080</span> // Objects.hash(getLexicalForm(), getDatatype(), getLanguageTag());<a name="line.80"></a>
-<span class="sourceLineNo">081</span> return Objects.hash(node.getValue(), node.getDatatype(), node.getLanguage());<a name="line.81"></a>
-<span class="sourceLineNo">082</span> }<a name="line.82"></a>
-<span class="sourceLineNo">083</span><a name="line.83"></a>
-<span class="sourceLineNo">084</span> @Override<a name="line.84"></a>
-<span class="sourceLineNo">085</span> public boolean equals(final Object obj) {<a name="line.85"></a>
-<span class="sourceLineNo">086</span> if (obj instanceof JsonLdLiteral) {<a name="line.86"></a>
-<span class="sourceLineNo">087</span> final JsonLdLiteral other = (JsonLdLiteral) obj;<a name="line.87"></a>
-<span class="sourceLineNo">088</span> return asJsonLdNode().compareTo(other.asJsonLdNode()) == 0;<a name="line.88"></a>
-<span class="sourceLineNo">089</span> }<a name="line.89"></a>
-<span class="sourceLineNo">090</span> if (obj instanceof Literal) {<a name="line.90"></a>
-<span class="sourceLineNo">091</span> final Literal other = (Literal) obj;<a name="line.91"></a>
-<span class="sourceLineNo">092</span> return getLexicalForm().equals(other.getLexicalForm()) && getDatatype().equals(other.getDatatype())<a name="line.92"></a>
-<span class="sourceLineNo">093</span> && getLanguageTag().equals(other.getLanguageTag());<a name="line.93"></a>
-<span class="sourceLineNo">094</span> }<a name="line.94"></a>
-<span class="sourceLineNo">095</span> return false;<a name="line.95"></a>
-<span class="sourceLineNo">096</span><a name="line.96"></a>
-<span class="sourceLineNo">097</span> }<a name="line.97"></a>
-<span class="sourceLineNo">098</span>}<a name="line.98"></a>
+<span class="sourceLineNo">078</span> public Optional<String> getLanguageTag() {<a name="line.78"></a>
+<span class="sourceLineNo">079</span> return Optional.ofNullable(node.getLanguage());<a name="line.79"></a>
+<span class="sourceLineNo">080</span> }<a name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span> @Override<a name="line.82"></a>
+<span class="sourceLineNo">083</span> public int hashCode() {<a name="line.83"></a>
+<span class="sourceLineNo">084</span> return Objects.hash(node.getValue(), node.getDatatype(), <a name="line.84"></a>
+<span class="sourceLineNo">085</span> getLanguageTag().map(JsonLdLiteralImpl::lowerCase));<a name="line.85"></a>
+<span class="sourceLineNo">086</span> }<a name="line.86"></a>
+<span class="sourceLineNo">087</span><a name="line.87"></a>
+<span class="sourceLineNo">088</span> @Override<a name="line.88"></a>
+<span class="sourceLineNo">089</span> public boolean equals(final Object obj) {<a name="line.89"></a>
+<span class="sourceLineNo">090</span> // COMMONSRDF-56: Do **not** use <a name="line.90"></a>
+<span class="sourceLineNo">091</span> // asJsonLdNode().compareTo(other.asJsonLdNode())<a name="line.91"></a>
+<span class="sourceLineNo">092</span> if (obj instanceof Literal) {<a name="line.92"></a>
+<span class="sourceLineNo">093</span> final Literal other = (Literal) obj;<a name="line.93"></a>
+<span class="sourceLineNo">094</span> return getLexicalForm().equals(other.getLexicalForm()) <a name="line.94"></a>
+<span class="sourceLineNo">095</span> && getDatatype().equals(other.getDatatype())<a name="line.95"></a>
+<span class="sourceLineNo">096</span> && getLanguageTag().map(JsonLdLiteralImpl::lowerCase)<a name="line.96"></a>
+<span class="sourceLineNo">097</span> .equals(other.getLanguageTag().map(JsonLdLiteralImpl::lowerCase));<a name="line.97"></a>
+<span class="sourceLineNo">098</span> }<a name="line.98"></a>
+<span class="sourceLineNo">099</span> return false;<a name="line.99"></a>
+<span class="sourceLineNo">100</span> }<a name="line.100"></a>
+<span class="sourceLineNo">101</span>}<a name="line.101"></a>
Modified: websites/production/commons/content/proper/commons-rdf-parent/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.html
==============================================================================
--- websites/production/commons/content/proper/commons-rdf-parent/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.html (original)
+++ websites/production/commons/content/proper/commons-rdf-parent/apidocs/src-html/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.html Thu Feb 9 00:35:28 2017
@@ -80,7 +80,12 @@
<span class="sourceLineNo">072</span> public Quad asJsonLdQuad() {<a name="line.72"></a>
<span class="sourceLineNo">073</span> return quad;<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">075</span> <a name="line.75"></a>
+<span class="sourceLineNo">076</span> @Override<a name="line.76"></a>
+<span class="sourceLineNo">077</span> public String toString() {<a name="line.77"></a>
+<span class="sourceLineNo">078</span> return quad.toString();<a name="line.78"></a>
+<span class="sourceLineNo">079</span> }<a name="line.79"></a>
+<span class="sourceLineNo">080</span>}<a name="line.80"></a>