Skip to content

Issue #56 Conversion to RDF4J #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 3, 2016
Merged

Issue #56 Conversion to RDF4J #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
242bd33
issue#56 : Initial conversion to RDF4J
ansell Aug 3, 2016
9a287a6
Fix some Eclipse warnings about generics and deprecation
ansell Aug 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions caching-sail/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<artifactId>common</artifactId>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-sail-memory</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-sail-memory</artifactId>
</dependency>

<!-- test dependencies -->
Expand All @@ -36,13 +36,13 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-rio-trig</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-trig</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-repository-sail</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-repository-sail</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
20 changes: 10 additions & 10 deletions caching-sail/src/main/java/net/fortytwo/sesametools/caching/CachingSail.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@

package net.fortytwo.sesametools.caching;

import org.openrdf.model.IRI;
import org.openrdf.model.Resource;
import org.openrdf.model.Value;
import org.openrdf.model.ValueFactory;
import org.openrdf.sail.Sail;
import org.openrdf.sail.SailConnection;
import org.openrdf.sail.SailException;
import org.openrdf.sail.StackableSail;
import org.openrdf.sail.helpers.AbstractSail;
import org.openrdf.sail.memory.MemoryStore;
import org.eclipse.rdf4j.model.IRI;
import org.eclipse.rdf4j.model.Resource;
import org.eclipse.rdf4j.model.Value;
import org.eclipse.rdf4j.model.ValueFactory;
import org.eclipse.rdf4j.sail.Sail;
import org.eclipse.rdf4j.sail.SailConnection;
import org.eclipse.rdf4j.sail.SailException;
import org.eclipse.rdf4j.sail.StackableSail;
import org.eclipse.rdf4j.sail.helpers.AbstractSail;
import org.eclipse.rdf4j.sail.memory.MemoryStore;

import java.io.File;
import java.util.HashSet;
Expand Down
38 changes: 19 additions & 19 deletions caching-sail/src/main/java/net/fortytwo/sesametools/caching/CachingSailConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
package net.fortytwo.sesametools.caching;

import info.aduna.iteration.CloseableIteration;
import org.eclipse.rdf4j.common.iteration.CloseableIteration;
import net.fortytwo.sesametools.SailConnectionTripleSource;
import org.openrdf.model.IRI;
import org.openrdf.model.Namespace;
import org.openrdf.model.Resource;
import org.openrdf.model.Statement;
import org.openrdf.model.Value;
import org.openrdf.model.ValueFactory;
import org.openrdf.query.BindingSet;
import org.openrdf.query.Dataset;
import org.openrdf.query.QueryEvaluationException;
import org.openrdf.query.algebra.TupleExpr;
import org.openrdf.query.algebra.evaluation.EvaluationStrategy;
import org.openrdf.query.algebra.evaluation.TripleSource;
import org.openrdf.query.algebra.evaluation.impl.SimpleEvaluationStrategy;
import org.openrdf.sail.Sail;
import org.openrdf.sail.SailConnection;
import org.openrdf.sail.SailException;
import org.openrdf.sail.helpers.AbstractSail;
import org.openrdf.sail.helpers.AbstractSailConnection;
import org.eclipse.rdf4j.model.IRI;
import org.eclipse.rdf4j.model.Namespace;
import org.eclipse.rdf4j.model.Resource;
import org.eclipse.rdf4j.model.Statement;
import org.eclipse.rdf4j.model.Value;
import org.eclipse.rdf4j.model.ValueFactory;
import org.eclipse.rdf4j.query.BindingSet;
import org.eclipse.rdf4j.query.Dataset;
import org.eclipse.rdf4j.query.QueryEvaluationException;
import org.eclipse.rdf4j.query.algebra.TupleExpr;
import org.eclipse.rdf4j.query.algebra.evaluation.EvaluationStrategy;
import org.eclipse.rdf4j.query.algebra.evaluation.TripleSource;
import org.eclipse.rdf4j.query.algebra.evaluation.impl.SimpleEvaluationStrategy;
import org.eclipse.rdf4j.sail.Sail;
import org.eclipse.rdf4j.sail.SailConnection;
import org.eclipse.rdf4j.sail.SailException;
import org.eclipse.rdf4j.sail.helpers.AbstractSail;
import org.eclipse.rdf4j.sail.helpers.AbstractSailConnection;

