diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraph.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraph.java index 651a4e368..e591f4fa2 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraph.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraph.java @@ -7,6 +7,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; +import java.util.function.Supplier; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -524,6 +525,16 @@ public class RDFServiceGraph implements GraphWithPerform { return null; } + @Override + public void execute(Runnable runnable) { + + } + + @Override + public T calculate(Supplier supplier) { + return null; + } + @Override public boolean transactionsSupported() { return true; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractModelDecorator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractModelDecorator.java index e9c19a486..c9d6c384f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractModelDecorator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractModelDecorator.java @@ -10,6 +10,7 @@ import java.util.Calendar; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.function.Supplier; import org.apache.jena.datatypes.RDFDatatype; import org.apache.jena.graph.Graph; @@ -1078,4 +1079,33 @@ public abstract class AbstractModelDecorator implements Model { return inner.isClosed(); } + @Override + public Statement getRequiredProperty(Resource resource, Property property, String s) { + return inner.getRequiredProperty(resource, property, s); + } + + @Override + public Statement getProperty(Resource resource, Property property, String s) { + return inner.getProperty(resource, property, s); + } + + @Override + public void executeInTxn(Runnable runnable) { + inner.executeInTxn(runnable); + } + + @Override + public T calculateInTxn(Supplier supplier) { + return inner.calculateInTxn(supplier); + } + + @Override + public PrefixMapping clearNsPrefixMap() { + return inner.clearNsPrefixMap(); + } + + @Override + public int numPrefixes() { + return inner.numPrefixes(); + } } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractOntModelDecorator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractOntModelDecorator.java index 653f5372b..6712b9501 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractOntModelDecorator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractOntModelDecorator.java @@ -11,6 +11,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.function.Supplier; import org.apache.jena.datatypes.RDFDatatype; import org.apache.jena.graph.Graph; @@ -1775,4 +1776,34 @@ public abstract class AbstractOntModelDecorator implements OntModel { public Model writeAll(OutputStream out, String lang, String base) { return inner.writeAll(out, lang, base); } + + @Override + public Statement getRequiredProperty(Resource resource, Property property, String s) { + return inner.getRequiredProperty(resource, property, s); + } + + @Override + public Statement getProperty(Resource resource, Property property, String s) { + return inner.getProperty(resource, property, s); + } + + @Override + public void executeInTxn(Runnable runnable) { + inner.executeInTxn(runnable); + } + + @Override + public T calculateInTxn(Supplier supplier) { + return inner.calculateInTxn(supplier); + } + + @Override + public PrefixMapping clearNsPrefixMap() { + return inner.clearNsPrefixMap(); + } + + @Override + public int numPrefixes() { + return inner.numPrefixes(); + } } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/virtuoso/RDFServiceVirtuoso.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/virtuoso/RDFServiceVirtuoso.java index 1c7ff10a0..08ab76046 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/virtuoso/RDFServiceVirtuoso.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/virtuoso/RDFServiceVirtuoso.java @@ -127,12 +127,7 @@ public class RDFServiceVirtuoso extends RDFServiceSparql { private HttpPost createHttpRequest(String updateString) { HttpPost meth = new HttpPost(updateEndpointURI); meth.addHeader("Content-Type", "application/sparql-query"); - try { - meth.setEntity(new StringEntity(updateString, "UTF-8")); - } catch (UnsupportedEncodingException e) { - // UTF-8 is unsupported? - throw new RuntimeException(e); - } + meth.setEntity(new StringEntity(updateString, "UTF-8")); return meth; } diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 5a5a45909..1246f2f0e 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -150,48 +150,49 @@ net.sourceforge.owlapi jfact - 4.0.0 + 4.0.4 net.sourceforge.owlapi owlapi-distribution - 4.0.1 - + 4.2.7 + + org.apache.httpcomponents httpcore - 4.2.4 + 4.4 org.apache.httpcomponents httpmime - 4.2.5 + 4.4 org.apache.jena jena-arq - 3.1.0 + 3.1.1 org.apache.jena jena-core - 3.1.0 + 3.1.1 org.apache.jena jena-sdb - 3.1.0 + 3.1.1 org.apache.jena jena-tdb - 3.1.0 + 3.1.1 org.apache.solr