Added: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/AbstractWholeFileTripleWriter.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/AbstractWholeFileTripleWriter.java?rev=1585723&view=auto ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/AbstractWholeFileTripleWriter.java (added) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/AbstractWholeFileTripleWriter.java Tue Apr 8 13:42:18 2014 @@ -0,0 +1,65 @@ +/* +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.jena.hadoop.rdf.io.output.writers; + +import java.io.Writer; + +import org.apache.jena.hadoop.rdf.types.TripleWritable; +import org.apache.jena.riot.Lang; +import org.apache.jena.riot.RDFDataMgr; + +import com.hp.hpl.jena.graph.Graph; +import com.hp.hpl.jena.graph.Triple; +import com.hp.hpl.jena.sparql.graph.GraphFactory; + +/** + * An abstract record writer for whole file triple formats + * + * @author rvesse + * + * @param <TKey> + * Key type + */ +public abstract class AbstractWholeFileTripleWriter<TKey> extends AbstractWholeFileNodeTupleWriter<TKey, Triple, TripleWritable> { + + private Graph g = GraphFactory.createDefaultGraph(); + + protected AbstractWholeFileTripleWriter(Writer writer) { + super(writer); + } + + @Override + protected final void add(TripleWritable value) { + this.g.add(value.get()); + } + + @SuppressWarnings("deprecation") + @Override + protected final void writeOutput(Writer writer) { + RDFDataMgr.write(writer, this.g, this.getRdfLanguage()); + } + + /** + * Gets the RDF language to write the output in + * + * @return RDF language + */ + protected abstract Lang getRdfLanguage(); + +}
Added: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/NQuadsWriter.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/NQuadsWriter.java?rev=1585723&view=auto ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/NQuadsWriter.java (added) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/NQuadsWriter.java Tue Apr 8 13:42:18 2014 @@ -0,0 +1,56 @@ +/* +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.jena.hadoop.rdf.io.output.writers; + +import java.io.Writer; + +import org.apache.jena.riot.out.CharSpace; +import org.apache.jena.riot.out.NodeFormatterNT; + +/** + * A record writer for NQuads + * + * @author rvesse + * + * @param <TKey> + */ +public class NQuadsWriter<TKey> extends AbstractLineBasedQuadWriter<TKey> { + + /** + * Creates a new writer + * + * @param writer + * Writer + */ + public NQuadsWriter(Writer writer) { + super(writer, new NodeFormatterNT()); + } + + /** + * Creates a new writer using the given character space + * + * @param writer + * Writer + * @param charSpace + * Character space + */ + public NQuadsWriter(Writer writer, CharSpace charSpace) { + super(writer, new NodeFormatterNT(charSpace)); + } +} Added: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/NTriplesNodeWriter.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/NTriplesNodeWriter.java?rev=1585723&view=auto ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/NTriplesNodeWriter.java (added) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/NTriplesNodeWriter.java Tue Apr 8 13:42:18 2014 @@ -0,0 +1,58 @@ +/* +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.jena.hadoop.rdf.io.output.writers; + +import java.io.Writer; + +import org.apache.jena.riot.out.CharSpace; +import org.apache.jena.riot.out.NodeFormatterNT; + +/** + * A NTriples based node writer + * + * @author rvesse + * + * @param <TValue> + * Value type + */ +public class NTriplesNodeWriter<TValue> extends AbstractNodeWriter<TValue> { + + /** + * Creates a new writer + * + * @param writer + * Writer + */ + public NTriplesNodeWriter(Writer writer) { + super(writer); + } + + /** + * Creates a new writer + * + * @param writer + * Writer + * @param charSpace + * Character space to use + */ + public NTriplesNodeWriter(Writer writer, CharSpace charSpace) { + super(writer, new NodeFormatterNT(charSpace)); + } + +} Added: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/NTriplesWriter.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/NTriplesWriter.java?rev=1585723&view=auto ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/NTriplesWriter.java (added) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/NTriplesWriter.java Tue Apr 8 13:42:18 2014 @@ -0,0 +1,57 @@ +/* +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.jena.hadoop.rdf.io.output.writers; + +import java.io.Writer; + +import org.apache.jena.riot.out.CharSpace; +import org.apache.jena.riot.out.NodeFormatterNT; + +/** + * A record writer for NTriples + * + * @author rvesse + * @param <TKey> + * Key type + * + */ +public class NTriplesWriter<TKey> extends AbstractLineBasedTripleWriter<TKey> { + + /** + * Creates a new writer + * + * @param writer + * Writer + */ + public NTriplesWriter(Writer writer) { + super(writer, new NodeFormatterNT()); + } + + /** + * Creates a new writer using the given character space + * + * @param writer + * Writer + * @param charSpace + * Character space + */ + public NTriplesWriter(Writer writer, CharSpace charSpace) { + super(writer, new NodeFormatterNT(charSpace)); + } +} Added: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/RdfJsonWriter.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/RdfJsonWriter.java?rev=1585723&view=auto ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/RdfJsonWriter.java (added) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/RdfJsonWriter.java Tue Apr 8 13:42:18 2014 @@ -0,0 +1,50 @@ +/* +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.jena.hadoop.rdf.io.output.writers; + +import java.io.Writer; + +import org.apache.jena.riot.Lang; + +/** + * A record writer for RDF/JSON + * + * @author rvesse + * @param <TKey> + * Key type + * + */ +public class RdfJsonWriter<TKey> extends AbstractWholeFileTripleWriter<TKey> { + + /** + * Creates a new record writer + * + * @param writer + * Writer + */ + public RdfJsonWriter(Writer writer) { + super(writer); + } + + @Override + protected Lang getRdfLanguage() { + return Lang.RDFJSON; + } + +} Added: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/RdfXmlWriter.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/RdfXmlWriter.java?rev=1585723&view=auto ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/RdfXmlWriter.java (added) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/RdfXmlWriter.java Tue Apr 8 13:42:18 2014 @@ -0,0 +1,50 @@ +/* +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.jena.hadoop.rdf.io.output.writers; + +import java.io.Writer; + +import org.apache.jena.riot.Lang; + +/** + * A record writer for RDF/XML + * + * @author rvesse + * @param <TKey> + * Key type + * + */ +public class RdfXmlWriter<TKey> extends AbstractWholeFileTripleWriter<TKey> { + + /** + * Creates a new record writer + * + * @param writer + * Writer + */ + public RdfXmlWriter(Writer writer) { + super(writer); + } + + @Override + protected Lang getRdfLanguage() { + return Lang.RDFXML; + } + +} Added: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/TriGWriter.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/TriGWriter.java?rev=1585723&view=auto ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/TriGWriter.java (added) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/TriGWriter.java Tue Apr 8 13:42:18 2014 @@ -0,0 +1,52 @@ +/* +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.jena.hadoop.rdf.io.output.writers; + +import java.io.Writer; + +import org.apache.jena.riot.Lang; + +/** + * A record writer for TriG + * + * @author rvesse + * + * @param <TKey> + * Key type + */ +public class TriGWriter<TKey> extends AbstractBatchedQuadWriter<TKey> { + + /** + * Creates a new record writer + * + * @param writer + * Writer + * @param batchSize + * Batch size + */ + public TriGWriter(Writer writer, long batchSize) { + super(writer, batchSize); + } + + @Override + protected Lang getRdfLanguage() { + return Lang.TRIG; + } + +} Added: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/TurtleWriter.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/TurtleWriter.java?rev=1585723&view=auto ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/TurtleWriter.java (added) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/TurtleWriter.java Tue Apr 8 13:42:18 2014 @@ -0,0 +1,51 @@ +/* +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.jena.hadoop.rdf.io.output.writers; + +import java.io.Writer; + +import org.apache.jena.riot.Lang; + +/** + * A record writer for Turtle + * + * @author rvesse + * + * @param <TKey> + */ +public class TurtleWriter<TKey> extends AbstractBatchedTripleWriter<TKey> { + + /** + * Creates a new record writer + * + * @param writer + * Writer + * @param batchSize + * Batch size + */ + public TurtleWriter(Writer writer, long batchSize) { + super(writer, batchSize); + } + + @Override + protected Lang getRdfLanguage() { + return Lang.TURTLE; + } + +} Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/AbstractNodeTupleInputFormatTests.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/AbstractNodeTupleInputFormatTests.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/AbstractNodeTupleInputFormatTests.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/AbstractNodeTupleInputFormatTests.java Tue Apr 8 13:42:18 2014 @@ -40,6 +40,8 @@ import org.apache.hadoop.mapreduce.lib.i import org.apache.hadoop.mapreduce.lib.input.NLineInputFormat; import org.apache.hadoop.mapreduce.task.JobContextImpl; import org.apache.hadoop.mapreduce.task.TaskAttemptContextImpl; +import org.apache.jena.hadoop.rdf.io.HadoopIOConstants; +import org.apache.jena.hadoop.rdf.io.RdfIOConstants; import org.apache.jena.hadoop.rdf.types.AbstractNodeTupleWritable; import org.junit.After; import org.junit.Assert; @@ -51,8 +53,6 @@ import org.junit.rules.TemporaryFolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.yarcdata.urika.hadoop.rdf.io.HadoopIOConstants; -import com.yarcdata.urika.hadoop.rdf.io.RdfIOConstants; /** * Abstract node tuple input format tests Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/BlockedNQuadsInputTest.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/BlockedNQuadsInputTest.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/BlockedNQuadsInputTest.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/BlockedNQuadsInputTest.java Tue Apr 8 13:42:18 2014 @@ -20,6 +20,7 @@ package com.yarcdata.urika.hadoop.rdf.io import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.mapreduce.InputFormat; +import org.apache.jena.hadoop.rdf.io.input.BlockedNQuadsInputFormat; import org.apache.jena.hadoop.rdf.types.QuadWritable; import org.apache.jena.riot.Lang; Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/BlockedNTriplesInputTest.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/BlockedNTriplesInputTest.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/BlockedNTriplesInputTest.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/BlockedNTriplesInputTest.java Tue Apr 8 13:42:18 2014 @@ -20,6 +20,7 @@ package com.yarcdata.urika.hadoop.rdf.io import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.mapreduce.InputFormat; +import org.apache.jena.hadoop.rdf.io.input.BlockedNTriplesInputFormat; import org.apache.jena.hadoop.rdf.types.TripleWritable; import org.apache.jena.riot.Lang; Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/NQuadsInputTest.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/NQuadsInputTest.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/NQuadsInputTest.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/NQuadsInputTest.java Tue Apr 8 13:42:18 2014 @@ -20,6 +20,7 @@ package com.yarcdata.urika.hadoop.rdf.io import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.mapreduce.InputFormat; +import org.apache.jena.hadoop.rdf.io.input.NQuadsInputFormat; import org.apache.jena.hadoop.rdf.types.QuadWritable; Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/NTriplesInputTest.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/NTriplesInputTest.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/NTriplesInputTest.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/NTriplesInputTest.java Tue Apr 8 13:42:18 2014 @@ -20,6 +20,7 @@ package com.yarcdata.urika.hadoop.rdf.io import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.mapreduce.InputFormat; +import org.apache.jena.hadoop.rdf.io.input.NTriplesInputFormat; import org.apache.jena.hadoop.rdf.types.TripleWritable; Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/RdfJsonInputTest.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/RdfJsonInputTest.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/RdfJsonInputTest.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/RdfJsonInputTest.java Tue Apr 8 13:42:18 2014 @@ -20,6 +20,7 @@ package com.yarcdata.urika.hadoop.rdf.io import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.mapreduce.InputFormat; +import org.apache.jena.hadoop.rdf.io.input.RdfJsonInputFormat; import org.apache.jena.hadoop.rdf.types.TripleWritable; import org.apache.jena.riot.Lang; Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/RdfXmlInputTest.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/RdfXmlInputTest.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/RdfXmlInputTest.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/RdfXmlInputTest.java Tue Apr 8 13:42:18 2014 @@ -20,6 +20,7 @@ package com.yarcdata.urika.hadoop.rdf.io import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.mapreduce.InputFormat; +import org.apache.jena.hadoop.rdf.io.input.RdfXmlInputFormat; import org.apache.jena.hadoop.rdf.types.TripleWritable; import org.apache.jena.riot.Lang; Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/TriGInputTest.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/TriGInputTest.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/TriGInputTest.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/TriGInputTest.java Tue Apr 8 13:42:18 2014 @@ -20,6 +20,7 @@ package com.yarcdata.urika.hadoop.rdf.io import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.mapreduce.InputFormat; +import org.apache.jena.hadoop.rdf.io.input.TriGInputFormat; import org.apache.jena.hadoop.rdf.types.QuadWritable; import org.apache.jena.riot.Lang; Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/TurtleInputTest.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/TurtleInputTest.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/TurtleInputTest.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/TurtleInputTest.java Tue Apr 8 13:42:18 2014 @@ -20,6 +20,7 @@ package com.yarcdata.urika.hadoop.rdf.io import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.mapreduce.InputFormat; +import org.apache.jena.hadoop.rdf.io.input.TurtleInputFormat; import org.apache.jena.hadoop.rdf.types.TripleWritable; import org.apache.jena.riot.Lang; Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/WholeFileNQuadsInputTest.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/WholeFileNQuadsInputTest.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/WholeFileNQuadsInputTest.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/WholeFileNQuadsInputTest.java Tue Apr 8 13:42:18 2014 @@ -20,6 +20,7 @@ package com.yarcdata.urika.hadoop.rdf.io import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.mapreduce.InputFormat; +import org.apache.jena.hadoop.rdf.io.input.WholeFileNQuadsInputFormat; import org.apache.jena.hadoop.rdf.types.QuadWritable; import org.apache.jena.riot.Lang; Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/WholeFileNTriplesInputTest.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/WholeFileNTriplesInputTest.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/WholeFileNTriplesInputTest.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/WholeFileNTriplesInputTest.java Tue Apr 8 13:42:18 2014 @@ -20,6 +20,8 @@ package com.yarcdata.urika.hadoop.rdf.io import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.mapreduce.InputFormat; +import org.apache.jena.hadoop.rdf.io.input.NTriplesInputFormat; +import org.apache.jena.hadoop.rdf.io.input.WholeFileNTriplesInputFormat; import org.apache.jena.hadoop.rdf.types.TripleWritable; import org.apache.jena.riot.Lang; Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/AbstractCompressedNodeTupleInputFormatTests.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/AbstractCompressedNodeTupleInputFormatTests.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/AbstractCompressedNodeTupleInputFormatTests.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/AbstractCompressedNodeTupleInputFormatTests.java Tue Apr 8 13:42:18 2014 @@ -28,9 +28,9 @@ import java.io.Writer; import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.compress.CompressionCodec; +import org.apache.jena.hadoop.rdf.io.HadoopIOConstants; import org.apache.jena.hadoop.rdf.types.AbstractNodeTupleWritable; -import com.yarcdata.urika.hadoop.rdf.io.HadoopIOConstants; import com.yarcdata.urika.hadoop.rdf.io.input.AbstractNodeTupleInputFormatTests; /** Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/AbstractCompressedWholeFileQuadInputFormatTests.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/AbstractCompressedWholeFileQuadInputFormatTests.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/AbstractCompressedWholeFileQuadInputFormatTests.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/AbstractCompressedWholeFileQuadInputFormatTests.java Tue Apr 8 13:42:18 2014 @@ -28,6 +28,7 @@ import java.io.Writer; import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.compress.CompressionCodec; +import org.apache.jena.hadoop.rdf.io.HadoopIOConstants; import org.apache.jena.hadoop.rdf.types.QuadWritable; import org.apache.jena.riot.Lang; import org.apache.jena.riot.RDFDataMgr; @@ -40,7 +41,6 @@ import com.hp.hpl.jena.rdf.model.ModelFa import com.hp.hpl.jena.rdf.model.Property; import com.hp.hpl.jena.rdf.model.Resource; import com.hp.hpl.jena.sparql.core.Quad; -import com.yarcdata.urika.hadoop.rdf.io.HadoopIOConstants; import com.yarcdata.urika.hadoop.rdf.io.input.AbstractNodeTupleInputFormatTests; /** Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/AbstractCompressedWholeFileTripleInputFormatTests.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/AbstractCompressedWholeFileTripleInputFormatTests.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/AbstractCompressedWholeFileTripleInputFormatTests.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/AbstractCompressedWholeFileTripleInputFormatTests.java Tue Apr 8 13:42:18 2014 @@ -28,6 +28,7 @@ import java.io.Writer; import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.compress.CompressionCodec; +import org.apache.jena.hadoop.rdf.io.HadoopIOConstants; import org.apache.jena.hadoop.rdf.types.TripleWritable; import org.apache.jena.riot.Lang; import org.apache.jena.riot.RDFDataMgr; @@ -37,7 +38,6 @@ import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.ModelFactory; import com.hp.hpl.jena.rdf.model.Property; import com.hp.hpl.jena.rdf.model.Resource; -import com.yarcdata.urika.hadoop.rdf.io.HadoopIOConstants; import com.yarcdata.urika.hadoop.rdf.io.input.AbstractNodeTupleInputFormatTests; /** Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/nquads/AbstractCompressedNQuadsInputFormatTests.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/nquads/AbstractCompressedNQuadsInputFormatTests.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/nquads/AbstractCompressedNQuadsInputFormatTests.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/nquads/AbstractCompressedNQuadsInputFormatTests.java Tue Apr 8 13:42:18 2014 @@ -21,9 +21,9 @@ package com.yarcdata.urika.hadoop.rdf.io import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.compress.CompressionCodec; import org.apache.hadoop.mapreduce.InputFormat; +import org.apache.jena.hadoop.rdf.io.input.NQuadsInputFormat; import org.apache.jena.hadoop.rdf.types.QuadWritable; -import com.yarcdata.urika.hadoop.rdf.io.input.NQuadsInputFormat; import com.yarcdata.urika.hadoop.rdf.io.input.compressed.AbstractCompressedQuadsInputFormatTests; /** Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/nquads/AbstractCompressedWholeFileNQuadsInputFormatTests.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/nquads/AbstractCompressedWholeFileNQuadsInputFormatTests.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/nquads/AbstractCompressedWholeFileNQuadsInputFormatTests.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/nquads/AbstractCompressedWholeFileNQuadsInputFormatTests.java Tue Apr 8 13:42:18 2014 @@ -21,10 +21,10 @@ package com.yarcdata.urika.hadoop.rdf.io import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.compress.CompressionCodec; import org.apache.hadoop.mapreduce.InputFormat; +import org.apache.jena.hadoop.rdf.io.input.WholeFileNQuadsInputFormat; import org.apache.jena.hadoop.rdf.types.QuadWritable; import org.apache.jena.riot.Lang; -import com.yarcdata.urika.hadoop.rdf.io.input.WholeFileNQuadsInputFormat; import com.yarcdata.urika.hadoop.rdf.io.input.compressed.AbstractCompressedWholeFileQuadInputFormatTests; /** Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/ntriples/AbstractCompressedBlockedNTriplesInputFormatTests.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/ntriples/AbstractCompressedBlockedNTriplesInputFormatTests.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/ntriples/AbstractCompressedBlockedNTriplesInputFormatTests.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/ntriples/AbstractCompressedBlockedNTriplesInputFormatTests.java Tue Apr 8 13:42:18 2014 @@ -21,9 +21,9 @@ package com.yarcdata.urika.hadoop.rdf.io import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.compress.CompressionCodec; import org.apache.hadoop.mapreduce.InputFormat; +import org.apache.jena.hadoop.rdf.io.input.BlockedNTriplesInputFormat; import org.apache.jena.hadoop.rdf.types.TripleWritable; -import com.yarcdata.urika.hadoop.rdf.io.input.BlockedNTriplesInputFormat; /** * Abstract compressed blocked NTriples input tests Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/ntriples/AbstractCompressedNTriplesInputFormatTests.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/ntriples/AbstractCompressedNTriplesInputFormatTests.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/ntriples/AbstractCompressedNTriplesInputFormatTests.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/ntriples/AbstractCompressedNTriplesInputFormatTests.java Tue Apr 8 13:42:18 2014 @@ -21,9 +21,9 @@ package com.yarcdata.urika.hadoop.rdf.io import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.compress.CompressionCodec; import org.apache.hadoop.mapreduce.InputFormat; +import org.apache.jena.hadoop.rdf.io.input.NTriplesInputFormat; import org.apache.jena.hadoop.rdf.types.TripleWritable; -import com.yarcdata.urika.hadoop.rdf.io.input.NTriplesInputFormat; import com.yarcdata.urika.hadoop.rdf.io.input.compressed.AbstractCompressedTriplesInputFormatTests; /** Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/ntriples/AbstractCompressedWholeFileNTriplesInputFormatTests.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/ntriples/AbstractCompressedWholeFileNTriplesInputFormatTests.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/ntriples/AbstractCompressedWholeFileNTriplesInputFormatTests.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/ntriples/AbstractCompressedWholeFileNTriplesInputFormatTests.java Tue Apr 8 13:42:18 2014 @@ -21,10 +21,10 @@ package com.yarcdata.urika.hadoop.rdf.io import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.compress.CompressionCodec; import org.apache.hadoop.mapreduce.InputFormat; +import org.apache.jena.hadoop.rdf.io.input.WholeFileNTriplesInputFormat; import org.apache.jena.hadoop.rdf.types.TripleWritable; import org.apache.jena.riot.Lang; -import com.yarcdata.urika.hadoop.rdf.io.input.WholeFileNTriplesInputFormat; import com.yarcdata.urika.hadoop.rdf.io.input.compressed.AbstractCompressedWholeFileTripleInputFormatTests; /** Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/rdfjson/AbstractCompressedRdfJsonInputFormatTests.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/rdfjson/AbstractCompressedRdfJsonInputFormatTests.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/rdfjson/AbstractCompressedRdfJsonInputFormatTests.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/rdfjson/AbstractCompressedRdfJsonInputFormatTests.java Tue Apr 8 13:42:18 2014 @@ -21,10 +21,10 @@ package com.yarcdata.urika.hadoop.rdf.io import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.compress.CompressionCodec; import org.apache.hadoop.mapreduce.InputFormat; +import org.apache.jena.hadoop.rdf.io.input.RdfJsonInputFormat; import org.apache.jena.hadoop.rdf.types.TripleWritable; import org.apache.jena.riot.Lang; -import com.yarcdata.urika.hadoop.rdf.io.input.RdfJsonInputFormat; import com.yarcdata.urika.hadoop.rdf.io.input.compressed.AbstractCompressedWholeFileTripleInputFormatTests; /** Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/rdfxml/AbstractCompressedRdfXmlInputFormatTests.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/rdfxml/AbstractCompressedRdfXmlInputFormatTests.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/rdfxml/AbstractCompressedRdfXmlInputFormatTests.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/rdfxml/AbstractCompressedRdfXmlInputFormatTests.java Tue Apr 8 13:42:18 2014 @@ -21,10 +21,10 @@ package com.yarcdata.urika.hadoop.rdf.io import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.compress.CompressionCodec; import org.apache.hadoop.mapreduce.InputFormat; +import org.apache.jena.hadoop.rdf.io.input.RdfXmlInputFormat; import org.apache.jena.hadoop.rdf.types.TripleWritable; import org.apache.jena.riot.Lang; -import com.yarcdata.urika.hadoop.rdf.io.input.RdfXmlInputFormat; import com.yarcdata.urika.hadoop.rdf.io.input.compressed.AbstractCompressedWholeFileTripleInputFormatTests; /** Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/trig/AbstractCompressedTriGInputFormatTests.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/trig/AbstractCompressedTriGInputFormatTests.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/trig/AbstractCompressedTriGInputFormatTests.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/trig/AbstractCompressedTriGInputFormatTests.java Tue Apr 8 13:42:18 2014 @@ -21,10 +21,10 @@ package com.yarcdata.urika.hadoop.rdf.io import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.compress.CompressionCodec; import org.apache.hadoop.mapreduce.InputFormat; +import org.apache.jena.hadoop.rdf.io.input.TriGInputFormat; import org.apache.jena.hadoop.rdf.types.QuadWritable; import org.apache.jena.riot.Lang; -import com.yarcdata.urika.hadoop.rdf.io.input.TriGInputFormat; import com.yarcdata.urika.hadoop.rdf.io.input.compressed.AbstractCompressedWholeFileQuadInputFormatTests; /** Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/turtle/AbstractCompressedTurtleInputFormatTests.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/turtle/AbstractCompressedTurtleInputFormatTests.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/turtle/AbstractCompressedTurtleInputFormatTests.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/compressed/turtle/AbstractCompressedTurtleInputFormatTests.java Tue Apr 8 13:42:18 2014 @@ -21,10 +21,10 @@ package com.yarcdata.urika.hadoop.rdf.io import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.compress.CompressionCodec; import org.apache.hadoop.mapreduce.InputFormat; +import org.apache.jena.hadoop.rdf.io.input.TurtleInputFormat; import org.apache.jena.hadoop.rdf.types.TripleWritable; import org.apache.jena.riot.Lang; -import com.yarcdata.urika.hadoop.rdf.io.input.TurtleInputFormat; import com.yarcdata.urika.hadoop.rdf.io.input.compressed.AbstractCompressedWholeFileTripleInputFormatTests; /** Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/util/AbstractTrackableInputStreamTests.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/util/AbstractTrackableInputStreamTests.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/util/AbstractTrackableInputStreamTests.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/util/AbstractTrackableInputStreamTests.java Tue Apr 8 13:42:18 2014 @@ -23,6 +23,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; +import org.apache.jena.hadoop.rdf.io.input.util.TrackableInputStream; import org.junit.Assert; import org.junit.Test; Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/util/BlockInputStreamTest.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/util/BlockInputStreamTest.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/util/BlockInputStreamTest.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/util/BlockInputStreamTest.java Tue Apr 8 13:42:18 2014 @@ -21,6 +21,8 @@ package com.yarcdata.urika.hadoop.rdf.io import java.io.IOException; import java.io.InputStream; +import org.apache.jena.hadoop.rdf.io.input.util.BlockInputStream; +import org.apache.jena.hadoop.rdf.io.input.util.TrackableInputStream; import org.junit.Assert; import org.junit.Test; Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/util/TrackedInputStreamTest.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/util/TrackedInputStreamTest.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/util/TrackedInputStreamTest.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/input/util/TrackedInputStreamTest.java Tue Apr 8 13:42:18 2014 @@ -19,6 +19,9 @@ limitations under the License. package com.yarcdata.urika.hadoop.rdf.io.input.util; import java.io.InputStream; + +import org.apache.jena.hadoop.rdf.io.input.util.TrackableInputStream; +import org.apache.jena.hadoop.rdf.io.input.util.TrackedInputStream; /** * Tests for the {@link TrackedInputStream} Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/output/NQuadsOutputTest.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/output/NQuadsOutputTest.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/output/NQuadsOutputTest.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/output/NQuadsOutputTest.java Tue Apr 8 13:42:18 2014 @@ -20,6 +20,7 @@ package com.yarcdata.urika.hadoop.rdf.io import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.mapreduce.OutputFormat; +import org.apache.jena.hadoop.rdf.io.output.NQuadsOutputFormat; import org.apache.jena.hadoop.rdf.types.QuadWritable; import org.apache.jena.riot.Lang; Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/output/NTriplesOutputTest.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/output/NTriplesOutputTest.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/output/NTriplesOutputTest.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/output/NTriplesOutputTest.java Tue Apr 8 13:42:18 2014 @@ -20,6 +20,7 @@ package com.yarcdata.urika.hadoop.rdf.io import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.mapreduce.OutputFormat; +import org.apache.jena.hadoop.rdf.io.output.NTriplesOutputFormat; import org.apache.jena.hadoop.rdf.types.TripleWritable; import org.apache.jena.riot.Lang; Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/output/RdfJsonOutputTest.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/output/RdfJsonOutputTest.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/output/RdfJsonOutputTest.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/output/RdfJsonOutputTest.java Tue Apr 8 13:42:18 2014 @@ -20,6 +20,7 @@ package com.yarcdata.urika.hadoop.rdf.io import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.mapreduce.OutputFormat; +import org.apache.jena.hadoop.rdf.io.output.RdfJsonOutputFormat; import org.apache.jena.hadoop.rdf.types.TripleWritable; import org.apache.jena.riot.Lang; Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/output/RdfXmlOutputTest.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/output/RdfXmlOutputTest.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/output/RdfXmlOutputTest.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/output/RdfXmlOutputTest.java Tue Apr 8 13:42:18 2014 @@ -20,6 +20,7 @@ package com.yarcdata.urika.hadoop.rdf.io import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.mapreduce.OutputFormat; +import org.apache.jena.hadoop.rdf.io.output.RdfXmlOutputFormat; import org.apache.jena.hadoop.rdf.types.TripleWritable; import org.apache.jena.riot.Lang; Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/output/TriGOutputTest.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/output/TriGOutputTest.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/output/TriGOutputTest.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/output/TriGOutputTest.java Tue Apr 8 13:42:18 2014 @@ -24,13 +24,14 @@ import java.util.Collection; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.mapreduce.OutputFormat; +import org.apache.jena.hadoop.rdf.io.RdfIOConstants; +import org.apache.jena.hadoop.rdf.io.output.TriGOutputFormat; import org.apache.jena.hadoop.rdf.types.QuadWritable; import org.apache.jena.riot.Lang; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import com.yarcdata.urika.hadoop.rdf.io.RdfIOConstants; /** * Tests for TriG output Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/output/TurtleOutputTest.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/output/TurtleOutputTest.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/output/TurtleOutputTest.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/test/java/com/yarcdata/urika/hadoop/rdf/io/output/TurtleOutputTest.java Tue Apr 8 13:42:18 2014 @@ -24,13 +24,14 @@ import java.util.Collection; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.mapreduce.OutputFormat; +import org.apache.jena.hadoop.rdf.io.RdfIOConstants; +import org.apache.jena.hadoop.rdf.io.output.TurtleOutputFormat; import org.apache.jena.hadoop.rdf.types.TripleWritable; import org.apache.jena.riot.Lang; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import com.yarcdata.urika.hadoop.rdf.io.RdfIOConstants; /** * Tests for Turtle output Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-stats/src/main/java/com/yarcdata/urika/hadoop/rdf/stats/jobs/JobFactory.java URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-stats/src/main/java/com/yarcdata/urika/hadoop/rdf/stats/jobs/JobFactory.java?rev=1585723&r1=1585722&r2=1585723&view=diff ============================================================================== --- jena/Experimental/hadoop-rdf/hadoop-rdf-stats/src/main/java/com/yarcdata/urika/hadoop/rdf/stats/jobs/JobFactory.java (original) +++ jena/Experimental/hadoop-rdf/hadoop-rdf-stats/src/main/java/com/yarcdata/urika/hadoop/rdf/stats/jobs/JobFactory.java Tue Apr 8 13:42:18 2014 @@ -35,20 +35,20 @@ import org.apache.hadoop.mapreduce.lib.o import org.apache.hadoop.mapreduce.lib.output.SequenceFileOutputFormat; import org.apache.hadoop.mapreduce.lib.output.TextOutputFormat; import org.apache.hadoop.util.StringUtils; +import org.apache.jena.hadoop.rdf.io.input.NQuadsInputFormat; +import org.apache.jena.hadoop.rdf.io.input.NTriplesInputFormat; +import org.apache.jena.hadoop.rdf.io.input.QuadsInputFormat; +import org.apache.jena.hadoop.rdf.io.input.TriplesInputFormat; +import org.apache.jena.hadoop.rdf.io.input.TriplesOrQuadsInputFormat; +import org.apache.jena.hadoop.rdf.io.output.NQuadsOutputFormat; +import org.apache.jena.hadoop.rdf.io.output.NTriplesNodeOutputFormat; +import org.apache.jena.hadoop.rdf.io.output.NTriplesOutputFormat; import org.apache.jena.hadoop.rdf.types.CharacteristicSetWritable; import org.apache.jena.hadoop.rdf.types.NodeWritable; import org.apache.jena.hadoop.rdf.types.QuadWritable; import org.apache.jena.hadoop.rdf.types.TripleWritable; import com.hp.hpl.jena.vocabulary.RDF; -import com.yarcdata.urika.hadoop.rdf.io.input.NQuadsInputFormat; -import com.yarcdata.urika.hadoop.rdf.io.input.NTriplesInputFormat; -import com.yarcdata.urika.hadoop.rdf.io.input.QuadsInputFormat; -import com.yarcdata.urika.hadoop.rdf.io.input.TriplesInputFormat; -import com.yarcdata.urika.hadoop.rdf.io.input.TriplesOrQuadsInputFormat; -import com.yarcdata.urika.hadoop.rdf.io.output.NQuadsOutputFormat; -import com.yarcdata.urika.hadoop.rdf.io.output.NTriplesNodeOutputFormat; -import com.yarcdata.urika.hadoop.rdf.io.output.NTriplesOutputFormat; import com.yarcdata.urika.hadoop.rdf.mapreduce.KeyMapper; import com.yarcdata.urika.hadoop.rdf.mapreduce.RdfMapReduceConstants; import com.yarcdata.urika.hadoop.rdf.mapreduce.TextCountReducer;