import java.util.Set;

Expand Down
22 changes: 11 additions & 11 deletions caching-sail/src/test/java/net/fortytwo/sesametools/caching/CachingSailTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
package net.fortytwo.sesametools.caching;

import info.aduna.iteration.CloseableIteration;
import org.eclipse.rdf4j.common.iteration.CloseableIteration;
import net.fortytwo.sesametools.replay.Handler;
import net.fortytwo.sesametools.replay.RecorderSail;
import net.fortytwo.sesametools.replay.SailConnectionCall;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.openrdf.model.Statement;
import org.openrdf.model.IRI;
import org.openrdf.repository.Repository;
import org.openrdf.repository.RepositoryConnection;
import org.openrdf.repository.sail.SailRepository;
import org.openrdf.rio.RDFFormat;
import org.openrdf.sail.Sail;
import org.openrdf.sail.SailConnection;
import org.openrdf.sail.SailException;
import org.openrdf.sail.memory.MemoryStore;
import org.eclipse.rdf4j.model.Statement;
import org.eclipse.rdf4j.model.IRI;
import org.eclipse.rdf4j.repository.Repository;
import org.eclipse.rdf4j.repository.RepositoryConnection;
import org.eclipse.rdf4j.repository.sail.SailRepository;
import org.eclipse.rdf4j.rio.RDFFormat;
import org.eclipse.rdf4j.sail.Sail;
import org.eclipse.rdf4j.sail.SailConnection;
import org.eclipse.rdf4j.sail.SailException;
import org.eclipse.rdf4j.sail.memory.MemoryStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
24 changes: 12 additions & 12 deletions common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,29 +17,29 @@

<dependencies>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-model</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-model</artifactId>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-sail-api</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-sail-api</artifactId>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-util</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-util</artifactId>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-queryalgebra-evaluation</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-queryalgebra-evaluation</artifactId>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-sail-memory</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-sail-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-repository-sail</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-repository-sail</artifactId>
<scope>test</scope>
</dependency>

Expand Down
10 changes: 5 additions & 5 deletions common/src/main/java/net/fortytwo/sesametools/CloseableGraphQueryResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package net.fortytwo.sesametools;

import org.openrdf.model.Statement;
import org.openrdf.query.GraphQueryResult;
import org.openrdf.query.QueryEvaluationException;
import org.openrdf.repository.RepositoryConnection;
import org.openrdf.repository.RepositoryException;
import org.eclipse.rdf4j.model.Statement;
import org.eclipse.rdf4j.query.GraphQueryResult;
import org.eclipse.rdf4j.query.QueryEvaluationException;
import org.eclipse.rdf4j.repository.RepositoryConnection;
import org.eclipse.rdf4j.repository.RepositoryException;

import java.util.Map;

Expand Down
10 changes: 5 additions & 5 deletions common/src/main/java/net/fortytwo/sesametools/CloseableTupleQueryResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package net.fortytwo.sesametools;

import org.openrdf.query.BindingSet;
import org.openrdf.query.QueryEvaluationException;
import org.openrdf.query.TupleQueryResult;
import org.openrdf.repository.RepositoryConnection;
import org.openrdf.repository.RepositoryException;
import org.eclipse.rdf4j.query.BindingSet;
import org.eclipse.rdf4j.query.QueryEvaluationException;
import org.eclipse.rdf4j.query.TupleQueryResult;
import org.eclipse.rdf4j.repository.RepositoryConnection;
import org.eclipse.rdf4j.repository.RepositoryException;

