http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/projection/ProjectionProcessorTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/projection/ProjectionProcessorTest.java b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/projection/ProjectionProcessorTest.java index 7ff2c96..f0fd762 100644 --- a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/projection/ProjectionProcessorTest.java +++ b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/projection/ProjectionProcessorTest.java @@ -30,11 +30,11 @@ import org.apache.rya.streams.kafka.RdfTestUtil; import org.apache.rya.streams.kafka.processors.ProcessorResult; import org.apache.rya.streams.kafka.processors.ProcessorResult.UnaryResult; import org.apache.rya.streams.kafka.processors.projection.ProjectionProcessorSupplier.ProjectionProcessor; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.impl.MapBindingSet; /** * Unit tests the methods of {@link ProjectionProcessor}. @@ -52,18 +52,18 @@ public class ProjectionProcessorTest { "}"); // Create a Binding Set that contains the result of the WHERE clause. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final MapBindingSet inputBs = new MapBindingSet(); - inputBs.addBinding("person", vf.createURI("urn:Alice")); - inputBs.addBinding("employee", vf.createURI("urn:Bob")); - inputBs.addBinding("business", vf.createURI("urn:TacoJoint")); + inputBs.addBinding("person", vf.createIRI("urn:Alice")); + inputBs.addBinding("employee", vf.createIRI("urn:Bob")); + inputBs.addBinding("business", vf.createIRI("urn:TacoJoint")); final VisibilityBindingSet inputVisBs = new VisibilityBindingSet(inputBs, "a"); // The expected binding set changes the "person" binding name to "p" and "employee" to "e". final MapBindingSet expectedBs = new MapBindingSet(); - expectedBs.addBinding("p", vf.createURI("urn:Alice")); - expectedBs.addBinding("e", vf.createURI("urn:Bob")); - expectedBs.addBinding("business", vf.createURI("urn:TacoJoint")); + expectedBs.addBinding("p", vf.createIRI("urn:Alice")); + expectedBs.addBinding("e", vf.createIRI("urn:Bob")); + expectedBs.addBinding("business", vf.createIRI("urn:TacoJoint")); final VisibilityBindingSet expectedVisBs = new VisibilityBindingSet(expectedBs, "a"); // Show it resulted in the correct output BindingSet.
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/queries/KafkaQueryChangeLogIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/queries/KafkaQueryChangeLogIT.java b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/queries/KafkaQueryChangeLogIT.java index 0dcd079..78db768 100644 --- a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/queries/KafkaQueryChangeLogIT.java +++ b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/queries/KafkaQueryChangeLogIT.java @@ -39,6 +39,7 @@ import org.apache.rya.streams.kafka.serialization.queries.QueryChangeSerializer; import org.apache.rya.test.kafka.KafkaITBase; import org.apache.rya.test.kafka.KafkaTestInstanceRule; import org.apache.rya.test.kafka.KafkaTestUtil; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -46,8 +47,6 @@ import org.junit.Test; import com.google.common.collect.Lists; -import info.aduna.iteration.CloseableIteration; - /** * Integration tests the {@link KafkaQueryChangeLog}. */ http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/serialization/VisibilityBindingSetKafkaIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/serialization/VisibilityBindingSetKafkaIT.java b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/serialization/VisibilityBindingSetKafkaIT.java index 70cba1c..5b14bd4 100644 --- a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/serialization/VisibilityBindingSetKafkaIT.java +++ b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/serialization/VisibilityBindingSetKafkaIT.java @@ -31,11 +31,11 @@ import org.apache.kafka.common.serialization.StringSerializer; import org.apache.rya.api.model.VisibilityBindingSet; import org.apache.rya.test.kafka.KafkaTestInstanceRule; import org.apache.rya.test.kafka.KafkaTestUtil; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.junit.Rule; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.impl.MapBindingSet; /** * Integration tests the {@link VisibilityBindingSetSerde} class' methods. @@ -48,10 +48,10 @@ public class VisibilityBindingSetKafkaIT { @Test public void readAndWrite() throws Exception { // Create the object that will be written to the topic. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final MapBindingSet bs = new MapBindingSet(); - bs.addBinding("urn:name", vf.createURI("urn:alice")); + bs.addBinding("urn:name", vf.createIRI("urn:alice")); bs.addBinding("urn:age", vf.createLiteral(32)); final VisibilityBindingSet original = new VisibilityBindingSet(bs, "a|b|c"); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/serialization/VisibilityBindingSetSerdeTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/serialization/VisibilityBindingSetSerdeTest.java b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/serialization/VisibilityBindingSetSerdeTest.java index 9d93539..049893b 100644 --- a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/serialization/VisibilityBindingSetSerdeTest.java +++ b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/serialization/VisibilityBindingSetSerdeTest.java @@ -23,10 +23,10 @@ import static org.junit.Assert.assertNull; import org.apache.kafka.common.serialization.Serde; import org.apache.rya.api.model.VisibilityBindingSet; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.impl.MapBindingSet; /** * Tests the methods of {@link VisibilityBindingSetSerde}. @@ -36,7 +36,7 @@ public class VisibilityBindingSetSerdeTest { @Test public void serializeAndDeserialize() { // Create the object that will be serialized. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final MapBindingSet bs = new MapBindingSet(); bs.addBinding("name", vf.createLiteral("alice")); bs.addBinding("age", vf.createLiteral(37)); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/serialization/VisibilityStatementKafkaIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/serialization/VisibilityStatementKafkaIT.java b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/serialization/VisibilityStatementKafkaIT.java index 9e85f52..a680582 100644 --- a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/serialization/VisibilityStatementKafkaIT.java +++ b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/serialization/VisibilityStatementKafkaIT.java @@ -31,10 +31,10 @@ import org.apache.kafka.common.serialization.StringSerializer; import org.apache.rya.api.model.VisibilityStatement; import org.apache.rya.test.kafka.KafkaTestInstanceRule; import org.apache.rya.test.kafka.KafkaTestUtil; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; import org.junit.Rule; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; /** * Integration tests the {@link VisibilityStatementSerde} class' methods. @@ -47,13 +47,13 @@ public class VisibilityStatementKafkaIT { @Test public void readAndWrite() throws Exception { // Create the object that will be written to the topic. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final VisibilityStatement original = new VisibilityStatement( vf.createStatement( - vf.createURI("urn:alice"), - vf.createURI("urn:age"), + vf.createIRI("urn:alice"), + vf.createIRI("urn:age"), vf.createLiteral(32), - vf.createURI("urn:context")), + vf.createIRI("urn:context")), "a|b|c"); // Write a VisibilityStatement to the test topic. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/serialization/VisibilityStatementSerdeTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/serialization/VisibilityStatementSerdeTest.java b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/serialization/VisibilityStatementSerdeTest.java index 47a79c9..d4f8ada 100644 --- a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/serialization/VisibilityStatementSerdeTest.java +++ b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/serialization/VisibilityStatementSerdeTest.java @@ -23,10 +23,10 @@ import static org.junit.Assert.assertNull; import org.apache.kafka.common.serialization.Serde; import org.apache.rya.api.model.VisibilityStatement; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; import org.junit.Test; -import org.openrdf.model.Statement; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; /** * Tests the methods of {@link VisibilityStatementSerde}. @@ -36,12 +36,12 @@ public class VisibilityStatementSerdeTest { @Test public void serializeAndDeserialize() { // Create the object that will be serialized. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final Statement statement = vf.createStatement( - vf.createURI("urn:person1"), - vf.createURI("urn:hasName"), + vf.createIRI("urn:person1"), + vf.createIRI("urn:hasName"), vf.createLiteral("alice"), - vf.createURI("urn:testContext")); + vf.createIRI("urn:testContext")); final VisibilityStatement original = new VisibilityStatement(statement, "a|b|c"); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/topology/TopologyFactoryTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/topology/TopologyFactoryTest.java b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/topology/TopologyFactoryTest.java index 31462ec..95e2ddb 100644 --- a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/topology/TopologyFactoryTest.java +++ b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/topology/TopologyFactoryTest.java @@ -23,16 +23,17 @@ import static org.junit.Assert.assertTrue; import java.util.List; +import org.apache.rya.api.domain.VarNameUtils; import org.apache.rya.api.function.projection.RandomUUIDFactory; import org.apache.rya.streams.kafka.topology.TopologyFactory.ProcessorEntry; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.algebra.Join; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.Var; import org.junit.Before; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.algebra.Join; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.Var; /** * Unit tests the methods of {@link TopologyFactory}. @@ -40,9 +41,9 @@ import org.openrdf.query.algebra.Var; public class TopologyFactoryTest { private static TopologyFactory FACTORY; - private static final ValueFactory VF = ValueFactoryImpl.getInstance(); - private static final Var TALKS_TO = new Var("-const-urn:talksTo", VF.createURI("urn:talksTo")); - private static final Var CHEWS = new Var("-const-urn:chews", VF.createURI("urn:chews")); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); + private static final Var TALKS_TO = VarNameUtils.createUniqueConstVar(VF.createIRI("urn:talksTo")); + private static final Var CHEWS = VarNameUtils.createUniqueConstVar(VF.createIRI("urn:chews")); static { TALKS_TO.setAnonymous(true); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/query-manager/src/main/java/org/apache/rya/streams/querymanager/QueryExecutor.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/query-manager/src/main/java/org/apache/rya/streams/querymanager/QueryExecutor.java b/extras/rya.streams/query-manager/src/main/java/org/apache/rya/streams/querymanager/QueryExecutor.java index bcee796..2c0686f 100644 --- a/extras/rya.streams/query-manager/src/main/java/org/apache/rya/streams/querymanager/QueryExecutor.java +++ b/extras/rya.streams/query-manager/src/main/java/org/apache/rya/streams/querymanager/QueryExecutor.java @@ -22,7 +22,7 @@ import java.util.Set; import java.util.UUID; import org.apache.rya.streams.api.entity.StreamsQuery; -import org.openrdf.model.Statement; +import org.eclipse.rdf4j.model.Statement; import com.google.common.util.concurrent.Service; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/query-manager/src/test/java/org/apache/rya/streams/querymanager/kafka/LocalQueryExecutorIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/query-manager/src/test/java/org/apache/rya/streams/querymanager/kafka/LocalQueryExecutorIT.java b/extras/rya.streams/query-manager/src/test/java/org/apache/rya/streams/querymanager/kafka/LocalQueryExecutorIT.java index 83f040d..fcb3a46 100644 --- a/extras/rya.streams/query-manager/src/test/java/org/apache/rya/streams/querymanager/kafka/LocalQueryExecutorIT.java +++ b/extras/rya.streams/query-manager/src/test/java/org/apache/rya/streams/querymanager/kafka/LocalQueryExecutorIT.java @@ -42,13 +42,13 @@ import org.apache.rya.streams.kafka.serialization.VisibilityStatementSerializer; import org.apache.rya.streams.querymanager.QueryExecutor; import org.apache.rya.test.kafka.KafkaTestInstanceRule; import org.apache.rya.test.kafka.KafkaTestUtil; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.impl.MapBindingSet; import com.google.common.collect.Lists; @@ -89,34 +89,34 @@ public class LocalQueryExecutorIT { final StreamsQuery sQuery = new StreamsQuery(UUID.randomUUID(), "SELECT * WHERE { ?person <urn:worksAt> ?business . }", true, false); // Create the statements that will be loaded. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final List<VisibilityStatement> statements = new ArrayList<>(); statements.add(new VisibilityStatement(vf.createStatement( - vf.createURI("urn:Alice"), - vf.createURI("urn:worksAt"), - vf.createURI("urn:BurgerJoint")), "a")); + vf.createIRI("urn:Alice"), + vf.createIRI("urn:worksAt"), + vf.createIRI("urn:BurgerJoint")), "a")); statements.add(new VisibilityStatement(vf.createStatement( - vf.createURI("urn:Bob"), - vf.createURI("urn:worksAt"), - vf.createURI("urn:TacoShop")), "a")); + vf.createIRI("urn:Bob"), + vf.createIRI("urn:worksAt"), + vf.createIRI("urn:TacoShop")), "a")); statements.add(new VisibilityStatement(vf.createStatement( - vf.createURI("urn:Charlie"), - vf.createURI("urn:worksAt"), - vf.createURI("urn:TacoShop")), "a")); + vf.createIRI("urn:Charlie"), + vf.createIRI("urn:worksAt"), + vf.createIRI("urn:TacoShop")), "a")); // Create the expected results. final List<VisibilityBindingSet> expected = new ArrayList<>(); MapBindingSet bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Alice")); - bs.addBinding("business", vf.createURI("urn:BurgerJoint")); + bs.addBinding("person", vf.createIRI("urn:Alice")); + bs.addBinding("business", vf.createIRI("urn:BurgerJoint")); expected.add(new VisibilityBindingSet(bs, "a")); bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Bob")); - bs.addBinding("business", vf.createURI("urn:TacoShop")); + bs.addBinding("person", vf.createIRI("urn:Bob")); + bs.addBinding("business", vf.createIRI("urn:TacoShop")); expected.add(new VisibilityBindingSet(bs, "a")); bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Charlie")); - bs.addBinding("business", vf.createURI("urn:TacoShop")); + bs.addBinding("person", vf.createIRI("urn:Charlie")); + bs.addBinding("business", vf.createIRI("urn:TacoShop")); expected.add(new VisibilityBindingSet(bs, "a")); // Start the executor that will be tested. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/shell/src/main/java/org/apache/rya/shell/RyaCommands.java ---------------------------------------------------------------------- diff --git a/extras/shell/src/main/java/org/apache/rya/shell/RyaCommands.java b/extras/shell/src/main/java/org/apache/rya/shell/RyaCommands.java index 1d53348..c257860 100644 --- a/extras/shell/src/main/java/org/apache/rya/shell/RyaCommands.java +++ b/extras/shell/src/main/java/org/apache/rya/shell/RyaCommands.java @@ -35,12 +35,14 @@ import org.apache.commons.io.FilenameUtils; import org.apache.rya.api.client.ExecuteSparqlQuery; import org.apache.rya.api.client.RyaClient; import org.apache.rya.api.client.RyaClientException; +import org.apache.rya.rdftriplestore.utils.RdfFormatUtils; import org.apache.rya.shell.SharedShellState.ShellState; import org.apache.rya.shell.util.ConsolePrinter; import org.apache.rya.shell.util.SparqlPrompt; -import org.openrdf.query.BindingSet; -import org.openrdf.query.TupleQueryResult; -import org.openrdf.rio.RDFFormat; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.TupleQueryResult; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.Rio; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -121,7 +123,7 @@ public class RyaCommands implements CommandMarker { RDFFormat rdfFormat = null; // If a format was provided, then go with that. if (format != null) { - rdfFormat = RDFFormat.valueOf(format); + rdfFormat = RdfFormatUtils.getRdfFormatFromName(format); if (rdfFormat == null) { throw new RuntimeException("Unsupported RDF Statement data input format: " + format); } @@ -129,7 +131,7 @@ public class RyaCommands implements CommandMarker { // Otherwise try to figure it out using the filename. else if (rdfFormat == null) { - rdfFormat = RDFFormat.forFileName(rootedFile.getFileName().toString()); + rdfFormat = Rio.getParserFormatForFileName(rootedFile.getFileName().toString()).get(); if (rdfFormat == null) { throw new RuntimeException("Unable to detect RDF Statement data input format for file: " + rootedFile); } else { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/shell/src/main/java/org/apache/rya/shell/RyaStreamsCommands.java ---------------------------------------------------------------------- diff --git a/extras/shell/src/main/java/org/apache/rya/shell/RyaStreamsCommands.java b/extras/shell/src/main/java/org/apache/rya/shell/RyaStreamsCommands.java index fede1a9..f286472 100644 --- a/extras/shell/src/main/java/org/apache/rya/shell/RyaStreamsCommands.java +++ b/extras/shell/src/main/java/org/apache/rya/shell/RyaStreamsCommands.java @@ -37,7 +37,7 @@ import org.apache.rya.streams.api.RyaStreamsClient; import org.apache.rya.streams.api.entity.StreamsQuery; import org.apache.rya.streams.api.exception.RyaStreamsException; import org.apache.rya.streams.kafka.KafkaRyaStreamsClientFactory; -import org.openrdf.query.MalformedQueryException; +import org.eclipse.rdf4j.query.MalformedQueryException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.shell.core.CommandMarker; import org.springframework.shell.core.annotation.CliAvailabilityIndicator; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/shell/src/main/java/org/apache/rya/shell/util/StreamsQueryFormatter.java ---------------------------------------------------------------------- diff --git a/extras/shell/src/main/java/org/apache/rya/shell/util/StreamsQueryFormatter.java b/extras/shell/src/main/java/org/apache/rya/shell/util/StreamsQueryFormatter.java index babeec8..646ca7c 100644 --- a/extras/shell/src/main/java/org/apache/rya/shell/util/StreamsQueryFormatter.java +++ b/extras/shell/src/main/java/org/apache/rya/shell/util/StreamsQueryFormatter.java @@ -24,9 +24,9 @@ import java.util.Collection; import java.util.List; import org.apache.rya.streams.api.entity.StreamsQuery; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; -import org.openrdf.queryrender.sparql.SPARQLQueryRenderer; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; +import org.eclipse.rdf4j.queryrender.sparql.SPARQLQueryRenderer; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/shell/src/test/java/org/apache/rya/shell/RyaCommandsTest.java ---------------------------------------------------------------------- diff --git a/extras/shell/src/test/java/org/apache/rya/shell/RyaCommandsTest.java b/extras/shell/src/test/java/org/apache/rya/shell/RyaCommandsTest.java index d08b0bd..ced94f3 100644 --- a/extras/shell/src/test/java/org/apache/rya/shell/RyaCommandsTest.java +++ b/extras/shell/src/test/java/org/apache/rya/shell/RyaCommandsTest.java @@ -17,6 +17,7 @@ * under the License. */ package org.apache.rya.shell; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; @@ -37,9 +38,9 @@ import org.apache.rya.api.client.RyaClientException; import org.apache.rya.api.client.accumulo.AccumuloConnectionDetails; import org.apache.rya.shell.util.ConsolePrinter; import org.apache.rya.shell.util.SparqlPrompt; +import org.eclipse.rdf4j.query.TupleQueryResult; +import org.eclipse.rdf4j.rio.RDFFormat; import org.junit.Test; -import org.openrdf.query.TupleQueryResult; -import org.openrdf.rio.RDFFormat; import com.google.common.base.Optional; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/vagrantExample/src/main/vagrant/Vagrantfile ---------------------------------------------------------------------- diff --git a/extras/vagrantExample/src/main/vagrant/Vagrantfile b/extras/vagrantExample/src/main/vagrant/Vagrantfile index e3f2a73..6b81abe 100644 --- a/extras/vagrantExample/src/main/vagrant/Vagrantfile +++ b/extras/vagrantExample/src/main/vagrant/Vagrantfile @@ -20,7 +20,7 @@ # # Builds a single node Rya on Accumulo on Hadoop and Zookeeper. -# Deploys Rya, and the Sesame openrdf-workbench on Tomcat accessable from the host's browser. +# Deploys Rya, and the Eclipse rdf4j-workbench on Tomcat accessible from the host's browser. # See the accompanying readme for URL's, verification, and troubleshooting. # # Note: Machine's ip is 192.168.33.10 @@ -52,8 +52,8 @@ Vagrant.configure(2) do |config| export ACCUMULO_VERSION=1.6.5 ###export ACCUMULO_VERSION=1.7.1 export HADOOP_VERSION=2.7.2 - export RYA_EXAMPLE_VERSION=3.2.10-SNAPSHOT - export SESAME_VERSION=2.7.6 + export RYA_EXAMPLE_VERSION=3.2.13-SNAPSHOT + export RDF4J_VERSION=2.3.1 export ZOOKEEPER_VERSION=3.4.5-cdh4.5.0 echo "Updating host file with permanent ip" @@ -288,25 +288,25 @@ EOF echo 'Done!' - echo "Installing Sesame Server" - # creating log dir sesame-http-server-${SESAME_VERSION} - sudo mkdir --parents /usr/share/tomcat7/.aduna + echo "Installing RDF4J Server" + # creating log dir rdf4j-http-server-${RDF4J_VERSION} + sudo mkdir --parents /usr/share/tomcat7/.RDF4J sudo chown -R tomcat7:tomcat7 /usr/share/tomcat7 - sudo ln --force -s /usr/share/tomcat7/.aduna/openrdf-sesame/logs /var/log/tomcat7/openrdf-sesame - sesamewar=/var/lib/tomcat7/webapps/openrdf-sesame.war - if [[ ! -s $sesamewar ]] ; then + sudo ln --force -s /usr/share/tomcat7/.RDF4J/Server/logs /var/log/tomcat7/rdf4j-server + rdf4jwar=/var/lib/tomcat7/webapps/rdf4j-server.war + if [[ ! -s $rdf4jwar ]] ; then echo "Downloading" - download --output $sesamewar http://repo1.maven.org/maven2/org/openrdf/sesame/sesame-http-server/${SESAME_VERSION}/sesame-http-server-${SESAME_VERSION}.war || exit 110 + download --output $rdf4jwar http://repo1.maven.org/maven2/org/eclipse/rdf4j/rdf4j-http-server/${RDF4J_VERSION}/rdf4j-http-server-${RDF4J_VERSION}.war || exit 110 fi - echo "Sesame http server deployed at http://rya-example-box:8080/openrdf-sesame"; + echo "RDF4J http server deployed at http://rya-example-box:8080/rdf4j-server"; - echo "Installing Sesame Workbench" - workbench=/var/lib/tomcat7/webapps/openrdf-workbench.war + echo "Installing RDF4J Workbench" + workbench=/var/lib/tomcat7/webapps/rdf4j-workbench.war if [[ ! -s $workbench ]] ; then echo "Downloading" - download --output $workbench http://repo1.maven.org/maven2/org/openrdf/sesame/sesame-http-workbench/${SESAME_VERSION}/sesame-http-workbench-${SESAME_VERSION}.war || exit 111 + download --output $workbench http://repo1.maven.org/maven2/org/eclipse/rdf4j/rdf4j-http-workbench/${RDF4J_VERSION}/rdf4j-http-workbench-${RDF4J_VERSION}.war || exit 111 fi - echo "Sesame workbench deployed at http://rya-example-box:8080/openrdf-workbench"; + echo "RDF4J workbench deployed at http://rya-example-box:8080/rdf4j-workbench"; echo "Installing Rya" ryaIndexing=rya.indexing.example-${RYA_EXAMPLE_VERSION}-distribution @@ -319,23 +319,23 @@ EOF sudo unzip -q -o ${ryaIndexing}.zip -d ${ryaIndexing} # before continueing, wait for tomcat to deploy wars: - waitForDeploy /var/lib/tomcat7/webapps/openrdf-workbench/WEB-INF/lib/ - waitForDeploy /var/lib/tomcat7/webapps/openrdf-sesame/WEB-INF/lib/ + waitForDeploy /var/lib/tomcat7/webapps/rdf4j-workbench/WEB-INF/lib/ + waitForDeploy /var/lib/tomcat7/webapps/rdf4j-server/WEB-INF/lib/ # soft linking the files doesn't seem to work in tomcat, so we copy them instead :( - sudo cp ${ryaIndexing}/dist/lib/* /var/lib/tomcat7/webapps/openrdf-workbench/WEB-INF/lib/ || exit 113 - sudo cp ${ryaIndexing}/dist/lib/* /var/lib/tomcat7/webapps/openrdf-sesame/WEB-INF/lib/ || exit 114 + sudo cp ${ryaIndexing}/dist/lib/* /var/lib/tomcat7/webapps/rdf4j-workbench/WEB-INF/lib/ || exit 113 + sudo cp ${ryaIndexing}/dist/lib/* /var/lib/tomcat7/webapps/rdf4j-server/WEB-INF/lib/ || exit 114 # These are older libs that breaks tomcat 7 - sudo rm --force /var/lib/tomcat7/webapps/openrdf-workbench/WEB-INF/lib/servlet-api-2.5.jar - sudo rm --force /var/lib/tomcat7/webapps/openrdf-workbench/WEB-INF/lib/jsp-api-2.1.jar - sudo rm --force /var/lib/tomcat7/webapps/openrdf-sesame/WEB-INF/lib/servlet-api-2.5.jar - sudo rm --force /var/lib/tomcat7/webapps/openrdf-sesame/WEB-INF/lib/jsp-api-2.1.jar + sudo rm --force /var/lib/tomcat7/webapps/rdf4j-workbench/WEB-INF/lib/servlet-api-2.5.jar + sudo rm --force /var/lib/tomcat7/webapps/rdf4j-workbench/WEB-INF/lib/jsp-api-2.1.jar + sudo rm --force /var/lib/tomcat7/webapps/rdf4j-server/WEB-INF/lib/servlet-api-2.5.jar + sudo rm --force /var/lib/tomcat7/webapps/rdf4j-server/WEB-INF/lib/jsp-api-2.1.jar - sudo chown -R tomcat7:tomcat7 /var/lib/tomcat7/webapps/openrdf-workbench/WEB-INF/lib/ - sudo chown -R tomcat7:tomcat7 /var/lib/tomcat7/webapps/openrdf-sesame/WEB-INF/lib/ + sudo chown -R tomcat7:tomcat7 /var/lib/tomcat7/webapps/rdf4j-workbench/WEB-INF/lib/ + sudo chown -R tomcat7:tomcat7 /var/lib/tomcat7/webapps/rdf4j-server/WEB-INF/lib/ - echo "Downloading and installing new templates for OpenRdf WorkBench" + echo "Downloading and installing new templates for RDF4J WorkBench" ryaVagrant=rya.vagrant.example-${RYA_EXAMPLE_VERSION} if [[ ! -s ${ryaVagrant}.jar ]] ; then echo "Downloading" @@ -343,8 +343,8 @@ EOF fi sudo mkdir --parents ${ryaVagrant} sudo unzip -q -o ${ryaVagrant}.jar -d ${ryaVagrant} - sudo cp ${ryaVagrant}/*.xsl /var/lib/tomcat7/webapps/openrdf-workbench/transformations/ - sudo chown tomcat7:tomcat7 /var/lib/tomcat7/webapps/openrdf-workbench/transformations/* + sudo cp ${ryaVagrant}/*.xsl /var/lib/tomcat7/webapps/rdf4j-workbench/transformations/ + sudo chown tomcat7:tomcat7 /var/lib/tomcat7/webapps/rdf4j-workbench/transformations/* echo "Deploying Rya Web" ryaWar=web.rya-${RYA_EXAMPLE_VERSION}.war http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/vagrantExample/src/main/vagrant/readme.md ---------------------------------------------------------------------- diff --git a/extras/vagrantExample/src/main/vagrant/readme.md b/extras/vagrantExample/src/main/vagrant/readme.md index 235d28d..dcfcf8d 100644 --- a/extras/vagrantExample/src/main/vagrant/readme.md +++ b/extras/vagrantExample/src/main/vagrant/readme.md @@ -21,7 +21,7 @@ # Rya Vagrant Example Documentation -The Rya Vagrant Example project allows users to quickly get up and running on Rya using a Virtual Machine. Specifically, this project uses Vagrant to create a VM, install Rya on Accumulo, and configure the OpenRDF Workbench Web Application to use Rya. +The Rya Vagrant Example project allows users to quickly get up and running on Rya using a Virtual Machine. Specifically, this project uses Vagrant to create a VM, install Rya on Accumulo, and configure the RDF4J Workbench Web Application to use Rya. ## Setting up the VM @@ -49,9 +49,9 @@ By default, the VM should be assigned the IP address of `192.168.33.10`. This v 1. **Verify the Tomcat instance**: Open a browser to <http://rya-example-box:8080/>. You should see a webpage that says âIt works! If you're seeing this page via a web browser, it means you've setup Tomcat successfully. Congratulations! -1. **Verify the deployed OpenRDF Sesame service**: Open your browser to <http://rya-example-box:8080/openrdf-sesame/protocol> and you should see a `6` (this is the OpenRDF Protocol Version). +1. **Verify the deployed RDF4J Server service**: Open your browser to <http://rya-example-box:8080/rdf4j-server/protocol> and you should see a `6` (this is the RDF4J Protocol Version). -1. **Verify the deployed OpenRDF Workbench**: Open your browser to <http://rya-example-box:8080/openrdf-workbench> +1. **Verify the deployed RDF4J Workbench**: Open your browser to <http://rya-example-box:8080/rdf4j-workbench> 1. **Verify the deployed Rya Web**: Open your browser to <http://rya-example-box:8080/web.rya/sparqlQuery.jsp> @@ -74,15 +74,15 @@ the Vagrantfile. Run these two commands and see if you have any Rya files in the two lib directories: ``` - ls /var/lib/tomcat7/webapps/openrdf-sesame/WEB-INF/lib/rya* - ls /var/lib/tomcat7/webapps/openrdf-workbench/WEB-INF/lib/rya* + ls /var/lib/tomcat7/webapps/rdf4j-server/WEB-INF/lib/rya* + ls /var/lib/tomcat7/webapps/rdf4j-workbench/WEB-INF/lib/rya* ``` If these files do note exists, open the vagrant file and look for the line `echo "Downloading Rya"`. Try working through those commands manually on your Vagrant VM. -#### OpenRDF Workbench transformations are not installed +#### RDF4J Workbench transformations are not installed -OpenRDF Workbench requires a set of "transformations" for listing Rya in the OpenRDF Workbench Repository list. The transforms are in this directory: /var/lib/tomcat7/webapps/openrdf-workbench/transformations/ +RDF4J Workbench requires a set of "transformations" for listing Rya in the RDF4J Workbench Repository list. The transforms are in this directory: /var/lib/tomcat7/webapps/rdf4j-workbench/transformations/ 1. Verify that this file exists: create-RyaAccumuloSail.xsl 1. Verify that create.xsl has been updated for rya. (run: "cat create.xsl | grep Rya" and make sure there's some stuff there.) @@ -183,30 +183,30 @@ From within the VM, run: ## Interacting with Rya on the VM -### Connecting to Rya via OpenRDF Workbench +### Connecting to Rya via RDF4J Workbench -The first step to using Rya via the OpenRDF Workbench is to create a repository using the Rya Accumulo Store connector. +The first step to using Rya via the RDF4J Workbench is to create a repository using the Rya Accumulo Store connector. -1. Open your browser to the [OpenRDF Workbench](http://rya-example-box:8080/openrdf-workbench) +1. Open your browser to the [RDF4j Workbench](http://rya-example-box:8080/rdf4j-workbench) 2. Click on `New Repository` 3. Choose "Type" of `Rya Accumulo Store`, a Repository "ID" (e.g., `RyaAccumulo`), and a Repository "Title" (e.g., `Rya Accumulo`). Click on `Next` when complete. 4. Enter the Rya Accumulo Store connection parameters. The default parameters will connect to the Rya Example Box Acccumulo deployment (i.e., Accumulo User: `root`, Accumulo Password: `root`, Accumulo Instance: `dev`, Zookeepers: `localhost`, is Mock?: `false`). Click on `Create` when complete. -### Uploading Data via OpenRDF Workbench +### Uploading Data via RDF4J Workbench -Once we've created a Rya repository, we can load data into Rya via the OpenRDF Workbench. +Once we've created a Rya repository, we can load data into Rya via the RDF4J Workbench. -1. Open your browser to the [OpenRDF Workbench](http://rya-example-box:8080/openrdf-workbench) -1. Verify that OpenRDF Workbench is connected to Rya. The OpenRDF Workbench screen should have `Current Selections: Repository: Rya Accumulo ( RyaAccumulo )` at the top of the page. +1. Open your browser to the [RDF4J Workbench](http://rya-example-box:8080/rdf4j-workbench) +1. Verify that RDF4J Workbench is connected to Rya. The RDF4j Workbench screen should have `Current Selections: Repository: Rya Accumulo ( RyaAccumulo )` at the top of the page. 2. Click on `Add` on the left side of the page. 3. This page allows a user to add data either through a local file (uploaded through the browser), cut-and-pasted RDF, or a file located on the web. For this example, let's choose a file on the web. Set "Data Format" to `RDF/XML` and "Location of the RDF data you wish to upload" to `http://telegraphis.net/data/currencies/currencies.rdf`. All other fields should remain empty. Click on `Upload` when complete. -### Querying Data via OpenRDF Workbench +### Querying Data via RDF4J Workbench -Once we've created a Rya repository and uploaded data, we can query Rya via the OpenRDF Workbench. +Once we've created a Rya repository and uploaded data, we can query Rya via the RDF4J Workbench. -1. Open your browser to the [OpenRDF Workbench](http://rya-example-box:8080/openrdf-workbench) -1. Verify that OpenRDF Workbench is connected to Rya. The OpenRDF Workbench screen should have `Current Selections: Repository: Rya Accumulo ( RyaAccumulo )` at the top of the page. +1. Open your browser to the [RDF4J Workbench](http://rya-example-box:8080/rdf4j-workbench) +1. Verify that RDF4J Workbench is connected to Rya. The RDF4J Workbench screen should have `Current Selections: Repository: Rya Accumulo ( RyaAccumulo )` at the top of the page. 1. Click on `Query` on the left side of the page. 1. Use the example SPARQL query below to query for Currencies with a Short Name of "dollar" @@ -220,9 +220,10 @@ Once we've created a Rya repository and uploaded data, we can query Rya via the } ``` -### Using the OpenRDF REST Service +### Using the RDF4J REST Service -More information about the Sesame REST HTTP Protocol is availible in the [OpenRDF 2.7 Docs] (http://rdf4j.org/sesame/2.7/docs/system.docbook?view#The_Sesame_REST_HTTP_Protocol) +More information about the RDF4J REST HTTP Protocol is availible in the [RDF4J 2.3.1 Docs] +(http://docs.rdf4j.org/rest-api/) ### Using Rya Java Client TODO http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/mapreduce/pom.xml ---------------------------------------------------------------------- diff --git a/mapreduce/pom.xml b/mapreduce/pom.xml index 98b4200..dc3cec4 100644 --- a/mapreduce/pom.xml +++ b/mapreduce/pom.xml @@ -60,16 +60,16 @@ under the License. </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-rio-ntriples</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-rio-ntriples</artifactId> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-rio-nquads</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-rio-nquads</artifactId> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-rio-trig</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-rio-trig</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/mapreduce/src/main/java/org/apache/rya/accumulo/mr/AbstractAccumuloMRTool.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/AbstractAccumuloMRTool.java b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/AbstractAccumuloMRTool.java index 0e7cbc6..7489391 100644 --- a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/AbstractAccumuloMRTool.java +++ b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/AbstractAccumuloMRTool.java @@ -19,13 +19,6 @@ package org.apache.rya.accumulo.mr; * under the License. */ -import org.apache.rya.accumulo.AccumuloRdfConstants; -import org.apache.rya.api.RdfCloudTripleStoreConfiguration; -import org.apache.rya.api.RdfCloudTripleStoreConstants; -import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; -import org.apache.rya.api.RdfCloudTripleStoreUtils; -import org.apache.rya.indexing.accumulo.ConfigUtils; - import java.io.IOException; import org.apache.accumulo.core.client.AccumuloException; @@ -45,7 +38,13 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.util.Tool; -import org.openrdf.rio.RDFFormat; +import org.apache.rya.accumulo.AccumuloRdfConstants; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.RdfCloudTripleStoreConstants; +import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; +import org.apache.rya.api.RdfCloudTripleStoreUtils; +import org.apache.rya.indexing.accumulo.ConfigUtils; +import org.eclipse.rdf4j.rio.RDFFormat; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/mapreduce/src/main/java/org/apache/rya/accumulo/mr/MRUtils.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/MRUtils.java b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/MRUtils.java index e985563..f826b71 100644 --- a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/MRUtils.java +++ b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/MRUtils.java @@ -1,5 +1,3 @@ -package org.apache.rya.accumulo.mr; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -18,6 +16,7 @@ package org.apache.rya.accumulo.mr; * specific language governing permissions and limitations * under the License. */ +package org.apache.rya.accumulo.mr; import org.apache.accumulo.core.client.Instance; import org.apache.accumulo.core.client.mapreduce.InputFormatBase; @@ -27,11 +26,11 @@ import org.apache.hadoop.mapreduce.InputSplit; import org.apache.hadoop.mapreduce.JobContext; import org.apache.hadoop.mapreduce.RecordReader; import org.apache.hadoop.mapreduce.TaskAttemptContext; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.rio.RDFFormat; - import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; +import org.apache.rya.rdftriplestore.utils.RdfFormatUtils; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.rio.RDFFormat; /** * Contains constants and static methods for interacting with a @@ -114,7 +113,7 @@ public class MRUtils { public static final String AC_TABLE_PROP = "ac.table"; public static final String HADOOP_IO_SORT_MB = "io.sort.mb"; - public static final ValueFactory vf = new ValueFactoryImpl(); + public static final ValueFactory VF = SimpleValueFactory.getInstance(); /** * Gets the TTL from a given Configuration. @@ -200,7 +199,7 @@ public class MRUtils { * @return The configured RDFFormat, or null if not set. */ public static RDFFormat getRDFFormat(Configuration conf) { - return RDFFormat.valueOf(conf.get(FORMAT_PROP)); + return RdfFormatUtils.getRdfFormatFromName(conf.get(FORMAT_PROP)); } /** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RdfFileInputFormat.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RdfFileInputFormat.java b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RdfFileInputFormat.java index 27e38f2..84e0210 100644 --- a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RdfFileInputFormat.java +++ b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RdfFileInputFormat.java @@ -38,17 +38,18 @@ import org.apache.hadoop.mapreduce.TaskAttemptContext; import org.apache.hadoop.mapreduce.lib.input.FileInputFormat; import org.apache.hadoop.mapreduce.lib.input.KeyValueLineRecordReader; import org.apache.log4j.Logger; -import org.openrdf.model.Statement; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFHandler; -import org.openrdf.rio.RDFHandlerException; -import org.openrdf.rio.RDFParseException; -import org.openrdf.rio.RDFParser; -import org.openrdf.rio.Rio; - import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.resolver.RdfToRyaConversions; import org.apache.rya.api.resolver.RyaTripleContext; +import org.apache.rya.rdftriplestore.utils.RdfFormatUtils; +import org.eclipse.rdf4j.model.Statement; +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 org.eclipse.rdf4j.rio.RDFParser; +import org.eclipse.rdf4j.rio.Rio; /** * {@link FileInputFormat} that can read multiple RDF files and convert into @@ -124,7 +125,7 @@ public class RdfFileInputFormat extends FileInputFormat<LongWritable, RyaStateme private RDFFormat getRDFFormat(JobContext context) { String name = context.getConfiguration().get(FORMAT_PROP); - return RDFFormat.valueOf(name); + return RdfFormatUtils.getRdfFormatFromName(name); } /** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaOutputFormat.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaOutputFormat.java b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaOutputFormat.java index 0d42df2..0dd08b1 100644 --- a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaOutputFormat.java +++ b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaOutputFormat.java @@ -62,8 +62,8 @@ import org.apache.rya.indexing.accumulo.ConfigUtils; import org.apache.rya.indexing.accumulo.entity.EntityCentricIndex; import org.apache.rya.indexing.accumulo.freetext.AccumuloFreeTextIndexer; import org.apache.rya.indexing.accumulo.temporal.AccumuloTemporalIndexer; -import org.openrdf.model.Statement; -import org.openrdf.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; /** * {@link OutputFormat} that uses Rya, the {@link GeoIndexer}, the http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaTypeWritable.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaTypeWritable.java b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaTypeWritable.java index ec47d82..be90180 100644 --- a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaTypeWritable.java +++ b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaTypeWritable.java @@ -23,11 +23,10 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.rya.api.domain.RyaType; - import org.apache.hadoop.io.WritableComparable; -import org.openrdf.model.URI; -import org.openrdf.model.impl.ValueFactoryImpl; +import org.apache.rya.api.domain.RyaType; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; public class RyaTypeWritable implements WritableComparable<RyaTypeWritable>{ @@ -52,10 +51,10 @@ public class RyaTypeWritable implements WritableComparable<RyaTypeWritable>{ @Override public void readFields(DataInput dataInput) throws IOException { - ValueFactoryImpl vfi = new ValueFactoryImpl(); + SimpleValueFactory vfi = SimpleValueFactory.getInstance(); String data = dataInput.readLine(); String dataTypeString = dataInput.readLine(); - URI dataType = vfi.createURI(dataTypeString); + IRI dataType = vfi.createIRI(dataTypeString); ryatype.setData(data); ryatype.setDataType(dataType); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/mapreduce/src/main/java/org/apache/rya/accumulo/mr/examples/TextOutputExample.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/examples/TextOutputExample.java b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/examples/TextOutputExample.java index ab42aab..593e568 100644 --- a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/examples/TextOutputExample.java +++ b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/examples/TextOutputExample.java @@ -1,7 +1,3 @@ -package org.apache.rya.accumulo.mr.examples; - -import java.io.BufferedReader; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -20,7 +16,9 @@ import java.io.BufferedReader; * specific language governing permissions and limitations * under the License. */ +package org.apache.rya.accumulo.mr.examples; +import java.io.BufferedReader; import java.io.IOException; import java.io.StringWriter; import java.nio.charset.Charset; @@ -51,11 +49,11 @@ import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaURI; import org.apache.rya.api.persist.RyaDAOException; import org.apache.rya.api.resolver.RyaToRdfConversions; -import org.openrdf.model.Statement; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFHandlerException; -import org.openrdf.rio.RDFWriter; -import org.openrdf.rio.Rio; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFHandlerException; +import org.eclipse.rdf4j.rio.RDFWriter; +import org.eclipse.rdf4j.rio.Rio; /** * Example of using a MapReduce tool to get triples from a Rya instance and serialize them to a text file as RDF. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/AccumuloRdfCountTool.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/AccumuloRdfCountTool.java b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/AccumuloRdfCountTool.java index 5adb893..c2ad57a 100644 --- a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/AccumuloRdfCountTool.java +++ b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/AccumuloRdfCountTool.java @@ -19,8 +19,6 @@ package org.apache.rya.accumulo.mr.tools; * under the License. */ - - import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Date; @@ -49,8 +47,8 @@ import org.apache.rya.api.domain.RyaURI; import org.apache.rya.api.resolver.RyaTripleContext; import org.apache.rya.api.resolver.triple.TripleRow; import org.apache.rya.api.resolver.triple.TripleRowResolverException; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; import com.google.common.collect.Lists; import com.google.common.io.ByteArrayDataInput; @@ -130,7 +128,7 @@ public class AccumuloRdfCountTool extends AbstractAccumuloMRTool implements Tool public static final byte[] EMPTY_BYTES = new byte[0]; private RdfCloudTripleStoreConstants.TABLE_LAYOUT tableLayout = RdfCloudTripleStoreConstants.TABLE_LAYOUT.OSP; - ValueFactoryImpl vf = new ValueFactoryImpl(); + SimpleValueFactory vf = SimpleValueFactory.getInstance(); private final Text keyOut = new Text(); private final LongWritable valOut = new LongWritable(1); @@ -213,7 +211,7 @@ public class AccumuloRdfCountTool extends AbstractAccumuloMRTool implements Tool Text row = new Text(); Text cat_txt = new Text(); Value v_out = new Value(); - ValueFactory vf = new ValueFactoryImpl(); + ValueFactory vf = SimpleValueFactory.getInstance(); // any count lower than this does not need to be saved public static final int TOO_LOW = 10; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/RdfFileInputTool.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/RdfFileInputTool.java b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/RdfFileInputTool.java index 55c4365..c004f4e 100644 --- a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/RdfFileInputTool.java +++ b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/RdfFileInputTool.java @@ -25,10 +25,9 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.ToolRunner; -import org.openrdf.rio.RDFFormat; - import org.apache.rya.accumulo.mr.AbstractAccumuloMRTool; import org.apache.rya.accumulo.mr.MRUtils; +import org.eclipse.rdf4j.rio.RDFFormat; /** * Reads RDF data from one or more file(s) and inserts statements into Rya. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/Upgrade322Tool.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/Upgrade322Tool.java b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/Upgrade322Tool.java index 4edc949..e271e27 100644 --- a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/Upgrade322Tool.java +++ b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/Upgrade322Tool.java @@ -1,5 +1,3 @@ -package org.apache.rya.accumulo.mr.tools; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -18,11 +16,17 @@ package org.apache.rya.accumulo.mr.tools; * specific language governing permissions and limitations * under the License. */ +package org.apache.rya.accumulo.mr.tools; +import static org.apache.rya.api.RdfCloudTripleStoreConstants.DELIM; +import static org.apache.rya.api.RdfCloudTripleStoreConstants.TBL_OSP_SUFFIX; +import static org.apache.rya.api.RdfCloudTripleStoreConstants.TBL_PO_SUFFIX; +import static org.apache.rya.api.RdfCloudTripleStoreConstants.TBL_PRFX_DEF; +import static org.apache.rya.api.RdfCloudTripleStoreConstants.TBL_SPO_SUFFIX; +import static org.apache.rya.api.RdfCloudTripleStoreConstants.TYPE_DELIM; - -import org.apache.rya.accumulo.mr.AbstractAccumuloMRTool; -import org.apache.rya.accumulo.mr.MRUtils; +import java.io.IOException; +import java.util.Date; import org.apache.accumulo.core.client.IteratorSetting; import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat; @@ -37,14 +41,11 @@ import org.apache.hadoop.mapreduce.Mapper; import org.apache.hadoop.mapreduce.Reducer; import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.ToolRunner; +import org.apache.rya.accumulo.mr.AbstractAccumuloMRTool; +import org.apache.rya.accumulo.mr.MRUtils; import org.calrissian.mango.types.LexiTypeEncoders; import org.calrissian.mango.types.TypeEncoder; -import java.io.IOException; -import java.util.Date; - -import static org.apache.rya.api.RdfCloudTripleStoreConstants.*; - /** */ public class Upgrade322Tool extends AbstractAccumuloMRTool implements Tool { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RdfFileInputFormatTest.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RdfFileInputFormatTest.java b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RdfFileInputFormatTest.java index c3bbbba..6129d6c 100644 --- a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RdfFileInputFormatTest.java +++ b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RdfFileInputFormatTest.java @@ -1,3 +1,21 @@ +/* + * 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.accumulo.mr; import java.io.File; @@ -12,41 +30,21 @@ import org.apache.hadoop.mapreduce.TaskAttemptContext; import org.apache.hadoop.mapreduce.TaskAttemptID; import org.apache.hadoop.mapreduce.lib.input.FileSplit; import org.apache.hadoop.mapreduce.task.TaskAttemptContextImpl; +import org.apache.rya.api.resolver.RyaToRdfConversions; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.rio.RDFFormat; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.impl.ContextStatementImpl; -import org.openrdf.model.impl.LiteralImpl; -import org.openrdf.model.impl.StatementImpl; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.rio.RDFFormat; - -import org.apache.rya.api.resolver.RyaToRdfConversions; - -/* - * 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. - */ public class RdfFileInputFormatTest { + private static final ValueFactory VF = SimpleValueFactory.getInstance(); + static String NT_INPUT = "src/test/resources/test.ntriples"; static String TRIG_INPUT = "src/test/resources/namedgraphs.trig"; @@ -81,17 +79,17 @@ public class RdfFileInputFormatTest { RdfFileInputFormat.setRDFFormat(job, RDFFormat.NTRIPLES); init(NT_INPUT); String prefix = "urn:lubm:rdfts#"; - URI[] gs = { - new URIImpl(prefix + "GraduateStudent01"), - new URIImpl(prefix + "GraduateStudent02"), - new URIImpl(prefix + "GraduateStudent03"), - new URIImpl(prefix + "GraduateStudent04") + IRI[] gs = { + VF.createIRI(prefix + "GraduateStudent01"), + VF.createIRI(prefix + "GraduateStudent02"), + VF.createIRI(prefix + "GraduateStudent03"), + VF.createIRI(prefix + "GraduateStudent04") }; - URI hasFriend = new URIImpl(prefix + "hasFriend"); + IRI hasFriend = VF.createIRI(prefix + "hasFriend"); Statement[] statements = { - new StatementImpl(gs[0], hasFriend, gs[1]), - new StatementImpl(gs[1], hasFriend, gs[2]), - new StatementImpl(gs[2], hasFriend, gs[3]) + VF.createStatement(gs[0], hasFriend, gs[1]), + VF.createStatement(gs[1], hasFriend, gs[2]), + VF.createStatement(gs[2], hasFriend, gs[3]) }; int count = 0; while (reader.nextKeyValue()) { @@ -109,11 +107,11 @@ public class RdfFileInputFormatTest { init(TRIG_INPUT); Assert.assertTrue(reader.nextKeyValue()); Assert.assertEquals(1, reader.getCurrentKey().get()); - Statement expected = new ContextStatementImpl( - new URIImpl("http://www.example.org/exampleDocument#Monica";), - new URIImpl("http://www.example.org/vocabulary#name";), - new LiteralImpl("Monica Murphy"), - new URIImpl("http://www.example.org/exampleDocument#G1";)); + Statement expected = VF.createStatement( + VF.createIRI("http://www.example.org/exampleDocument#Monica";), + VF.createIRI("http://www.example.org/vocabulary#name";), + VF.createLiteral("Monica Murphy"), + VF.createIRI("http://www.example.org/exampleDocument#G1";)); Statement actual = RyaToRdfConversions.convertStatement( reader.getCurrentValue().getRyaStatement()); Assert.assertEquals(expected, actual); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaOutputFormatTest.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaOutputFormatTest.java b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaOutputFormatTest.java index 96f57f6..e0a7ac0 100644 --- a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaOutputFormatTest.java +++ b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaOutputFormatTest.java @@ -36,15 +36,14 @@ import org.apache.rya.indexing.accumulo.freetext.AccumuloFreeTextIndexer; import org.apache.rya.indexing.accumulo.freetext.SimpleTokenizer; import org.apache.rya.indexing.accumulo.freetext.Tokenizer; import org.apache.rya.indexing.accumulo.temporal.AccumuloTemporalIndexer; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.openrdf.model.Statement; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.model.vocabulary.XMLSchema; - -import info.aduna.iteration.CloseableIteration; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -224,7 +223,7 @@ public class RyaOutputFormatTest { RyaOutputFormat.setFreeTextEnabled(job, false); RyaOutputFormat.setTemporalEnabled(job, true); RyaOutputFormat.setEntityEnabled(job, false); - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); for (int i = 0; i < instants.length; i++) { final RyaType time = RdfToRyaConversions.convertLiteral(vf.createLiteral(instants[i].toString())); final RyaStatement input = RyaStatement.builder() http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaStatementWritableTest.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaStatementWritableTest.java b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaStatementWritableTest.java index 29639c2..98d36c9 100644 --- a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaStatementWritableTest.java +++ b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaStatementWritableTest.java @@ -5,17 +5,16 @@ import java.io.ByteArrayOutputStream; import java.io.DataInputStream; import java.io.DataOutputStream; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.openrdf.model.vocabulary.XMLSchema; -import org.junit.Assert; -import org.junit.Rule; - import org.apache.rya.accumulo.AccumuloRdfConfiguration; 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.resolver.RyaTripleContext; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/AccumuloRdfCountToolTest.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/AccumuloRdfCountToolTest.java b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/AccumuloRdfCountToolTest.java index 9b7fa22..30c6a7a 100644 --- a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/AccumuloRdfCountToolTest.java +++ b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/AccumuloRdfCountToolTest.java @@ -1,5 +1,3 @@ -package org.apache.rya.accumulo.mr.tools; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -18,16 +16,14 @@ package org.apache.rya.accumulo.mr.tools; * specific language governing permissions and limitations * under the License. */ +package org.apache.rya.accumulo.mr.tools; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import java.util.HashMap; +import java.util.Map; -import org.apache.rya.accumulo.AccumuloRdfConfiguration; -import org.apache.rya.accumulo.AccumuloRyaDAO; -import org.apache.rya.accumulo.mr.tools.AccumuloRdfCountTool; -import org.apache.rya.api.RdfCloudTripleStoreConstants; -import org.apache.rya.api.domain.RyaStatement; -import org.apache.rya.api.domain.RyaURI; -import org.apache.rya.api.resolver.RdfToRyaConversions; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.Scanner; @@ -40,18 +36,17 @@ import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.TablePermission; import org.apache.hadoop.io.Text; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.api.RdfCloudTripleStoreConstants; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.resolver.RdfToRyaConversions; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; - -import java.util.HashMap; -import java.util.Map; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; /** * Created by IntelliJ IDEA. @@ -70,7 +65,7 @@ public class AccumuloRdfCountToolTest { private Connector connector; private AccumuloRyaDAO dao; - private ValueFactory vf = new ValueFactoryImpl(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); private AccumuloRdfConfiguration conf = new AccumuloRdfConfiguration(); static String litdupsNS = "urn:test:litdups#"; @@ -110,19 +105,19 @@ public class AccumuloRdfCountToolTest { @Test public void testMR() throws Exception { - RyaURI test1 = RdfToRyaConversions.convertURI(vf.createURI(litdupsNS, "test1")); - RyaURI pred1 = RdfToRyaConversions.convertURI(vf.createURI(litdupsNS, "pred1")); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(0)))); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(1)))); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(2)))); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(3)))); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(4)))); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(5)))); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(6)))); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(7)))); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(8)))); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(9)))); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(10)))); + RyaURI test1 = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "test1")); + RyaURI pred1 = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "pred1")); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(0)))); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(1)))); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(2)))); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(3)))); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(4)))); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(5)))); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(6)))); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(7)))); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(8)))); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(9)))); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(10)))); AccumuloRdfCountTool.main(new String[]{ "-Dac.mock=true", @@ -155,19 +150,19 @@ public class AccumuloRdfCountToolTest { } // public void testMRObject() throws Exception { -// URI pred1 = vf.createURI(litdupsNS, "pred1"); -// Literal literal = vf.createLiteral(0); -// dao.add(new StatementImpl(vf.createURI(litdupsNS, "test0"), pred1, literal)); -// dao.add(new StatementImpl(vf.createURI(litdupsNS, "test1"), pred1, literal)); -// dao.add(new StatementImpl(vf.createURI(litdupsNS, "test2"), pred1, literal)); -// dao.add(new StatementImpl(vf.createURI(litdupsNS, "test3"), pred1, literal)); -// dao.add(new StatementImpl(vf.createURI(litdupsNS, "test4"), pred1, literal)); -// dao.add(new StatementImpl(vf.createURI(litdupsNS, "test5"), pred1, literal)); -// dao.add(new StatementImpl(vf.createURI(litdupsNS, "test6"), pred1, literal)); -// dao.add(new StatementImpl(vf.createURI(litdupsNS, "test7"), pred1, literal)); -// dao.add(new StatementImpl(vf.createURI(litdupsNS, "test8"), pred1, literal)); -// dao.add(new StatementImpl(vf.createURI(litdupsNS, "test9"), pred1, literal)); -// dao.add(new StatementImpl(vf.createURI(litdupsNS, "test10"), pred1, literal)); +// URI pred1 = VF.createIRI(litdupsNS, "pred1"); +// Literal literal = VF.createLiteral(0); +// dao.add(new StatementImpl(VF.createIRI(litdupsNS, "test0"), pred1, literal)); +// dao.add(new StatementImpl(VF.createIRI(litdupsNS, "test1"), pred1, literal)); +// dao.add(new StatementImpl(VF.createIRI(litdupsNS, "test2"), pred1, literal)); +// dao.add(new StatementImpl(VF.createIRI(litdupsNS, "test3"), pred1, literal)); +// dao.add(new StatementImpl(VF.createIRI(litdupsNS, "test4"), pred1, literal)); +// dao.add(new StatementImpl(VF.createIRI(litdupsNS, "test5"), pred1, literal)); +// dao.add(new StatementImpl(VF.createIRI(litdupsNS, "test6"), pred1, literal)); +// dao.add(new StatementImpl(VF.createIRI(litdupsNS, "test7"), pred1, literal)); +// dao.add(new StatementImpl(VF.createIRI(litdupsNS, "test8"), pred1, literal)); +// dao.add(new StatementImpl(VF.createIRI(litdupsNS, "test9"), pred1, literal)); +// dao.add(new StatementImpl(VF.createIRI(litdupsNS, "test10"), pred1, literal)); // dao.commit(); // // AccumuloRdfCountTool.main(new String[]{ @@ -202,19 +197,19 @@ public class AccumuloRdfCountToolTest { @Test public void testTTL() throws Exception { - RyaURI test1 = RdfToRyaConversions.convertURI(vf.createURI(litdupsNS, "test1")); - RyaURI pred1 = RdfToRyaConversions.convertURI(vf.createURI(litdupsNS, "pred1")); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(0)))); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(1)))); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(2)))); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(3)))); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(4)))); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(5)))); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(6)))); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(7)))); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(8)))); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(9)))); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(10)))); + RyaURI test1 = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "test1")); + RyaURI pred1 = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "pred1")); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(0)))); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(1)))); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(2)))); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(3)))); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(4)))); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(5)))); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(6)))); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(7)))); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(8)))); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(9)))); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(10)))); AccumuloRdfCountTool.main(new String[]{ "-Dac.mock=true", @@ -236,20 +231,20 @@ public class AccumuloRdfCountToolTest { @Test public void testContext() throws Exception { - RyaURI test1 = RdfToRyaConversions.convertURI(vf.createURI(litdupsNS, "test1")); - RyaURI pred1 = RdfToRyaConversions.convertURI(vf.createURI(litdupsNS, "pred1")); - RyaURI cntxt = RdfToRyaConversions.convertURI(vf.createURI(litdupsNS, "cntxt")); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(0)), cntxt)); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(1)), cntxt)); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(2)), cntxt)); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(3)), cntxt)); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(4)), cntxt)); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(5)), cntxt)); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(6)), cntxt)); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(7)), cntxt)); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(8)), cntxt)); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(9)), cntxt)); - dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(vf.createLiteral(10)), cntxt)); + RyaURI test1 = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "test1")); + RyaURI pred1 = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "pred1")); + RyaURI cntxt = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "cntxt")); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(0)), cntxt)); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(1)), cntxt)); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(2)), cntxt)); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(3)), cntxt)); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(4)), cntxt)); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(5)), cntxt)); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(6)), cntxt)); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(7)), cntxt)); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(8)), cntxt)); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(9)), cntxt)); + dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(10)), cntxt)); AccumuloRdfCountTool.main(new String[]{ "-Dac.mock=true", http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/RdfFileInputToolTest.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/RdfFileInputToolTest.java b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/RdfFileInputToolTest.java index 6b41ca2..b8b2384 100644 --- a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/RdfFileInputToolTest.java +++ b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/RdfFileInputToolTest.java @@ -19,23 +19,21 @@ package org.apache.rya.accumulo.mr.tools; * under the License. */ +import junit.framework.TestCase; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.admin.SecurityOperations; import org.apache.accumulo.core.client.mock.MockInstance; import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.TablePermission; -import org.junit.Test; -import org.openrdf.rio.RDFFormat; - -import junit.framework.TestCase; import org.apache.rya.accumulo.AccumuloRdfConfiguration; import org.apache.rya.accumulo.mr.TestUtils; -import org.apache.rya.accumulo.mr.tools.RdfFileInputTool; import org.apache.rya.api.RdfCloudTripleStoreConstants; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaType; import org.apache.rya.api.domain.RyaURI; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.junit.Test; /** * Created by IntelliJ IDEA. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/Upgrade322ToolTest.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/Upgrade322ToolTest.java b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/Upgrade322ToolTest.java index f740cc0..cfdbeb7 100644 --- a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/Upgrade322ToolTest.java +++ b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/Upgrade322ToolTest.java @@ -1,23 +1,3 @@ -package org.apache.rya.accumulo.mr.tools; - -import java.util.Map; - -import org.apache.accumulo.core.Constants; -import org.apache.accumulo.core.client.BatchWriter; -import org.apache.accumulo.core.client.BatchWriterConfig; -import org.apache.accumulo.core.client.Connector; -import org.apache.accumulo.core.client.Scanner; -import org.apache.accumulo.core.client.TableNotFoundException; -import org.apache.accumulo.core.client.admin.SecurityOperations; -import org.apache.accumulo.core.client.mock.MockInstance; -import org.apache.accumulo.core.data.Key; -import org.apache.accumulo.core.data.Mutation; -import org.apache.accumulo.core.data.Range; -import org.apache.accumulo.core.data.Value; -import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.core.security.TablePermission; -import org.openrdf.model.vocabulary.XMLSchema; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -36,19 +16,35 @@ import org.openrdf.model.vocabulary.XMLSchema; * specific language governing permissions and limitations * under the License. */ +package org.apache.rya.accumulo.mr.tools; +import java.util.Map; - -import junit.framework.TestCase; +import org.apache.accumulo.core.Constants; +import org.apache.accumulo.core.client.BatchWriter; +import org.apache.accumulo.core.client.BatchWriterConfig; +import org.apache.accumulo.core.client.Connector; +import org.apache.accumulo.core.client.Scanner; +import org.apache.accumulo.core.client.TableNotFoundException; +import org.apache.accumulo.core.client.admin.SecurityOperations; +import org.apache.accumulo.core.client.mock.MockInstance; +import org.apache.accumulo.core.data.Key; +import org.apache.accumulo.core.data.Mutation; +import org.apache.accumulo.core.data.Range; +import org.apache.accumulo.core.data.Value; +import org.apache.accumulo.core.security.Authorizations; +import org.apache.accumulo.core.security.TablePermission; import org.apache.rya.accumulo.AccumuloRdfConfiguration; import org.apache.rya.accumulo.AccumuloRyaDAO; import org.apache.rya.accumulo.mr.TestUtils; -import org.apache.rya.accumulo.mr.tools.Upgrade322Tool; import org.apache.rya.accumulo.query.AccumuloRyaQueryEngine; import org.apache.rya.api.RdfCloudTripleStoreConstants; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaType; import org.apache.rya.api.domain.RyaURI; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; + +import junit.framework.TestCase; /** * Created by IntelliJ IDEA. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/UpgradeObjectSerializationTest.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/UpgradeObjectSerializationTest.java b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/UpgradeObjectSerializationTest.java index f7096e3..b14587c 100644 --- a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/UpgradeObjectSerializationTest.java +++ b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/UpgradeObjectSerializationTest.java @@ -19,14 +19,18 @@ package org.apache.rya.accumulo.mr.tools; * under the License. */ +import static org.junit.Assert.assertEquals; +import org.apache.rya.accumulo.mr.tools.Upgrade322Tool.UpgradeObjectSerialization; -import org.apache.rya.api.resolver.impl.*; +import org.apache.rya.api.resolver.impl.BooleanRyaTypeResolver; +import org.apache.rya.api.resolver.impl.ByteRyaTypeResolver; +import org.apache.rya.api.resolver.impl.DateTimeRyaTypeResolver; +import org.apache.rya.api.resolver.impl.DoubleRyaTypeResolver; +import org.apache.rya.api.resolver.impl.IntegerRyaTypeResolver; +import org.apache.rya.api.resolver.impl.LongRyaTypeResolver; import org.junit.Test; -import static org.apache.rya.accumulo.mr.tools.Upgrade322Tool.UpgradeObjectSerialization; -import static org.junit.Assert.*; - public class UpgradeObjectSerializationTest { @Test http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/osgi/alx.rya.console/pom.xml ---------------------------------------------------------------------- diff --git a/osgi/alx.rya.console/pom.xml b/osgi/alx.rya.console/pom.xml index 72ee63a..e078e0d 100644 --- a/osgi/alx.rya.console/pom.xml +++ b/osgi/alx.rya.console/pom.xml @@ -39,8 +39,8 @@ under the License. </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-repository-api</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-repository-api</artifactId> </dependency> <dependency> <groupId>org.apache.karaf.shell</groupId> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/osgi/alx.rya.console/src/main/java/org/apache/rya/alx/command/AbstractRyaCommand.java ---------------------------------------------------------------------- diff --git a/osgi/alx.rya.console/src/main/java/org/apache/rya/alx/command/AbstractRyaCommand.java b/osgi/alx.rya.console/src/main/java/org/apache/rya/alx/command/AbstractRyaCommand.java index 0d3ac97..c4c4705 100644 --- a/osgi/alx.rya.console/src/main/java/org/apache/rya/alx/command/AbstractRyaCommand.java +++ b/osgi/alx.rya.console/src/main/java/org/apache/rya/alx/command/AbstractRyaCommand.java @@ -19,11 +19,9 @@ package org.apache.rya.alx.command; * under the License. */ - - -import org.apache.rya.api.persist.RyaDAO; import org.apache.karaf.shell.console.OsgiCommandSupport; -import org.openrdf.repository.Repository; +import org.apache.rya.api.persist.RyaDAO; +import org.eclipse.rdf4j.repository.Repository; import org.osgi.util.tracker.ServiceTracker; public abstract class AbstractRyaCommand extends OsgiCommandSupport {
