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/06/03 13:28:39 UTC
[5/7] incubator-commonsrdf git commit: Added RDF4JQuad
Added RDF4JQuad
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/b90f9fc1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/b90f9fc1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/b90f9fc1
Branch: refs/heads/rdf4j
Commit: b90f9fc122197b81b1af2235af03db780811a559
Parents: 16ff446
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Jun 3 10:26:57 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Jun 3 10:26:57 2016 +0100
----------------------------------------------------------------------
.../org/apache/commons/rdf/rdf4j/RDF4JQuad.java | 35 +++++++++
.../commons/rdf/rdf4j/RDF4JTermFactory.java | 24 ++++++-
.../apache/commons/rdf/rdf4j/impl/QuadImpl.java | 76 ++++++++++++++++++++
3 files changed, 134 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/b90f9fc1/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JQuad.java
----------------------------------------------------------------------
diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JQuad.java b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JQuad.java
new file mode 100644
index 0000000..acbcedc
--- /dev/null
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JQuad.java
@@ -0,0 +1,35 @@
+/**
+ * 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.rdf4j;
+
+import org.apache.commons.rdf.api.Quad;
+import org.eclipse.rdf4j.model.Statement;
+
+/**
+ * Marker interface for RDF4J implementations of Quad.
+ *
+ */
+public interface RDF4JQuad extends Quad {
+
+ /**
+ * Return the corresponding RDF4J {@link Statement}.
+ *
+ * @return The corresponding RDF4J Statement.
+ */
+ public Statement asStatement();
+}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/b90f9fc1/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JTermFactory.java
----------------------------------------------------------------------
diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JTermFactory.java b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JTermFactory.java
index e258497..24d2d86 100644
--- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JTermFactory.java
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JTermFactory.java
@@ -25,6 +25,7 @@ import java.util.UUID;
import org.apache.commons.rdf.api.BlankNode;
import org.apache.commons.rdf.api.BlankNodeOrIRI;
import org.apache.commons.rdf.api.Graph;
+import org.apache.commons.rdf.api.Quad;
import org.apache.commons.rdf.api.RDFTerm;
import org.apache.commons.rdf.api.RDFTermFactory;
import org.apache.commons.rdf.api.Triple;
@@ -32,6 +33,7 @@ import org.apache.commons.rdf.rdf4j.impl.BlankNodeImpl;
import org.apache.commons.rdf.rdf4j.impl.GraphImpl;
import org.apache.commons.rdf.rdf4j.impl.IRIImpl;
import org.apache.commons.rdf.rdf4j.impl.LiteralImpl;
+import org.apache.commons.rdf.rdf4j.impl.QuadImpl;
import org.apache.commons.rdf.rdf4j.impl.TripleImpl;
import org.eclipse.rdf4j.model.BNode;
import org.eclipse.rdf4j.model.Model;
@@ -155,13 +157,22 @@ public class RDF4JTermFactory implements RDFTermFactory {
(org.eclipse.rdf4j.model.IRI) asValue(triple.getPredicate()),
asValue(triple.getObject()));
}
+
+ public Statement asStatement(Quad quad) {
+ return valueFactory.createStatement(
+ (org.eclipse.rdf4j.model.Resource) asValue(quad.getSubject()),
+ (org.eclipse.rdf4j.model.IRI) asValue(quad.getPredicate()),
+ asValue(quad.getObject()),
+ (org.eclipse.rdf4j.model.Resource) asValue(quad.getGraphName().orElse(null))
+ );
+ }
/**
* Adapt a RDF4J {@link Statement} as a Commons RDF
* {@link Triple}.
*
* @param statement
- * @return
+ * @return A {@link RDF4JTriple} that is equivalent to the statement
*/
public RDF4JTriple asTriple(final Statement statement) {
return new TripleImpl(statement, salt);
@@ -169,6 +180,17 @@ public class RDF4JTermFactory implements RDFTermFactory {
/**
* Adapt a RDF4J {@link Statement} as a Commons RDF
+ * {@link Quad}.
+ *
+ * @param statement
+ * @return A {@link RDF4JQuad} that is equivalent to the statement
+ */
+ public RDF4JQuad asQuad(final Statement statement) {
+ return new QuadImpl(statement, salt);
+ }
+
+ /**
+ * Adapt a RDF4J {@link Statement} as a Commons RDF
* {@link Triple}.
*
* @param statement
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/b90f9fc1/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/QuadImpl.java
----------------------------------------------------------------------
diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/QuadImpl.java b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/QuadImpl.java
new file mode 100644
index 0000000..7111fd2
--- /dev/null
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/QuadImpl.java
@@ -0,0 +1,76 @@
+package org.apache.commons.rdf.rdf4j.impl;
+
+import java.util.Objects;
+import java.util.Optional;
+import java.util.UUID;
+
+import org.apache.commons.rdf.api.BlankNodeOrIRI;
+import org.apache.commons.rdf.api.Quad;
+import org.apache.commons.rdf.api.RDFTerm;
+import org.apache.commons.rdf.api.Triple;
+import org.apache.commons.rdf.rdf4j.RDF4JQuad;
+import org.apache.commons.rdf.rdf4j.RDF4JTermFactory;
+import org.eclipse.rdf4j.model.Statement;
+
+public final class QuadImpl implements Quad, RDF4JQuad {
+ private final Statement statement;
+ private UUID salt;
+ private transient int hashCode = 0;
+
+ public QuadImpl(Statement statement, UUID salt) {
+ this.statement = statement;
+ this.salt = salt;
+ }
+
+ public Statement asStatement() {
+ return statement;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj instanceof Triple) {
+ Triple triple = (Triple) obj;
+ return getSubject().equals(triple.getSubject()) &&
+ getPredicate().equals(triple.getPredicate()) &&
+ getObject().equals(triple.getObject());
+ }
+ return false;
+ }
+
+ @Override
+ public RDFTerm getObject() {
+ return RDF4JTermFactory.asRDFTerm(statement.getObject(), salt);
+ }
+
+ @Override
+ public org.apache.commons.rdf.api.IRI getPredicate() {
+ return (org.apache.commons.rdf.api.IRI) RDF4JTermFactory.asRDFTerm(statement.getPredicate(), null);
+ }
+
+ @Override
+ public BlankNodeOrIRI getSubject() {
+ return (BlankNodeOrIRI) RDF4JTermFactory.asRDFTerm(statement.getSubject(), salt);
+ }
+
+ @Override
+ public int hashCode() {
+ if (hashCode != 0) {
+ return hashCode;
+ }
+ return hashCode = Objects.hash(getSubject(), getPredicate(), getObject(), getGraphName());
+ }
+
+ @Override
+ public String toString() {
+ return statement.toString();
+ }
+
+ @Override
+ public Optional<BlankNodeOrIRI> getGraphName() {
+ if (statement.getContext() == null) {
+ return Optional.empty();
+ }
+ BlankNodeOrIRI g = (BlankNodeOrIRI) RDF4JTermFactory.asRDFTerm(statement.getContext(), salt);
+ return Optional.of(g);
+ }
+}
\ No newline at end of file