svn commit: r1506106 - in /jena/trunk/jena-arq/src/main/java/org/apache/jena: riot/WebContent.java web/DatasetGraphAccessorHTTP.java

[andy]

Author: andy
Date: Tue Jul 23 15:21:58 2013
New Revision: 1506106

URL: http://svn.apache.org/r1506106
Log:
JENA-481

Default accept header for reading graphs to prefer Turtle (RDFDataMgr, 
LocatorURL)
but use more efficient N-Triples for fetching graphs for 
DatasetGraphAccessorHTTP.

Modified:
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java
    
jena/trunk/jena-arq/src/main/java/org/apache/jena/web/DatasetGraphAccessorHTTP.java

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=1506106&r1=1506105&r2=1506106&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 Tue 
Jul 23 15:21:58 2013
@@ -124,12 +124,12 @@ public class WebContent
     }
 
     /** Accept header part when looking for a graph */
-    private static final String defaultGraphAccept          =  
"application/n-triples,text/turtle;q=0.9,application/rdf+xml;q=0.8,application/xml;q=0.7"
 ;
+    private static final String defaultGraphAccept          =  
"text/turtle,application/n-triples;q=0.9,application/rdf+xml;q=0.8,application/xml;q=0.7"
 ;
     /** Accept header when looking for a graph */
     public static final String defaultGraphAcceptHeader     =  
defaultGraphAccept+",*/*;q=0.5" ; 
 
     /** Accept header part when looking for a dataset */
-    public static final String defaultDatasetAccept         =  
"application/n-quads,text/x-nquads;q=0.9;application/trig;q=0.8,application/x-trig;q=0.7"
 ;
+    public static final String defaultDatasetAccept         =  
"application/trig,application/n-quads;q=0.9,text/x-nquads;q=0.8,application/x-trig;q=0.7"
 ;
     /** Accept header when looking for a dataset */
     public static final String defaultDatasetAcceptHeader   =  
defaultDatasetAccept+",*/*;q=0.5" ;
     

Modified: 
jena/trunk/jena-arq/src/main/java/org/apache/jena/web/DatasetGraphAccessorHTTP.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/web/DatasetGraphAccessorHTTP.java?rev=1506106&r1=1506105&r2=1506106&view=diff
==============================================================================
--- 
jena/trunk/jena-arq/src/main/java/org/apache/jena/web/DatasetGraphAccessorHTTP.java
 (original)
+++ 
jena/trunk/jena-arq/src/main/java/org/apache/jena/web/DatasetGraphAccessorHTTP.java
 Tue Jul 23 15:21:58 2013
@@ -99,12 +99,18 @@ public class DatasetGraphAccessorHTTP im
 
     @Override
     public Graph httpGet(Node graphName)              { return 
doGet(target(graphName)) ; }
+    
+    /** Accept header for fetching graphs - prefer N-triples
+     * @See WebContent.defaultGraphAcceptHeader 
+     *  
+     */
+    private static String GetAcceptHeader = 
"application/n-triples,text/turtle;q=0.9,application/rdf+xml;q=0.8,application/xml;q=0.7"
 ;
     
     private Graph doGet(String url)
     {
         HttpCaptureResponse<Graph> graph = HttpResponseLib.graphHandler() ;
         try {
-            HttpOp.execHttpGet(url, WebContent.defaultGraphAcceptHeader, 
graph, this.authenticator) ;
+            HttpOp.execHttpGet(url, GetAcceptHeader, graph, 
this.authenticator) ;
         } catch (HttpException ex) {
             if ( ex.getResponseCode() == HttpSC.NOT_FOUND_404 )
                 return null ;