You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2014/06/21 16:22:48 UTC
svn commit: r1604399 - in /jena/trunk/jena-arq/src:
main/java/com/hp/hpl/jena/sparql/engine/iterator/
main/java/com/hp/hpl/jena/sparql/graph/
main/java/com/hp/hpl/jena/sparql/modify/
main/java/org/apache/jena/riot/system/ main/java/org/openjena/riot/ t...
Author: andy
Date: Sat Jun 21 14:22:47 2014
New Revision: 1604399
URL: http://svn.apache.org/r1604399
Log:
JENA-726 : Move SerializationFactoryFinder out of org.openjena.riot. Leave depracted tombstone redirections.
Added:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/SerializationFactoryFinder.java (with props)
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterDistinct.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterSort.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDefaultDataBag.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDistinctDataBag.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineWorker.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/SerializationFactoryFinder.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterDistinct.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterDistinct.java?rev=1604399&r1=1604398&r2=1604399&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterDistinct.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterDistinct.java Sat Jun 21 14:22:47 2014
@@ -25,7 +25,7 @@ import org.apache.jena.atlas.data.BagFac
import org.apache.jena.atlas.data.DistinctDataNet ;
import org.apache.jena.atlas.data.ThresholdPolicy ;
import org.apache.jena.atlas.data.ThresholdPolicyFactory ;
-import org.openjena.riot.SerializationFactoryFinder ;
+import org.apache.jena.riot.system.SerializationFactoryFinder ;
import com.hp.hpl.jena.query.SortCondition ;
import com.hp.hpl.jena.sparql.engine.ExecutionContext ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterSort.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterSort.java?rev=1604399&r1=1604398&r2=1604399&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterSort.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterSort.java Sat Jun 21 14:22:47 2014
@@ -28,7 +28,7 @@ import org.apache.jena.atlas.data.Thresh
import org.apache.jena.atlas.data.ThresholdPolicyFactory ;
import org.apache.jena.atlas.iterator.IteratorDelayedInitialization ;
import org.apache.jena.atlas.lib.Closeable ;
-import org.openjena.riot.SerializationFactoryFinder ;
+import org.apache.jena.riot.system.SerializationFactoryFinder ;
import com.hp.hpl.jena.query.QueryCancelledException ;
import com.hp.hpl.jena.query.SortCondition ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDefaultDataBag.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDefaultDataBag.java?rev=1604399&r1=1604398&r2=1604399&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDefaultDataBag.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDefaultDataBag.java Sat Jun 21 14:22:47 2014
@@ -21,7 +21,7 @@ package com.hp.hpl.jena.sparql.graph;
import org.apache.jena.atlas.data.BagFactory ;
import org.apache.jena.atlas.data.DataBag ;
import org.apache.jena.atlas.data.ThresholdPolicy ;
-import org.openjena.riot.SerializationFactoryFinder ;
+import org.apache.jena.riot.system.SerializationFactoryFinder ;
import com.hp.hpl.jena.graph.Triple ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDistinctDataBag.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDistinctDataBag.java?rev=1604399&r1=1604398&r2=1604399&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDistinctDataBag.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDistinctDataBag.java Sat Jun 21 14:22:47 2014
@@ -21,7 +21,7 @@ package com.hp.hpl.jena.sparql.graph;
import org.apache.jena.atlas.data.BagFactory ;
import org.apache.jena.atlas.data.DataBag ;
import org.apache.jena.atlas.data.ThresholdPolicy ;
-import org.openjena.riot.SerializationFactoryFinder ;
+import org.apache.jena.riot.system.SerializationFactoryFinder ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.util.TripleComparator ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineWorker.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineWorker.java?rev=1604399&r1=1604398&r2=1604399&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineWorker.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineWorker.java Sat Jun 21 14:22:47 2014
@@ -35,7 +35,7 @@ import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.riot.RDFLanguages ;
import org.apache.jena.riot.system.StreamRDF ;
import org.apache.jena.riot.system.StreamRDFLib ;
-import org.openjena.riot.SerializationFactoryFinder ;
+import org.apache.jena.riot.system.SerializationFactoryFinder ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.GraphUtil ;
Added: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/SerializationFactoryFinder.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/SerializationFactoryFinder.java?rev=1604399&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/SerializationFactoryFinder.java (added)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/SerializationFactoryFinder.java Sat Jun 21 14:22:47 2014
@@ -0,0 +1,127 @@
+/*
+ * 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.riot.system;
+
+import java.io.InputStream ;
+import java.io.OutputStream ;
+import java.util.Iterator ;
+
+import org.apache.jena.atlas.data.SerializationFactory ;
+import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.riot.lang.LabelToNode ;
+import org.apache.jena.riot.lang.LangNQuads ;
+import org.apache.jena.riot.lang.LangNTriples ;
+import org.apache.jena.riot.out.NodeToLabel ;
+import org.apache.jena.riot.out.SinkQuadOutput ;
+import org.apache.jena.riot.out.SinkTripleOutput ;
+import org.apache.jena.riot.system.IRIResolver ;
+import org.apache.jena.riot.system.ParserProfileBase ;
+import org.apache.jena.riot.system.Prologue ;
+import org.apache.jena.riot.tokens.Tokenizer ;
+import org.apache.jena.riot.tokens.TokenizerFactory ;
+
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.sparql.core.Quad ;
+import com.hp.hpl.jena.sparql.engine.binding.Binding ;
+import com.hp.hpl.jena.sparql.engine.binding.BindingInputStream ;
+import com.hp.hpl.jena.sparql.engine.binding.BindingOutputStream ;
+
+public class SerializationFactoryFinder
+{
+ public static SerializationFactory<Binding> bindingSerializationFactory()
+ {
+ return new SerializationFactory<Binding>()
+ {
+ @Override
+ public Sink<Binding> createSerializer(OutputStream out)
+ {
+ return new BindingOutputStream(out);
+ }
+
+ @Override
+ public Iterator<Binding> createDeserializer(InputStream in)
+ {
+ return new BindingInputStream(in);
+ }
+
+ @Override
+ public long getEstimatedMemorySize(Binding item)
+ {
+ // TODO traverse the binding, and add up the variable + node sizes + object overhead
+ return 0 ;
+ }
+ };
+ }
+
+ public static SerializationFactory<Triple> tripleSerializationFactory()
+ {
+ return new SerializationFactory<Triple>()
+ {
+ @Override
+ public Sink<Triple> createSerializer(OutputStream out)
+ {
+ return new SinkTripleOutput(out, null, NodeToLabel.createBNodeByLabelEncoded()) ;
+ }
+
+ @Override
+ public Iterator<Triple> createDeserializer(InputStream in)
+ {
+ Tokenizer tokenizer = TokenizerFactory.makeTokenizerASCII(in) ;
+ ParserProfileBase profile = new ParserProfileBase(new Prologue(null, IRIResolver.createNoResolve()), null, LabelToNode.createUseLabelEncoded()) ;
+ LangNTriples parser = new LangNTriples(tokenizer, profile, null) ;
+ return parser ;
+ }
+
+ @Override
+ public long getEstimatedMemorySize(Triple item)
+ {
+ // TODO
+ return 0 ;
+ }
+ };
+ }
+
+ public static SerializationFactory<Quad> quadSerializationFactory()
+ {
+ return new SerializationFactory<Quad>()
+ {
+ @Override
+ public Sink<Quad> createSerializer(OutputStream out)
+ {
+ return new SinkQuadOutput(out, null, NodeToLabel.createBNodeByLabelEncoded()) ;
+ }
+
+ @Override
+ public Iterator<Quad> createDeserializer(InputStream in)
+ {
+ Tokenizer tokenizer = TokenizerFactory.makeTokenizerASCII(in) ;
+ ParserProfileBase profile = new ParserProfileBase(new Prologue(null, IRIResolver.createNoResolve()), null, LabelToNode.createUseLabelEncoded()) ;
+ LangNQuads parser = new LangNQuads(tokenizer, profile, null) ;
+ return parser ;
+ }
+
+ @Override
+ public long getEstimatedMemorySize(Quad item)
+ {
+ // TODO
+ return 0 ;
+ }
+ };
+ }
+}
Propchange: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/SerializationFactoryFinder.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/SerializationFactoryFinder.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/SerializationFactoryFinder.java?rev=1604399&r1=1604398&r2=1604399&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/SerializationFactoryFinder.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/SerializationFactoryFinder.java Sat Jun 21 14:22:47 2014
@@ -18,110 +18,34 @@
package org.openjena.riot;
-import java.io.InputStream ;
-import java.io.OutputStream ;
-import java.util.Iterator ;
-
import org.apache.jena.atlas.data.SerializationFactory ;
-import org.apache.jena.atlas.lib.Sink ;
-import org.apache.jena.riot.lang.LabelToNode ;
-import org.apache.jena.riot.lang.LangNQuads ;
-import org.apache.jena.riot.lang.LangNTriples ;
-import org.apache.jena.riot.out.NodeToLabel ;
-import org.apache.jena.riot.out.SinkQuadOutput ;
-import org.apache.jena.riot.out.SinkTripleOutput ;
-import org.apache.jena.riot.system.IRIResolver ;
-import org.apache.jena.riot.system.ParserProfileBase ;
-import org.apache.jena.riot.system.Prologue ;
-import org.apache.jena.riot.tokens.Tokenizer ;
-import org.apache.jena.riot.tokens.TokenizerFactory ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.core.Quad ;
import com.hp.hpl.jena.sparql.engine.binding.Binding ;
-import com.hp.hpl.jena.sparql.engine.binding.BindingInputStream ;
-import com.hp.hpl.jena.sparql.engine.binding.BindingOutputStream ;
+/** @deprecated use {@link org.apache.jena.riot.system.SerializationFactoryFinder} */
+@Deprecated
public class SerializationFactoryFinder
{
+ /** @deprecated use {@link org.apache.jena.riot.system.SerializationFactoryFinder#bindingSerializationFactory} */
+ @Deprecated
public static SerializationFactory<Binding> bindingSerializationFactory()
{
- return new SerializationFactory<Binding>()
- {
- @Override
- public Sink<Binding> createSerializer(OutputStream out)
- {
- return new BindingOutputStream(out);
- }
-
- @Override
- public Iterator<Binding> createDeserializer(InputStream in)
- {
- return new BindingInputStream(in);
- }
-
- @Override
- public long getEstimatedMemorySize(Binding item)
- {
- // TODO traverse the binding, and add up the variable + node sizes + object overhead
- return 0 ;
- }
- };
+ return org.apache.jena.riot.system.SerializationFactoryFinder.bindingSerializationFactory() ;
}
+ /** @deprecated use {@link org.apache.jena.riot.system.SerializationFactoryFinder#tripleSerializationFactory} */
+ @Deprecated
public static SerializationFactory<Triple> tripleSerializationFactory()
{
- return new SerializationFactory<Triple>()
- {
- @Override
- public Sink<Triple> createSerializer(OutputStream out)
- {
- return new SinkTripleOutput(out, null, NodeToLabel.createBNodeByLabelEncoded()) ;
- }
-
- @Override
- public Iterator<Triple> createDeserializer(InputStream in)
- {
- Tokenizer tokenizer = TokenizerFactory.makeTokenizerASCII(in) ;
- ParserProfileBase profile = new ParserProfileBase(new Prologue(null, IRIResolver.createNoResolve()), null, LabelToNode.createUseLabelEncoded()) ;
- LangNTriples parser = new LangNTriples(tokenizer, profile, null) ;
- return parser ;
- }
-
- @Override
- public long getEstimatedMemorySize(Triple item)
- {
- // TODO
- return 0 ;
- }
- };
+ return org.apache.jena.riot.system.SerializationFactoryFinder.tripleSerializationFactory() ;
}
+ /** @deprecated use {@link org.apache.jena.riot.system.SerializationFactoryFinder#quadSerializationFactory} */
+ @Deprecated
public static SerializationFactory<Quad> quadSerializationFactory()
{
- return new SerializationFactory<Quad>()
- {
- @Override
- public Sink<Quad> createSerializer(OutputStream out)
- {
- return new SinkQuadOutput(out, null, NodeToLabel.createBNodeByLabelEncoded()) ;
- }
-
- @Override
- public Iterator<Quad> createDeserializer(InputStream in)
- {
- Tokenizer tokenizer = TokenizerFactory.makeTokenizerASCII(in) ;
- ParserProfileBase profile = new ParserProfileBase(new Prologue(null, IRIResolver.createNoResolve()), null, LabelToNode.createUseLabelEncoded()) ;
- LangNQuads parser = new LangNQuads(tokenizer, profile, null) ;
- return parser ;
- }
-
- @Override
- public long getEstimatedMemorySize(Quad item)
- {
- // TODO
- return 0 ;
- }
- };
+ return org.apache.jena.riot.system.SerializationFactoryFinder.quadSerializationFactory() ;
}
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java?rev=1604399&r1=1604398&r2=1604399&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java Sat Jun 21 14:22:47 2014
@@ -30,7 +30,7 @@ import org.apache.jena.atlas.data.Distin
import org.apache.jena.atlas.data.ThresholdPolicyCount ;
import org.apache.jena.atlas.iterator.Iter ;
import org.junit.Test ;
-import org.openjena.riot.SerializationFactoryFinder ;
+import org.apache.jena.riot.system.SerializationFactoryFinder ;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
import com.hp.hpl.jena.graph.NodeFactory ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java?rev=1604399&r1=1604398&r2=1604399&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java Sat Jun 21 14:22:47 2014
@@ -31,8 +31,7 @@ import org.apache.jena.atlas.data.Distin
import org.apache.jena.atlas.data.ThresholdPolicyCount ;
import org.apache.jena.atlas.iterator.Iter ;
import org.junit.Test ;
-import org.openjena.riot.SerializationFactoryFinder ;
-
+import org.apache.jena.riot.system.SerializationFactoryFinder ;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.query.SortCondition ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java?rev=1604399&r1=1604398&r2=1604399&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java Sat Jun 21 14:22:47 2014
@@ -31,7 +31,7 @@ import org.apache.jena.atlas.data.Sorted
import org.apache.jena.atlas.data.ThresholdPolicyCount ;
import org.apache.jena.atlas.iterator.Iter ;
import org.junit.Test ;
-import org.openjena.riot.SerializationFactoryFinder ;
+import org.apache.jena.riot.system.SerializationFactoryFinder ;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
import com.hp.hpl.jena.graph.NodeFactory ;