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/07 13:48:19 UTC
[1/8] incubator-commonsrdf git commit: Removed JenaAny, JenaVariable
Repository: incubator-commonsrdf
Updated Branches:
refs/heads/jena e569efe0e -> 51d7b4117
Removed JenaAny, JenaVariable
throw ConversionException if node can't be converted
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/3fdb27ff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/3fdb27ff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/3fdb27ff
Branch: refs/heads/jena
Commit: 3fdb27ff0d418f62917d8beb224a823e5d6e2068
Parents: e569efe
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Oct 7 09:37:37 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Oct 7 09:37:37 2016 +0100
----------------------------------------------------------------------
.../org/apache/commons/rdf/jena/JenaAny.java | 39 ------------
.../commons/rdf/jena/JenaRDFTermFactory.java | 8 ---
.../apache/commons/rdf/jena/JenaVariable.java | 39 ------------
.../commons/rdf/jena/impl/JenaAnyImpl.java | 54 -----------------
.../commons/rdf/jena/impl/JenaFactory.java | 18 ++----
.../commons/rdf/jena/impl/JenaVariableImpl.java | 64 --------------------
6 files changed, 5 insertions(+), 217 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/3fdb27ff/jena/src/main/java/org/apache/commons/rdf/jena/JenaAny.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaAny.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaAny.java
deleted file mode 100644
index 5b6f398..0000000
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaAny.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.commons.rdf.jena;
-
-import org.apache.jena.graph.Node;
-
-/**
- * A placeholder for "any" RDFTerm.
- * <p>
- * Equivalent to <code>[]</code> in SPARQL. This is a Jena-specific
- * RDFTerm extension used in SPARQL queries.
- * <p>
- * Note that any JenaAny is {@link Object#equals(Object)} equal to
- * any other JenaAny - in practice there is only a singleton instance -
- * but every ocurrance of JenaAny in a generalized statement
- * would independently represent "any" RDFTerm.
- *
- * @see Node#ANY
- *
- */
-public interface JenaAny extends JenaRDFTerm {
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/3fdb27ff/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
index 6c1d9f7..6793335 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
@@ -138,14 +138,6 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
return JenaFactory.createQuad(subject, predicate, object, graphName);
}
- public JenaAny createAnyVariable() {
- return JenaFactory.createAnyVariable();
- }
-
- public JenaVariable createVariable(String variableName) {
- return JenaFactory.createVariable(variableName);
- }
-
/**
* Create a generalized Jena triple.
* <p>
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/3fdb27ff/jena/src/main/java/org/apache/commons/rdf/jena/JenaVariable.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaVariable.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaVariable.java
deleted file mode 100644
index 099018f..0000000
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaVariable.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.rdf.jena;
-
-import org.apache.commons.rdf.api.BlankNode;
-import org.apache.jena.graph.Node;
-
-/**
- * A placeholder for a variable RDFTerm.
- * <p>
- * Equivalent to <code>?variable</code> in SPARQL. This is a Jena-specific
- * RDFTerm extension used in SPARQL queries.
- * <p>
- * Note that any JenaVariable is {@link Object#equals(Object)} equal to
- * any other JenaVariable if they have the same {@link #getVariableName()}. There
- * is no equivalent of {@link BlankNode#uniqueReference()} and actual equality depend
- * on the SPARQL query using the variable.
- *
- * @see Node#isVariable()
- */
-public interface JenaVariable extends JenaRDFTerm {
- public String getVariableName();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/3fdb27ff/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaAnyImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaAnyImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaAnyImpl.java
deleted file mode 100644
index 068cbd8..0000000
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaAnyImpl.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.commons.rdf.jena.impl;
-
-import org.apache.commons.rdf.jena.JenaAny;
-import org.apache.commons.rdf.jena.JenaRDFTerm;
-import org.apache.jena.graph.Node;
-
-public class JenaAnyImpl implements JenaRDFTerm, JenaAny {
-
- static class Singleton {
- static JenaAnyImpl instance = new JenaAnyImpl();
- }
-
- /**
- * Private constructor
- *
- * @see {@link Singleton#instance}
- */
- private JenaAnyImpl() {
- }
-
- @Override
- public String ntriplesString() {
- return "[]";
- }
-
- @Override
- public Node asJenaNode() {
- return Node.ANY;
- }
-
- @Override
- public boolean equals(Object obj) {
- return obj == this || obj instanceof JenaAny;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/3fdb27ff/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaFactory.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaFactory.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaFactory.java
index eb60cc0..2f75436 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaFactory.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaFactory.java
@@ -26,7 +26,6 @@ import org.apache.commons.rdf.api.BlankNodeOrIRI;
import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.RDFTerm;
import org.apache.commons.rdf.jena.ConversionException;
-import org.apache.commons.rdf.jena.JenaAny;
import org.apache.commons.rdf.jena.JenaBlankNode;
import org.apache.commons.rdf.jena.JenaDataset;
import org.apache.commons.rdf.jena.JenaGraph;
@@ -38,7 +37,6 @@ import org.apache.commons.rdf.jena.JenaRDFTerm;
import org.apache.commons.rdf.jena.JenaRDFTermFactory;
import org.apache.commons.rdf.jena.JenaTriple;
import org.apache.commons.rdf.jena.JenaTripleLike;
-import org.apache.commons.rdf.jena.JenaVariable;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.rdf.model.Model;
@@ -99,14 +97,6 @@ public class JenaFactory {
public static JenaQuad createQuad(BlankNodeOrIRI subject, IRI predicate, RDFTerm object, BlankNodeOrIRI graphName) {
return new JenaQuadImpl(subject, predicate, object, Optional.ofNullable(graphName));
}
-
- public static JenaVariable createVariable(String name) {
- return new JenaVariableImpl(NodeFactory.createVariable(name));
- }
-
- public static JenaAny createAnyVariable() {
- return JenaAnyImpl.Singleton.instance;
- }
public static JenaTripleLike<RDFTerm,RDFTerm,RDFTerm> createGeneralizedTriple(RDFTerm subject, RDFTerm predicate, RDFTerm object) {
return new JenaGeneralizedQuad<RDFTerm,RDFTerm,RDFTerm,RDFTerm>(subject, predicate, object);
@@ -134,12 +124,14 @@ public class JenaFactory {
return new JenaBlankNodeImpl(node, salt);
}
if (node.equals(Node.ANY)) {
- return JenaAnyImpl.Singleton.instance;
+ // NOTE: JenaAny no longer supported by Commons RDF
+ //return JenaAnyImpl.Singleton.instance;
}
if (node.isVariable()) {
- return new JenaVariableImpl(node);
+ // NOTE: JenaVariable no longer supported by Commons RDF
+ //return new JenaVariableImpl(node);
}
- throw new IllegalArgumentException("Unrecognized node type: " + node);
+ throw new ConversionException("Unrecognized node type: " + node);
}
public static JenaGraph fromJena(org.apache.jena.graph.Graph graph, UUID salt) {
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/3fdb27ff/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaVariableImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaVariableImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaVariableImpl.java
deleted file mode 100644
index 8027cf2..0000000
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaVariableImpl.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.commons.rdf.jena.impl;
-
-import java.util.Objects;
-
-import org.apache.commons.rdf.jena.JenaRDFTerm;
-import org.apache.commons.rdf.jena.JenaVariable;
-import org.apache.jena.graph.Node;
-
-public class JenaVariableImpl implements JenaRDFTerm, JenaVariable {
-
- private Node node;
-
- JenaVariableImpl(Node node) {
- if (! node.isVariable()) {
- throw new IllegalArgumentException("Node is not a variable: " + node);
- }
- this.node = node;
- }
-
- @Override
- public String ntriplesString() {
- return "?" + getVariableName();
- }
-
- @Override
- public String getVariableName() {
- return node.getName();
- }
-
- @Override
- public Node asJenaNode() {
- return node;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (obj == this) {
- return true;
- }
- if (! (obj instanceof JenaVariable)) {
- return false;
- }
- return Objects.equals(getVariableName(), ((JenaVariable)obj).getVariableName());
- }
-
-}
[8/8] incubator-commonsrdf git commit: Added JenaGeneralizedQuadLike
and JenaGeneralizedTripleLike interfaces
Posted by st...@apache.org.
Added JenaGeneralizedQuadLike and JenaGeneralizedTripleLike interfaces
to avoid the <Generics> overload in the factory
Also made AbstractQuadLike superclass
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/51d7b411
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/51d7b411
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/51d7b411
Branch: refs/heads/jena
Commit: 51d7b41176815c708eaaf941692c711d8f8ad903
Parents: b3baff4
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Oct 7 14:47:49 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Oct 7 14:47:49 2016 +0100
----------------------------------------------------------------------
.../rdf/jena/JenaGeneralizedQuadLike.java | 37 +++++
.../rdf/jena/JenaGeneralizedTripleLike.java | 38 +++++
.../commons/rdf/jena/JenaRDFTermFactory.java | 5 +-
.../commons/rdf/jena/impl/AbstractQuadLike.java | 141 +++++++++++++++++++
.../commons/rdf/jena/impl/JenaFactory.java | 18 +--
.../rdf/jena/impl/JenaGeneralizedQuad.java | 141 -------------------
.../jena/impl/JenaGeneralizedQuadLikeImpl.java | 39 +++++
.../impl/JenaGeneralizedTripleLikeImpl.java | 37 +++++
.../commons/rdf/jena/impl/JenaQuadImpl.java | 2 +-
.../commons/rdf/jena/impl/JenaTripleImpl.java | 2 +-
10 files changed, 306 insertions(+), 154 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/51d7b411/jena/src/main/java/org/apache/commons/rdf/jena/JenaGeneralizedQuadLike.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaGeneralizedQuadLike.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaGeneralizedQuadLike.java
new file mode 100644
index 0000000..272421d
--- /dev/null
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaGeneralizedQuadLike.java
@@ -0,0 +1,37 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.rdf.jena;
+
+import org.apache.commons.rdf.api.Quad;
+import org.apache.commons.rdf.api.RDFTerm;
+
+/**
+ * A generalized quad representation.
+ * <p>
+ * A <em>generalized quad</em> is a quad-like object which allow any
+ * {@link RDFTerm} type for its {@link #getSubject()}, {@link #getPredicate()}
+ * {@link #getObject()} and {@link #getGraphName()}. This might be useful with
+ * some serializations like JSON-LD.
+ * <p>
+ * Note that unlike {@link Quad}, this type does not have fixed semantics for
+ * {@link #equals(Object)} or {@link #hashCode()} beyond object identity.
+ *
+ */
+public interface JenaGeneralizedQuadLike extends JenaQuadLike<RDFTerm, RDFTerm, RDFTerm, RDFTerm> {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/51d7b411/jena/src/main/java/org/apache/commons/rdf/jena/JenaGeneralizedTripleLike.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaGeneralizedTripleLike.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaGeneralizedTripleLike.java
new file mode 100644
index 0000000..68e5264
--- /dev/null
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaGeneralizedTripleLike.java
@@ -0,0 +1,38 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.rdf.jena;
+
+import org.apache.commons.rdf.api.RDFTerm;
+import org.apache.commons.rdf.api.Triple;
+
+/**
+ * A generalized triple representation.
+ * <p>
+ * A <em>generalized triple</em> is a triple-like object which allow any
+ * {@link RDFTerm} type for its {@link #getSubject()}, {@link #getPredicate()}
+ * and {@link #getObject()}. This might be useful with some serializations like
+ * JSON-LD.
+ * <p>
+ * Note that unlike {@link Triple}, this type does not have fixed semantics for
+ * {@link #equals(Object)} or {@link #hashCode()} beyond object identity.
+ *
+ */
+public interface JenaGeneralizedTripleLike
+ extends JenaTripleLike<RDFTerm, RDFTerm, RDFTerm> {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/51d7b411/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
index 25db850..4d5c592 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
@@ -15,7 +15,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.commons.rdf.jena;
import java.util.Optional;
@@ -163,7 +162,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* does <strong>not</strong> implement {@link Triple#equals(Object)}
* or {@link Triple#hashCode()}.
*/
- public JenaTripleLike<RDFTerm, RDFTerm, RDFTerm> createGeneralizedTriple(
+ public JenaGeneralizedTripleLike createGeneralizedTriple(
RDFTerm subject, RDFTerm predicate, RDFTerm object) {
return jenaFactory.createGeneralizedTriple(subject, predicate, object);
}
@@ -190,7 +189,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* <strong>not</strong> implement {@link Quad#equals(Object)} or
* {@link Quad#hashCode()}.
*/
- public JenaQuadLike<RDFTerm, RDFTerm, RDFTerm, RDFTerm> createGeneralizedQuad(
+ public JenaGeneralizedQuadLike createGeneralizedQuad(
RDFTerm subject, RDFTerm predicate, RDFTerm object, RDFTerm graphName) {
return jenaFactory.createGeneralizedQuad(subject, predicate, object, graphName);
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/51d7b411/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractQuadLike.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractQuadLike.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractQuadLike.java
new file mode 100644
index 0000000..f8451ea
--- /dev/null
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractQuadLike.java
@@ -0,0 +1,141 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.rdf.jena.impl;
+
+import java.util.Objects;
+import java.util.Optional;
+import java.util.UUID;
+
+import org.apache.commons.rdf.api.QuadLike;
+import org.apache.commons.rdf.api.RDFTerm;
+import org.apache.commons.rdf.jena.JenaQuad;
+import org.apache.commons.rdf.jena.JenaQuadLike;
+import org.apache.commons.rdf.jena.JenaRDFTermFactory;
+import org.apache.commons.rdf.jena.JenaTriple;
+import org.apache.jena.graph.Triple;
+import org.apache.jena.sparql.core.Quad;
+
+/**
+ * A generalized {@link QuadLike}, backed by a Jena {@link Quad} or {@link Triple}.
+ * <p>
+ * This class does not implement any particular {@link #equals(Object)} or
+ * {@link #hashCode()} but can otherwise be used as a base class for both
+ * a {@link JenaTriple} and a {@link JenaQuad}.
+ *
+ * @see JenaTripleImpl
+ * @see JenaQuadImpl
+ * @see jenaFactory#createGeneralizedTriple(RDFTerm, RDFTerm, RDFTerm)
+ * @see jenaFactory#createGeneralizedQuad(RDFTerm, RDFTerm, RDFTerm, RDFTerm)
+ *
+ */
+abstract class AbstractQuadLike<S extends RDFTerm, P extends RDFTerm, O extends RDFTerm, G extends RDFTerm> implements JenaQuadLike<S,P,O,G> {
+
+ private static JenaFactory jenaFactory = new JenaFactory(){};
+
+ final Optional<G> graphName;
+ final S subject;
+ final P predicate;
+ final O object;
+ org.apache.jena.sparql.core.Quad quad = null;
+ org.apache.jena.graph.Triple triple = null;
+
+ AbstractQuadLike(S subject, P predicate, O object, Optional<G> graphName) {
+ this.subject = Objects.requireNonNull(subject);
+ this.predicate = Objects.requireNonNull(predicate);
+ this.object = Objects.requireNonNull(object);
+ this.graphName = Objects.requireNonNull(graphName);
+ }
+
+ AbstractQuadLike(S subject, P predicate, O object) {
+ this(subject, predicate, object, Optional.empty());
+ }
+
+ @SuppressWarnings("unchecked")
+ AbstractQuadLike(org.apache.jena.sparql.core.Quad quad, UUID salt) {
+ this.quad = Objects.requireNonNull(quad);
+ this.subject = (S) jenaFactory.fromJena(quad.getSubject(), salt);
+ this.predicate = (P) jenaFactory.fromJena(quad.getPredicate(), salt);
+ this.object = (O)jenaFactory.fromJena(quad.getObject(), salt);
+ this.graphName = Optional.of((G) jenaFactory.fromJena(quad.getGraph(), salt));
+ }
+
+ @SuppressWarnings("unchecked")
+ AbstractQuadLike(org.apache.jena.graph.Triple triple, UUID salt) {
+ this.triple = Objects.requireNonNull(triple);
+ this.subject = (S) jenaFactory.fromJena(triple.getSubject(), salt);
+ this.predicate = (P) jenaFactory.fromJena(triple.getPredicate(), salt);
+ this.object = (O)jenaFactory.fromJena(triple.getObject(), salt);
+ this.graphName = Optional.empty();
+ }
+
+ @Override
+ public org.apache.jena.sparql.core.Quad asJenaQuad() {
+ JenaRDFTermFactory factory = new JenaRDFTermFactory();
+ if (quad == null) {
+ quad = org.apache.jena.sparql.core.Quad.create(
+ factory.toJena(graphName.orElse(null)),
+ factory.toJena(subject),
+ factory.toJena(predicate),
+ factory.toJena(object));
+ }
+ return quad;
+ }
+
+ @Override
+ public org.apache.jena.graph.Triple asJenaTriple() {
+ JenaRDFTermFactory factory = new JenaRDFTermFactory();
+ if (triple == null) {
+ triple = org.apache.jena.graph.Triple.create(
+ factory.toJena(subject),
+ factory.toJena(predicate),
+ factory.toJena(object));
+ }
+ return triple;
+ }
+
+ @Override
+ public S getSubject() {
+ return subject;
+ }
+
+ @Override
+ public P getPredicate() {
+ return predicate;
+ }
+
+ @Override
+ public O getObject() {
+ return object;
+ }
+
+ @Override
+ public Optional<G> getGraphName() {
+ return graphName;
+ }
+
+ @Override
+ public String toString() {
+ // kind of nquad syntax
+ return getSubject().ntriplesString() + " " +
+ getPredicate().ntriplesString() + " "
+ + getObject().ntriplesString() + " " +
+ getGraphName().map(RDFTerm::ntriplesString).orElse("") + ".";
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/51d7b411/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaFactory.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaFactory.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaFactory.java
index 30b96ed..ec15d35 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaFactory.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaFactory.java
@@ -28,6 +28,8 @@ import org.apache.commons.rdf.api.RDFTerm;
import org.apache.commons.rdf.jena.ConversionException;
import org.apache.commons.rdf.jena.JenaBlankNode;
import org.apache.commons.rdf.jena.JenaDataset;
+import org.apache.commons.rdf.jena.JenaGeneralizedQuadLike;
+import org.apache.commons.rdf.jena.JenaGeneralizedTripleLike;
import org.apache.commons.rdf.jena.JenaGraph;
import org.apache.commons.rdf.jena.JenaIRI;
import org.apache.commons.rdf.jena.JenaLiteral;
@@ -99,12 +101,12 @@ public abstract class JenaFactory {
return new JenaQuadImpl(subject, predicate, object, Optional.ofNullable(graphName));
}
- public JenaTripleLike<RDFTerm,RDFTerm,RDFTerm> createGeneralizedTriple(RDFTerm subject, RDFTerm predicate, RDFTerm object) {
- return new JenaGeneralizedQuad<RDFTerm,RDFTerm,RDFTerm,RDFTerm>(subject, predicate, object);
+ public JenaGeneralizedTripleLike createGeneralizedTriple(RDFTerm subject, RDFTerm predicate, RDFTerm object) {
+ return new JenaGeneralizedTripleLikeImpl(subject, predicate, object);
}
- public JenaQuadLike<RDFTerm,RDFTerm,RDFTerm,RDFTerm> createGeneralizedQuad(RDFTerm subject, RDFTerm predicate, RDFTerm object, RDFTerm graphName) {
- return new JenaGeneralizedQuad<RDFTerm,RDFTerm,RDFTerm,RDFTerm>(subject, predicate, object, Optional.ofNullable(graphName));
+ public JenaGeneralizedQuadLike createGeneralizedQuad(RDFTerm subject, RDFTerm predicate, RDFTerm object, RDFTerm graphName) {
+ return new JenaGeneralizedQuadLikeImpl(subject, predicate, object, Optional.ofNullable(graphName));
}
public JenaRDFTerm fromJena(Node node, UUID salt) throws ConversionException {
@@ -147,12 +149,12 @@ public abstract class JenaFactory {
return new JenaTripleImpl(triple, salt);
}
- public JenaTripleLike<RDFTerm, RDFTerm, RDFTerm> fromJenaGeneralized(org.apache.jena.graph.Triple triple, UUID salt) {
- return new JenaGeneralizedQuad<RDFTerm,RDFTerm,RDFTerm,RDFTerm>(triple, salt);
+ public JenaGeneralizedTripleLike fromJenaGeneralized(org.apache.jena.graph.Triple triple, UUID salt) {
+ return new JenaGeneralizedTripleLikeImpl(triple, salt);
}
- public JenaQuadLike<RDFTerm,RDFTerm,RDFTerm,RDFTerm> fromJenaGeneralized(org.apache.jena.sparql.core.Quad quad, UUID salt) {
- return new JenaGeneralizedQuad<RDFTerm,RDFTerm,RDFTerm,RDFTerm>(quad, salt);
+ public JenaGeneralizedQuadLike fromJenaGeneralized(org.apache.jena.sparql.core.Quad quad, UUID salt) {
+ return new JenaGeneralizedQuadLikeImpl(quad, salt);
}
public JenaQuad fromJena(org.apache.jena.sparql.core.Quad quad, UUID salt) {
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/51d7b411/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedQuad.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedQuad.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedQuad.java
deleted file mode 100644
index 607defd..0000000
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedQuad.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.commons.rdf.jena.impl;
-
-import java.util.Objects;
-import java.util.Optional;
-import java.util.UUID;
-
-import org.apache.commons.rdf.api.QuadLike;
-import org.apache.commons.rdf.api.RDFTerm;
-import org.apache.commons.rdf.jena.JenaQuad;
-import org.apache.commons.rdf.jena.JenaQuadLike;
-import org.apache.commons.rdf.jena.JenaRDFTermFactory;
-import org.apache.commons.rdf.jena.JenaTriple;
-import org.apache.jena.graph.Triple;
-import org.apache.jena.sparql.core.Quad;
-
-/**
- * A generalized {@link QuadLike}, backed by a Jena {@link Quad} or {@link Triple}.
- * <p>
- * This class does not implement any particular {@link #equals(Object)} or
- * {@link #hashCode()} but can otherwise be used as a base class for both
- * a {@link JenaTriple} and a {@link JenaQuad}.
- *
- * @see JenaTripleImpl
- * @see JenaQuadImpl
- * @see jenaFactory#createGeneralizedTriple(RDFTerm, RDFTerm, RDFTerm)
- * @see jenaFactory#createGeneralizedQuad(RDFTerm, RDFTerm, RDFTerm, RDFTerm)
- *
- */
-class JenaGeneralizedQuad<S extends RDFTerm, P extends RDFTerm, O extends RDFTerm, G extends RDFTerm> implements JenaQuadLike<S,P,O,G> {
-
- private static JenaFactory jenaFactory = new JenaFactory(){};
-
- final Optional<G> graphName;
- final S subject;
- final P predicate;
- final O object;
- org.apache.jena.sparql.core.Quad quad = null;
- org.apache.jena.graph.Triple triple = null;
-
- JenaGeneralizedQuad(S subject, P predicate, O object, Optional<G> graphName) {
- this.subject = Objects.requireNonNull(subject);
- this.predicate = Objects.requireNonNull(predicate);
- this.object = Objects.requireNonNull(object);
- this.graphName = Objects.requireNonNull(graphName);
- }
-
- JenaGeneralizedQuad(S subject, P predicate, O object) {
- this(subject, predicate, object, Optional.empty());
- }
-
- @SuppressWarnings("unchecked")
- JenaGeneralizedQuad(org.apache.jena.sparql.core.Quad quad, UUID salt) {
- this.quad = Objects.requireNonNull(quad);
- this.subject = (S) jenaFactory.fromJena(quad.getSubject(), salt);
- this.predicate = (P) jenaFactory.fromJena(quad.getPredicate(), salt);
- this.object = (O)jenaFactory.fromJena(quad.getObject(), salt);
- this.graphName = Optional.of((G) jenaFactory.fromJena(quad.getGraph(), salt));
- }
-
- @SuppressWarnings("unchecked")
- JenaGeneralizedQuad(org.apache.jena.graph.Triple triple, UUID salt) {
- this.triple = Objects.requireNonNull(triple);
- this.subject = (S) jenaFactory.fromJena(triple.getSubject(), salt);
- this.predicate = (P) jenaFactory.fromJena(triple.getPredicate(), salt);
- this.object = (O)jenaFactory.fromJena(triple.getObject(), salt);
- this.graphName = Optional.empty();
- }
-
- @Override
- public org.apache.jena.sparql.core.Quad asJenaQuad() {
- JenaRDFTermFactory factory = new JenaRDFTermFactory();
- if (quad == null) {
- quad = org.apache.jena.sparql.core.Quad.create(
- factory.toJena(graphName.orElse(null)),
- factory.toJena(subject),
- factory.toJena(predicate),
- factory.toJena(object));
- }
- return quad;
- }
-
- @Override
- public org.apache.jena.graph.Triple asJenaTriple() {
- JenaRDFTermFactory factory = new JenaRDFTermFactory();
- if (triple == null) {
- triple = org.apache.jena.graph.Triple.create(
- factory.toJena(subject),
- factory.toJena(predicate),
- factory.toJena(object));
- }
- return triple;
- }
-
- @Override
- public S getSubject() {
- return subject;
- }
-
- @Override
- public P getPredicate() {
- return predicate;
- }
-
- @Override
- public O getObject() {
- return object;
- }
-
- @Override
- public Optional<G> getGraphName() {
- return graphName;
- }
-
- @Override
- public String toString() {
- // kind of nquad syntax
- return getSubject().ntriplesString() + " " +
- getPredicate().ntriplesString() + " "
- + getObject().ntriplesString() + " " +
- getGraphName().map(RDFTerm::ntriplesString).orElse("") + ".";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/51d7b411/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedQuadLikeImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedQuadLikeImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedQuadLikeImpl.java
new file mode 100644
index 0000000..df74900
--- /dev/null
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedQuadLikeImpl.java
@@ -0,0 +1,39 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.rdf.jena.impl;
+
+import java.util.Optional;
+import java.util.UUID;
+
+import org.apache.commons.rdf.api.RDFTerm;
+import org.apache.commons.rdf.jena.JenaGeneralizedQuadLike;
+import org.apache.jena.sparql.core.Quad;
+
+class JenaGeneralizedQuadLikeImpl extends AbstractQuadLike<RDFTerm, RDFTerm, RDFTerm, RDFTerm>
+ implements JenaGeneralizedQuadLike {
+
+ JenaGeneralizedQuadLikeImpl(RDFTerm subject, RDFTerm predicate, RDFTerm object,
+ Optional<RDFTerm> ofNullable) {
+ super(subject, predicate, object, ofNullable);
+ }
+
+ JenaGeneralizedQuadLikeImpl(Quad quad, UUID salt) {
+ super(quad, salt);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/51d7b411/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedTripleLikeImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedTripleLikeImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedTripleLikeImpl.java
new file mode 100644
index 0000000..ecaa46a
--- /dev/null
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedTripleLikeImpl.java
@@ -0,0 +1,37 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.rdf.jena.impl;
+
+import java.util.UUID;
+
+import org.apache.commons.rdf.api.RDFTerm;
+import org.apache.commons.rdf.jena.JenaGeneralizedTripleLike;
+import org.apache.jena.graph.Triple;
+
+class JenaGeneralizedTripleLikeImpl extends AbstractQuadLike<RDFTerm, RDFTerm, RDFTerm, RDFTerm>
+ implements JenaGeneralizedTripleLike {
+
+ JenaGeneralizedTripleLikeImpl(RDFTerm subject, RDFTerm predicate, RDFTerm object) {
+ super(subject, predicate, object);
+ }
+
+ JenaGeneralizedTripleLikeImpl(Triple triple, UUID salt) {
+ super(triple, salt);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/51d7b411/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaQuadImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaQuadImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaQuadImpl.java
index 9d65374..61ddf9b 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaQuadImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaQuadImpl.java
@@ -29,7 +29,7 @@ import org.apache.commons.rdf.api.RDFTerm;
import org.apache.commons.rdf.jena.ConversionException;
import org.apache.commons.rdf.jena.JenaQuad;
-class JenaQuadImpl extends JenaGeneralizedQuad<BlankNodeOrIRI,IRI,RDFTerm,BlankNodeOrIRI>
+class JenaQuadImpl extends AbstractQuadLike<BlankNodeOrIRI,IRI,RDFTerm,BlankNodeOrIRI>
implements JenaQuad {
JenaQuadImpl(BlankNodeOrIRI subject, IRI predicate, RDFTerm object, Optional<BlankNodeOrIRI> graphName) {
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/51d7b411/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaTripleImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaTripleImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaTripleImpl.java
index 502b575..453300c 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaTripleImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaTripleImpl.java
@@ -28,7 +28,7 @@ import org.apache.commons.rdf.api.Triple;
import org.apache.commons.rdf.jena.ConversionException;
import org.apache.commons.rdf.jena.JenaTriple;
-class JenaTripleImpl extends JenaGeneralizedQuad<BlankNodeOrIRI, IRI, RDFTerm, RDFTerm>
+class JenaTripleImpl extends AbstractQuadLike<BlankNodeOrIRI, IRI, RDFTerm, RDFTerm>
implements JenaTriple {
JenaTripleImpl(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
[5/8] incubator-commonsrdf git commit: avoid 'static' in
JenaRDFTermFactory
Posted by st...@apache.org.
avoid 'static' in JenaRDFTermFactory
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/edc30364
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/edc30364
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/edc30364
Branch: refs/heads/jena
Commit: edc303640de509e838628249b27b344f22fa61ae
Parents: 35e1366
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Oct 7 14:08:19 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Oct 7 14:09:40 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/jena/JenaRDFTermFactory.java | 12 ++-----
.../commons/rdf/jena/impl/JenaDatasetImpl.java | 26 ++++++++-------
.../rdf/jena/impl/JenaGeneralizedQuad.java | 17 +++++-----
.../commons/rdf/jena/impl/JenaGraphImpl.java | 33 +++++++++++---------
4 files changed, 45 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/edc30364/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
index 10d8fa1..aa4bacf 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
@@ -205,7 +205,6 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* {@link Node#getBlankNodeId()} for the purpose of its
* {@link BlankNode#uniqueReference()}.
*
- * @see #fromJena(Node, UUID)
* @see #fromJena(RDFTermFactory, Node)
*
* @param node
@@ -229,7 +228,6 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* for multiple conversion sessions.
*
* @see #fromJena(Node)
- * @see #fromJena(Node, UUID)
*
* @param factory {@link RDFTermFactory} to use for creating {@link RDFTerm}.
* @param node
@@ -273,7 +271,6 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* {@link Node#getBlankNodeId()} for the purpose of its
* {@link BlankNode#uniqueReference()}.
*
- * @see #fromJena(org.apache.jena.graph.Triple, UUID)
* @see #fromJena(RDFTermFactory, org.apache.jena.graph.Triple)
*
* @param triple
@@ -300,7 +297,6 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* {@link Node#getBlankNodeId()} for the purpose of its
* {@link BlankNode#uniqueReference()}.
*
- * @see #fromJena(org.apache.jena.graph.Triple, UUID)
* @see #fromJena(RDFTermFactory, org.apache.jena.graph.Triple)
*
* @param triple
@@ -357,7 +353,6 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* for multiple conversion sessions.
*
* @see #fromJena(org.apache.jena.graph.Triple)
- * @see #fromJena(org.apache.jena.graph.Triple, UUID)
*
* @param factory {@link RDFTermFactory} to use for creating the {@link Triple} and its
* {@link RDFTerm}s.
@@ -494,7 +489,6 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* instance for multiple conversion sessions.
*
* @see #fromJena(org.apache.jena.sparql.core.Quad)
- * @see #fromJena(org.apache.jena.sparql.core.Quad, UUID)
* @see #fromJenaGeneralized(org.apache.jena.sparql.core.Quad)
*
* @param factory
@@ -637,7 +631,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* @param term Commons RDF {@link RDFTerm} to convert
* @return Converted Jena {@link Node}
*/
- public static Node toJena(RDFTerm term) {
+ public Node toJena(RDFTerm term) {
if (term == null) {
return null;
}
@@ -674,7 +668,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* @param triple Commons RDF {@link Triple} to convert
* @return Converted Jena {@link org.apache.jena.graph.Triple}
*/
- public static org.apache.jena.graph.Triple toJena(Triple triple) {
+ public org.apache.jena.graph.Triple toJena(Triple triple) {
if (triple instanceof JenaTriple)
return ((JenaTriple) triple).asJenaTriple();
return org.apache.jena.graph.Triple.create(
@@ -694,7 +688,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* @param quad Commons RDF {@link Quad} to convert
* @return Converted Jena {@link org.apache.jena.sparql.core.Quad}
*/
- public static org.apache.jena.sparql.core.Quad toJena(Quad quad) {
+ public org.apache.jena.sparql.core.Quad toJena(Quad quad) {
if (quad instanceof JenaQuad) {
return ((JenaQuad) quad).asJenaQuad();
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/edc30364/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java
index 4cd6bd1..76b018c 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java
@@ -44,25 +44,27 @@ public class JenaDatasetImpl implements JenaDataset {
private DatasetGraph graph;
private UUID salt;
+ private JenaRDFTermFactory factory;
- /* package */ JenaDatasetImpl(DatasetGraph graph, UUID salt) {
+ JenaDatasetImpl(DatasetGraph graph, UUID salt) {
this.graph = graph;
this.salt = salt;
+ this.factory = new JenaRDFTermFactory(salt);
}
@Override
public void add(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
graph.add(
org.apache.jena.sparql.core.Quad.create(
- JenaRDFTermFactory.toJena(graphName),
- JenaRDFTermFactory.toJena(subject),
- JenaRDFTermFactory.toJena(predicate),
- JenaRDFTermFactory.toJena(object)));
+ factory.toJena(graphName),
+ factory.toJena(subject),
+ factory.toJena(predicate),
+ factory.toJena(object)));
}
@Override
public void add(Quad quad) {
- graph.add(JenaRDFTermFactory.toJena(quad));
+ graph.add(factory.toJena(quad));
}
@Override
@@ -92,25 +94,25 @@ public class JenaDatasetImpl implements JenaDataset {
private Node toJenaPattern(Optional<? extends RDFTerm> graphName) {
// In theory we could have done:
- // JenaRDFTermFactory.toJena(graphName.orElse(JenaFactory::createAnyVariable))
+ // factory.toJena(graphName.orElse(JenaFactory::createAnyVariable))
// but because of generics casting rules that doesn't work :(
if (graphName == null) {
return ANY;
}
// null: default graph
- return JenaRDFTermFactory.toJena(graphName.orElse(null));
+ return factory.toJena(graphName.orElse(null));
}
private Node toJenaPattern(RDFTerm term) {
if (term == null)
return ANY;
- return JenaRDFTermFactory.toJena(term);
+ return factory.toJena(term);
}
@Override
public boolean contains(Quad quad) {
- return graph.contains(JenaRDFTermFactory.toJena(quad));
+ return graph.contains(factory.toJena(quad));
}
@Override
@@ -124,7 +126,7 @@ public class JenaDatasetImpl implements JenaDataset {
@Override
public void remove(Quad quad) {
- graph.delete(JenaRDFTermFactory.toJena(quad));
+ graph.delete(factory.toJena(quad));
}
@Override
@@ -167,7 +169,7 @@ public class JenaDatasetImpl implements JenaDataset {
@Override
public Optional<Graph> getGraph(BlankNodeOrIRI graphName) {
- GraphView gv = GraphView.createNamedGraph(graph, JenaRDFTermFactory.toJena(graphName));
+ GraphView gv = GraphView.createNamedGraph(graph, factory.toJena(graphName));
return Optional.of(new JenaGraphImpl(gv, salt));
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/edc30364/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedQuad.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedQuad.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedQuad.java
index 5456ec9..cad2355 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedQuad.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedQuad.java
@@ -84,22 +84,25 @@ public class JenaGeneralizedQuad<S extends RDFTerm, P extends RDFTerm, O extends
@Override
public org.apache.jena.sparql.core.Quad asJenaQuad() {
+ JenaRDFTermFactory factory = new JenaRDFTermFactory();
if (quad == null) {
quad = org.apache.jena.sparql.core.Quad.create(
- JenaRDFTermFactory.toJena(graphName.orElse(null)),
- JenaRDFTermFactory.toJena(subject),
- JenaRDFTermFactory.toJena(predicate),
- JenaRDFTermFactory.toJena(object));
+ factory.toJena(graphName.orElse(null)),
+ factory.toJena(subject),
+ factory.toJena(predicate),
+ factory.toJena(object));
}
return quad;
}
@Override
public org.apache.jena.graph.Triple asJenaTriple() {
+ JenaRDFTermFactory factory = new JenaRDFTermFactory();
if (triple == null) {
- triple = org.apache.jena.graph.Triple.create(JenaRDFTermFactory.toJena(subject),
- JenaRDFTermFactory.toJena(predicate),
- JenaRDFTermFactory.toJena(object));
+ triple = org.apache.jena.graph.Triple.create(
+ factory.toJena(subject),
+ factory.toJena(predicate),
+ factory.toJena(object));
}
return triple;
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/edc30364/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGraphImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGraphImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGraphImpl.java
index 49a09ae..89162e0 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGraphImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGraphImpl.java
@@ -37,32 +37,35 @@ import org.apache.jena.riot.RDFDataMgr;
public class JenaGraphImpl implements JenaGraph {
- private org.apache.jena.graph.Graph graph;
- private UUID salt;
+ private final org.apache.jena.graph.Graph graph;
+ private final UUID salt;
+ private final transient JenaRDFTermFactory factory;
private Model model;
JenaGraphImpl(org.apache.jena.graph.Graph graph, UUID salt) {
this.graph = graph;
this.salt = salt;
+ this.factory = new JenaRDFTermFactory(salt);
}
JenaGraphImpl(Model model, UUID salt) {
this.model = model;
this.graph = model.getGraph();
this.salt = salt;
+ this.factory = new JenaRDFTermFactory(salt);
}
@Override
public void add(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
graph.add(org.apache.jena.graph.Triple.create(
- JenaRDFTermFactory.toJena(subject),
- JenaRDFTermFactory.toJena(predicate),
- JenaRDFTermFactory.toJena(object)));
+ factory.toJena(subject),
+ factory.toJena(predicate),
+ factory.toJena(object)));
}
@Override
public void add(Triple triple) {
- graph.add(JenaRDFTermFactory.toJena(triple));
+ graph.add(factory.toJena(triple));
}
@Override
@@ -83,27 +86,27 @@ public class JenaGraphImpl implements JenaGraph {
@Override
public boolean contains(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
return graph.contains(
- JenaRDFTermFactory.toJena(subject),
- JenaRDFTermFactory.toJena(predicate),
- JenaRDFTermFactory.toJena(object));
+ factory.toJena(subject),
+ factory.toJena(predicate),
+ factory.toJena(object));
}
@Override
public boolean contains(Triple triple) {
- return graph.contains(JenaRDFTermFactory.toJena(triple));
+ return graph.contains(factory.toJena(triple));
}
@Override
public void remove(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
graph.delete(org.apache.jena.graph.Triple.create(
- JenaRDFTermFactory.toJena(subject),
- JenaRDFTermFactory.toJena(predicate),
- JenaRDFTermFactory.toJena(object)));
+ factory.toJena(subject),
+ factory.toJena(predicate),
+ factory.toJena(object)));
}
@Override
public void remove(Triple triple) {
- graph.delete(JenaRDFTermFactory.toJena(triple));
+ graph.delete(factory.toJena(triple));
}
@Override
@@ -127,7 +130,7 @@ public class JenaGraphImpl implements JenaGraph {
private Node toJenaAny(RDFTerm term) {
if (term == null)
return Node.ANY;
- return JenaRDFTermFactory.toJena(term);
+ return factory.toJena(term);
}
@Override
[4/8] incubator-commonsrdf git commit: JenaRDFTermFactory - less
static methods
Posted by st...@apache.org.
JenaRDFTermFactory - less static methods
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/35e13664
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/35e13664
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/35e13664
Branch: refs/heads/jena
Commit: 35e1366419486b5b929f990670cf813995453673
Parents: afbcf11
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Oct 7 09:50:50 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Oct 7 09:50:50 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/jena/JenaRDFTermFactory.java | 169 +------------------
.../rdf/jena/experimental/JenaRDFParser.java | 15 +-
.../commons/rdf/jena/impl/JenaDatasetImpl.java | 3 +-
3 files changed, 15 insertions(+), 172 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/35e13664/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
index 5b9bebc..10d8fa1 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
@@ -221,33 +221,6 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
}
/**
- * Adapt an existing Jena Node to CommonsRDF {@link RDFTerm}.
- * <p>
- * If {@link Node#isLiteral()}, then the returned value is a {@link Literal}.
- * If {@link Node#isURI()}, the returned value is a IRI. If {@link Node#isBlank()},
- * the returned value is a {@link BlankNode}, which will use the provided
- * {@link UUID} salt in combination with {@link Node#getBlankNodeId()} for
- * the purpose of its {@link BlankNode#uniqueReference()}.
- *
- * @see #fromJena(Node)
- * @see #fromJena(RDFTermFactory, Node)
- *
- * @param node
- * The Jena Node to adapt. It's {@link Node#isConcrete()} must be
- * <code>true</code>.
- * @param salt
- * UUID salt for the purpose of
- * {@link BlankNode#uniqueReference()}
- * @return Adapted {@link JenaRDFTerm}
- * @throws ConversionException If the {@link Node} can't be represented as an {@link RDFTerm}, e.g.
- * if the node is not {@link Node#isConcrete()},
- * is {@link Node#isVariable()}, or is {@link Node.ANY}
- */
- public static JenaRDFTerm fromJena(Node node, UUID salt) {
- return JenaFactory.fromJena(node, salt);
- }
-
- /**
* Convert from Jena {@link Node} to any Commons RDF implementation.
* <p>
* Note that if the {@link Node#isBlank()}, then the factory's
@@ -314,37 +287,6 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
return JenaFactory.fromJena(triple, getSalt());
}
-
- /**
- * Adapt a generalized Jena Triple to a CommonsRDF {@link TripleLike}.
- * <p>
- * The generalized triple supports any {@link RDFTerm} as its {@link TripleLike#getSubject()}
- * {@link TripleLike#getPredicate()} or {@link TripleLike#getObject()}.
- * <p>
- * If the Jena triple contains any {@link Node#isBlank()}, then any corresponding
- * {@link BlankNode} will use the provided {@link UUID} salt
- * in combination with
- * {@link Node#getBlankNodeId()} for the purpose of its
- * {@link BlankNode#uniqueReference()}.
- *
- * @see #fromJena(org.apache.jena.graph.Triple, UUID)
- * @see #fromJena(RDFTermFactory, org.apache.jena.graph.Triple)
- *
- * @param triple
- * Jena triple
- * @param salt
- * UUID salt for the purpose of
- * {@link BlankNode#uniqueReference()}
- * @return Adapted {@link TripleLike}. Note that the generalized triple does
- * <strong>not</strong> implement {@link Triple#equals(Object)} or
- * {@link Triple#hashCode()}.
- * @throws ConversionException
- * if any of the triple's nodes are not concrete
- */
- public JenaTripleLike<RDFTerm, RDFTerm, RDFTerm> fromJenaGeneralized(org.apache.jena.graph.Triple triple, UUID salt) throws ConversionException {
- return JenaFactory.fromJenaGeneralized(triple, salt);
- }
-
/**
* Adapt a generalized Jena {@link org.apache.jena.graph.Triple} to a CommonsRDF {@link TripleLike}.
* <p>
@@ -405,28 +347,6 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
return JenaFactory.fromJenaGeneralized(quad, getSalt());
}
-
- /**
- * Adapt an existing Jena Triple to CommonsRDF {@link Triple}.
- * <p>
- * If the triple contains any {@link Node#isBlank()}, then any corresponding
- * {@link BlankNode} will use the provided a {@link UUID} salt in
- * combination with {@link Node#getBlankNodeId()} for the purpose of its
- * {@link BlankNode#uniqueReference()}.
- *
- * @param triple
- * Jena triple
- * @param salt
- * A {@link UUID} salt for adapting any {@link BlankNode}s
- * @return Adapted triple
- * @throws ConversionException
- * if any of the triple's nodes are not concrete or the triple
- * is a generalized triple
- */
- public static JenaTriple fromJena(org.apache.jena.graph.Triple triple, UUID salt) throws ConversionException {
- return JenaFactory.fromJena(triple, salt);
- }
-
/**
* Convert from Jena {@link org.apache.jena.graph.Triple} to a Commons RDF
* {@link Triple}.
@@ -482,24 +402,6 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
public JenaQuad fromJena(org.apache.jena.sparql.core.Quad quad) {
return JenaFactory.fromJena(quad, getSalt());
}
-
- /**
- * Adapt an existing Jena {@link org.apache.jena.sparql.core.Quad} to CommonsRDF {@link Quad}.
- * <p>
- * If the quad contains any {@link Node#isBlank()}, then any corresponding
- * {@link BlankNode} will use the provided {@link UUID} salt
- * in combination with {@link Node#getBlankNodeId()}
- * for the purpose of its {@link BlankNode#uniqueReference()}.
- *
- * @param quad
- * Jena quad
- * @param salt
- * A {@link UUID} salt for adapting any {@link BlankNode}s
- * @return Adapted quad
- */
- public static JenaQuad fromJena(org.apache.jena.sparql.core.Quad quad, UUID salt) {
- return JenaFactory.fromJena(quad, salt);
- }
/**
* Adapt an existing Jena {@link org.apache.jena.graph.Graph} to CommonsRDF
@@ -543,29 +445,6 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
}
/**
- * Adapt an existing Jena {@link org.apache.jena.graph.Graph} to CommonsRDF
- * {@link Graph}.
- * <p>
- * This does not take a copy, changes to the CommonsRDF Graph are reflected
- * in the jena graph, which is accessible from
- * {@link JenaGraph#asJenaGraph()}.
- * <p>
- * If the graph contains any {@link Node#isBlank()}, then any corresponding
- * {@link BlankNode} will use the provided {@link UUID} salt in combination
- * with {@link Node#getBlankNodeId()} for the purpose of its
- * {@link BlankNode#uniqueReference()}.
- *
- * @param graph
- * Jena {@link org.apache.jena.graph.Graph} to adapt
- * @param salt
- * A {@link UUID} salt for adapting any {@link BlankNode}s
- * @return Adapted {@link JenaGraph}
- */
- public static JenaGraph fromJena(org.apache.jena.graph.Graph graph, UUID salt) {
- return JenaFactory.fromJena(graph, salt);
- }
-
- /**
* Adapt an existing Jena {@link DatasetGraph} to CommonsRDF {@link Dataset}.
* <p>
* This does not
@@ -604,46 +483,6 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
public JenaDataset fromJena(org.apache.jena.query.Dataset datasetGraph) {
return JenaFactory.fromJena(datasetGraph.asDatasetGraph(), getSalt());
}
-
- /**
- * Adapt an existing Jena {@link DatasetGraph} to CommonsRDF
- * {@link Dataset}.
- * <p>
- * This does not take a copy, changes to the CommonsRDF Dataset are
- * reflected in the jena dataset graph, which is accessible from
- * {@link JenaDataset#asJenaDatasetGraph()}.
- * <p>
- * If the dataset contains any {@link Node#isBlank()}, then any
- * corresponding {@link BlankNode} will use the provided {@link UUID} salt
- * in combination with {@link Node#getBlankNodeId()} for the purpose of its
- * {@link BlankNode#uniqueReference()}.
- *
- * @param datasetGraph
- * Jena {@link DatasetGraph} to adapt
- * @param salt
- * A {@link UUID} salt for adapting any {@link BlankNode}s
- * @return Adapted {@link JenaDataset}
- */
- public static JenaDataset fromJena(DatasetGraph datasetGraph, UUID salt) {
- return JenaFactory.fromJena(datasetGraph, salt);
- }
-
- /**
- * Convert from Jena to any Commons RDF implementation. This is a copy, even
- * if the factory is a JenaRDFTermFactory. Use
- * {@link #fromJena(org.apache.jena.graph.Graph)} for a wrapper.
- *
- * @param factory {@link RDFTermFactory} to use for creating {@link RDFTerm}s
- * @param graph Jena {@link org.apache.jena.graph.Graph} to copy
- * @return Converted Graph
- */
- public static Graph fromJena(RDFTermFactory factory, org.apache.jena.graph.Graph graph) {
- Graph g = factory.createGraph();
- graph.find(Node.ANY, Node.ANY, Node.ANY).forEachRemaining(t -> {
- g.add(fromJena(factory, t));
- });
- return g;
- }
/**
* Convert from Jena {@link org.apache.jena.sparql.core.Quad} to a Commons
@@ -686,7 +525,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* @param lang {@link Lang} to convert
* @return Matched {@link RDFSyntax}, otherwise {@link Optional#empty()}
*/
- public static Optional<RDFSyntax> langToRdfSyntax(Lang lang) {
+ public Optional<RDFSyntax> langToRdfSyntax(Lang lang) {
return RDFSyntax.byMediaType(lang.getContentType().getContentType());
}
@@ -696,7 +535,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* @param rdfSyntax {@link RDFSyntax} to convert
* @return Matched {@link Lang}, otherwise {@link Optional#empty()}
*/
- public static Optional<Lang> rdfSyntaxToLang(RDFSyntax rdfSyntax) {
+ public Optional<Lang> rdfSyntaxToLang(RDFSyntax rdfSyntax) {
return Optional.ofNullable(RDFLanguages.contentTypeToLang(rdfSyntax.mediaType));
}
@@ -782,7 +621,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* @param graph Commons RDF {@link Graph} to convert
* @return Converted Jena {@link org.apache.jena.graph.Graph}
*/
- public static org.apache.jena.graph.Graph toJena(Graph graph) {
+ public org.apache.jena.graph.Graph toJena(Graph graph) {
if (graph instanceof JenaGraph)
return ((JenaGraph) graph).asJenaGraph();
org.apache.jena.graph.Graph g = GraphFactory.createGraphMem();
@@ -867,7 +706,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
}
// Some simple validations - full IRI parsing is not cheap.
- private static void validateIRI(String iri) {
+ private void validateIRI(String iri) {
if (iri.contains(" "))
throw new IllegalArgumentException();
if (iri.contains("<"))
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/35e13664/jena/src/main/java/org/apache/commons/rdf/jena/experimental/JenaRDFParser.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/experimental/JenaRDFParser.java b/jena/src/main/java/org/apache/commons/rdf/jena/experimental/JenaRDFParser.java
index 873f1cf..0ad12b9 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/experimental/JenaRDFParser.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/experimental/JenaRDFParser.java
@@ -71,18 +71,21 @@ public class JenaRDFParser extends AbstractRDFParser<JenaRDFParser> implements R
@Override
protected void parseSynchronusly() throws IOException {
StreamRDF dest;
+ JenaRDFTermFactory jenaFactory = getJenaFactory();
if (getTargetGraph().isPresent() && getTargetGraph().get() instanceof JenaGraph) {
Graph jenaGraph = ((JenaGraph) getTargetGraph().get()).asJenaGraph();
dest = StreamRDFLib.graph(jenaGraph);
- } else if (generalizedConsumerQuad != null) {
- dest = getJenaFactory().streamJenaToGeneralizedQuad(generalizedConsumerQuad);
- } else if (generalizedConsumerTriple != null) {
- dest = getJenaFactory().streamJenaToGeneralizedTriple(generalizedConsumerTriple);
} else {
- dest = JenaRDFTermFactory.streamJenaToCommonsRDF(getRdfTermFactory().get(), getTarget());
+ if (generalizedConsumerQuad != null) {
+ dest = jenaFactory.streamJenaToGeneralizedQuad(generalizedConsumerQuad);
+ } else if (generalizedConsumerTriple != null) {
+ dest = jenaFactory.streamJenaToGeneralizedTriple(generalizedConsumerTriple);
+ } else {
+ dest = JenaRDFTermFactory.streamJenaToCommonsRDF(getRdfTermFactory().get(), getTarget());
+ }
}
- Lang lang = getContentTypeSyntax().flatMap(JenaRDFTermFactory::rdfSyntaxToLang).orElse(null);
+ Lang lang = getContentTypeSyntax().flatMap(jenaFactory::rdfSyntaxToLang).orElse(null);
String baseStr = getBase().map(IRI::getIRIString).orElse(null);
if (getSourceIri().isPresent()) {
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/35e13664/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java
index 45d753d..4cd6bd1 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java
@@ -180,8 +180,9 @@ public class JenaDatasetImpl implements JenaDataset {
@Override
public Iterable<Quad> iterate() {
+ final JenaRDFTermFactory factory = new JenaRDFTermFactory(salt);
return Iter.asStream(graph.find(), false)
- .map(q -> (Quad) JenaRDFTermFactory.fromJena(q, salt))
+ .map(q -> (Quad) factory.fromJena(q))
::iterator;
}
[6/8] incubator-commonsrdf git commit: avoid javadoc warnings
Posted by st...@apache.org.
avoid javadoc warnings
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/a072cb96
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/a072cb96
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/a072cb96
Branch: refs/heads/jena
Commit: a072cb96943bc2d72d905502baa5c1212a10c18e
Parents: edc3036
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Oct 7 14:25:24 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Oct 7 14:25:24 2016 +0100
----------------------------------------------------------------------
.../apache/commons/rdf/jena/JenaDataset.java | 6 ++-
.../commons/rdf/jena/JenaRDFTermFactory.java | 41 ++++++++------------
2 files changed, 20 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/a072cb96/jena/src/main/java/org/apache/commons/rdf/jena/JenaDataset.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaDataset.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaDataset.java
index f312c2a..ad8c0ca 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaDataset.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaDataset.java
@@ -36,8 +36,10 @@ public interface JenaDataset extends org.apache.commons.rdf.api.Dataset {
public DatasetGraph asJenaDatasetGraph();
/**
- * Return a union graph view of this dataset. <p The <em>union graph</em>
- * contains triples in any graph (including the default graph).
+ * Return a union graph view of this dataset.
+ * <p>
+ * The <em>union graph</em> contains triples in any graph (including the
+ * default graph).
* <p>
* Changes in the union graph are reflected in the Commons RDF dataset and
* vice versa. Triples added to the graph are added to the default graph.
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/a072cb96/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
index aa4bacf..8b53c76 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
@@ -76,10 +76,13 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
/**
* Create a JenaRDFTermFactory.
* <p>
- * This constructor will use the specified {@link UUID} as a salt
- * for the purposes of {@link BlankNode} identity.
+ * This constructor will use the specified {@link UUID} as a salt for
+ * the purposes of {@link BlankNode} identity, and should only be used in
+ * cases where predictable and consistent
+ * {@link BlankNode#uniqueReference()} are important.
*
- * @param salt {@link UUID} to use as salt
+ * @param salt
+ * {@link UUID} to use as salt for {@link BlankNode} equality
*/
public JenaRDFTermFactory(UUID salt) {
this.salt = salt;
@@ -143,13 +146,10 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* <p>
* The <em>generalized triple</em> supports any {@link RDFTerm} as its
* {@link TripleLike#getSubject()} {@link TripleLike#getPredicate()} or
- * {@link TripleLike#getObject()}, including {@link JenaAny} or
- * {@link JenaVariable}.
+ * {@link TripleLike#getObject()}.
*
* @see #createTriple(BlankNodeOrIRI, IRI, RDFTerm)
* @see #createGeneralizedQuad(RDFTerm, RDFTerm, RDFTerm, RDFTerm)
- * @see #createAnyVariable()
- * @see #createVariable(String)
*
* @param subject
* The subject of the statement
@@ -171,13 +171,10 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* <p>
* The <em>generalized quad</em> supports any {@link RDFTerm} as its
* {@link QuadLike#getSubject()} {@link QuadLike#getPredicate()},
- * {@link QuadLike#getObject()} or {@link QuadLike#getObject()} including
- * {@link JenaAny} or {@link JenaVariable}.
+ * {@link QuadLike#getObject()} or {@link QuadLike#getObject()}.
*
* @see #createQuad(BlankNodeOrIRI, BlankNodeOrIRI, IRI, RDFTerm)
* @see #createGeneralizedTriple(RDFTerm, RDFTerm, RDFTerm)
- * @see #createAnyVariable()
- * @see #createVariable(String)
*
* @param subject
* The subject of the statement
@@ -212,8 +209,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* <code>true</code>.
* @return Adapted {@link JenaRDFTerm}
* @throws ConversionException If the {@link Node} can't be represented as an {@link RDFTerm}, e.g.
- * if the node is not {@link Node#isConcrete()},
- * is {@link Node#isVariable()}, or is {@link Node.ANY}
+ * if the node is not concrete or represents a variable in Jena.
*/
public JenaRDFTerm fromJena(Node node) throws ConversionException {
return JenaFactory.fromJena(node, getSalt());
@@ -233,9 +229,9 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* @param node
* The Jena Node to adapt. It's {@link Node#isConcrete()} must be
* <code>true</code>.
- * @return Adapted {@link RDFTerm}
- * @throws ConversionException
- * if the node is not concrete.
+ * @return Adapted {@link RDFTerm}
+ * @throws ConversionException If the {@link Node} can't be represented as an {@link RDFTerm}, e.g.
+ * if the node is not concrete or represents a variable in Jena.
*/
public static RDFTerm fromJena(RDFTermFactory factory, Node node) {
if (node == null) {
@@ -288,8 +284,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* Adapt a generalized Jena {@link org.apache.jena.graph.Triple} to a CommonsRDF {@link TripleLike}.
* <p>
* The generalized triple supports any {@link RDFTerm} as its {@link TripleLike#getSubject()}
- * {@link TripleLike#getPredicate()} or {@link TripleLike#getObject()}, including
- * the extensions {@link JenaAny} and {@link JenaVariable}.
+ * {@link TripleLike#getPredicate()} or {@link TripleLike#getObject()}.
* <p>
* If the Jena triple contains any {@link Node#isBlank()}, then any corresponding
* {@link BlankNode} will use a {@link UUID} salt from this
@@ -318,9 +313,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* {@link QuadLike#getGraphName()},
* {@link QuadLike#getSubject()}
* {@link QuadLike#getPredicate()} or
- * {@link QuadLike#getObject()}, including
- * the extensions
- * {@link JenaAny} and {@link JenaVariable}.
+ * {@link QuadLike#getObject()}.
* <p>
* If the Jena quad contains any {@link Node#isBlank()}, then any corresponding
* {@link BlankNode} will use a {@link UUID} salt from this
@@ -721,10 +714,8 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* {@link BlankNode#uniqueReference()} for details.
* <p>
* This salt can be used with the constructor
- * {@link JenaRDFTermFactory#JenaRDFTermFactory(UUID)} or
- * methods like {@link #fromJena(Node, UUID)} and
- * {@link #fromJena(org.apache.jena.graph.Triple, UUID)}
- * to ensure consistent {@link BlankNode}s.
+ * {@link JenaRDFTermFactory#JenaRDFTermFactory(UUID)}
+ * if consistent or reproducible {@link BlankNode}s are desirable.
*
* @return The {@link UUID} used as salt
*/
[3/8] incubator-commonsrdf git commit: about ConversionException
Posted by st...@apache.org.
about ConversionException
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/afbcf114
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/afbcf114
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/afbcf114
Branch: refs/heads/jena
Commit: afbcf114dbe296d7e20eec26c437a7e0a7dddbf9
Parents: fd87f5a
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Oct 7 09:42:26 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Oct 7 09:42:26 2016 +0100
----------------------------------------------------------------------
.../org/apache/commons/rdf/jena/JenaRDFTermFactory.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/afbcf114/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
index 6793335..5b9bebc 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
@@ -212,8 +212,9 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* The Jena Node to adapt. It's {@link Node#isConcrete()} must be
* <code>true</code>.
* @return Adapted {@link JenaRDFTerm}
- * @throws ConversionException
- * if the node is not concrete.
+ * @throws ConversionException If the {@link Node} can't be represented as an {@link RDFTerm}, e.g.
+ * if the node is not {@link Node#isConcrete()},
+ * is {@link Node#isVariable()}, or is {@link Node.ANY}
*/
public JenaRDFTerm fromJena(Node node) throws ConversionException {
return JenaFactory.fromJena(node, getSalt());
@@ -238,8 +239,9 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* UUID salt for the purpose of
* {@link BlankNode#uniqueReference()}
* @return Adapted {@link JenaRDFTerm}
- * @throws ConversionException
- * if the node is not concrete.
+ * @throws ConversionException If the {@link Node} can't be represented as an {@link RDFTerm}, e.g.
+ * if the node is not {@link Node#isConcrete()},
+ * is {@link Node#isVariable()}, or is {@link Node.ANY}
*/
public static JenaRDFTerm fromJena(Node node, UUID salt) {
return JenaFactory.fromJena(node, salt);
[7/8] incubator-commonsrdf git commit: reduce visibility of
JenaFactory and impl
Posted by st...@apache.org.
reduce visibility of JenaFactory and impl
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/b3baff42
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/b3baff42
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/b3baff42
Branch: refs/heads/jena
Commit: b3baff420a91eb24e081e423d7a21f2e9344f7cc
Parents: a072cb9
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Oct 7 14:33:33 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Oct 7 14:33:33 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/jena/JenaRDFTermFactory.java | 44 ++++++++--------
.../rdf/jena/impl/JenaBlankNodeImpl.java | 4 +-
.../commons/rdf/jena/impl/JenaDatasetImpl.java | 4 +-
.../commons/rdf/jena/impl/JenaFactory.java | 53 ++++++++++----------
.../rdf/jena/impl/JenaGeneralizedQuad.java | 24 +++++----
.../commons/rdf/jena/impl/JenaGraphImpl.java | 2 +-
.../commons/rdf/jena/impl/JenaIRIImpl.java | 6 +--
.../commons/rdf/jena/impl/JenaLiteralImpl.java | 8 +--
.../commons/rdf/jena/impl/JenaQuadImpl.java | 2 +-
.../commons/rdf/jena/impl/JenaTripleImpl.java | 2 +-
.../commons/rdf/jena/TestBlankNodeJena.java | 6 ++-
11 files changed, 82 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/b3baff42/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
index 8b53c76..25db850 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
@@ -61,6 +61,8 @@ import org.apache.jena.sparql.graph.GraphFactory;
*/
public final class JenaRDFTermFactory implements RDFTermFactory {
+ private static JenaFactory jenaFactory = new JenaFactory(){};
+
private final UUID salt;
/**
@@ -90,55 +92,55 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
@Override
public JenaBlankNode createBlankNode() {
- return JenaFactory.createBlankNode(getSalt());
+ return jenaFactory.createBlankNode(getSalt());
}
@Override
public JenaBlankNode createBlankNode(String name) {
- return JenaFactory.createBlankNode(name, getSalt());
+ return jenaFactory.createBlankNode(name, getSalt());
}
@Override
public JenaDataset createDataset() {
- return JenaFactory.createDataset(getSalt());
+ return jenaFactory.createDataset(getSalt());
}
@Override
public JenaGraph createGraph() {
- return JenaFactory.createGraph(getSalt());
+ return jenaFactory.createGraph(getSalt());
}
@Override
public JenaIRI createIRI(String iri) {
validateIRI(iri);
- return JenaFactory.createIRI(iri);
+ return jenaFactory.createIRI(iri);
}
@Override
public JenaLiteral createLiteral(String lexicalForm) {
- return JenaFactory.createLiteral(lexicalForm);
+ return jenaFactory.createLiteral(lexicalForm);
}
@Override
public JenaLiteral createLiteral(String lexicalForm, IRI dataType) {
- return JenaFactory.createLiteralDT(lexicalForm, dataType.getIRIString());
+ return jenaFactory.createLiteralDT(lexicalForm, dataType.getIRIString());
}
@Override
public JenaLiteral createLiteral(String lexicalForm, String languageTag) {
validateLang(languageTag);
- return JenaFactory.createLiteralLang(lexicalForm, languageTag);
+ return jenaFactory.createLiteralLang(lexicalForm, languageTag);
}
@Override
public JenaTriple createTriple(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
- return JenaFactory.createTriple(subject, predicate, object);
+ return jenaFactory.createTriple(subject, predicate, object);
}
@Override
public JenaQuad createQuad(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object)
throws IllegalArgumentException, UnsupportedOperationException {
- return JenaFactory.createQuad(subject, predicate, object, graphName);
+ return jenaFactory.createQuad(subject, predicate, object, graphName);
}
/**
@@ -163,7 +165,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
*/
public JenaTripleLike<RDFTerm, RDFTerm, RDFTerm> createGeneralizedTriple(
RDFTerm subject, RDFTerm predicate, RDFTerm object) {
- return JenaFactory.createGeneralizedTriple(subject, predicate, object);
+ return jenaFactory.createGeneralizedTriple(subject, predicate, object);
}
/**
@@ -190,7 +192,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
*/
public JenaQuadLike<RDFTerm, RDFTerm, RDFTerm, RDFTerm> createGeneralizedQuad(
RDFTerm subject, RDFTerm predicate, RDFTerm object, RDFTerm graphName) {
- return JenaFactory.createGeneralizedQuad(subject, predicate, object, graphName);
+ return jenaFactory.createGeneralizedQuad(subject, predicate, object, graphName);
}
/**
* Adapt an existing Jena Node to CommonsRDF {@link RDFTerm}.
@@ -212,7 +214,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* if the node is not concrete or represents a variable in Jena.
*/
public JenaRDFTerm fromJena(Node node) throws ConversionException {
- return JenaFactory.fromJena(node, getSalt());
+ return jenaFactory.fromJena(node, getSalt());
}
/**
@@ -277,7 +279,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* is a generalized triple
*/
public JenaTriple fromJena(org.apache.jena.graph.Triple triple) throws ConversionException {
- return JenaFactory.fromJena(triple, getSalt());
+ return jenaFactory.fromJena(triple, getSalt());
}
/**
@@ -303,7 +305,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* if any of the triple's nodes are not concrete
*/
public JenaTripleLike<RDFTerm, RDFTerm, RDFTerm> fromJenaGeneralized(org.apache.jena.graph.Triple triple) throws ConversionException {
- return JenaFactory.fromJenaGeneralized(triple, getSalt());
+ return jenaFactory.fromJenaGeneralized(triple, getSalt());
}
/**
@@ -333,7 +335,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* if any of the quad nodes are not concrete
*/
public JenaQuadLike<RDFTerm, RDFTerm, RDFTerm, RDFTerm> fromJenaGeneralized(org.apache.jena.sparql.core.Quad quad) throws ConversionException {
- return JenaFactory.fromJenaGeneralized(quad, getSalt());
+ return jenaFactory.fromJenaGeneralized(quad, getSalt());
}
/**
@@ -388,7 +390,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* @return Adapted quad
*/
public JenaQuad fromJena(org.apache.jena.sparql.core.Quad quad) {
- return JenaFactory.fromJena(quad, getSalt());
+ return jenaFactory.fromJena(quad, getSalt());
}
/**
@@ -410,7 +412,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* @return Adapted {@link JenaGraph}
*/
public JenaGraph fromJena(org.apache.jena.graph.Graph graph) {
- return JenaFactory.fromJena(graph, getSalt());
+ return jenaFactory.fromJena(graph, getSalt());
}
/**
@@ -429,7 +431,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* @return Adapted {@link JenaGraph}
*/
public JenaGraph fromJena(org.apache.jena.rdf.model.Model model) {
- return JenaFactory.fromJena(model, getSalt());
+ return jenaFactory.fromJena(model, getSalt());
}
/**
@@ -449,7 +451,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* @return Adapted {@link JenaDataset}
*/
public JenaDataset fromJena(DatasetGraph datasetGraph) {
- return JenaFactory.fromJena(datasetGraph, getSalt());
+ return jenaFactory.fromJena(datasetGraph, getSalt());
}
/**
@@ -469,7 +471,7 @@ public final class JenaRDFTermFactory implements RDFTermFactory {
* @return Adapted {@link JenaDataset}
*/
public JenaDataset fromJena(org.apache.jena.query.Dataset datasetGraph) {
- return JenaFactory.fromJena(datasetGraph.asDatasetGraph(), getSalt());
+ return jenaFactory.fromJena(datasetGraph.asDatasetGraph(), getSalt());
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/b3baff42/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaBlankNodeImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaBlankNodeImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaBlankNodeImpl.java
index 0cbd764..a4cc3af 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaBlankNodeImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaBlankNodeImpl.java
@@ -24,11 +24,11 @@ import org.apache.commons.rdf.api.BlankNode;
import org.apache.commons.rdf.jena.JenaBlankNode;
import org.apache.jena.graph.Node;
-public class JenaBlankNodeImpl extends AbstractJenaRDFTerm implements JenaBlankNode {
+class JenaBlankNodeImpl extends AbstractJenaRDFTerm implements JenaBlankNode {
private UUID salt;
- /* package */ JenaBlankNodeImpl(Node node, UUID salt) {
+ JenaBlankNodeImpl(Node node, UUID salt) {
super(node);
if (! node.isBlank()) {
throw new IllegalArgumentException("Node is not a blank node: " + node);
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/b3baff42/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java
index 76b018c..fec063f 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java
@@ -40,7 +40,7 @@ import org.apache.jena.riot.RDFDataMgr;
import org.apache.jena.sparql.core.DatasetGraph;
import org.apache.jena.sparql.core.GraphView;
-public class JenaDatasetImpl implements JenaDataset {
+class JenaDatasetImpl implements JenaDataset {
private DatasetGraph graph;
private UUID salt;
@@ -94,7 +94,7 @@ public class JenaDatasetImpl implements JenaDataset {
private Node toJenaPattern(Optional<? extends RDFTerm> graphName) {
// In theory we could have done:
- // factory.toJena(graphName.orElse(JenaFactory::createAnyVariable))
+ // factory.toJena(graphName.orElse(jenaFactory::createAnyVariable))
// but because of generics casting rules that doesn't work :(
if (graphName == null) {
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/b3baff42/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaFactory.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaFactory.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaFactory.java
index b349df8..30b96ed 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaFactory.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaFactory.java
@@ -47,66 +47,67 @@ import org.apache.jena.sparql.graph.GraphFactory;
/**
* Construct Jena implementations of Commons RDF.
* <p>
- * This class is primarily an internal helper class, users should instead use
- * {@link JenaRDFTermFactory}.
+ * This class is deliberately an abstract class, as it is an internal helper
+ * which <strong>may change</strong> in any minor version update; users should
+ * instead use {@link JenaRDFTermFactory}.
* <p>
- * For the purpose of blank node identity, some of
- * these methods require a {@link UUID} to use as a salt.
- * See {@link BlankNode#uniqueReference()} for details.
+ * For the purpose of blank node identity, some of these methods require a
+ * {@link UUID} to use as a salt. See {@link BlankNode#uniqueReference()} for
+ * details.
*
*/
-public class JenaFactory {
+public abstract class JenaFactory {
- public static JenaBlankNode createBlankNode(String id, UUID salt) {
+ public JenaBlankNode createBlankNode(String id, UUID salt) {
return new JenaBlankNodeImpl(NodeFactory.createBlankNode(id), salt);
}
- public static JenaBlankNode createBlankNode(UUID salt) {
+ public JenaBlankNode createBlankNode(UUID salt) {
return new JenaBlankNodeImpl(NodeFactory.createBlankNode(), salt);
}
- public static JenaDataset createDataset(UUID salt) {
+ public JenaDataset createDataset(UUID salt) {
DatasetGraph dg = DatasetGraphFactory.createGeneral();
// Or which createMethod() -- a bit confusing with lots of choice..
return new JenaDatasetImpl(dg, salt);
}
- public static JenaGraph createGraph(UUID salt) {
+ public JenaGraph createGraph(UUID salt) {
return new JenaGraphImpl(GraphFactory.createDefaultGraph(), salt);
}
- public static JenaIRI createIRI(String iriStr) {
+ public JenaIRI createIRI(String iriStr) {
return new JenaIRIImpl(iriStr);
}
- public static JenaLiteral createLiteral(String lexStr) {
+ public JenaLiteral createLiteral(String lexStr) {
return new JenaLiteralImpl(NodeFactory.createLiteral(lexStr));
}
- public static JenaLiteral createLiteralDT(String lexStr, String datatypeIRI) {
+ public JenaLiteral createLiteralDT(String lexStr, String datatypeIRI) {
return new JenaLiteralImpl(NodeFactory.createLiteral(lexStr, NodeFactory.getType(datatypeIRI)));
}
- public static JenaLiteral createLiteralLang(String lexStr, String langTag) {
+ public JenaLiteral createLiteralLang(String lexStr, String langTag) {
return new JenaLiteralImpl(NodeFactory.createLiteral(lexStr, langTag));
}
- public static JenaTriple createTriple(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+ public JenaTriple createTriple(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
return new JenaTripleImpl(subject, predicate, object);
}
- public static JenaQuad createQuad(BlankNodeOrIRI subject, IRI predicate, RDFTerm object, BlankNodeOrIRI graphName) {
+ public JenaQuad createQuad(BlankNodeOrIRI subject, IRI predicate, RDFTerm object, BlankNodeOrIRI graphName) {
return new JenaQuadImpl(subject, predicate, object, Optional.ofNullable(graphName));
}
- public static JenaTripleLike<RDFTerm,RDFTerm,RDFTerm> createGeneralizedTriple(RDFTerm subject, RDFTerm predicate, RDFTerm object) {
+ public JenaTripleLike<RDFTerm,RDFTerm,RDFTerm> createGeneralizedTriple(RDFTerm subject, RDFTerm predicate, RDFTerm object) {
return new JenaGeneralizedQuad<RDFTerm,RDFTerm,RDFTerm,RDFTerm>(subject, predicate, object);
}
- public static JenaQuadLike<RDFTerm,RDFTerm,RDFTerm,RDFTerm> createGeneralizedQuad(RDFTerm subject, RDFTerm predicate, RDFTerm object, RDFTerm graphName) {
+ public JenaQuadLike<RDFTerm,RDFTerm,RDFTerm,RDFTerm> createGeneralizedQuad(RDFTerm subject, RDFTerm predicate, RDFTerm object, RDFTerm graphName) {
return new JenaGeneralizedQuad<RDFTerm,RDFTerm,RDFTerm,RDFTerm>(subject, predicate, object, Optional.ofNullable(graphName));
}
- public static JenaRDFTerm fromJena(Node node, UUID salt) throws ConversionException {
+ public JenaRDFTerm fromJena(Node node, UUID salt) throws ConversionException {
if (! node.isConcrete()) {
throw new ConversionException("Node is not a concrete RDF Term: " + node);
}
@@ -130,31 +131,31 @@ public class JenaFactory {
throw new ConversionException("Unrecognized node type: " + node);
}
- public static JenaGraph fromJena(org.apache.jena.graph.Graph graph, UUID salt) {
+ public JenaGraph fromJena(org.apache.jena.graph.Graph graph, UUID salt) {
return new JenaGraphImpl(graph, salt);
}
- public static JenaGraph fromJena(Model model, UUID salt) {
+ public JenaGraph fromJena(Model model, UUID salt) {
return new JenaGraphImpl(model, salt);
}
- public static JenaDataset fromJena(DatasetGraph datasetGraph, UUID salt) {
+ public JenaDataset fromJena(DatasetGraph datasetGraph, UUID salt) {
return new JenaDatasetImpl(datasetGraph, salt);
}
- public static JenaTriple fromJena(org.apache.jena.graph.Triple triple, UUID salt) {
+ public JenaTriple fromJena(org.apache.jena.graph.Triple triple, UUID salt) {
return new JenaTripleImpl(triple, salt);
}
- public static JenaTripleLike<RDFTerm, RDFTerm, RDFTerm> fromJenaGeneralized(org.apache.jena.graph.Triple triple, UUID salt) {
+ public JenaTripleLike<RDFTerm, RDFTerm, RDFTerm> fromJenaGeneralized(org.apache.jena.graph.Triple triple, UUID salt) {
return new JenaGeneralizedQuad<RDFTerm,RDFTerm,RDFTerm,RDFTerm>(triple, salt);
}
- public static JenaQuadLike<RDFTerm,RDFTerm,RDFTerm,RDFTerm> fromJenaGeneralized(org.apache.jena.sparql.core.Quad quad, UUID salt) {
+ public JenaQuadLike<RDFTerm,RDFTerm,RDFTerm,RDFTerm> fromJenaGeneralized(org.apache.jena.sparql.core.Quad quad, UUID salt) {
return new JenaGeneralizedQuad<RDFTerm,RDFTerm,RDFTerm,RDFTerm>(quad, salt);
}
- public static JenaQuad fromJena(org.apache.jena.sparql.core.Quad quad, UUID salt) {
+ public JenaQuad fromJena(org.apache.jena.sparql.core.Quad quad, UUID salt) {
return new JenaQuadImpl(quad, salt);
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/b3baff42/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedQuad.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedQuad.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedQuad.java
index cad2355..607defd 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedQuad.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGeneralizedQuad.java
@@ -40,12 +40,14 @@ import org.apache.jena.sparql.core.Quad;
*
* @see JenaTripleImpl
* @see JenaQuadImpl
- * @see JenaFactory#createGeneralizedTriple(RDFTerm, RDFTerm, RDFTerm)
- * @see JenaFactory#createGeneralizedQuad(RDFTerm, RDFTerm, RDFTerm, RDFTerm)
+ * @see jenaFactory#createGeneralizedTriple(RDFTerm, RDFTerm, RDFTerm)
+ * @see jenaFactory#createGeneralizedQuad(RDFTerm, RDFTerm, RDFTerm, RDFTerm)
*
*/
-public class JenaGeneralizedQuad<S extends RDFTerm, P extends RDFTerm, O extends RDFTerm, G extends RDFTerm> implements JenaQuadLike<S,P,O,G> {
+class JenaGeneralizedQuad<S extends RDFTerm, P extends RDFTerm, O extends RDFTerm, G extends RDFTerm> implements JenaQuadLike<S,P,O,G> {
+ private static JenaFactory jenaFactory = new JenaFactory(){};
+
final Optional<G> graphName;
final S subject;
final P predicate;
@@ -53,7 +55,7 @@ public class JenaGeneralizedQuad<S extends RDFTerm, P extends RDFTerm, O extends
org.apache.jena.sparql.core.Quad quad = null;
org.apache.jena.graph.Triple triple = null;
- JenaGeneralizedQuad(S subject, P predicate, O object, Optional<G> graphName) {
+ JenaGeneralizedQuad(S subject, P predicate, O object, Optional<G> graphName) {
this.subject = Objects.requireNonNull(subject);
this.predicate = Objects.requireNonNull(predicate);
this.object = Objects.requireNonNull(object);
@@ -67,18 +69,18 @@ public class JenaGeneralizedQuad<S extends RDFTerm, P extends RDFTerm, O extends
@SuppressWarnings("unchecked")
JenaGeneralizedQuad(org.apache.jena.sparql.core.Quad quad, UUID salt) {
this.quad = Objects.requireNonNull(quad);
- this.subject = (S) JenaFactory.fromJena(quad.getSubject(), salt);
- this.predicate = (P) JenaFactory.fromJena(quad.getPredicate(), salt);
- this.object = (O)JenaFactory.fromJena(quad.getObject(), salt);
- this.graphName = Optional.of((G) JenaFactory.fromJena(quad.getGraph(), salt));
+ this.subject = (S) jenaFactory.fromJena(quad.getSubject(), salt);
+ this.predicate = (P) jenaFactory.fromJena(quad.getPredicate(), salt);
+ this.object = (O)jenaFactory.fromJena(quad.getObject(), salt);
+ this.graphName = Optional.of((G) jenaFactory.fromJena(quad.getGraph(), salt));
}
@SuppressWarnings("unchecked")
JenaGeneralizedQuad(org.apache.jena.graph.Triple triple, UUID salt) {
this.triple = Objects.requireNonNull(triple);
- this.subject = (S) JenaFactory.fromJena(triple.getSubject(), salt);
- this.predicate = (P) JenaFactory.fromJena(triple.getPredicate(), salt);
- this.object = (O)JenaFactory.fromJena(triple.getObject(), salt);
+ this.subject = (S) jenaFactory.fromJena(triple.getSubject(), salt);
+ this.predicate = (P) jenaFactory.fromJena(triple.getPredicate(), salt);
+ this.object = (O)jenaFactory.fromJena(triple.getObject(), salt);
this.graphName = Optional.empty();
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/b3baff42/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGraphImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGraphImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGraphImpl.java
index 89162e0..09cc2ab 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGraphImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaGraphImpl.java
@@ -35,7 +35,7 @@ import org.apache.jena.rdf.model.ModelFactory;
import org.apache.jena.riot.Lang;
import org.apache.jena.riot.RDFDataMgr;
-public class JenaGraphImpl implements JenaGraph {
+class JenaGraphImpl implements JenaGraph {
private final org.apache.jena.graph.Graph graph;
private final UUID salt;
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/b3baff42/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaIRIImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaIRIImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaIRIImpl.java
index 2aa170f..7fbf284 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaIRIImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaIRIImpl.java
@@ -23,9 +23,9 @@ import org.apache.commons.rdf.jena.JenaIRI;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
-public class JenaIRIImpl extends AbstractJenaRDFTerm implements JenaIRI {
+class JenaIRIImpl extends AbstractJenaRDFTerm implements JenaIRI {
- /* package */ JenaIRIImpl(Node node) {
+ JenaIRIImpl(Node node) {
super(node);
if (! node.isURI()) {
throw new IllegalArgumentException("Node is not a blank node: " + node);
@@ -33,7 +33,7 @@ public class JenaIRIImpl extends AbstractJenaRDFTerm implements JenaIRI {
}
- /* package */ JenaIRIImpl(String iriStr) {
+ JenaIRIImpl(String iriStr) {
super(NodeFactory.createURI(iriStr));
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/b3baff42/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaLiteralImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaLiteralImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaLiteralImpl.java
index 5bbc166..173af4c 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaLiteralImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaLiteralImpl.java
@@ -26,9 +26,11 @@ import org.apache.commons.rdf.api.Literal;
import org.apache.commons.rdf.jena.JenaLiteral;
import org.apache.jena.graph.Node;
-public class JenaLiteralImpl extends AbstractJenaRDFTerm implements JenaLiteral {
+class JenaLiteralImpl extends AbstractJenaRDFTerm implements JenaLiteral {
- /* package */ JenaLiteralImpl(Node node) {
+ private static JenaFactory jenaFactory = new JenaFactory(){};
+
+ JenaLiteralImpl(Node node) {
super(node);
if (! node.isLiteral()) {
throw new IllegalArgumentException("Node is not a literal: " + node);
@@ -50,7 +52,7 @@ public class JenaLiteralImpl extends AbstractJenaRDFTerm implements JenaLiteral
@Override
public IRI getDatatype() {
- return JenaFactory.createIRI(asJenaNode().getLiteralDatatype().getURI());
+ return jenaFactory.createIRI(asJenaNode().getLiteralDatatype().getURI());
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/b3baff42/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaQuadImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaQuadImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaQuadImpl.java
index 0f3e3e3..9d65374 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaQuadImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaQuadImpl.java
@@ -29,7 +29,7 @@ import org.apache.commons.rdf.api.RDFTerm;
import org.apache.commons.rdf.jena.ConversionException;
import org.apache.commons.rdf.jena.JenaQuad;
-public class JenaQuadImpl extends JenaGeneralizedQuad<BlankNodeOrIRI,IRI,RDFTerm,BlankNodeOrIRI>
+class JenaQuadImpl extends JenaGeneralizedQuad<BlankNodeOrIRI,IRI,RDFTerm,BlankNodeOrIRI>
implements JenaQuad {
JenaQuadImpl(BlankNodeOrIRI subject, IRI predicate, RDFTerm object, Optional<BlankNodeOrIRI> graphName) {
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/b3baff42/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaTripleImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaTripleImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaTripleImpl.java
index 4e497f2..502b575 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaTripleImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaTripleImpl.java
@@ -28,7 +28,7 @@ import org.apache.commons.rdf.api.Triple;
import org.apache.commons.rdf.jena.ConversionException;
import org.apache.commons.rdf.jena.JenaTriple;
-public class JenaTripleImpl extends JenaGeneralizedQuad<BlankNodeOrIRI, IRI, RDFTerm, RDFTerm>
+class JenaTripleImpl extends JenaGeneralizedQuad<BlankNodeOrIRI, IRI, RDFTerm, RDFTerm>
implements JenaTriple {
JenaTripleImpl(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/b3baff42/jena/src/test/java/org/apache/commons/rdf/jena/TestBlankNodeJena.java
----------------------------------------------------------------------
diff --git a/jena/src/test/java/org/apache/commons/rdf/jena/TestBlankNodeJena.java b/jena/src/test/java/org/apache/commons/rdf/jena/TestBlankNodeJena.java
index f37922f..0ac6326 100644
--- a/jena/src/test/java/org/apache/commons/rdf/jena/TestBlankNodeJena.java
+++ b/jena/src/test/java/org/apache/commons/rdf/jena/TestBlankNodeJena.java
@@ -26,6 +26,8 @@ import org.apache.commons.rdf.jena.impl.JenaFactory;
public class TestBlankNodeJena extends AbstractBlankNodeTest {
+ JenaFactory jenaFactory = new JenaFactory(){};
+
/**
* Fixed salt for the purpose of this test.
*/
@@ -33,12 +35,12 @@ public class TestBlankNodeJena extends AbstractBlankNodeTest {
@Override
protected BlankNode getBlankNode() {
- return JenaFactory.createBlankNode(SALT) ;
+ return jenaFactory.createBlankNode(SALT) ;
}
@Override
protected BlankNode getBlankNode(String identifier) {
- return JenaFactory.createBlankNode(identifier, SALT) ;
+ return jenaFactory.createBlankNode(identifier, SALT) ;
}
}
[2/8] incubator-commonsrdf git commit: removed fromJenaGeneralized
Posted by st...@apache.org.
removed fromJenaGeneralized
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/fd87f5ae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/fd87f5ae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/fd87f5ae
Branch: refs/heads/jena
Commit: fd87f5ae93fdec379feadda162a9ed41c92885de
Parents: 3fdb27f
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Oct 7 09:39:23 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Oct 7 09:39:23 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/commons/rdf/jena/impl/JenaFactory.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/fd87f5ae/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaFactory.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaFactory.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaFactory.java
index 2f75436..b349df8 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaFactory.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaFactory.java
@@ -110,10 +110,6 @@ public class JenaFactory {
if (! node.isConcrete()) {
throw new ConversionException("Node is not a concrete RDF Term: " + node);
}
- return fromJenaGeneralized(node, salt);
- }
-
- public static JenaRDFTerm fromJenaGeneralized(Node node, UUID salt) {
if (node.isURI()) {
return new JenaIRIImpl(node);
}