You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commonsrdf.apache.org by st...@apache.org on 2016/10/26 15:57:54 UTC
svn commit: r999954 [23/27] - in /websites/production/commonsrdf/content: ./
apidocs/ apidocs/org/apache/commons/rdf/api/
apidocs/org/apache/commons/rdf/api/class-use/
apidocs/org/apache/commons/rdf/jena/
apidocs/org/apache/commons/rdf/jena/class-use/ ...
Modified: websites/production/commonsrdf/content/xref/org/apache/commons/rdf/jena/experimental/JenaRDFParser.html
==============================================================================
--- websites/production/commonsrdf/content/xref/org/apache/commons/rdf/jena/experimental/JenaRDFParser.html (original)
+++ websites/production/commonsrdf/content/xref/org/apache/commons/rdf/jena/experimental/JenaRDFParser.html Wed Oct 26 15:57:51 2016
@@ -38,7 +38,7 @@
<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.api.TripleLike;
<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.experimental.RDFParser;
<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.jena.JenaGraph;
-<a class="jxr_linenumber" name="L33" href="#L33">33</a> <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.jena.JenaRDFTermFactory;
+<a class="jxr_linenumber" name="L33" href="#L33">33</a> <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.jena.JenaFactory;
<a class="jxr_linenumber" name="L34" href="#L34">34</a> <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.simple.experimental.AbstractRDFParser;
<a class="jxr_linenumber" name="L35" href="#L35">35</a> <strong class="jxr_keyword">import</strong> org.apache.jena.graph.Graph;
<a class="jxr_linenumber" name="L36" href="#L36">36</a> <strong class="jxr_keyword">import</strong> org.apache.jena.riot.Lang;
@@ -52,7 +52,7 @@
<a class="jxr_linenumber" name="L44" href="#L44">44</a> <strong class="jxr_keyword">private</strong> Consumer<QuadLike<RDFTerm>> generalizedConsumerQuad;
<a class="jxr_linenumber" name="L45" href="#L45">45</a>
<a class="jxr_linenumber" name="L46" href="#L46">46</a> <strong class="jxr_keyword">protected</strong> <a href="../../../../../../org/apache/commons/rdf/api/RDFTermFactory.html">RDFTermFactory</a> createRDFTermFactory() {
-<a class="jxr_linenumber" name="L47" href="#L47">47</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaRDFTermFactory.html">JenaRDFTermFactory</a>();
+<a class="jxr_linenumber" name="L47" href="#L47">47</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaFactory.html">JenaFactory</a>();
<a class="jxr_linenumber" name="L48" href="#L48">48</a> }
<a class="jxr_linenumber" name="L49" href="#L49">49</a>
<a class="jxr_linenumber" name="L50" href="#L50">50</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/experimental/JenaRDFParser.html">JenaRDFParser</a> targetGeneralizedTriple(Consumer<TripleLike> consumer) {
@@ -79,7 +79,7 @@
<a class="jxr_linenumber" name="L71" href="#L71">71</a> @Override
<a class="jxr_linenumber" name="L72" href="#L72">72</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> parseSynchronusly() <strong class="jxr_keyword">throws</strong> IOException {
<a class="jxr_linenumber" name="L73" href="#L73">73</a> StreamRDF dest;
-<a class="jxr_linenumber" name="L74" href="#L74">74</a> JenaRDFTermFactory jenaFactory = getJenaFactory();
+<a class="jxr_linenumber" name="L74" href="#L74">74</a> JenaFactory jenaFactory = getJenaFactory();
<a class="jxr_linenumber" name="L75" href="#L75">75</a> <strong class="jxr_keyword">if</strong> (getTargetGraph().isPresent() && getTargetGraph().get() instanceof JenaGraph) {
<a class="jxr_linenumber" name="L76" href="#L76">76</a> Graph jenaGraph = ((JenaGraph) getTargetGraph().get()).asJenaGraph();
<a class="jxr_linenumber" name="L77" href="#L77">77</a> dest = StreamRDFLib.graph(jenaGraph);
@@ -89,11 +89,11 @@
<a class="jxr_linenumber" name="L81" href="#L81">81</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (generalizedConsumerTriple != <strong class="jxr_keyword">null</strong>) {
<a class="jxr_linenumber" name="L82" href="#L82">82</a> dest = jenaFactory.streamJenaToGeneralizedTriple(generalizedConsumerTriple);
<a class="jxr_linenumber" name="L83" href="#L83">83</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L84" href="#L84">84</a> dest = JenaRDFTermFactory.streamJenaToCommonsRDF(getRdfTermFactory().get(), getTarget());
+<a class="jxr_linenumber" name="L84" href="#L84">84</a> dest = JenaFactory.streamJenaToQuad(getRdfTermFactory().get(), getTarget());
<a class="jxr_linenumber" name="L85" href="#L85">85</a> }
<a class="jxr_linenumber" name="L86" href="#L86">86</a> }
<a class="jxr_linenumber" name="L87" href="#L87">87</a>
-<a class="jxr_linenumber" name="L88" href="#L88">88</a> Lang lang = getContentTypeSyntax().flatMap(jenaFactory::rdfSyntaxToLang).orElse(<strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="L88" href="#L88">88</a> Lang lang = getContentTypeSyntax().flatMap(jenaFactory::asJenaLang).orElse(<strong class="jxr_keyword">null</strong>);
<a class="jxr_linenumber" name="L89" href="#L89">89</a> String baseStr = getBase().map(IRI::getIRIString).orElse(<strong class="jxr_keyword">null</strong>);
<a class="jxr_linenumber" name="L90" href="#L90">90</a>
<a class="jxr_linenumber" name="L91" href="#L91">91</a> <strong class="jxr_keyword">if</strong> (getSourceIri().isPresent()) {
@@ -107,9 +107,9 @@
<a class="jxr_linenumber" name="L99" href="#L99">99</a> }
<a class="jxr_linenumber" name="L100" href="#L100">100</a> }
<a class="jxr_linenumber" name="L101" href="#L101">101</a>
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaRDFTermFactory.html">JenaRDFTermFactory</a> getJenaFactory() {
-<a class="jxr_linenumber" name="L103" href="#L103">103</a> <strong class="jxr_keyword">return</strong> (JenaRDFTermFactory) getRdfTermFactory()
-<a class="jxr_linenumber" name="L104" href="#L104">104</a> .filter(JenaRDFTermFactory.<strong class="jxr_keyword">class</strong>::isInstance)
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaFactory.html">JenaFactory</a> getJenaFactory() {
+<a class="jxr_linenumber" name="L103" href="#L103">103</a> <strong class="jxr_keyword">return</strong> (JenaFactory) getRdfTermFactory()
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> .filter(JenaFactory.<strong class="jxr_keyword">class</strong>::isInstance)
<a class="jxr_linenumber" name="L105" href="#L105">105</a> .orElseGet(<strong class="jxr_keyword">this</strong>::createRDFTermFactory);
<a class="jxr_linenumber" name="L106" href="#L106">106</a> }
<a class="jxr_linenumber" name="L107" href="#L107">107</a>
Modified: websites/production/commonsrdf/content/xref/org/apache/commons/rdf/jena/impl/AbstractQuadLike.html
==============================================================================
--- websites/production/commonsrdf/content/xref/org/apache/commons/rdf/jena/impl/AbstractQuadLike.html (original)
+++ websites/production/commonsrdf/content/xref/org/apache/commons/rdf/jena/impl/AbstractQuadLike.html Wed Oct 26 15:57:51 2016
@@ -34,7 +34,7 @@
<a class="jxr_linenumber" name="L26" href="#L26">26</a> <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.api.RDFTerm;
<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.jena.JenaQuad;
<a class="jxr_linenumber" name="L28" href="#L28">28</a> <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.jena.JenaQuadLike;
-<a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.jena.JenaRDFTermFactory;
+<a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.jena.JenaFactory;
<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.jena.JenaTriple;
<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong class="jxr_keyword">import</strong> org.apache.jena.graph.Triple;
<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong class="jxr_keyword">import</strong> org.apache.jena.sparql.core.Quad;
@@ -77,42 +77,42 @@
<a class="jxr_linenumber" name="L69" href="#L69">69</a> @SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
<a class="jxr_linenumber" name="L70" href="#L70">70</a> AbstractQuadLike(org.apache.jena.sparql.core.Quad quad, UUID salt) {
<a class="jxr_linenumber" name="L71" href="#L71">71</a> <strong class="jxr_keyword">this</strong>.quad = Objects.requireNonNull(quad);
-<a class="jxr_linenumber" name="L72" href="#L72">72</a> <strong class="jxr_keyword">this</strong>.subject = (S) internalJenaFactory.fromJena(quad.getSubject(), salt);
-<a class="jxr_linenumber" name="L73" href="#L73">73</a> <strong class="jxr_keyword">this</strong>.predicate = (P) internalJenaFactory.fromJena(quad.getPredicate(), salt);
-<a class="jxr_linenumber" name="L74" href="#L74">74</a> <strong class="jxr_keyword">this</strong>.object = (O)internalJenaFactory.fromJena(quad.getObject(), salt);
-<a class="jxr_linenumber" name="L75" href="#L75">75</a> <strong class="jxr_keyword">this</strong>.graphName = Optional.of((G) internalJenaFactory.fromJena(quad.getGraph(), salt));
+<a class="jxr_linenumber" name="L72" href="#L72">72</a> <strong class="jxr_keyword">this</strong>.subject = (S) internalJenaFactory.createRDFTerm(quad.getSubject(), salt);
+<a class="jxr_linenumber" name="L73" href="#L73">73</a> <strong class="jxr_keyword">this</strong>.predicate = (P) internalJenaFactory.createRDFTerm(quad.getPredicate(), salt);
+<a class="jxr_linenumber" name="L74" href="#L74">74</a> <strong class="jxr_keyword">this</strong>.object = (O)internalJenaFactory.createRDFTerm(quad.getObject(), salt);
+<a class="jxr_linenumber" name="L75" href="#L75">75</a> <strong class="jxr_keyword">this</strong>.graphName = Optional.of((G) internalJenaFactory.createRDFTerm(quad.getGraph(), salt));
<a class="jxr_linenumber" name="L76" href="#L76">76</a> }
<a class="jxr_linenumber" name="L77" href="#L77">77</a>
<a class="jxr_linenumber" name="L78" href="#L78">78</a> @SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
<a class="jxr_linenumber" name="L79" href="#L79">79</a> AbstractQuadLike(org.apache.jena.graph.Triple triple, UUID salt) {
<a class="jxr_linenumber" name="L80" href="#L80">80</a> <strong class="jxr_keyword">this</strong>.triple = Objects.requireNonNull(triple);
-<a class="jxr_linenumber" name="L81" href="#L81">81</a> <strong class="jxr_keyword">this</strong>.subject = (S) internalJenaFactory.fromJena(triple.getSubject(), salt);
-<a class="jxr_linenumber" name="L82" href="#L82">82</a> <strong class="jxr_keyword">this</strong>.predicate = (P) internalJenaFactory.fromJena(triple.getPredicate(), salt);
-<a class="jxr_linenumber" name="L83" href="#L83">83</a> <strong class="jxr_keyword">this</strong>.object = (O)internalJenaFactory.fromJena(triple.getObject(), salt);
+<a class="jxr_linenumber" name="L81" href="#L81">81</a> <strong class="jxr_keyword">this</strong>.subject = (S) internalJenaFactory.createRDFTerm(triple.getSubject(), salt);
+<a class="jxr_linenumber" name="L82" href="#L82">82</a> <strong class="jxr_keyword">this</strong>.predicate = (P) internalJenaFactory.createRDFTerm(triple.getPredicate(), salt);
+<a class="jxr_linenumber" name="L83" href="#L83">83</a> <strong class="jxr_keyword">this</strong>.object = (O)internalJenaFactory.createRDFTerm(triple.getObject(), salt);
<a class="jxr_linenumber" name="L84" href="#L84">84</a> <strong class="jxr_keyword">this</strong>.graphName = Optional.empty();
<a class="jxr_linenumber" name="L85" href="#L85">85</a> }
<a class="jxr_linenumber" name="L86" href="#L86">86</a>
<a class="jxr_linenumber" name="L87" href="#L87">87</a> @Override
<a class="jxr_linenumber" name="L88" href="#L88">88</a> <strong class="jxr_keyword">public</strong> org.apache.jena.sparql.core.Quad asJenaQuad() {
-<a class="jxr_linenumber" name="L89" href="#L89">89</a> JenaRDFTermFactory factory = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaRDFTermFactory.html">JenaRDFTermFactory</a>();
+<a class="jxr_linenumber" name="L89" href="#L89">89</a> JenaFactory factory = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaFactory.html">JenaFactory</a>();
<a class="jxr_linenumber" name="L90" href="#L90">90</a> <strong class="jxr_keyword">if</strong> (quad == <strong class="jxr_keyword">null</strong>) {
<a class="jxr_linenumber" name="L91" href="#L91">91</a> quad = org.apache.jena.sparql.core.Quad.create(
-<a class="jxr_linenumber" name="L92" href="#L92">92</a> factory.toJena(graphName.orElse(<strong class="jxr_keyword">null</strong>)),
-<a class="jxr_linenumber" name="L93" href="#L93">93</a> factory.toJena(subject),
-<a class="jxr_linenumber" name="L94" href="#L94">94</a> factory.toJena(predicate),
-<a class="jxr_linenumber" name="L95" href="#L95">95</a> factory.toJena(object));
+<a class="jxr_linenumber" name="L92" href="#L92">92</a> factory.asJenaNode(graphName.orElse(<strong class="jxr_keyword">null</strong>)),
+<a class="jxr_linenumber" name="L93" href="#L93">93</a> factory.asJenaNode(subject),
+<a class="jxr_linenumber" name="L94" href="#L94">94</a> factory.asJenaNode(predicate),
+<a class="jxr_linenumber" name="L95" href="#L95">95</a> factory.asJenaNode(object));
<a class="jxr_linenumber" name="L96" href="#L96">96</a> }
<a class="jxr_linenumber" name="L97" href="#L97">97</a> <strong class="jxr_keyword">return</strong> quad;
<a class="jxr_linenumber" name="L98" href="#L98">98</a> }
<a class="jxr_linenumber" name="L99" href="#L99">99</a>
<a class="jxr_linenumber" name="L100" href="#L100">100</a> @Override
<a class="jxr_linenumber" name="L101" href="#L101">101</a> <strong class="jxr_keyword">public</strong> org.apache.jena.graph.Triple asJenaTriple() {
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> JenaRDFTermFactory factory = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaRDFTermFactory.html">JenaRDFTermFactory</a>();
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> JenaFactory factory = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaFactory.html">JenaFactory</a>();
<a class="jxr_linenumber" name="L103" href="#L103">103</a> <strong class="jxr_keyword">if</strong> (triple == <strong class="jxr_keyword">null</strong>) {
<a class="jxr_linenumber" name="L104" href="#L104">104</a> triple = org.apache.jena.graph.Triple.create(
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> factory.toJena(subject),
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> factory.toJena(predicate),
-<a class="jxr_linenumber" name="L107" href="#L107">107</a> factory.toJena(object));
+<a class="jxr_linenumber" name="L105" href="#L105">105</a> factory.asJenaNode(subject),
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> factory.asJenaNode(predicate),
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> factory.asJenaNode(object));
<a class="jxr_linenumber" name="L108" href="#L108">108</a> }
<a class="jxr_linenumber" name="L109" href="#L109">109</a> <strong class="jxr_keyword">return</strong> triple;
<a class="jxr_linenumber" name="L110" href="#L110">110</a> }
Modified: websites/production/commonsrdf/content/xref/org/apache/commons/rdf/jena/impl/InternalJenaFactory.html
==============================================================================
--- websites/production/commonsrdf/content/xref/org/apache/commons/rdf/jena/impl/InternalJenaFactory.html (original)
+++ websites/production/commonsrdf/content/xref/org/apache/commons/rdf/jena/impl/InternalJenaFactory.html Wed Oct 26 15:57:51 2016
@@ -43,7 +43,7 @@
<a class="jxr_linenumber" name="L35" href="#L35">35</a> <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.jena.JenaLiteral;
<a class="jxr_linenumber" name="L36" href="#L36">36</a> <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.jena.JenaQuad;
<a class="jxr_linenumber" name="L37" href="#L37">37</a> <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.jena.JenaRDFTerm;
-<a class="jxr_linenumber" name="L38" href="#L38">38</a> <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.jena.JenaRDFTermFactory;
+<a class="jxr_linenumber" name="L38" href="#L38">38</a> <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.jena.JenaFactory;
<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.jena.JenaTriple;
<a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong class="jxr_keyword">import</strong> org.apache.jena.graph.Node;
<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong class="jxr_keyword">import</strong> org.apache.jena.graph.NodeFactory;
@@ -57,7 +57,7 @@
<a class="jxr_linenumber" name="L49" href="#L49">49</a> <em class="jxr_javadoccomment"> * <p></em>
<a class="jxr_linenumber" name="L50" href="#L50">50</a> <em class="jxr_javadoccomment"> * This class is deliberately an abstract class, as it is an internal helper</em>
<a class="jxr_linenumber" name="L51" href="#L51">51</a> <em class="jxr_javadoccomment"> * which <strong>may change</strong> in any minor version update; users should</em>
-<a class="jxr_linenumber" name="L52" href="#L52">52</a> <em class="jxr_javadoccomment"> * instead use {@link JenaRDFTermFactory}.</em>
+<a class="jxr_linenumber" name="L52" href="#L52">52</a> <em class="jxr_javadoccomment"> * instead use {@link JenaFactory}.</em>
<a class="jxr_linenumber" name="L53" href="#L53">53</a> <em class="jxr_javadoccomment"> * <p></em>
<a class="jxr_linenumber" name="L54" href="#L54">54</a> <em class="jxr_javadoccomment"> * For the purpose of blank node identity, some of these methods require a</em>
<a class="jxr_linenumber" name="L55" href="#L55">55</a> <em class="jxr_javadoccomment"> * {@link UUID} to use as a salt. See {@link BlankNode#uniqueReference()} for</em>
@@ -73,98 +73,98 @@
<a class="jxr_linenumber" name="L65" href="#L65">65</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaBlankNode.html">JenaBlankNode</a> createBlankNode(UUID salt) {
<a class="jxr_linenumber" name="L66" href="#L66">66</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaBlankNodeImpl.html">JenaBlankNodeImpl</a>(NodeFactory.createBlankNode(), salt);
<a class="jxr_linenumber" name="L67" href="#L67">67</a> }
-<a class="jxr_linenumber" name="L68" href="#L68">68</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaDataset.html">JenaDataset</a> createDataset(UUID salt) {
-<a class="jxr_linenumber" name="L69" href="#L69">69</a> DatasetGraph dg = DatasetGraphFactory.createGeneral();
-<a class="jxr_linenumber" name="L70" href="#L70">70</a> <em class="jxr_comment">// Or which createMethod() -- a bit confusing with lots of choice..</em>
-<a class="jxr_linenumber" name="L71" href="#L71">71</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaDatasetImpl.html">JenaDatasetImpl</a>(dg, salt);
-<a class="jxr_linenumber" name="L72" href="#L72">72</a> }
-<a class="jxr_linenumber" name="L73" href="#L73">73</a>
-<a class="jxr_linenumber" name="L74" href="#L74">74</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaGraph.html">JenaGraph</a> createGraph(UUID salt) {
-<a class="jxr_linenumber" name="L75" href="#L75">75</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaGraphImpl.html">JenaGraphImpl</a>(GraphFactory.createDefaultGraph(), salt);
+<a class="jxr_linenumber" name="L68" href="#L68">68</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaDataset.html">JenaDataset</a> createDataset(DatasetGraph datasetGraph, UUID salt) {
+<a class="jxr_linenumber" name="L69" href="#L69">69</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaDatasetImpl.html">JenaDatasetImpl</a>(datasetGraph, salt);
+<a class="jxr_linenumber" name="L70" href="#L70">70</a> }
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>
+<a class="jxr_linenumber" name="L72" href="#L72">72</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaDataset.html">JenaDataset</a> createDataset(UUID salt) {
+<a class="jxr_linenumber" name="L73" href="#L73">73</a> DatasetGraph dg = DatasetGraphFactory.createGeneral();
+<a class="jxr_linenumber" name="L74" href="#L74">74</a> <em class="jxr_comment">// Or which createMethod() -- a bit confusing with lots of choice..</em>
+<a class="jxr_linenumber" name="L75" href="#L75">75</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaDatasetImpl.html">JenaDatasetImpl</a>(dg, salt);
<a class="jxr_linenumber" name="L76" href="#L76">76</a> }
<a class="jxr_linenumber" name="L77" href="#L77">77</a>
-<a class="jxr_linenumber" name="L78" href="#L78">78</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaIRI.html">JenaIRI</a> createIRI(String iriStr) {
-<a class="jxr_linenumber" name="L79" href="#L79">79</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaIRIImpl.html">JenaIRIImpl</a>(iriStr);
+<a class="jxr_linenumber" name="L78" href="#L78">78</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaGeneralizedQuadLike.html">JenaGeneralizedQuadLike</a> createGeneralizedQuad(org.apache.jena.sparql.core.Quad quad, UUID salt) {
+<a class="jxr_linenumber" name="L79" href="#L79">79</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaGeneralizedQuadLikeImpl.html">JenaGeneralizedQuadLikeImpl</a>(quad, salt);
<a class="jxr_linenumber" name="L80" href="#L80">80</a> }
<a class="jxr_linenumber" name="L81" href="#L81">81</a>
-<a class="jxr_linenumber" name="L82" href="#L82">82</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaLiteral.html">JenaLiteral</a> createLiteral(String lexStr) {
-<a class="jxr_linenumber" name="L83" href="#L83">83</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaLiteralImpl.html">JenaLiteralImpl</a>(NodeFactory.createLiteral(lexStr));
+<a class="jxr_linenumber" name="L82" href="#L82">82</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaGeneralizedQuadLike.html">JenaGeneralizedQuadLike</a> createGeneralizedQuad(<a href="../../../../../../org/apache/commons/rdf/api/RDFTerm.html">RDFTerm</a> subject, <a href="../../../../../../org/apache/commons/rdf/api/RDFTerm.html">RDFTerm</a> predicate, <a href="../../../../../../org/apache/commons/rdf/api/RDFTerm.html">RDFTerm</a> object, <a href="../../../../../../org/apache/commons/rdf/api/RDFTerm.html">RDFTerm</a> graphName) {
+<a class="jxr_linenumber" name="L83" href="#L83">83</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaGeneralizedQuadLikeImpl.html">JenaGeneralizedQuadLikeImpl</a>(subject, predicate, object, Optional.ofNullable(graphName));
<a class="jxr_linenumber" name="L84" href="#L84">84</a> }
<a class="jxr_linenumber" name="L85" href="#L85">85</a>
-<a class="jxr_linenumber" name="L86" href="#L86">86</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaLiteral.html">JenaLiteral</a> createLiteralDT(String lexStr, String datatypeIRI) {
-<a class="jxr_linenumber" name="L87" href="#L87">87</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaLiteralImpl.html">JenaLiteralImpl</a>(NodeFactory.createLiteral(lexStr, NodeFactory.getType(datatypeIRI)));
+<a class="jxr_linenumber" name="L86" href="#L86">86</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaGeneralizedTripleLike.html">JenaGeneralizedTripleLike</a> createGeneralizedTriple(org.apache.jena.graph.Triple triple, UUID salt) {
+<a class="jxr_linenumber" name="L87" href="#L87">87</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaGeneralizedTripleLikeImpl.html">JenaGeneralizedTripleLikeImpl</a>(triple, salt);
<a class="jxr_linenumber" name="L88" href="#L88">88</a> }
<a class="jxr_linenumber" name="L89" href="#L89">89</a>
-<a class="jxr_linenumber" name="L90" href="#L90">90</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaLiteral.html">JenaLiteral</a> createLiteralLang(String lexStr, String langTag) {
-<a class="jxr_linenumber" name="L91" href="#L91">91</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaLiteralImpl.html">JenaLiteralImpl</a>(NodeFactory.createLiteral(lexStr, langTag));
+<a class="jxr_linenumber" name="L90" href="#L90">90</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaGeneralizedTripleLike.html">JenaGeneralizedTripleLike</a> createGeneralizedTriple(<a href="../../../../../../org/apache/commons/rdf/api/RDFTerm.html">RDFTerm</a> subject, <a href="../../../../../../org/apache/commons/rdf/api/RDFTerm.html">RDFTerm</a> predicate, <a href="../../../../../../org/apache/commons/rdf/api/RDFTerm.html">RDFTerm</a> object) {
+<a class="jxr_linenumber" name="L91" href="#L91">91</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaGeneralizedTripleLikeImpl.html">JenaGeneralizedTripleLikeImpl</a>(subject, predicate, object);
<a class="jxr_linenumber" name="L92" href="#L92">92</a> }
<a class="jxr_linenumber" name="L93" href="#L93">93</a>
-<a class="jxr_linenumber" name="L94" href="#L94">94</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaTriple.html">JenaTriple</a> createTriple(<a href="../../../../../../org/apache/commons/rdf/api/BlankNodeOrIRI.html">BlankNodeOrIRI</a> subject, <a href="../../../../../../org/apache/commons/rdf/api/IRI.html">IRI</a> predicate, <a href="../../../../../../org/apache/commons/rdf/api/RDFTerm.html">RDFTerm</a> object) {
-<a class="jxr_linenumber" name="L95" href="#L95">95</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaTripleImpl.html">JenaTripleImpl</a>(subject, predicate, object);
+<a class="jxr_linenumber" name="L94" href="#L94">94</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaGraph.html">JenaGraph</a> createGraph(Model model, UUID salt) {
+<a class="jxr_linenumber" name="L95" href="#L95">95</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaGraphImpl.html">JenaGraphImpl</a>(model, salt);
<a class="jxr_linenumber" name="L96" href="#L96">96</a> }
<a class="jxr_linenumber" name="L97" href="#L97">97</a>
-<a class="jxr_linenumber" name="L98" href="#L98">98</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaQuad.html">JenaQuad</a> createQuad(<a href="../../../../../../org/apache/commons/rdf/api/BlankNodeOrIRI.html">BlankNodeOrIRI</a> subject, <a href="../../../../../../org/apache/commons/rdf/api/IRI.html">IRI</a> predicate, <a href="../../../../../../org/apache/commons/rdf/api/RDFTerm.html">RDFTerm</a> object, <a href="../../../../../../org/apache/commons/rdf/api/BlankNodeOrIRI.html">BlankNodeOrIRI</a> graphName) {
-<a class="jxr_linenumber" name="L99" href="#L99">99</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaQuadImpl.html">JenaQuadImpl</a>(subject, predicate, object, Optional.ofNullable(graphName));
+<a class="jxr_linenumber" name="L98" href="#L98">98</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaGraph.html">JenaGraph</a> createGraph(org.apache.jena.graph.Graph graph, UUID salt) {
+<a class="jxr_linenumber" name="L99" href="#L99">99</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaGraphImpl.html">JenaGraphImpl</a>(graph, salt);
<a class="jxr_linenumber" name="L100" href="#L100">100</a> }
<a class="jxr_linenumber" name="L101" href="#L101">101</a>
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaGeneralizedTripleLike.html">JenaGeneralizedTripleLike</a> createGeneralizedTriple(<a href="../../../../../../org/apache/commons/rdf/api/RDFTerm.html">RDFTerm</a> subject, <a href="../../../../../../org/apache/commons/rdf/api/RDFTerm.html">RDFTerm</a> predicate, <a href="../../../../../../org/apache/commons/rdf/api/RDFTerm.html">RDFTerm</a> object) {
-<a class="jxr_linenumber" name="L103" href="#L103">103</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaGeneralizedTripleLikeImpl.html">JenaGeneralizedTripleLikeImpl</a>(subject, predicate, object);
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaGraph.html">JenaGraph</a> createGraph(UUID salt) {
+<a class="jxr_linenumber" name="L103" href="#L103">103</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaGraphImpl.html">JenaGraphImpl</a>(GraphFactory.createDefaultGraph(), salt);
<a class="jxr_linenumber" name="L104" href="#L104">104</a> }
<a class="jxr_linenumber" name="L105" href="#L105">105</a>
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaGeneralizedQuadLike.html">JenaGeneralizedQuadLike</a> createGeneralizedQuad(<a href="../../../../../../org/apache/commons/rdf/api/RDFTerm.html">RDFTerm</a> subject, <a href="../../../../../../org/apache/commons/rdf/api/RDFTerm.html">RDFTerm</a> predicate, <a href="../../../../../../org/apache/commons/rdf/api/RDFTerm.html">RDFTerm</a> object, <a href="../../../../../../org/apache/commons/rdf/api/RDFTerm.html">RDFTerm</a> graphName) {
-<a class="jxr_linenumber" name="L107" href="#L107">107</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaGeneralizedQuadLikeImpl.html">JenaGeneralizedQuadLikeImpl</a>(subject, predicate, object, Optional.ofNullable(graphName));
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaIRI.html">JenaIRI</a> createIRI(String iriStr) {
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaIRIImpl.html">JenaIRIImpl</a>(iriStr);
<a class="jxr_linenumber" name="L108" href="#L108">108</a> }
<a class="jxr_linenumber" name="L109" href="#L109">109</a>
-<a class="jxr_linenumber" name="L110" href="#L110">110</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaRDFTerm.html">JenaRDFTerm</a> fromJena(Node node, UUID salt) <strong class="jxr_keyword">throws</strong> ConversionException {
-<a class="jxr_linenumber" name="L111" href="#L111">111</a> <strong class="jxr_keyword">if</strong> (! node.isConcrete()) {
-<a class="jxr_linenumber" name="L112" href="#L112">112</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/ConversionException.html">ConversionException</a>(<span class="jxr_string">"Node is not a concrete RDF Term: "</span> + node);
-<a class="jxr_linenumber" name="L113" href="#L113">113</a> }
-<a class="jxr_linenumber" name="L114" href="#L114">114</a> <strong class="jxr_keyword">if</strong> (node.isURI()) {
-<a class="jxr_linenumber" name="L115" href="#L115">115</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaIRIImpl.html">JenaIRIImpl</a>(node);
-<a class="jxr_linenumber" name="L116" href="#L116">116</a> }
-<a class="jxr_linenumber" name="L117" href="#L117">117</a> <strong class="jxr_keyword">if</strong> (node.isLiteral()) {
-<a class="jxr_linenumber" name="L118" href="#L118">118</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaLiteralImpl.html">JenaLiteralImpl</a>(node);
-<a class="jxr_linenumber" name="L119" href="#L119">119</a> }
-<a class="jxr_linenumber" name="L120" href="#L120">120</a> <strong class="jxr_keyword">if</strong> (node.isBlank()) {
-<a class="jxr_linenumber" name="L121" href="#L121">121</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaBlankNodeImpl.html">JenaBlankNodeImpl</a>(node, salt);
-<a class="jxr_linenumber" name="L122" href="#L122">122</a> }
-<a class="jxr_linenumber" name="L123" href="#L123">123</a> <strong class="jxr_keyword">if</strong> (node.equals(Node.ANY)) {
-<a class="jxr_linenumber" name="L124" href="#L124">124</a> <em class="jxr_comment">// NOTE: JenaAny no longer supported by Commons RDF</em>
-<a class="jxr_linenumber" name="L125" href="#L125">125</a> <em class="jxr_comment">//return JenaAnyImpl.Singleton.instance;</em>
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> }
-<a class="jxr_linenumber" name="L127" href="#L127">127</a> <strong class="jxr_keyword">if</strong> (node.isVariable()) {
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> <em class="jxr_comment">// NOTE: JenaVariable no longer supported by Commons RDF</em>
-<a class="jxr_linenumber" name="L129" href="#L129">129</a> <em class="jxr_comment">//return new JenaVariableImpl(node);</em>
-<a class="jxr_linenumber" name="L130" href="#L130">130</a> }
-<a class="jxr_linenumber" name="L131" href="#L131">131</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/ConversionException.html">ConversionException</a>(<span class="jxr_string">"Unrecognized node type: "</span> + node);
-<a class="jxr_linenumber" name="L132" href="#L132">132</a> }
-<a class="jxr_linenumber" name="L133" href="#L133">133</a>
-<a class="jxr_linenumber" name="L134" href="#L134">134</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaGraph.html">JenaGraph</a> fromJena(org.apache.jena.graph.Graph graph, UUID salt) {
-<a class="jxr_linenumber" name="L135" href="#L135">135</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaGraphImpl.html">JenaGraphImpl</a>(graph, salt);
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> }
-<a class="jxr_linenumber" name="L137" href="#L137">137</a>
-<a class="jxr_linenumber" name="L138" href="#L138">138</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaGraph.html">JenaGraph</a> fromJena(Model model, UUID salt) {
-<a class="jxr_linenumber" name="L139" href="#L139">139</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaGraphImpl.html">JenaGraphImpl</a>(model, salt);
-<a class="jxr_linenumber" name="L140" href="#L140">140</a> }
-<a class="jxr_linenumber" name="L141" href="#L141">141</a>
-<a class="jxr_linenumber" name="L142" href="#L142">142</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaDataset.html">JenaDataset</a> fromJena(DatasetGraph datasetGraph, UUID salt) {
-<a class="jxr_linenumber" name="L143" href="#L143">143</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaDatasetImpl.html">JenaDatasetImpl</a>(datasetGraph, salt);
-<a class="jxr_linenumber" name="L144" href="#L144">144</a> }
-<a class="jxr_linenumber" name="L145" href="#L145">145</a>
-<a class="jxr_linenumber" name="L146" href="#L146">146</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaTriple.html">JenaTriple</a> fromJena(org.apache.jena.graph.Triple triple, UUID salt) {
-<a class="jxr_linenumber" name="L147" href="#L147">147</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaTripleImpl.html">JenaTripleImpl</a>(triple, salt);
-<a class="jxr_linenumber" name="L148" href="#L148">148</a> }
-<a class="jxr_linenumber" name="L149" href="#L149">149</a>
-<a class="jxr_linenumber" name="L150" href="#L150">150</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaGeneralizedTripleLike.html">JenaGeneralizedTripleLike</a> fromJenaGeneralized(org.apache.jena.graph.Triple triple, UUID salt) {
-<a class="jxr_linenumber" name="L151" href="#L151">151</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaGeneralizedTripleLikeImpl.html">JenaGeneralizedTripleLikeImpl</a>(triple, salt);
+<a class="jxr_linenumber" name="L110" href="#L110">110</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaLiteral.html">JenaLiteral</a> createLiteral(String lexStr) {
+<a class="jxr_linenumber" name="L111" href="#L111">111</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaLiteralImpl.html">JenaLiteralImpl</a>(NodeFactory.createLiteral(lexStr));
+<a class="jxr_linenumber" name="L112" href="#L112">112</a> }
+<a class="jxr_linenumber" name="L113" href="#L113">113</a>
+<a class="jxr_linenumber" name="L114" href="#L114">114</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaLiteral.html">JenaLiteral</a> createLiteralDT(String lexStr, String datatypeIRI) {
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaLiteralImpl.html">JenaLiteralImpl</a>(NodeFactory.createLiteral(lexStr, NodeFactory.getType(datatypeIRI)));
+<a class="jxr_linenumber" name="L116" href="#L116">116</a> }
+<a class="jxr_linenumber" name="L117" href="#L117">117</a>
+<a class="jxr_linenumber" name="L118" href="#L118">118</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaLiteral.html">JenaLiteral</a> createLiteralLang(String lexStr, String langTag) {
+<a class="jxr_linenumber" name="L119" href="#L119">119</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaLiteralImpl.html">JenaLiteralImpl</a>(NodeFactory.createLiteral(lexStr, langTag));
+<a class="jxr_linenumber" name="L120" href="#L120">120</a> }
+<a class="jxr_linenumber" name="L121" href="#L121">121</a>
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaQuad.html">JenaQuad</a> createQuad(<a href="../../../../../../org/apache/commons/rdf/api/BlankNodeOrIRI.html">BlankNodeOrIRI</a> subject, <a href="../../../../../../org/apache/commons/rdf/api/IRI.html">IRI</a> predicate, <a href="../../../../../../org/apache/commons/rdf/api/RDFTerm.html">RDFTerm</a> object, <a href="../../../../../../org/apache/commons/rdf/api/BlankNodeOrIRI.html">BlankNodeOrIRI</a> graphName) {
+<a class="jxr_linenumber" name="L123" href="#L123">123</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaQuadImpl.html">JenaQuadImpl</a>(subject, predicate, object, Optional.ofNullable(graphName));
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> }
+<a class="jxr_linenumber" name="L125" href="#L125">125</a>
+<a class="jxr_linenumber" name="L126" href="#L126">126</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaQuad.html">JenaQuad</a> createQuad(org.apache.jena.sparql.core.Quad quad, UUID salt) {
+<a class="jxr_linenumber" name="L127" href="#L127">127</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaQuadImpl.html">JenaQuadImpl</a>(quad, salt);
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> }
+<a class="jxr_linenumber" name="L129" href="#L129">129</a>
+<a class="jxr_linenumber" name="L130" href="#L130">130</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaRDFTerm.html">JenaRDFTerm</a> createRDFTerm(Node node, UUID salt) <strong class="jxr_keyword">throws</strong> ConversionException {
+<a class="jxr_linenumber" name="L131" href="#L131">131</a> <strong class="jxr_keyword">if</strong> (! node.isConcrete()) {
+<a class="jxr_linenumber" name="L132" href="#L132">132</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/ConversionException.html">ConversionException</a>(<span class="jxr_string">"Node is not a concrete RDF Term: "</span> + node);
+<a class="jxr_linenumber" name="L133" href="#L133">133</a> }
+<a class="jxr_linenumber" name="L134" href="#L134">134</a> <strong class="jxr_keyword">if</strong> (node.isURI()) {
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaIRIImpl.html">JenaIRIImpl</a>(node);
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> }
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> <strong class="jxr_keyword">if</strong> (node.isLiteral()) {
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaLiteralImpl.html">JenaLiteralImpl</a>(node);
+<a class="jxr_linenumber" name="L139" href="#L139">139</a> }
+<a class="jxr_linenumber" name="L140" href="#L140">140</a> <strong class="jxr_keyword">if</strong> (node.isBlank()) {
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaBlankNodeImpl.html">JenaBlankNodeImpl</a>(node, salt);
+<a class="jxr_linenumber" name="L142" href="#L142">142</a> }
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> <strong class="jxr_keyword">if</strong> (node.equals(Node.ANY)) {
+<a class="jxr_linenumber" name="L144" href="#L144">144</a> <em class="jxr_comment">// NOTE: JenaAny no longer supported by Commons RDF</em>
+<a class="jxr_linenumber" name="L145" href="#L145">145</a> <em class="jxr_comment">//return JenaAnyImpl.Singleton.instance;</em>
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> }
+<a class="jxr_linenumber" name="L147" href="#L147">147</a> <strong class="jxr_keyword">if</strong> (node.isVariable()) {
+<a class="jxr_linenumber" name="L148" href="#L148">148</a> <em class="jxr_comment">// NOTE: JenaVariable no longer supported by Commons RDF</em>
+<a class="jxr_linenumber" name="L149" href="#L149">149</a> <em class="jxr_comment">//return new JenaVariableImpl(node);</em>
+<a class="jxr_linenumber" name="L150" href="#L150">150</a> }
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/ConversionException.html">ConversionException</a>(<span class="jxr_string">"Unrecognized node type: "</span> + node);
<a class="jxr_linenumber" name="L152" href="#L152">152</a> }
<a class="jxr_linenumber" name="L153" href="#L153">153</a>
-<a class="jxr_linenumber" name="L154" href="#L154">154</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaGeneralizedQuadLike.html">JenaGeneralizedQuadLike</a> fromJenaGeneralized(org.apache.jena.sparql.core.Quad quad, UUID salt) {
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaGeneralizedQuadLikeImpl.html">JenaGeneralizedQuadLikeImpl</a>(quad, salt);
+<a class="jxr_linenumber" name="L154" href="#L154">154</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaTriple.html">JenaTriple</a> createTriple(<a href="../../../../../../org/apache/commons/rdf/api/BlankNodeOrIRI.html">BlankNodeOrIRI</a> subject, <a href="../../../../../../org/apache/commons/rdf/api/IRI.html">IRI</a> predicate, <a href="../../../../../../org/apache/commons/rdf/api/RDFTerm.html">RDFTerm</a> object) {
+<a class="jxr_linenumber" name="L155" href="#L155">155</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaTripleImpl.html">JenaTripleImpl</a>(subject, predicate, object);
<a class="jxr_linenumber" name="L156" href="#L156">156</a> }
<a class="jxr_linenumber" name="L157" href="#L157">157</a>
-<a class="jxr_linenumber" name="L158" href="#L158">158</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaQuad.html">JenaQuad</a> fromJena(org.apache.jena.sparql.core.Quad quad, UUID salt) {
-<a class="jxr_linenumber" name="L159" href="#L159">159</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaQuadImpl.html">JenaQuadImpl</a>(quad, salt);
+<a class="jxr_linenumber" name="L158" href="#L158">158</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaTriple.html">JenaTriple</a> createTriple(org.apache.jena.graph.Triple triple, UUID salt) {
+<a class="jxr_linenumber" name="L159" href="#L159">159</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaTripleImpl.html">JenaTripleImpl</a>(triple, salt);
<a class="jxr_linenumber" name="L160" href="#L160">160</a> }
<a class="jxr_linenumber" name="L161" href="#L161">161</a>
<a class="jxr_linenumber" name="L162" href="#L162">162</a> }
Modified: websites/production/commonsrdf/content/xref/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.html
==============================================================================
--- websites/production/commonsrdf/content/xref/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.html (original)
+++ websites/production/commonsrdf/content/xref/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.html Wed Oct 26 15:57:51 2016
@@ -40,7 +40,7 @@
<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.api.RDFTerm;
<a class="jxr_linenumber" name="L33" href="#L33">33</a> <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.jena.JenaDataset;
<a class="jxr_linenumber" name="L34" href="#L34">34</a> <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.jena.JenaGraph;
-<a class="jxr_linenumber" name="L35" href="#L35">35</a> <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.jena.JenaRDFTermFactory;
+<a class="jxr_linenumber" name="L35" href="#L35">35</a> <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.jena.JenaFactory;
<a class="jxr_linenumber" name="L36" href="#L36">36</a> <strong class="jxr_keyword">import</strong> org.apache.jena.atlas.iterator.Iter;
<a class="jxr_linenumber" name="L37" href="#L37">37</a> <strong class="jxr_keyword">import</strong> org.apache.jena.graph.Node;
<a class="jxr_linenumber" name="L38" href="#L38">38</a> <strong class="jxr_keyword">import</strong> org.apache.jena.riot.Lang;
@@ -52,27 +52,27 @@
<a class="jxr_linenumber" name="L44" href="#L44">44</a>
<a class="jxr_linenumber" name="L45" href="#L45">45</a> <strong class="jxr_keyword">private</strong> DatasetGraph graph;
<a class="jxr_linenumber" name="L46" href="#L46">46</a> <strong class="jxr_keyword">private</strong> UUID salt;
-<a class="jxr_linenumber" name="L47" href="#L47">47</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaRDFTermFactory.html">JenaRDFTermFactory</a> factory;
+<a class="jxr_linenumber" name="L47" href="#L47">47</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaFactory.html">JenaFactory</a> factory;
<a class="jxr_linenumber" name="L48" href="#L48">48</a>
<a class="jxr_linenumber" name="L49" href="#L49">49</a> JenaDatasetImpl(DatasetGraph graph, UUID salt) {
<a class="jxr_linenumber" name="L50" href="#L50">50</a> <strong class="jxr_keyword">this</strong>.graph = graph;
<a class="jxr_linenumber" name="L51" href="#L51">51</a> <strong class="jxr_keyword">this</strong>.salt = salt;
-<a class="jxr_linenumber" name="L52" href="#L52">52</a> <strong class="jxr_keyword">this</strong>.factory = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaRDFTermFactory.html">JenaRDFTermFactory</a>(salt);
+<a class="jxr_linenumber" name="L52" href="#L52">52</a> <strong class="jxr_keyword">this</strong>.factory = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaFactory.html">JenaFactory</a>(salt);
<a class="jxr_linenumber" name="L53" href="#L53">53</a> }
<a class="jxr_linenumber" name="L54" href="#L54">54</a>
<a class="jxr_linenumber" name="L55" href="#L55">55</a> @Override
<a class="jxr_linenumber" name="L56" href="#L56">56</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> add(<a href="../../../../../../org/apache/commons/rdf/api/BlankNodeOrIRI.html">BlankNodeOrIRI</a> graphName, <a href="../../../../../../org/apache/commons/rdf/api/BlankNodeOrIRI.html">BlankNodeOrIRI</a> subject, <a href="../../../../../../org/apache/commons/rdf/api/IRI.html">IRI</a> predicate, <a href="../../../../../../org/apache/commons/rdf/api/RDFTerm.html">RDFTerm</a> object) {
<a class="jxr_linenumber" name="L57" href="#L57">57</a> graph.add(
<a class="jxr_linenumber" name="L58" href="#L58">58</a> org.apache.jena.sparql.core.Quad.create(
-<a class="jxr_linenumber" name="L59" href="#L59">59</a> factory.toJena(graphName),
-<a class="jxr_linenumber" name="L60" href="#L60">60</a> factory.toJena(subject),
-<a class="jxr_linenumber" name="L61" href="#L61">61</a> factory.toJena(predicate),
-<a class="jxr_linenumber" name="L62" href="#L62">62</a> factory.toJena(object)));
+<a class="jxr_linenumber" name="L59" href="#L59">59</a> factory.asJenaNode(graphName),
+<a class="jxr_linenumber" name="L60" href="#L60">60</a> factory.asJenaNode(subject),
+<a class="jxr_linenumber" name="L61" href="#L61">61</a> factory.asJenaNode(predicate),
+<a class="jxr_linenumber" name="L62" href="#L62">62</a> factory.asJenaNode(object)));
<a class="jxr_linenumber" name="L63" href="#L63">63</a> }
<a class="jxr_linenumber" name="L64" href="#L64">64</a>
<a class="jxr_linenumber" name="L65" href="#L65">65</a> @Override
<a class="jxr_linenumber" name="L66" href="#L66">66</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> add(<a href="../../../../../../org/apache/commons/rdf/api/Quad.html">Quad</a> quad) {
-<a class="jxr_linenumber" name="L67" href="#L67">67</a> graph.add(factory.toJena(quad));
+<a class="jxr_linenumber" name="L67" href="#L67">67</a> graph.add(factory.asJenaQuad(quad));
<a class="jxr_linenumber" name="L68" href="#L68">68</a> }
<a class="jxr_linenumber" name="L69" href="#L69">69</a>
<a class="jxr_linenumber" name="L70" href="#L70">70</a> @Override
@@ -109,18 +109,18 @@
<a class="jxr_linenumber" name="L101" href="#L101">101</a> <strong class="jxr_keyword">return</strong> ANY;
<a class="jxr_linenumber" name="L102" href="#L102">102</a> }
<a class="jxr_linenumber" name="L103" href="#L103">103</a> <em class="jxr_comment">// null: default graph</em>
-<a class="jxr_linenumber" name="L104" href="#L104">104</a> <strong class="jxr_keyword">return</strong> factory.toJena(graphName.orElse(<strong class="jxr_keyword">null</strong>));
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> <strong class="jxr_keyword">return</strong> factory.asJenaNode(graphName.orElse(<strong class="jxr_keyword">null</strong>));
<a class="jxr_linenumber" name="L105" href="#L105">105</a> }
<a class="jxr_linenumber" name="L106" href="#L106">106</a>
<a class="jxr_linenumber" name="L107" href="#L107">107</a> <strong class="jxr_keyword">private</strong> Node toJenaPattern(<a href="../../../../../../org/apache/commons/rdf/api/RDFTerm.html">RDFTerm</a> term) {
<a class="jxr_linenumber" name="L108" href="#L108">108</a> <strong class="jxr_keyword">if</strong> (term == <strong class="jxr_keyword">null</strong>)
<a class="jxr_linenumber" name="L109" href="#L109">109</a> <strong class="jxr_keyword">return</strong> ANY;
-<a class="jxr_linenumber" name="L110" href="#L110">110</a> <strong class="jxr_keyword">return</strong> factory.toJena(term);
+<a class="jxr_linenumber" name="L110" href="#L110">110</a> <strong class="jxr_keyword">return</strong> factory.asJenaNode(term);
<a class="jxr_linenumber" name="L111" href="#L111">111</a> }
<a class="jxr_linenumber" name="L112" href="#L112">112</a>
<a class="jxr_linenumber" name="L113" href="#L113">113</a> @Override
<a class="jxr_linenumber" name="L114" href="#L114">114</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> contains(<a href="../../../../../../org/apache/commons/rdf/api/Quad.html">Quad</a> quad) {
-<a class="jxr_linenumber" name="L115" href="#L115">115</a> <strong class="jxr_keyword">return</strong> graph.contains(factory.toJena(quad));
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> <strong class="jxr_keyword">return</strong> graph.contains(factory.asJenaQuad(quad));
<a class="jxr_linenumber" name="L116" href="#L116">116</a> }
<a class="jxr_linenumber" name="L117" href="#L117">117</a>
<a class="jxr_linenumber" name="L118" href="#L118">118</a> @Override
@@ -134,7 +134,7 @@
<a class="jxr_linenumber" name="L126" href="#L126">126</a>
<a class="jxr_linenumber" name="L127" href="#L127">127</a> @Override
<a class="jxr_linenumber" name="L128" href="#L128">128</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> remove(<a href="../../../../../../org/apache/commons/rdf/api/Quad.html">Quad</a> quad) {
-<a class="jxr_linenumber" name="L129" href="#L129">129</a> graph.delete(factory.toJena(quad));
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> graph.delete(factory.asJenaQuad(quad));
<a class="jxr_linenumber" name="L130" href="#L130">130</a> }
<a class="jxr_linenumber" name="L131" href="#L131">131</a>
<a class="jxr_linenumber" name="L132" href="#L132">132</a> @Override
@@ -144,16 +144,16 @@
<a class="jxr_linenumber" name="L136" href="#L136">136</a>
<a class="jxr_linenumber" name="L137" href="#L137">137</a> @Override
<a class="jxr_linenumber" name="L138" href="#L138">138</a> <strong class="jxr_keyword">public</strong> Stream<? <strong class="jxr_keyword">extends</strong> Quad> stream() {
-<a class="jxr_linenumber" name="L139" href="#L139">139</a> JenaRDFTermFactory factory = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaRDFTermFactory.html">JenaRDFTermFactory</a>(salt);
+<a class="jxr_linenumber" name="L139" href="#L139">139</a> JenaFactory factory = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaFactory.html">JenaFactory</a>(salt);
<a class="jxr_linenumber" name="L140" href="#L140">140</a> <strong class="jxr_keyword">return</strong> Iter.asStream(graph.find(ANY, ANY, ANY, ANY), <strong class="jxr_keyword">true</strong>)
-<a class="jxr_linenumber" name="L141" href="#L141">141</a> .map(factory::fromJena);
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> .map(factory::asQuad);
<a class="jxr_linenumber" name="L142" href="#L142">142</a> }
<a class="jxr_linenumber" name="L143" href="#L143">143</a>
<a class="jxr_linenumber" name="L144" href="#L144">144</a> @Override
<a class="jxr_linenumber" name="L145" href="#L145">145</a> <strong class="jxr_keyword">public</strong> Stream<? <strong class="jxr_keyword">extends</strong> Quad> stream(Optional<BlankNodeOrIRI> g, <a href="../../../../../../org/apache/commons/rdf/api/BlankNodeOrIRI.html">BlankNodeOrIRI</a> s, <a href="../../../../../../org/apache/commons/rdf/api/IRI.html">IRI</a> p, <a href="../../../../../../org/apache/commons/rdf/api/RDFTerm.html">RDFTerm</a> o) {
-<a class="jxr_linenumber" name="L146" href="#L146">146</a> JenaRDFTermFactory factory = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaRDFTermFactory.html">JenaRDFTermFactory</a>(salt);
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> JenaFactory factory = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaFactory.html">JenaFactory</a>(salt);
<a class="jxr_linenumber" name="L147" href="#L147">147</a> <strong class="jxr_keyword">return</strong> Iter.asStream(graph.find(toJenaPattern(g), toJenaPattern(s), toJenaPattern(p), toJenaPattern(o)), <strong class="jxr_keyword">true</strong>)
-<a class="jxr_linenumber" name="L148" href="#L148">148</a> .map(factory::fromJena);
+<a class="jxr_linenumber" name="L148" href="#L148">148</a> .map(factory::asQuad);
<a class="jxr_linenumber" name="L149" href="#L149">149</a> }
<a class="jxr_linenumber" name="L150" href="#L150">150</a>
<a class="jxr_linenumber" name="L151" href="#L151">151</a> @Override
@@ -177,22 +177,22 @@
<a class="jxr_linenumber" name="L169" href="#L169">169</a>
<a class="jxr_linenumber" name="L170" href="#L170">170</a> @Override
<a class="jxr_linenumber" name="L171" href="#L171">171</a> <strong class="jxr_keyword">public</strong> Optional<Graph> getGraph(<a href="../../../../../../org/apache/commons/rdf/api/BlankNodeOrIRI.html">BlankNodeOrIRI</a> graphName) {
-<a class="jxr_linenumber" name="L172" href="#L172">172</a> GraphView gv = GraphView.createNamedGraph(graph, factory.toJena(graphName));
+<a class="jxr_linenumber" name="L172" href="#L172">172</a> GraphView gv = GraphView.createNamedGraph(graph, factory.asJenaNode(graphName));
<a class="jxr_linenumber" name="L173" href="#L173">173</a> <strong class="jxr_keyword">return</strong> Optional.of(<strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/impl/JenaGraphImpl.html">JenaGraphImpl</a>(gv, salt));
<a class="jxr_linenumber" name="L174" href="#L174">174</a> }
<a class="jxr_linenumber" name="L175" href="#L175">175</a>
<a class="jxr_linenumber" name="L176" href="#L176">176</a> @Override
<a class="jxr_linenumber" name="L177" href="#L177">177</a> <strong class="jxr_keyword">public</strong> Stream<BlankNodeOrIRI> getGraphNames() {
-<a class="jxr_linenumber" name="L178" href="#L178">178</a> JenaRDFTermFactory factory = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaRDFTermFactory.html">JenaRDFTermFactory</a>(salt);
+<a class="jxr_linenumber" name="L178" href="#L178">178</a> JenaFactory factory = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaFactory.html">JenaFactory</a>(salt);
<a class="jxr_linenumber" name="L179" href="#L179">179</a> <strong class="jxr_keyword">return</strong> Iter.asStream(graph.listGraphNodes()).map(node ->
-<a class="jxr_linenumber" name="L180" href="#L180">180</a> (<a href="../../../../../../org/apache/commons/rdf/api/BlankNodeOrIRI.html">BlankNodeOrIRI</a>) factory.fromJena(node));
+<a class="jxr_linenumber" name="L180" href="#L180">180</a> (<a href="../../../../../../org/apache/commons/rdf/api/BlankNodeOrIRI.html">BlankNodeOrIRI</a>) factory.asRDFTerm(node));
<a class="jxr_linenumber" name="L181" href="#L181">181</a> }
<a class="jxr_linenumber" name="L182" href="#L182">182</a>
<a class="jxr_linenumber" name="L183" href="#L183">183</a> @Override
<a class="jxr_linenumber" name="L184" href="#L184">184</a> <strong class="jxr_keyword">public</strong> Iterable<Quad> iterate() {
-<a class="jxr_linenumber" name="L185" href="#L185">185</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaRDFTermFactory.html">JenaRDFTermFactory</a> factory = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaRDFTermFactory.html">JenaRDFTermFactory</a>(salt);
+<a class="jxr_linenumber" name="L185" href="#L185">185</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaFactory.html">JenaFactory</a> factory = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaFactory.html">JenaFactory</a>(salt);
<a class="jxr_linenumber" name="L186" href="#L186">186</a> <strong class="jxr_keyword">return</strong> Iter.asStream(graph.find(), false)
-<a class="jxr_linenumber" name="L187" href="#L187">187</a> .map(q -> (Quad) factory.fromJena(q))
+<a class="jxr_linenumber" name="L187" href="#L187">187</a> .map(q -> (Quad) factory.asQuad(q))
<a class="jxr_linenumber" name="L188" href="#L188">188</a> ::iterator;
<a class="jxr_linenumber" name="L189" href="#L189">189</a> }
<a class="jxr_linenumber" name="L190" href="#L190">190</a>
Modified: websites/production/commonsrdf/content/xref/org/apache/commons/rdf/jena/impl/JenaGraphImpl.html
==============================================================================
--- websites/production/commonsrdf/content/xref/org/apache/commons/rdf/jena/impl/JenaGraphImpl.html (original)
+++ websites/production/commonsrdf/content/xref/org/apache/commons/rdf/jena/impl/JenaGraphImpl.html Wed Oct 26 15:57:51 2016
@@ -35,7 +35,7 @@
<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.api.RDFTerm;
<a class="jxr_linenumber" name="L28" href="#L28">28</a> <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.api.Triple;
<a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.jena.JenaGraph;
-<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.jena.JenaRDFTermFactory;
+<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.jena.JenaFactory;
<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong class="jxr_keyword">import</strong> org.apache.jena.atlas.iterator.Iter;
<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong class="jxr_keyword">import</strong> org.apache.jena.graph.Node;
<a class="jxr_linenumber" name="L33" href="#L33">33</a> <strong class="jxr_keyword">import</strong> org.apache.jena.rdf.model.Model;
@@ -47,33 +47,33 @@
<a class="jxr_linenumber" name="L39" href="#L39">39</a>
<a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> org.apache.jena.graph.Graph graph;
<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> UUID salt;
-<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">transient</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaRDFTermFactory.html">JenaRDFTermFactory</a> factory;
+<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">transient</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaFactory.html">JenaFactory</a> factory;
<a class="jxr_linenumber" name="L43" href="#L43">43</a> <strong class="jxr_keyword">private</strong> Model model;
<a class="jxr_linenumber" name="L44" href="#L44">44</a>
<a class="jxr_linenumber" name="L45" href="#L45">45</a> JenaGraphImpl(org.apache.jena.graph.Graph graph, UUID salt) {
<a class="jxr_linenumber" name="L46" href="#L46">46</a> <strong class="jxr_keyword">this</strong>.graph = graph;
<a class="jxr_linenumber" name="L47" href="#L47">47</a> <strong class="jxr_keyword">this</strong>.salt = salt;
-<a class="jxr_linenumber" name="L48" href="#L48">48</a> <strong class="jxr_keyword">this</strong>.factory = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaRDFTermFactory.html">JenaRDFTermFactory</a>(salt);
+<a class="jxr_linenumber" name="L48" href="#L48">48</a> <strong class="jxr_keyword">this</strong>.factory = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaFactory.html">JenaFactory</a>(salt);
<a class="jxr_linenumber" name="L49" href="#L49">49</a> }
<a class="jxr_linenumber" name="L50" href="#L50">50</a>
<a class="jxr_linenumber" name="L51" href="#L51">51</a> JenaGraphImpl(Model model, UUID salt) {
<a class="jxr_linenumber" name="L52" href="#L52">52</a> <strong class="jxr_keyword">this</strong>.model = model;
<a class="jxr_linenumber" name="L53" href="#L53">53</a> <strong class="jxr_keyword">this</strong>.graph = model.getGraph();
<a class="jxr_linenumber" name="L54" href="#L54">54</a> <strong class="jxr_keyword">this</strong>.salt = salt;
-<a class="jxr_linenumber" name="L55" href="#L55">55</a> <strong class="jxr_keyword">this</strong>.factory = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaRDFTermFactory.html">JenaRDFTermFactory</a>(salt);
+<a class="jxr_linenumber" name="L55" href="#L55">55</a> <strong class="jxr_keyword">this</strong>.factory = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaFactory.html">JenaFactory</a>(salt);
<a class="jxr_linenumber" name="L56" href="#L56">56</a> }
<a class="jxr_linenumber" name="L57" href="#L57">57</a>
<a class="jxr_linenumber" name="L58" href="#L58">58</a> @Override
<a class="jxr_linenumber" name="L59" href="#L59">59</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> add(<a href="../../../../../../org/apache/commons/rdf/api/BlankNodeOrIRI.html">BlankNodeOrIRI</a> subject, <a href="../../../../../../org/apache/commons/rdf/api/IRI.html">IRI</a> predicate, <a href="../../../../../../org/apache/commons/rdf/api/RDFTerm.html">RDFTerm</a> object) {
<a class="jxr_linenumber" name="L60" href="#L60">60</a> graph.add(org.apache.jena.graph.Triple.create(
-<a class="jxr_linenumber" name="L61" href="#L61">61</a> factory.toJena(subject),
-<a class="jxr_linenumber" name="L62" href="#L62">62</a> factory.toJena(predicate),
-<a class="jxr_linenumber" name="L63" href="#L63">63</a> factory.toJena(object)));
+<a class="jxr_linenumber" name="L61" href="#L61">61</a> factory.asJenaNode(subject),
+<a class="jxr_linenumber" name="L62" href="#L62">62</a> factory.asJenaNode(predicate),
+<a class="jxr_linenumber" name="L63" href="#L63">63</a> factory.asJenaNode(object)));
<a class="jxr_linenumber" name="L64" href="#L64">64</a> }
<a class="jxr_linenumber" name="L65" href="#L65">65</a>
<a class="jxr_linenumber" name="L66" href="#L66">66</a> @Override
<a class="jxr_linenumber" name="L67" href="#L67">67</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> add(<a href="../../../../../../org/apache/commons/rdf/api/Triple.html">Triple</a> triple) {
-<a class="jxr_linenumber" name="L68" href="#L68">68</a> graph.add(factory.toJena(triple));
+<a class="jxr_linenumber" name="L68" href="#L68">68</a> graph.add(factory.asJenaTriple(triple));
<a class="jxr_linenumber" name="L69" href="#L69">69</a> }
<a class="jxr_linenumber" name="L70" href="#L70">70</a>
<a class="jxr_linenumber" name="L71" href="#L71">71</a> @Override
@@ -94,27 +94,27 @@
<a class="jxr_linenumber" name="L86" href="#L86">86</a> @Override
<a class="jxr_linenumber" name="L87" href="#L87">87</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> contains(<a href="../../../../../../org/apache/commons/rdf/api/BlankNodeOrIRI.html">BlankNodeOrIRI</a> subject, <a href="../../../../../../org/apache/commons/rdf/api/IRI.html">IRI</a> predicate, <a href="../../../../../../org/apache/commons/rdf/api/RDFTerm.html">RDFTerm</a> object) {
<a class="jxr_linenumber" name="L88" href="#L88">88</a> <strong class="jxr_keyword">return</strong> graph.contains(
-<a class="jxr_linenumber" name="L89" href="#L89">89</a> factory.toJena(subject),
-<a class="jxr_linenumber" name="L90" href="#L90">90</a> factory.toJena(predicate),
-<a class="jxr_linenumber" name="L91" href="#L91">91</a> factory.toJena(object));
+<a class="jxr_linenumber" name="L89" href="#L89">89</a> factory.asJenaNode(subject),
+<a class="jxr_linenumber" name="L90" href="#L90">90</a> factory.asJenaNode(predicate),
+<a class="jxr_linenumber" name="L91" href="#L91">91</a> factory.asJenaNode(object));
<a class="jxr_linenumber" name="L92" href="#L92">92</a> }
<a class="jxr_linenumber" name="L93" href="#L93">93</a>
<a class="jxr_linenumber" name="L94" href="#L94">94</a> @Override
<a class="jxr_linenumber" name="L95" href="#L95">95</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> contains(<a href="../../../../../../org/apache/commons/rdf/api/Triple.html">Triple</a> triple) {
-<a class="jxr_linenumber" name="L96" href="#L96">96</a> <strong class="jxr_keyword">return</strong> graph.contains(factory.toJena(triple));
+<a class="jxr_linenumber" name="L96" href="#L96">96</a> <strong class="jxr_keyword">return</strong> graph.contains(factory.asJenaTriple(triple));
<a class="jxr_linenumber" name="L97" href="#L97">97</a> }
<a class="jxr_linenumber" name="L98" href="#L98">98</a>
<a class="jxr_linenumber" name="L99" href="#L99">99</a> @Override
<a class="jxr_linenumber" name="L100" href="#L100">100</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> remove(<a href="../../../../../../org/apache/commons/rdf/api/BlankNodeOrIRI.html">BlankNodeOrIRI</a> subject, <a href="../../../../../../org/apache/commons/rdf/api/IRI.html">IRI</a> predicate, <a href="../../../../../../org/apache/commons/rdf/api/RDFTerm.html">RDFTerm</a> object) {
<a class="jxr_linenumber" name="L101" href="#L101">101</a> graph.delete(org.apache.jena.graph.Triple.create(
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> factory.toJena(subject),
-<a class="jxr_linenumber" name="L103" href="#L103">103</a> factory.toJena(predicate),
-<a class="jxr_linenumber" name="L104" href="#L104">104</a> factory.toJena(object)));
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> factory.asJenaNode(subject),
+<a class="jxr_linenumber" name="L103" href="#L103">103</a> factory.asJenaNode(predicate),
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> factory.asJenaNode(object)));
<a class="jxr_linenumber" name="L105" href="#L105">105</a> }
<a class="jxr_linenumber" name="L106" href="#L106">106</a>
<a class="jxr_linenumber" name="L107" href="#L107">107</a> @Override
<a class="jxr_linenumber" name="L108" href="#L108">108</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> remove(<a href="../../../../../../org/apache/commons/rdf/api/Triple.html">Triple</a> triple) {
-<a class="jxr_linenumber" name="L109" href="#L109">109</a> graph.delete(factory.toJena(triple));
+<a class="jxr_linenumber" name="L109" href="#L109">109</a> graph.delete(factory.asJenaTriple(triple));
<a class="jxr_linenumber" name="L110" href="#L110">110</a> }
<a class="jxr_linenumber" name="L111" href="#L111">111</a>
<a class="jxr_linenumber" name="L112" href="#L112">112</a> @Override
@@ -124,21 +124,21 @@
<a class="jxr_linenumber" name="L116" href="#L116">116</a>
<a class="jxr_linenumber" name="L117" href="#L117">117</a> @Override
<a class="jxr_linenumber" name="L118" href="#L118">118</a> <strong class="jxr_keyword">public</strong> Stream<? <strong class="jxr_keyword">extends</strong> Triple> stream() {
-<a class="jxr_linenumber" name="L119" href="#L119">119</a> JenaRDFTermFactory factory = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaRDFTermFactory.html">JenaRDFTermFactory</a>(salt);
-<a class="jxr_linenumber" name="L120" href="#L120">120</a> <strong class="jxr_keyword">return</strong> Iter.asStream(graph.find(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>), <strong class="jxr_keyword">true</strong>).map(factory::fromJena);
+<a class="jxr_linenumber" name="L119" href="#L119">119</a> JenaFactory factory = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaFactory.html">JenaFactory</a>(salt);
+<a class="jxr_linenumber" name="L120" href="#L120">120</a> <strong class="jxr_keyword">return</strong> Iter.asStream(graph.find(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>), <strong class="jxr_keyword">true</strong>).map(factory::asTriple);
<a class="jxr_linenumber" name="L121" href="#L121">121</a> }
<a class="jxr_linenumber" name="L122" href="#L122">122</a>
<a class="jxr_linenumber" name="L123" href="#L123">123</a> @Override
<a class="jxr_linenumber" name="L124" href="#L124">124</a> <strong class="jxr_keyword">public</strong> Stream<? <strong class="jxr_keyword">extends</strong> Triple> stream(<a href="../../../../../../org/apache/commons/rdf/api/BlankNodeOrIRI.html">BlankNodeOrIRI</a> s, <a href="../../../../../../org/apache/commons/rdf/api/IRI.html">IRI</a> p, <a href="../../../../../../org/apache/commons/rdf/api/RDFTerm.html">RDFTerm</a> o) {
-<a class="jxr_linenumber" name="L125" href="#L125">125</a> JenaRDFTermFactory factory = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaRDFTermFactory.html">JenaRDFTermFactory</a>(salt);
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> JenaFactory factory = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/rdf/jena/JenaFactory.html">JenaFactory</a>(salt);
<a class="jxr_linenumber" name="L126" href="#L126">126</a> <strong class="jxr_keyword">return</strong> Iter.asStream(graph.find(toJenaAny(s), toJenaAny(p), toJenaAny(o)), <strong class="jxr_keyword">true</strong>)
-<a class="jxr_linenumber" name="L127" href="#L127">127</a> .map(factory::fromJena);
+<a class="jxr_linenumber" name="L127" href="#L127">127</a> .map(factory::asTriple);
<a class="jxr_linenumber" name="L128" href="#L128">128</a> }
<a class="jxr_linenumber" name="L129" href="#L129">129</a>
<a class="jxr_linenumber" name="L130" href="#L130">130</a> <strong class="jxr_keyword">private</strong> Node toJenaAny(<a href="../../../../../../org/apache/commons/rdf/api/RDFTerm.html">RDFTerm</a> term) {
<a class="jxr_linenumber" name="L131" href="#L131">131</a> <strong class="jxr_keyword">if</strong> (term == <strong class="jxr_keyword">null</strong>)
<a class="jxr_linenumber" name="L132" href="#L132">132</a> <strong class="jxr_keyword">return</strong> Node.ANY;
-<a class="jxr_linenumber" name="L133" href="#L133">133</a> <strong class="jxr_keyword">return</strong> factory.toJena(term);
+<a class="jxr_linenumber" name="L133" href="#L133">133</a> <strong class="jxr_keyword">return</strong> factory.asJenaNode(term);
<a class="jxr_linenumber" name="L134" href="#L134">134</a> }
<a class="jxr_linenumber" name="L135" href="#L135">135</a>
<a class="jxr_linenumber" name="L136" href="#L136">136</a> @Override
Modified: websites/production/commonsrdf/content/xref/org/apache/commons/rdf/jena/package-frame.html
==============================================================================
--- websites/production/commonsrdf/content/xref/org/apache/commons/rdf/jena/package-frame.html (original)
+++ websites/production/commonsrdf/content/xref/org/apache/commons/rdf/jena/package-frame.html Wed Oct 26 15:57:51 2016
@@ -25,6 +25,9 @@
<a href="JenaDataset.html" target="classFrame">JenaDataset</a>
</li>
<li>
+ <a href="JenaFactory.html" target="classFrame">JenaFactory</a>
+ </li>
+ <li>
<a href="JenaGeneralizedQuadLike.html" target="classFrame">JenaGeneralizedQuadLike</a>
</li>
<li>
@@ -49,9 +52,6 @@
<a href="JenaRDFTerm.html" target="classFrame">JenaRDFTerm</a>
</li>
<li>
- <a href="JenaRDFTermFactory.html" target="classFrame">JenaRDFTermFactory</a>
- </li>
- <li>
<a href="JenaTriple.html" target="classFrame">JenaTriple</a>
</li>
<li>
Modified: websites/production/commonsrdf/content/xref/org/apache/commons/rdf/jena/package-summary.html
==============================================================================
--- websites/production/commonsrdf/content/xref/org/apache/commons/rdf/jena/package-summary.html (original)
+++ websites/production/commonsrdf/content/xref/org/apache/commons/rdf/jena/package-summary.html Wed Oct 26 15:57:51 2016
@@ -52,6 +52,11 @@
</tr>
<tr>
<td>
+ <a href="JenaFactory.html" target="classFrame">JenaFactory</a>
+ </td>
+ </tr>
+ <tr>
+ <td>
<a href="JenaGeneralizedQuadLike.html" target="classFrame">JenaGeneralizedQuadLike</a>
</td>
</tr>
@@ -91,11 +96,6 @@
</td>
</tr>
<tr>
- <td>
- <a href="JenaRDFTermFactory.html" target="classFrame">JenaRDFTermFactory</a>
- </td>
- </tr>
- <tr>
<td>
<a href="JenaTriple.html" target="classFrame">JenaTriple</a>
</td>