Modified: websites/production/commonsrdf/content/commons-rdf-api/xref-test/org/apache/commons/rdf/api/AbstractDatasetTest.html ============================================================================== --- websites/production/commonsrdf/content/commons-rdf-api/xref-test/org/apache/commons/rdf/api/AbstractDatasetTest.html (original) +++ websites/production/commonsrdf/content/commons-rdf-api/xref-test/org/apache/commons/rdf/api/AbstractDatasetTest.html Thu Nov 17 15:06:06 2016 @@ -137,8 +137,8 @@ <a class="jxr_linenumber" name="L129" href="#L129">129</a> @Test <a class="jxr_linenumber" name="L130" href="#L130">130</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> iterate() <strong class="jxr_keyword">throws</strong> Exception { <a class="jxr_linenumber" name="L131" href="#L131">131</a> Assume.assumeTrue(dataset.size() > 0); -<a class="jxr_linenumber" name="L132" href="#L132">132</a> <strong class="jxr_keyword">final</strong> List<Quad> quads = <strong class="jxr_keyword">new</strong> ArrayList<>(); -<a class="jxr_linenumber" name="L133" href="#L133">133</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> Quad t : dataset.iterate()) { +<a class="jxr_linenumber" name="L132" href="#L132">132</a> List<Quad> quads = <strong class="jxr_keyword">new</strong> ArrayList<>(); +<a class="jxr_linenumber" name="L133" href="#L133">133</a> <strong class="jxr_keyword">for</strong> (Quad t : dataset.iterate()) { <a class="jxr_linenumber" name="L134" href="#L134">134</a> quads.add(t); <a class="jxr_linenumber" name="L135" href="#L135">135</a> } <a class="jxr_linenumber" name="L136" href="#L136">136</a> assertEquals(dataset.size(), quads.size()); @@ -146,12 +146,12 @@ <a class="jxr_linenumber" name="L138" href="#L138">138</a> <em class="jxr_comment">//assertTrue(quads.contains(bobNameQuad));</em> <a class="jxr_linenumber" name="L139" href="#L139">139</a> <em class="jxr_comment">// java.util.List won't do any BlankNode mapping, so </em> <a class="jxr_linenumber" name="L140" href="#L140">140</a> <em class="jxr_comment">// instead bobNameQuad of let's check for an IRI-centric quad </em> -<a class="jxr_linenumber" name="L141" href="#L141">141</a> <strong class="jxr_keyword">final</strong> Quad q = factory.createQuad(graph1, alice, name, aliceName); +<a class="jxr_linenumber" name="L141" href="#L141">141</a> Quad q = factory.createQuad(graph1, alice, name, aliceName); <a class="jxr_linenumber" name="L142" href="#L142">142</a> quads.contains(q); <a class="jxr_linenumber" name="L143" href="#L143">143</a> <a class="jxr_linenumber" name="L144" href="#L144">144</a> <em class="jxr_comment">// aborted iteration</em> -<a class="jxr_linenumber" name="L145" href="#L145">145</a> <strong class="jxr_keyword">final</strong> Iterable<Quad> iterate = dataset.iterate(); -<a class="jxr_linenumber" name="L146" href="#L146">146</a> <strong class="jxr_keyword">final</strong> Iterator<Quad> it = iterate.iterator(); +<a class="jxr_linenumber" name="L145" href="#L145">145</a> Iterable<Quad> iterate = dataset.iterate(); +<a class="jxr_linenumber" name="L146" href="#L146">146</a> Iterator<Quad> it = iterate.iterator(); <a class="jxr_linenumber" name="L147" href="#L147">147</a> <a class="jxr_linenumber" name="L148" href="#L148">148</a> assertTrue(it.hasNext()); <a class="jxr_linenumber" name="L149" href="#L149">149</a> it.next(); @@ -160,8 +160,8 @@ <a class="jxr_linenumber" name="L152" href="#L152">152</a> <em class="jxr_comment">// second iteration - should start from fresh and</em> <a class="jxr_linenumber" name="L153" href="#L153">153</a> <em class="jxr_comment">// get the same count</em> <a class="jxr_linenumber" name="L154" href="#L154">154</a> <strong class="jxr_keyword">long</strong> count = 0; -<a class="jxr_linenumber" name="L155" href="#L155">155</a> <strong class="jxr_keyword">final</strong> Iterable<Quad> iterable = dataset.iterate(); -<a class="jxr_linenumber" name="L156" href="#L156">156</a> <strong class="jxr_keyword">for</strong> (@SuppressWarnings(<span class="jxr_string">"unused"</span>) <strong class="jxr_keyword">final</strong> +<a class="jxr_linenumber" name="L155" href="#L155">155</a> Iterable<Quad> iterable = dataset.iterate(); +<a class="jxr_linenumber" name="L156" href="#L156">156</a> <strong class="jxr_keyword">for</strong> (@SuppressWarnings(<span class="jxr_string">"unused"</span>) <a class="jxr_linenumber" name="L157" href="#L157">157</a> Quad t : iterable) { <a class="jxr_linenumber" name="L158" href="#L158">158</a> count++; <a class="jxr_linenumber" name="L159" href="#L159">159</a> } @@ -171,7 +171,7 @@ <a class="jxr_linenumber" name="L163" href="#L163">163</a> <em class="jxr_javadoccomment">/**</em> <a class="jxr_linenumber" name="L164" href="#L164">164</a> <em class="jxr_javadoccomment"> * Special quad closing for RDF4J.</em> <a class="jxr_linenumber" name="L165" href="#L165">165</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L166" href="#L166">166</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> closeIterable(<strong class="jxr_keyword">final</strong> Iterable<Quad> iterate) <strong class="jxr_keyword">throws</strong> Exception { +<a class="jxr_linenumber" name="L166" href="#L166">166</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> closeIterable(Iterable<Quad> iterate) <strong class="jxr_keyword">throws</strong> Exception { <a class="jxr_linenumber" name="L167" href="#L167">167</a> <strong class="jxr_keyword">if</strong> (iterate instanceof AutoCloseable) { <a class="jxr_linenumber" name="L168" href="#L168">168</a> ((AutoCloseable) iterate).close(); <a class="jxr_linenumber" name="L169" href="#L169">169</a> } @@ -179,18 +179,18 @@ <a class="jxr_linenumber" name="L171" href="#L171">171</a> <a class="jxr_linenumber" name="L172" href="#L172">172</a> @Test <a class="jxr_linenumber" name="L173" href="#L173">173</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> iterateFilter() <strong class="jxr_keyword">throws</strong> Exception { -<a class="jxr_linenumber" name="L174" href="#L174">174</a> <strong class="jxr_keyword">final</strong> List<RDFTerm> friends = <strong class="jxr_keyword">new</strong> ArrayList<>(); -<a class="jxr_linenumber" name="L175" href="#L175">175</a> <strong class="jxr_keyword">final</strong> IRI alice = factory.createIRI(<span class="jxr_string">"http://example.com/alice"</span>); -<a class="jxr_linenumber" name="L176" href="#L176">176</a> <strong class="jxr_keyword">final</strong> IRI knows = factory.createIRI(<span class="jxr_string">"http://xmlns.com/foaf/0.1/knows"</span>); -<a class="jxr_linenumber" name="L177" href="#L177">177</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> Quad t : dataset.iterate(<strong class="jxr_keyword">null</strong>, alice, knows, <strong class="jxr_keyword">null</strong>)) { +<a class="jxr_linenumber" name="L174" href="#L174">174</a> List<RDFTerm> friends = <strong class="jxr_keyword">new</strong> ArrayList<>(); +<a class="jxr_linenumber" name="L175" href="#L175">175</a> IRI alice = factory.createIRI(<span class="jxr_string">"http://example.com/alice"</span>); +<a class="jxr_linenumber" name="L176" href="#L176">176</a> IRI knows = factory.createIRI(<span class="jxr_string">"http://xmlns.com/foaf/0.1/knows"</span>); +<a class="jxr_linenumber" name="L177" href="#L177">177</a> <strong class="jxr_keyword">for</strong> (Quad t : dataset.iterate(<strong class="jxr_keyword">null</strong>, alice, knows, <strong class="jxr_keyword">null</strong>)) { <a class="jxr_linenumber" name="L178" href="#L178">178</a> friends.add(t.getObject()); <a class="jxr_linenumber" name="L179" href="#L179">179</a> } <a class="jxr_linenumber" name="L180" href="#L180">180</a> assertEquals(1, friends.size()); <a class="jxr_linenumber" name="L181" href="#L181">181</a> assertEquals(bob, friends.get(0)); <a class="jxr_linenumber" name="L182" href="#L182">182</a> <a class="jxr_linenumber" name="L183" href="#L183">183</a> <em class="jxr_comment">// .. can we iterate over zero hits?</em> -<a class="jxr_linenumber" name="L184" href="#L184">184</a> <strong class="jxr_keyword">final</strong> Iterable<Quad> iterate = dataset.iterate(Optional.of(graph2), bob, knows, alice); -<a class="jxr_linenumber" name="L185" href="#L185">185</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> Quad unexpected : iterate) { +<a class="jxr_linenumber" name="L184" href="#L184">184</a> Iterable<Quad> iterate = dataset.iterate(Optional.of(graph2), bob, knows, alice); +<a class="jxr_linenumber" name="L185" href="#L185">185</a> <strong class="jxr_keyword">for</strong> (Quad unexpected : iterate) { <a class="jxr_linenumber" name="L186" href="#L186">186</a> fail(<span class="jxr_string">"Unexpected quad "</span> + unexpected); <a class="jxr_linenumber" name="L187" href="#L187">187</a> } <a class="jxr_linenumber" name="L188" href="#L188">188</a> <em class="jxr_comment">// closeIterable(iterate);</em> @@ -203,26 +203,26 @@ <a class="jxr_linenumber" name="L195" href="#L195">195</a> assertTrue(dataset.contains(Optional.of(graph1), alice, knows, bob)); <a class="jxr_linenumber" name="L196" href="#L196">196</a> <a class="jxr_linenumber" name="L197" href="#L197">197</a> <strong class="jxr_keyword">try</strong> (Stream<? <strong class="jxr_keyword">extends</strong> Quad> stream = dataset.stream()) { -<a class="jxr_linenumber" name="L198" href="#L198">198</a> <strong class="jxr_keyword">final</strong> Optional<? <strong class="jxr_keyword">extends</strong> Quad> first = stream.skip(4).findFirst(); +<a class="jxr_linenumber" name="L198" href="#L198">198</a> Optional<? <strong class="jxr_keyword">extends</strong> Quad> first = stream.skip(4).findFirst(); <a class="jxr_linenumber" name="L199" href="#L199">199</a> Assume.assumeTrue(first.isPresent()); -<a class="jxr_linenumber" name="L200" href="#L200">200</a> <strong class="jxr_keyword">final</strong> Quad existingQuad = first.get(); +<a class="jxr_linenumber" name="L200" href="#L200">200</a> Quad existingQuad = first.get(); <a class="jxr_linenumber" name="L201" href="#L201">201</a> assertTrue(dataset.contains(existingQuad)); <a class="jxr_linenumber" name="L202" href="#L202">202</a> } <a class="jxr_linenumber" name="L203" href="#L203">203</a> -<a class="jxr_linenumber" name="L204" href="#L204">204</a> <strong class="jxr_keyword">final</strong> Quad nonExistingQuad = factory.createQuad(graph2, bob, knows, alice); +<a class="jxr_linenumber" name="L204" href="#L204">204</a> Quad nonExistingQuad = factory.createQuad(graph2, bob, knows, alice); <a class="jxr_linenumber" name="L205" href="#L205">205</a> assertFalse(dataset.contains(nonExistingQuad)); <a class="jxr_linenumber" name="L206" href="#L206">206</a> <a class="jxr_linenumber" name="L207" href="#L207">207</a> <em class="jxr_comment">// An existing quad</em> -<a class="jxr_linenumber" name="L208" href="#L208">208</a> <strong class="jxr_keyword">final</strong> Quad quad = factory.createQuad(graph1, alice, knows, bob); +<a class="jxr_linenumber" name="L208" href="#L208">208</a> Quad quad = factory.createQuad(graph1, alice, knows, bob); <a class="jxr_linenumber" name="L209" href="#L209">209</a> <em class="jxr_comment">// FIXME: Should not this always be true?</em> <a class="jxr_linenumber" name="L210" href="#L210">210</a> assertTrue(dataset.contains(quad)); <a class="jxr_linenumber" name="L211" href="#L211">211</a> } <a class="jxr_linenumber" name="L212" href="#L212">212</a> <a class="jxr_linenumber" name="L213" href="#L213">213</a> @Test <a class="jxr_linenumber" name="L214" href="#L214">214</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> remove() <strong class="jxr_keyword">throws</strong> Exception { -<a class="jxr_linenumber" name="L215" href="#L215">215</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> fullSize = dataset.size(); +<a class="jxr_linenumber" name="L215" href="#L215">215</a> <strong class="jxr_keyword">long</strong> fullSize = dataset.size(); <a class="jxr_linenumber" name="L216" href="#L216">216</a> dataset.remove(Optional.of(graph1), alice, knows, bob); -<a class="jxr_linenumber" name="L217" href="#L217">217</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> shrunkSize = dataset.size(); +<a class="jxr_linenumber" name="L217" href="#L217">217</a> <strong class="jxr_keyword">long</strong> shrunkSize = dataset.size(); <a class="jxr_linenumber" name="L218" href="#L218">218</a> assertEquals(1, fullSize - shrunkSize); <a class="jxr_linenumber" name="L219" href="#L219">219</a> <a class="jxr_linenumber" name="L220" href="#L220">220</a> dataset.remove(Optional.of(graph1), alice, knows, bob); @@ -241,7 +241,7 @@ <a class="jxr_linenumber" name="L233" href="#L233">233</a> <a class="jxr_linenumber" name="L234" href="#L234">234</a> Quad otherQuad; <a class="jxr_linenumber" name="L235" href="#L235">235</a> <strong class="jxr_keyword">try</strong> (Stream<? <strong class="jxr_keyword">extends</strong> Quad> stream = dataset.stream()) { -<a class="jxr_linenumber" name="L236" href="#L236">236</a> <strong class="jxr_keyword">final</strong> Optional<? <strong class="jxr_keyword">extends</strong> Quad> anyQuad = stream.findAny(); +<a class="jxr_linenumber" name="L236" href="#L236">236</a> Optional<? <strong class="jxr_keyword">extends</strong> Quad> anyQuad = stream.findAny(); <a class="jxr_linenumber" name="L237" href="#L237">237</a> Assume.assumeTrue(anyQuad.isPresent()); <a class="jxr_linenumber" name="L238" href="#L238">238</a> otherQuad = anyQuad.get(); <a class="jxr_linenumber" name="L239" href="#L239">239</a> } @@ -289,7 +289,7 @@ <a class="jxr_linenumber" name="L281" href="#L281">281</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> getQuadsQuery() <strong class="jxr_keyword">throws</strong> Exception { <a class="jxr_linenumber" name="L282" href="#L282">282</a> <a class="jxr_linenumber" name="L283" href="#L283">283</a> <strong class="jxr_keyword">try</strong> (Stream<? <strong class="jxr_keyword">extends</strong> Quad> stream = dataset.stream(Optional.of(graph1), alice, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>)) { -<a class="jxr_linenumber" name="L284" href="#L284">284</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> aliceCount = stream.count(); +<a class="jxr_linenumber" name="L284" href="#L284">284</a> <strong class="jxr_keyword">long</strong> aliceCount = stream.count(); <a class="jxr_linenumber" name="L285" href="#L285">285</a> assertTrue(aliceCount > 0); <a class="jxr_linenumber" name="L286" href="#L286">286</a> Assume.assumeNotNull(aliceName); <a class="jxr_linenumber" name="L287" href="#L287">287</a> assertEquals(3, aliceCount); @@ -308,11 +308,11 @@ <a class="jxr_linenumber" name="L300" href="#L300">300</a> @Test <a class="jxr_linenumber" name="L301" href="#L301">301</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> addBlankNodesFromMultipleDatasets() { <a class="jxr_linenumber" name="L302" href="#L302">302</a> <em class="jxr_comment">// Create two separate Dataset instances</em> -<a class="jxr_linenumber" name="L303" href="#L303">303</a> <strong class="jxr_keyword">final</strong> Dataset g1 = createDataset1(); -<a class="jxr_linenumber" name="L304" href="#L304">304</a> <strong class="jxr_keyword">final</strong> Dataset g2 = createDataset2(); +<a class="jxr_linenumber" name="L303" href="#L303">303</a> Dataset g1 = createDataset1(); +<a class="jxr_linenumber" name="L304" href="#L304">304</a> Dataset g2 = createDataset2(); <a class="jxr_linenumber" name="L305" href="#L305">305</a> <a class="jxr_linenumber" name="L306" href="#L306">306</a> <em class="jxr_comment">// and add them to a new Dataset g3</em> -<a class="jxr_linenumber" name="L307" href="#L307">307</a> <strong class="jxr_keyword">final</strong> Dataset g3 = factory.createDataset(); +<a class="jxr_linenumber" name="L307" href="#L307">307</a> Dataset g3 = factory.createDataset(); <a class="jxr_linenumber" name="L308" href="#L308">308</a> addAllQuads(g1, g3); <a class="jxr_linenumber" name="L309" href="#L309">309</a> addAllQuads(g2, g3); <a class="jxr_linenumber" name="L310" href="#L310">310</a> @@ -327,22 +327,22 @@ <a class="jxr_linenumber" name="L319" href="#L319">319</a> <em class="jxr_comment">// HashMap!)</em> <a class="jxr_linenumber" name="L320" href="#L320">320</a> <a class="jxr_linenumber" name="L321" href="#L321">321</a> <em class="jxr_comment">// look up BlankNodes by name</em> -<a class="jxr_linenumber" name="L322" href="#L322">322</a> <strong class="jxr_keyword">final</strong> IRI name = factory.createIRI(<span class="jxr_string">"http://xmlns.com/foaf/0.1/name"</span>); +<a class="jxr_linenumber" name="L322" href="#L322">322</a> IRI name = factory.createIRI(<span class="jxr_string">"http://xmlns.com/foaf/0.1/name"</span>); <a class="jxr_linenumber" name="L323" href="#L323">323</a> <strong class="jxr_keyword">try</strong> (Stream<? <strong class="jxr_keyword">extends</strong> Quad> stream = g3.stream(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, name, <strong class="jxr_keyword">null</strong>)) { <a class="jxr_linenumber" name="L324" href="#L324">324</a> stream.parallel().forEach(t -> whoIsWho.put(t.getObject().ntriplesString(), t.getSubject())); <a class="jxr_linenumber" name="L325" href="#L325">325</a> } <a class="jxr_linenumber" name="L326" href="#L326">326</a> <a class="jxr_linenumber" name="L327" href="#L327">327</a> assertEquals(4, whoIsWho.size()); <a class="jxr_linenumber" name="L328" href="#L328">328</a> <em class="jxr_comment">// and contains 4 unique values</em> -<a class="jxr_linenumber" name="L329" href="#L329">329</a> assertEquals(4, <strong class="jxr_keyword">new</strong> HashSet<>(whoIsWho.values()).size()); +<a class="jxr_linenumber" name="L329" href="#L329">329</a> assertEquals(4, <strong class="jxr_keyword">new</strong> HashSet<BlankNodeOrIRI>(whoIsWho.values()).size()); <a class="jxr_linenumber" name="L330" href="#L330">330</a> -<a class="jxr_linenumber" name="L331" href="#L331">331</a> <strong class="jxr_keyword">final</strong> BlankNodeOrIRI b1Alice = whoIsWho.get(<span class="jxr_string">"\"Alice\""</span>); +<a class="jxr_linenumber" name="L331" href="#L331">331</a> BlankNodeOrIRI b1Alice = whoIsWho.get(<span class="jxr_string">"\"Alice\""</span>); <a class="jxr_linenumber" name="L332" href="#L332">332</a> assertNotNull(b1Alice); -<a class="jxr_linenumber" name="L333" href="#L333">333</a> <strong class="jxr_keyword">final</strong> BlankNodeOrIRI b2Bob = whoIsWho.get(<span class="jxr_string">"\"Bob\""</span>); +<a class="jxr_linenumber" name="L333" href="#L333">333</a> BlankNodeOrIRI b2Bob = whoIsWho.get(<span class="jxr_string">"\"Bob\""</span>); <a class="jxr_linenumber" name="L334" href="#L334">334</a> assertNotNull(b2Bob); -<a class="jxr_linenumber" name="L335" href="#L335">335</a> <strong class="jxr_keyword">final</strong> BlankNodeOrIRI b1Charlie = whoIsWho.get(<span class="jxr_string">"\"Charlie\""</span>); +<a class="jxr_linenumber" name="L335" href="#L335">335</a> BlankNodeOrIRI b1Charlie = whoIsWho.get(<span class="jxr_string">"\"Charlie\""</span>); <a class="jxr_linenumber" name="L336" href="#L336">336</a> assertNotNull(b1Charlie); -<a class="jxr_linenumber" name="L337" href="#L337">337</a> <strong class="jxr_keyword">final</strong> BlankNodeOrIRI b2Dave = whoIsWho.get(<span class="jxr_string">"\"Dave\""</span>); +<a class="jxr_linenumber" name="L337" href="#L337">337</a> BlankNodeOrIRI b2Dave = whoIsWho.get(<span class="jxr_string">"\"Dave\""</span>); <a class="jxr_linenumber" name="L338" href="#L338">338</a> assertNotNull(b2Dave); <a class="jxr_linenumber" name="L339" href="#L339">339</a> <a class="jxr_linenumber" name="L340" href="#L340">340</a> <em class="jxr_comment">// All blank nodes should differ</em> @@ -355,7 +355,7 @@ <a class="jxr_linenumber" name="L347" href="#L347">347</a> <a class="jxr_linenumber" name="L348" href="#L348">348</a> <em class="jxr_comment">// And we should be able to query with them again</em> <a class="jxr_linenumber" name="L349" href="#L349">349</a> <em class="jxr_comment">// as we got them back from g3</em> -<a class="jxr_linenumber" name="L350" href="#L350">350</a> <strong class="jxr_keyword">final</strong> IRI hasChild = factory.createIRI(<span class="jxr_string">"http://example.com/hasChild"</span>); +<a class="jxr_linenumber" name="L350" href="#L350">350</a> IRI hasChild = factory.createIRI(<span class="jxr_string">"http://example.com/hasChild"</span>); <a class="jxr_linenumber" name="L351" href="#L351">351</a> <em class="jxr_comment">// FIXME: Check graph2 BlankNode in these ..?</em> <a class="jxr_linenumber" name="L352" href="#L352">352</a> assertTrue(g3.contains(<strong class="jxr_keyword">null</strong>, b1Alice, hasChild, b2Bob)); <a class="jxr_linenumber" name="L353" href="#L353">353</a> assertTrue(g3.contains(<strong class="jxr_keyword">null</strong>, b2Dave, hasChild, b1Charlie)); @@ -372,7 +372,7 @@ <a class="jxr_linenumber" name="L364" href="#L364">364</a> assertFalse(g3.contains(<strong class="jxr_keyword">null</strong>, b1Charlie, hasChild, <strong class="jxr_keyword">null</strong>)); <a class="jxr_linenumber" name="L365" href="#L365">365</a> } <a class="jxr_linenumber" name="L366" href="#L366">366</a> -<a class="jxr_linenumber" name="L367" href="#L367">367</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> notEquals(<strong class="jxr_keyword">final</strong> BlankNodeOrIRI node1, <strong class="jxr_keyword">final</strong> BlankNodeOrIRI node2) { +<a class="jxr_linenumber" name="L367" href="#L367">367</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> notEquals(BlankNodeOrIRI node1, BlankNodeOrIRI node2) { <a class="jxr_linenumber" name="L368" href="#L368">368</a> assertFalse(node1.equals(node2)); <a class="jxr_linenumber" name="L369" href="#L369">369</a> <em class="jxr_comment">// in which case we should be able to assume</em> <a class="jxr_linenumber" name="L370" href="#L370">370</a> <em class="jxr_comment">// (as they are in the same dataset)</em> @@ -390,7 +390,7 @@ <a class="jxr_linenumber" name="L382" href="#L382">382</a> <em class="jxr_javadoccomment"> * @param target</em> <a class="jxr_linenumber" name="L383" href="#L383">383</a> <em class="jxr_javadoccomment"> * Target Dataset where quads will be added</em> <a class="jxr_linenumber" name="L384" href="#L384">384</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L385" href="#L385">385</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> addAllQuads(<strong class="jxr_keyword">final</strong> Dataset source, <strong class="jxr_keyword">final</strong> Dataset target) { +<a class="jxr_linenumber" name="L385" href="#L385">385</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> addAllQuads(Dataset source, Dataset target) { <a class="jxr_linenumber" name="L386" href="#L386">386</a> <a class="jxr_linenumber" name="L387" href="#L387">387</a> <em class="jxr_comment">// unordered() as we don't need to preserve quad order</em> <a class="jxr_linenumber" name="L388" href="#L388">388</a> <em class="jxr_comment">// sequential() as we don't (currently) require target Dataset to be</em> @@ -406,17 +406,17 @@ <a class="jxr_linenumber" name="L398" href="#L398">398</a> <em class="jxr_javadoccomment"> * uniqueReference</em> <a class="jxr_linenumber" name="L399" href="#L399">399</a> <em class="jxr_javadoccomment"> */</em> <a class="jxr_linenumber" name="L400" href="#L400">400</a> <strong class="jxr_keyword">private</strong> Dataset createDataset1() { -<a class="jxr_linenumber" name="L401" href="#L401">401</a> <strong class="jxr_keyword">final</strong> RDF factory1 = createFactory(); +<a class="jxr_linenumber" name="L401" href="#L401">401</a> RDF factory1 = createFactory(); <a class="jxr_linenumber" name="L402" href="#L402">402</a> -<a class="jxr_linenumber" name="L403" href="#L403">403</a> <strong class="jxr_keyword">final</strong> IRI name = factory1.createIRI(<span class="jxr_string">"http://xmlns.com/foaf/0.1/name"</span>); -<a class="jxr_linenumber" name="L404" href="#L404">404</a> <strong class="jxr_keyword">final</strong> Dataset g1 = factory1.createDataset(); -<a class="jxr_linenumber" name="L405" href="#L405">405</a> <strong class="jxr_keyword">final</strong> BlankNode b1 = createOwnBlankNode(<span class="jxr_string">"b1"</span>, <span class="jxr_string">"0240eaaa-d33e-4fc0-a4f1-169d6ced3680"</span>); +<a class="jxr_linenumber" name="L403" href="#L403">403</a> IRI name = factory1.createIRI(<span class="jxr_string">"http://xmlns.com/foaf/0.1/name"</span>); +<a class="jxr_linenumber" name="L404" href="#L404">404</a> Dataset g1 = factory1.createDataset(); +<a class="jxr_linenumber" name="L405" href="#L405">405</a> BlankNode b1 = createOwnBlankNode(<span class="jxr_string">"b1"</span>, <span class="jxr_string">"0240eaaa-d33e-4fc0-a4f1-169d6ced3680"</span>); <a class="jxr_linenumber" name="L406" href="#L406">406</a> g1.add(b1, b1, name, factory1.createLiteral(<span class="jxr_string">"Alice"</span>)); <a class="jxr_linenumber" name="L407" href="#L407">407</a> -<a class="jxr_linenumber" name="L408" href="#L408">408</a> <strong class="jxr_keyword">final</strong> BlankNode b2 = createOwnBlankNode(<span class="jxr_string">"b2"</span>, <span class="jxr_string">"9de7db45-0ce7-4b0f-a1ce-c9680ffcfd9f"</span>); +<a class="jxr_linenumber" name="L408" href="#L408">408</a> BlankNode b2 = createOwnBlankNode(<span class="jxr_string">"b2"</span>, <span class="jxr_string">"9de7db45-0ce7-4b0f-a1ce-c9680ffcfd9f"</span>); <a class="jxr_linenumber" name="L409" href="#L409">409</a> g1.add(b2, b2, name, factory1.createLiteral(<span class="jxr_string">"Bob"</span>)); <a class="jxr_linenumber" name="L410" href="#L410">410</a> -<a class="jxr_linenumber" name="L411" href="#L411">411</a> <strong class="jxr_keyword">final</strong> IRI hasChild = factory1.createIRI(<span class="jxr_string">"http://example.com/hasChild"</span>); +<a class="jxr_linenumber" name="L411" href="#L411">411</a> IRI hasChild = factory1.createIRI(<span class="jxr_string">"http://example.com/hasChild"</span>); <a class="jxr_linenumber" name="L412" href="#L412">412</a> g1.add(<strong class="jxr_keyword">null</strong>, b1, hasChild, b2); <a class="jxr_linenumber" name="L413" href="#L413">413</a> <a class="jxr_linenumber" name="L414" href="#L414">414</a> <strong class="jxr_keyword">return</strong> g1; @@ -430,7 +430,7 @@ <a class="jxr_linenumber" name="L422" href="#L422">422</a> <em class="jxr_javadoccomment"> * @param name</em> <a class="jxr_linenumber" name="L423" href="#L423">423</a> <em class="jxr_javadoccomment"> * @return</em> <a class="jxr_linenumber" name="L424" href="#L424">424</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L425" href="#L425">425</a> <strong class="jxr_keyword">private</strong> BlankNode createOwnBlankNode(<strong class="jxr_keyword">final</strong> String name, <strong class="jxr_keyword">final</strong> String uuid) { +<a class="jxr_linenumber" name="L425" href="#L425">425</a> <strong class="jxr_keyword">private</strong> BlankNode createOwnBlankNode(String name, String uuid) { <a class="jxr_linenumber" name="L426" href="#L426">426</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> BlankNode() { <a class="jxr_linenumber" name="L427" href="#L427">427</a> @Override <a class="jxr_linenumber" name="L428" href="#L428">428</a> <strong class="jxr_keyword">public</strong> String ntriplesString() { @@ -448,29 +448,29 @@ <a class="jxr_linenumber" name="L440" href="#L440">440</a> } <a class="jxr_linenumber" name="L441" href="#L441">441</a> <a class="jxr_linenumber" name="L442" href="#L442">442</a> @Override -<a class="jxr_linenumber" name="L443" href="#L443">443</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> equals(<strong class="jxr_keyword">final</strong> Object obj) { +<a class="jxr_linenumber" name="L443" href="#L443">443</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> equals(Object obj) { <a class="jxr_linenumber" name="L444" href="#L444">444</a> <strong class="jxr_keyword">if</strong> (!(obj instanceof BlankNode)) { <a class="jxr_linenumber" name="L445" href="#L445">445</a> <strong class="jxr_keyword">return</strong> false; <a class="jxr_linenumber" name="L446" href="#L446">446</a> } -<a class="jxr_linenumber" name="L447" href="#L447">447</a> <strong class="jxr_keyword">final</strong> BlankNode other = (BlankNode) obj; +<a class="jxr_linenumber" name="L447" href="#L447">447</a> BlankNode other = (BlankNode) obj; <a class="jxr_linenumber" name="L448" href="#L448">448</a> <strong class="jxr_keyword">return</strong> uuid.equals(other.uniqueReference()); <a class="jxr_linenumber" name="L449" href="#L449">449</a> } <a class="jxr_linenumber" name="L450" href="#L450">450</a> }; <a class="jxr_linenumber" name="L451" href="#L451">451</a> } <a class="jxr_linenumber" name="L452" href="#L452">452</a> <a class="jxr_linenumber" name="L453" href="#L453">453</a> <strong class="jxr_keyword">private</strong> Dataset createDataset2() { -<a class="jxr_linenumber" name="L454" href="#L454">454</a> <strong class="jxr_keyword">final</strong> RDF factory2 = createFactory(); -<a class="jxr_linenumber" name="L455" href="#L455">455</a> <strong class="jxr_keyword">final</strong> IRI name = factory2.createIRI(<span class="jxr_string">"http://xmlns.com/foaf/0.1/name"</span>); +<a class="jxr_linenumber" name="L454" href="#L454">454</a> RDF factory2 = createFactory(); +<a class="jxr_linenumber" name="L455" href="#L455">455</a> IRI name = factory2.createIRI(<span class="jxr_string">"http://xmlns.com/foaf/0.1/name"</span>); <a class="jxr_linenumber" name="L456" href="#L456">456</a> -<a class="jxr_linenumber" name="L457" href="#L457">457</a> <strong class="jxr_keyword">final</strong> Dataset g2 = factory2.createDataset(); +<a class="jxr_linenumber" name="L457" href="#L457">457</a> Dataset g2 = factory2.createDataset(); <a class="jxr_linenumber" name="L458" href="#L458">458</a> -<a class="jxr_linenumber" name="L459" href="#L459">459</a> <strong class="jxr_keyword">final</strong> BlankNode b1 = createOwnBlankNode(<span class="jxr_string">"b1"</span>, <span class="jxr_string">"bc8d3e45-a08f-421d-85b3-c25b373abf87"</span>); +<a class="jxr_linenumber" name="L459" href="#L459">459</a> BlankNode b1 = createOwnBlankNode(<span class="jxr_string">"b1"</span>, <span class="jxr_string">"bc8d3e45-a08f-421d-85b3-c25b373abf87"</span>); <a class="jxr_linenumber" name="L460" href="#L460">460</a> g2.add(b1, b1, name, factory2.createLiteral(<span class="jxr_string">"Charlie"</span>)); <a class="jxr_linenumber" name="L461" href="#L461">461</a> -<a class="jxr_linenumber" name="L462" href="#L462">462</a> <strong class="jxr_keyword">final</strong> BlankNode b2 = createOwnBlankNode(<span class="jxr_string">"b2"</span>, <span class="jxr_string">"2209097a-5078-4b03-801a-6a2d2f50d739"</span>); +<a class="jxr_linenumber" name="L462" href="#L462">462</a> BlankNode b2 = createOwnBlankNode(<span class="jxr_string">"b2"</span>, <span class="jxr_string">"2209097a-5078-4b03-801a-6a2d2f50d739"</span>); <a class="jxr_linenumber" name="L463" href="#L463">463</a> g2.add(b2, b2, name, factory2.createLiteral(<span class="jxr_string">"Dave"</span>)); <a class="jxr_linenumber" name="L464" href="#L464">464</a> -<a class="jxr_linenumber" name="L465" href="#L465">465</a> <strong class="jxr_keyword">final</strong> IRI hasChild = factory2.createIRI(<span class="jxr_string">"http://example.com/hasChild"</span>); +<a class="jxr_linenumber" name="L465" href="#L465">465</a> IRI hasChild = factory2.createIRI(<span class="jxr_string">"http://example.com/hasChild"</span>); <a class="jxr_linenumber" name="L466" href="#L466">466</a> <em class="jxr_comment">// NOTE: Opposite direction of loadDataset1</em> <a class="jxr_linenumber" name="L467" href="#L467">467</a> g2.add(b2, b2, hasChild, b1); <a class="jxr_linenumber" name="L468" href="#L468">468</a> <strong class="jxr_keyword">return</strong> g2; @@ -484,11 +484,11 @@ <a class="jxr_linenumber" name="L476" href="#L476">476</a> <em class="jxr_javadoccomment"> */</em> <a class="jxr_linenumber" name="L477" href="#L477">477</a> @Test <a class="jxr_linenumber" name="L478" href="#L478">478</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> getGraphNames() <strong class="jxr_keyword">throws</strong> Exception { -<a class="jxr_linenumber" name="L479" href="#L479">479</a> <strong class="jxr_keyword">final</strong> Set<BlankNodeOrIRI> names = dataset.getGraphNames().collect(Collectors.toSet()); +<a class="jxr_linenumber" name="L479" href="#L479">479</a> Set<BlankNodeOrIRI> names = dataset.getGraphNames().collect(Collectors.toSet()); <a class="jxr_linenumber" name="L480" href="#L480">480</a> assertTrue(<span class="jxr_string">"Can't find graph name "</span> + graph1, names.contains(graph1)); <a class="jxr_linenumber" name="L481" href="#L481">481</a> assertTrue(<span class="jxr_string">"Found no quads in graph1"</span>, dataset.contains(Optional.of(graph1), <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>)); <a class="jxr_linenumber" name="L482" href="#L482">482</a> -<a class="jxr_linenumber" name="L483" href="#L483">483</a> <strong class="jxr_keyword">final</strong> Optional<BlankNodeOrIRI> graphName2 = dataset.getGraphNames().filter(BlankNode.<strong class="jxr_keyword">class</strong>::isInstance).findAny(); +<a class="jxr_linenumber" name="L483" href="#L483">483</a> Optional<BlankNodeOrIRI> graphName2 = dataset.getGraphNames().filter(BlankNode.<strong class="jxr_keyword">class</strong>::isInstance).findAny(); <a class="jxr_linenumber" name="L484" href="#L484">484</a> assertTrue(<span class="jxr_string">"Could not find graph2-like BlankNode"</span>, graphName2.isPresent()); <a class="jxr_linenumber" name="L485" href="#L485">485</a> assertTrue(<span class="jxr_string">"Found no quads in graph2"</span>, dataset.contains(graphName2, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>)); <a class="jxr_linenumber" name="L486" href="#L486">486</a> @@ -499,7 +499,7 @@ <a class="jxr_linenumber" name="L491" href="#L491">491</a> <a class="jxr_linenumber" name="L492" href="#L492">492</a> @Test <a class="jxr_linenumber" name="L493" href="#L493">493</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> getGraph() <strong class="jxr_keyword">throws</strong> Exception { -<a class="jxr_linenumber" name="L494" href="#L494">494</a> <strong class="jxr_keyword">final</strong> Graph defaultGraph = dataset.getGraph(); +<a class="jxr_linenumber" name="L494" href="#L494">494</a> Graph defaultGraph = dataset.getGraph(); <a class="jxr_linenumber" name="L495" href="#L495">495</a> <em class="jxr_comment">// TODO: Can we assume the default graph was empty before our new triples?</em> <a class="jxr_linenumber" name="L496" href="#L496">496</a> assertEquals(2, defaultGraph.size()); <a class="jxr_linenumber" name="L497" href="#L497">497</a> assertTrue(defaultGraph.contains(alice, isPrimaryTopicOf, graph1)); @@ -511,7 +511,7 @@ <a class="jxr_linenumber" name="L503" href="#L503">503</a> @Test <a class="jxr_linenumber" name="L504" href="#L504">504</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> getGraphNull() <strong class="jxr_keyword">throws</strong> Exception { <a class="jxr_linenumber" name="L505" href="#L505">505</a> <em class="jxr_comment">// Default graph should be present</em> -<a class="jxr_linenumber" name="L506" href="#L506">506</a> <strong class="jxr_keyword">final</strong> Graph defaultGraph = dataset.getGraph(<strong class="jxr_keyword">null</strong>).get(); +<a class="jxr_linenumber" name="L506" href="#L506">506</a> Graph defaultGraph = dataset.getGraph(<strong class="jxr_keyword">null</strong>).get(); <a class="jxr_linenumber" name="L507" href="#L507">507</a> <em class="jxr_comment">// TODO: Can we assume the default graph was empty before our new triples?</em> <a class="jxr_linenumber" name="L508" href="#L508">508</a> assertEquals(2, defaultGraph.size()); <a class="jxr_linenumber" name="L509" href="#L509">509</a> assertTrue(defaultGraph.contains(alice, isPrimaryTopicOf, graph1)); @@ -523,7 +523,7 @@ <a class="jxr_linenumber" name="L515" href="#L515">515</a> @Test <a class="jxr_linenumber" name="L516" href="#L516">516</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> getGraph1() <strong class="jxr_keyword">throws</strong> Exception { <a class="jxr_linenumber" name="L517" href="#L517">517</a> <em class="jxr_comment">// graph1 should be present</em> -<a class="jxr_linenumber" name="L518" href="#L518">518</a> <strong class="jxr_keyword">final</strong> Graph g1 = dataset.getGraph(graph1).get(); +<a class="jxr_linenumber" name="L518" href="#L518">518</a> Graph g1 = dataset.getGraph(graph1).get(); <a class="jxr_linenumber" name="L519" href="#L519">519</a> assertEquals(4, g1.size()); <a class="jxr_linenumber" name="L520" href="#L520">520</a> <a class="jxr_linenumber" name="L521" href="#L521">521</a> assertTrue(g1.contains(alice, name, aliceName)); @@ -536,12 +536,12 @@ <a class="jxr_linenumber" name="L528" href="#L528">528</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> getGraph2() <strong class="jxr_keyword">throws</strong> Exception { <a class="jxr_linenumber" name="L529" href="#L529">529</a> <em class="jxr_comment">// graph2 should be present, even if is named by a BlankNode</em> <a class="jxr_linenumber" name="L530" href="#L530">530</a> <em class="jxr_comment">// We'll look up the potentially mapped graph2 blanknode</em> -<a class="jxr_linenumber" name="L531" href="#L531">531</a> <strong class="jxr_keyword">final</strong> BlankNodeOrIRI graph2Name = (BlankNodeOrIRI) dataset.stream(Optional.empty(), bob, isPrimaryTopicOf, <strong class="jxr_keyword">null</strong>) +<a class="jxr_linenumber" name="L531" href="#L531">531</a> BlankNodeOrIRI graph2Name = (BlankNodeOrIRI) dataset.stream(Optional.empty(), bob, isPrimaryTopicOf, <strong class="jxr_keyword">null</strong>) <a class="jxr_linenumber" name="L532" href="#L532">532</a> .map(Quad::getObject).findAny().get(); <a class="jxr_linenumber" name="L533" href="#L533">533</a> -<a class="jxr_linenumber" name="L534" href="#L534">534</a> <strong class="jxr_keyword">final</strong> Graph g2 = dataset.getGraph(graph2Name).get(); +<a class="jxr_linenumber" name="L534" href="#L534">534</a> Graph g2 = dataset.getGraph(graph2Name).get(); <a class="jxr_linenumber" name="L535" href="#L535">535</a> assertEquals(4, g2.size()); -<a class="jxr_linenumber" name="L536" href="#L536">536</a> <strong class="jxr_keyword">final</strong> Triple bobNameTriple = bobNameQuad.asTriple(); +<a class="jxr_linenumber" name="L536" href="#L536">536</a> Triple bobNameTriple = bobNameQuad.asTriple(); <a class="jxr_linenumber" name="L537" href="#L537">537</a> assertTrue(g2.contains(bobNameTriple)); <a class="jxr_linenumber" name="L538" href="#L538">538</a> assertTrue(g2.contains(bob, member, bnode1)); <a class="jxr_linenumber" name="L539" href="#L539">539</a> assertTrue(g2.contains(bob, member, bnode2)); @@ -604,4 +604,4 @@ <hr/> <div id="footer">Copyright © 2015–2016 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div> </body> -</html> \ No newline at end of file +</html>
Modified: websites/production/commonsrdf/content/commons-rdf-api/xref-test/org/apache/commons/rdf/api/AbstractGraphTest.html ============================================================================== --- websites/production/commonsrdf/content/commons-rdf-api/xref-test/org/apache/commons/rdf/api/AbstractGraphTest.html (original) +++ websites/production/commonsrdf/content/commons-rdf-api/xref-test/org/apache/commons/rdf/api/AbstractGraphTest.html Thu Nov 17 15:06:06 2016 @@ -98,7 +98,7 @@ <a class="jxr_linenumber" name="L90" href="#L90">90</a> <strong class="jxr_keyword">try</strong> { <a class="jxr_linenumber" name="L91" href="#L91">91</a> bnode1 = factory.createBlankNode(<span class="jxr_string">"org1"</span>); <a class="jxr_linenumber" name="L92" href="#L92">92</a> bnode2 = factory.createBlankNode(<span class="jxr_string">"org2"</span>); -<a class="jxr_linenumber" name="L93" href="#L93">93</a> } <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> UnsupportedOperationException ex) { +<a class="jxr_linenumber" name="L93" href="#L93">93</a> } <strong class="jxr_keyword">catch</strong> (UnsupportedOperationException ex) { <a class="jxr_linenumber" name="L94" href="#L94">94</a> <em class="jxr_comment">// leave as null</em> <a class="jxr_linenumber" name="L95" href="#L95">95</a> } <a class="jxr_linenumber" name="L96" href="#L96">96</a> @@ -107,7 +107,7 @@ <a class="jxr_linenumber" name="L99" href="#L99">99</a> companyName = factory.createLiteral(<span class="jxr_string">"A company"</span>); <a class="jxr_linenumber" name="L100" href="#L100">100</a> aliceName = factory.createLiteral(<span class="jxr_string">"Alice"</span>); <a class="jxr_linenumber" name="L101" href="#L101">101</a> bobName = factory.createLiteral(<span class="jxr_string">"Bob"</span>, <span class="jxr_string">"en-US"</span>); -<a class="jxr_linenumber" name="L102" href="#L102">102</a> } <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> UnsupportedOperationException ex) { +<a class="jxr_linenumber" name="L102" href="#L102">102</a> } <strong class="jxr_keyword">catch</strong> (UnsupportedOperationException ex) { <a class="jxr_linenumber" name="L103" href="#L103">103</a> <em class="jxr_comment">// leave as null</em> <a class="jxr_linenumber" name="L104" href="#L104">104</a> } <a class="jxr_linenumber" name="L105" href="#L105">105</a> @@ -123,7 +123,7 @@ <a class="jxr_linenumber" name="L115" href="#L115">115</a> <strong class="jxr_keyword">if</strong> (bobName != <strong class="jxr_keyword">null</strong>) { <a class="jxr_linenumber" name="L116" href="#L116">116</a> <strong class="jxr_keyword">try</strong> { <a class="jxr_linenumber" name="L117" href="#L117">117</a> bobNameTriple = factory.createTriple(bob, name, bobName); -<a class="jxr_linenumber" name="L118" href="#L118">118</a> } <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> UnsupportedOperationException ex) { +<a class="jxr_linenumber" name="L118" href="#L118">118</a> } <strong class="jxr_keyword">catch</strong> (UnsupportedOperationException ex) { <a class="jxr_linenumber" name="L119" href="#L119">119</a> <em class="jxr_comment">// leave as null</em> <a class="jxr_linenumber" name="L120" href="#L120">120</a> } <a class="jxr_linenumber" name="L121" href="#L121">121</a> <strong class="jxr_keyword">if</strong> (bobNameTriple != <strong class="jxr_keyword">null</strong>) { @@ -153,8 +153,8 @@ <a class="jxr_linenumber" name="L145" href="#L145">145</a> <a class="jxr_linenumber" name="L146" href="#L146">146</a> Assume.assumeTrue(graph.size() > 0); <a class="jxr_linenumber" name="L147" href="#L147">147</a> -<a class="jxr_linenumber" name="L148" href="#L148">148</a> <strong class="jxr_keyword">final</strong> List<Triple> triples = <strong class="jxr_keyword">new</strong> ArrayList<>(); -<a class="jxr_linenumber" name="L149" href="#L149">149</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> Triple t : graph.iterate()) { +<a class="jxr_linenumber" name="L148" href="#L148">148</a> List<Triple> triples = <strong class="jxr_keyword">new</strong> ArrayList<>(); +<a class="jxr_linenumber" name="L149" href="#L149">149</a> <strong class="jxr_keyword">for</strong> (Triple t : graph.iterate()) { <a class="jxr_linenumber" name="L150" href="#L150">150</a> triples.add(t); <a class="jxr_linenumber" name="L151" href="#L151">151</a> } <a class="jxr_linenumber" name="L152" href="#L152">152</a> assertEquals(graph.size(), triples.size()); @@ -163,8 +163,8 @@ <a class="jxr_linenumber" name="L155" href="#L155">155</a> } <a class="jxr_linenumber" name="L156" href="#L156">156</a> <a class="jxr_linenumber" name="L157" href="#L157">157</a> <em class="jxr_comment">// aborted iteration</em> -<a class="jxr_linenumber" name="L158" href="#L158">158</a> <strong class="jxr_keyword">final</strong> Iterable<Triple> iterate = graph.iterate(); -<a class="jxr_linenumber" name="L159" href="#L159">159</a> <strong class="jxr_keyword">final</strong> Iterator<Triple> it = iterate.iterator(); +<a class="jxr_linenumber" name="L158" href="#L158">158</a> Iterable<Triple> iterate = graph.iterate(); +<a class="jxr_linenumber" name="L159" href="#L159">159</a> Iterator<Triple> it = iterate.iterator(); <a class="jxr_linenumber" name="L160" href="#L160">160</a> <a class="jxr_linenumber" name="L161" href="#L161">161</a> assertTrue(it.hasNext()); <a class="jxr_linenumber" name="L162" href="#L162">162</a> it.next(); @@ -173,8 +173,8 @@ <a class="jxr_linenumber" name="L165" href="#L165">165</a> <em class="jxr_comment">// second iteration - should start from fresh and</em> <a class="jxr_linenumber" name="L166" href="#L166">166</a> <em class="jxr_comment">// get the same count</em> <a class="jxr_linenumber" name="L167" href="#L167">167</a> <strong class="jxr_keyword">long</strong> count = 0; -<a class="jxr_linenumber" name="L168" href="#L168">168</a> <strong class="jxr_keyword">final</strong> Iterable<Triple> iterable = graph.iterate(); -<a class="jxr_linenumber" name="L169" href="#L169">169</a> <strong class="jxr_keyword">for</strong> (@SuppressWarnings(<span class="jxr_string">"unused"</span>) <strong class="jxr_keyword">final</strong> +<a class="jxr_linenumber" name="L168" href="#L168">168</a> Iterable<Triple> iterable = graph.iterate(); +<a class="jxr_linenumber" name="L169" href="#L169">169</a> <strong class="jxr_keyword">for</strong> (@SuppressWarnings(<span class="jxr_string">"unused"</span>) <a class="jxr_linenumber" name="L170" href="#L170">170</a> Triple t : iterable) { <a class="jxr_linenumber" name="L171" href="#L171">171</a> count++; <a class="jxr_linenumber" name="L172" href="#L172">172</a> } @@ -184,7 +184,7 @@ <a class="jxr_linenumber" name="L176" href="#L176">176</a> <em class="jxr_javadoccomment">/**</em> <a class="jxr_linenumber" name="L177" href="#L177">177</a> <em class="jxr_javadoccomment"> * Special triple closing for RDF4J.</em> <a class="jxr_linenumber" name="L178" href="#L178">178</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L179" href="#L179">179</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> closeIterable(<strong class="jxr_keyword">final</strong> Iterable<Triple> iterate) <strong class="jxr_keyword">throws</strong> Exception { +<a class="jxr_linenumber" name="L179" href="#L179">179</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> closeIterable(Iterable<Triple> iterate) <strong class="jxr_keyword">throws</strong> Exception { <a class="jxr_linenumber" name="L180" href="#L180">180</a> <strong class="jxr_keyword">if</strong> (iterate instanceof AutoCloseable) { <a class="jxr_linenumber" name="L181" href="#L181">181</a> ((AutoCloseable) iterate).close(); <a class="jxr_linenumber" name="L182" href="#L182">182</a> } @@ -192,18 +192,18 @@ <a class="jxr_linenumber" name="L184" href="#L184">184</a> <a class="jxr_linenumber" name="L185" href="#L185">185</a> @Test <a class="jxr_linenumber" name="L186" href="#L186">186</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> iterateFilter() <strong class="jxr_keyword">throws</strong> Exception { -<a class="jxr_linenumber" name="L187" href="#L187">187</a> <strong class="jxr_keyword">final</strong> List<RDFTerm> friends = <strong class="jxr_keyword">new</strong> ArrayList<>(); -<a class="jxr_linenumber" name="L188" href="#L188">188</a> <strong class="jxr_keyword">final</strong> IRI alice = factory.createIRI(<span class="jxr_string">"http://example.com/alice"</span>); -<a class="jxr_linenumber" name="L189" href="#L189">189</a> <strong class="jxr_keyword">final</strong> IRI knows = factory.createIRI(<span class="jxr_string">"http://xmlns.com/foaf/0.1/knows"</span>); -<a class="jxr_linenumber" name="L190" href="#L190">190</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> Triple t : graph.iterate(alice, knows, <strong class="jxr_keyword">null</strong>)) { +<a class="jxr_linenumber" name="L187" href="#L187">187</a> List<RDFTerm> friends = <strong class="jxr_keyword">new</strong> ArrayList<>(); +<a class="jxr_linenumber" name="L188" href="#L188">188</a> IRI alice = factory.createIRI(<span class="jxr_string">"http://example.com/alice"</span>); +<a class="jxr_linenumber" name="L189" href="#L189">189</a> IRI knows = factory.createIRI(<span class="jxr_string">"http://xmlns.com/foaf/0.1/knows"</span>); +<a class="jxr_linenumber" name="L190" href="#L190">190</a> <strong class="jxr_keyword">for</strong> (Triple t : graph.iterate(alice, knows, <strong class="jxr_keyword">null</strong>)) { <a class="jxr_linenumber" name="L191" href="#L191">191</a> friends.add(t.getObject()); <a class="jxr_linenumber" name="L192" href="#L192">192</a> } <a class="jxr_linenumber" name="L193" href="#L193">193</a> assertEquals(1, friends.size()); <a class="jxr_linenumber" name="L194" href="#L194">194</a> assertEquals(bob, friends.get(0)); <a class="jxr_linenumber" name="L195" href="#L195">195</a> <a class="jxr_linenumber" name="L196" href="#L196">196</a> <em class="jxr_comment">// .. can we iterate over zero hits?</em> -<a class="jxr_linenumber" name="L197" href="#L197">197</a> <strong class="jxr_keyword">final</strong> Iterable<Triple> iterate = graph.iterate(bob, knows, alice); -<a class="jxr_linenumber" name="L198" href="#L198">198</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> Triple unexpected : iterate) { +<a class="jxr_linenumber" name="L197" href="#L197">197</a> Iterable<Triple> iterate = graph.iterate(bob, knows, alice); +<a class="jxr_linenumber" name="L198" href="#L198">198</a> <strong class="jxr_keyword">for</strong> (Triple unexpected : iterate) { <a class="jxr_linenumber" name="L199" href="#L199">199</a> fail(<span class="jxr_string">"Unexpected triple "</span> + unexpected); <a class="jxr_linenumber" name="L200" href="#L200">200</a> } <a class="jxr_linenumber" name="L201" href="#L201">201</a> <em class="jxr_comment">// closeIterable(iterate);</em> @@ -216,19 +216,19 @@ <a class="jxr_linenumber" name="L208" href="#L208">208</a> assertTrue(graph.contains(alice, knows, bob)); <a class="jxr_linenumber" name="L209" href="#L209">209</a> <a class="jxr_linenumber" name="L210" href="#L210">210</a> <strong class="jxr_keyword">try</strong> (Stream<? <strong class="jxr_keyword">extends</strong> Triple> stream = graph.stream()) { -<a class="jxr_linenumber" name="L211" href="#L211">211</a> <strong class="jxr_keyword">final</strong> Optional<? <strong class="jxr_keyword">extends</strong> Triple> first = stream.skip(4).findFirst(); +<a class="jxr_linenumber" name="L211" href="#L211">211</a> Optional<? <strong class="jxr_keyword">extends</strong> Triple> first = stream.skip(4).findFirst(); <a class="jxr_linenumber" name="L212" href="#L212">212</a> Assume.assumeTrue(first.isPresent()); -<a class="jxr_linenumber" name="L213" href="#L213">213</a> <strong class="jxr_keyword">final</strong> Triple existingTriple = first.get(); +<a class="jxr_linenumber" name="L213" href="#L213">213</a> Triple existingTriple = first.get(); <a class="jxr_linenumber" name="L214" href="#L214">214</a> assertTrue(graph.contains(existingTriple)); <a class="jxr_linenumber" name="L215" href="#L215">215</a> } <a class="jxr_linenumber" name="L216" href="#L216">216</a> -<a class="jxr_linenumber" name="L217" href="#L217">217</a> <strong class="jxr_keyword">final</strong> Triple nonExistingTriple = factory.createTriple(bob, knows, alice); +<a class="jxr_linenumber" name="L217" href="#L217">217</a> Triple nonExistingTriple = factory.createTriple(bob, knows, alice); <a class="jxr_linenumber" name="L218" href="#L218">218</a> assertFalse(graph.contains(nonExistingTriple)); <a class="jxr_linenumber" name="L219" href="#L219">219</a> <a class="jxr_linenumber" name="L220" href="#L220">220</a> Triple triple = <strong class="jxr_keyword">null</strong>; <a class="jxr_linenumber" name="L221" href="#L221">221</a> <strong class="jxr_keyword">try</strong> { <a class="jxr_linenumber" name="L222" href="#L222">222</a> triple = factory.createTriple(alice, knows, bob); -<a class="jxr_linenumber" name="L223" href="#L223">223</a> } <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> UnsupportedOperationException ex) { +<a class="jxr_linenumber" name="L223" href="#L223">223</a> } <strong class="jxr_keyword">catch</strong> (UnsupportedOperationException ex) { <a class="jxr_linenumber" name="L224" href="#L224">224</a> } <a class="jxr_linenumber" name="L225" href="#L225">225</a> <strong class="jxr_keyword">if</strong> (triple != <strong class="jxr_keyword">null</strong>) { <a class="jxr_linenumber" name="L226" href="#L226">226</a> <em class="jxr_comment">// FIXME: Should not this always be true?</em> @@ -238,9 +238,9 @@ <a class="jxr_linenumber" name="L230" href="#L230">230</a> <a class="jxr_linenumber" name="L231" href="#L231">231</a> @Test <a class="jxr_linenumber" name="L232" href="#L232">232</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> remove() <strong class="jxr_keyword">throws</strong> Exception { -<a class="jxr_linenumber" name="L233" href="#L233">233</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> fullSize = graph.size(); +<a class="jxr_linenumber" name="L233" href="#L233">233</a> <strong class="jxr_keyword">long</strong> fullSize = graph.size(); <a class="jxr_linenumber" name="L234" href="#L234">234</a> graph.remove(alice, knows, bob); -<a class="jxr_linenumber" name="L235" href="#L235">235</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> shrunkSize = graph.size(); +<a class="jxr_linenumber" name="L235" href="#L235">235</a> <strong class="jxr_keyword">long</strong> shrunkSize = graph.size(); <a class="jxr_linenumber" name="L236" href="#L236">236</a> assertEquals(1, fullSize - shrunkSize); <a class="jxr_linenumber" name="L237" href="#L237">237</a> <a class="jxr_linenumber" name="L238" href="#L238">238</a> graph.remove(alice, knows, bob); @@ -259,7 +259,7 @@ <a class="jxr_linenumber" name="L251" href="#L251">251</a> <a class="jxr_linenumber" name="L252" href="#L252">252</a> Triple otherTriple; <a class="jxr_linenumber" name="L253" href="#L253">253</a> <strong class="jxr_keyword">try</strong> (Stream<? <strong class="jxr_keyword">extends</strong> Triple> stream = graph.stream()) { -<a class="jxr_linenumber" name="L254" href="#L254">254</a> <strong class="jxr_keyword">final</strong> Optional<? <strong class="jxr_keyword">extends</strong> Triple> anyTriple = stream.findAny(); +<a class="jxr_linenumber" name="L254" href="#L254">254</a> Optional<? <strong class="jxr_keyword">extends</strong> Triple> anyTriple = stream.findAny(); <a class="jxr_linenumber" name="L255" href="#L255">255</a> Assume.assumeTrue(anyTriple.isPresent()); <a class="jxr_linenumber" name="L256" href="#L256">256</a> otherTriple = anyTriple.get(); <a class="jxr_linenumber" name="L257" href="#L257">257</a> } @@ -306,7 +306,7 @@ <a class="jxr_linenumber" name="L298" href="#L298">298</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> getTriplesQuery() <strong class="jxr_keyword">throws</strong> Exception { <a class="jxr_linenumber" name="L299" href="#L299">299</a> <a class="jxr_linenumber" name="L300" href="#L300">300</a> <strong class="jxr_keyword">try</strong> (Stream<? <strong class="jxr_keyword">extends</strong> Triple> stream = graph.stream(alice, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>)) { -<a class="jxr_linenumber" name="L301" href="#L301">301</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> aliceCount = stream.count(); +<a class="jxr_linenumber" name="L301" href="#L301">301</a> <strong class="jxr_keyword">long</strong> aliceCount = stream.count(); <a class="jxr_linenumber" name="L302" href="#L302">302</a> assertTrue(aliceCount > 0); <a class="jxr_linenumber" name="L303" href="#L303">303</a> Assume.assumeNotNull(aliceName); <a class="jxr_linenumber" name="L304" href="#L304">304</a> assertEquals(3, aliceCount); @@ -327,11 +327,11 @@ <a class="jxr_linenumber" name="L319" href="#L319">319</a> <a class="jxr_linenumber" name="L320" href="#L320">320</a> <strong class="jxr_keyword">try</strong> { <a class="jxr_linenumber" name="L321" href="#L321">321</a> <em class="jxr_comment">// Create two separate Graph instances</em> -<a class="jxr_linenumber" name="L322" href="#L322">322</a> <strong class="jxr_keyword">final</strong> Graph g1 = createGraph1(); -<a class="jxr_linenumber" name="L323" href="#L323">323</a> <strong class="jxr_keyword">final</strong> Graph g2 = createGraph2(); +<a class="jxr_linenumber" name="L322" href="#L322">322</a> Graph g1 = createGraph1(); +<a class="jxr_linenumber" name="L323" href="#L323">323</a> Graph g2 = createGraph2(); <a class="jxr_linenumber" name="L324" href="#L324">324</a> <a class="jxr_linenumber" name="L325" href="#L325">325</a> <em class="jxr_comment">// and add them to a new Graph g3</em> -<a class="jxr_linenumber" name="L326" href="#L326">326</a> <strong class="jxr_keyword">final</strong> Graph g3 = factory.createGraph(); +<a class="jxr_linenumber" name="L326" href="#L326">326</a> Graph g3 = factory.createGraph(); <a class="jxr_linenumber" name="L327" href="#L327">327</a> addAllTriples(g1, g3); <a class="jxr_linenumber" name="L328" href="#L328">328</a> addAllTriples(g2, g3); <a class="jxr_linenumber" name="L329" href="#L329">329</a> @@ -346,22 +346,22 @@ <a class="jxr_linenumber" name="L338" href="#L338">338</a> <em class="jxr_comment">// HashMap!)</em> <a class="jxr_linenumber" name="L339" href="#L339">339</a> <a class="jxr_linenumber" name="L340" href="#L340">340</a> <em class="jxr_comment">// look up BlankNodes by name</em> -<a class="jxr_linenumber" name="L341" href="#L341">341</a> <strong class="jxr_keyword">final</strong> IRI name = factory.createIRI(<span class="jxr_string">"http://xmlns.com/foaf/0.1/name"</span>); +<a class="jxr_linenumber" name="L341" href="#L341">341</a> IRI name = factory.createIRI(<span class="jxr_string">"http://xmlns.com/foaf/0.1/name"</span>); <a class="jxr_linenumber" name="L342" href="#L342">342</a> <strong class="jxr_keyword">try</strong> (Stream<? <strong class="jxr_keyword">extends</strong> Triple> stream = g3.stream(<strong class="jxr_keyword">null</strong>, name, <strong class="jxr_keyword">null</strong>)) { <a class="jxr_linenumber" name="L343" href="#L343">343</a> stream.parallel().forEach(t -> whoIsWho.put(t.getObject().ntriplesString(), t.getSubject())); <a class="jxr_linenumber" name="L344" href="#L344">344</a> } <a class="jxr_linenumber" name="L345" href="#L345">345</a> <a class="jxr_linenumber" name="L346" href="#L346">346</a> assertEquals(4, whoIsWho.size()); <a class="jxr_linenumber" name="L347" href="#L347">347</a> <em class="jxr_comment">// and contains 4 unique values</em> -<a class="jxr_linenumber" name="L348" href="#L348">348</a> assertEquals(4, <strong class="jxr_keyword">new</strong> HashSet<>(whoIsWho.values()).size()); +<a class="jxr_linenumber" name="L348" href="#L348">348</a> assertEquals(4, <strong class="jxr_keyword">new</strong> HashSet<BlankNodeOrIRI>(whoIsWho.values()).size()); <a class="jxr_linenumber" name="L349" href="#L349">349</a> -<a class="jxr_linenumber" name="L350" href="#L350">350</a> <strong class="jxr_keyword">final</strong> BlankNodeOrIRI b1Alice = whoIsWho.get(<span class="jxr_string">"\"Alice\""</span>); +<a class="jxr_linenumber" name="L350" href="#L350">350</a> BlankNodeOrIRI b1Alice = whoIsWho.get(<span class="jxr_string">"\"Alice\""</span>); <a class="jxr_linenumber" name="L351" href="#L351">351</a> assertNotNull(b1Alice); -<a class="jxr_linenumber" name="L352" href="#L352">352</a> <strong class="jxr_keyword">final</strong> BlankNodeOrIRI b2Bob = whoIsWho.get(<span class="jxr_string">"\"Bob\""</span>); +<a class="jxr_linenumber" name="L352" href="#L352">352</a> BlankNodeOrIRI b2Bob = whoIsWho.get(<span class="jxr_string">"\"Bob\""</span>); <a class="jxr_linenumber" name="L353" href="#L353">353</a> assertNotNull(b2Bob); -<a class="jxr_linenumber" name="L354" href="#L354">354</a> <strong class="jxr_keyword">final</strong> BlankNodeOrIRI b1Charlie = whoIsWho.get(<span class="jxr_string">"\"Charlie\""</span>); +<a class="jxr_linenumber" name="L354" href="#L354">354</a> BlankNodeOrIRI b1Charlie = whoIsWho.get(<span class="jxr_string">"\"Charlie\""</span>); <a class="jxr_linenumber" name="L355" href="#L355">355</a> assertNotNull(b1Charlie); -<a class="jxr_linenumber" name="L356" href="#L356">356</a> <strong class="jxr_keyword">final</strong> BlankNodeOrIRI b2Dave = whoIsWho.get(<span class="jxr_string">"\"Dave\""</span>); +<a class="jxr_linenumber" name="L356" href="#L356">356</a> BlankNodeOrIRI b2Dave = whoIsWho.get(<span class="jxr_string">"\"Dave\""</span>); <a class="jxr_linenumber" name="L357" href="#L357">357</a> assertNotNull(b2Dave); <a class="jxr_linenumber" name="L358" href="#L358">358</a> <a class="jxr_linenumber" name="L359" href="#L359">359</a> <em class="jxr_comment">// All blank nodes should differ</em> @@ -374,7 +374,7 @@ <a class="jxr_linenumber" name="L366" href="#L366">366</a> <a class="jxr_linenumber" name="L367" href="#L367">367</a> <em class="jxr_comment">// And we should be able to query with them again</em> <a class="jxr_linenumber" name="L368" href="#L368">368</a> <em class="jxr_comment">// as we got them back from g3</em> -<a class="jxr_linenumber" name="L369" href="#L369">369</a> <strong class="jxr_keyword">final</strong> IRI hasChild = factory.createIRI(<span class="jxr_string">"http://example.com/hasChild"</span>); +<a class="jxr_linenumber" name="L369" href="#L369">369</a> IRI hasChild = factory.createIRI(<span class="jxr_string">"http://example.com/hasChild"</span>); <a class="jxr_linenumber" name="L370" href="#L370">370</a> assertTrue(g3.contains(b1Alice, hasChild, b2Bob)); <a class="jxr_linenumber" name="L371" href="#L371">371</a> assertTrue(g3.contains(b2Dave, hasChild, b1Charlie)); <a class="jxr_linenumber" name="L372" href="#L372">372</a> <em class="jxr_comment">// But not</em> @@ -388,12 +388,12 @@ <a class="jxr_linenumber" name="L380" href="#L380">380</a> <em class="jxr_comment">// and these don't have any children (as far as we know)</em> <a class="jxr_linenumber" name="L381" href="#L381">381</a> assertFalse(g3.contains(b2Bob, hasChild, <strong class="jxr_keyword">null</strong>)); <a class="jxr_linenumber" name="L382" href="#L382">382</a> assertFalse(g3.contains(b1Charlie, hasChild, <strong class="jxr_keyword">null</strong>)); -<a class="jxr_linenumber" name="L383" href="#L383">383</a> } <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> UnsupportedOperationException ex) { +<a class="jxr_linenumber" name="L383" href="#L383">383</a> } <strong class="jxr_keyword">catch</strong> (UnsupportedOperationException ex) { <a class="jxr_linenumber" name="L384" href="#L384">384</a> Assume.assumeNoException(ex); <a class="jxr_linenumber" name="L385" href="#L385">385</a> } <a class="jxr_linenumber" name="L386" href="#L386">386</a> } <a class="jxr_linenumber" name="L387" href="#L387">387</a> -<a class="jxr_linenumber" name="L388" href="#L388">388</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> notEquals(<strong class="jxr_keyword">final</strong> BlankNodeOrIRI node1, <strong class="jxr_keyword">final</strong> BlankNodeOrIRI node2) { +<a class="jxr_linenumber" name="L388" href="#L388">388</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> notEquals(BlankNodeOrIRI node1, BlankNodeOrIRI node2) { <a class="jxr_linenumber" name="L389" href="#L389">389</a> assertFalse(node1.equals(node2)); <a class="jxr_linenumber" name="L390" href="#L390">390</a> <em class="jxr_comment">// in which case we should be able to assume</em> <a class="jxr_linenumber" name="L391" href="#L391">391</a> <em class="jxr_comment">// (as they are in the same graph)</em> @@ -411,7 +411,7 @@ <a class="jxr_linenumber" name="L403" href="#L403">403</a> <em class="jxr_javadoccomment"> * @param target</em> <a class="jxr_linenumber" name="L404" href="#L404">404</a> <em class="jxr_javadoccomment"> * Target Graph where triples will be added</em> <a class="jxr_linenumber" name="L405" href="#L405">405</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L406" href="#L406">406</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> addAllTriples(<strong class="jxr_keyword">final</strong> Graph source, <strong class="jxr_keyword">final</strong> Graph target) { +<a class="jxr_linenumber" name="L406" href="#L406">406</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> addAllTriples(Graph source, Graph target) { <a class="jxr_linenumber" name="L407" href="#L407">407</a> <a class="jxr_linenumber" name="L408" href="#L408">408</a> <em class="jxr_comment">// unordered() as we don't need to preserve triple order</em> <a class="jxr_linenumber" name="L409" href="#L409">409</a> <em class="jxr_comment">// sequential() as we don't (currently) require target Graph to be</em> @@ -427,17 +427,17 @@ <a class="jxr_linenumber" name="L419" href="#L419">419</a> <em class="jxr_javadoccomment"> * uniqueReference</em> <a class="jxr_linenumber" name="L420" href="#L420">420</a> <em class="jxr_javadoccomment"> */</em> <a class="jxr_linenumber" name="L421" href="#L421">421</a> <strong class="jxr_keyword">private</strong> Graph createGraph1() { -<a class="jxr_linenumber" name="L422" href="#L422">422</a> <strong class="jxr_keyword">final</strong> RDF factory1 = createFactory(); +<a class="jxr_linenumber" name="L422" href="#L422">422</a> RDF factory1 = createFactory(); <a class="jxr_linenumber" name="L423" href="#L423">423</a> -<a class="jxr_linenumber" name="L424" href="#L424">424</a> <strong class="jxr_keyword">final</strong> IRI name = factory1.createIRI(<span class="jxr_string">"http://xmlns.com/foaf/0.1/name"</span>); -<a class="jxr_linenumber" name="L425" href="#L425">425</a> <strong class="jxr_keyword">final</strong> Graph g1 = factory1.createGraph(); -<a class="jxr_linenumber" name="L426" href="#L426">426</a> <strong class="jxr_keyword">final</strong> BlankNode b1 = createOwnBlankNode(<span class="jxr_string">"b1"</span>, <span class="jxr_string">"0240eaaa-d33e-4fc0-a4f1-169d6ced3680"</span>); +<a class="jxr_linenumber" name="L424" href="#L424">424</a> IRI name = factory1.createIRI(<span class="jxr_string">"http://xmlns.com/foaf/0.1/name"</span>); +<a class="jxr_linenumber" name="L425" href="#L425">425</a> Graph g1 = factory1.createGraph(); +<a class="jxr_linenumber" name="L426" href="#L426">426</a> BlankNode b1 = createOwnBlankNode(<span class="jxr_string">"b1"</span>, <span class="jxr_string">"0240eaaa-d33e-4fc0-a4f1-169d6ced3680"</span>); <a class="jxr_linenumber" name="L427" href="#L427">427</a> g1.add(b1, name, factory1.createLiteral(<span class="jxr_string">"Alice"</span>)); <a class="jxr_linenumber" name="L428" href="#L428">428</a> -<a class="jxr_linenumber" name="L429" href="#L429">429</a> <strong class="jxr_keyword">final</strong> BlankNode b2 = createOwnBlankNode(<span class="jxr_string">"b2"</span>, <span class="jxr_string">"9de7db45-0ce7-4b0f-a1ce-c9680ffcfd9f"</span>); +<a class="jxr_linenumber" name="L429" href="#L429">429</a> BlankNode b2 = createOwnBlankNode(<span class="jxr_string">"b2"</span>, <span class="jxr_string">"9de7db45-0ce7-4b0f-a1ce-c9680ffcfd9f"</span>); <a class="jxr_linenumber" name="L430" href="#L430">430</a> g1.add(b2, name, factory1.createLiteral(<span class="jxr_string">"Bob"</span>)); <a class="jxr_linenumber" name="L431" href="#L431">431</a> -<a class="jxr_linenumber" name="L432" href="#L432">432</a> <strong class="jxr_keyword">final</strong> IRI hasChild = factory1.createIRI(<span class="jxr_string">"http://example.com/hasChild"</span>); +<a class="jxr_linenumber" name="L432" href="#L432">432</a> IRI hasChild = factory1.createIRI(<span class="jxr_string">"http://example.com/hasChild"</span>); <a class="jxr_linenumber" name="L433" href="#L433">433</a> g1.add(b1, hasChild, b2); <a class="jxr_linenumber" name="L434" href="#L434">434</a> <a class="jxr_linenumber" name="L435" href="#L435">435</a> <strong class="jxr_keyword">return</strong> g1; @@ -451,7 +451,7 @@ <a class="jxr_linenumber" name="L443" href="#L443">443</a> <em class="jxr_javadoccomment"> * @param name</em> <a class="jxr_linenumber" name="L444" href="#L444">444</a> <em class="jxr_javadoccomment"> * @return</em> <a class="jxr_linenumber" name="L445" href="#L445">445</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L446" href="#L446">446</a> <strong class="jxr_keyword">private</strong> BlankNode createOwnBlankNode(<strong class="jxr_keyword">final</strong> String name, <strong class="jxr_keyword">final</strong> String uuid) { +<a class="jxr_linenumber" name="L446" href="#L446">446</a> <strong class="jxr_keyword">private</strong> BlankNode createOwnBlankNode(String name, String uuid) { <a class="jxr_linenumber" name="L447" href="#L447">447</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> BlankNode() { <a class="jxr_linenumber" name="L448" href="#L448">448</a> @Override <a class="jxr_linenumber" name="L449" href="#L449">449</a> <strong class="jxr_keyword">public</strong> String ntriplesString() { @@ -469,29 +469,29 @@ <a class="jxr_linenumber" name="L461" href="#L461">461</a> } <a class="jxr_linenumber" name="L462" href="#L462">462</a> <a class="jxr_linenumber" name="L463" href="#L463">463</a> @Override -<a class="jxr_linenumber" name="L464" href="#L464">464</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> equals(<strong class="jxr_keyword">final</strong> Object obj) { +<a class="jxr_linenumber" name="L464" href="#L464">464</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> equals(Object obj) { <a class="jxr_linenumber" name="L465" href="#L465">465</a> <strong class="jxr_keyword">if</strong> (!(obj instanceof BlankNode)) { <a class="jxr_linenumber" name="L466" href="#L466">466</a> <strong class="jxr_keyword">return</strong> false; <a class="jxr_linenumber" name="L467" href="#L467">467</a> } -<a class="jxr_linenumber" name="L468" href="#L468">468</a> <strong class="jxr_keyword">final</strong> BlankNode other = (BlankNode) obj; +<a class="jxr_linenumber" name="L468" href="#L468">468</a> BlankNode other = (BlankNode) obj; <a class="jxr_linenumber" name="L469" href="#L469">469</a> <strong class="jxr_keyword">return</strong> uuid.equals(other.uniqueReference()); <a class="jxr_linenumber" name="L470" href="#L470">470</a> } <a class="jxr_linenumber" name="L471" href="#L471">471</a> }; <a class="jxr_linenumber" name="L472" href="#L472">472</a> } <a class="jxr_linenumber" name="L473" href="#L473">473</a> <a class="jxr_linenumber" name="L474" href="#L474">474</a> <strong class="jxr_keyword">private</strong> Graph createGraph2() { -<a class="jxr_linenumber" name="L475" href="#L475">475</a> <strong class="jxr_keyword">final</strong> RDF factory2 = createFactory(); -<a class="jxr_linenumber" name="L476" href="#L476">476</a> <strong class="jxr_keyword">final</strong> IRI name = factory2.createIRI(<span class="jxr_string">"http://xmlns.com/foaf/0.1/name"</span>); +<a class="jxr_linenumber" name="L475" href="#L475">475</a> RDF factory2 = createFactory(); +<a class="jxr_linenumber" name="L476" href="#L476">476</a> IRI name = factory2.createIRI(<span class="jxr_string">"http://xmlns.com/foaf/0.1/name"</span>); <a class="jxr_linenumber" name="L477" href="#L477">477</a> -<a class="jxr_linenumber" name="L478" href="#L478">478</a> <strong class="jxr_keyword">final</strong> Graph g2 = factory2.createGraph(); +<a class="jxr_linenumber" name="L478" href="#L478">478</a> Graph g2 = factory2.createGraph(); <a class="jxr_linenumber" name="L479" href="#L479">479</a> -<a class="jxr_linenumber" name="L480" href="#L480">480</a> <strong class="jxr_keyword">final</strong> BlankNode b1 = createOwnBlankNode(<span class="jxr_string">"b1"</span>, <span class="jxr_string">"bc8d3e45-a08f-421d-85b3-c25b373abf87"</span>); +<a class="jxr_linenumber" name="L480" href="#L480">480</a> BlankNode b1 = createOwnBlankNode(<span class="jxr_string">"b1"</span>, <span class="jxr_string">"bc8d3e45-a08f-421d-85b3-c25b373abf87"</span>); <a class="jxr_linenumber" name="L481" href="#L481">481</a> g2.add(b1, name, factory2.createLiteral(<span class="jxr_string">"Charlie"</span>)); <a class="jxr_linenumber" name="L482" href="#L482">482</a> -<a class="jxr_linenumber" name="L483" href="#L483">483</a> <strong class="jxr_keyword">final</strong> BlankNode b2 = createOwnBlankNode(<span class="jxr_string">"b2"</span>, <span class="jxr_string">"2209097a-5078-4b03-801a-6a2d2f50d739"</span>); +<a class="jxr_linenumber" name="L483" href="#L483">483</a> BlankNode b2 = createOwnBlankNode(<span class="jxr_string">"b2"</span>, <span class="jxr_string">"2209097a-5078-4b03-801a-6a2d2f50d739"</span>); <a class="jxr_linenumber" name="L484" href="#L484">484</a> g2.add(b2, name, factory2.createLiteral(<span class="jxr_string">"Dave"</span>)); <a class="jxr_linenumber" name="L485" href="#L485">485</a> -<a class="jxr_linenumber" name="L486" href="#L486">486</a> <strong class="jxr_keyword">final</strong> IRI hasChild = factory2.createIRI(<span class="jxr_string">"http://example.com/hasChild"</span>); +<a class="jxr_linenumber" name="L486" href="#L486">486</a> IRI hasChild = factory2.createIRI(<span class="jxr_string">"http://example.com/hasChild"</span>); <a class="jxr_linenumber" name="L487" href="#L487">487</a> <em class="jxr_comment">// NOTE: Opposite direction of loadGraph1</em> <a class="jxr_linenumber" name="L488" href="#L488">488</a> g2.add(b2, hasChild, b1); <a class="jxr_linenumber" name="L489" href="#L489">489</a> <strong class="jxr_keyword">return</strong> g2; @@ -550,4 +550,4 @@ <hr/> <div id="footer">Copyright © 2015–2016 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div> </body> -</html> \ No newline at end of file +</html>