diff --git a/bigdata-blueprints/pom.xml b/bigdata-blueprints/pom.xml index b2f9411e34..f852a45fbd 100644 --- a/bigdata-blueprints/pom.xml +++ b/bigdata-blueprints/pom.xml @@ -30,12 +30,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../pom.xml com.blazegraph bigdata-blueprints - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT Blazegraph Blueprints API Blazegraph support for Tinkerpop 2.5 jar @@ -257,9 +257,10 @@ ga('send', 'pageview'); ${servlet.version} - org.openrdf.sesame - sesame-runtime - ${sesame.version} + org.eclipse.rdf4j + rdf4j-runtime + ${rdf4j.version} + pom diff --git a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataEdge.java b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataEdge.java index 406c463412..5ca6230d15 100644 --- a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataEdge.java +++ b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataEdge.java @@ -28,8 +28,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.URI; import com.tinkerpop.blueprints.Direction; import com.tinkerpop.blueprints.Edge; diff --git a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataElement.java b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataElement.java index f2fa39369f..a8977d6648 100644 --- a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataElement.java +++ b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataElement.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Set; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.URI; import com.tinkerpop.blueprints.Element; diff --git a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraph.java b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraph.java index e954a14c55..90c3820637 100644 --- a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraph.java +++ b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraph.java @@ -22,7 +22,7 @@ */ package com.bigdata.blueprints; -import info.aduna.iteration.CloseableIteration; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; import java.lang.reflect.Array; import java.util.Collection; @@ -36,23 +36,23 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.OpenRDFException; -import org.openrdf.model.Literal; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.impl.StatementImpl; -import org.openrdf.query.BindingSet; -import org.openrdf.query.BooleanQuery; -import org.openrdf.query.GraphQueryResult; -import org.openrdf.query.QueryInterruptedException; -import org.openrdf.query.QueryLanguage; -import org.openrdf.query.TupleQuery; -import org.openrdf.query.TupleQueryResult; -import org.openrdf.query.Update; -import org.openrdf.repository.RepositoryConnection; -import org.openrdf.repository.RepositoryException; -import org.openrdf.repository.RepositoryResult; +import org.eclipse.rdf4j.OpenRDFException; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.impl.StatementImpl; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.BooleanQuery; +import org.eclipse.rdf4j.query.GraphQueryResult; +import org.eclipse.rdf4j.query.QueryInterruptedException; +import org.eclipse.rdf4j.query.QueryLanguage; +import org.eclipse.rdf4j.query.TupleQuery; +import org.eclipse.rdf4j.query.TupleQueryResult; +import org.eclipse.rdf4j.query.Update; +import org.eclipse.rdf4j.repository.RepositoryConnection; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.repository.RepositoryResult; import com.bigdata.blueprints.BigdataGraphAtom.EdgeAtom; import com.bigdata.blueprints.BigdataGraphAtom.EdgeLabelAtom; @@ -133,24 +133,24 @@ public interface Options { protected final int maxQueryTime; /** - * URI used for typing elements. + * IRI used for typing elements. */ - protected final URI TYPE; + protected final IRI TYPE; /** - * URI used to represent a Vertex. + * IRI used to represent a Vertex. */ - protected final URI VERTEX; + protected final IRI VERTEX; /** - * URI used to represent a Edge. + * IRI used to represent a Edge. */ - protected final URI EDGE; + protected final IRI EDGE; /** - * URI used for labeling edges. + * IRI used for labeling edges. */ - protected final URI LABEL; + protected final IRI LABEL; /** * Factory for round-tripping between Blueprints data and RDF data. @@ -219,9 +219,9 @@ public BlueprintsValueFactory getValueFactory() { * * @see {@link BigdataElement} */ - public Object getProperty(final URI uri, final String prop) { + public Object getProperty(final IRI IRI, final String prop) { - return getProperty(uri, factory.toPropertyURI(prop)); + return getProperty(IRI, factory.toPropertyURI(prop)); } @@ -230,12 +230,12 @@ public Object getProperty(final URI uri, final String prop) { * * @see {@link BigdataElement} */ - public Object getProperty(final URI uri, final URI prop) { + public Object getProperty(final IRI IRI, final IRI prop) { try { final RepositoryResult result = - cxn().getStatements(uri, prop, null, false); + cxn().getStatements(IRI, prop, null, false); try { @@ -308,9 +308,9 @@ protected Object getProperty(final Value value) { // * // * @see {@link BigdataElement} // */ -// public List getProperties(final URI uri, final String prop) { +// public List getProperties(final IRI IRI, final String prop) { // -// return getProperties(uri, factory.toPropertyURI(prop)); +// return getProperties(IRI, factory.toPropertyURI(prop)); // // } // @@ -321,12 +321,12 @@ protected Object getProperty(final Value value) { // * // * @see {@link BigdataElement} // */ -// public List getProperties(final URI uri, final URI prop) { +// public List getProperties(final IRI IRI, final IRI prop) { // // try { // // final RepositoryResult result = -// getWriteConnection().getStatements(uri, prop, null, false); +// getWriteConnection().getStatements(IRI, prop, null, false); // // final List props = new LinkedList(); // @@ -359,12 +359,12 @@ protected Object getProperty(final Value value) { * * @see {@link BigdataElement} */ - public Set getPropertyKeys(final URI uri) { + public Set getPropertyKeys(final IRI IRI) { try { final RepositoryResult result = - cxn().getStatements(uri, null, null, false); + cxn().getStatements(IRI, null, null, false); try { @@ -411,9 +411,9 @@ public Set getPropertyKeys(final URI uri) { * * @see {@link BigdataElement} */ - public Object removeProperty(final URI uri, final String prop) { + public Object removeProperty(final IRI IRI, final String prop) { - return removeProperty(uri, factory.toPropertyURI(prop)); + return removeProperty(IRI, factory.toPropertyURI(prop)); } @@ -422,13 +422,13 @@ public Object removeProperty(final URI uri, final String prop) { * * @see {@link BigdataElement} */ - public Object removeProperty(final URI uri, final URI prop) { + public Object removeProperty(final IRI IRI, final IRI prop) { try { - final Object oldVal = getProperty(uri, prop); + final Object oldVal = getProperty(IRI, prop); - cxn().remove(uri, prop, null); + cxn().remove(IRI, prop, null); return oldVal; @@ -444,7 +444,7 @@ public Object removeProperty(final URI uri, final URI prop) { * * @see {@link BigdataElement} */ - public void setProperty(final URI s, final String prop, final Object val) { + public void setProperty(final IRI s, final String prop, final Object val) { setProperty(s, factory.toPropertyURI(prop), toLiterals(val)); @@ -493,7 +493,7 @@ protected Collection toLiterals(final Object val) { // * // * @see {@link BigdataElement} // */ -// public void setProperty(final URI uri, final URI prop, final Literal val) { +// public void setProperty(final IRI IRI, final IRI prop, final Literal val) { // // try { // @@ -502,12 +502,12 @@ protected Collection toLiterals(final Object val) { // if (!laxProperties) { // // // remove the old value -// cxn.remove(uri, prop, null); +// cxn.remove(IRI, prop, null); // // } // // // add the new value -// cxn.add(uri, prop, val); +// cxn.add(IRI, prop, val); // // } catch (RuntimeException e) { // throw e; @@ -523,7 +523,7 @@ protected Collection toLiterals(final Object val) { * * @see {@link BigdataElement} */ - public void setProperty(final URI uri, final URI prop, + public void setProperty(final IRI IRI, final IRI prop, final Collection vals) { try { @@ -533,13 +533,13 @@ public void setProperty(final URI uri, final URI prop, if (!laxProperties) { // remove the old value - cxn.remove(uri, prop, null); + cxn.remove(IRI, prop, null); } // add the new values for (Literal val : vals) { - cxn.add(uri, prop, val); + cxn.add(IRI, prop, val); } /* @@ -567,9 +567,9 @@ public void setProperty(final URI uri, final URI prop, // * // * @see {@link BigdataElement} // */ -// public void addProperty(final URI uri, final String prop, final Object val) { +// public void addProperty(final IRI IRI, final String prop, final Object val) { // -// setProperty(uri, factory.toPropertyURI(prop), factory.toLiteral(val)); +// setProperty(IRI, factory.toPropertyURI(prop), factory.toLiteral(val)); // // } // @@ -578,11 +578,11 @@ public void setProperty(final URI uri, final URI prop, // * // * @see {@link BigdataElement} // */ -// public void addProperty(final URI uri, final URI prop, final Literal val) { +// public void addProperty(final IRI IRI, final IRI prop, final Literal val) { // // try { // -// getWriteConnection().add(uri, prop, val); +// getWriteConnection().add(IRI, prop, val); // // } catch (RuntimeException e) { // throw e; @@ -653,7 +653,7 @@ public Edge addEdge(final Object key, final Vertex from, final Vertex to, final String eid = key != null ? key.toString() : UUID.randomUUID().toString(); - final URI edgeURI = factory.toEdgeURI(eid); + final IRI edgeURI = factory.toEdgeURI(eid); try { @@ -662,8 +662,8 @@ public Edge addEdge(final Object key, final Vertex from, final Vertex to, // throw new IllegalArgumentException("edge " + eid + " already exists"); // } - final URI fromURI = factory.toVertexURI(from.getId().toString()); - final URI toURI = factory.toVertexURI(to.getId().toString()); + final IRI fromURI = factory.toVertexURI(from.getId().toString()); + final IRI toURI = factory.toVertexURI(to.getId().toString()); final RepositoryConnection cxn = cxn(); @@ -704,16 +704,16 @@ public Vertex addVertex(final Object key) { final String vid = key != null ? key.toString() : UUID.randomUUID().toString(); - final URI uri = factory.toVertexURI(vid); + final IRI IRI = factory.toVertexURI(vid); // do we need to check this? // if (cxn().hasStatement(vertexURI, TYPE, VERTEX, false)) { // throw new IllegalArgumentException("vertex " + vid + " already exists"); // } - cxn().add(uri, TYPE, VERTEX); + cxn().add(IRI, TYPE, VERTEX); - return new BigdataVertex(uri, this); + return new BigdataVertex(IRI, this); } catch (RuntimeException e) { throw e; @@ -737,7 +737,7 @@ public Edge getEdge(final Object key) { try { - final URI edge = factory.toEdgeURI(key.toString()); + final IRI edge = factory.toEdgeURI(key.toString()); final RepositoryResult result = cxn().getStatements(null, edge, null, false); @@ -784,7 +784,7 @@ public Iterable getEdges() { try { - final URI wild = null; + final IRI wild = null; return getEdges(wild, wild); } catch (RuntimeException ex) { @@ -809,7 +809,7 @@ public Iterable getEdges() { * the edge labels to consider (optional) * @return the edges matching the supplied criteria */ - Iterable getEdges(final URI from, final URI to, + Iterable getEdges(final IRI from, final IRI to, final String... labels) throws Exception { final GraphQueryResult stmts = getElements(from, to, labels); @@ -836,7 +836,7 @@ Iterable getEdges(final URI from, final URI to, * filter(?label in ("label1", "label2", ...)) . * } */ - protected GraphQueryResult getElements(final URI from, final URI to, + protected GraphQueryResult getElements(final IRI from, final IRI to, final String... labels) throws Exception { final StringBuilder sb = new StringBuilder(); @@ -863,7 +863,7 @@ protected GraphQueryResult getElements(final URI from, final URI to, .replace("?from", from != null ? "<"+from+">" : "?from") .replace("?to", to != null ? "<"+to+">" : "?to"); - final org.openrdf.query.GraphQuery query = + final org.eclipse.rdf4j.query.GraphQuery query = cxn().prepareGraphQuery(QueryLanguage.SPARQL, queryStr); final GraphQueryResult stmts = query.evaluate(); @@ -882,7 +882,7 @@ protected GraphQueryResult getElements(final URI from, final URI to, */ Iterable getEdges(final String queryStr) throws Exception { - final org.openrdf.query.GraphQuery query = + final org.eclipse.rdf4j.query.GraphQuery query = cxn().prepareGraphQuery(QueryLanguage.SPARQL, queryStr); final GraphQueryResult stmts = query.evaluate(); @@ -909,7 +909,7 @@ Iterable getEdges(final String queryStr) throws Exception { * @return * the vertices matching the supplied criteria */ - Iterable getVertices(final URI from, final URI to, + Iterable getVertices(final IRI from, final IRI to, final String... labels) throws Exception { if (from != null && to != null) { @@ -940,7 +940,7 @@ Iterable getVertices(final URI from, final URI to, Iterable getVertices(final String queryStr, final boolean subject) throws Exception { - final org.openrdf.query.GraphQuery query = + final org.eclipse.rdf4j.query.GraphQuery query = cxn().prepareGraphQuery(QueryLanguage.SPARQL, queryStr); final GraphQueryResult stmts = query.evaluate(); @@ -969,7 +969,7 @@ public Iterable getEdges(final String prop, final Object val) { if (log.isInfoEnabled()) log.info("("+prop+", "+val+")"); - final URI p = factory.toPropertyURI(prop); + final IRI p = factory.toPropertyURI(prop); final Literal o = factory.toLiteral(val); try { @@ -1004,12 +1004,12 @@ public Vertex getVertex(final Object key) { if (key == null) throw new IllegalArgumentException(); - final URI uri = factory.toVertexURI(key.toString()); + final IRI IRI = factory.toVertexURI(key.toString()); try { - if (cxn().hasStatement(uri, TYPE, VERTEX, false)) { - return new BigdataVertex(uri, this); + if (cxn().hasStatement(IRI, TYPE, VERTEX, false)) { + return new BigdataVertex(IRI, this); } return null; @@ -1059,7 +1059,7 @@ public Iterable getVertices(final String prop, final Object val) { if (log.isInfoEnabled()) log.info("("+prop+", "+val+")"); - final URI p = factory.toPropertyURI(prop); + final IRI p = factory.toPropertyURI(prop); final Literal o = factory.toLiteral(val); try { @@ -1104,19 +1104,19 @@ public void removeEdge(final Edge edge) { final RepositoryConnection cxn = cxn(); - final URI uri = factory.toURI(edge); + final IRI IRI = factory.toURI(edge); - if (!cxn.hasStatement(uri, TYPE, EDGE, false)) { + if (!cxn.hasStatement(IRI, TYPE, EDGE, false)) { throw new IllegalStateException(); } - final URI wild = null; + final IRI wild = null; // remove the edge statement - cxn.remove(wild, uri, wild); + cxn.remove(wild, IRI, wild); // remove its properties - cxn.remove(uri, wild, wild); + cxn.remove(IRI, wild, wild); } catch (RuntimeException e) { throw e; @@ -1138,19 +1138,19 @@ public void removeVertex(final Vertex vertex) { final RepositoryConnection cxn = cxn(); - final URI uri = factory.toURI(vertex); + final IRI IRI = factory.toURI(vertex); - if (!cxn.hasStatement(uri, TYPE, VERTEX, false)) { + if (!cxn.hasStatement(IRI, TYPE, VERTEX, false)) { throw new IllegalStateException(); } - final URI wild = null; + final IRI wild = null; // remove outgoing edges and properties - cxn.remove(uri, wild, wild); + cxn.remove(IRI, wild, wild); // remove incoming edges - cxn.remove(wild, wild, uri); + cxn.remove(wild, wild, IRI); } catch (RuntimeException e) { throw e; @@ -1198,7 +1198,7 @@ public boolean hasNext() { public Vertex next() { try { final Statement stmt = stmts.next(); - final URI v = (URI) + final IRI v = (IRI) (subject ? stmt.getSubject() : stmt.getObject()); final Vertex vertex = new BigdataVertex(v, BigdataGraph.this); cache.add(vertex); @@ -1384,7 +1384,7 @@ public ICloseableIterator project(final String queryStr, try { - final org.openrdf.query.GraphQuery query = + final org.eclipse.rdf4j.query.GraphQuery query = cxn.prepareGraphQuery(QueryLanguage.SPARQL, queryStr); setMaxQueryTime(query); @@ -1426,7 +1426,7 @@ public ICloseableIterator project(final String queryStr, public boolean isValid(final Object e) { final Statement stmt = (Statement) e; // do not project history - return stmt.getSubject() instanceof URI; + return stmt.getSubject() instanceof IRI; } }); @@ -1448,8 +1448,8 @@ protected Object resolve(final Object e) { */ protected BigdataGraphAtom toGraphAtom(final Statement stmt) { - final URI s = (URI) stmt.getSubject(); - final URI p = (URI) stmt.getPredicate(); + final IRI s = (IRI) stmt.getSubject(); + final IRI p = (IRI) stmt.getPredicate(); final Value o = stmt.getObject(); return toGraphAtom(s, p, o); @@ -1459,13 +1459,13 @@ protected BigdataGraphAtom toGraphAtom(final Statement stmt) { /** * Convert a unit of RDF data to an atomic unit of PG data. */ - protected BigdataGraphAtom toGraphAtom(final URI s, final URI p, final Value o) { + protected BigdataGraphAtom toGraphAtom(final IRI s, final IRI p, final Value o) { final String sid = factory.fromURI(s); final String pid = factory.fromURI(p); final BigdataGraphAtom atom; - if (o instanceof URI) { + if (o instanceof IRI) { /* * Either an edge or an element type statement. @@ -1487,7 +1487,7 @@ protected BigdataGraphAtom toGraphAtom(final URI s, final URI p, final Value o) /* * Edge. */ - final String oid = factory.fromURI((URI) o); + final String oid = factory.fromURI((IRI) o); atom = new EdgeAtom(pid, sid, oid); } @@ -1617,8 +1617,8 @@ protected BigdataBindingSet convert(final BindingSet bs) { final Object o; if (val instanceof Literal) { o = factory.fromLiteral((Literal) val); - } else if (val instanceof URI) { - o = factory.fromURI((URI) val); + } else if (val instanceof IRI) { + o = factory.fromURI((IRI) val); } else { continue; } @@ -1734,14 +1734,14 @@ public void update(final String queryStr, final String extQueryId) * @see {@link AbstractTripleStore.Options#RDR_HISTORY_CLASS} * @see {@link RDRHistory} */ - public ICloseableIterator history(final List ids) + public ICloseableIterator history(final List ids) throws Exception { final String randomUUID = UUID.randomUUID().toString(); return history(ids, randomUUID); } @SuppressWarnings("unchecked") - public ICloseableIterator history(final List ids, + public ICloseableIterator history(final List ids, final String extQueryId) throws Exception { final RepositoryConnection cxn = cxn(); @@ -1751,7 +1751,7 @@ public ICloseableIterator history(final List ids, if (ids.size() > 0) { final StringBuilder vc = new StringBuilder(); vc.append(" values (?s) { \n"); - for (URI id : ids) { + for (IRI id : ids) { vc.append(" (<"+id+">) \n"); } vc.append(" } \n"); @@ -1810,10 +1810,10 @@ public ICloseableIterator history(final List ids, @Override protected Object resolve(final Object e) { final BindingSet bs = (BindingSet) e; - final URI s = (URI) bs.getValue("s"); - final URI p = (URI) bs.getValue("p"); + final IRI s = (IRI) bs.getValue("s"); + final IRI p = (IRI) bs.getValue("p"); final Value o = bs.getValue("o"); - final URI a = (URI) bs.getValue("action"); + final IRI a = (IRI) bs.getValue("action"); final Literal t = (Literal) bs.getValue("time"); if (!t.getDatatype().equals(XSD.DATETIME)) { @@ -1967,7 +1967,7 @@ public void close() { * Utility function to set the Query timeout to the global * setting if it is configured. */ - protected void setMaxQueryTime(final org.openrdf.query.Query query) { + protected void setMaxQueryTime(final org.eclipse.rdf4j.query.Query query) { if (maxQueryTime > 0) { query.setMaxQueryTime(maxQueryTime); } diff --git a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraphBulkLoad.java b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraphBulkLoad.java index 7e49582c03..7177595d19 100644 --- a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraphBulkLoad.java +++ b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraphBulkLoad.java @@ -25,11 +25,11 @@ import java.util.Collection; import java.util.UUID; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.impl.StatementImpl; -import org.openrdf.query.impl.AbstractQuery; -import org.openrdf.repository.RepositoryConnection; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.impl.StatementImpl; +import org.eclipse.rdf4j.query.impl.AbstractQuery; +import org.eclipse.rdf4j.repository.RepositoryConnection; import com.bigdata.rdf.changesets.IChangeLog; import com.bigdata.rdf.changesets.IChangeRecord; diff --git a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraphEmbedded.java b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraphEmbedded.java index fd8508c079..2c67bdeb58 100644 --- a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraphEmbedded.java +++ b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraphEmbedded.java @@ -35,7 +35,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.BNode; +import org.eclipse.rdf4j.model.BNode; import com.bigdata.blueprints.BigdataGraphEdit.Action; import com.bigdata.bop.engine.IRunningQuery; diff --git a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraphQuery.java b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraphQuery.java index 1db8ab9f93..ca658d4edb 100644 --- a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraphQuery.java +++ b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraphQuery.java @@ -29,8 +29,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; import com.tinkerpop.blueprints.Edge; import com.tinkerpop.blueprints.Predicate; diff --git a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataRDFFactory.java b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataRDFFactory.java index 625fde0c62..f2562cf3dc 100644 --- a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataRDFFactory.java +++ b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataRDFFactory.java @@ -22,11 +22,12 @@ */ package com.bigdata.blueprints; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.impl.URIImpl; +import org.eclipse.rdf4j.model.impl.ValueFactoryImpl; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.rdf.store.BD; @@ -56,14 +57,14 @@ public class BigdataRDFFactory extends DefaultBlueprintsValueFactory { public static final String EDGE_NAMESPACE = "http://www.bigdata.com/rdf/graph/edge/"; /** - * URI used to represent a Vertex. + * IRI used to represent a Vertex. */ - public static final URI VERTEX = new URIImpl(BD.NAMESPACE + "Vertex"); + public static final IRI VERTEX = SimpleValueFactory.getInstance().createIRI(BD.NAMESPACE, "Vertex"); /** - * URI used to represent a Edge. + * IRI used to represent a Edge. */ - public static final URI EDGE = new URIImpl(BD.NAMESPACE + "Edge"); + public static final IRI EDGE = SimpleValueFactory.getInstance().createIRI(BD.NAMESPACE, "Edge"); public static BigdataRDFFactory INSTANCE = new BigdataRDFFactory(); @@ -71,7 +72,7 @@ public class BigdataRDFFactory extends DefaultBlueprintsValueFactory { * Construct an instance with a simple Sesame ValueFactoryImpl. */ private BigdataRDFFactory() { - super(new ValueFactoryImpl(), + super(SimpleValueFactory.getInstance(), GRAPH_NAMESPACE, VERTEX_NAMESPACE, EDGE_NAMESPACE, RDF.TYPE, VERTEX, EDGE, RDFS.LABEL); } diff --git a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataVertex.java b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataVertex.java index 36686bce0b..0e508551f2 100644 --- a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataVertex.java +++ b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataVertex.java @@ -27,7 +27,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.URI; import com.tinkerpop.blueprints.Direction; import com.tinkerpop.blueprints.Edge; diff --git a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BlueprintsValueFactory.java b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BlueprintsValueFactory.java index d7a0057245..1b90659a8f 100644 --- a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BlueprintsValueFactory.java +++ b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BlueprintsValueFactory.java @@ -22,8 +22,8 @@ */ package com.bigdata.blueprints; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.IRI; import com.tinkerpop.blueprints.Element; @@ -36,61 +36,61 @@ public interface BlueprintsValueFactory { /** - * Return the URI used for typing elements. + * Return the IRI used for typing elements. */ - URI getTypeURI(); + IRI getTypeURI(); /** - * Return the URI used to identify vertices. + * Return the IRI used to identify vertices. */ - URI getVertexURI(); + IRI getVertexURI(); /** - * Return the URI used to identify edges. + * Return the IRI used to identify edges. */ - URI getEdgeURI(); + IRI getEdgeURI(); /** - * Return the URI used for labeling edges. + * Return the IRI used for labeling edges. */ - URI getLabelURI(); + IRI getLabelURI(); /** - * Create a vertex URI from a blueprints vertex id. + * Create a vertex IRI from a blueprints vertex id. */ - URI toVertexURI(Object key); + IRI toVertexURI(Object key); /** - * Create an edge URI from a blueprints edge id. + * Create an edge IRI from a blueprints edge id. */ - URI toEdgeURI(Object key); + IRI toEdgeURI(Object key); /** - * Create an element URI from a blueprints element id. + * Create an element IRI from a blueprints element id. */ - URI toURI(Element e); + IRI toURI(Element e); /** - * Create a property URI from a blueprints property name. + * Create a property IRI from a blueprints property name. */ - URI toPropertyURI(String property); + IRI toPropertyURI(String property); // /** -// * Create a blueprints vertex id from a vertex URI. +// * Create a blueprints vertex id from a vertex IRI. // */ -// String fromVertexURI(URI uri); +// String fromVertexURI(IRI IRI); // // /** -// * Create a blueprints edge id from an edge URI. +// * Create a blueprints edge id from an edge IRI. // */ -// String fromEdgeURI(URI uri); +// String fromEdgeURI(IRI IRI); // // /** -// * Create a blueprints property name from a property URI. +// * Create a blueprints property name from a property IRI. // */ -// String fromPropertyURI(URI uri); +// String fromPropertyURI(IRI IRI); - String fromURI(URI uri); + String fromURI(IRI IRI); /** * Create a datatyped literal from a blueprints property value. @@ -103,18 +103,18 @@ public interface BlueprintsValueFactory { Object fromLiteral(Literal lit); // /** -// * Is the URI a vertex? +// * Is the IRI a vertex? // */ -// boolean isVertex(URI uri); +// boolean isVertex(IRI IRI); // // /** -// * Is the URI an edge? +// * Is the IRI an edge? // */ -// boolean isEdge(URI uri); +// boolean isEdge(IRI IRI); // // /** -// * Is the URI an edge? +// * Is the IRI an edge? // */ -// boolean isProperty(URI uri); +// boolean isProperty(IRI IRI); } diff --git a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/DefaultBlueprintsValueFactory.java b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/DefaultBlueprintsValueFactory.java index 964fb5473e..85fc6c8f95 100644 --- a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/DefaultBlueprintsValueFactory.java +++ b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/DefaultBlueprintsValueFactory.java @@ -26,11 +26,11 @@ import java.net.URLDecoder; import java.net.URLEncoder; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.ValueFactoryImpl; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.rdf.internal.XSD; import com.tinkerpop.blueprints.Edge; diff --git a/bigdata-blueprints/src/test/java/com/bigdata/blueprints/SimpleBlueprintsValueFactory.java b/bigdata-blueprints/src/test/java/com/bigdata/blueprints/SimpleBlueprintsValueFactory.java index e34e2478fc..b808487176 100644 --- a/bigdata-blueprints/src/test/java/com/bigdata/blueprints/SimpleBlueprintsValueFactory.java +++ b/bigdata-blueprints/src/test/java/com/bigdata/blueprints/SimpleBlueprintsValueFactory.java @@ -31,8 +31,8 @@ import java.util.StringTokenizer; import java.util.regex.Matcher; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.impl.URIImpl; import com.bigdata.rdf.internal.impl.literal.IPv4AddrIV; diff --git a/bigdata-blueprints/src/test/java/com/bigdata/blueprints/TestBigdataGraphEmbeddedRepository.java b/bigdata-blueprints/src/test/java/com/bigdata/blueprints/TestBigdataGraphEmbeddedRepository.java index a9079af50b..3d7b05d4b1 100644 --- a/bigdata-blueprints/src/test/java/com/bigdata/blueprints/TestBigdataGraphEmbeddedRepository.java +++ b/bigdata-blueprints/src/test/java/com/bigdata/blueprints/TestBigdataGraphEmbeddedRepository.java @@ -25,8 +25,8 @@ import java.io.File; import java.util.Properties; -import org.openrdf.repository.RepositoryException; -import org.openrdf.repository.sail.SailRepository; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.repository.sail.SailRepository; import com.bigdata.rdf.axioms.NoAxioms; import com.bigdata.rdf.sail.BigdataSail; diff --git a/bigdata-blueprints/src/test/java/com/bigdata/blueprints/TestPathConstraints.java b/bigdata-blueprints/src/test/java/com/bigdata/blueprints/TestPathConstraints.java index f6ce750b68..0834b9a012 100644 --- a/bigdata-blueprints/src/test/java/com/bigdata/blueprints/TestPathConstraints.java +++ b/bigdata-blueprints/src/test/java/com/bigdata/blueprints/TestPathConstraints.java @@ -6,7 +6,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.query.QueryLanguage; +import org.eclipse.rdf4j.query.QueryLanguage; import com.bigdata.rdf.sail.BigdataSailRepositoryConnection; import com.bigdata.rdf.sail.BigdataSailTupleQuery; diff --git a/bigdata-cache/pom.xml b/bigdata-cache/pom.xml index 6fbff9eec2..1799c902a0 100644 --- a/bigdata-cache/pom.xml +++ b/bigdata-cache/pom.xml @@ -28,12 +28,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../pom.xml com.blazegraph bigdata-cache - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT Blazegraph Cache Blazegraph Cache utilities jar diff --git a/bigdata-client/pom.xml b/bigdata-client/pom.xml index 0df071c181..8800b210fe 100644 --- a/bigdata-client/pom.xml +++ b/bigdata-client/pom.xml @@ -28,12 +28,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../pom.xml com.blazegraph bigdata-client - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT Blazegraph Client API Blazegraph Client API tools @@ -109,9 +109,10 @@ ga('send', 'pageview'); ${project.version} - org.openrdf.sesame - sesame-runtime - ${sesame.version} + org.eclipse.rdf4j + rdf4j-runtime + ${rdf4j.version} + pom org.eclipse.jetty diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/AbstractBigdataRemoteQuery.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/AbstractBigdataRemoteQuery.java index 500175a645..0506eeb5e9 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/AbstractBigdataRemoteQuery.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/AbstractBigdataRemoteQuery.java @@ -1,8 +1,8 @@ package com.bigdata.rdf.sail.remote; -import org.openrdf.model.URI; -import org.openrdf.query.Binding; -import org.openrdf.query.impl.AbstractQuery; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.query.Binding; +import org.eclipse.rdf4j.query.impl.AbstractQuery; import com.bigdata.rdf.sail.webapp.client.EncodeDecodeValue; import com.bigdata.rdf.sail.webapp.client.IPreparedQuery; @@ -19,7 +19,7 @@ public AbstractBigdataRemoteQuery(String baseURI) { } /** - * @see org.openrdf.http.client.HTTPClient#getQueryMethodParameters(QueryLanguage, String, String, Dataset, boolean, int, Binding...) + * @see org.eclipse.rdf4j.http.client.HTTPClient#getQueryMethodParameters(QueryLanguage, String, String, Dataset, boolean, int, Binding...) */ protected void configureConnectOptions(IPreparedQuery q) { if (baseURI != null) { diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataRemoteBooleanQuery.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataRemoteBooleanQuery.java index b3b871611b..2d25a492b7 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataRemoteBooleanQuery.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataRemoteBooleanQuery.java @@ -2,8 +2,8 @@ import java.util.concurrent.TimeUnit; -import org.openrdf.query.BooleanQuery; -import org.openrdf.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.BooleanQuery; +import org.eclipse.rdf4j.query.QueryEvaluationException; import com.bigdata.rdf.sail.webapp.client.IPreparedBooleanQuery; import com.bigdata.rdf.sail.webapp.client.RemoteRepository; diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataRemoteGraphQuery.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataRemoteGraphQuery.java index 4bd4c94676..6b35acdc68 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataRemoteGraphQuery.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataRemoteGraphQuery.java @@ -2,11 +2,11 @@ import java.util.concurrent.TimeUnit; -import org.openrdf.query.GraphQuery; -import org.openrdf.query.GraphQueryResult; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.rio.RDFHandler; -import org.openrdf.rio.RDFHandlerException; +import org.eclipse.rdf4j.query.GraphQuery; +import org.eclipse.rdf4j.query.GraphQueryResult; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.rio.RDFHandler; +import org.eclipse.rdf4j.rio.RDFHandlerException; import com.bigdata.rdf.sail.webapp.client.IPreparedGraphQuery; import com.bigdata.rdf.sail.webapp.client.RemoteRepository; diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataRemoteTupleQuery.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataRemoteTupleQuery.java index faa2cfc19e..598582733d 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataRemoteTupleQuery.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataRemoteTupleQuery.java @@ -2,11 +2,11 @@ import java.util.concurrent.TimeUnit; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.TupleQuery; -import org.openrdf.query.TupleQueryResult; -import org.openrdf.query.TupleQueryResultHandler; -import org.openrdf.query.TupleQueryResultHandlerException; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.TupleQuery; +import org.eclipse.rdf4j.query.TupleQueryResult; +import org.eclipse.rdf4j.query.TupleQueryResultHandler; +import org.eclipse.rdf4j.query.TupleQueryResultHandlerException; import com.bigdata.rdf.sail.webapp.client.IPreparedTupleQuery; import com.bigdata.rdf.sail.webapp.client.RemoteRepository; diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataSailFactory.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataSailFactory.java index fe7c98ef4c..28158dab8c 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataSailFactory.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataSailFactory.java @@ -30,8 +30,8 @@ import java.util.List; import java.util.Properties; -import org.openrdf.repository.sail.SailRepository; -import org.openrdf.sail.Sail; +import org.eclipse.rdf4j.repository.sail.SailRepository; +import org.eclipse.rdf4j.sail.Sail; import com.bigdata.rdf.sail.webapp.client.RemoteRepositoryManager; import com.bigdata.util.httpd.Config; diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataSailRemoteRepository.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataSailRemoteRepository.java index 5ef511bdd7..0bf13e053f 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataSailRemoteRepository.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataSailRemoteRepository.java @@ -28,11 +28,11 @@ import java.util.Collection; import java.util.UUID; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.repository.Repository; -import org.openrdf.repository.RepositoryConnection; -import org.openrdf.repository.RepositoryException; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.ValueFactoryImpl; +import org.eclipse.rdf4j.repository.Repository; +import org.eclipse.rdf4j.repository.RepositoryConnection; +import org.eclipse.rdf4j.repository.RepositoryException; import com.bigdata.rdf.sail.model.RunningQuery; import com.bigdata.rdf.sail.webapp.client.RemoteRepository; diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataSailRemoteRepositoryConnection.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataSailRemoteRepositoryConnection.java index 8afb778fa8..25359107ee 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataSailRemoteRepositoryConnection.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataSailRemoteRepositoryConnection.java @@ -24,9 +24,6 @@ package com.bigdata.rdf.sail.remote; -import info.aduna.iteration.CloseableIteration; -import info.aduna.iteration.Iteration; - import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -38,37 +35,39 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.IsolationLevel; -import org.openrdf.model.Graph; -import org.openrdf.model.Namespace; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.LinkedHashModel; -import org.openrdf.model.impl.StatementImpl; -import org.openrdf.query.BindingSet; -import org.openrdf.query.BooleanQuery; -import org.openrdf.query.Dataset; -import org.openrdf.query.GraphQuery; -import org.openrdf.query.GraphQueryResult; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.Query; -import org.openrdf.query.QueryLanguage; -import org.openrdf.query.TupleQuery; -import org.openrdf.query.Update; -import org.openrdf.query.UpdateExecutionException; -import org.openrdf.repository.Repository; -import org.openrdf.repository.RepositoryConnection; -import org.openrdf.repository.RepositoryException; -import org.openrdf.repository.RepositoryResult; -import org.openrdf.repository.UnknownTransactionStateException; -import org.openrdf.rio.ParserConfig; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFHandler; -import org.openrdf.rio.RDFHandlerException; -import org.openrdf.rio.RDFParseException; +import org.eclipse.rdf4j.IsolationLevel; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.common.iteration.Iteration; +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.model.impl.LinkedHashModel; +import org.eclipse.rdf4j.model.impl.StatementImpl; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.BooleanQuery; +import org.eclipse.rdf4j.query.Dataset; +import org.eclipse.rdf4j.query.GraphQuery; +import org.eclipse.rdf4j.query.GraphQueryResult; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.Query; +import org.eclipse.rdf4j.query.QueryLanguage; +import org.eclipse.rdf4j.query.TupleQuery; +import org.eclipse.rdf4j.query.Update; +import org.eclipse.rdf4j.query.UpdateExecutionException; +import org.eclipse.rdf4j.repository.Repository; +import org.eclipse.rdf4j.repository.RepositoryConnection; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.repository.RepositoryResult; +import org.eclipse.rdf4j.repository.UnknownTransactionStateException; +import org.eclipse.rdf4j.rio.ParserConfig; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFHandler; +import org.eclipse.rdf4j.rio.RDFHandlerException; +import org.eclipse.rdf4j.rio.RDFParseException; import com.bigdata.rdf.sail.webapp.client.IPreparedSparqlUpdate; import com.bigdata.rdf.sail.webapp.client.IRemoteTx; @@ -153,7 +152,7 @@ protected RemoteRepository getRepositoryForConnection() { * Report the fast range count (aka ESTCARD) associated with the specified * access path. */ - public long count(final Resource s, final URI p, final Value o, + public long count(final Resource s, final IRI p, final Value o, final Resource... c) throws RepositoryException { @@ -176,7 +175,7 @@ public long count(final Resource s, final URI p, final Value o, */ @Override public RepositoryResult getStatements(final Resource s, - final URI p, final Value o, final boolean includeInferred, + final IRI p, final Value o, final boolean includeInferred, final Resource... c) throws RepositoryException { try { @@ -244,7 +243,7 @@ public void close() throws RepositoryException { * overestimate and ignores includeInferred (REST API) */ @Override - public boolean hasStatement(final Resource s, final URI p, final Value o, + public boolean hasStatement(final Resource s, final IRI p, final Value o, final boolean includeInferred, final Resource... c) throws RepositoryException { @@ -390,7 +389,7 @@ public void add( final Iteration stmts, final Resource... c) throws RepositoryException, E { - final Graph g = new LinkedHashModel(); + final Model g = new LinkedHashModel(); while (stmts.hasNext()) { @@ -403,7 +402,7 @@ public void add( } @Override - public void add(final Resource s, final URI p, final Value o, + public void add(final Resource s, final IRI p, final Value o, final Resource... c) throws RepositoryException { add(new StatementImpl(s, p, o), c); @@ -422,7 +421,7 @@ public void add(final Statement stmt, final Resource... c) // log.warn("single statement updates not recommended"); - final Graph g = new LinkedHashModel(); + final Model g = new LinkedHashModel(); g.add(stmt); @@ -520,7 +519,7 @@ public void remove( final Iteration stmts, final Resource... c) throws RepositoryException, E { - final Graph g = new LinkedHashModel(); + final Model g = new LinkedHashModel(); while (stmts.hasNext()) { @@ -544,7 +543,7 @@ public void remove(final Statement stmt, final Resource... c) // log.warn("single statement updates not recommended"); - final Graph g = new LinkedHashModel(); + final Model g = new LinkedHashModel(); g.add(stmt); @@ -563,7 +562,7 @@ public void remove(final Iterable stmts, } @Override - public void remove(final Resource s, URI p, Value o, final Resource... c) + public void remove(final Resource s, IRI p, Value o, final Resource... c) throws RepositoryException { final RemoveOp op = new RemoveOp(s, p, o, c); @@ -705,7 +704,7 @@ public void export(final RDFHandler handler, final Resource... c) } @Override - public void exportStatements(final Resource s, final URI p, final Value o, + public void exportStatements(final Resource s, final IRI p, final Value o, final boolean includeInferred, final RDFHandler handler, final Resource... c) throws RepositoryException, RDFHandlerException { diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/AST2SPARQLUtil.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/AST2SPARQLUtil.java index 184cf31575..449cd37822 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/AST2SPARQLUtil.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/AST2SPARQLUtil.java @@ -30,12 +30,12 @@ import java.util.HashMap; import java.util.Map; -import org.openrdf.model.BNode; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.vocabulary.XMLSchema; -import org.openrdf.query.parser.sparql.SPARQLUtil; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLUtil; /** * Utility class for externalizing SPARQL prefix declaration management. diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/AbstractConnectOptions.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/AbstractConnectOptions.java index c59bd2b541..762b8dfa03 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/AbstractConnectOptions.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/AbstractConnectOptions.java @@ -33,9 +33,9 @@ import org.apache.http.NameValuePair; import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.message.BasicNameValuePair; -import org.openrdf.query.resultio.BooleanQueryResultFormat; -import org.openrdf.query.resultio.TupleQueryResultFormat; -import org.openrdf.rio.RDFFormat; +import org.eclipse.rdf4j.query.resultio.BooleanQueryResultFormat; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultFormat; +import org.eclipse.rdf4j.rio.RDFFormat; public class AbstractConnectOptions implements IMimeTypes { diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/AcceptHeaderFactory.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/AcceptHeaderFactory.java index 2fc1da017c..c6bfaf4f90 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/AcceptHeaderFactory.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/AcceptHeaderFactory.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -32,7 +32,7 @@ package com.bigdata.rdf.sail.webapp.client; -import info.aduna.lang.FileFormat; +import org.eclipse.rdf4j.common.lang.FileFormat; import java.util.Iterator; import java.util.LinkedHashSet; @@ -40,12 +40,12 @@ import java.util.List; import java.util.Set; -import org.openrdf.query.resultio.BooleanQueryResultFormat; -import org.openrdf.query.resultio.BooleanQueryResultParserRegistry; -import org.openrdf.query.resultio.TupleQueryResultFormat; -import org.openrdf.query.resultio.TupleQueryResultParserRegistry; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParserRegistry; +import org.eclipse.rdf4j.query.resultio.BooleanQueryResultFormat; +import org.eclipse.rdf4j.query.resultio.BooleanQueryResultParserRegistry; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultFormat; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultParserRegistry; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParserRegistry; /** * Utility class for generating accept heades modeled on diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/BackgroundGraphResult.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/BackgroundGraphResult.java index a03197293f..7150f1de49 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/BackgroundGraphResult.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/BackgroundGraphResult.java @@ -16,14 +16,14 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.openrdf.model.Statement; -import org.openrdf.query.GraphQueryResult; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.repository.sparql.query.QueueCursor; -import org.openrdf.rio.RDFHandler; -import org.openrdf.rio.RDFHandlerException; -import org.openrdf.rio.RDFParseException; -import org.openrdf.rio.RDFParser; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.query.GraphQueryResult; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.repository.sparql.query.QueueCursor; +import org.eclipse.rdf4j.rio.RDFHandler; +import org.eclipse.rdf4j.rio.RDFHandlerException; +import org.eclipse.rdf4j.rio.RDFParseException; +import org.eclipse.rdf4j.rio.RDFParser; /** * Provides concurrent access to statements as they are being parsed. diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/BackgroundTupleResult.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/BackgroundTupleResult.java index ecc8f1172f..dd71a4b79b 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/BackgroundTupleResult.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/BackgroundTupleResult.java @@ -12,16 +12,16 @@ import java.util.List; import java.util.concurrent.CountDownLatch; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.QueryResultHandlerException; -import org.openrdf.query.TupleQueryResult; -import org.openrdf.query.TupleQueryResultHandler; -import org.openrdf.query.TupleQueryResultHandlerException; -import org.openrdf.query.impl.TupleQueryResultImpl; -import org.openrdf.query.resultio.QueryResultParseException; -import org.openrdf.query.resultio.TupleQueryResultParser; -import org.openrdf.repository.sparql.query.QueueCursor; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.QueryResultHandlerException; +import org.eclipse.rdf4j.query.TupleQueryResult; +import org.eclipse.rdf4j.query.TupleQueryResultHandler; +import org.eclipse.rdf4j.query.TupleQueryResultHandlerException; +import org.eclipse.rdf4j.query.impl.TupleQueryResultImpl; +import org.eclipse.rdf4j.query.resultio.QueryResultParseException; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultParser; +import org.eclipse.rdf4j.repository.sparql.query.QueueCursor; /** * Provides concurrent access to tuple results as they are being parsed. diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/ContextsResult.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/ContextsResult.java index daf1b83ba6..d780486c7e 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/ContextsResult.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/ContextsResult.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -29,7 +29,7 @@ import java.util.Collection; -import org.openrdf.model.Resource; +import org.eclipse.rdf4j.model.Resource; /** * Class representing the result of a get contexts operation against @@ -46,4 +46,4 @@ public ContextsResult(final Collection contexts) { } -} +} diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/EncodeDecodeValue.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/EncodeDecodeValue.java index 6e76f561e8..212965ec3c 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/EncodeDecodeValue.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/EncodeDecodeValue.java @@ -27,15 +27,15 @@ package com.bigdata.rdf.sail.webapp.client; -import org.openrdf.model.BNode; -import org.openrdf.model.Literal; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.impl.LiteralImpl; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.impl.LiteralImpl; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; /** * Utility class to encode/decode RDF {@link Value}s for interchange with the @@ -242,12 +242,12 @@ public class EncodeDecodeValue { // } /** - * Decode a URI or Literal. + * Decode a IRI or Literal. * * @param s * The value to be decoded. * - * @return The URI or literal -or- null if the argument was + * @return The IRI or literal -or- null if the argument was * null. * * @throws IllegalArgumentException @@ -317,9 +317,9 @@ public static Value decodeValue(final String s) { final String datatypeStr = s.substring(closeQuotePos + 3); - final URI datatypeURI = decodeURI(datatypeStr); + final IRI datatypeIRI = decodeIRI(datatypeStr); - return new LiteralImpl(label,datatypeURI); + return new LiteralImpl(label,datatypeIRI); } else { @@ -330,15 +330,15 @@ public static Value decodeValue(final String s) { } else if (ch == '<') { /* - * URI + * IRI */ if (s.charAt(slen - 1) != '>') throw new IllegalArgumentException(s); - final String uriStr = s.substring(1, slen - 1); + final String iriStr = s.substring(1, slen - 1); - return new URIImpl(uriStr); + return SimpleValueFactory.getInstance().createIRI(iriStr); } else { @@ -369,22 +369,22 @@ public static Resource decodeResource(final String param) { } /** - * Type safe variant for a {@link URI}. + * Type safe variant for a {@link IRI}. * * @param param * The encoded value. * - * @return The URI -or- null if the argument was + * @return The IRI -or- null if the argument was * null. */ - public static URI decodeURI(final String param) { + public static IRI decodeIRI(final String param) { final Value v = decodeValue(param); - if (v == null || v instanceof URI) - return (URI) v; + if (v == null || v instanceof IRI) + return (IRI) v; - throw new IllegalArgumentException("Not an URI: '" + param + "'"); + throw new IllegalArgumentException("Not an IRI: '" + param + "'"); } @@ -392,7 +392,7 @@ public static URI decodeURI(final String param) { * Encode an RDF {@link Value} as it should appear if used in a SPARQL * query. E.g., a literal will look like "abc", * "abc"@en or - * "3"^^xsd:int. A URI will look like <http://www.bigdata.com/> + * "3"^^xsd:int. A IRI will look like <http://www.bigdata.com/> * . * * @param v @@ -409,13 +409,13 @@ public static String encodeValue(final Value v) { return null; if (v instanceof BNode) throw new IllegalArgumentException(); - if (v instanceof URI) { + if (v instanceof IRI) { return "<" + v.stringValue() + ">"; } if (v instanceof Literal) { final Literal lit = (Literal) v; final StringBuilder sb = new StringBuilder(); - URI datatype = lit.getDatatype(); + IRI datatype = lit.getDatatype(); sb.append("\""); sb.append(lit.getLabel()); sb.append("\""); diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/IPreparedGraphQuery.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/IPreparedGraphQuery.java index 81c5aecf94..e1cee026f7 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/IPreparedGraphQuery.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/IPreparedGraphQuery.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -27,7 +27,7 @@ package com.bigdata.rdf.sail.webapp.client; -import org.openrdf.query.GraphQueryResult; +import org.eclipse.rdf4j.query.GraphQueryResult; /** * A prepared graph query for the {@link RemoteRepository}. @@ -56,4 +56,4 @@ public interface IPreparedGraphQuery extends IPreparedQuery { */ GraphQueryResult evaluate(IPreparedQueryListener listener) throws Exception; -} +} diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/IPreparedTupleQuery.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/IPreparedTupleQuery.java index 6cbbb98b2f..02c044f7dc 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/IPreparedTupleQuery.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/IPreparedTupleQuery.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -27,7 +27,7 @@ package com.bigdata.rdf.sail.webapp.client; -import org.openrdf.query.TupleQueryResult; +import org.eclipse.rdf4j.query.TupleQueryResult; /** * A prepared tuple query against a {@link JettyeRemoteRepository}. @@ -57,4 +57,4 @@ public interface IPreparedTupleQuery extends IPreparedQuery { public TupleQueryResult evaluate(IPreparedQueryListener listener) throws Exception; -} +} diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/IRemoteRepository.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/IRemoteRepository.java index 9992911a2f..6c043d4e95 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/IRemoteRepository.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/IRemoteRepository.java @@ -25,10 +25,10 @@ import java.util.UUID; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.query.GraphQueryResult; -import org.openrdf.query.TupleQueryResult; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.GraphQueryResult; +import org.eclipse.rdf4j.query.TupleQueryResult; /** * Interface for the Java API to the NanoSparqlServer. See diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepository.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepository.java index 4351705958..286464e500 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepository.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepository.java @@ -23,7 +23,7 @@ package com.bigdata.rdf.sail.webapp.client; -import info.aduna.io.IOUtil; +import org.eclipse.rdf4j.common.io.IOUtil; import java.io.Closeable; import java.io.File; @@ -41,13 +41,13 @@ import org.apache.http.entity.mime.content.ByteArrayBody; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.query.GraphQueryResult; -import org.openrdf.query.TupleQueryResult; -import org.openrdf.rio.RDFFormat; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.GraphQueryResult; +import org.eclipse.rdf4j.query.TupleQueryResult; +import org.eclipse.rdf4j.rio.RDFFormat; import com.bigdata.rdf.sail.remote.BigdataSailRemoteRepository; diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepositoryBase.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepositoryBase.java index 92641444d0..54641ac0c2 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepositoryBase.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepositoryBase.java @@ -36,16 +36,16 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Graph; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.impl.LinkedHashModel; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.query.GraphQueryResult; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFWriter; -import org.openrdf.rio.RDFWriterFactory; -import org.openrdf.rio.RDFWriterRegistry; +import org.eclipse.rdf4j.model.Graph; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.impl.LinkedHashModel; +import org.eclipse.rdf4j.model.impl.URIImpl; +import org.eclipse.rdf4j.query.GraphQueryResult; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFWriter; +import org.eclipse.rdf4j.rio.RDFWriterFactory; +import org.eclipse.rdf4j.rio.RDFWriterRegistry; import org.xml.sax.Attributes; import org.xml.sax.ext.DefaultHandler2; diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepositoryDecls.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepositoryDecls.java index 12dd55cde8..acff08ec9e 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepositoryDecls.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepositoryDecls.java @@ -22,8 +22,8 @@ */ package com.bigdata.rdf.sail.webapp.client; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.impl.URIImpl; //Note: Do not import. Not part of the bigdata-client.jar // diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepositoryManager.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepositoryManager.java index 50b23da5bb..e4c38f6193 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepositoryManager.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepositoryManager.java @@ -50,25 +50,25 @@ import org.eclipse.jetty.client.HttpRequest; import org.eclipse.jetty.client.api.Request; import org.eclipse.jetty.http.HttpMethod; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.GraphQueryResult; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.TupleQueryResult; -import org.openrdf.query.impl.MapBindingSet; -import org.openrdf.query.impl.TupleQueryResultImpl; -import org.openrdf.query.resultio.BooleanQueryResultFormat; -import org.openrdf.query.resultio.BooleanQueryResultParser; -import org.openrdf.query.resultio.BooleanQueryResultParserFactory; -import org.openrdf.query.resultio.BooleanQueryResultParserRegistry; -import org.openrdf.query.resultio.TupleQueryResultFormat; -import org.openrdf.query.resultio.TupleQueryResultParser; -import org.openrdf.query.resultio.TupleQueryResultParserFactory; -import org.openrdf.query.resultio.TupleQueryResultParserRegistry; -import org.openrdf.repository.sparql.query.InsertBindingSetCursor; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParser; -import org.openrdf.rio.RDFParserFactory; -import org.openrdf.rio.RDFParserRegistry; +import org.eclipse.rdf4j.model.impl.ValueFactoryImpl; +import org.eclipse.rdf4j.query.GraphQueryResult; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.TupleQueryResult; +import org.eclipse.rdf4j.query.impl.MapBindingSet; +import org.eclipse.rdf4j.query.impl.TupleQueryResultImpl; +import org.eclipse.rdf4j.query.resultio.BooleanQueryResultFormat; +import org.eclipse.rdf4j.query.resultio.BooleanQueryResultParser; +import org.eclipse.rdf4j.query.resultio.BooleanQueryResultParserFactory; +import org.eclipse.rdf4j.query.resultio.BooleanQueryResultParserRegistry; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultFormat; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultParser; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultParserFactory; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultParserRegistry; +import org.eclipse.rdf4j.repository.sparql.query.InsertBindingSetCursor; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParser; +import org.eclipse.rdf4j.rio.RDFParserFactory; +import org.eclipse.rdf4j.rio.RDFParserRegistry; import com.bigdata.rdf.ServiceProviderHook; import com.bigdata.rdf.properties.PropertiesFormat; diff --git a/bigdata-client/src/test/java/com/bigdata/rdf/sail/remote/BigdataSailRemoteRepositoryConnectionTest.java b/bigdata-client/src/test/java/com/bigdata/rdf/sail/remote/BigdataSailRemoteRepositoryConnectionTest.java index 0110c176d5..7ee56a8468 100644 --- a/bigdata-client/src/test/java/com/bigdata/rdf/sail/remote/BigdataSailRemoteRepositoryConnectionTest.java +++ b/bigdata-client/src/test/java/com/bigdata/rdf/sail/remote/BigdataSailRemoteRepositoryConnectionTest.java @@ -34,20 +34,20 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.query.QueryLanguage; -import org.openrdf.query.TupleQuery; -import org.openrdf.query.TupleQueryResult; -import org.openrdf.query.impl.DatasetImpl; -import org.openrdf.repository.RepositoryException; -import org.openrdf.repository.RepositoryResult; -import org.openrdf.rio.RDFHandler; -import org.openrdf.rio.RDFHandlerException; -import org.openrdf.rio.helpers.RDFHandlerBase; +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.impl.URIImpl; +import org.eclipse.rdf4j.query.QueryLanguage; +import org.eclipse.rdf4j.query.TupleQuery; +import org.eclipse.rdf4j.query.TupleQueryResult; +import org.eclipse.rdf4j.query.impl.DatasetImpl; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.repository.RepositoryResult; +import org.eclipse.rdf4j.rio.RDFHandler; +import org.eclipse.rdf4j.rio.RDFHandlerException; +import org.eclipse.rdf4j.rio.helpers.RDFHandlerBase; import com.bigdata.rdf.sail.webapp.client.EncodeDecodeValue; import com.bigdata.rdf.sail.webapp.client.MockRemoteRepository; @@ -67,16 +67,16 @@ public class BigdataSailRemoteRepositoryConnectionTest extends TestCase { private final boolean includeInferred = false; private final Resource s = new URIImpl("http://test/s"); - private final URI p = new URIImpl("http://test/p"); + private final IRI p = new URIImpl("http://test/p"); private final Value o = new URIImpl("http://test/o"); private final Resource c = new URIImpl("http://test/c"); - private final URI defaultGraph1 = new URIImpl("http://test/defaultGraph1"); - private final URI defaultGraph2 = new URIImpl("http://test/defaultGraph2"); - private final URI namedGraph1 = new URIImpl("http://test/namedGraph1"); - private final URI namedGraph2 = new URIImpl("http://test/namedGraph2"); + private final IRI defaultGraph1 = new URIImpl("http://test/defaultGraph1"); + private final IRI defaultGraph2 = new URIImpl("http://test/defaultGraph2"); + private final IRI namedGraph1 = new URIImpl("http://test/namedGraph1"); + private final IRI namedGraph2 = new URIImpl("http://test/namedGraph2"); private final DatasetImpl dataset = new DatasetImpl(); - private final Set defaultGraphs = new HashSet<>(); - private final Set namedGraphs = new HashSet<>(); + private final Set defaultGraphs = new HashSet<>(); + private final Set namedGraphs = new HashSet<>(); @Before protected void setUp() { diff --git a/bigdata-client/src/test/java/com/bigdata/rdf/sail/webapp/client/MockRemoteRepository.java b/bigdata-client/src/test/java/com/bigdata/rdf/sail/webapp/client/MockRemoteRepository.java index 011a5ae5d0..58840c68c1 100644 --- a/bigdata-client/src/test/java/com/bigdata/rdf/sail/webapp/client/MockRemoteRepository.java +++ b/bigdata-client/src/test/java/com/bigdata/rdf/sail/webapp/client/MockRemoteRepository.java @@ -3,6 +3,7 @@ import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.List; +import java.util.Optional; import java.util.concurrent.Executor; import java.util.concurrent.Executors; @@ -13,8 +14,10 @@ import org.eclipse.jetty.client.api.Result; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.util.Callback; -import org.openrdf.query.resultio.TupleQueryResultFormat; -import org.openrdf.rio.RDFFormat; +import org.eclipse.rdf4j.query.resultio.QueryResultFormat; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultFormat; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultParserRegistry; +import org.eclipse.rdf4j.rio.RDFFormat; public class MockRemoteRepository extends RemoteRepository { @@ -53,10 +56,10 @@ public int getStatus() { }; String requestMimeType = request.getHeaders().get(HttpHeader.ACCEPT).split(";")[0]; - TupleQueryResultFormat tupleQueryMimeType = TupleQueryResultFormat.forMIMEType(requestMimeType); + Optional tupleQueryMimeType = TupleQueryResultParserRegistry.getInstance().getFileFormatForMIMEType(requestMimeType); String responseMimeType; String responseContent; - if (tupleQueryMimeType!=null) { + if (tupleQueryMimeType.isPresent()) { responseMimeType = TupleQueryResultFormat.TSV.getDefaultMIMEType(); responseContent = tupleQueryResponse; } else { diff --git a/bigdata-client/src/test/java/com/bigdata/rdf/sail/webapp/client/TestEncodeDecodeValue.java b/bigdata-client/src/test/java/com/bigdata/rdf/sail/webapp/client/TestEncodeDecodeValue.java index dd2d3471d9..8f049728e7 100644 --- a/bigdata-client/src/test/java/com/bigdata/rdf/sail/webapp/client/TestEncodeDecodeValue.java +++ b/bigdata-client/src/test/java/com/bigdata/rdf/sail/webapp/client/TestEncodeDecodeValue.java @@ -31,14 +31,14 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.LiteralImpl; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.LiteralImpl; +import org.eclipse.rdf4j.model.impl.URIImpl; +import org.eclipse.rdf4j.model.impl.ValueFactoryImpl; +import org.eclipse.rdf4j.model.vocabulary.RDF; /** * Test suite for utility class to encode and decode RDF Values for interchange diff --git a/bigdata-common-util/pom.xml b/bigdata-common-util/pom.xml index 9c1bcfcb4c..0adf1cacaa 100644 --- a/bigdata-common-util/pom.xml +++ b/bigdata-common-util/pom.xml @@ -28,12 +28,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../pom.xml com.blazegraph bigdata-common-util - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT Blazegraph Common Utilities Blazegraph utilities common across artifacts @@ -129,9 +129,9 @@ ga('send', 'pageview'); ${colt.version} - org.openrdf.sesame - sesame-util - ${sesame.version} + org.eclipse.rdf4j + rdf4j-util + ${rdf4j.version} com.blazegraph diff --git a/bigdata-common-util/src/main/java/com/bigdata/util/Depends.java b/bigdata-common-util/src/main/java/com/bigdata/util/Depends.java index 548c7cf0fc..8e4f40611d 100644 --- a/bigdata-common-util/src/main/java/com/bigdata/util/Depends.java +++ b/bigdata-common-util/src/main/java/com/bigdata/util/Depends.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -238,7 +238,7 @@ public LGPL21Dep(String component, String projectURL) { private final static Dep slf4j = new Dep("slf4j", "http://www.slf4j.org/", "http://www.slf4j.org/license.html"); - private final static Dep sesame = new Dep("sesame", + private final static Dep rdf4j = new Dep("rdf4j", "http://www.openrdf.org/", "http://www.openrdf.org/download.jsp"); //Used for RDFa support. Apache2 License @@ -266,10 +266,10 @@ public LGPL21Dep(String component, String projectURL) { private final static Dep jetty = new Dep("jetty", "http://www.eclipse.org/jetty/", "http://www.apache.org/licenses/LICENSE-2.0.html"); - - private final static Dep jsonld = new Dep("jsonld", - "https://github.com/jsonld-java/jsonld-java/", - "https://raw.githubusercontent.com/jsonld-java/jsonld-java/master/LICENCE"); + + private final static Dep jsonld = new Dep("jsonld", + "https://github.com/jsonld-java/jsonld-java/", + "https://raw.githubusercontent.com/jsonld-java/jsonld-java/master/LICENCE"); private final static Dep servletApi = new ApacheDep("servlet-api", "http://tomcat.apache.org"); @@ -317,13 +317,13 @@ public LGPL21Dep(String component, String projectURL) { // webapp // cweb,// slf4j,// - sesame,// + rdf4j,// semargl,// icu,// // nxparser,// nanohttp,// jetty,// - jsonld,// + jsonld,// servletApi,// jacksonCore,// blueprintsCore,// diff --git a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/Example1.java b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/Example1.java index 25b1ed7eeb..7c3f9de4f7 100644 --- a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/Example1.java +++ b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/Example1.java @@ -6,8 +6,8 @@ import java.util.concurrent.Executors; import org.eclipse.jetty.client.HttpClient; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; import com.bigdata.BigdataStatics; import com.bigdata.gom.gpo.IGPO; diff --git a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/IGOMProxy.java b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/IGOMProxy.java index 5910ecd9af..53b88b027e 100644 --- a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/IGOMProxy.java +++ b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/IGOMProxy.java @@ -3,10 +3,10 @@ import java.io.IOException; import java.net.URL; -import org.openrdf.model.ValueFactory; -import org.openrdf.repository.RepositoryException; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParseException; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParseException; import com.bigdata.gom.om.IObjectManager; diff --git a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/LocalGOMTestCase.java b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/LocalGOMTestCase.java index d5f3ce6597..c6dc8b161f 100644 --- a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/LocalGOMTestCase.java +++ b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/LocalGOMTestCase.java @@ -37,10 +37,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.ValueFactory; -import org.openrdf.repository.RepositoryException; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParseException; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParseException; import com.bigdata.BigdataStatics; import com.bigdata.gom.om.IObjectManager; diff --git a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/ProxyGOMTest.java b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/ProxyGOMTest.java index e292d706cd..97f01ff92b 100644 --- a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/ProxyGOMTest.java +++ b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/ProxyGOMTest.java @@ -7,12 +7,12 @@ import java.net.URL; import java.util.Iterator; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.vocabulary.RDFS; -import org.openrdf.repository.RepositoryException; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParseException; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.vocabulary.RDFS; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParseException; import com.bigdata.gom.gpo.IGPO; import com.bigdata.gom.om.IObjectManager; diff --git a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/RemoteGOMTestCase.java b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/RemoteGOMTestCase.java index 36aa32d7a8..a00f96906b 100644 --- a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/RemoteGOMTestCase.java +++ b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/RemoteGOMTestCase.java @@ -44,10 +44,10 @@ import org.apache.logging.log4j.Logger; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.server.Server; -import org.openrdf.model.ValueFactory; -import org.openrdf.repository.RepositoryException; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParseException; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParseException; import com.bigdata.BigdataStatics; import com.bigdata.gom.om.IObjectManager; diff --git a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestGOM.java b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestGOM.java index 42c5fa5118..d4dcfc231d 100644 --- a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestGOM.java +++ b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestGOM.java @@ -36,12 +36,12 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.ValueFactory; -import org.openrdf.repository.RepositoryException; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParseException; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParseException; import com.bigdata.gom.gpo.BasicSkin; import com.bigdata.gom.gpo.GPO; diff --git a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestGPO.java b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestGPO.java index 2a118172cc..3014c64b3a 100644 --- a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestGPO.java +++ b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestGPO.java @@ -31,12 +31,12 @@ import junit.framework.Test; import junit.framework.TestCase; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.repository.RepositoryException; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParseException; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParseException; import com.bigdata.gom.gpo.IGPO; import com.bigdata.gom.gpo.ILinkSet; diff --git a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestNumericBNodes.java b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestNumericBNodes.java index bcc750b3a7..c05261bc14 100644 --- a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestNumericBNodes.java +++ b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestNumericBNodes.java @@ -2,8 +2,8 @@ import java.util.Properties; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParserRegistry; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParserRegistry; import com.bigdata.rdf.axioms.NoAxioms; import com.bigdata.rdf.rio.turtle.BigdataTurtleParser; diff --git a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestOWLSkin.java b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestOWLSkin.java index 67c95f9c3d..454e9e1918 100644 --- a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestOWLSkin.java +++ b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestOWLSkin.java @@ -32,9 +32,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.repository.RepositoryException; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParseException; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParseException; import com.bigdata.gom.alchemy.owl.OWLClassSkin; import com.bigdata.gom.alchemy.owl.OWLOntologySkin; diff --git a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestOwlGOM.java b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestOwlGOM.java index 94ae3510f3..3270af19a8 100644 --- a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestOwlGOM.java +++ b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestOwlGOM.java @@ -36,13 +36,13 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.URI; -import org.openrdf.model.vocabulary.OWL; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; -import org.openrdf.repository.RepositoryException; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParseException; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParseException; import com.bigdata.gom.gpo.IGPO; diff --git a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestRemoteGOM.java b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestRemoteGOM.java index 35e4426a26..b7d02888fe 100644 --- a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestRemoteGOM.java +++ b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestRemoteGOM.java @@ -45,12 +45,12 @@ import org.apache.logging.log4j.Logger; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.server.Server; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.ValueFactory; -import org.openrdf.repository.RepositoryException; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParseException; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParseException; import com.bigdata.BigdataStatics; import com.bigdata.gom.gpo.IGPO; diff --git a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/engine/AbstractQueryEngineTestCase.java b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/engine/AbstractQueryEngineTestCase.java index 1ad2a4d7c0..b6e1e2c523 100644 --- a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/engine/AbstractQueryEngineTestCase.java +++ b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/engine/AbstractQueryEngineTestCase.java @@ -58,8 +58,8 @@ Copyright Aduna (http://www.aduna-software.com/) � 2001-2007 package com.bigdata.bop.engine; -import info.aduna.iteration.Iterations; -import info.aduna.text.StringUtil; +import org.eclipse.rdf4j.common.iteration.Iterations; +import org.eclipse.rdf4j.common.text.StringUtil; import java.util.ArrayList; import java.util.Arrays; @@ -77,13 +77,13 @@ Copyright Aduna (http://www.aduna-software.com/) � 2001-2007 import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Statement; -import org.openrdf.model.util.ModelUtil; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.QueryResultUtil; -import org.openrdf.query.TupleQueryResult; -import org.openrdf.query.impl.MutableTupleQueryResult; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.util.ModelUtil; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.QueryResultUtil; +import org.eclipse.rdf4j.query.TupleQueryResult; +import org.eclipse.rdf4j.query.impl.MutableTupleQueryResult; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/join/AbstractHashJoinOpTestCase.java b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/join/AbstractHashJoinOpTestCase.java index 203a5231f3..9288e439fd 100644 --- a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/join/AbstractHashJoinOpTestCase.java +++ b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/join/AbstractHashJoinOpTestCase.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -61,7 +61,7 @@ import com.bigdata.journal.ITx; import com.bigdata.journal.Journal; import com.bigdata.rdf.internal.IV; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValue; import com.bigdata.rdf.model.BigdataValueFactory; import com.bigdata.rdf.model.StatementEnum; @@ -131,14 +131,14 @@ public JoinSetup(final String kbNamespace) { { final BigdataValueFactory vf = kb.getValueFactory(); final String uriString = "http://bigdata.com/"; - final BigdataURI _knows = vf.asValue(FOAFVocabularyDecl.knows); - final BigdataURI _brad = vf.createURI(uriString+"brad"); - final BigdataURI _john = vf.createURI(uriString+"john"); - final BigdataURI _fred = vf.createURI(uriString+"fred"); - final BigdataURI _mary = vf.createURI(uriString+"mary"); - final BigdataURI _paul = vf.createURI(uriString+"paul"); - final BigdataURI _leon = vf.createURI(uriString+"leon"); - final BigdataURI _luke = vf.createURI(uriString+"luke"); + final BigdataIRI _knows = vf.asValue(FOAFVocabularyDecl.knows); + final BigdataIRI _brad = vf.createURI(uriString+"brad"); + final BigdataIRI _john = vf.createURI(uriString+"john"); + final BigdataIRI _fred = vf.createURI(uriString+"fred"); + final BigdataIRI _mary = vf.createURI(uriString+"mary"); + final BigdataIRI _paul = vf.createURI(uriString+"paul"); + final BigdataIRI _leon = vf.createURI(uriString+"leon"); + final BigdataIRI _luke = vf.createURI(uriString+"luke"); final BigdataValue[] a = new BigdataValue[] { _knows,// diff --git a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/join/AbstractHashJoinUtilityTestCase.java b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/join/AbstractHashJoinUtilityTestCase.java index bf2d927e59..b7d442ddbe 100644 --- a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/join/AbstractHashJoinUtilityTestCase.java +++ b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/join/AbstractHashJoinUtilityTestCase.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -35,10 +35,10 @@ import junit.framework.TestCase; -import org.openrdf.model.Value; -import org.openrdf.model.impl.LiteralImpl; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.impl.LiteralImpl; +import org.eclipse.rdf4j.model.impl.URIImpl; +import org.eclipse.rdf4j.model.vocabulary.RDF; import com.bigdata.bop.BOp; import com.bigdata.bop.BOpContext; @@ -2695,4 +2695,4 @@ public void test_service04b() { } -} +} diff --git a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/AbstractAggregationTestCase.java b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/AbstractAggregationTestCase.java index d6de01ff44..e929094d2e 100644 --- a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/AbstractAggregationTestCase.java +++ b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/AbstractAggregationTestCase.java @@ -34,7 +34,7 @@ import junit.framework.TestCase2; -import org.openrdf.query.algebra.Compare.CompareOp; +import org.eclipse.rdf4j.query.algebra.Compare.CompareOp; import com.bigdata.bop.BOpContext; import com.bigdata.bop.Bind; diff --git a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/AbstractDistinctSolutionsTestCase.java b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/AbstractDistinctSolutionsTestCase.java index 09ebf38ac0..43f7e685c8 100644 --- a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/AbstractDistinctSolutionsTestCase.java +++ b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/AbstractDistinctSolutionsTestCase.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -35,8 +35,8 @@ import junit.framework.TestCase2; -import org.openrdf.model.Value; -import org.openrdf.model.impl.LiteralImpl; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.impl.LiteralImpl; import com.bigdata.bop.BOp; import com.bigdata.bop.BOpContext; diff --git a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/TestGroupByRewriter.java b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/TestGroupByRewriter.java index fa511b7974..a53e95cec6 100644 --- a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/TestGroupByRewriter.java +++ b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/TestGroupByRewriter.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -31,7 +31,7 @@ import junit.framework.TestCase2; -import org.openrdf.query.algebra.Compare.CompareOp; +import org.eclipse.rdf4j.query.algebra.Compare.CompareOp; import com.bigdata.bop.Bind; import com.bigdata.bop.Constant; diff --git a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/TestGroupByState.java b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/TestGroupByState.java index 9e9ebbcef7..9f7d926949 100644 --- a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/TestGroupByState.java +++ b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/TestGroupByState.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -31,7 +31,7 @@ import junit.framework.TestCase2; -import org.openrdf.query.algebra.Compare.CompareOp; +import org.eclipse.rdf4j.query.algebra.Compare.CompareOp; import com.bigdata.bop.Bind; import com.bigdata.bop.Constant; diff --git a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/TestIVComparator.java b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/TestIVComparator.java index efad2ee049..acc9bb4b6a 100644 --- a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/TestIVComparator.java +++ b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/TestIVComparator.java @@ -30,7 +30,7 @@ import junit.framework.TestCase2; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.URI; import com.bigdata.rdf.internal.IDatatypeURIResolver; import com.bigdata.rdf.internal.IV; @@ -44,7 +44,7 @@ import com.bigdata.rdf.internal.impl.literal.XSDNumericIV; import com.bigdata.rdf.model.BigdataBNode; import com.bigdata.rdf.model.BigdataLiteral; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValue; import com.bigdata.rdf.model.BigdataValueFactory; import com.bigdata.rdf.model.BigdataValueFactoryImpl; @@ -101,8 +101,8 @@ private static class V { /* * URIs */ - final IV noninline_uri1 = new TermId(VTE.URI, termId++); - final IV noninline_uri2 = new TermId(VTE.URI, termId++); + final IV noninline_uri1 = new TermId(VTE.URI, termId++); + final IV noninline_uri2 = new TermId(VTE.URI, termId++); /* * Blank nodes. @@ -126,8 +126,8 @@ public V() { } final IDatatypeURIResolver resolver = new IDatatypeURIResolver() { - public BigdataURI resolve(final URI uri) { - final BigdataURI buri = f.createURI(uri.stringValue()); + public BigdataIRI resolve(final URI uri) { + final BigdataIRI buri = f.createURI(uri.stringValue()); buri.setIV(new TermId(VTE.URI,termId++)); return buri; } diff --git a/bigdata-core-test/pom.xml b/bigdata-core-test/pom.xml index b1a0d17d13..de7908e5b7 100644 --- a/bigdata-core-test/pom.xml +++ b/bigdata-core-test/pom.xml @@ -29,12 +29,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../pom.xml com.blazegraph bigdata-core-test - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT jar Blazegraph Core Tests Blazegraph Core Platform Test Suites @@ -383,34 +383,35 @@ See https://maven.apache.org/plugins/maven-jar-plugin/examples/create-test-jar.h ${jettison.version} - org.openrdf.sesame - sesame-runtime - ${sesame.version} + org.eclipse.rdf4j + rdf4j-runtime + ${rdf4j.version} + pom - org.openrdf.sesame - sesame-rio-rdfxml - ${sesame.version} + org.eclipse.rdf4j + rdf4j-rio-rdfxml + ${rdf4j.version} - org.openrdf.sesame - sesame-queryresultio-sparqljson - ${sesame.version} + org.eclipse.rdf4j + rdf4j-queryresultio-sparqljson + ${rdf4j.version} - org.openrdf.sesame - sesame-rio-testsuite - ${sesame.version} + org.eclipse.rdf4j + rdf4j-rio-testsuite + ${rdf4j.version} - org.openrdf.sesame - sesame-sparql-testsuite - ${sesame.version} + org.eclipse.rdf4j + rdf4j-sparql-testsuite + ${rdf4j.version} - org.openrdf.sesame - sesame-store-testsuite - ${sesame.version} + org.eclipse.rdf4j + rdf4j-store-testsuite + ${rdf4j.version} org.semarglproject - semargl-sesame + semargl-rdf4j ${semargl.version} diff --git a/blazegraph-artifacts/pom.xml b/blazegraph-artifacts/pom.xml index 980b9bc7ac..768b65eb35 100644 --- a/blazegraph-artifacts/pom.xml +++ b/blazegraph-artifacts/pom.xml @@ -28,12 +28,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../pom.xml com.blazegraph blazegraph-artifacts - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT Blazegraph Deployment Artifacts Parent POM for Blazegraph Deployment (war, jar, deb, rpm, tgz) artifacts pom diff --git a/blazegraph-colt/pom.xml b/blazegraph-colt/pom.xml index 2cd0852ab2..0fa6d4fa4c 100644 --- a/blazegraph-colt/pom.xml +++ b/blazegraph-colt/pom.xml @@ -28,12 +28,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../pom.xml com.blazegraph blazegraph-colt - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT Blazegraph Colt Blazegraph Modifications to the Colt libraries to remove hep.aida. Forked under LGPL 2.1 from the original license: Copyright (c) 1999 CERN - European Organization for Nuclear Research. Permission to use, copy, modify, distribute and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation. CERN makes no representations about the suitability of this software for any purpose. It is provided "as is" without expressed or implied warranty. jar diff --git a/blazegraph-war/pom.xml b/blazegraph-war/pom.xml index 9edc315b97..b89bd1c5aa 100644 --- a/blazegraph-war/pom.xml +++ b/blazegraph-war/pom.xml @@ -30,12 +30,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) com.blazegraph blazegraph-artifacts - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../blazegraph-artifacts/pom.xml com.blazegraph blazegraph-war - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT Blazegraph WAR Blazegraph Web Application Archive war @@ -345,19 +345,20 @@ ga('send', 'pageview'); ${jackson.version} - org.openrdf.sesame - sesame-runtime - ${sesame.version} + org.eclipse.rdf4j + rdf4j-runtime + ${rdf4j.version} + pom - org.openrdf.sesame - sesame-rio-rdfxml - ${sesame.version} + org.eclipse.rdf4j + rdf4j-rio-rdfxml + ${rdf4j.version} - org.openrdf.sesame - sesame-queryresultio-sparqljson - ${sesame.version} + org.eclipse.rdf4j + rdf4j-queryresultio-sparqljson + ${rdf4j.version} com.tinkerpop.blueprints @@ -397,7 +398,7 @@ ga('send', 'pageview'); ${jsonld.version} - org.openrdf.sesame + org.eclipse.rdf4j * @@ -409,7 +410,7 @@ ga('send', 'pageview'); org.semarglproject - semargl-sesame + semargl-rdf4j ${semargl.version} diff --git a/contrib/src/problems/alex/LoadPdb.java b/contrib/src/problems/alex/LoadPdb.java index a81b8e97fe..16a23bbc05 100644 --- a/contrib/src/problems/alex/LoadPdb.java +++ b/contrib/src/problems/alex/LoadPdb.java @@ -7,21 +7,21 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryLanguage; -import org.openrdf.query.TupleQuery; -import org.openrdf.query.TupleQueryResult; -import org.openrdf.repository.Repository; -import org.openrdf.repository.RepositoryConnection; -import org.openrdf.repository.RepositoryResult; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParser; -import org.openrdf.rio.RDFParserRegistry; -import org.openrdf.rio.helpers.StatementCollector; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryLanguage; +import org.eclipse.rdf4j.query.TupleQuery; +import org.eclipse.rdf4j.query.TupleQueryResult; +import org.eclipse.rdf4j.repository.Repository; +import org.eclipse.rdf4j.repository.RepositoryConnection; +import org.eclipse.rdf4j.repository.RepositoryResult; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParser; +import org.eclipse.rdf4j.rio.RDFParserRegistry; +import org.eclipse.rdf4j.rio.helpers.StatementCollector; import com.bigdata.rdf.model.BigdataStatement; import com.bigdata.rdf.sail.BigdataSail; diff --git a/ctc-striterators/pom.xml b/ctc-striterators/pom.xml index 60b0ea08ad..389693971c 100644 --- a/ctc-striterators/pom.xml +++ b/ctc-striterators/pom.xml @@ -28,12 +28,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../pom.xml com.blazegraph ctc-striterators - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT CTC Striterators CTC Streaming Iterator utilities jar diff --git a/dsi-utils/pom.xml b/dsi-utils/pom.xml index dc6f7d7552..208c35ed89 100644 --- a/dsi-utils/pom.xml +++ b/dsi-utils/pom.xml @@ -28,12 +28,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../pom.xml com.blazegraph dsi-utils - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT Blazegraph DSI Utils Blazegraph Modifications to the DSI utils. This are forked from version 1.10.0 under LGPLv2.1. jar diff --git a/junit-ext/pom.xml b/junit-ext/pom.xml index cdfad9ce1d..e88c277657 100644 --- a/junit-ext/pom.xml +++ b/junit-ext/pom.xml @@ -22,12 +22,12 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../pom.xml com.blazegraph junit-ext - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT Blazegraph Junit Extensions Blazegraph JUnit Extensions jar diff --git a/lgpl-utils/pom.xml b/lgpl-utils/pom.xml index 048f8263ef..d3596453ac 100644 --- a/lgpl-utils/pom.xml +++ b/lgpl-utils/pom.xml @@ -28,12 +28,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../pom.xml com.blazegraph lgpl-utils - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT Blazegraph LGPL Utils Blazegraph Modifications to the LGPL utils. This are forked from a version under LGPLv2.1. jar diff --git a/pom.xml b/pom.xml index 7d68cefd9e..85a84528a5 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) 4.0.0 com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT pom Blazegraph Database Platform Blazegraph™ DB is our ultra high-performance graph database supporting Blueprints and RDF/SPARQL APIs. It supports up to 50 Billion edges on a single machine and has a High Availability and Scale-out architecture. It is in production use for customers such as EMC, Syapse, Wikidata Query Service, the British Museum, and many others. GPU acceleration and High Availability (HA) are available in the Enterprise edition. It contains war, jar, deb, rpm, and tar.gz deployment artifacts. @@ -206,7 +206,7 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) 4.8.2 3.9.3 - 2.9.0 + 3.7.7 0.13.6 0.7 1.7.36 @@ -226,7 +226,7 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) ${project.version} 6.5.16 2.6.7 @@ -386,9 +386,9 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) bigdata-war-html bigdata-blueprints bigdata-runtime - bigdata-core-test/ - bigdata-rdf-test/ - bigdata-sails-test/ + bigdata-core-test + bigdata-rdf-test + bigdata-sails-test diff --git a/rdf-properties/pom.xml b/rdf-properties/pom.xml index aaf3b19b49..935de057f3 100644 --- a/rdf-properties/pom.xml +++ b/rdf-properties/pom.xml @@ -30,12 +30,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../pom.xml com.blazegraph rdf-properties - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT Blazegraph RDF Properties RDF Property configurations @@ -78,19 +78,19 @@ ga('send', 'pageview'); ${apache.commons_io.version} - org.openrdf.sesame - sesame-util - ${sesame.version} + org.eclipse.rdf4j + rdf4j-util + ${rdf4j.version} - org.openrdf.sesame - sesame-rio-rdfxml - ${sesame.version} + org.eclipse.rdf4j + rdf4j-rio-rdfxml + ${rdf4j.version} - org.openrdf.sesame - sesame-queryresultio-sparqljson - ${sesame.version} + org.eclipse.rdf4j + rdf4j-queryresultio-sparqljson + ${rdf4j.version} @@ -99,7 +99,7 @@ ga('send', 'pageview'); ${jsonld.version} - org.openrdf.sesame + org.eclipse.rdf4j * @@ -111,7 +111,7 @@ ga('send', 'pageview'); org.semarglproject - semargl-sesame + semargl-rdf4j ${semargl.version} diff --git a/rdf-properties/src/main/java/com/bigdata/rdf/ServiceProviderHook.java b/rdf-properties/src/main/java/com/bigdata/rdf/ServiceProviderHook.java index 0c25a2e616..1399cdcd85 100644 --- a/rdf-properties/src/main/java/com/bigdata/rdf/ServiceProviderHook.java +++ b/rdf-properties/src/main/java/com/bigdata/rdf/ServiceProviderHook.java @@ -27,7 +27,7 @@ package com.bigdata.rdf; -import info.aduna.lang.service.ServiceRegistry; +import org.eclipse.rdf4j.common.lang.service.ServiceRegistry; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -37,16 +37,16 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.query.QueryLanguage; -import org.openrdf.query.resultio.TupleQueryResultParserFactory; -import org.openrdf.query.resultio.TupleQueryResultParserRegistry; -import org.openrdf.query.resultio.TupleQueryResultWriterFactory; -import org.openrdf.query.resultio.TupleQueryResultWriterRegistry; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParserFactory; -import org.openrdf.rio.RDFParserRegistry; -import org.openrdf.rio.RDFWriterFactory; -import org.openrdf.rio.RDFWriterRegistry; +import org.eclipse.rdf4j.query.QueryLanguage; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultParserFactory; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultParserRegistry; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultWriterFactory; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultWriterRegistry; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParserFactory; +import org.eclipse.rdf4j.rio.RDFParserRegistry; +import org.eclipse.rdf4j.rio.RDFWriterFactory; +import org.eclipse.rdf4j.rio.RDFWriterRegistry; /** * This static class provides a hook which allows the replacement of services @@ -193,7 +193,7 @@ synchronized static public void forceLoad() { // * classes. // */ // { -// final String className = "info.aduna.lang.service.ServiceRegistry"; +// final String className = "rg.eclipse.rdf4j.common.lang.service.ServiceRegistry"; // try { // Class.forName(className); // } catch (ClassNotFoundException ex) { diff --git a/rdf-properties/src/main/java/com/bigdata/rdf/properties/PropertiesFormat.java b/rdf-properties/src/main/java/com/bigdata/rdf/properties/PropertiesFormat.java index 209c1d9694..70da2a2d3d 100644 --- a/rdf-properties/src/main/java/com/bigdata/rdf/properties/PropertiesFormat.java +++ b/rdf-properties/src/main/java/com/bigdata/rdf/properties/PropertiesFormat.java @@ -57,7 +57,7 @@ Copyright Aduna (http://www.aduna-software.com/) � 2001-2007 */ package com.bigdata.rdf.properties; -import info.aduna.lang.FileFormat; +import org.eclipse.rdf4j.common.lang.FileFormat; import java.nio.charset.Charset; import java.util.Arrays; @@ -203,8 +203,7 @@ public static PropertiesFormat forMIMEType(final String mimeType) { public static PropertiesFormat forMIMEType(String mimeType, PropertiesFormat fallback) { - return matchMIMEType(mimeType, formats/* Iterable */, - fallback); + return matchMIMEType(mimeType, formats/* Iterable */).orElse(fallback); } diff --git a/rdf-properties/src/main/java/com/bigdata/rdf/properties/PropertiesParserRegistry.java b/rdf-properties/src/main/java/com/bigdata/rdf/properties/PropertiesParserRegistry.java index 8f7d162a80..d226a2e61c 100644 --- a/rdf-properties/src/main/java/com/bigdata/rdf/properties/PropertiesParserRegistry.java +++ b/rdf-properties/src/main/java/com/bigdata/rdf/properties/PropertiesParserRegistry.java @@ -57,9 +57,9 @@ Copyright Aduna (http://www.aduna-software.com/) � 2001-2007 */ package com.bigdata.rdf.properties; -import info.aduna.lang.service.FileFormatServiceRegistry; +import org.eclipse.rdf4j.common.lang.service.FileFormatServiceRegistry; -import org.openrdf.rio.RDFParserFactory; +import org.eclipse.rdf4j.rio.RDFParserFactory; /** * A registry that keeps track of the available {@link RDFParserFactory}s. diff --git a/rdf-properties/src/main/java/com/bigdata/rdf/properties/PropertiesWriterRegistry.java b/rdf-properties/src/main/java/com/bigdata/rdf/properties/PropertiesWriterRegistry.java index 3b10086ee0..acbd5cbae1 100644 --- a/rdf-properties/src/main/java/com/bigdata/rdf/properties/PropertiesWriterRegistry.java +++ b/rdf-properties/src/main/java/com/bigdata/rdf/properties/PropertiesWriterRegistry.java @@ -57,7 +57,7 @@ Copyright Aduna (http://www.aduna-software.com/) � 2001-2007 */ package com.bigdata.rdf.properties; -import info.aduna.lang.service.FileFormatServiceRegistry; +import org.eclipse.rdf4j.common.lang.service.FileFormatServiceRegistry; /** * A registry that keeps track of the available {@link PropertiesWriterFactory} diff --git a/sparql-grammar/pom.xml b/sparql-grammar/pom.xml index a1d121257e..e41c01243c 100644 --- a/sparql-grammar/pom.xml +++ b/sparql-grammar/pom.xml @@ -29,12 +29,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../pom.xml com.blazegraph sparql-grammar - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT jar Blazegraph Sparql Grammar Blazegraph(TM) SPARQL Grammar @@ -81,9 +81,10 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) - org.openrdf.sesame - sesame-runtime - ${sesame.version} + org.eclipse.rdf4j + rdf4j-runtime + ${rdf4j.version} + pom diff --git a/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTCompare.java b/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTCompare.java index 5edc42f3ce..6160c427c3 100644 --- a/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTCompare.java +++ b/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTCompare.java @@ -2,7 +2,7 @@ package com.bigdata.rdf.sail.sparql.ast; -import org.openrdf.query.algebra.Compare.CompareOp; +import org.eclipse.rdf4j.query.algebra.Compare.CompareOp; import com.bigdata.rdf.sail.sparql.ast.SimpleNode; import com.bigdata.rdf.sail.sparql.ast.SyntaxTreeBuilder; import com.bigdata.rdf.sail.sparql.ast.SyntaxTreeBuilderVisitor; diff --git a/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTLoad.java b/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTLoad.java index 4facdd286c..c19c6029de 100644 --- a/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTLoad.java +++ b/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTLoad.java @@ -2,7 +2,7 @@ /* JavaCCOptions:MULTI=true,NODE_USES_PARSER=false,VISITOR=true,TRACK_TOKENS=false,NODE_PREFIX=AST,NODE_EXTENDS=,NODE_FACTORY=,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */ package com.bigdata.rdf.sail.sparql.ast; -import org.openrdf.rio.RDFParser.DatatypeHandling; +import org.eclipse.rdf4j.rio.RDFParser.DatatypeHandling; public class ASTLoad extends ASTUpdate { diff --git a/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTMath.java b/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTMath.java index df964d0555..a436f499ad 100644 --- a/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTMath.java +++ b/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTMath.java @@ -2,7 +2,7 @@ package com.bigdata.rdf.sail.sparql.ast; -import org.openrdf.query.algebra.MathExpr.MathOp; +import org.eclipse.rdf4j.query.algebra.MathExpr.MathOp; import com.bigdata.rdf.sail.sparql.ast.SimpleNode; import com.bigdata.rdf.sail.sparql.ast.SyntaxTreeBuilder; import com.bigdata.rdf.sail.sparql.ast.SyntaxTreeBuilderVisitor; diff --git a/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTNumericLiteral.java b/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTNumericLiteral.java index 771abc62ff..b0b7296f5d 100644 --- a/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTNumericLiteral.java +++ b/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTNumericLiteral.java @@ -2,7 +2,7 @@ package com.bigdata.rdf.sail.sparql.ast; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.URI; import com.bigdata.rdf.sail.sparql.ast.ASTRDFValue; import com.bigdata.rdf.sail.sparql.ast.SyntaxTreeBuilder; import com.bigdata.rdf.sail.sparql.ast.SyntaxTreeBuilderVisitor; diff --git a/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTRDFValue.java b/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTRDFValue.java index 6146efad4c..668e02f005 100644 --- a/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTRDFValue.java +++ b/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTRDFValue.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -27,7 +27,7 @@ package com.bigdata.rdf.sail.sparql.ast; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; import com.bigdata.rdf.sail.sparql.ast.SimpleNode; import com.bigdata.rdf.sail.sparql.ast.SyntaxTreeBuilder; diff --git a/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/SyntaxTreeBuilder.java b/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/SyntaxTreeBuilder.java index fd41db8b7e..f3b471ba8f 100644 --- a/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/SyntaxTreeBuilder.java +++ b/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/SyntaxTreeBuilder.java @@ -3,12 +3,12 @@ import java.io.StringReader; -import org.openrdf.model.URI; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.XMLSchema; -import org.openrdf.query.algebra.Compare.CompareOp; -import org.openrdf.query.algebra.MathExpr.MathOp; -import org.openrdf.rio.RDFParser.DatatypeHandling; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.query.algebra.Compare.CompareOp; +import org.eclipse.rdf4j.query.algebra.MathExpr.MathOp; +import org.eclipse.rdf4j.rio.RDFParser.DatatypeHandling; public class SyntaxTreeBuilder/*@bgen(jjtree)*/implements SyntaxTreeBuilderTreeConstants, SyntaxTreeBuilderConstants {/*@bgen(jjtree)*/ protected JJTSyntaxTreeBuilderState jjtree = new JJTSyntaxTreeBuilderState(); diff --git a/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/SyntaxTreeBuilderTokenManager.java b/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/SyntaxTreeBuilderTokenManager.java index 806fd8e955..6cefc7a935 100644 --- a/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/SyntaxTreeBuilderTokenManager.java +++ b/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/SyntaxTreeBuilderTokenManager.java @@ -1,12 +1,12 @@ /* Generated By:JJTree&JavaCC: Do not edit this line. SyntaxTreeBuilderTokenManager.java */ package com.bigdata.rdf.sail.sparql.ast; import java.io.StringReader; -import org.openrdf.model.URI; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.XMLSchema; -import org.openrdf.query.algebra.Compare.CompareOp; -import org.openrdf.query.algebra.MathExpr.MathOp; -import org.openrdf.rio.RDFParser.DatatypeHandling; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.query.algebra.Compare.CompareOp; +import org.eclipse.rdf4j.query.algebra.MathExpr.MathOp; +import org.eclipse.rdf4j.rio.RDFParser.DatatypeHandling; /** Token Manager. */ public class SyntaxTreeBuilderTokenManager implements SyntaxTreeBuilderConstants diff --git a/system-utils/pom.xml b/system-utils/pom.xml index c40dc58871..0deaa70fe0 100644 --- a/system-utils/pom.xml +++ b/system-utils/pom.xml @@ -28,12 +28,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../pom.xml com.blazegraph system-utils - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT Blazegraph System Utilities System Utilities for Blazegraph DB diff --git a/vocabularies/pom.xml b/vocabularies/pom.xml index 087c44ad09..eab08e1107 100644 --- a/vocabularies/pom.xml +++ b/vocabularies/pom.xml @@ -28,12 +28,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../pom.xml com.blazegraph vocabularies - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT Blazegraph Vocabularies Blazegraph Custom Vocabularies and Inline URI Handlers for commonly used data sets. diff --git a/vocabularies/src/main/java/com/blazegraph/vocab/pubchem/PubChemVocabularyDecl.java b/vocabularies/src/main/java/com/blazegraph/vocab/pubchem/PubChemVocabularyDecl.java index 126ce6a9cd..6edeeb1f4f 100644 --- a/vocabularies/src/main/java/com/blazegraph/vocab/pubchem/PubChemVocabularyDecl.java +++ b/vocabularies/src/main/java/com/blazegraph/vocab/pubchem/PubChemVocabularyDecl.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC 2006-2015. All rights reserved. +Copyright (C) SYSTAP, LLC 2006-2015. All rights reserved. Contact: SYSTAP, LLC @@ -31,8 +31,8 @@ import java.util.Collections; import java.util.Iterator; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.impl.URIImpl; import com.bigdata.rdf.util.VocabBuilder; import com.bigdata.rdf.vocab.VocabularyDecl; diff --git a/vocabularies/src/test/java/com/blazegraph/vocab/pubchem/TestPubchemVocabInlineUris.java b/vocabularies/src/test/java/com/blazegraph/vocab/pubchem/TestPubchemVocabInlineUris.java index 4ea4c8ae65..6394f24a96 100644 --- a/vocabularies/src/test/java/com/blazegraph/vocab/pubchem/TestPubchemVocabInlineUris.java +++ b/vocabularies/src/test/java/com/blazegraph/vocab/pubchem/TestPubchemVocabInlineUris.java @@ -9,7 +9,7 @@ import com.bigdata.rdf.axioms.NoAxioms; import com.bigdata.rdf.model.BigdataStatement; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValueFactory; import com.bigdata.rdf.rio.StatementBuffer; import com.bigdata.rdf.sail.BigdataSail; @@ -65,15 +65,15 @@ public void test_PubChemInlineValues() { final BigdataValueFactory vf = store.getValueFactory(); - final LinkedList uriList = new LinkedList(); + final LinkedList uriList = new LinkedList(); Random rand = new Random(); final StatementBuffer sb = new StatementBuffer( store, PubChemInlineURIFactory.uris.length/* capacity */); - BigdataURI pred = vf.createURI("http://semanticscience.org/resource/CHEMINF_000461"); - BigdataURI obj = vf.createURI("http://rdf.ncbi.nlm.nih.gov/pubchem/compound/CID1726184"); + BigdataIRI pred = vf.createURI("http://semanticscience.org/resource/CHEMINF_000461"); + BigdataIRI obj = vf.createURI("http://rdf.ncbi.nlm.nih.gov/pubchem/compound/CID1726184"); for (int i = 0; i < PubChemInlineURIFactory.uris.length; i++) { @@ -82,7 +82,7 @@ public void test_PubChemInlineValues() { final int test = rand.nextInt(999999); - final BigdataURI uri = vf.createURI(uriStr+prefix+test); + final BigdataIRI uri = vf.createURI(uriStr+prefix+test); uriList.push(uri); sb.add(uri, pred, obj); @@ -96,7 +96,7 @@ public void test_PubChemInlineValues() { final int test = rand.nextInt(999999); - final BigdataURI uri = vf.createURI(uriStr+prefix+test+suffix); + final BigdataIRI uri = vf.createURI(uriStr+prefix+test+suffix); uriList.push(uri); sb.add(uri, pred, obj); @@ -105,7 +105,7 @@ public void test_PubChemInlineValues() { { //Add the fixed width ones // http://www.bioassayontology.org/bao#BAO_0002877 fixed width 7 - BigdataURI uri = null; + BigdataIRI uri = null; uri = vf.createURI("http://www.bioassayontology.org/bao#BAO_002877"); uriList.push(uri); sb.add(uri, pred, obj); @@ -138,7 +138,7 @@ public void test_PubChemInlineValues() { if (log.isDebugEnabled()) log.debug(store.dumpStore()); - for (final BigdataURI uri: uriList ) { + for (final BigdataIRI uri: uriList ) { if(log.isDebugEnabled()) { log.debug("Checking " + uri.getNamespace() + " "+ uri.getLocalName() + " inline: " + uri.getIV().isInline());