import java.util.List;

Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/net/fortytwo/sesametools/CompoundCloseableIteration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

package net.fortytwo.sesametools;

import info.aduna.iteration.CloseableIteration;
import org.eclipse.rdf4j.common.iteration.CloseableIteration;

import java.util.Collection;
import java.util.Iterator;
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/net/fortytwo/sesametools/ContextInsensitiveStatementComparator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package net.fortytwo.sesametools;

import org.openrdf.model.Statement;
import org.eclipse.rdf4j.model.Statement;

import java.util.Comparator;

Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/net/fortytwo/sesametools/EmptyCloseableIteration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

package net.fortytwo.sesametools;

import info.aduna.iteration.CloseableIteration;
import org.eclipse.rdf4j.common.iteration.CloseableIteration;

/**
* @author Joshua Shinavier (http://fortytwo.net)
Expand Down
12 changes: 6 additions & 6 deletions common/src/main/java/net/fortytwo/sesametools/MultiStackableSail.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@

package net.fortytwo.sesametools;

import org.openrdf.IsolationLevel;
import org.openrdf.model.ValueFactory;
import org.openrdf.sail.Sail;
import org.openrdf.sail.SailConnection;
import org.openrdf.sail.SailException;
import org.openrdf.sail.StackableSail;
import org.eclipse.rdf4j.IsolationLevel;
import org.eclipse.rdf4j.model.ValueFactory;
import org.eclipse.rdf4j.sail.Sail;
import org.eclipse.rdf4j.sail.SailConnection;
import org.eclipse.rdf4j.sail.SailException;
import org.eclipse.rdf4j.sail.StackableSail;

import java.io.File;
import java.util.List;
Expand Down
10 changes: 5 additions & 5 deletions common/src/main/java/net/fortytwo/sesametools/PatternIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package net.fortytwo.sesametools;

import org.openrdf.model.IRI;
import org.openrdf.model.Resource;
import org.openrdf.model.Statement;
import org.openrdf.model.Value;
import org.openrdf.util.iterators.FilterIterator;
import org.eclipse.rdf4j.model.IRI;
import org.eclipse.rdf4j.model.Resource;
import org.eclipse.rdf4j.model.Statement;
import org.eclipse.rdf4j.model.Value;
import org.eclipse.rdf4j.util.iterators.FilterIterator;

import java.util.Iterator;

Expand Down
16 changes: 8 additions & 8 deletions common/src/main/java/net/fortytwo/sesametools/RandomValueFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package net.fortytwo.sesametools;

import org.openrdf.model.BNode;
import org.openrdf.model.Literal;
import org.openrdf.model.Resource;
import org.openrdf.model.Statement;
import org.openrdf.model.IRI;
import org.openrdf.model.Value;
import org.openrdf.model.ValueFactory;
import org.openrdf.model.vocabulary.XMLSchema;
import org.eclipse.rdf4j.model.BNode;
import org.eclipse.rdf4j.model.Literal;
import org.eclipse.rdf4j.model.Resource;
import org.eclipse.rdf4j.model.Statement;
import org.eclipse.rdf4j.model.IRI;
import org.eclipse.rdf4j.model.Value;
import org.eclipse.rdf4j.model.ValueFactory;
import org.eclipse.rdf4j.model.vocabulary.XMLSchema;

import java.util.Random;
import java.util.UUID;
Expand Down
18 changes: 9 additions & 9 deletions common/src/main/java/net/fortytwo/sesametools/RdfListUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package net.fortytwo.sesametools;

import org.openrdf.OpenRDFUtil;
import org.openrdf.model.IRI;
import org.openrdf.model.Model;
import org.openrdf.model.Resource;
import org.openrdf.model.Statement;
import org.openrdf.model.Value;
import org.openrdf.model.ValueFactory;
import org.openrdf.model.impl.SimpleValueFactory;
import org.openrdf.model.vocabulary.RDF;
import org.eclipse.rdf4j.OpenRDFUtil;
import org.eclipse.rdf4j.model.IRI;
import org.eclipse.rdf4j.model.Model;
import org.eclipse.rdf4j.model.Resource;
import org.eclipse.rdf4j.model.Statement;
import org.eclipse.rdf4j.model.Value;
import org.eclipse.rdf4j.model.ValueFactory;
import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
import org.eclipse.rdf4j.model.vocabulary.RDF;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
32 changes: 16 additions & 16 deletions common/src/main/java/net/fortytwo/sesametools/RepositoryGraph.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package net.fortytwo.sesametools;

import info.aduna.iteration.CloseableIteration;
import org.openrdf.model.IRI;
import org.openrdf.model.Model;
import org.openrdf.model.Namespace;
import org.openrdf.model.Resource;
import org.openrdf.model.Statement;
import org.openrdf.model.Value;
import org.openrdf.model.ValueFactory;
import org.openrdf.repository.RepositoryConnection;
import org.openrdf.repository.RepositoryException;
import org.openrdf.repository.RepositoryResult;
import org.eclipse.rdf4j.common.iteration.CloseableIteration;
import org.eclipse.rdf4j.model.IRI;
import org.eclipse.rdf4j.model.Model;
import org.eclipse.rdf4j.model.Namespace;
import org.eclipse.rdf4j.model.Resource;
import org.eclipse.rdf4j.model.Statement;
import org.eclipse.rdf4j.model.Value;
import org.eclipse.rdf4j.model.ValueFactory;
import org.eclipse.rdf4j.repository.RepositoryConnection;
import org.eclipse.rdf4j.repository.RepositoryException;
import org.eclipse.rdf4j.repository.RepositoryResult;

import java.util.Collection;
import java.util.HashSet;
Expand Down Expand Up @@ -187,7 +187,7 @@ public boolean contains(Object o) {
if (o instanceof Statement) {
Statement st = (Statement) o;
try {
try (RepositoryResult result = rc.getStatements(
try (RepositoryResult<Statement> result = rc.getStatements(
st.getSubject(), st.getPredicate(), st.getObject(), INFER, st.getContext())) {
return result.hasNext();
}
Expand All @@ -210,7 +210,7 @@ public Object[] toArray() {
Object[] a = new Object[size];
if (size > 0) try {
int i = 0;
try (RepositoryResult result = rc.getStatements(null, null, null, INFER)) {
try (RepositoryResult<Statement> result = rc.getStatements(null, null, null, INFER)) {
while (result.hasNext()) {
a[i] = result.next();
i++;
Expand Down Expand Up @@ -300,9 +300,9 @@ public void clear() {
}

private class RepositoryResultIterator implements Iterator<Statement> {
private final RepositoryResult result;
private final RepositoryResult<Statement> result;

private RepositoryResultIterator(RepositoryResult result) {
private RepositoryResultIterator(RepositoryResult<Statement> result) {
this.result = result;
}

Expand All @@ -316,7 +316,7 @@ public boolean hasNext() {

public Statement next() {
try {
return (Statement) result.next();
return result.next();
} catch (RepositoryException e) {
throw new RepositoryGraphRuntimeException(e);
}
Expand Down
6 changes: 3 additions & 3 deletions common/src/main/java/net/fortytwo/sesametools/ReusableRDFHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

package net.fortytwo.sesametools;

import org.openrdf.model.Statement;
import org.openrdf.rio.RDFHandler;
import org.openrdf.rio.RDFHandlerException;
import org.eclipse.rdf4j.model.Statement;
import org.eclipse.rdf4j.rio.RDFHandler;
import org.eclipse.rdf4j.rio.RDFHandlerException;

/**
* An <code>RDFHandler</code> which wraps another handler and ignores calls
Expand Down
Loading