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 2012/12/18 22:49:54 UTC
svn commit: r1423683 - in /jena/trunk/jena-arq/src:
main/java/org/apache/jena/atlas/web/ main/java/org/apache/jena/riot/
main/java/org/apache/jena/riot/adapters/
main/java/org/apache/jena/riot/stream/ main/java/org/apache/jena/riot/web/
main/java/org/o...
Author: andy
Date: Tue Dec 18 21:49:51 2012
New Revision: 1423683
URL: http://svn.apache.org/viewvc?rev=1423683&view=rev
Log:
Merge in updates to TypedInputStream from intermediate type in dev code.
Removed:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/TypedInputStream2.java
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedInputStream.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Jena.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebReader2.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLocator.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/JenaIOEnvironment.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/Locator.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorClassLoader.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFile2.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL2.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorZip.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/StreamManager.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/TypedInputStreamHttp.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/WebReader.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocators.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedInputStream.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedInputStream.java?rev=1423683&r1=1423682&r2=1423683&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedInputStream.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedInputStream.java Tue Dec 18 21:49:51 2012
@@ -19,35 +19,41 @@
package org.apache.jena.atlas.web;
import java.io.FilterInputStream ;
-import java.io.IOException ;
-import java.io.InputStream;
-
-import org.apache.jena.atlas.io.IO ;
+import java.io.InputStream ;
public class TypedInputStream extends FilterInputStream
{
- private final MediaType mediaType ;
+ private ContentType mediaType ;
+ // The URI to use when parsing.
+ // May be different from the URI used to access the resource
+ // e.g. 303 redirection, mapped URI redirection
+ private String baseURI ;
public TypedInputStream(InputStream in)
- { this(in, null, null) ; }
-
- public TypedInputStream(InputStream in, MediaType mediaType)
- {
- super(in) ;
- this.mediaType = mediaType ;
- }
+ { this(in, (ContentType)null, null) ; }
public TypedInputStream(InputStream in, String mediaType, String charset)
- {
- this(in, MediaType.create(mediaType, charset)) ;
- }
+ { this(in, mediaType, charset, null) ; }
+
+ public TypedInputStream(InputStream in, String mediaType, String charset, String baseURI)
+ { this(in, ContentType.create(mediaType, charset), baseURI) ; }
- public String getMediaType() { return mediaType.getContentType() ; }
- public String getCharset() { return mediaType.getCharset() ; }
+ public TypedInputStream(InputStream in, ContentType ct)
+ { this(in, ct, null) ; }
- @Override
- public void close()
+ public TypedInputStream(InputStream in, ContentType ct, String baseURI)
{
- try { super.close() ; } catch (IOException ex) { IO.exception(ex) ; }
+ super(in) ;
+ this.mediaType = ct ;
+ this.baseURI = baseURI ;
}
+
+ /** @deprecated Use {@link #getContentType} */
+ @Deprecated
+ public String getMimeType() { return getContentType() ; }
+
+ public String getContentType() { return mediaType == null ? null : mediaType.getContentType() ; }
+ public String getCharset() { return mediaType == null ? null : mediaType.getCharset() ; }
+ public ContentType getMediaType() { return mediaType ; }
+ public String getBaseURI() { return baseURI ; }
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Jena.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Jena.java?rev=1423683&r1=1423682&r2=1423683&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Jena.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Jena.java Tue Dec 18 21:49:51 2012
@@ -19,6 +19,7 @@
package org.apache.jena.riot;
import org.apache.jena.atlas.web.ContentType ;
+import org.apache.jena.atlas.web.TypedInputStream ;
import org.apache.jena.riot.WebReader2.RDFReaderRIOT_NT ;
import org.apache.jena.riot.WebReader2.RDFReaderRIOT_RDFJSON ;
import org.apache.jena.riot.WebReader2.RDFReaderRIOT_RDFXML ;
@@ -107,13 +108,13 @@ public class IO_Jena
/** Open a stream to the destination (URI or filename)
* Performs content negotition, including looking at file extension.
*/
- public static TypedInputStream2 open(String filenameOrURI)
+ public static TypedInputStream open(String filenameOrURI)
{ return open(filenameOrURI, (Context)null) ; }
/** Open a stream to the destination (URI or filename)
* Performs content negotition, including looking at file extension.
*/
- public static TypedInputStream2 open(String filenameOrURI, Context context)
+ public static TypedInputStream open(String filenameOrURI, Context context)
{
StreamManager sMgr = StreamManager.get() ;
if ( context != null )
@@ -126,9 +127,9 @@ public class IO_Jena
return open(filenameOrURI, sMgr) ;
}
- public static TypedInputStream2 open(String filenameOrURI, StreamManager sMgr)
+ public static TypedInputStream open(String filenameOrURI, StreamManager sMgr)
{
- TypedInputStream2 in = sMgr.open(filenameOrURI) ;
+ TypedInputStream in = sMgr.open(filenameOrURI) ;
if ( in == null )
{
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebReader2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebReader2.java?rev=1423683&r1=1423682&r2=1423683&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebReader2.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebReader2.java Tue Dec 18 21:49:51 2012
@@ -22,10 +22,12 @@ import java.io.InputStream ;
import java.io.Reader ;
import java.io.StringReader ;
+import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.io.PeekReader ;
import org.apache.jena.atlas.json.io.parser.TokenizerJSON ;
import org.apache.jena.atlas.lib.Sink ;
import org.apache.jena.atlas.web.ContentType ;
+import org.apache.jena.atlas.web.TypedInputStream ;
import org.apache.jena.riot.lang.* ;
import org.apache.jena.riot.stream.StreamManager ;
import org.apache.jena.riot.tokens.Tokenizer ;
@@ -176,7 +178,7 @@ public class WebReader2
Graph g = model.getGraph() ;
RDFParserOutput dest = RDFParserOutputLib.graph(g) ;
Sink<Triple> sink = new SinkTriplesToGraph(g) ;
- processTriples(dest, base, new TypedInputStream2(in), lang, null) ;
+ processTriples(dest, base, new TypedInputStream(in), lang, null) ;
}
/** Read triples into a model with chars from an Reader.
@@ -268,7 +270,7 @@ public class WebReader2
{
DatasetGraph dsg = dataset.asDatasetGraph() ;
RDFParserOutput dest = RDFParserOutputLib.dataset(dsg) ;
- processQuads(dest, base, new TypedInputStream2(in), lang, null) ;
+ processQuads(dest, base, new TypedInputStream(in), lang, null) ;
}
/** Read quads into a dataset with chars from an Reader.
@@ -336,13 +338,13 @@ public class WebReader2
*/
public static void readTriples(RDFParserOutput sink, String uri, String base, Lang2 hintLang, Context context)
{
- TypedInputStream2 in = open(uri, context) ;
+ TypedInputStream in = open(uri, context) ;
if ( in == null )
throw new RiotException("Not found: "+uri) ;
if ( base == null )
base = uri ;
processTriples(sink, base, in, hintLang, context) ;
- in.close() ;
+ IO.close(in) ;
}
/** Read quads - send to a sink.
@@ -365,24 +367,24 @@ public class WebReader2
*/
public static void readQuads(Sink<Quad> sink, String uri, String base, Lang2 hintLang, Context context)
{
- TypedInputStream2 in = open(uri, context) ;
+ TypedInputStream in = open(uri, context) ;
if ( in == null )
throw new RiotException("Not found: "+uri) ;
RDFParserOutput dest = RDFParserOutputLib.sinkQuads(sink) ;
processQuads(dest, base, in, hintLang, context) ;
- in.close() ;
+ IO.close(in) ;
}
/** Open a stream to the destination (URI or filename)
* Performs content negotition, including looking at file extension.
*/
- public static TypedInputStream2 open(String filenameOrURI)
+ public static TypedInputStream open(String filenameOrURI)
{ return open(filenameOrURI, (Context)null) ; }
/** Open a stream to the destination (URI or filename)
* Performs content negotition, including looking at file extension.
*/
- public static TypedInputStream2 open(String filenameOrURI, Context context)
+ public static TypedInputStream open(String filenameOrURI, Context context)
{
StreamManager sMgr = StreamManager.get() ;
if ( context != null )
@@ -395,9 +397,9 @@ public class WebReader2
return open(filenameOrURI, sMgr) ;
}
- public static TypedInputStream2 open(String filenameOrURI, StreamManager sMgr)
+ public static TypedInputStream open(String filenameOrURI, StreamManager sMgr)
{
- TypedInputStream2 in = sMgr.open(filenameOrURI) ;
+ TypedInputStream in = sMgr.open(filenameOrURI) ;
if ( in == null )
{
@@ -423,7 +425,7 @@ public class WebReader2
// We could have had two step design - ReaderFactory-ReaderInstance
// no - put the bruden on complicated readers, not everyone.
- private static void processTriples(RDFParserOutput destination, String baseUri, TypedInputStream2 in, Lang2 hintLang, Context context)
+ private static void processTriples(RDFParserOutput destination, String baseUri, TypedInputStream in, Lang2 hintLang, Context context)
{
ContentType ct = determineCT(baseUri, in.getContentType(), hintLang ) ;
@@ -436,7 +438,7 @@ public class WebReader2
throw new RiotException("No triples reader for content type: "+ct.getContentType()) ;
}
- reader.read(in.getInput(), baseUri, ct, destination, context) ;
+ reader.read(in, baseUri, ct, destination, context) ;
}
private static ReaderRIOT getReaderTriples(ContentType ct)
@@ -475,7 +477,7 @@ public class WebReader2
parser.parse() ;
}
- private static void processQuads(RDFParserOutput destination, String uri, TypedInputStream2 in, Lang2 hintLang, Context context)
+ private static void processQuads(RDFParserOutput destination, String uri, TypedInputStream in, Lang2 hintLang, Context context)
{
ContentType ct = determineCT(uri, in.getContentType(), hintLang ) ;
if ( ct == null )
@@ -484,7 +486,7 @@ public class WebReader2
if ( reader == null )
throw new RiotException("No quads reader for content type: "+ct) ;
- reader.read(in.getInput(), uri, ct, destination, context) ;
+ reader.read(in, uri, ct, destination, context) ;
}
private static ReaderRIOT getReaderQuads(ContentType ct)
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java?rev=1423683&r1=1423682&r2=1423683&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java Tue Dec 18 21:49:51 2012
@@ -23,7 +23,7 @@ import java.io.InputStream ;
import java.util.Iterator ;
import org.apache.jena.atlas.lib.IRILib ;
-import org.apache.jena.riot.TypedInputStream2 ;
+import org.apache.jena.atlas.web.TypedInputStream ;
import org.apache.jena.riot.stream.* ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
@@ -278,7 +278,7 @@ public class AdapterFileManager extends
if ( baseURI == null )
baseURI = chooseBaseURI(filenameOrURI) ;
- TypedInputStream2 in = streamManager.openNoMapOrNull(mappedURI) ;
+ TypedInputStream in = streamManager.openNoMapOrNull(mappedURI) ;
if ( in == null )
{
if ( log.isDebugEnabled() )
@@ -290,8 +290,8 @@ public class AdapterFileManager extends
// XXX
//syntax
}
- model.read(in.getInput(), baseURI, syntax) ;
- try { in.getInput().close(); } catch (IOException ex) {}
+ model.read(in, baseURI, syntax) ;
+ try { in.close(); } catch (IOException ex) {}
return model ;
}
@@ -312,7 +312,7 @@ public class AdapterFileManager extends
@Override
public InputStream open(String filenameOrURI)
{
- return streamManager.open(filenameOrURI).getInput() ;
+ return streamManager.open(filenameOrURI) ;
}
/** Apply the mapping of a filename or URI */
@@ -322,7 +322,7 @@ public class AdapterFileManager extends
/** Open a file using the locators of this FileManager
* but without location mapping. Throws RiotNotFoundException if not found.*/
@Override
- public InputStream openNoMap(String filenameOrURI) { return streamManager.openNoMap(filenameOrURI).getInput() ; }
+ public InputStream openNoMap(String filenameOrURI) { return streamManager.openNoMap(filenameOrURI) ; }
/** Open a file using the locators of this FileManager
* without location mapping. Return null if not found
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java?rev=1423683&r1=1423682&r2=1423683&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java Tue Dec 18 21:49:51 2012
@@ -20,18 +20,18 @@ package org.apache.jena.riot.adapters;
import java.util.Iterator ;
-import com.hp.hpl.jena.sparql.util.Utils ;
-
-import org.apache.jena.riot.TypedInputStream2 ;
+import org.apache.jena.atlas.web.TypedInputStream ;
import org.apache.jena.riot.stream.* ;
import org.openjena.riot.RiotException ;
+import com.hp.hpl.jena.sparql.util.Utils ;
+
class AdapterLib
{
- public static com.hp.hpl.jena.util.TypedStream convert(TypedInputStream2 in)
+ public static com.hp.hpl.jena.util.TypedStream convert(TypedInputStream in)
{
- return new com.hp.hpl.jena.util.TypedStream(in.getInput(), in.getContentType(), in.getCharset()) ;
+ return new com.hp.hpl.jena.util.TypedStream(in, in.getContentType(), in.getCharset()) ;
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLocator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLocator.java?rev=1423683&r1=1423682&r2=1423683&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLocator.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLocator.java Tue Dec 18 21:49:51 2012
@@ -18,7 +18,7 @@
package org.apache.jena.riot.adapters;
-import org.apache.jena.riot.TypedInputStream2 ;
+import org.apache.jena.atlas.web.TypedInputStream ;
import org.apache.jena.riot.stream.Locator ;
public class AdapterLocator implements com.hp.hpl.jena.util.Locator
@@ -30,7 +30,7 @@ public class AdapterLocator implements c
@Override
public com.hp.hpl.jena.util.TypedStream open(String filenameOrURI)
{
- TypedInputStream2 in = locator.open(filenameOrURI) ;
+ TypedInputStream in = locator.open(filenameOrURI) ;
return AdapterLib.convert(in) ;
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/JenaIOEnvironment.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/JenaIOEnvironment.java?rev=1423683&r1=1423682&r2=1423683&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/JenaIOEnvironment.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/JenaIOEnvironment.java Tue Dec 18 21:49:51 2012
@@ -20,7 +20,7 @@ package org.apache.jena.riot.stream;
import java.util.StringTokenizer ;
-import org.apache.jena.riot.TypedInputStream2 ;
+import org.apache.jena.atlas.web.TypedInputStream ;
import org.apache.jena.riot.adapters.AdapterFileManager ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
@@ -164,7 +164,7 @@ class JenaIOEnvironment
try {
String uriConfig = null ;
- TypedInputStream2 in = null ;
+ TypedInputStream in = null ;
StringTokenizer pathElems = new StringTokenizer( configPath, AdapterFileManager.PATH_DELIMITER );
while (pathElems.hasMoreTokens()) {
@@ -187,7 +187,7 @@ class JenaIOEnvironment
}
String syntax = FileUtils.guessLang(uriConfig) ;
Model model = ModelFactory.createDefaultModel() ;
- model.read(in.getInput(), uriConfig, syntax) ;
+ model.read(in, uriConfig, syntax) ;
processConfig(model) ;
} catch (JenaException ex)
{
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/Locator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/Locator.java?rev=1423683&r1=1423682&r2=1423683&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/Locator.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/Locator.java Tue Dec 18 21:49:51 2012
@@ -18,7 +18,7 @@
package org.apache.jena.riot.stream;
-import org.apache.jena.riot.TypedInputStream2 ;
+import org.apache.jena.atlas.web.TypedInputStream ;
/**
* Interface to things that open TypedStreams from a place
@@ -27,6 +27,6 @@ import org.apache.jena.riot.TypedInputSt
public interface Locator
{
// Open a stream given a name of some kind (not necessarily an IRI).
- public TypedInputStream2 open(String uri) ;
+ public TypedInputStream open(String uri) ;
public String getName() ;
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorClassLoader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorClassLoader.java?rev=1423683&r1=1423682&r2=1423683&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorClassLoader.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorClassLoader.java Tue Dec 18 21:49:51 2012
@@ -21,8 +21,8 @@ package org.apache.jena.riot.stream;
import java.io.InputStream ;
import org.apache.jena.atlas.web.ContentType ;
+import org.apache.jena.atlas.web.TypedInputStream ;
import org.apache.jena.riot.RDFLanguages ;
-import org.apache.jena.riot.TypedInputStream2 ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
@@ -49,7 +49,7 @@ public class LocatorClassLoader impleme
{ return classLoader.hashCode(); }
@Override
- public TypedInputStream2 open(String resourceName)
+ public TypedInputStream open(String resourceName)
{
if ( classLoader == null )
return null ;
@@ -67,7 +67,7 @@ public class LocatorClassLoader impleme
ContentType ct = RDFLanguages.guessContentType(resourceName) ;
// No sensible base URI.
- return new TypedInputStream2(in, ct, null) ;
+ return new TypedInputStream(in, ct, null) ;
}
public ClassLoader getClassLoader()
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFile2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFile2.java?rev=1423683&r1=1423682&r2=1423683&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFile2.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFile2.java Tue Dec 18 21:49:51 2012
@@ -26,8 +26,8 @@ import java.security.AccessControlExcept
import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.lib.IRILib ;
import org.apache.jena.atlas.web.ContentType ;
+import org.apache.jena.atlas.web.TypedInputStream ;
import org.apache.jena.riot.RDFLanguages ;
-import org.apache.jena.riot.TypedInputStream2 ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
@@ -111,7 +111,7 @@ public class LocatorFile2 implements Loc
/** Open anything that looks a bit like a file name */
@Override
- public TypedInputStream2 open(String filenameIRI)
+ public TypedInputStream open(String filenameIRI)
{
String fn = toFileName(filenameIRI) ;
if ( fn == null )
@@ -136,7 +136,7 @@ public class LocatorFile2 implements Loc
log.trace("Found: "+filenameIRI+thisDirLogStr) ;
ContentType ct = RDFLanguages.guessContentType(filenameIRI) ;
- return new TypedInputStream2(in, ct, filenameIRI) ;
+ return new TypedInputStream(in, ct, filenameIRI) ;
} catch (IOException ioEx)
{
// Includes FileNotFoundException
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL2.java?rev=1423683&r1=1423682&r2=1423683&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL2.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL2.java Tue Dec 18 21:49:51 2012
@@ -18,7 +18,7 @@
package org.apache.jena.riot.stream;
-import org.apache.jena.riot.TypedInputStream2 ;
+import org.apache.jena.atlas.web.TypedInputStream ;
import org.apache.jena.riot.web.HttpOp ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
@@ -33,7 +33,7 @@ public class LocatorURL2 implements Loca
public final String acceptTriples = "text/turtle,application/rdf+xml;q=0.9,application/xml;q=0.8,*/*;q=0.5" ;
@Override
- public TypedInputStream2 open(String uri)
+ public TypedInputStream open(String uri)
{
if ( ! acceptByScheme(uri) )
{
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorZip.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorZip.java?rev=1423683&r1=1423682&r2=1423683&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorZip.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorZip.java Tue Dec 18 21:49:51 2012
@@ -24,8 +24,8 @@ import java.util.zip.ZipEntry ;
import java.util.zip.ZipFile ;
import org.apache.jena.atlas.web.ContentType ;
+import org.apache.jena.atlas.web.TypedInputStream ;
import org.apache.jena.riot.RDFLanguages ;
-import org.apache.jena.riot.TypedInputStream2 ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
@@ -52,7 +52,7 @@ public class LocatorZip implements Locat
}
@Override
- public TypedInputStream2 open(String filenameOrURI)
+ public TypedInputStream open(String filenameOrURI)
{
ZipEntry entry = zipFile.getEntry(filenameOrURI) ;
if ( entry == null )
@@ -77,7 +77,7 @@ public class LocatorZip implements Locat
log.trace("Found: "+filenameOrURI) ;
ContentType ct = RDFLanguages.guessContentType(filenameOrURI) ;
- return new TypedInputStream2(in, ct, filenameOrURI) ;
+ return new TypedInputStream(in, ct, filenameOrURI) ;
}
catch (IOException ex)
{
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/StreamManager.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/StreamManager.java?rev=1423683&r1=1423682&r2=1423683&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/StreamManager.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/StreamManager.java Tue Dec 18 21:49:51 2012
@@ -22,7 +22,7 @@ import java.util.ArrayList ;
import java.util.Collections ;
import java.util.List ;
-import org.apache.jena.riot.TypedInputStream2 ;
+import org.apache.jena.atlas.web.TypedInputStream ;
import org.openjena.riot.RiotNotFoundException ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
@@ -66,7 +66,7 @@ public class StreamManager
/** Open a file using the locators of this FileManager.
* Returns null if not found.
*/
- public TypedInputStream2 open(String filenameOrURI)
+ public TypedInputStream open(String filenameOrURI)
{
if ( log.isDebugEnabled())
log.debug("open("+filenameOrURI+")") ;
@@ -103,9 +103,9 @@ public class StreamManager
/** Open a file using the locators of this FileManager
* but without location mapping. Throws RiotNotFoundException if not found.*/
- public TypedInputStream2 openNoMap(String filenameOrURI)
+ public TypedInputStream openNoMap(String filenameOrURI)
{
- TypedInputStream2 in = openNoMapOrNull(filenameOrURI) ;
+ TypedInputStream in = openNoMapOrNull(filenameOrURI) ;
if ( in == null )
throw new RiotNotFoundException(filenameOrURI) ;
return in ;
@@ -115,11 +115,11 @@ public class StreamManager
* without location mapping. Return null if not found
*/
- public TypedInputStream2 openNoMapOrNull(String filenameOrURI)
+ public TypedInputStream openNoMapOrNull(String filenameOrURI)
{
for (Locator loc : handlers)
{
- TypedInputStream2 in = loc.open(filenameOrURI) ;
+ TypedInputStream in = loc.open(filenameOrURI) ;
if ( in != null )
{
if ( log.isDebugEnabled() )
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/TypedInputStreamHttp.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/TypedInputStreamHttp.java?rev=1423683&r1=1423682&r2=1423683&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/TypedInputStreamHttp.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/TypedInputStreamHttp.java Tue Dec 18 21:49:51 2012
@@ -18,14 +18,15 @@
package org.apache.jena.riot.web;
+import java.io.IOException ;
import java.io.InputStream ;
import org.apache.http.conn.ClientConnectionManager ;
import org.apache.jena.atlas.web.MediaType ;
-import org.apache.jena.riot.TypedInputStream2 ;
+import org.apache.jena.atlas.web.TypedInputStream ;
/** Type streams for HTTP connections - includes Apache HTTP client specific cleanup */
-public class TypedInputStreamHttp extends TypedInputStream2
+public class TypedInputStreamHttp extends TypedInputStream
{
private ClientConnectionManager connectMgr ;
@@ -36,7 +37,7 @@ public class TypedInputStreamHttp extend
}
@Override
- public void close()
+ public void close() throws IOException
{
super.close() ;
if ( connectMgr != null )
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/WebReader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/WebReader.java?rev=1423683&r1=1423682&r2=1423683&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/WebReader.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/WebReader.java Tue Dec 18 21:49:51 2012
@@ -66,7 +66,7 @@ public class WebReader
public static void readGraph(Graph graph, String uri, Lang lang)
{
TypedInputStream typedInput = open(uri, lang) ;
- String contentType = typedInput.getMediaType() ;
+ String contentType = typedInput.getContentType() ;
lang = chooseLang(contentType, lang) ;
if ( lang == null )
@@ -94,7 +94,7 @@ public class WebReader
public static void readDataset(DatasetGraph dataset, String uri, Lang lang)
{
TypedInputStream typedInput = open(uri, lang) ;
- String contentType = typedInput.getMediaType() ;
+ String contentType = typedInput.getContentType() ;
lang = chooseLang(contentType, lang) ;
if ( lang == null )
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java?rev=1423683&r1=1423682&r2=1423683&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java Tue Dec 18 21:49:51 2012
@@ -24,6 +24,7 @@ import java.io.StringReader ;
import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.atlas.lib.StrUtils ;
+import org.apache.jena.atlas.web.TypedInputStream ;
import org.junit.AfterClass ;
import org.junit.BeforeClass ;
import org.junit.Test ;
@@ -77,15 +78,15 @@ public class TestJenaReaderRIOT extends
@Test public void read_30()
{
{
- TypedInputStream2 in = WebReader2.open(filename("D-not-TTL.ttl") );
+ TypedInputStream in = WebReader2.open(filename("D-not-TTL.ttl") );
Model m0 = ModelFactory.createDefaultModel() ;
- WebReader2.read(m0, in.getInput(), RDFLanguages.RDFXML) ;
+ WebReader2.read(m0, in, RDFLanguages.RDFXML) ;
}
- TypedInputStream2 in1 = WebReader2.open(filename("D-not-TTL.ttl") );
+ TypedInputStream in1 = WebReader2.open(filename("D-not-TTL.ttl") );
Model m1 = ModelFactory.createDefaultModel() ;
// Fails until integration with jena-core as hintlang gets lost.
- m1.read(in1.getInput(), null, "RDF/XML") ;
+ m1.read(in1, null, "RDF/XML") ;
}
// test read from StringReader..
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java?rev=1423683&r1=1423682&r2=1423683&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java Tue Dec 18 21:49:51 2012
@@ -71,7 +71,7 @@ public class UnitTestEval extends LangTe
String syntax = FileUtils.guessLang(output, FileUtils.langNTriple) ;
Model results = ModelFactory.createDefaultModel() ;
// Directly get an N-triples reader
- InputStream in = StreamManager.get().open(output).getInput() ;
+ InputStream in = StreamManager.get().open(output) ;
WebReader2.read(results, in, null, RDFLanguages.NTriples) ;
boolean b = model.isIsomorphicWith(results) ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocators.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocators.java?rev=1423683&r1=1423682&r2=1423683&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocators.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocators.java Tue Dec 18 21:49:51 2012
@@ -21,8 +21,7 @@ package org.apache.jena.riot.stream;
import java.io.File ;
import org.apache.jena.atlas.junit.BaseTest ;
-import org.apache.jena.riot.TypedInputStream2 ;
-import org.apache.jena.riot.stream.LocatorFile2 ;
+import org.apache.jena.atlas.web.TypedInputStream ;
import org.junit.Test ;
import org.openjena.riot.WebContent ;
@@ -69,7 +68,7 @@ public class TestLocators extends BaseTe
@Test public void locatorFile_05()
{
LocatorFile2 loc = new LocatorFile2() ;
- TypedInputStream2 ts = loc.open(testingDir+"data.ttl") ;
+ TypedInputStream ts = loc.open(testingDir+"data.ttl") ;
assertTrue("Not equal: "+WebContent.contentTypeTurtle+" != "+ts.getMediaType(),
WebContent.contentTypeTurtle.equalsIgnoreCase(ts.getContentType())) ;
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java?rev=1423683&r1=1423682&r2=1423683&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java Tue Dec 18 21:49:51 2012
@@ -20,12 +20,10 @@ package org.apache.jena.riot.stream;
import java.io.File ;
+import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.junit.BaseTest ;
-import org.apache.jena.riot.TypedInputStream2 ;
+import org.apache.jena.atlas.web.TypedInputStream ;
import org.apache.jena.riot.WebReader2 ;
-import org.apache.jena.riot.stream.LocatorFile2 ;
-import org.apache.jena.riot.stream.LocatorURL2 ;
-import org.apache.jena.riot.stream.StreamManager ;
import org.junit.AfterClass ;
import org.junit.BeforeClass ;
import org.junit.Test ;
@@ -94,13 +92,12 @@ public class TestStreamManager extends B
private static void open(String dataName, Context context)
{
- TypedInputStream2 in ;
- if ( context != null )
- in = WebReader2.open(dataName, context) ;
- else
- in = WebReader2.open(dataName) ;
+ TypedInputStream in =
+ ( context != null ) ?
+ WebReader2.open(dataName, context) :
+ WebReader2.open(dataName) ;
assertNotNull(in) ;
- in.close() ;
+ IO.close(in) ;
}
private static void read(String dataName)