Modified: websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/rdf4j/RDF4J.html ============================================================================== --- websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/rdf4j/RDF4J.html (original) +++ websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/rdf4j/RDF4J.html Tue Nov 22 07:55:35 2016 @@ -150,7 +150,7 @@ <span class="sourceLineNo">142</span> * @param valueFactory<a name="line.142"></a> <span class="sourceLineNo">143</span> * The RDF4J {@link ValueFactory} to use<a name="line.143"></a> <span class="sourceLineNo">144</span> */<a name="line.144"></a> -<span class="sourceLineNo">145</span> public RDF4J(ValueFactory valueFactory) {<a name="line.145"></a> +<span class="sourceLineNo">145</span> public RDF4J(final ValueFactory valueFactory) {<a name="line.145"></a> <span class="sourceLineNo">146</span> this(valueFactory, UUID.randomUUID());<a name="line.146"></a> <span class="sourceLineNo">147</span> }<a name="line.147"></a> <span class="sourceLineNo">148</span><a name="line.148"></a> @@ -165,7 +165,7 @@ <span class="sourceLineNo">157</span> * {@link BlankNode}s for the purpose of<a name="line.157"></a> <span class="sourceLineNo">158</span> * {@link BlankNode#uniqueReference()}<a name="line.158"></a> <span class="sourceLineNo">159</span> */<a name="line.159"></a> -<span class="sourceLineNo">160</span> public RDF4J(UUID salt) {<a name="line.160"></a> +<span class="sourceLineNo">160</span> public RDF4J(final UUID salt) {<a name="line.160"></a> <span class="sourceLineNo">161</span> this(SimpleValueFactory.getInstance(), salt);<a name="line.161"></a> <span class="sourceLineNo">162</span> }<a name="line.162"></a> <span class="sourceLineNo">163</span><a name="line.163"></a> @@ -182,7 +182,7 @@ <span class="sourceLineNo">174</span> * {@link BlankNode}s for the purpose of<a name="line.174"></a> <span class="sourceLineNo">175</span> * {@link BlankNode#uniqueReference()}<a name="line.175"></a> <span class="sourceLineNo">176</span> */<a name="line.176"></a> -<span class="sourceLineNo">177</span> public RDF4J(ValueFactory valueFactory, UUID salt) {<a name="line.177"></a> +<span class="sourceLineNo">177</span> public RDF4J(final ValueFactory valueFactory, final UUID salt) {<a name="line.177"></a> <span class="sourceLineNo">178</span> this.valueFactory = valueFactory;<a name="line.178"></a> <span class="sourceLineNo">179</span> this.salt = salt;<a name="line.179"></a> <span class="sourceLineNo">180</span> }<a name="line.180"></a> @@ -236,7 +236,7 @@ <span class="sourceLineNo">228</span> * @throws IllegalArgumentException<a name="line.228"></a> <span class="sourceLineNo">229</span> * if the value is not a BNode, Literal or IRI<a name="line.229"></a> <span class="sourceLineNo">230</span> */<a name="line.230"></a> -<span class="sourceLineNo">231</span> public RDF4JTerm asRDFTerm(Value value) {<a name="line.231"></a> +<span class="sourceLineNo">231</span> public RDF4JTerm asRDFTerm(final Value value) {<a name="line.231"></a> <span class="sourceLineNo">232</span> return asRDFTerm(value, salt);<a name="line.232"></a> <span class="sourceLineNo">233</span> }<a name="line.233"></a> <span class="sourceLineNo">234</span><a name="line.234"></a> @@ -263,7 +263,7 @@ <span class="sourceLineNo">255</span> * @throws IllegalArgumentException<a name="line.255"></a> <span class="sourceLineNo">256</span> * if the value is not a BNode, Literal or IRI<a name="line.256"></a> <span class="sourceLineNo">257</span> */<a name="line.257"></a> -<span class="sourceLineNo">258</span> public static RDF4JTerm asRDFTerm(final Value value, UUID salt) {<a name="line.258"></a> +<span class="sourceLineNo">258</span> public static RDF4JTerm asRDFTerm(final Value value, final UUID salt) {<a name="line.258"></a> <span class="sourceLineNo">259</span> if (value instanceof BNode) {<a name="line.259"></a> <span class="sourceLineNo">260</span> return rdf4j.createBlankNodeImpl((BNode) value, salt);<a name="line.260"></a> <span class="sourceLineNo">261</span> }<a name="line.261"></a> @@ -292,8 +292,8 @@ <span class="sourceLineNo">284</span> * Zero or more {@link Option}<a name="line.284"></a> <span class="sourceLineNo">285</span> * @return A {@link Dataset} backed by the RDF4J repository.<a name="line.285"></a> <span class="sourceLineNo">286</span> */<a name="line.286"></a> -<span class="sourceLineNo">287</span> public RDF4JDataset asDataset(Repository repository, Option... options) {<a name="line.287"></a> -<span class="sourceLineNo">288</span> EnumSet<Option> opts = optionSet(options);<a name="line.288"></a> +<span class="sourceLineNo">287</span> public RDF4JDataset asDataset(final Repository repository, final Option... options) {<a name="line.287"></a> +<span class="sourceLineNo">288</span> final EnumSet<Option> opts = optionSet(options);<a name="line.288"></a> <span class="sourceLineNo">289</span> return rdf4j.createRepositoryDatasetImpl(repository, opts.contains(Option.handleInitAndShutdown),<a name="line.289"></a> <span class="sourceLineNo">290</span> opts.contains(Option.includeInferred));<a name="line.290"></a> <span class="sourceLineNo">291</span> }<a name="line.291"></a> @@ -307,7 +307,7 @@ <span class="sourceLineNo">299</span> * RDF4J {@link Model} to adapt.<a name="line.299"></a> <span class="sourceLineNo">300</span> * @return Adapted {@link Graph}.<a name="line.300"></a> <span class="sourceLineNo">301</span> */<a name="line.301"></a> -<span class="sourceLineNo">302</span> public RDF4JGraph asGraph(Model model) {<a name="line.302"></a> +<span class="sourceLineNo">302</span> public RDF4JGraph asGraph(final Model model) {<a name="line.302"></a> <span class="sourceLineNo">303</span> return rdf4j.createModelGraphImpl(model, this);<a name="line.303"></a> <span class="sourceLineNo">304</span> }<a name="line.304"></a> <span class="sourceLineNo">305</span><a name="line.305"></a> @@ -330,8 +330,8 @@ <span class="sourceLineNo">322</span> * Zero or more {@link Option}<a name="line.322"></a> <span class="sourceLineNo">323</span> * @return A {@link Graph} backed by the RDF4J repository.<a name="line.323"></a> <span class="sourceLineNo">324</span> */<a name="line.324"></a> -<span class="sourceLineNo">325</span> public RDF4JGraph asGraph(Repository repository, Option... options) {<a name="line.325"></a> -<span class="sourceLineNo">326</span> EnumSet<Option> opts = optionSet(options);<a name="line.326"></a> +<span class="sourceLineNo">325</span> public RDF4JGraph asGraph(final Repository repository, final Option... options) {<a name="line.325"></a> +<span class="sourceLineNo">326</span> final EnumSet<Option> opts = optionSet(options);<a name="line.326"></a> <span class="sourceLineNo">327</span> return rdf4j.createRepositoryGraphImpl(repository, opts.contains(Option.handleInitAndShutdown),<a name="line.327"></a> <span class="sourceLineNo">328</span> opts.contains(Option.includeInferred), new Resource[] { null }); // default<a name="line.328"></a> <span class="sourceLineNo">329</span> // graph<a name="line.329"></a> @@ -350,8 +350,8 @@ <span class="sourceLineNo">342</span> * Zero or more {@link Option}<a name="line.342"></a> <span class="sourceLineNo">343</span> * @return A union {@link Graph} backed by the RDF4J repository.<a name="line.343"></a> <span class="sourceLineNo">344</span> */<a name="line.344"></a> -<span class="sourceLineNo">345</span> public RDF4JGraph asGraphUnion(Repository repository, Option... options) {<a name="line.345"></a> -<span class="sourceLineNo">346</span> EnumSet<Option> opts = optionSet(options);<a name="line.346"></a> +<span class="sourceLineNo">345</span> public RDF4JGraph asGraphUnion(final Repository repository, final Option... options) {<a name="line.345"></a> +<span class="sourceLineNo">346</span> final EnumSet<Option> opts = optionSet(options);<a name="line.346"></a> <span class="sourceLineNo">347</span> return rdf4j.createRepositoryGraphImpl(repository, opts.contains(Option.handleInitAndShutdown),<a name="line.347"></a> <span class="sourceLineNo">348</span> opts.contains(Option.includeInferred), new Resource[] {}); // union<a name="line.348"></a> <span class="sourceLineNo">349</span> // graph<a name="line.349"></a> @@ -383,10 +383,10 @@ <span class="sourceLineNo">375</span> * Zero or more {@link Option}s<a name="line.375"></a> <span class="sourceLineNo">376</span> * @return A {@link Graph} backed by the RDF4J repository.<a name="line.376"></a> <span class="sourceLineNo">377</span> */<a name="line.377"></a> -<span class="sourceLineNo">378</span> public RDF4JGraph asGraph(Repository repository, Set<? extends BlankNodeOrIRI> contexts, Option... option) {<a name="line.378"></a> -<span class="sourceLineNo">379</span> EnumSet<Option> opts = optionSet(option);<a name="line.379"></a> +<span class="sourceLineNo">378</span> public RDF4JGraph asGraph(final Repository repository, final Set<? extends BlankNodeOrIRI> contexts, final Option... option) {<a name="line.378"></a> +<span class="sourceLineNo">379</span> final EnumSet<Option> opts = optionSet(option);<a name="line.379"></a> <span class="sourceLineNo">380</span> /** NOTE: asValue() deliberately CAN handle <code>null</code> */<a name="line.380"></a> -<span class="sourceLineNo">381</span> Resource[] resources = contexts.stream().map(g -> (Resource) asValue(g)).toArray(Resource[]::new);<a name="line.381"></a> +<span class="sourceLineNo">381</span> final Resource[] resources = contexts.stream().map(g -> (Resource) asValue(g)).toArray(Resource[]::new);<a name="line.381"></a> <span class="sourceLineNo">382</span> return rdf4j.createRepositoryGraphImpl(Objects.requireNonNull(repository),<a name="line.382"></a> <span class="sourceLineNo">383</span> opts.contains(Option.handleInitAndShutdown), opts.contains(Option.includeInferred), resources);<a name="line.383"></a> <span class="sourceLineNo">384</span> }<a name="line.384"></a> @@ -406,20 +406,20 @@ <span class="sourceLineNo">398</span> * A {@link Triple} or {@link Quad} to adapt<a name="line.398"></a> <span class="sourceLineNo">399</span> * @return A corresponding {@link Statement}<a name="line.399"></a> <span class="sourceLineNo">400</span> */<a name="line.400"></a> -<span class="sourceLineNo">401</span> public Statement asStatement(TripleLike tripleLike) {<a name="line.401"></a> +<span class="sourceLineNo">401</span> public Statement asStatement(final TripleLike tripleLike) {<a name="line.401"></a> <span class="sourceLineNo">402</span> if (tripleLike instanceof RDF4JTripleLike) {<a name="line.402"></a> <span class="sourceLineNo">403</span> // Return original statement - this covers both RDF4JQuad and<a name="line.403"></a> <span class="sourceLineNo">404</span> // RDF4JTriple<a name="line.404"></a> <span class="sourceLineNo">405</span> return ((RDF4JTripleLike) tripleLike).asStatement();<a name="line.405"></a> <span class="sourceLineNo">406</span> }<a name="line.406"></a> <span class="sourceLineNo">407</span><a name="line.407"></a> -<span class="sourceLineNo">408</span> org.eclipse.rdf4j.model.Resource subject = (org.eclipse.rdf4j.model.Resource) asValue(tripleLike.getSubject());<a name="line.408"></a> -<span class="sourceLineNo">409</span> org.eclipse.rdf4j.model.IRI predicate = (org.eclipse.rdf4j.model.IRI) asValue(tripleLike.getPredicate());<a name="line.409"></a> -<span class="sourceLineNo">410</span> Value object = asValue(tripleLike.getObject());<a name="line.410"></a> +<span class="sourceLineNo">408</span> final org.eclipse.rdf4j.model.Resource subject = (org.eclipse.rdf4j.model.Resource) asValue(tripleLike.getSubject());<a name="line.408"></a> +<span class="sourceLineNo">409</span> final org.eclipse.rdf4j.model.IRI predicate = (org.eclipse.rdf4j.model.IRI) asValue(tripleLike.getPredicate());<a name="line.409"></a> +<span class="sourceLineNo">410</span> final Value object = asValue(tripleLike.getObject());<a name="line.410"></a> <span class="sourceLineNo">411</span><a name="line.411"></a> <span class="sourceLineNo">412</span> org.eclipse.rdf4j.model.Resource context = null;<a name="line.412"></a> <span class="sourceLineNo">413</span> if (tripleLike instanceof Quad) {<a name="line.413"></a> -<span class="sourceLineNo">414</span> Quad quad = (Quad) tripleLike;<a name="line.414"></a> +<span class="sourceLineNo">414</span> final Quad quad = (Quad) tripleLike;<a name="line.414"></a> <span class="sourceLineNo">415</span> context = (org.eclipse.rdf4j.model.Resource) asValue(quad.getGraphName().orElse(null));<a name="line.415"></a> <span class="sourceLineNo">416</span> }<a name="line.416"></a> <span class="sourceLineNo">417</span><a name="line.417"></a> @@ -470,7 +470,7 @@ <span class="sourceLineNo">462</span> * RDFTerm to adapt to RDF4J Value<a name="line.462"></a> <span class="sourceLineNo">463</span> * @return Adapted RDF4J {@link Value}<a name="line.463"></a> <span class="sourceLineNo">464</span> */<a name="line.464"></a> -<span class="sourceLineNo">465</span> public Value asValue(RDFTerm term) {<a name="line.465"></a> +<span class="sourceLineNo">465</span> public Value asValue(final RDFTerm term) {<a name="line.465"></a> <span class="sourceLineNo">466</span> if (term == null) {<a name="line.466"></a> <span class="sourceLineNo">467</span> return null;<a name="line.467"></a> <span class="sourceLineNo">468</span> }<a name="line.468"></a> @@ -480,22 +480,22 @@ <span class="sourceLineNo">472</span> return ((RDF4JTerm) term).asValue();<a name="line.472"></a> <span class="sourceLineNo">473</span> }<a name="line.473"></a> <span class="sourceLineNo">474</span> if (term instanceof org.apache.commons.rdf.api.IRI) {<a name="line.474"></a> -<span class="sourceLineNo">475</span> org.apache.commons.rdf.api.IRI iri = (org.apache.commons.rdf.api.IRI) term;<a name="line.475"></a> +<span class="sourceLineNo">475</span> final org.apache.commons.rdf.api.IRI iri = (org.apache.commons.rdf.api.IRI) term;<a name="line.475"></a> <span class="sourceLineNo">476</span> return getValueFactory().createIRI(iri.getIRIString());<a name="line.476"></a> <span class="sourceLineNo">477</span> }<a name="line.477"></a> <span class="sourceLineNo">478</span> if (term instanceof org.apache.commons.rdf.api.Literal) {<a name="line.478"></a> -<span class="sourceLineNo">479</span> org.apache.commons.rdf.api.Literal literal = (org.apache.commons.rdf.api.Literal) term;<a name="line.479"></a> -<span class="sourceLineNo">480</span> String label = literal.getLexicalForm();<a name="line.480"></a> +<span class="sourceLineNo">479</span> final org.apache.commons.rdf.api.Literal literal = (org.apache.commons.rdf.api.Literal) term;<a name="line.479"></a> +<span class="sourceLineNo">480</span> final String label = literal.getLexicalForm();<a name="line.480"></a> <span class="sourceLineNo">481</span> if (literal.getLanguageTag().isPresent()) {<a name="line.481"></a> -<span class="sourceLineNo">482</span> String lang = literal.getLanguageTag().get();<a name="line.482"></a> +<span class="sourceLineNo">482</span> final String lang = literal.getLanguageTag().get();<a name="line.482"></a> <span class="sourceLineNo">483</span> return getValueFactory().createLiteral(label, lang);<a name="line.483"></a> <span class="sourceLineNo">484</span> }<a name="line.484"></a> -<span class="sourceLineNo">485</span> org.eclipse.rdf4j.model.IRI dataType = (org.eclipse.rdf4j.model.IRI) asValue(literal.getDatatype());<a name="line.485"></a> +<span class="sourceLineNo">485</span> final org.eclipse.rdf4j.model.IRI dataType = (org.eclipse.rdf4j.model.IRI) asValue(literal.getDatatype());<a name="line.485"></a> <span class="sourceLineNo">486</span> return getValueFactory().createLiteral(label, dataType);<a name="line.486"></a> <span class="sourceLineNo">487</span> }<a name="line.487"></a> <span class="sourceLineNo">488</span> if (term instanceof BlankNode) {<a name="line.488"></a> <span class="sourceLineNo">489</span> // This is where it gets tricky to support round trips!<a name="line.489"></a> -<span class="sourceLineNo">490</span> BlankNode blankNode = (BlankNode) term;<a name="line.490"></a> +<span class="sourceLineNo">490</span> final BlankNode blankNode = (BlankNode) term;<a name="line.490"></a> <span class="sourceLineNo">491</span> // FIXME: The uniqueReference might not be a valid BlankNode<a name="line.491"></a> <span class="sourceLineNo">492</span> // identifier..<a name="line.492"></a> <span class="sourceLineNo">493</span> // does it have to be in RDF4J?<a name="line.493"></a> @@ -506,13 +506,13 @@ <span class="sourceLineNo">498</span><a name="line.498"></a> <span class="sourceLineNo">499</span> @Override<a name="line.499"></a> <span class="sourceLineNo">500</span> public RDF4JBlankNode createBlankNode() {<a name="line.500"></a> -<span class="sourceLineNo">501</span> BNode bnode = getValueFactory().createBNode();<a name="line.501"></a> +<span class="sourceLineNo">501</span> final BNode bnode = getValueFactory().createBNode();<a name="line.501"></a> <span class="sourceLineNo">502</span> return (RDF4JBlankNode) asRDFTerm(bnode);<a name="line.502"></a> <span class="sourceLineNo">503</span> }<a name="line.503"></a> <span class="sourceLineNo">504</span><a name="line.504"></a> <span class="sourceLineNo">505</span> @Override<a name="line.505"></a> -<span class="sourceLineNo">506</span> public RDF4JBlankNode createBlankNode(String name) {<a name="line.506"></a> -<span class="sourceLineNo">507</span> BNode bnode = getValueFactory().createBNode(name);<a name="line.507"></a> +<span class="sourceLineNo">506</span> public RDF4JBlankNode createBlankNode(final String name) {<a name="line.506"></a> +<span class="sourceLineNo">507</span> final BNode bnode = getValueFactory().createBNode(name);<a name="line.507"></a> <span class="sourceLineNo">508</span> return (RDF4JBlankNode) asRDFTerm(bnode);<a name="line.508"></a> <span class="sourceLineNo">509</span> }<a name="line.509"></a> <span class="sourceLineNo">510</span><a name="line.510"></a> @@ -527,8 +527,8 @@ <span class="sourceLineNo">519</span> */<a name="line.519"></a> <span class="sourceLineNo">520</span> @Override<a name="line.520"></a> <span class="sourceLineNo">521</span> public RDF4JDataset createDataset() {<a name="line.521"></a> -<span class="sourceLineNo">522</span> Sail sail = new MemoryStore();<a name="line.522"></a> -<span class="sourceLineNo">523</span> Repository repository = new SailRepository(sail);<a name="line.523"></a> +<span class="sourceLineNo">522</span> final Sail sail = new MemoryStore();<a name="line.522"></a> +<span class="sourceLineNo">523</span> final Repository repository = new SailRepository(sail);<a name="line.523"></a> <span class="sourceLineNo">524</span> return rdf4j.createRepositoryDatasetImpl(repository, true, false);<a name="line.524"></a> <span class="sourceLineNo">525</span> }<a name="line.525"></a> <span class="sourceLineNo">526</span><a name="line.526"></a> @@ -538,33 +538,33 @@ <span class="sourceLineNo">530</span> }<a name="line.530"></a> <span class="sourceLineNo">531</span><a name="line.531"></a> <span class="sourceLineNo">532</span> @Override<a name="line.532"></a> -<span class="sourceLineNo">533</span> public RDF4JIRI createIRI(String iri) throws IllegalArgumentException {<a name="line.533"></a> +<span class="sourceLineNo">533</span> public RDF4JIRI createIRI(final String iri) throws IllegalArgumentException {<a name="line.533"></a> <span class="sourceLineNo">534</span> return (RDF4JIRI) asRDFTerm(getValueFactory().createIRI(iri));<a name="line.534"></a> <span class="sourceLineNo">535</span> }<a name="line.535"></a> <span class="sourceLineNo">536</span><a name="line.536"></a> <span class="sourceLineNo">537</span> @Override<a name="line.537"></a> -<span class="sourceLineNo">538</span> public RDF4JLiteral createLiteral(String lexicalForm) throws IllegalArgumentException {<a name="line.538"></a> -<span class="sourceLineNo">539</span> org.eclipse.rdf4j.model.Literal lit = getValueFactory().createLiteral(lexicalForm);<a name="line.539"></a> +<span class="sourceLineNo">538</span> public RDF4JLiteral createLiteral(final String lexicalForm) throws IllegalArgumentException {<a name="line.538"></a> +<span class="sourceLineNo">539</span> final org.eclipse.rdf4j.model.Literal lit = getValueFactory().createLiteral(lexicalForm);<a name="line.539"></a> <span class="sourceLineNo">540</span> return (RDF4JLiteral) asRDFTerm(lit);<a name="line.540"></a> <span class="sourceLineNo">541</span> }<a name="line.541"></a> <span class="sourceLineNo">542</span><a name="line.542"></a> <span class="sourceLineNo">543</span> @Override<a name="line.543"></a> -<span class="sourceLineNo">544</span> public org.apache.commons.rdf.api.Literal createLiteral(String lexicalForm, org.apache.commons.rdf.api.IRI dataType)<a name="line.544"></a> +<span class="sourceLineNo">544</span> public org.apache.commons.rdf.api.Literal createLiteral(final String lexicalForm, final org.apache.commons.rdf.api.IRI dataType)<a name="line.544"></a> <span class="sourceLineNo">545</span> throws IllegalArgumentException {<a name="line.545"></a> -<span class="sourceLineNo">546</span> org.eclipse.rdf4j.model.IRI iri = getValueFactory().createIRI(dataType.getIRIString());<a name="line.546"></a> -<span class="sourceLineNo">547</span> org.eclipse.rdf4j.model.Literal lit = getValueFactory().createLiteral(lexicalForm, iri);<a name="line.547"></a> +<span class="sourceLineNo">546</span> final org.eclipse.rdf4j.model.IRI iri = getValueFactory().createIRI(dataType.getIRIString());<a name="line.546"></a> +<span class="sourceLineNo">547</span> final org.eclipse.rdf4j.model.Literal lit = getValueFactory().createLiteral(lexicalForm, iri);<a name="line.547"></a> <span class="sourceLineNo">548</span> return (org.apache.commons.rdf.api.Literal) asRDFTerm(lit);<a name="line.548"></a> <span class="sourceLineNo">549</span> }<a name="line.549"></a> <span class="sourceLineNo">550</span><a name="line.550"></a> <span class="sourceLineNo">551</span> @Override<a name="line.551"></a> -<span class="sourceLineNo">552</span> public org.apache.commons.rdf.api.Literal createLiteral(String lexicalForm, String languageTag)<a name="line.552"></a> +<span class="sourceLineNo">552</span> public org.apache.commons.rdf.api.Literal createLiteral(final String lexicalForm, final String languageTag)<a name="line.552"></a> <span class="sourceLineNo">553</span> throws IllegalArgumentException {<a name="line.553"></a> -<span class="sourceLineNo">554</span> org.eclipse.rdf4j.model.Literal lit = getValueFactory().createLiteral(lexicalForm, languageTag);<a name="line.554"></a> +<span class="sourceLineNo">554</span> final org.eclipse.rdf4j.model.Literal lit = getValueFactory().createLiteral(lexicalForm, languageTag);<a name="line.554"></a> <span class="sourceLineNo">555</span> return (org.apache.commons.rdf.api.Literal) asRDFTerm(lit);<a name="line.555"></a> <span class="sourceLineNo">556</span> }<a name="line.556"></a> <span class="sourceLineNo">557</span><a name="line.557"></a> <span class="sourceLineNo">558</span> @Override<a name="line.558"></a> -<span class="sourceLineNo">559</span> public RDF4JTriple createTriple(BlankNodeOrIRI subject, org.apache.commons.rdf.api.IRI predicate, RDFTerm object)<a name="line.559"></a> +<span class="sourceLineNo">559</span> public RDF4JTriple createTriple(final BlankNodeOrIRI subject, final org.apache.commons.rdf.api.IRI predicate, final RDFTerm object)<a name="line.559"></a> <span class="sourceLineNo">560</span> throws IllegalArgumentException {<a name="line.560"></a> <span class="sourceLineNo">561</span> final Statement statement = getValueFactory().createStatement(<a name="line.561"></a> <span class="sourceLineNo">562</span> (org.eclipse.rdf4j.model.Resource) asValue(subject), (org.eclipse.rdf4j.model.IRI) asValue(predicate),<a name="line.562"></a> @@ -573,8 +573,8 @@ <span class="sourceLineNo">565</span> }<a name="line.565"></a> <span class="sourceLineNo">566</span><a name="line.566"></a> <span class="sourceLineNo">567</span> @Override<a name="line.567"></a> -<span class="sourceLineNo">568</span> public Quad createQuad(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, org.apache.commons.rdf.api.IRI predicate,<a name="line.568"></a> -<span class="sourceLineNo">569</span> RDFTerm object) throws IllegalArgumentException {<a name="line.569"></a> +<span class="sourceLineNo">568</span> public Quad createQuad(final BlankNodeOrIRI graphName, final BlankNodeOrIRI subject, final org.apache.commons.rdf.api.IRI predicate,<a name="line.568"></a> +<span class="sourceLineNo">569</span> final RDFTerm object) throws IllegalArgumentException {<a name="line.569"></a> <span class="sourceLineNo">570</span> final Statement statement = getValueFactory().createStatement(<a name="line.570"></a> <span class="sourceLineNo">571</span> (org.eclipse.rdf4j.model.Resource) asValue(subject), (org.eclipse.rdf4j.model.IRI) asValue(predicate),<a name="line.571"></a> <span class="sourceLineNo">572</span> asValue(object), (org.eclipse.rdf4j.model.Resource) asValue(graphName));<a name="line.572"></a> @@ -585,8 +585,8 @@ <span class="sourceLineNo">577</span> return valueFactory;<a name="line.577"></a> <span class="sourceLineNo">578</span> }<a name="line.578"></a> <span class="sourceLineNo">579</span><a name="line.579"></a> -<span class="sourceLineNo">580</span> private EnumSet<Option> optionSet(Option... options) {<a name="line.580"></a> -<span class="sourceLineNo">581</span> EnumSet<Option> opts = EnumSet.noneOf(Option.class);<a name="line.581"></a> +<span class="sourceLineNo">580</span> private EnumSet<Option> optionSet(final Option... options) {<a name="line.580"></a> +<span class="sourceLineNo">581</span> final EnumSet<Option> opts = EnumSet.noneOf(Option.class);<a name="line.581"></a> <span class="sourceLineNo">582</span> opts.addAll(Arrays.asList(options));<a name="line.582"></a> <span class="sourceLineNo">583</span> return opts;<a name="line.583"></a> <span class="sourceLineNo">584</span> }<a name="line.584"></a>
Modified: websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/rdf4j/experimental/RDF4JParser.html ============================================================================== --- websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/rdf4j/experimental/RDF4JParser.html (original) +++ websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/rdf4j/experimental/RDF4JParser.html Tue Nov 22 07:55:35 2016 @@ -38,43 +38,43 @@ <span class="sourceLineNo">030</span>import org.apache.commons.rdf.api.IRI;<a name="line.30"></a> <span class="sourceLineNo">031</span>import org.apache.commons.rdf.api.Quad;<a name="line.31"></a> <span class="sourceLineNo">032</span>import org.apache.commons.rdf.api.RDFSyntax;<a name="line.32"></a> -<span class="sourceLineNo">033</span>import org.apache.commons.rdf.experimental.RDFParser;<a name="line.33"></a> +<span class="sourceLineNo">033</span>import org.apache.commons.rdf.rdf4j.RDF4J;<a name="line.33"></a> <span class="sourceLineNo">034</span>import org.apache.commons.rdf.rdf4j.RDF4JBlankNodeOrIRI;<a name="line.34"></a> <span class="sourceLineNo">035</span>import org.apache.commons.rdf.rdf4j.RDF4JDataset;<a name="line.35"></a> <span class="sourceLineNo">036</span>import org.apache.commons.rdf.rdf4j.RDF4JGraph;<a name="line.36"></a> -<span class="sourceLineNo">037</span>import org.apache.commons.rdf.rdf4j.RDF4J;<a name="line.37"></a> -<span class="sourceLineNo">038</span>import org.apache.commons.rdf.simple.experimental.AbstractRDFParser;<a name="line.38"></a> -<span class="sourceLineNo">039</span>import org.eclipse.rdf4j.model.Model;<a name="line.39"></a> -<span class="sourceLineNo">040</span>import org.eclipse.rdf4j.model.Resource;<a name="line.40"></a> -<span class="sourceLineNo">041</span>import org.eclipse.rdf4j.repository.util.RDFInserter;<a name="line.41"></a> -<span class="sourceLineNo">042</span>import org.eclipse.rdf4j.repository.util.RDFLoader;<a name="line.42"></a> -<span class="sourceLineNo">043</span>import org.eclipse.rdf4j.rio.ParserConfig;<a name="line.43"></a> -<span class="sourceLineNo">044</span>import org.eclipse.rdf4j.rio.RDFFormat;<a name="line.44"></a> -<span class="sourceLineNo">045</span>import org.eclipse.rdf4j.rio.RDFHandler;<a name="line.45"></a> -<span class="sourceLineNo">046</span>import org.eclipse.rdf4j.rio.RDFHandlerException;<a name="line.46"></a> -<span class="sourceLineNo">047</span>import org.eclipse.rdf4j.rio.Rio;<a name="line.47"></a> -<span class="sourceLineNo">048</span>import org.eclipse.rdf4j.rio.helpers.AbstractRDFHandler;<a name="line.48"></a> -<span class="sourceLineNo">049</span><a name="line.49"></a> -<span class="sourceLineNo">050</span>/**<a name="line.50"></a> -<span class="sourceLineNo">051</span> * RDF4J-based parser.<a name="line.51"></a> -<span class="sourceLineNo">052</span> * <p><a name="line.52"></a> -<span class="sourceLineNo">053</span> * This can handle the RDF syntaxes {@link RDFSyntax#JSONLD},<a name="line.53"></a> -<span class="sourceLineNo">054</span> * {@link RDFSyntax#NQUADS}, {@link RDFSyntax#NTRIPLES},<a name="line.54"></a> -<span class="sourceLineNo">055</span> * {@link RDFSyntax#RDFXML}, {@link RDFSyntax#TRIG} and {@link RDFSyntax#TURTLE}<a name="line.55"></a> -<span class="sourceLineNo">056</span> * - additional syntaxes can be supported by including the corresponding<a name="line.56"></a> -<span class="sourceLineNo">057</span> * <em>rdf4j-rio-*</em> module on the classpath.<a name="line.57"></a> -<span class="sourceLineNo">058</span> *<a name="line.58"></a> -<span class="sourceLineNo">059</span> */<a name="line.59"></a> -<span class="sourceLineNo">060</span>public class RDF4JParser extends AbstractRDFParser<RDF4JParser> implements RDFParser {<a name="line.60"></a> -<span class="sourceLineNo">061</span><a name="line.61"></a> -<span class="sourceLineNo">062</span> private final class AddToQuadConsumer extends AbstractRDFHandler {<a name="line.62"></a> -<span class="sourceLineNo">063</span> private final Consumer<Quad> quadTarget;<a name="line.63"></a> -<span class="sourceLineNo">064</span><a name="line.64"></a> -<span class="sourceLineNo">065</span> private AddToQuadConsumer(Consumer<Quad> quadTarget) {<a name="line.65"></a> -<span class="sourceLineNo">066</span> this.quadTarget = quadTarget;<a name="line.66"></a> -<span class="sourceLineNo">067</span> }<a name="line.67"></a> -<span class="sourceLineNo">068</span><a name="line.68"></a> -<span class="sourceLineNo">069</span> public void handleStatement(org.eclipse.rdf4j.model.Statement st)<a name="line.69"></a> +<span class="sourceLineNo">037</span>import org.apache.commons.rdf.simple.experimental.AbstractRDFParser;<a name="line.37"></a> +<span class="sourceLineNo">038</span>import org.eclipse.rdf4j.model.Model;<a name="line.38"></a> +<span class="sourceLineNo">039</span>import org.eclipse.rdf4j.model.Resource;<a name="line.39"></a> +<span class="sourceLineNo">040</span>import org.eclipse.rdf4j.repository.util.RDFInserter;<a name="line.40"></a> +<span class="sourceLineNo">041</span>import org.eclipse.rdf4j.repository.util.RDFLoader;<a name="line.41"></a> +<span class="sourceLineNo">042</span>import org.eclipse.rdf4j.rio.ParserConfig;<a name="line.42"></a> +<span class="sourceLineNo">043</span>import org.eclipse.rdf4j.rio.RDFFormat;<a name="line.43"></a> +<span class="sourceLineNo">044</span>import org.eclipse.rdf4j.rio.RDFHandler;<a name="line.44"></a> +<span class="sourceLineNo">045</span>import org.eclipse.rdf4j.rio.RDFHandlerException;<a name="line.45"></a> +<span class="sourceLineNo">046</span>import org.eclipse.rdf4j.rio.Rio;<a name="line.46"></a> +<span class="sourceLineNo">047</span>import org.eclipse.rdf4j.rio.helpers.AbstractRDFHandler;<a name="line.47"></a> +<span class="sourceLineNo">048</span><a name="line.48"></a> +<span class="sourceLineNo">049</span>/**<a name="line.49"></a> +<span class="sourceLineNo">050</span> * RDF4J-based parser.<a name="line.50"></a> +<span class="sourceLineNo">051</span> * <p><a name="line.51"></a> +<span class="sourceLineNo">052</span> * This can handle the RDF syntaxes {@link RDFSyntax#JSONLD},<a name="line.52"></a> +<span class="sourceLineNo">053</span> * {@link RDFSyntax#NQUADS}, {@link RDFSyntax#NTRIPLES},<a name="line.53"></a> +<span class="sourceLineNo">054</span> * {@link RDFSyntax#RDFXML}, {@link RDFSyntax#TRIG} and {@link RDFSyntax#TURTLE}<a name="line.54"></a> +<span class="sourceLineNo">055</span> * - additional syntaxes can be supported by including the corresponding<a name="line.55"></a> +<span class="sourceLineNo">056</span> * <em>rdf4j-rio-*</em> module on the classpath.<a name="line.56"></a> +<span class="sourceLineNo">057</span> *<a name="line.57"></a> +<span class="sourceLineNo">058</span> */<a name="line.58"></a> +<span class="sourceLineNo">059</span>public class RDF4JParser extends AbstractRDFParser<RDF4JParser> {<a name="line.59"></a> +<span class="sourceLineNo">060</span><a name="line.60"></a> +<span class="sourceLineNo">061</span> private final class AddToQuadConsumer extends AbstractRDFHandler {<a name="line.61"></a> +<span class="sourceLineNo">062</span> private final Consumer<Quad> quadTarget;<a name="line.62"></a> +<span class="sourceLineNo">063</span><a name="line.63"></a> +<span class="sourceLineNo">064</span> private AddToQuadConsumer(final Consumer<Quad> quadTarget) {<a name="line.64"></a> +<span class="sourceLineNo">065</span> this.quadTarget = quadTarget;<a name="line.65"></a> +<span class="sourceLineNo">066</span> }<a name="line.66"></a> +<span class="sourceLineNo">067</span><a name="line.67"></a> +<span class="sourceLineNo">068</span> @Override<a name="line.68"></a> +<span class="sourceLineNo">069</span> public void handleStatement(final org.eclipse.rdf4j.model.Statement st)<a name="line.69"></a> <span class="sourceLineNo">070</span> throws org.eclipse.rdf4j.rio.RDFHandlerException {<a name="line.70"></a> <span class="sourceLineNo">071</span> // TODO: if getRdfTermFactory() is a non-rdf4j factory, should<a name="line.71"></a> <span class="sourceLineNo">072</span> // we use factory.createQuad() instead?<a name="line.72"></a> @@ -94,154 +94,155 @@ <span class="sourceLineNo">086</span> private final static class AddToModel extends AbstractRDFHandler {<a name="line.86"></a> <span class="sourceLineNo">087</span> private final Model model;<a name="line.87"></a> <span class="sourceLineNo">088</span><a name="line.88"></a> -<span class="sourceLineNo">089</span> public AddToModel(Model model) {<a name="line.89"></a> +<span class="sourceLineNo">089</span> public AddToModel(final Model model) {<a name="line.89"></a> <span class="sourceLineNo">090</span> this.model = model;<a name="line.90"></a> <span class="sourceLineNo">091</span> }<a name="line.91"></a> <span class="sourceLineNo">092</span><a name="line.92"></a> -<span class="sourceLineNo">093</span> public void handleStatement(org.eclipse.rdf4j.model.Statement st)<a name="line.93"></a> -<span class="sourceLineNo">094</span> throws org.eclipse.rdf4j.rio.RDFHandlerException {<a name="line.94"></a> -<span class="sourceLineNo">095</span> model.add(st);<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> @Override<a name="line.98"></a> -<span class="sourceLineNo">099</span> public void handleNamespace(String prefix, String uri) throws RDFHandlerException {<a name="line.99"></a> -<span class="sourceLineNo">100</span> model.setNamespace(prefix, uri);<a name="line.100"></a> -<span class="sourceLineNo">101</span> }<a name="line.101"></a> -<span class="sourceLineNo">102</span> }<a name="line.102"></a> -<span class="sourceLineNo">103</span><a name="line.103"></a> -<span class="sourceLineNo">104</span> private RDF4J rdf4jTermFactory;<a name="line.104"></a> -<span class="sourceLineNo">105</span> private ParserConfig parserConfig = new ParserConfig();<a name="line.105"></a> -<span class="sourceLineNo">106</span><a name="line.106"></a> -<span class="sourceLineNo">107</span> @Override<a name="line.107"></a> -<span class="sourceLineNo">108</span> protected RDF4J createRDFTermFactory() {<a name="line.108"></a> -<span class="sourceLineNo">109</span> return new RDF4J();<a name="line.109"></a> -<span class="sourceLineNo">110</span> }<a name="line.110"></a> -<span class="sourceLineNo">111</span><a name="line.111"></a> -<span class="sourceLineNo">112</span> @Override<a name="line.112"></a> -<span class="sourceLineNo">113</span> protected RDF4JParser prepareForParsing() throws IOException, IllegalStateException {<a name="line.113"></a> -<span class="sourceLineNo">114</span> RDF4JParser c = super.prepareForParsing();<a name="line.114"></a> -<span class="sourceLineNo">115</span> // Ensure we have an RDF4J for conversion.<a name="line.115"></a> -<span class="sourceLineNo">116</span> // We'll make a new one if user has provided a non-RDF4J factory<a name="line.116"></a> -<span class="sourceLineNo">117</span> c.rdf4jTermFactory = (RDF4J) getRdfTermFactory().filter(RDF4J.class::isInstance)<a name="line.117"></a> -<span class="sourceLineNo">118</span> .orElseGet(c::createRDFTermFactory);<a name="line.118"></a> -<span class="sourceLineNo">119</span> return c;<a name="line.119"></a> -<span class="sourceLineNo">120</span> }<a name="line.120"></a> -<span class="sourceLineNo">121</span><a name="line.121"></a> -<span class="sourceLineNo">122</span> @Override<a name="line.122"></a> -<span class="sourceLineNo">123</span> protected void parseSynchronusly() throws IOException {<a name="line.123"></a> -<span class="sourceLineNo">124</span> Optional<RDFFormat> formatByMimeType = getContentType().flatMap(Rio::getParserFormatForMIMEType);<a name="line.124"></a> -<span class="sourceLineNo">125</span> String base = getBase().map(IRI::getIRIString).orElse(null);<a name="line.125"></a> -<span class="sourceLineNo">126</span><a name="line.126"></a> -<span class="sourceLineNo">127</span> ParserConfig parserConfig = getParserConfig();<a name="line.127"></a> -<span class="sourceLineNo">128</span> // TODO: Should we need to set anything?<a name="line.128"></a> -<span class="sourceLineNo">129</span> RDFLoader loader = new RDFLoader(parserConfig, rdf4jTermFactory.getValueFactory());<a name="line.129"></a> -<span class="sourceLineNo">130</span> RDFHandler rdfHandler = makeRDFHandler();<a name="line.130"></a> -<span class="sourceLineNo">131</span> if (getSourceFile().isPresent()) {<a name="line.131"></a> -<span class="sourceLineNo">132</span> // NOTE: While we could have used<a name="line.132"></a> -<span class="sourceLineNo">133</span> // loader.load(sourcePath.toFile()<a name="line.133"></a> -<span class="sourceLineNo">134</span> // if the path fs provider == FileSystems.getDefault(),<a name="line.134"></a> -<span class="sourceLineNo">135</span> // that RDFLoader method does not use absolute path<a name="line.135"></a> -<span class="sourceLineNo">136</span> // as the base URI, so to be consistent<a name="line.136"></a> -<span class="sourceLineNo">137</span> // we'll always do it with our own input stream<a name="line.137"></a> -<span class="sourceLineNo">138</span> //<a name="line.138"></a> -<span class="sourceLineNo">139</span> // That means we may have to guess format by extensions:<a name="line.139"></a> -<span class="sourceLineNo">140</span> Optional<RDFFormat> formatByFilename = getSourceFile().map(Path::getFileName).map(Path::toString)<a name="line.140"></a> -<span class="sourceLineNo">141</span> .flatMap(Rio::getParserFormatForFileName);<a name="line.141"></a> -<span class="sourceLineNo">142</span> // TODO: for the excited.. what about the extension after following<a name="line.142"></a> -<span class="sourceLineNo">143</span> // symlinks?<a name="line.143"></a> -<span class="sourceLineNo">144</span><a name="line.144"></a> -<span class="sourceLineNo">145</span> RDFFormat format = formatByMimeType.orElse(formatByFilename.orElse(null));<a name="line.145"></a> -<span class="sourceLineNo">146</span> try (InputStream in = Files.newInputStream(getSourceFile().get())) {<a name="line.146"></a> -<span class="sourceLineNo">147</span> loader.load(in, base, format, rdfHandler);<a name="line.147"></a> -<span class="sourceLineNo">148</span> }<a name="line.148"></a> -<span class="sourceLineNo">149</span> } else if (getSourceIri().isPresent()) {<a name="line.149"></a> -<span class="sourceLineNo">150</span> try {<a name="line.150"></a> -<span class="sourceLineNo">151</span> // TODO: Handle international IRIs properly<a name="line.151"></a> -<span class="sourceLineNo">152</span> // (Unicode support for for hostname, path and query)<a name="line.152"></a> -<span class="sourceLineNo">153</span> URL url = new URL(getSourceIri().get().getIRIString());<a name="line.153"></a> -<span class="sourceLineNo">154</span> // TODO: This probably does not support https:// -> http://<a name="line.154"></a> -<span class="sourceLineNo">155</span> // redirections<a name="line.155"></a> -<span class="sourceLineNo">156</span> loader.load(url, base, formatByMimeType.orElse(null), makeRDFHandler());<a name="line.156"></a> -<span class="sourceLineNo">157</span> } catch (MalformedURLException ex) {<a name="line.157"></a> -<span class="sourceLineNo">158</span> throw new IOException("Can't handle source URL: " + getSourceIri().get(), ex);<a name="line.158"></a> -<span class="sourceLineNo">159</span> }<a name="line.159"></a> -<span class="sourceLineNo">160</span> }<a name="line.160"></a> -<span class="sourceLineNo">161</span> // must be getSourceInputStream then, this is guaranteed by<a name="line.161"></a> -<span class="sourceLineNo">162</span> // super.checkSource();<a name="line.162"></a> -<span class="sourceLineNo">163</span> loader.load(getSourceInputStream().get(), base, formatByMimeType.orElse(null), rdfHandler);<a name="line.163"></a> -<span class="sourceLineNo">164</span> }<a name="line.164"></a> -<span class="sourceLineNo">165</span><a name="line.165"></a> -<span class="sourceLineNo">166</span> /**<a name="line.166"></a> -<span class="sourceLineNo">167</span> * Get the RDF4J {@link ParserConfig} to use.<a name="line.167"></a> -<span class="sourceLineNo">168</span> * <p><a name="line.168"></a> -<span class="sourceLineNo">169</span> * If no parser config is set, the default configuration is provided.<a name="line.169"></a> -<span class="sourceLineNo">170</span> * <p><a name="line.170"></a> -<span class="sourceLineNo">171</span> * <strong>Note:</strong> The parser config is mutable - changes in the<a name="line.171"></a> -<span class="sourceLineNo">172</span> * returned config is reflected in this instance of the parser. To avoid<a name="line.172"></a> -<span class="sourceLineNo">173</span> * mutation, create a new {@link ParserConfig} and set<a name="line.173"></a> -<span class="sourceLineNo">174</span> * {@link #setParserConfig(ParserConfig)}.<a name="line.174"></a> -<span class="sourceLineNo">175</span> * <a name="line.175"></a> -<span class="sourceLineNo">176</span> * @return The RDF4J {@link ParserConfig}<a name="line.176"></a> -<span class="sourceLineNo">177</span> */<a name="line.177"></a> -<span class="sourceLineNo">178</span> public ParserConfig getParserConfig() {<a name="line.178"></a> -<span class="sourceLineNo">179</span> return parserConfig;<a name="line.179"></a> -<span class="sourceLineNo">180</span> }<a name="line.180"></a> -<span class="sourceLineNo">181</span><a name="line.181"></a> -<span class="sourceLineNo">182</span> /**<a name="line.182"></a> -<span class="sourceLineNo">183</span> * Set an RDF4J {@link ParserConfig} to use<a name="line.183"></a> -<span class="sourceLineNo">184</span> * <a name="line.184"></a> -<span class="sourceLineNo">185</span> * @param parserConfig<a name="line.185"></a> -<span class="sourceLineNo">186</span> * Parser configuration<a name="line.186"></a> -<span class="sourceLineNo">187</span> */<a name="line.187"></a> -<span class="sourceLineNo">188</span> public void setParserConfig(ParserConfig parserConfig) {<a name="line.188"></a> -<span class="sourceLineNo">189</span> this.parserConfig = parserConfig;<a name="line.189"></a> -<span class="sourceLineNo">190</span> }<a name="line.190"></a> -<span class="sourceLineNo">191</span><a name="line.191"></a> -<span class="sourceLineNo">192</span> protected RDFHandler makeRDFHandler() {<a name="line.192"></a> -<span class="sourceLineNo">193</span><a name="line.193"></a> -<span class="sourceLineNo">194</span> // TODO: Can we join the below DF4JDataset and RDF4JGraph cases<a name="line.194"></a> -<span class="sourceLineNo">195</span> // using RDF4JGraphLike<TripleLike<BlankNodeOrIRI,IRI,RDFTerm>><a name="line.195"></a> -<span class="sourceLineNo">196</span> // or will that need tricky generics types?<a name="line.196"></a> -<span class="sourceLineNo">197</span><a name="line.197"></a> -<span class="sourceLineNo">198</span> if (getTargetDataset().filter(RDF4JDataset.class::isInstance).isPresent()) {<a name="line.198"></a> -<span class="sourceLineNo">199</span> // One of us, we can add them as Statements directly<a name="line.199"></a> -<span class="sourceLineNo">200</span> RDF4JDataset dataset = (RDF4JDataset) getTargetDataset().get();<a name="line.200"></a> -<span class="sourceLineNo">201</span> if (dataset.asRepository().isPresent()) {<a name="line.201"></a> -<span class="sourceLineNo">202</span> return new RDFInserter(dataset.asRepository().get().getConnection());<a name="line.202"></a> -<span class="sourceLineNo">203</span> }<a name="line.203"></a> -<span class="sourceLineNo">204</span> if (dataset.asModel().isPresent()) {<a name="line.204"></a> -<span class="sourceLineNo">205</span> Model model = dataset.asModel().get();<a name="line.205"></a> -<span class="sourceLineNo">206</span> return new AddToModel(model);<a name="line.206"></a> -<span class="sourceLineNo">207</span> }<a name="line.207"></a> -<span class="sourceLineNo">208</span> // Not backed by Repository or Model?<a name="line.208"></a> -<span class="sourceLineNo">209</span> // Third-party RDF4JDataset subclass, so we'll fall through to the<a name="line.209"></a> -<span class="sourceLineNo">210</span> // getTarget() handling further down<a name="line.210"></a> -<span class="sourceLineNo">211</span> } else if (getTargetGraph().filter(RDF4JGraph.class::isInstance).isPresent()) {<a name="line.211"></a> -<span class="sourceLineNo">212</span> RDF4JGraph graph = (RDF4JGraph) getTargetGraph().get();<a name="line.212"></a> -<span class="sourceLineNo">213</span><a name="line.213"></a> -<span class="sourceLineNo">214</span> if (graph.asRepository().isPresent()) {<a name="line.214"></a> -<span class="sourceLineNo">215</span> RDFInserter inserter = new RDFInserter(graph.asRepository().get().getConnection());<a name="line.215"></a> -<span class="sourceLineNo">216</span> if (!graph.getContextMask().isEmpty()) {<a name="line.216"></a> -<span class="sourceLineNo">217</span> Stream<RDF4JBlankNodeOrIRI> b = graph.getContextMask().stream();<a name="line.217"></a> -<span class="sourceLineNo">218</span> Stream<Resource> c = b.map(RDF4JBlankNodeOrIRI::asValue);<a name="line.218"></a> -<span class="sourceLineNo">219</span> Resource[] contexts = c.toArray(Resource[]::new);<a name="line.219"></a> -<span class="sourceLineNo">220</span> inserter.enforceContext(contexts);<a name="line.220"></a> -<span class="sourceLineNo">221</span> }<a name="line.221"></a> -<span class="sourceLineNo">222</span> return inserter;<a name="line.222"></a> -<span class="sourceLineNo">223</span> }<a name="line.223"></a> -<span class="sourceLineNo">224</span> if (graph.asModel().isPresent() && graph.getContextMask().isEmpty()) {<a name="line.224"></a> -<span class="sourceLineNo">225</span> // the model accepts any quad<a name="line.225"></a> -<span class="sourceLineNo">226</span> Model model = graph.asModel().get();<a name="line.226"></a> -<span class="sourceLineNo">227</span> return new AddToModel(model);<a name="line.227"></a> -<span class="sourceLineNo">228</span> }<a name="line.228"></a> -<span class="sourceLineNo">229</span> // else - fall through<a name="line.229"></a> -<span class="sourceLineNo">230</span> }<a name="line.230"></a> -<span class="sourceLineNo">231</span><a name="line.231"></a> -<span class="sourceLineNo">232</span> // Fall thorough: let target() consume our converted quads.<a name="line.232"></a> -<span class="sourceLineNo">233</span> return new AddToQuadConsumer(getTarget());<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> +<span class="sourceLineNo">093</span> @Override<a name="line.93"></a> +<span class="sourceLineNo">094</span> public void handleStatement(final org.eclipse.rdf4j.model.Statement st)<a name="line.94"></a> +<span class="sourceLineNo">095</span> throws org.eclipse.rdf4j.rio.RDFHandlerException {<a name="line.95"></a> +<span class="sourceLineNo">096</span> model.add(st);<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">099</span> @Override<a name="line.99"></a> +<span class="sourceLineNo">100</span> public void handleNamespace(final String prefix, final String uri) throws RDFHandlerException {<a name="line.100"></a> +<span class="sourceLineNo">101</span> model.setNamespace(prefix, uri);<a name="line.101"></a> +<span class="sourceLineNo">102</span> }<a name="line.102"></a> +<span class="sourceLineNo">103</span> }<a name="line.103"></a> +<span class="sourceLineNo">104</span><a name="line.104"></a> +<span class="sourceLineNo">105</span> private RDF4J rdf4jTermFactory;<a name="line.105"></a> +<span class="sourceLineNo">106</span> private ParserConfig parserConfig = new ParserConfig();<a name="line.106"></a> +<span class="sourceLineNo">107</span><a name="line.107"></a> +<span class="sourceLineNo">108</span> @Override<a name="line.108"></a> +<span class="sourceLineNo">109</span> protected RDF4J createRDFTermFactory() {<a name="line.109"></a> +<span class="sourceLineNo">110</span> return new RDF4J();<a name="line.110"></a> +<span class="sourceLineNo">111</span> }<a name="line.111"></a> +<span class="sourceLineNo">112</span><a name="line.112"></a> +<span class="sourceLineNo">113</span> @Override<a name="line.113"></a> +<span class="sourceLineNo">114</span> protected RDF4JParser prepareForParsing() throws IOException, IllegalStateException {<a name="line.114"></a> +<span class="sourceLineNo">115</span> final RDF4JParser c = super.prepareForParsing();<a name="line.115"></a> +<span class="sourceLineNo">116</span> // Ensure we have an RDF4J for conversion.<a name="line.116"></a> +<span class="sourceLineNo">117</span> // We'll make a new one if user has provided a non-RDF4J factory<a name="line.117"></a> +<span class="sourceLineNo">118</span> c.rdf4jTermFactory = (RDF4J) getRdfTermFactory().filter(RDF4J.class::isInstance)<a name="line.118"></a> +<span class="sourceLineNo">119</span> .orElseGet(c::createRDFTermFactory);<a name="line.119"></a> +<span class="sourceLineNo">120</span> return c;<a name="line.120"></a> +<span class="sourceLineNo">121</span> }<a name="line.121"></a> +<span class="sourceLineNo">122</span><a name="line.122"></a> +<span class="sourceLineNo">123</span> @Override<a name="line.123"></a> +<span class="sourceLineNo">124</span> protected void parseSynchronusly() throws IOException {<a name="line.124"></a> +<span class="sourceLineNo">125</span> final Optional<RDFFormat> formatByMimeType = getContentType().flatMap(Rio::getParserFormatForMIMEType);<a name="line.125"></a> +<span class="sourceLineNo">126</span> final String base = getBase().map(IRI::getIRIString).orElse(null);<a name="line.126"></a> +<span class="sourceLineNo">127</span><a name="line.127"></a> +<span class="sourceLineNo">128</span> final ParserConfig parserConfig = getParserConfig();<a name="line.128"></a> +<span class="sourceLineNo">129</span> // TODO: Should we need to set anything?<a name="line.129"></a> +<span class="sourceLineNo">130</span> final RDFLoader loader = new RDFLoader(parserConfig, rdf4jTermFactory.getValueFactory());<a name="line.130"></a> +<span class="sourceLineNo">131</span> final RDFHandler rdfHandler = makeRDFHandler();<a name="line.131"></a> +<span class="sourceLineNo">132</span> if (getSourceFile().isPresent()) {<a name="line.132"></a> +<span class="sourceLineNo">133</span> // NOTE: While we could have used<a name="line.133"></a> +<span class="sourceLineNo">134</span> // loader.load(sourcePath.toFile()<a name="line.134"></a> +<span class="sourceLineNo">135</span> // if the path fs provider == FileSystems.getDefault(),<a name="line.135"></a> +<span class="sourceLineNo">136</span> // that RDFLoader method does not use absolute path<a name="line.136"></a> +<span class="sourceLineNo">137</span> // as the base URI, so to be consistent<a name="line.137"></a> +<span class="sourceLineNo">138</span> // we'll always do it with our own input stream<a name="line.138"></a> +<span class="sourceLineNo">139</span> //<a name="line.139"></a> +<span class="sourceLineNo">140</span> // That means we may have to guess format by extensions:<a name="line.140"></a> +<span class="sourceLineNo">141</span> final Optional<RDFFormat> formatByFilename = getSourceFile().map(Path::getFileName).map(Path::toString)<a name="line.141"></a> +<span class="sourceLineNo">142</span> .flatMap(Rio::getParserFormatForFileName);<a name="line.142"></a> +<span class="sourceLineNo">143</span> // TODO: for the excited.. what about the extension after following<a name="line.143"></a> +<span class="sourceLineNo">144</span> // symlinks?<a name="line.144"></a> +<span class="sourceLineNo">145</span><a name="line.145"></a> +<span class="sourceLineNo">146</span> final RDFFormat format = formatByMimeType.orElse(formatByFilename.orElse(null));<a name="line.146"></a> +<span class="sourceLineNo">147</span> try (InputStream in = Files.newInputStream(getSourceFile().get())) {<a name="line.147"></a> +<span class="sourceLineNo">148</span> loader.load(in, base, format, rdfHandler);<a name="line.148"></a> +<span class="sourceLineNo">149</span> }<a name="line.149"></a> +<span class="sourceLineNo">150</span> } else if (getSourceIri().isPresent()) {<a name="line.150"></a> +<span class="sourceLineNo">151</span> try {<a name="line.151"></a> +<span class="sourceLineNo">152</span> // TODO: Handle international IRIs properly<a name="line.152"></a> +<span class="sourceLineNo">153</span> // (Unicode support for for hostname, path and query)<a name="line.153"></a> +<span class="sourceLineNo">154</span> final URL url = new URL(getSourceIri().get().getIRIString());<a name="line.154"></a> +<span class="sourceLineNo">155</span> // TODO: This probably does not support https:// -> http://<a name="line.155"></a> +<span class="sourceLineNo">156</span> // redirections<a name="line.156"></a> +<span class="sourceLineNo">157</span> loader.load(url, base, formatByMimeType.orElse(null), makeRDFHandler());<a name="line.157"></a> +<span class="sourceLineNo">158</span> } catch (final MalformedURLException ex) {<a name="line.158"></a> +<span class="sourceLineNo">159</span> throw new IOException("Can't handle source URL: " + getSourceIri().get(), ex);<a name="line.159"></a> +<span class="sourceLineNo">160</span> }<a name="line.160"></a> +<span class="sourceLineNo">161</span> }<a name="line.161"></a> +<span class="sourceLineNo">162</span> // must be getSourceInputStream then, this is guaranteed by<a name="line.162"></a> +<span class="sourceLineNo">163</span> // super.checkSource();<a name="line.163"></a> +<span class="sourceLineNo">164</span> loader.load(getSourceInputStream().get(), base, formatByMimeType.orElse(null), rdfHandler);<a name="line.164"></a> +<span class="sourceLineNo">165</span> }<a name="line.165"></a> +<span class="sourceLineNo">166</span><a name="line.166"></a> +<span class="sourceLineNo">167</span> /**<a name="line.167"></a> +<span class="sourceLineNo">168</span> * Get the RDF4J {@link ParserConfig} to use.<a name="line.168"></a> +<span class="sourceLineNo">169</span> * <p><a name="line.169"></a> +<span class="sourceLineNo">170</span> * If no parser config is set, the default configuration is provided.<a name="line.170"></a> +<span class="sourceLineNo">171</span> * <p><a name="line.171"></a> +<span class="sourceLineNo">172</span> * <strong>Note:</strong> The parser config is mutable - changes in the<a name="line.172"></a> +<span class="sourceLineNo">173</span> * returned config is reflected in this instance of the parser. To avoid<a name="line.173"></a> +<span class="sourceLineNo">174</span> * mutation, create a new {@link ParserConfig} and set<a name="line.174"></a> +<span class="sourceLineNo">175</span> * {@link #setParserConfig(ParserConfig)}.<a name="line.175"></a> +<span class="sourceLineNo">176</span> * <a name="line.176"></a> +<span class="sourceLineNo">177</span> * @return The RDF4J {@link ParserConfig}<a name="line.177"></a> +<span class="sourceLineNo">178</span> */<a name="line.178"></a> +<span class="sourceLineNo">179</span> public ParserConfig getParserConfig() {<a name="line.179"></a> +<span class="sourceLineNo">180</span> return parserConfig;<a name="line.180"></a> +<span class="sourceLineNo">181</span> }<a name="line.181"></a> +<span class="sourceLineNo">182</span><a name="line.182"></a> +<span class="sourceLineNo">183</span> /**<a name="line.183"></a> +<span class="sourceLineNo">184</span> * Set an RDF4J {@link ParserConfig} to use<a name="line.184"></a> +<span class="sourceLineNo">185</span> * <a name="line.185"></a> +<span class="sourceLineNo">186</span> * @param parserConfig<a name="line.186"></a> +<span class="sourceLineNo">187</span> * Parser configuration<a name="line.187"></a> +<span class="sourceLineNo">188</span> */<a name="line.188"></a> +<span class="sourceLineNo">189</span> public void setParserConfig(final ParserConfig parserConfig) {<a name="line.189"></a> +<span class="sourceLineNo">190</span> this.parserConfig = parserConfig;<a name="line.190"></a> +<span class="sourceLineNo">191</span> }<a name="line.191"></a> +<span class="sourceLineNo">192</span><a name="line.192"></a> +<span class="sourceLineNo">193</span> protected RDFHandler makeRDFHandler() {<a name="line.193"></a> +<span class="sourceLineNo">194</span><a name="line.194"></a> +<span class="sourceLineNo">195</span> // TODO: Can we join the below DF4JDataset and RDF4JGraph cases<a name="line.195"></a> +<span class="sourceLineNo">196</span> // using RDF4JGraphLike<TripleLike<BlankNodeOrIRI,IRI,RDFTerm>><a name="line.196"></a> +<span class="sourceLineNo">197</span> // or will that need tricky generics types?<a name="line.197"></a> +<span class="sourceLineNo">198</span><a name="line.198"></a> +<span class="sourceLineNo">199</span> if (getTargetDataset().filter(RDF4JDataset.class::isInstance).isPresent()) {<a name="line.199"></a> +<span class="sourceLineNo">200</span> // One of us, we can add them as Statements directly<a name="line.200"></a> +<span class="sourceLineNo">201</span> final RDF4JDataset dataset = (RDF4JDataset) getTargetDataset().get();<a name="line.201"></a> +<span class="sourceLineNo">202</span> if (dataset.asRepository().isPresent()) {<a name="line.202"></a> +<span class="sourceLineNo">203</span> return new RDFInserter(dataset.asRepository().get().getConnection());<a name="line.203"></a> +<span class="sourceLineNo">204</span> }<a name="line.204"></a> +<span class="sourceLineNo">205</span> if (dataset.asModel().isPresent()) {<a name="line.205"></a> +<span class="sourceLineNo">206</span> final Model model = dataset.asModel().get();<a name="line.206"></a> +<span class="sourceLineNo">207</span> return new AddToModel(model);<a name="line.207"></a> +<span class="sourceLineNo">208</span> }<a name="line.208"></a> +<span class="sourceLineNo">209</span> // Not backed by Repository or Model?<a name="line.209"></a> +<span class="sourceLineNo">210</span> // Third-party RDF4JDataset subclass, so we'll fall through to the<a name="line.210"></a> +<span class="sourceLineNo">211</span> // getTarget() handling further down<a name="line.211"></a> +<span class="sourceLineNo">212</span> } else if (getTargetGraph().filter(RDF4JGraph.class::isInstance).isPresent()) {<a name="line.212"></a> +<span class="sourceLineNo">213</span> final RDF4JGraph graph = (RDF4JGraph) getTargetGraph().get();<a name="line.213"></a> +<span class="sourceLineNo">214</span><a name="line.214"></a> +<span class="sourceLineNo">215</span> if (graph.asRepository().isPresent()) {<a name="line.215"></a> +<span class="sourceLineNo">216</span> final RDFInserter inserter = new RDFInserter(graph.asRepository().get().getConnection());<a name="line.216"></a> +<span class="sourceLineNo">217</span> if (!graph.getContextMask().isEmpty()) {<a name="line.217"></a> +<span class="sourceLineNo">218</span> final Stream<RDF4JBlankNodeOrIRI> b = graph.getContextMask().stream();<a name="line.218"></a> +<span class="sourceLineNo">219</span> final Stream<Resource> c = b.map(RDF4JBlankNodeOrIRI::asValue);<a name="line.219"></a> +<span class="sourceLineNo">220</span> final Resource[] contexts = c.toArray(Resource[]::new);<a name="line.220"></a> +<span class="sourceLineNo">221</span> inserter.enforceContext(contexts);<a name="line.221"></a> +<span class="sourceLineNo">222</span> }<a name="line.222"></a> +<span class="sourceLineNo">223</span> return inserter;<a name="line.223"></a> +<span class="sourceLineNo">224</span> }<a name="line.224"></a> +<span class="sourceLineNo">225</span> if (graph.asModel().isPresent() && graph.getContextMask().isEmpty()) {<a name="line.225"></a> +<span class="sourceLineNo">226</span> // the model accepts any quad<a name="line.226"></a> +<span class="sourceLineNo">227</span> final Model model = graph.asModel().get();<a name="line.227"></a> +<span class="sourceLineNo">228</span> return new AddToModel(model);<a name="line.228"></a> +<span class="sourceLineNo">229</span> }<a name="line.229"></a> +<span class="sourceLineNo">230</span> // else - fall through<a name="line.230"></a> +<span class="sourceLineNo">231</span> }<a name="line.231"></a> +<span class="sourceLineNo">232</span><a name="line.232"></a> +<span class="sourceLineNo">233</span> // Fall thorough: let target() consume our converted quads.<a name="line.233"></a> +<span class="sourceLineNo">234</span> return new AddToQuadConsumer(getTarget());<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> +<span class="sourceLineNo">237</span>}<a name="line.237"></a> Modified: websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/rdf4j/impl/InternalRDF4JFactory.html ============================================================================== --- websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/rdf4j/impl/InternalRDF4JFactory.html (original) +++ websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/rdf4j/impl/InternalRDF4JFactory.html Tue Nov 22 07:55:35 2016 @@ -74,7 +74,7 @@ <span class="sourceLineNo">066</span> * combination with {@link BNode#getID()}<a name="line.66"></a> <span class="sourceLineNo">067</span> * @return Adapted {@link RDF4JBlankNode}<a name="line.67"></a> <span class="sourceLineNo">068</span> */<a name="line.68"></a> -<span class="sourceLineNo">069</span> public RDF4JBlankNode createBlankNodeImpl(BNode bNode, UUID salt) {<a name="line.69"></a> +<span class="sourceLineNo">069</span> public RDF4JBlankNode createBlankNodeImpl(final BNode bNode, final UUID salt) {<a name="line.69"></a> <span class="sourceLineNo">070</span> return new BlankNodeImpl(bNode, salt);<a name="line.70"></a> <span class="sourceLineNo">071</span> }<a name="line.71"></a> <span class="sourceLineNo">072</span><a name="line.72"></a> @@ -85,7 +85,7 @@ <span class="sourceLineNo">077</span> * RDF4J {@link IRI} to adapt<a name="line.77"></a> <span class="sourceLineNo">078</span> * @return Adapted {@link RDF4JIRI}<a name="line.78"></a> <span class="sourceLineNo">079</span> */<a name="line.79"></a> -<span class="sourceLineNo">080</span> public RDF4JIRI createIRIImpl(IRI iri) {<a name="line.80"></a> +<span class="sourceLineNo">080</span> public RDF4JIRI createIRIImpl(final IRI iri) {<a name="line.80"></a> <span class="sourceLineNo">081</span> return new IRIImpl(iri);<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> @@ -96,7 +96,7 @@ <span class="sourceLineNo">088</span> * RDF4J {@link Literal}<a name="line.88"></a> <span class="sourceLineNo">089</span> * @return Adapted {@link RDF4JLiteral}<a name="line.89"></a> <span class="sourceLineNo">090</span> */<a name="line.90"></a> -<span class="sourceLineNo">091</span> public RDF4JLiteral createLiteralImpl(Literal literal) {<a name="line.91"></a> +<span class="sourceLineNo">091</span> public RDF4JLiteral createLiteralImpl(final Literal literal) {<a name="line.91"></a> <span class="sourceLineNo">092</span> return new LiteralImpl(literal);<a name="line.92"></a> <span class="sourceLineNo">093</span> }<a name="line.93"></a> <span class="sourceLineNo">094</span><a name="line.94"></a> @@ -111,7 +111,7 @@ <span class="sourceLineNo">103</span> * factory to use for adapting graph triples<a name="line.103"></a> <span class="sourceLineNo">104</span> * @return Adapted {@link RDF4JGraph}<a name="line.104"></a> <span class="sourceLineNo">105</span> */<a name="line.105"></a> -<span class="sourceLineNo">106</span> public RDF4JGraph createModelGraphImpl(Model model, RDF4J rdf4jTermFactory) {<a name="line.106"></a> +<span class="sourceLineNo">106</span> public RDF4JGraph createModelGraphImpl(final Model model, final RDF4J rdf4jTermFactory) {<a name="line.106"></a> <span class="sourceLineNo">107</span> return new ModelGraphImpl(model, rdf4jTermFactory);<a name="line.107"></a> <span class="sourceLineNo">108</span> }<a name="line.108"></a> <span class="sourceLineNo">109</span><a name="line.109"></a> @@ -124,7 +124,7 @@ <span class="sourceLineNo">116</span> * {@link UUID} for adapting any {@link BNode}s<a name="line.116"></a> <span class="sourceLineNo">117</span> * @return Adapted {@link RDF4JQuad}<a name="line.117"></a> <span class="sourceLineNo">118</span> */<a name="line.118"></a> -<span class="sourceLineNo">119</span> public RDF4JQuad createQuadImpl(Statement statement, UUID salt) {<a name="line.119"></a> +<span class="sourceLineNo">119</span> public RDF4JQuad createQuadImpl(final Statement statement, final UUID salt) {<a name="line.119"></a> <span class="sourceLineNo">120</span> return new QuadImpl(statement, salt);<a name="line.120"></a> <span class="sourceLineNo">121</span> }<a name="line.121"></a> <span class="sourceLineNo">122</span><a name="line.122"></a> @@ -145,8 +145,8 @@ <span class="sourceLineNo">137</span> * <a name="line.137"></a> <span class="sourceLineNo">138</span> * @return Adapted {@link RDF4JDataset}<a name="line.138"></a> <span class="sourceLineNo">139</span> */<a name="line.139"></a> -<span class="sourceLineNo">140</span> public RDF4JDataset createRepositoryDatasetImpl(Repository repository, boolean handleInitAndShutdown,<a name="line.140"></a> -<span class="sourceLineNo">141</span> boolean includeInferred) {<a name="line.141"></a> +<span class="sourceLineNo">140</span> public RDF4JDataset createRepositoryDatasetImpl(final Repository repository, final boolean handleInitAndShutdown,<a name="line.140"></a> +<span class="sourceLineNo">141</span> final boolean includeInferred) {<a name="line.141"></a> <span class="sourceLineNo">142</span> return new RepositoryDatasetImpl(repository, UUID.randomUUID(), handleInitAndShutdown, includeInferred);<a name="line.142"></a> <span class="sourceLineNo">143</span> }<a name="line.143"></a> <span class="sourceLineNo">144</span><a name="line.144"></a> @@ -170,8 +170,8 @@ <span class="sourceLineNo">162</span> * <code>(Resource[]) null</code>.<a name="line.162"></a> <span class="sourceLineNo">163</span> * @return Adapted {@link RDF4JGraph}<a name="line.163"></a> <span class="sourceLineNo">164</span> */<a name="line.164"></a> -<span class="sourceLineNo">165</span> public RDF4JGraph createRepositoryGraphImpl(Repository repository, boolean handleInitAndShutdown,<a name="line.165"></a> -<span class="sourceLineNo">166</span> boolean includeInferred, Resource... contextMask) {<a name="line.166"></a> +<span class="sourceLineNo">165</span> public RDF4JGraph createRepositoryGraphImpl(final Repository repository, final boolean handleInitAndShutdown,<a name="line.165"></a> +<span class="sourceLineNo">166</span> final boolean includeInferred, final Resource... contextMask) {<a name="line.166"></a> <span class="sourceLineNo">167</span> return new RepositoryGraphImpl(repository, UUID.randomUUID(), handleInitAndShutdown, includeInferred,<a name="line.167"></a> <span class="sourceLineNo">168</span> contextMask);<a name="line.168"></a> <span class="sourceLineNo">169</span> }<a name="line.169"></a> @@ -185,7 +185,7 @@ <span class="sourceLineNo">177</span> * {@link UUID} for adapting any {@link BNode}s<a name="line.177"></a> <span class="sourceLineNo">178</span> * @return Adapted {@link RDF4JTriple}<a name="line.178"></a> <span class="sourceLineNo">179</span> */<a name="line.179"></a> -<span class="sourceLineNo">180</span> public RDF4JTriple createTripleImpl(Statement statement, UUID salt) {<a name="line.180"></a> +<span class="sourceLineNo">180</span> public RDF4JTriple createTripleImpl(final Statement statement, final UUID salt) {<a name="line.180"></a> <span class="sourceLineNo">181</span> return new TripleImpl(statement, salt);<a name="line.181"></a> <span class="sourceLineNo">182</span> }<a name="line.182"></a> <span class="sourceLineNo">183</span><a name="line.183"></a> Modified: websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/simple/DatasetGraphView.html ============================================================================== --- websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/simple/DatasetGraphView.html (original) +++ websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/simple/DatasetGraphView.html Tue Nov 22 07:55:35 2016 @@ -64,13 +64,13 @@ <span class="sourceLineNo">056</span> private final BlankNodeOrIRI namedGraph;<a name="line.56"></a> <span class="sourceLineNo">057</span> private final Dataset dataset;<a name="line.57"></a> <span class="sourceLineNo">058</span><a name="line.58"></a> -<span class="sourceLineNo">059</span> public DatasetGraphView(Dataset dataset) {<a name="line.59"></a> +<span class="sourceLineNo">059</span> public DatasetGraphView(final Dataset dataset) {<a name="line.59"></a> <span class="sourceLineNo">060</span> this.dataset = dataset;<a name="line.60"></a> <span class="sourceLineNo">061</span> this.namedGraph = null;<a name="line.61"></a> <span class="sourceLineNo">062</span> this.unionGraph = true;<a name="line.62"></a> <span class="sourceLineNo">063</span> }<a name="line.63"></a> <span class="sourceLineNo">064</span><a name="line.64"></a> -<span class="sourceLineNo">065</span> public DatasetGraphView(Dataset dataset, BlankNodeOrIRI namedGraph) {<a name="line.65"></a> +<span class="sourceLineNo">065</span> public DatasetGraphView(final Dataset dataset, final BlankNodeOrIRI namedGraph) {<a name="line.65"></a> <span class="sourceLineNo">066</span> this.dataset = dataset;<a name="line.66"></a> <span class="sourceLineNo">067</span> this.namedGraph = namedGraph;<a name="line.67"></a> <span class="sourceLineNo">068</span> this.unionGraph = false;<a name="line.68"></a> @@ -83,17 +83,17 @@ <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 void add(Triple triple) {<a name="line.78"></a> +<span class="sourceLineNo">078</span> public void add(final Triple triple) {<a name="line.78"></a> <span class="sourceLineNo">079</span> dataset.add(namedGraph, triple.getSubject(), triple.getPredicate(), triple.getObject());<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 void add(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {<a name="line.83"></a> +<span class="sourceLineNo">083</span> public void add(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {<a name="line.83"></a> <span class="sourceLineNo">084</span> dataset.add(namedGraph, subject, predicate, object);<a name="line.84"></a> <span class="sourceLineNo">085</span> }<a name="line.85"></a> <span class="sourceLineNo">086</span><a name="line.86"></a> <span class="sourceLineNo">087</span> @Override<a name="line.87"></a> -<span class="sourceLineNo">088</span> public boolean contains(Triple triple) {<a name="line.88"></a> +<span class="sourceLineNo">088</span> public boolean contains(final Triple triple) {<a name="line.88"></a> <span class="sourceLineNo">089</span> return dataset.contains(unionOrNamedGraph(), triple.getSubject(), triple.getPredicate(), triple.getObject());<a name="line.89"></a> <span class="sourceLineNo">090</span> }<a name="line.90"></a> <span class="sourceLineNo">091</span><a name="line.91"></a> @@ -105,17 +105,17 @@ <span class="sourceLineNo">097</span> }<a name="line.97"></a> <span class="sourceLineNo">098</span><a name="line.98"></a> <span class="sourceLineNo">099</span> @Override<a name="line.99"></a> -<span class="sourceLineNo">100</span> public boolean contains(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {<a name="line.100"></a> +<span class="sourceLineNo">100</span> public boolean contains(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {<a name="line.100"></a> <span class="sourceLineNo">101</span> return dataset.contains(unionOrNamedGraph(), subject, predicate, object);<a name="line.101"></a> <span class="sourceLineNo">102</span> }<a name="line.102"></a> <span class="sourceLineNo">103</span><a name="line.103"></a> <span class="sourceLineNo">104</span> @Override<a name="line.104"></a> -<span class="sourceLineNo">105</span> public void remove(Triple triple) {<a name="line.105"></a> +<span class="sourceLineNo">105</span> public void remove(final Triple triple) {<a name="line.105"></a> <span class="sourceLineNo">106</span> dataset.remove(unionOrNamedGraph(), triple.getSubject(), triple.getPredicate(), triple.getObject());<a name="line.106"></a> <span class="sourceLineNo">107</span> }<a name="line.107"></a> <span class="sourceLineNo">108</span><a name="line.108"></a> <span class="sourceLineNo">109</span> @Override<a name="line.109"></a> -<span class="sourceLineNo">110</span> public void remove(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {<a name="line.110"></a> +<span class="sourceLineNo">110</span> public void remove(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {<a name="line.110"></a> <span class="sourceLineNo">111</span> dataset.remove(unionOrNamedGraph(), subject, predicate, object);<a name="line.111"></a> <span class="sourceLineNo">112</span> }<a name="line.112"></a> <span class="sourceLineNo">113</span><a name="line.113"></a> @@ -135,8 +135,8 @@ <span class="sourceLineNo">127</span> }<a name="line.127"></a> <span class="sourceLineNo">128</span><a name="line.128"></a> <span class="sourceLineNo">129</span> @Override<a name="line.129"></a> -<span class="sourceLineNo">130</span> public Stream<? extends Triple> stream(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {<a name="line.130"></a> -<span class="sourceLineNo">131</span> Stream<Triple> stream = dataset.stream(unionOrNamedGraph(), subject, predicate, object).map(Quad::asTriple);<a name="line.131"></a> +<span class="sourceLineNo">130</span> public Stream<? extends Triple> stream(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {<a name="line.130"></a> +<span class="sourceLineNo">131</span> final Stream<Triple> stream = dataset.stream(unionOrNamedGraph(), subject, predicate, object).map(Quad::asTriple);<a name="line.131"></a> <span class="sourceLineNo">132</span> if (unionGraph) {<a name="line.132"></a> <span class="sourceLineNo">133</span> // remove duplicates<a name="line.133"></a> <span class="sourceLineNo">134</span> return stream.distinct();<a name="line.134"></a> Modified: websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/simple/SimpleRDF.html ============================================================================== --- websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/simple/SimpleRDF.html (original) +++ websites/production/commonsrdf/content/apidocs/src-html/org/apache/commons/rdf/simple/SimpleRDF.html Tue Nov 22 07:55:35 2016 @@ -69,7 +69,7 @@ <span class="sourceLineNo">061</span> }<a name="line.61"></a> <span class="sourceLineNo">062</span><a name="line.62"></a> <span class="sourceLineNo">063</span> @Override<a name="line.63"></a> -<span class="sourceLineNo">064</span> public BlankNode createBlankNode(String name) {<a name="line.64"></a> +<span class="sourceLineNo">064</span> public BlankNode createBlankNode(final String name) {<a name="line.64"></a> <span class="sourceLineNo">065</span> return new BlankNodeImpl(SALT, name);<a name="line.65"></a> <span class="sourceLineNo">066</span> }<a name="line.66"></a> <span class="sourceLineNo">067</span><a name="line.67"></a> @@ -86,34 +86,34 @@ <span class="sourceLineNo">078</span> }<a name="line.78"></a> <span class="sourceLineNo">079</span><a name="line.79"></a> <span class="sourceLineNo">080</span> @Override<a name="line.80"></a> -<span class="sourceLineNo">081</span> public IRI createIRI(String iri) {<a name="line.81"></a> -<span class="sourceLineNo">082</span> IRI result = new IRIImpl(iri);<a name="line.82"></a> +<span class="sourceLineNo">081</span> public IRI createIRI(final String iri) {<a name="line.81"></a> +<span class="sourceLineNo">082</span> final IRI result = new IRIImpl(iri);<a name="line.82"></a> <span class="sourceLineNo">083</span> // Reuse any IRI objects already created in Types<a name="line.83"></a> <span class="sourceLineNo">084</span> return Types.get(result).orElse(result);<a name="line.84"></a> <span class="sourceLineNo">085</span> }<a name="line.85"></a> <span class="sourceLineNo">086</span><a name="line.86"></a> <span class="sourceLineNo">087</span> @Override<a name="line.87"></a> -<span class="sourceLineNo">088</span> public Literal createLiteral(String literal) {<a name="line.88"></a> +<span class="sourceLineNo">088</span> public Literal createLiteral(final String literal) {<a name="line.88"></a> <span class="sourceLineNo">089</span> return new LiteralImpl(literal);<a name="line.89"></a> <span class="sourceLineNo">090</span> }<a name="line.90"></a> <span class="sourceLineNo">091</span><a name="line.91"></a> <span class="sourceLineNo">092</span> @Override<a name="line.92"></a> -<span class="sourceLineNo">093</span> public Literal createLiteral(String literal, IRI dataType) {<a name="line.93"></a> +<span class="sourceLineNo">093</span> public Literal createLiteral(final String literal, final IRI dataType) {<a name="line.93"></a> <span class="sourceLineNo">094</span> return new LiteralImpl(literal, dataType);<a name="line.94"></a> <span class="sourceLineNo">095</span> }<a name="line.95"></a> <span class="sourceLineNo">096</span><a name="line.96"></a> <span class="sourceLineNo">097</span> @Override<a name="line.97"></a> -<span class="sourceLineNo">098</span> public Literal createLiteral(String literal, String language) {<a name="line.98"></a> +<span class="sourceLineNo">098</span> public Literal createLiteral(final String literal, final String language) {<a name="line.98"></a> <span class="sourceLineNo">099</span> return new LiteralImpl(literal, language);<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> <span class="sourceLineNo">102</span> @Override<a name="line.102"></a> -<span class="sourceLineNo">103</span> public Triple createTriple(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {<a name="line.103"></a> +<span class="sourceLineNo">103</span> public Triple createTriple(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {<a name="line.103"></a> <span class="sourceLineNo">104</span> return new TripleImpl(subject, predicate, object);<a name="line.104"></a> <span class="sourceLineNo">105</span> }<a name="line.105"></a> <span class="sourceLineNo">106</span><a name="line.106"></a> <span class="sourceLineNo">107</span> @Override<a name="line.107"></a> -<span class="sourceLineNo">108</span> public Quad createQuad(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object)<a name="line.108"></a> +<span class="sourceLineNo">108</span> public Quad createQuad(final BlankNodeOrIRI graphName, final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object)<a name="line.108"></a> <span class="sourceLineNo">109</span> throws IllegalArgumentException {<a name="line.109"></a> <span class="sourceLineNo">110</span> return new QuadImpl(graphName, subject, predicate, object);<a name="line.110"></a> <span class="sourceLineNo">111</span> }<a name="line.111"></a>