http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/inference/TransitivePropertyVisitor.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/TransitivePropertyVisitor.java b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/TransitivePropertyVisitor.java index 45f74ed..666bbd8 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/TransitivePropertyVisitor.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/TransitivePropertyVisitor.java @@ -20,12 +20,12 @@ package org.apache.rya.rdftriplestore.inference; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.rdftriplestore.utils.TransitivePropertySP; -import org.openrdf.model.URI; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; -import org.openrdf.model.vocabulary.SESAME; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.Var; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.SESAME; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.Var; /** * All predicates are changed @@ -45,7 +45,7 @@ public class TransitivePropertyVisitor extends AbstractInferVisitor { final StatementPattern sp = node.clone(); final Var predVar = sp.getPredicateVar(); - final URI pred = (URI) predVar.getValue(); + final IRI pred = (IRI) predVar.getValue(); final String predNamespace = pred.getNamespace(); final Var objVar = sp.getObjectVar(); @@ -56,7 +56,7 @@ public class TransitivePropertyVisitor extends AbstractInferVisitor { !RDFS.NAMESPACE.equals(predNamespace) && !EXPANDED.equals(cntxtVar)) { - final URI transPropUri = (URI) predVar.getValue(); + final IRI transPropUri = (IRI) predVar.getValue(); if (inferenceEngine.isTransitiveProperty(transPropUri)) { node.replaceWith(new TransitivePropertySP(sp.getSubjectVar(), sp.getPredicateVar(), sp.getObjectVar(), sp.getContextVar())); }
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/namespace/NamespaceManager.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/namespace/NamespaceManager.java b/sail/src/main/java/org/apache/rya/rdftriplestore/namespace/NamespaceManager.java index 3d8526f..86cc991 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/namespace/NamespaceManager.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/namespace/NamespaceManager.java @@ -1,14 +1,3 @@ -package org.apache.rya.rdftriplestore.namespace; - -import java.io.InputStream; - -import org.apache.rya.api.RdfCloudTripleStoreConfiguration; -import org.apache.rya.api.persist.RdfDAOException; -import org.apache.rya.api.persist.RyaDAO; -import org.apache.rya.api.persist.RyaNamespaceManager; -import org.openrdf.model.Namespace; -import org.openrdf.sail.SailException; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -27,10 +16,18 @@ import org.openrdf.sail.SailException; * specific language governing permissions and limitations * under the License. */ +package org.apache.rya.rdftriplestore.namespace; +import java.io.InputStream; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.persist.RdfDAOException; +import org.apache.rya.api.persist.RyaDAO; +import org.apache.rya.api.persist.RyaNamespaceManager; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.model.Namespace; +import org.eclipse.rdf4j.sail.SailException; -import info.aduna.iteration.CloseableIteration; import net.sf.ehcache.Cache; import net.sf.ehcache.CacheManager; import net.sf.ehcache.Element; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/utils/CombineContextsRdfInserter.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/utils/CombineContextsRdfInserter.java b/sail/src/main/java/org/apache/rya/rdftriplestore/utils/CombineContextsRdfInserter.java index 6a61201..8a9b9a1 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/utils/CombineContextsRdfInserter.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/utils/CombineContextsRdfInserter.java @@ -1,5 +1,3 @@ -package org.apache.rya.rdftriplestore.utils; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -18,19 +16,22 @@ package org.apache.rya.rdftriplestore.utils; * specific language governing permissions and limitations * under the License. */ - - - -import org.openrdf.OpenRDFUtil; -import org.openrdf.model.*; -import org.openrdf.repository.RepositoryConnection; -import org.openrdf.repository.RepositoryException; -import org.openrdf.rio.RDFHandlerException; -import org.openrdf.rio.helpers.RDFHandlerBase; +package org.apache.rya.rdftriplestore.utils; import java.util.HashMap; import java.util.Map; +import org.eclipse.rdf4j.OpenRDFUtil; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.repository.RepositoryConnection; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.rio.RDFHandlerException; +import org.eclipse.rdf4j.rio.helpers.AbstractRDFHandler; + /** * Created by IntelliJ IDEA. * User: RoshanP @@ -38,7 +39,7 @@ import java.util.Map; * Time: 9:50 AM * To change this template use File | Settings | File Templates. */ -public class CombineContextsRdfInserter extends RDFHandlerBase { +public class CombineContextsRdfInserter extends AbstractRDFHandler { private final RepositoryConnection con; private Resource[] contexts = new Resource[0]; @@ -108,7 +109,7 @@ public class CombineContextsRdfInserter extends RDFHandlerBase { public void handleStatement(Statement st) throws RDFHandlerException { Resource subj = st.getSubject(); - URI pred = st.getPredicate(); + IRI pred = st.getPredicate(); Value obj = st.getObject(); Resource ctxt = st.getContext(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/utils/DefaultStatistics.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/utils/DefaultStatistics.java b/sail/src/main/java/org/apache/rya/rdftriplestore/utils/DefaultStatistics.java index 94c32d2..a23920a 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/utils/DefaultStatistics.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/utils/DefaultStatistics.java @@ -19,10 +19,8 @@ package org.apache.rya.rdftriplestore.utils; * under the License. */ - - -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.evaluation.impl.EvaluationStatistics; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.EvaluationStatistics; /** * Class DefaultStatistics http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/utils/FixedStatementPattern.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/utils/FixedStatementPattern.java b/sail/src/main/java/org/apache/rya/rdftriplestore/utils/FixedStatementPattern.java index ee63213..bcd46fd 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/utils/FixedStatementPattern.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/utils/FixedStatementPattern.java @@ -21,9 +21,9 @@ package org.apache.rya.rdftriplestore.utils; import java.util.ArrayList; import java.util.Collection; -import org.openrdf.model.Statement; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.Var; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.Var; /** * StatementPattern gives fixed statements back http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/utils/RdfFormatUtils.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/utils/RdfFormatUtils.java b/sail/src/main/java/org/apache/rya/rdftriplestore/utils/RdfFormatUtils.java new file mode 100644 index 0000000..78f2335 --- /dev/null +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/utils/RdfFormatUtils.java @@ -0,0 +1,101 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.rya.rdftriplestore.utils; + +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + +import org.eclipse.rdf4j.common.lang.FileFormat; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParserRegistry; + +import com.google.common.collect.ImmutableSet; + +/** + * Utility methods for {@link RDFFormat}. + */ +public final class RdfFormatUtils { + /** + * Holds all supported {@link RDFFormat} types. + */ + public static final Set<RDFFormat> RDF_FORMATS = RDFParserRegistry.getInstance().getKeys(); + + /** + * The set of all supported file extensions from {@link #RDF_FORMATS}. + */ + public static final Set<String> SUPPORTED_FILE_EXTENSIONS = buildSupportedFileExtensions(); + + /** + * Private constructor to prevent instantiation. + */ + private RdfFormatUtils() { + } + + /** + * Gets the RDF format whose name matches the specified name. + * @param formatName The format name. + * @return The {@link RDFFormat} whose name matches the specified name, or + * {@code null} if there is no such format. + */ + public static RDFFormat getRdfFormatFromName(final String formatName) { + for (final RDFFormat rdfFormat : RDF_FORMATS) { + if (rdfFormat.getName().equalsIgnoreCase(formatName)) { + return rdfFormat; + } + } + return null; + } + + /** + * Tries to determine the appropriate RDF file format based on the extension + * of a file name. + * @param fileName A file name. + * @return An {@link RDFFormat} object if the file extension was recognized, + * or {@code null} otherwise. + */ + public static RDFFormat forFileName(final String fileName) { + return forFileName(fileName, null); + } + + /** + * Tries to determine the appropriate RDF file format based on the extension + * of a file name. The supplied fallback format will be returned when the + * file name extension was not recognized. + * @param fileName A file name. + * @return An {@link RDFFormat} that matches the file name extension, or the + * fallback format if the extension was not recognized. + */ + public static RDFFormat forFileName(final String fileName, final RDFFormat fallback) { + final Optional<RDFFormat> match = FileFormat.matchFileName(fileName, RDF_FORMATS); + if (match.isPresent()) { + return match.get(); + } else { + return fallback; + } + } + + /** + * @return the set of all supported file extensions from + * {@link #RDF_FORMATS}. + */ + private static Set<String> buildSupportedFileExtensions() { + return ImmutableSet.copyOf(RDF_FORMATS.stream().flatMap(rdfFormat -> rdfFormat.getFileExtensions().stream()).collect(Collectors.toList())); + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/utils/TransitivePropertySP.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/utils/TransitivePropertySP.java b/sail/src/main/java/org/apache/rya/rdftriplestore/utils/TransitivePropertySP.java index 9cdb113..89e2d90 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/utils/TransitivePropertySP.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/utils/TransitivePropertySP.java @@ -19,10 +19,8 @@ package org.apache.rya.rdftriplestore.utils; * under the License. */ - - -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.Var; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.Var; /** * Class TransitivePropertySP http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/test/java/org/apache/rya/ArbitraryLengthQueryTest.java ---------------------------------------------------------------------- diff --git a/sail/src/test/java/org/apache/rya/ArbitraryLengthQueryTest.java b/sail/src/test/java/org/apache/rya/ArbitraryLengthQueryTest.java index 3b6056f..e4e3fb6 100644 --- a/sail/src/test/java/org/apache/rya/ArbitraryLengthQueryTest.java +++ b/sail/src/test/java/org/apache/rya/ArbitraryLengthQueryTest.java @@ -19,8 +19,6 @@ package org.apache.rya; * under the License. */ - - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -28,25 +26,23 @@ import java.io.InputStream; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.Instance; import org.apache.accumulo.core.client.mock.MockInstance; -import org.openrdf.model.Resource; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.QueryLanguage; -import org.openrdf.query.TupleQuery; -import org.openrdf.query.TupleQueryResultHandlerException; -import org.openrdf.query.resultio.text.tsv.SPARQLResultsTSVWriter; -import org.openrdf.repository.Repository; -import org.openrdf.repository.RepositoryConnection; -import org.openrdf.repository.RepositoryException; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParseException; - import org.apache.rya.accumulo.AccumuloRdfConfiguration; import org.apache.rya.accumulo.AccumuloRyaDAO; import org.apache.rya.rdftriplestore.RdfCloudTripleStore; import org.apache.rya.rdftriplestore.RyaSailRepository; import org.apache.rya.rdftriplestore.inference.InferenceEngine; import org.apache.rya.rdftriplestore.namespace.NamespaceManager; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.QueryLanguage; +import org.eclipse.rdf4j.query.TupleQuery; +import org.eclipse.rdf4j.query.TupleQueryResultHandlerException; +import org.eclipse.rdf4j.repository.Repository; +import org.eclipse.rdf4j.repository.RepositoryConnection; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParseException; + import junit.framework.TestCase; /** @@ -160,12 +156,12 @@ public class ArbitraryLengthQueryTest extends TestCase { // T-Box String ttlString = MODEL_TTL; InputStream stringInput = new ByteArrayInputStream(ttlString.getBytes()); - conn.add(stringInput, "http://dragon-research.com/cham/model/model1";, RDFFormat.TURTLE, new Resource[]{}); + conn.add(stringInput, "http://dragon-research.com/cham/model/model1";, RDFFormat.TURTLE); // A-Box ttlString = BUCKET_TTL; stringInput = new ByteArrayInputStream(ttlString.getBytes()); - conn.add(stringInput, "http://dragon-research.com/cham/bucket/bucket1";, RDFFormat.TURTLE, new Resource[]{}); + conn.add(stringInput, "http://dragon-research.com/cham/bucket/bucket1";, RDFFormat.TURTLE); conn.commit(); conn.close(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/test/java/org/apache/rya/HashJoinTest.java ---------------------------------------------------------------------- diff --git a/sail/src/test/java/org/apache/rya/HashJoinTest.java b/sail/src/test/java/org/apache/rya/HashJoinTest.java index f011d00..e0463c9 100644 --- a/sail/src/test/java/org/apache/rya/HashJoinTest.java +++ b/sail/src/test/java/org/apache/rya/HashJoinTest.java @@ -19,10 +19,15 @@ package org.apache.rya; * under the License. */ +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import java.util.HashSet; +import java.util.Set; -import info.aduna.iteration.CloseableIteration; -import junit.framework.TestCase; +import org.apache.accumulo.core.client.Connector; +import org.apache.accumulo.core.client.mock.MockInstance; import org.apache.rya.accumulo.AccumuloRdfConfiguration; import org.apache.rya.accumulo.AccumuloRyaDAO; import org.apache.rya.api.RdfCloudTripleStoreUtils; @@ -31,19 +36,11 @@ import org.apache.rya.api.domain.RyaType; import org.apache.rya.api.domain.RyaURI; import org.apache.rya.api.persist.RyaDAOException; import org.apache.rya.api.persist.query.join.HashJoin; -import org.apache.accumulo.core.client.Connector; -import org.apache.accumulo.core.client.mock.MockInstance; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; import org.junit.After; import org.junit.Before; import org.junit.Test; -import java.util.HashSet; -import java.util.Set; - -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertTrue; - /** * Date: 7/24/12 * Time: 5:51 PM http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/test/java/org/apache/rya/IterativeJoinTest.java ---------------------------------------------------------------------- diff --git a/sail/src/test/java/org/apache/rya/IterativeJoinTest.java b/sail/src/test/java/org/apache/rya/IterativeJoinTest.java index c84919e..8e40e2d 100644 --- a/sail/src/test/java/org/apache/rya/IterativeJoinTest.java +++ b/sail/src/test/java/org/apache/rya/IterativeJoinTest.java @@ -19,10 +19,15 @@ package org.apache.rya; * under the License. */ +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import java.util.HashSet; +import java.util.Set; -import info.aduna.iteration.CloseableIteration; -import junit.framework.TestCase; +import org.apache.accumulo.core.client.Connector; +import org.apache.accumulo.core.client.mock.MockInstance; import org.apache.rya.accumulo.AccumuloRdfConfiguration; import org.apache.rya.accumulo.AccumuloRyaDAO; import org.apache.rya.api.RdfCloudTripleStoreUtils; @@ -31,17 +36,11 @@ import org.apache.rya.api.domain.RyaType; import org.apache.rya.api.domain.RyaURI; import org.apache.rya.api.persist.RyaDAOException; import org.apache.rya.api.persist.query.join.IterativeJoin; -import org.apache.accumulo.core.client.Connector; -import org.apache.accumulo.core.client.mock.MockInstance; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; import org.junit.After; import org.junit.Before; import org.junit.Test; -import java.util.HashSet; -import java.util.Set; - -import static junit.framework.Assert.*; - /** * Date: 7/24/12 * Time: 5:51 PM http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/test/java/org/apache/rya/MergeJoinTest.java ---------------------------------------------------------------------- diff --git a/sail/src/test/java/org/apache/rya/MergeJoinTest.java b/sail/src/test/java/org/apache/rya/MergeJoinTest.java index d7ac948..efc44c3 100644 --- a/sail/src/test/java/org/apache/rya/MergeJoinTest.java +++ b/sail/src/test/java/org/apache/rya/MergeJoinTest.java @@ -19,29 +19,28 @@ package org.apache.rya; * under the License. */ +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import java.util.HashSet; +import java.util.Set; -import info.aduna.iteration.CloseableIteration; +import org.apache.accumulo.core.client.Connector; +import org.apache.accumulo.core.client.mock.MockInstance; import org.apache.rya.accumulo.AccumuloRdfConfiguration; import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.api.RdfCloudTripleStoreUtils.CustomEntry; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaType; import org.apache.rya.api.domain.RyaURI; import org.apache.rya.api.persist.RyaDAOException; import org.apache.rya.api.persist.query.join.MergeJoin; -import org.apache.accumulo.core.client.Connector; -import org.apache.accumulo.core.client.mock.MockInstance; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; -import java.util.HashSet; -import java.util.Set; - -import static junit.framework.Assert.*; -import static org.apache.rya.api.RdfCloudTripleStoreUtils.CustomEntry; - /** * TODO: Move to rya.api when we have proper mock ryaDao * http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/test/java/org/apache/rya/RdfCloudTripleStoreConnectionTest.java ---------------------------------------------------------------------- diff --git a/sail/src/test/java/org/apache/rya/RdfCloudTripleStoreConnectionTest.java b/sail/src/test/java/org/apache/rya/RdfCloudTripleStoreConnectionTest.java index 8c926db..d40972c 100644 --- a/sail/src/test/java/org/apache/rya/RdfCloudTripleStoreConnectionTest.java +++ b/sail/src/test/java/org/apache/rya/RdfCloudTripleStoreConnectionTest.java @@ -34,31 +34,28 @@ import org.apache.rya.rdftriplestore.RdfCloudTripleStore; import org.apache.rya.rdftriplestore.RyaSailRepository; import org.apache.rya.rdftriplestore.inference.InferenceEngine; import org.apache.rya.rdftriplestore.namespace.NamespaceManager; -import org.openrdf.model.Literal; -import org.openrdf.model.Model; -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.StatementImpl; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.model.vocabulary.OWL; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryLanguage; -import org.openrdf.query.QueryResultHandlerException; -import org.openrdf.query.TupleQuery; -import org.openrdf.query.TupleQueryResultHandler; -import org.openrdf.query.TupleQueryResultHandlerException; -import org.openrdf.query.Update; -import org.openrdf.repository.Repository; -import org.openrdf.repository.RepositoryConnection; -import org.openrdf.repository.RepositoryResult; -import org.openrdf.repository.sail.SailRepository; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.Rio; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Model; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +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.query.BindingSet; +import org.eclipse.rdf4j.query.QueryLanguage; +import org.eclipse.rdf4j.query.QueryResultHandlerException; +import org.eclipse.rdf4j.query.TupleQuery; +import org.eclipse.rdf4j.query.TupleQueryResultHandler; +import org.eclipse.rdf4j.query.TupleQueryResultHandlerException; +import org.eclipse.rdf4j.query.Update; +import org.eclipse.rdf4j.repository.Repository; +import org.eclipse.rdf4j.repository.RepositoryConnection; +import org.eclipse.rdf4j.repository.RepositoryResult; +import org.eclipse.rdf4j.repository.sail.SailRepository; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.Rio; import junit.framework.TestCase; @@ -69,11 +66,11 @@ import junit.framework.TestCase; */ public class RdfCloudTripleStoreConnectionTest extends TestCase { private Repository repository; - ValueFactoryImpl vf = new ValueFactoryImpl(); + private static final SimpleValueFactory VF = SimpleValueFactory.getInstance(); private InferenceEngine internalInferenceEngine; static String litdupsNS = "urn:test:litdups#"; - URI cpu = vf.createURI(litdupsNS, "cpu"); + IRI cpu = VF.createIRI(litdupsNS, "cpu"); protected RdfCloudTripleStore store; @Override @@ -97,8 +94,8 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { public void testAddStatement() throws Exception { RepositoryConnection conn = repository.getConnection(); - URI loadPerc = vf.createURI(litdupsNS, "loadPerc"); - URI uri1 = vf.createURI(litdupsNS, "uri1"); + IRI loadPerc = VF.createIRI(litdupsNS, "loadPerc"); + IRI uri1 = VF.createIRI(litdupsNS, "uri1"); conn.add(cpu, loadPerc, uri1); conn.commit(); @@ -115,7 +112,7 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { conn.remove(cpu, loadPerc, uri1); // //test removal - result = conn.getStatements(cpu, loadPerc, null, true, new Resource[0]); + result = conn.getStatements(cpu, loadPerc, null, true); count = 0; while (result.hasNext()) { count++; @@ -129,14 +126,14 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { // public void testAddAuth() throws Exception { // RepositoryConnection conn = repository.getConnection(); -// URI cpu = vf.createURI(litdupsNS, "cpu"); -// URI loadPerc = vf.createURI(litdupsNS, "loadPerc"); -// URI uri1 = vf.createURI(litdupsNS, "uri1"); -// URI uri2 = vf.createURI(litdupsNS, "uri2"); -// URI uri3 = vf.createURI(litdupsNS, "uri3"); -// URI auth1 = vf.createURI(RdfCloudTripleStoreConstants.AUTH_NAMESPACE, "1"); -// URI auth2 = vf.createURI(RdfCloudTripleStoreConstants.AUTH_NAMESPACE, "2"); -// URI auth3 = vf.createURI(RdfCloudTripleStoreConstants.AUTH_NAMESPACE, "3"); +// URI cpu = vf.createIRI(litdupsNS, "cpu"); +// URI loadPerc = vf.createIRI(litdupsNS, "loadPerc"); +// URI uri1 = vf.createIRI(litdupsNS, "uri1"); +// URI uri2 = vf.createIRI(litdupsNS, "uri2"); +// URI uri3 = vf.createIRI(litdupsNS, "uri3"); +// URI auth1 = vf.createIRI(RdfCloudTripleStoreConstants.AUTH_NAMESPACE, "1"); +// URI auth2 = vf.createIRI(RdfCloudTripleStoreConstants.AUTH_NAMESPACE, "2"); +// URI auth3 = vf.createIRI(RdfCloudTripleStoreConstants.AUTH_NAMESPACE, "3"); // conn.add(cpu, loadPerc, uri1, auth1, auth2, auth3); // conn.add(cpu, loadPerc, uri2, auth2, auth3); // conn.add(cpu, loadPerc, uri3, auth3); @@ -166,8 +163,8 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { public void testEvaluate() throws Exception { RepositoryConnection conn = repository.getConnection(); - URI loadPerc = vf.createURI(litdupsNS, "loadPerc"); - URI uri1 = vf.createURI(litdupsNS, "uri1"); + IRI loadPerc = VF.createIRI(litdupsNS, "loadPerc"); + IRI uri1 = VF.createIRI(litdupsNS, "uri1"); conn.add(cpu, loadPerc, uri1); conn.commit(); @@ -183,10 +180,10 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { public void testEvaluateMultiLine() throws Exception { RepositoryConnection conn = repository.getConnection(); - URI loadPerc = vf.createURI(litdupsNS, "loadPerc"); - URI uri1 = vf.createURI(litdupsNS, "uri1"); - URI pred2 = vf.createURI(litdupsNS, "pred2"); - URI uri2 = vf.createURI(litdupsNS, "uri2"); + IRI loadPerc = VF.createIRI(litdupsNS, "loadPerc"); + IRI uri1 = VF.createIRI(litdupsNS, "uri1"); + IRI pred2 = VF.createIRI(litdupsNS, "pred2"); + IRI uri2 = VF.createIRI(litdupsNS, "uri2"); conn.add(cpu, loadPerc, uri1); conn.add(cpu, pred2, uri2); conn.commit(); @@ -205,10 +202,10 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { public void testPOObjRange() throws Exception { RepositoryConnection conn = repository.getConnection(); - URI loadPerc = vf.createURI(litdupsNS, "loadPerc"); - Literal six = vf.createLiteral("6"); - Literal sev = vf.createLiteral("7"); - Literal ten = vf.createLiteral("10"); + IRI loadPerc = VF.createIRI(litdupsNS, "loadPerc"); + Literal six = VF.createLiteral("6"); + Literal sev = VF.createLiteral("7"); + Literal ten = VF.createLiteral("10"); conn.add(cpu, loadPerc, six); conn.add(cpu, loadPerc, sev); conn.add(cpu, loadPerc, ten); @@ -228,13 +225,13 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { public void testPOPredRange() throws Exception { RepositoryConnection conn = repository.getConnection(); - URI loadPerc = vf.createURI(litdupsNS, "loadPerc1"); - URI loadPerc2 = vf.createURI(litdupsNS, "loadPerc2"); - URI loadPerc3 = vf.createURI(litdupsNS, "loadPerc3"); - URI loadPerc4 = vf.createURI(litdupsNS, "loadPerc4"); - Literal six = vf.createLiteral("6"); - Literal sev = vf.createLiteral("7"); - Literal ten = vf.createLiteral("10"); + IRI loadPerc = VF.createIRI(litdupsNS, "loadPerc1"); + IRI loadPerc2 = VF.createIRI(litdupsNS, "loadPerc2"); + IRI loadPerc3 = VF.createIRI(litdupsNS, "loadPerc3"); + IRI loadPerc4 = VF.createIRI(litdupsNS, "loadPerc4"); + Literal six = VF.createLiteral("6"); + Literal sev = VF.createLiteral("7"); + Literal ten = VF.createLiteral("10"); conn.add(cpu, loadPerc, six); conn.add(cpu, loadPerc2, sev); conn.add(cpu, loadPerc4, ten); @@ -254,13 +251,13 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { public void testSPOPredRange() throws Exception { RepositoryConnection conn = repository.getConnection(); - URI loadPerc = vf.createURI(litdupsNS, "loadPerc1"); - URI loadPerc2 = vf.createURI(litdupsNS, "loadPerc2"); - URI loadPerc3 = vf.createURI(litdupsNS, "loadPerc3"); - URI loadPerc4 = vf.createURI(litdupsNS, "loadPerc4"); - Literal six = vf.createLiteral("6"); - Literal sev = vf.createLiteral("7"); - Literal ten = vf.createLiteral("10"); + IRI loadPerc = VF.createIRI(litdupsNS, "loadPerc1"); + IRI loadPerc2 = VF.createIRI(litdupsNS, "loadPerc2"); + IRI loadPerc3 = VF.createIRI(litdupsNS, "loadPerc3"); + IRI loadPerc4 = VF.createIRI(litdupsNS, "loadPerc4"); + Literal six = VF.createLiteral("6"); + Literal sev = VF.createLiteral("7"); + Literal ten = VF.createLiteral("10"); conn.add(cpu, loadPerc, six); conn.add(cpu, loadPerc2, sev); conn.add(cpu, loadPerc4, ten); @@ -280,12 +277,12 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { public void testSPOSubjRange() throws Exception { RepositoryConnection conn = repository.getConnection(); - URI cpu2 = vf.createURI(litdupsNS, "cpu2"); - URI cpu3 = vf.createURI(litdupsNS, "cpu3"); - URI loadPerc = vf.createURI(litdupsNS, "loadPerc"); - Literal six = vf.createLiteral("6"); - Literal sev = vf.createLiteral("7"); - Literal ten = vf.createLiteral("10"); + IRI cpu2 = VF.createIRI(litdupsNS, "cpu2"); + IRI cpu3 = VF.createIRI(litdupsNS, "cpu3"); + IRI loadPerc = VF.createIRI(litdupsNS, "loadPerc"); + Literal six = VF.createLiteral("6"); + Literal sev = VF.createLiteral("7"); + Literal ten = VF.createLiteral("10"); conn.add(cpu, loadPerc, six); conn.add(cpu2, loadPerc, sev); conn.add(cpu3, loadPerc, ten); @@ -305,10 +302,10 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { public void testSPOObjRange() throws Exception { RepositoryConnection conn = repository.getConnection(); - URI loadPerc = vf.createURI(litdupsNS, "loadPerc"); - Literal six = vf.createLiteral("6"); - Literal sev = vf.createLiteral("7"); - Literal ten = vf.createLiteral("10"); + IRI loadPerc = VF.createIRI(litdupsNS, "loadPerc"); + Literal six = VF.createLiteral("6"); + Literal sev = VF.createLiteral("7"); + Literal ten = VF.createLiteral("10"); conn.add(cpu, loadPerc, six); conn.add(cpu, loadPerc, sev); conn.add(cpu, loadPerc, ten); @@ -328,10 +325,10 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { public void testOSPObjRange() throws Exception { RepositoryConnection conn = repository.getConnection(); - URI loadPerc = vf.createURI(litdupsNS, "loadPerc"); - Literal six = vf.createLiteral("6"); - Literal sev = vf.createLiteral("7"); - Literal ten = vf.createLiteral("10"); + IRI loadPerc = VF.createIRI(litdupsNS, "loadPerc"); + Literal six = VF.createLiteral("6"); + Literal sev = VF.createLiteral("7"); + Literal ten = VF.createLiteral("10"); conn.add(cpu, loadPerc, six); conn.add(cpu, loadPerc, sev); conn.add(cpu, loadPerc, ten); @@ -351,11 +348,11 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { public void testRegexFilter() throws Exception { RepositoryConnection conn = repository.getConnection(); - URI loadPerc = vf.createURI(litdupsNS, "loadPerc"); - URI testClass = vf.createURI(litdupsNS, "test"); - Literal six = vf.createLiteral("6"); - Literal sev = vf.createLiteral("7"); - Literal ten = vf.createLiteral("10"); + IRI loadPerc = VF.createIRI(litdupsNS, "loadPerc"); + IRI testClass = VF.createIRI(litdupsNS, "test"); + Literal six = VF.createLiteral("6"); + Literal sev = VF.createLiteral("7"); + Literal ten = VF.createLiteral("10"); conn.add(cpu, loadPerc, six); conn.add(cpu, loadPerc, sev); conn.add(cpu, loadPerc, ten); @@ -376,12 +373,12 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { public void testMMRTS152() throws Exception { RepositoryConnection conn = repository.getConnection(); - URI loadPerc = vf.createURI(litdupsNS, "testPred"); - URI uri1 = vf.createURI(litdupsNS, "uri1"); + IRI loadPerc = VF.createIRI(litdupsNS, "testPred"); + IRI uri1 = VF.createIRI(litdupsNS, "uri1"); conn.add(cpu, loadPerc, uri1); conn.commit(); - RepositoryResult<Statement> result = conn.getStatements(cpu, loadPerc, null, false, new Resource[0]); + RepositoryResult<Statement> result = conn.getStatements(cpu, loadPerc, null, false); // RdfCloudTripleStoreCollectionStatementsIterator iterator = new RdfCloudTripleStoreCollectionStatementsIterator( // cpu, loadPerc, null, store.connector, // vf, new Configuration(), null); @@ -397,17 +394,17 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { public void testDuplicateLiterals() throws Exception { RepositoryConnection conn = repository.getConnection(); - URI loadPerc = vf.createURI(litdupsNS, "loadPerc"); - Literal lit1 = vf.createLiteral(0.0); - Literal lit2 = vf.createLiteral(0.0); - Literal lit3 = vf.createLiteral(0.0); + IRI loadPerc = VF.createIRI(litdupsNS, "loadPerc"); + Literal lit1 = VF.createLiteral(0.0); + Literal lit2 = VF.createLiteral(0.0); + Literal lit3 = VF.createLiteral(0.0); conn.add(cpu, loadPerc, lit1); conn.add(cpu, loadPerc, lit2); conn.add(cpu, loadPerc, lit3); conn.commit(); - RepositoryResult<Statement> result = conn.getStatements(cpu, loadPerc, null, true, new Resource[0]); + RepositoryResult<Statement> result = conn.getStatements(cpu, loadPerc, null, true); int count = 0; while (result.hasNext()) { count++; @@ -424,17 +421,17 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { public void testNotDuplicateUris() throws Exception { RepositoryConnection conn = repository.getConnection(); - URI loadPerc = vf.createURI(litdupsNS, "loadPerc"); - URI uri1 = vf.createURI(litdupsNS, "uri1"); - URI uri2 = vf.createURI(litdupsNS, "uri1"); - URI uri3 = vf.createURI(litdupsNS, "uri1"); + IRI loadPerc = VF.createIRI(litdupsNS, "loadPerc"); + IRI uri1 = VF.createIRI(litdupsNS, "uri1"); + IRI uri2 = VF.createIRI(litdupsNS, "uri1"); + IRI uri3 = VF.createIRI(litdupsNS, "uri1"); conn.add(cpu, loadPerc, uri1); conn.add(cpu, loadPerc, uri2); conn.add(cpu, loadPerc, uri3); conn.commit(); - RepositoryResult<Statement> result = conn.getStatements(cpu, loadPerc, null, true, new Resource[0]); + RepositoryResult<Statement> result = conn.getStatements(cpu, loadPerc, null, true); int count = 0; while (result.hasNext()) { count++; @@ -451,8 +448,8 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { public void testNamespaceUsage() throws Exception { RepositoryConnection conn = repository.getConnection(); conn.setNamespace("lit", litdupsNS); - URI loadPerc = vf.createURI(litdupsNS, "loadPerc"); - final URI uri1 = vf.createURI(litdupsNS, "uri1"); + IRI loadPerc = VF.createIRI(litdupsNS, "loadPerc"); + final IRI uri1 = VF.createIRI(litdupsNS, "uri1"); conn.add(cpu, loadPerc, uri1); conn.commit(); @@ -493,13 +490,13 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { } RepositoryConnection conn = repository.getConnection(); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "undergradDegreeFrom"), RDFS.SUBPROPERTYOF, vf.createURI(litdupsNS, "degreeFrom"))); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "gradDegreeFrom"), RDFS.SUBPROPERTYOF, vf.createURI(litdupsNS, "degreeFrom"))); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "degreeFrom"), RDFS.SUBPROPERTYOF, vf.createURI(litdupsNS, "memberOf"))); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "memberOf"), RDFS.SUBPROPERTYOF, vf.createURI(litdupsNS, "associatedWith"))); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "UgradA"), vf.createURI(litdupsNS, "undergradDegreeFrom"), vf.createURI(litdupsNS, "Harvard"))); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "GradB"), vf.createURI(litdupsNS, "gradDegreeFrom"), vf.createURI(litdupsNS, "Yale"))); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "ProfessorC"), vf.createURI(litdupsNS, "memberOf"), vf.createURI(litdupsNS, "Harvard"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "undergradDegreeFrom"), RDFS.SUBPROPERTYOF, VF.createIRI(litdupsNS, "degreeFrom"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "gradDegreeFrom"), RDFS.SUBPROPERTYOF, VF.createIRI(litdupsNS, "degreeFrom"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "degreeFrom"), RDFS.SUBPROPERTYOF, VF.createIRI(litdupsNS, "memberOf"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "memberOf"), RDFS.SUBPROPERTYOF, VF.createIRI(litdupsNS, "associatedWith"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "UgradA"), VF.createIRI(litdupsNS, "undergradDegreeFrom"), VF.createIRI(litdupsNS, "Harvard"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "GradB"), VF.createIRI(litdupsNS, "gradDegreeFrom"), VF.createIRI(litdupsNS, "Yale"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "ProfessorC"), VF.createIRI(litdupsNS, "memberOf"), VF.createIRI(litdupsNS, "Harvard"))); conn.commit(); conn.close(); @@ -557,10 +554,10 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { } RepositoryConnection conn = repository.getConnection(); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "undergradDegreeFrom"), OWL.EQUIVALENTPROPERTY, vf.createURI(litdupsNS, "ugradDegreeFrom"))); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "UgradA"), vf.createURI(litdupsNS, "undergradDegreeFrom"), vf.createURI(litdupsNS, "Harvard"))); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "GradB"), vf.createURI(litdupsNS, "ugradDegreeFrom"), vf.createURI(litdupsNS, "Harvard"))); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "GradC"), vf.createURI(litdupsNS, "ugraduateDegreeFrom"), vf.createURI(litdupsNS, "Harvard"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "undergradDegreeFrom"), OWL.EQUIVALENTPROPERTY, VF.createIRI(litdupsNS, "ugradDegreeFrom"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "UgradA"), VF.createIRI(litdupsNS, "undergradDegreeFrom"), VF.createIRI(litdupsNS, "Harvard"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "GradB"), VF.createIRI(litdupsNS, "ugradDegreeFrom"), VF.createIRI(litdupsNS, "Harvard"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "GradC"), VF.createIRI(litdupsNS, "ugraduateDegreeFrom"), VF.createIRI(litdupsNS, "Harvard"))); conn.commit(); conn.close(); @@ -588,9 +585,9 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { } RepositoryConnection conn = repository.getConnection(); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "friendOf"), RDF.TYPE, OWL.SYMMETRICPROPERTY)); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "Bob"), vf.createURI(litdupsNS, "friendOf"), vf.createURI(litdupsNS, "Jeff"))); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "James"), vf.createURI(litdupsNS, "friendOf"), vf.createURI(litdupsNS, "Jeff"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "friendOf"), RDF.TYPE, OWL.SYMMETRICPROPERTY)); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "Bob"), VF.createIRI(litdupsNS, "friendOf"), VF.createIRI(litdupsNS, "Jeff"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "James"), VF.createIRI(litdupsNS, "friendOf"), VF.createIRI(litdupsNS, "Jeff"))); conn.commit(); conn.close(); @@ -638,12 +635,12 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { } RepositoryConnection conn = repository.getConnection(); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "subRegionOf"), RDF.TYPE, OWL.TRANSITIVEPROPERTY)); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "Queens"), vf.createURI(litdupsNS, "subRegionOf"), vf.createURI(litdupsNS, "NYC"))); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "NYC"), vf.createURI(litdupsNS, "subRegionOf"), vf.createURI(litdupsNS, "NY"))); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "NY"), vf.createURI(litdupsNS, "subRegionOf"), vf.createURI(litdupsNS, "US"))); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "US"), vf.createURI(litdupsNS, "subRegionOf"), vf.createURI(litdupsNS, "NorthAmerica"))); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "NorthAmerica"), vf.createURI(litdupsNS, "subRegionOf"), vf.createURI(litdupsNS, "World"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "subRegionOf"), RDF.TYPE, OWL.TRANSITIVEPROPERTY)); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "Queens"), VF.createIRI(litdupsNS, "subRegionOf"), VF.createIRI(litdupsNS, "NYC"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "NYC"), VF.createIRI(litdupsNS, "subRegionOf"), VF.createIRI(litdupsNS, "NY"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "NY"), VF.createIRI(litdupsNS, "subRegionOf"), VF.createIRI(litdupsNS, "US"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "US"), VF.createIRI(litdupsNS, "subRegionOf"), VF.createIRI(litdupsNS, "NorthAmerica"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "NorthAmerica"), VF.createIRI(litdupsNS, "subRegionOf"), VF.createIRI(litdupsNS, "World"))); conn.commit(); conn.close(); @@ -701,10 +698,10 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { } RepositoryConnection conn = repository.getConnection(); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "degreeFrom"), OWL.INVERSEOF, vf.createURI(litdupsNS, "hasAlumnus"))); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "UgradA"), vf.createURI(litdupsNS, "degreeFrom"), vf.createURI(litdupsNS, "Harvard"))); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "GradB"), vf.createURI(litdupsNS, "degreeFrom"), vf.createURI(litdupsNS, "Harvard"))); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "Harvard"), vf.createURI(litdupsNS, "hasAlumnus"), vf.createURI(litdupsNS, "AlumC"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "degreeFrom"), OWL.INVERSEOF, VF.createIRI(litdupsNS, "hasAlumnus"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "UgradA"), VF.createIRI(litdupsNS, "degreeFrom"), VF.createIRI(litdupsNS, "Harvard"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "GradB"), VF.createIRI(litdupsNS, "degreeFrom"), VF.createIRI(litdupsNS, "Harvard"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "Harvard"), VF.createIRI(litdupsNS, "hasAlumnus"), VF.createIRI(litdupsNS, "AlumC"))); conn.commit(); conn.close(); @@ -742,11 +739,11 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { } RepositoryConnection conn = repository.getConnection(); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "UndergraduateStudent"), RDFS.SUBCLASSOF, vf.createURI(litdupsNS, "Student"))); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "Student"), RDFS.SUBCLASSOF, vf.createURI(litdupsNS, "Person"))); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "UgradA"), RDF.TYPE, vf.createURI(litdupsNS, "UndergraduateStudent"))); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "StudentB"), RDF.TYPE, vf.createURI(litdupsNS, "Student"))); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "PersonC"), RDF.TYPE, vf.createURI(litdupsNS, "Person"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "UndergraduateStudent"), RDFS.SUBCLASSOF, VF.createIRI(litdupsNS, "Student"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "Student"), RDFS.SUBCLASSOF, VF.createIRI(litdupsNS, "Person"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "UgradA"), RDF.TYPE, VF.createIRI(litdupsNS, "UndergraduateStudent"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "StudentB"), RDF.TYPE, VF.createIRI(litdupsNS, "Student"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "PersonC"), RDF.TYPE, VF.createIRI(litdupsNS, "Person"))); conn.commit(); conn.close(); @@ -755,7 +752,7 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { conn = repository.getConnection(); //simple api first - RepositoryResult<Statement> person = conn.getStatements(null, RDF.TYPE, vf.createURI(litdupsNS, "Person"), true); + RepositoryResult<Statement> person = conn.getStatements(null, RDF.TYPE, VF.createIRI(litdupsNS, "Person"), true); int count = 0; while (person.hasNext()) { count++; @@ -804,12 +801,12 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { } RepositoryConnection conn = repository.getConnection(); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "StudentA1"), OWL.SAMEAS, vf.createURI(litdupsNS, "StudentA2"))); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "StudentA2"), OWL.SAMEAS, vf.createURI(litdupsNS, "StudentA3"))); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "StudentB1"), OWL.SAMEAS, vf.createURI(litdupsNS, "StudentB2"))); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "StudentB2"), OWL.SAMEAS, vf.createURI(litdupsNS, "StudentB3"))); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "StudentA1"), vf.createURI(litdupsNS, "pred1"), vf.createURI(litdupsNS, "StudentB3"))); - conn.add(new StatementImpl(vf.createURI(litdupsNS, "StudentB1"), vf.createURI(litdupsNS, "pred2"), vf.createURI(litdupsNS, "StudentA3"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "StudentA1"), OWL.SAMEAS, VF.createIRI(litdupsNS, "StudentA2"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "StudentA2"), OWL.SAMEAS, VF.createIRI(litdupsNS, "StudentA3"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "StudentB1"), OWL.SAMEAS, VF.createIRI(litdupsNS, "StudentB2"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "StudentB2"), OWL.SAMEAS, VF.createIRI(litdupsNS, "StudentB3"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "StudentA1"), VF.createIRI(litdupsNS, "pred1"), VF.createIRI(litdupsNS, "StudentB3"))); + conn.add(VF.createStatement(VF.createIRI(litdupsNS, "StudentB1"), VF.createIRI(litdupsNS, "pred2"), VF.createIRI(litdupsNS, "StudentA3"))); conn.commit(); conn.close(); @@ -963,7 +960,7 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { conn.add(stream, "", RDFFormat.TRIG); conn.commit(); - RepositoryResult<Statement> statements = conn.getStatements(null, vf.createURI("http://www.example.org/vocabulary#name";), null, true, vf.createURI("http://www.example.org/exampleDocument#G1";)); + RepositoryResult<Statement> statements = conn.getStatements(null, VF.createIRI("http://www.example.org/vocabulary#name";), null, true, VF.createIRI("http://www.example.org/exampleDocument#G1";)); int count = 0; while (statements.hasNext()) { statements.next(); @@ -978,7 +975,7 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { // public void testNamedGraphLoadWInlineAuth() throws Exception { // InputStream stream = Thread.currentThread().getContextClassLoader().getResourceAsStream("namedgraphs.trig"); // assertNotNull(stream); -// URI auth1 = vf.createURI(RdfCloudTripleStoreConstants.AUTH_NAMESPACE, "1"); +// URI auth1 = vf.createIRI(RdfCloudTripleStoreConstants.AUTH_NAMESPACE, "1"); // RepositoryConnection conn = repository.getConnection(); // conn.add(stream, "", RDFFormat.TRIG, auth1); // conn.commit(); @@ -1036,7 +1033,7 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { // } private static String escape(Value r) { - if (r instanceof URI) { + if (r instanceof IRI) { return "<" + r.toString() +">"; } return r.toString(); @@ -1107,7 +1104,7 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { " } .\n" + "}"; TupleQuery tupleQuery = conn.prepareTupleQuery(QueryLanguage.SPARQL, query); - tupleQuery.setBinding(RdfCloudTripleStoreConfiguration.CONF_QUERY_AUTH, vf.createLiteral("2")); + tupleQuery.setBinding(RdfCloudTripleStoreConfiguration.CONF_QUERY_AUTH, VF.createLiteral("2")); CountTupleHandler tupleHandler = new CountTupleHandler(); tupleQuery.evaluate(tupleHandler); assertEquals(1, tupleHandler.getCount()); @@ -1157,7 +1154,7 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { " } .\n" + "}"; TupleQuery tupleQuery = conn.prepareTupleQuery(QueryLanguage.SPARQL, query); - tupleQuery.setBinding(RdfCloudTripleStoreConfiguration.CONF_QUERY_AUTH, vf.createLiteral("2")); + tupleQuery.setBinding(RdfCloudTripleStoreConfiguration.CONF_QUERY_AUTH, VF.createLiteral("2")); CountTupleHandler tupleHandler = new CountTupleHandler(); tupleQuery.evaluate(tupleHandler); assertEquals(1, tupleHandler.getCount()); @@ -1287,12 +1284,12 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { assertEquals(4, tupleHandler.getCount()); tupleHandler = new CountTupleHandler(); - conn.clear(new URIImpl("http://example/addresses#G2";)); + conn.clear(VF.createIRI("http://example/addresses#G2";)); tupleQuery.evaluate(tupleHandler); assertEquals(2, tupleHandler.getCount()); tupleHandler = new CountTupleHandler(); - conn.clear(new URIImpl("http://example/addresses#G1";)); + conn.clear(VF.createIRI("http://example/addresses#G1";)); tupleQuery.evaluate(tupleHandler); assertEquals(0, tupleHandler.getCount()); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/test/java/org/apache/rya/RdfCloudTripleStoreTest.java ---------------------------------------------------------------------- diff --git a/sail/src/test/java/org/apache/rya/RdfCloudTripleStoreTest.java b/sail/src/test/java/org/apache/rya/RdfCloudTripleStoreTest.java index fa8e6f5..99d400d 100644 --- a/sail/src/test/java/org/apache/rya/RdfCloudTripleStoreTest.java +++ b/sail/src/test/java/org/apache/rya/RdfCloudTripleStoreTest.java @@ -1,5 +1,3 @@ -package org.apache.rya; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -18,32 +16,36 @@ package org.apache.rya; * specific language governing permissions and limitations * under the License. */ +package org.apache.rya; +import java.util.GregorianCalendar; +import java.util.List; +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeFactory; -import junit.framework.TestCase; +import org.apache.accumulo.core.client.Connector; +import org.apache.accumulo.core.client.mock.MockInstance; import org.apache.rya.accumulo.AccumuloRdfConfiguration; import org.apache.rya.accumulo.AccumuloRyaDAO; import org.apache.rya.api.RdfCloudTripleStoreConstants; import org.apache.rya.rdftriplestore.RdfCloudTripleStore; -import org.apache.accumulo.core.client.Connector; -import org.apache.accumulo.core.client.mock.MockInstance; -import org.openrdf.model.Namespace; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.StatementImpl; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.*; -import org.openrdf.repository.RepositoryException; -import org.openrdf.repository.RepositoryResult; -import org.openrdf.repository.sail.SailRepository; -import org.openrdf.repository.sail.SailRepositoryConnection; +import org.eclipse.rdf4j.model.Namespace; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryLanguage; +import org.eclipse.rdf4j.query.QueryResultHandlerException; +import org.eclipse.rdf4j.query.TupleQuery; +import org.eclipse.rdf4j.query.TupleQueryResultHandler; +import org.eclipse.rdf4j.query.TupleQueryResultHandlerException; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.repository.RepositoryResult; +import org.eclipse.rdf4j.repository.sail.SailRepository; +import org.eclipse.rdf4j.repository.sail.SailRepositoryConnection; -import javax.xml.datatype.DatatypeConfigurationException; -import javax.xml.datatype.DatatypeFactory; -import java.util.GregorianCalendar; -import java.util.List; -import java.util.Map; -import java.util.Set; +import junit.framework.TestCase; /** * Class PartitionConnectionTest @@ -59,7 +61,7 @@ public class RdfCloudTripleStoreTest extends TestCase { private SailRepository repository; private SailRepositoryConnection connection; - ValueFactory vf = ValueFactoryImpl.getInstance(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); private String objectUuid = "objectuuid1"; private String ancestor = "ancestor1"; @@ -90,113 +92,113 @@ public class RdfCloudTripleStoreTest extends TestCase { } private void loadData() throws RepositoryException, DatatypeConfigurationException { - connection.add(new StatementImpl(vf.createURI(NAMESPACE, objectUuid), vf.createURI(NAMESPACE, "name"), vf.createLiteral("objUuid"))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, objectUuid), VF.createIRI(NAMESPACE, "name"), VF.createLiteral("objUuid"))); //created String uuid = "uuid1"; - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(RDF_NS, "type"), vf.createURI(NAMESPACE, "Created"))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "createdItem"), vf.createURI(NAMESPACE, objectUuid))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "performedBy"), vf.createURI("urn:system:A"))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "stringLit"), vf.createLiteral("stringLit1"))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "stringLit"), vf.createLiteral("stringLit2"))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "stringLit"), vf.createLiteral("stringLit3"))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "stringLit"), vf.createLiteral("stringLit4"))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "strLit1"), vf.createLiteral("strLit1"))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "strLit1"), vf.createLiteral("strLit2"))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "strLit1"), vf.createLiteral("strLit3"))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "performedAt"), vf.createLiteral(DatatypeFactory.newInstance().newXMLGregorianCalendar(2011, 7, 12, 6, 0, 0, 0, 0)))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "reportedAt"), vf.createLiteral(DatatypeFactory.newInstance().newXMLGregorianCalendar(2011, 7, 12, 6, 1, 0, 0, 0)))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(RDF_NS, "type"), VF.createIRI(NAMESPACE, "Created"))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "createdItem"), VF.createIRI(NAMESPACE, objectUuid))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "performedBy"), VF.createIRI("urn:system:A"))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "stringLit"), VF.createLiteral("stringLit1"))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "stringLit"), VF.createLiteral("stringLit2"))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "stringLit"), VF.createLiteral("stringLit3"))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "stringLit"), VF.createLiteral("stringLit4"))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "strLit1"), VF.createLiteral("strLit1"))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "strLit1"), VF.createLiteral("strLit2"))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "strLit1"), VF.createLiteral("strLit3"))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "performedAt"), VF.createLiteral(DatatypeFactory.newInstance().newXMLGregorianCalendar(2011, 7, 12, 6, 0, 0, 0, 0)))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "reportedAt"), VF.createLiteral(DatatypeFactory.newInstance().newXMLGregorianCalendar(2011, 7, 12, 6, 1, 0, 0, 0)))); //clicked uuid = "uuid2"; - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(RDF_NS, "type"), vf.createURI(NAMESPACE, "Clicked"))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "clickedItem"), vf.createURI(NAMESPACE, objectUuid))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "performedBy"), vf.createURI("urn:system:B"))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "performedAt"), vf.createLiteral(DatatypeFactory.newInstance().newXMLGregorianCalendar(2011, 7, 12, 6, 2, 0, 0, 0)))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "reportedAt"), vf.createLiteral(DatatypeFactory.newInstance().newXMLGregorianCalendar(2011, 7, 12, 6, 3, 0, 0, 0)))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(RDF_NS, "type"), VF.createIRI(NAMESPACE, "Clicked"))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "clickedItem"), VF.createIRI(NAMESPACE, objectUuid))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "performedBy"), VF.createIRI("urn:system:B"))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "performedAt"), VF.createLiteral(DatatypeFactory.newInstance().newXMLGregorianCalendar(2011, 7, 12, 6, 2, 0, 0, 0)))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "reportedAt"), VF.createLiteral(DatatypeFactory.newInstance().newXMLGregorianCalendar(2011, 7, 12, 6, 3, 0, 0, 0)))); //deleted uuid = "uuid3"; - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(RDF_NS, "type"), vf.createURI(NAMESPACE, "Deleted"))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "deletedItem"), vf.createURI(NAMESPACE, objectUuid))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "performedBy"), vf.createURI("urn:system:C"))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "performedAt"), vf.createLiteral(DatatypeFactory.newInstance().newXMLGregorianCalendar(2011, 7, 12, 6, 4, 0, 0, 0)))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "reportedAt"), vf.createLiteral(DatatypeFactory.newInstance().newXMLGregorianCalendar(2011, 7, 12, 6, 5, 0, 0, 0)))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(RDF_NS, "type"), VF.createIRI(NAMESPACE, "Deleted"))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "deletedItem"), VF.createIRI(NAMESPACE, objectUuid))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "performedBy"), VF.createIRI("urn:system:C"))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "performedAt"), VF.createLiteral(DatatypeFactory.newInstance().newXMLGregorianCalendar(2011, 7, 12, 6, 4, 0, 0, 0)))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "reportedAt"), VF.createLiteral(DatatypeFactory.newInstance().newXMLGregorianCalendar(2011, 7, 12, 6, 5, 0, 0, 0)))); //dropped uuid = "uuid4"; - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(RDF_NS, "type"), vf.createURI(NAMESPACE, "Dropped"))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "droppedItem"), vf.createURI(NAMESPACE, objectUuid))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "performedBy"), vf.createURI("urn:system:D"))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "performedAt"), vf.createLiteral(DatatypeFactory.newInstance().newXMLGregorianCalendar(2011, 7, 12, 6, 6, 0, 0, 0)))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "reportedAt"), vf.createLiteral(DatatypeFactory.newInstance().newXMLGregorianCalendar(2011, 7, 12, 6, 7, 0, 0, 0)))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(RDF_NS, "type"), VF.createIRI(NAMESPACE, "Dropped"))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "droppedItem"), VF.createIRI(NAMESPACE, objectUuid))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "performedBy"), VF.createIRI("urn:system:D"))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "performedAt"), VF.createLiteral(DatatypeFactory.newInstance().newXMLGregorianCalendar(2011, 7, 12, 6, 6, 0, 0, 0)))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "reportedAt"), VF.createLiteral(DatatypeFactory.newInstance().newXMLGregorianCalendar(2011, 7, 12, 6, 7, 0, 0, 0)))); //received uuid = "uuid5"; - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(RDF_NS, "type"), vf.createURI(NAMESPACE, "Received"))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "receivedItem"), vf.createURI(NAMESPACE, objectUuid))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "performedBy"), vf.createURI("urn:system:E"))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "performedAt"), vf.createLiteral(DatatypeFactory.newInstance().newXMLGregorianCalendar(2011, 7, 12, 6, 8, 0, 0, 0)))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "reportedAt"), vf.createLiteral(DatatypeFactory.newInstance().newXMLGregorianCalendar(2011, 7, 12, 6, 9, 0, 0, 0)))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(RDF_NS, "type"), VF.createIRI(NAMESPACE, "Received"))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "receivedItem"), VF.createIRI(NAMESPACE, objectUuid))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "performedBy"), VF.createIRI("urn:system:E"))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "performedAt"), VF.createLiteral(DatatypeFactory.newInstance().newXMLGregorianCalendar(2011, 7, 12, 6, 8, 0, 0, 0)))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "reportedAt"), VF.createLiteral(DatatypeFactory.newInstance().newXMLGregorianCalendar(2011, 7, 12, 6, 9, 0, 0, 0)))); //sent uuid = "uuid6"; - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(RDF_NS, "type"), vf.createURI(NAMESPACE, "Sent"))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "sentItem"), vf.createURI(NAMESPACE, objectUuid))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "performedBy"), vf.createURI("urn:system:F"))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "performedAt"), vf.createLiteral(DatatypeFactory.newInstance().newXMLGregorianCalendar(2011, 7, 12, 6, 10, 0, 0, 0)))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "reportedAt"), vf.createLiteral(DatatypeFactory.newInstance().newXMLGregorianCalendar(2011, 7, 12, 6, 11, 0, 0, 0)))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(RDF_NS, "type"), VF.createIRI(NAMESPACE, "Sent"))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "sentItem"), VF.createIRI(NAMESPACE, objectUuid))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "performedBy"), VF.createIRI("urn:system:F"))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "performedAt"), VF.createLiteral(DatatypeFactory.newInstance().newXMLGregorianCalendar(2011, 7, 12, 6, 10, 0, 0, 0)))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "reportedAt"), VF.createLiteral(DatatypeFactory.newInstance().newXMLGregorianCalendar(2011, 7, 12, 6, 11, 0, 0, 0)))); //stored uuid = "uuid7"; - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(RDF_NS, "type"), vf.createURI(NAMESPACE, "Stored"))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "storedItem"), vf.createURI(NAMESPACE, objectUuid))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "performedBy"), vf.createURI("urn:system:G"))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "performedAt"), vf.createLiteral(DatatypeFactory.newInstance().newXMLGregorianCalendar(2011, 7, 12, 6, 12, 0, 0, 0)))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, uuid), vf.createURI(NAMESPACE, "reportedAt"), vf.createLiteral(DatatypeFactory.newInstance().newXMLGregorianCalendar(2011, 7, 12, 6, 13, 0, 0, 0)))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(RDF_NS, "type"), VF.createIRI(NAMESPACE, "Stored"))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "storedItem"), VF.createIRI(NAMESPACE, objectUuid))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "performedBy"), VF.createIRI("urn:system:G"))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "performedAt"), VF.createLiteral(DatatypeFactory.newInstance().newXMLGregorianCalendar(2011, 7, 12, 6, 12, 0, 0, 0)))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, uuid), VF.createIRI(NAMESPACE, "reportedAt"), VF.createLiteral(DatatypeFactory.newInstance().newXMLGregorianCalendar(2011, 7, 12, 6, 13, 0, 0, 0)))); //derivedFrom - connection.add(new StatementImpl(vf.createURI(NAMESPACE, descendant), vf.createURI(NAMESPACE, "derivedFrom"), vf.createURI(NAMESPACE, ancestor))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, descendant), vf.createURI(NAMESPACE, "name"), vf.createLiteral("descendantOne"))); - connection.add(new StatementImpl(vf.createURI(NAMESPACE, ancestor), vf.createURI(NAMESPACE, "name"), vf.createLiteral("ancestor1"))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, descendant), VF.createIRI(NAMESPACE, "derivedFrom"), VF.createIRI(NAMESPACE, ancestor))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, descendant), VF.createIRI(NAMESPACE, "name"), VF.createLiteral("descendantOne"))); + connection.add(VF.createStatement(VF.createIRI(NAMESPACE, ancestor), VF.createIRI(NAMESPACE, "name"), VF.createLiteral("ancestor1"))); //heartbeats String hbuuid = "hbuuid1"; - connection.add(new StatementImpl(vf.createURI(HBNAMESPACE, hbuuid), vf.createURI(RDF_NS, "type"), vf.createURI(HBNAMESPACE, "HeartbeatMeasurement"))); - connection.add(new StatementImpl(vf.createURI(HBNAMESPACE, hbuuid), vf.createURI(HB_TIMESTAMP), vf.createLiteral((START + 1) + ""))); - connection.add(new StatementImpl(vf.createURI(HBNAMESPACE, hbuuid), vf.createURI(HBNAMESPACE, "count"), vf.createLiteral(1 + ""))); - connection.add(new StatementImpl(vf.createURI(HBNAMESPACE, hbuuid), vf.createURI(HBNAMESPACE, "systemName"), vf.createURI("urn:system:A"))); - connection.add(new StatementImpl(vf.createURI("urn:system:A"), vf.createURI(HBNAMESPACE, "heartbeat"), vf.createURI(HBNAMESPACE, hbuuid))); + connection.add(VF.createStatement(VF.createIRI(HBNAMESPACE, hbuuid), VF.createIRI(RDF_NS, "type"), VF.createIRI(HBNAMESPACE, "HeartbeatMeasurement"))); + connection.add(VF.createStatement(VF.createIRI(HBNAMESPACE, hbuuid), VF.createIRI(HB_TIMESTAMP), VF.createLiteral((START + 1) + ""))); + connection.add(VF.createStatement(VF.createIRI(HBNAMESPACE, hbuuid), VF.createIRI(HBNAMESPACE, "count"), VF.createLiteral(1 + ""))); + connection.add(VF.createStatement(VF.createIRI(HBNAMESPACE, hbuuid), VF.createIRI(HBNAMESPACE, "systemName"), VF.createIRI("urn:system:A"))); + connection.add(VF.createStatement(VF.createIRI("urn:system:A"), VF.createIRI(HBNAMESPACE, "heartbeat"), VF.createIRI(HBNAMESPACE, hbuuid))); hbuuid = "hbuuid2"; - connection.add(new StatementImpl(vf.createURI(HBNAMESPACE, hbuuid), vf.createURI(RDF_NS, "type"), vf.createURI(HBNAMESPACE, "HeartbeatMeasurement"))); - connection.add(new StatementImpl(vf.createURI(HBNAMESPACE, hbuuid), vf.createURI(HB_TIMESTAMP), vf.createLiteral((START + 2) + ""))); - connection.add(new StatementImpl(vf.createURI(HBNAMESPACE, hbuuid), vf.createURI(HBNAMESPACE, "count"), vf.createLiteral(2 + ""))); - connection.add(new StatementImpl(vf.createURI(HBNAMESPACE, hbuuid), vf.createURI(HBNAMESPACE, "systemName"), vf.createURI("urn:system:B"))); - connection.add(new StatementImpl(vf.createURI("urn:system:B"), vf.createURI(HBNAMESPACE, "heartbeat"), vf.createURI(HBNAMESPACE, hbuuid))); + connection.add(VF.createStatement(VF.createIRI(HBNAMESPACE, hbuuid), VF.createIRI(RDF_NS, "type"), VF.createIRI(HBNAMESPACE, "HeartbeatMeasurement"))); + connection.add(VF.createStatement(VF.createIRI(HBNAMESPACE, hbuuid), VF.createIRI(HB_TIMESTAMP), VF.createLiteral((START + 2) + ""))); + connection.add(VF.createStatement(VF.createIRI(HBNAMESPACE, hbuuid), VF.createIRI(HBNAMESPACE, "count"), VF.createLiteral(2 + ""))); + connection.add(VF.createStatement(VF.createIRI(HBNAMESPACE, hbuuid), VF.createIRI(HBNAMESPACE, "systemName"), VF.createIRI("urn:system:B"))); + connection.add(VF.createStatement(VF.createIRI("urn:system:B"), VF.createIRI(HBNAMESPACE, "heartbeat"), VF.createIRI(HBNAMESPACE, hbuuid))); hbuuid = "hbuuid3"; - connection.add(new StatementImpl(vf.createURI(HBNAMESPACE, hbuuid), vf.createURI(RDF_NS, "type"), vf.createURI(HBNAMESPACE, "HeartbeatMeasurement"))); - connection.add(new StatementImpl(vf.createURI(HBNAMESPACE, hbuuid), vf.createURI(HB_TIMESTAMP), vf.createLiteral((START + 3) + ""))); - connection.add(new StatementImpl(vf.createURI(HBNAMESPACE, hbuuid), vf.createURI(HBNAMESPACE, "count"), vf.createLiteral(3 + ""))); - connection.add(new StatementImpl(vf.createURI(HBNAMESPACE, hbuuid), vf.createURI(HBNAMESPACE, "systemName"), vf.createURI("urn:system:C"))); - connection.add(new StatementImpl(vf.createURI("urn:system:C"), vf.createURI(HBNAMESPACE, "heartbeat"), vf.createURI(HBNAMESPACE, hbuuid))); - - connection.add(new StatementImpl(vf.createURI("urn:subj1"), vf.createURI("urn:pred"), vf.createLiteral("obj1"))); - connection.add(new StatementImpl(vf.createURI("urn:subj1"), vf.createURI("urn:pred"), vf.createLiteral("obj2"))); - connection.add(new StatementImpl(vf.createURI("urn:subj1"), vf.createURI("urn:pred"), vf.createLiteral("obj3"))); - connection.add(new StatementImpl(vf.createURI("urn:subj1"), vf.createURI("urn:pred"), vf.createLiteral("obj4"))); - connection.add(new StatementImpl(vf.createURI("urn:subj2"), vf.createURI("urn:pred"), vf.createLiteral("obj1"))); - connection.add(new StatementImpl(vf.createURI("urn:subj2"), vf.createURI("urn:pred"), vf.createLiteral("obj2"))); - connection.add(new StatementImpl(vf.createURI("urn:subj2"), vf.createURI("urn:pred"), vf.createLiteral("obj3"))); - connection.add(new StatementImpl(vf.createURI("urn:subj2"), vf.createURI("urn:pred"), vf.createLiteral("obj4"))); - connection.add(new StatementImpl(vf.createURI("urn:subj3"), vf.createURI("urn:pred"), vf.createLiteral("obj1"))); - connection.add(new StatementImpl(vf.createURI("urn:subj3"), vf.createURI("urn:pred"), vf.createLiteral("obj4"))); + connection.add(VF.createStatement(VF.createIRI(HBNAMESPACE, hbuuid), VF.createIRI(RDF_NS, "type"), VF.createIRI(HBNAMESPACE, "HeartbeatMeasurement"))); + connection.add(VF.createStatement(VF.createIRI(HBNAMESPACE, hbuuid), VF.createIRI(HB_TIMESTAMP), VF.createLiteral((START + 3) + ""))); + connection.add(VF.createStatement(VF.createIRI(HBNAMESPACE, hbuuid), VF.createIRI(HBNAMESPACE, "count"), VF.createLiteral(3 + ""))); + connection.add(VF.createStatement(VF.createIRI(HBNAMESPACE, hbuuid), VF.createIRI(HBNAMESPACE, "systemName"), VF.createIRI("urn:system:C"))); + connection.add(VF.createStatement(VF.createIRI("urn:system:C"), VF.createIRI(HBNAMESPACE, "heartbeat"), VF.createIRI(HBNAMESPACE, hbuuid))); + + connection.add(VF.createStatement(VF.createIRI("urn:subj1"), VF.createIRI("urn:pred"), VF.createLiteral("obj1"))); + connection.add(VF.createStatement(VF.createIRI("urn:subj1"), VF.createIRI("urn:pred"), VF.createLiteral("obj2"))); + connection.add(VF.createStatement(VF.createIRI("urn:subj1"), VF.createIRI("urn:pred"), VF.createLiteral("obj3"))); + connection.add(VF.createStatement(VF.createIRI("urn:subj1"), VF.createIRI("urn:pred"), VF.createLiteral("obj4"))); + connection.add(VF.createStatement(VF.createIRI("urn:subj2"), VF.createIRI("urn:pred"), VF.createLiteral("obj1"))); + connection.add(VF.createStatement(VF.createIRI("urn:subj2"), VF.createIRI("urn:pred"), VF.createLiteral("obj2"))); + connection.add(VF.createStatement(VF.createIRI("urn:subj2"), VF.createIRI("urn:pred"), VF.createLiteral("obj3"))); + connection.add(VF.createStatement(VF.createIRI("urn:subj2"), VF.createIRI("urn:pred"), VF.createLiteral("obj4"))); + connection.add(VF.createStatement(VF.createIRI("urn:subj3"), VF.createIRI("urn:pred"), VF.createLiteral("obj1"))); + connection.add(VF.createStatement(VF.createIRI("urn:subj3"), VF.createIRI("urn:pred"), VF.createLiteral("obj4"))); //Foreign Chars - connection.add(new StatementImpl(vf.createURI("urn:subj1"), vf.createURI("urn:pred"), vf.createLiteral(FAN_CH_SIM))); - connection.add(new StatementImpl(vf.createURI("urn:subj1"), vf.createURI("urn:pred"), vf.createLiteral(FAN_CH_TRAD))); - connection.add(new StatementImpl(vf.createURI("urn:subj1"), vf.createURI("urn:pred"), vf.createLiteral(FAN_TH))); - connection.add(new StatementImpl(vf.createURI("urn:subj1"), vf.createURI("urn:pred"), vf.createLiteral(FAN_RN))); - connection.add(new StatementImpl(vf.createURI("urn:subj2"), vf.createURI("urn:pred"), vf.createLiteral(FAN_CH_SIM))); - connection.add(new StatementImpl(vf.createURI("urn:subj2"), vf.createURI("urn:pred"), vf.createLiteral(FAN_CH_TRAD))); - connection.add(new StatementImpl(vf.createURI("urn:subj2"), vf.createURI("urn:pred"), vf.createLiteral(FAN_TH))); - connection.add(new StatementImpl(vf.createURI("urn:subj2"), vf.createURI("urn:pred"), vf.createLiteral(FAN_RN))); - connection.add(new StatementImpl(vf.createURI("urn:subj3"), vf.createURI("urn:pred"), vf.createLiteral(FAN_CH_SIM))); - connection.add(new StatementImpl(vf.createURI("urn:subj3"), vf.createURI("urn:pred"), vf.createLiteral(FAN_CH_TRAD))); + connection.add(VF.createStatement(VF.createIRI("urn:subj1"), VF.createIRI("urn:pred"), VF.createLiteral(FAN_CH_SIM))); + connection.add(VF.createStatement(VF.createIRI("urn:subj1"), VF.createIRI("urn:pred"), VF.createLiteral(FAN_CH_TRAD))); + connection.add(VF.createStatement(VF.createIRI("urn:subj1"), VF.createIRI("urn:pred"), VF.createLiteral(FAN_TH))); + connection.add(VF.createStatement(VF.createIRI("urn:subj1"), VF.createIRI("urn:pred"), VF.createLiteral(FAN_RN))); + connection.add(VF.createStatement(VF.createIRI("urn:subj2"), VF.createIRI("urn:pred"), VF.createLiteral(FAN_CH_SIM))); + connection.add(VF.createStatement(VF.createIRI("urn:subj2"), VF.createIRI("urn:pred"), VF.createLiteral(FAN_CH_TRAD))); + connection.add(VF.createStatement(VF.createIRI("urn:subj2"), VF.createIRI("urn:pred"), VF.createLiteral(FAN_TH))); + connection.add(VF.createStatement(VF.createIRI("urn:subj2"), VF.createIRI("urn:pred"), VF.createLiteral(FAN_RN))); + connection.add(VF.createStatement(VF.createIRI("urn:subj3"), VF.createIRI("urn:pred"), VF.createLiteral(FAN_CH_SIM))); + connection.add(VF.createStatement(VF.createIRI("urn:subj3"), VF.createIRI("urn:pred"), VF.createLiteral(FAN_CH_TRAD))); connection.commit(); } @@ -217,7 +219,7 @@ public class RdfCloudTripleStoreTest extends TestCase { GregorianCalendar gregorianCalendar = new GregorianCalendar(); gregorianCalendar.setTimeInMillis(ts); //"2011-07-12T05:12:00.000Z"^^xsd:dateTime - return "\"" + vf.createLiteral(DatatypeFactory.newInstance().newXMLGregorianCalendar(gregorianCalendar)).stringValue() + "\"^^xsd:dateTime"; + return "\"" + VF.createLiteral(DatatypeFactory.newInstance().newXMLGregorianCalendar(gregorianCalendar)).stringValue() + "\"^^xsd:dateTime"; } // public void testScanAll() throws Exception { @@ -263,7 +265,7 @@ public class RdfCloudTripleStoreTest extends TestCase { } public void testAddCommitStatement() throws Exception { - StatementImpl stmt = new StatementImpl(vf.createURI("urn:namespace#subj"), vf.createURI("urn:namespace#pred"), vf.createLiteral("object")); + Statement stmt = VF.createStatement(VF.createIRI("urn:namespace#subj"), VF.createIRI("urn:namespace#pred"), VF.createLiteral("object")); connection.add(stmt); connection.commit(); } @@ -404,7 +406,7 @@ public class RdfCloudTripleStoreTest extends TestCase { TupleQuery tupleQuery = connection.prepareTupleQuery(QueryLanguage.SPARQL, query); // tupleQuery.setBinding(START_BINDING, vf.createLiteral(START)); // tupleQuery.setBinding(END_BINDING, vf.createLiteral(END)); -// tupleQuery.setBinding(TIME_PREDICATE, vf.createURI(NAMESPACE, "performedAt")); +// tupleQuery.setBinding(TIME_PREDICATE, vf.createIRI(NAMESPACE, "performedAt")); // tupleQuery.evaluate(new PrintTupleHandler()); CountTupleHandler tupleHandler = new CountTupleHandler(); tupleQuery.evaluate(tupleHandler); @@ -464,7 +466,7 @@ public class RdfCloudTripleStoreTest extends TestCase { TupleQuery tupleQuery = connection.prepareTupleQuery(QueryLanguage.SPARQL, query); // tupleQuery.setBinding(START_BINDING, vf.createLiteral(START)); // tupleQuery.setBinding(END_BINDING, vf.createLiteral(END)); -// tupleQuery.setBinding(TIME_PREDICATE, vf.createURI(NAMESPACE, "performedAt")); +// tupleQuery.setBinding(TIME_PREDICATE, vf.createIRI(NAMESPACE, "performedAt")); // tupleQuery.evaluate(new PrintTupleHandler()); CountTupleHandler tupleHandler = new CountTupleHandler(); tupleQuery.evaluate(tupleHandler); @@ -494,7 +496,7 @@ public class RdfCloudTripleStoreTest extends TestCase { TupleQuery tupleQuery = connection.prepareTupleQuery(QueryLanguage.SPARQL, query); // tupleQuery.setBinding(START_BINDING, vf.createLiteral(START)); // tupleQuery.setBinding(END_BINDING, vf.createLiteral(END)); -// tupleQuery.setBinding(TIME_PREDICATE, vf.createURI(NAMESPACE, "performedAt")); +// tupleQuery.setBinding(TIME_PREDICATE, vf.createIRI(NAMESPACE, "performedAt")); // tupleQuery.evaluate(new PrintTupleHandler()); CountTupleHandler tupleHandler = new CountTupleHandler(); tupleQuery.evaluate(tupleHandler); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/test/java/org/apache/rya/RdfCloudTripleStoreUtilsTest.java ---------------------------------------------------------------------- diff --git a/sail/src/test/java/org/apache/rya/RdfCloudTripleStoreUtilsTest.java b/sail/src/test/java/org/apache/rya/RdfCloudTripleStoreUtilsTest.java index c80c6c4..b1ba3fc 100644 --- a/sail/src/test/java/org/apache/rya/RdfCloudTripleStoreUtilsTest.java +++ b/sail/src/test/java/org/apache/rya/RdfCloudTripleStoreUtilsTest.java @@ -24,11 +24,11 @@ // //import junit.framework.TestCase; // -//import org.openrdf.model.BNode; -//import org.openrdf.model.Resource; -//import org.openrdf.model.URI; -//import org.openrdf.model.Value; -//import org.openrdf.model.impl.ValueFactoryImpl; +//import org.eclipse.rdf4j.model.BNode; +//import org.eclipse.rdf4j.model.Resource; +//import org.eclipse.rdf4j.model.IRI; +//import org.eclipse.rdf4j.model.Value; +//import org.eclipse.rdf4j.model.impl.ValueFactoryImpl; // //import com.google.common.io.ByteStreams; // @@ -37,8 +37,8 @@ //public class RdfCloudTripleStoreUtilsTest extends TestCase { // // public void testWriteReadURI() throws Exception { -// final ValueFactoryImpl vf = new ValueFactoryImpl(); -// URI uri = vf.createURI("http://www.example.org/test/rel";); +// final ValueFactoryImpl vf = SimpleValueFactory.getInstance(); +// URI uri = vf.createIRI("http://www.example.org/test/rel";); // byte[] value = writeValue(uri); // // Value readValue = readValue(ByteStreams @@ -47,7 +47,7 @@ // } // // public void testWriteReadBNode() throws Exception { -// final ValueFactoryImpl vf = new ValueFactoryImpl(); +// final ValueFactoryImpl vf = SimpleValueFactory.getInstance(); // Value val = vf.createBNode("bnodeid"); // byte[] value = writeValue(val); // @@ -57,7 +57,7 @@ // } // // public void testWriteReadLiteral() throws Exception { -// final ValueFactoryImpl vf = new ValueFactoryImpl(); +// final ValueFactoryImpl vf = SimpleValueFactory.getInstance(); // Value val = vf.createLiteral("myliteral"); // byte[] value = writeValue(val); // @@ -67,7 +67,7 @@ // } // // public void testContexts() throws Exception { -// final ValueFactoryImpl vf = new ValueFactoryImpl(); +// final ValueFactoryImpl vf = SimpleValueFactory.getInstance(); // BNode cont1 = vf.createBNode("cont1"); // BNode cont2 = vf.createBNode("cont2"); // BNode cont3 = vf.createBNode("cont3");
