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 2013/06/30 12:25:45 UTC
svn commit: r1498081 - in
/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot: ./ stream/ web/
Author: andy
Date: Sun Jun 30 10:25:44 2013
New Revision: 1498081
URL: http://svn.apache.org/r1498081
Log:
Changes due to changes elsewhere.
Removed:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/ContentProducer.java
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpResponseHandler.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpResponseLib.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/TypedInputStreamHttp.java
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang.java?rev=1498081&r1=1498080&r2=1498081&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang.java Sun Jun 30 10:25:44 2013
@@ -85,7 +85,7 @@ public class Lang
String mediaType = mainContentType ;
- contentType = mediaType==null ? null : ContentType.parse(mediaType) ;
+ contentType = mediaType==null ? null : ContentType.create(mediaType) ;
List<String> _altContentTypes = copy(otherContentTypes) ;
if ( ! _altContentTypes.contains(mainContentType) )
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java?rev=1498081&r1=1498080&r2=1498081&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java Sun Jun 30 10:25:44 2013
@@ -837,7 +837,7 @@ public class RDFDataMgr
if ( ctStr != null )
ctStr = WebContent.contentTypeCanonical(ctStr) ;
- ContentType ct = (ctStr==null) ? null : ContentType.parse(ctStr) ;
+ ContentType ct = (ctStr==null) ? null : ContentType.create(ctStr) ;
// If it's text plain, we ignore it because a lot of naive
// server setups return text/plain for any file type.
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java?rev=1498081&r1=1498080&r2=1498081&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java Sun Jun 30 10:25:44 2013
@@ -121,8 +121,11 @@ public class WebContent
mapContentTypeToLang.put(contentTypeTriG, RDFLanguages.TRIG) ;
mapContentTypeToLang.put(contentTypeTriGAlt1, RDFLanguages.TRIG) ;
mapContentTypeToLang.put(contentTypeTriGAlt2, RDFLanguages.TRIG) ;
-
}
+
+ public static final String defaultGraphAcceptHeader = "application/n-triples,text/turtle;q=0.9,application/rdf+xml;q=0.8,application/xml;q=0.7,*/*;q=0.5" ;
+ // Old :: "application/rdf+xml,application/xml;q=0.9,*/*;q=0.5" ;
+
/** Return our "canonical" name for a Content Type.
* This should be the standard one, no X-*
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL.java?rev=1498081&r1=1498080&r2=1498081&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL.java Sun Jun 30 10:25:44 2013
@@ -21,6 +21,7 @@ package org.apache.jena.riot.stream;
import java.util.Locale ;
import org.apache.jena.atlas.web.TypedInputStream ;
+import org.apache.jena.riot.WebContent ;
import org.apache.jena.riot.web.HttpOp ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
@@ -32,8 +33,6 @@ public class LocatorURL implements Locat
private static Logger log = LoggerFactory.getLogger(LocatorURL.class) ;
private static final String[] schemeNames = { "http" , "https" } ; // Must be lower case and not include the ":"
- public final String acceptTriples = "text/turtle,application/rdf+xml;q=0.9,application/xml;q=0.8,*/*;q=0.5" ;
-
@Override
public TypedInputStream open(String uri)
{
@@ -44,7 +43,7 @@ public class LocatorURL implements Locat
return null;
}
if ( uri.startsWith("http://") || uri.startsWith("https://"))
- return HttpOp.execHttpGet(uri, acceptTriples, null) ;
+ return HttpOp.execHttpGet(uri, WebContent.defaultGraphAcceptHeader) ;
return null ;
}
@@ -71,10 +70,7 @@ public class LocatorURL implements Locat
@Override
public int hashCode()
{
- final int prime = 31 ;
- int result = 1 ;
- result = prime * result + ((acceptTriples == null) ? 0 : acceptTriples.hashCode()) ;
- return result ;
+ return 57 ;
}
@Override
@@ -82,14 +78,7 @@ public class LocatorURL implements Locat
{
if (this == obj) return true ;
if (obj == null) return false ;
- if (getClass() != obj.getClass()) return false ;
- LocatorURL other = (LocatorURL)obj ;
- if (acceptTriples == null)
- {
- if (other.acceptTriples != null) return false ;
- } else
- if (!acceptTriples.equals(other.acceptTriples)) return false ;
- return true ;
+ return getClass() == obj.getClass() ;
}
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpResponseHandler.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpResponseHandler.java?rev=1498081&r1=1498080&r2=1498081&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpResponseHandler.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpResponseHandler.java Sun Jun 30 10:25:44 2013
@@ -25,5 +25,5 @@ import org.apache.http.HttpResponse ;
/** General act-on-HTTP-response interface.*/
public interface HttpResponseHandler
{
- void handle(String contentType, String baseIRI, HttpResponse response) throws IOException ;
+ void handle(String baseIRI , HttpResponse response ) throws IOException ;
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpResponseLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpResponseLib.java?rev=1498081&r1=1498080&r2=1498081&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpResponseLib.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpResponseLib.java Sun Jun 30 10:25:44 2013
@@ -25,12 +25,11 @@ import java.util.Map ;
import org.apache.http.HttpEntity ;
import org.apache.http.HttpResponse ;
-import org.apache.http.protocol.HttpContext ;
import org.apache.jena.atlas.io.IO ;
-import org.apache.jena.atlas.web.MediaType ;
-import org.apache.jena.riot.RiotReader ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFDataMgr ;
+import org.apache.jena.riot.RDFLanguages ;
import org.apache.jena.riot.WebContent ;
-import org.apache.jena.riot.lang.LangRIOT ;
import org.apache.jena.riot.system.StreamRDF ;
import org.apache.jena.riot.system.StreamRDFLib ;
@@ -41,27 +40,26 @@ import com.hp.hpl.jena.sparql.graph.Grap
import com.hp.hpl.jena.sparql.resultset.ResultsFormat ;
/** A collection of handlers for response handling.
- * @see HttpOp#execHttpGet(String, String, java.util.Map, HttpContext)
- * @see HttpOp#execHttpPost(String, String, ContentProducer, String, java.util.Map)
- *
+ * @see HttpOp
*/
public class HttpResponseLib
{
- static abstract class AbstractGraphReader implements HttpCaptureResponse<Graph>
+ public static HttpCaptureResponse<Graph> graphHandler() { return new GraphReader() ; }
+ static class GraphReader implements HttpCaptureResponse<Graph>
{
private Graph graph = null ;
@Override
- final public void handle(String contentType, String baseIRI, HttpResponse response)
+ final public void handle(String baseIRI, HttpResponse response)
{
try {
Graph g = GraphFactory.createDefaultGraph() ;
HttpEntity entity = response.getEntity() ;
- MediaType mt = MediaType.create(response.getFirstHeader(HttpNames.hContentType).getValue()) ;
- mt.getCharset() ;
+ // org.apache.http.entity.ContentType ;
+ String ct = contentType(response) ;
+ Lang lang = RDFLanguages.contentTypeToLang(ct) ;
StreamRDF dest = StreamRDFLib.graph(g) ;
InputStream in = entity.getContent() ;
- LangRIOT parser = createParser(in, baseIRI, dest) ;
- parser.parse() ;
+ RDFDataMgr.parse(dest, in, baseIRI, lang) ;
in.close() ;
this.graph = g ;
} catch (IOException ex) { IO.exception(ex) ; }
@@ -69,17 +67,18 @@ public class HttpResponseLib
@Override
public Graph get() { return graph ; }
-
- abstract protected LangRIOT createParser(InputStream in, String baseIRI, StreamRDF dest) ;
}
public static HttpResponseHandler httpDumpResponse = new HttpResponseHandler()
{
@Override
- public void handle(String contentType, String baseIRI, HttpResponse response)
+ public void handle(String baseIRI , HttpResponse response )
{
try {
HttpEntity entity = response.getEntity() ;
+ org.apache.http.entity.ContentType ct = org.apache.http.entity.ContentType.get(entity) ;
+ System.out.println("Content-type: "+ct) ;
+ System.out.println() ;
InputStream in = entity.getContent() ;
int l ;
byte buffer[] = new byte[1024] ;
@@ -99,35 +98,10 @@ public class HttpResponseLib
public static HttpResponseHandler nullResponse = new HttpResponseHandler() {
@Override
- public void handle(String contentType, String baseIRI, HttpResponse response)
+ public void handle(String baseIRI , HttpResponse response )
{}
} ;
- public static HttpCaptureResponse<Graph> graphReaderTurtle = new AbstractGraphReader()
- {
- @Override
- protected LangRIOT createParser(InputStream in, String baseIRI, StreamRDF dest)
- {
- return RiotReader.createParserTurtle(in, baseIRI, dest) ;
- }
- } ;
- public static HttpCaptureResponse<Graph> graphReaderNTriples = new AbstractGraphReader()
- {
- @Override
- protected LangRIOT createParser(InputStream in, String baseIRI, StreamRDF dest)
- {
- return RiotReader.createParserNTriples(in, dest) ;
- }
- } ;
- public static HttpCaptureResponse<Graph> graphReaderRDFXML = new AbstractGraphReader()
- {
- @Override
- protected LangRIOT createParser(InputStream in, String baseIRI, StreamRDF dest)
- {
- return RiotReader.createParserRDFXML(in, baseIRI, dest) ;
- }
- } ;
-
public static ResultsFormat contentTypeToResultSet(String contentType) { return mapContentTypeToResultSet.get(contentType) ; }
private static final Map<String, ResultsFormat> mapContentTypeToResultSet = new HashMap<String, ResultsFormat>() ;
static
@@ -142,10 +116,10 @@ public class HttpResponseLib
{
ResultSet rs = null ;
@Override
- public void handle(String contentType, String baseIRI, HttpResponse response) throws IOException
+ public void handle(String baseIRI , HttpResponse response ) throws IOException
{
- MediaType mt = MediaType.create(contentType) ;
- ResultsFormat fmt = mapContentTypeToResultSet.get(contentType) ; // contentTypeToResultSet(contentType) ;
+ String ct = contentType(response) ;
+ ResultsFormat fmt = mapContentTypeToResultSet.get(ct) ;
InputStream in = response.getEntity().getContent() ;
rs = ResultSetFactory.load(in, fmt) ;
// Force reading
@@ -158,4 +132,11 @@ public class HttpResponseLib
return rs ;
}
}
+
+ private static String contentType(HttpResponse response) {
+ HttpEntity entity = response.getEntity() ;
+ //org.apache.http.entity.ContentType ;
+ org.apache.http.entity.ContentType ct = org.apache.http.entity.ContentType.get(entity) ;
+ return ct.getMimeType() ;
+ }
}
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=1498081&r1=1498080&r2=1498081&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 Sun Jun 30 10:25:44 2013
@@ -30,6 +30,11 @@ public class TypedInputStreamHttp extend
{
private ClientConnectionManager connectMgr ;
+ TypedInputStreamHttp(InputStream input, String contentType, ClientConnectionManager connectMgr)
+ {
+ this(input, MediaType.create(contentType), connectMgr) ;
+ }
+
TypedInputStreamHttp(InputStream input, MediaType mt, ClientConnectionManager connectMgr)
{
super(input, mt.getContentType(), mt.getCharset(), null) ;