[49/50] jena git commit: Merge master

[andy]

Merge master


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d030947e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d030947e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d030947e

Branch: refs/heads/master
Commit: d030947e2038741e4c02867091d604db2211dcdb
Parents: 0bd45a5 123cf4c
Author: Andy Seaborne <a...@apache.org>
Authored: Sun Aug 23 16:54:46 2015 +0100
Committer: Andy Seaborne <a...@apache.org>
Committed: Sun Aug 23 16:54:46 2015 +0100

----------------------------------------------------------------------
 .../java/org/apache/jena/riot/RDFDataMgr.java   | 47 ++++++++++++++-
 .../java/org/apache/jena/riot/RiotReader.java   | 61 ++++----------------
 .../sparql/engine/http/QueryEngineHTTP.java     |  4 +-
 .../org/apache/jena/riot/TestRiotReader.java    |  8 +--
 .../AbstractNodeTupleInputFormatTests.java      |  9 +--
 jena-fuseki2/examples/jetty-fuseki.xml          | 48 ---------------
 6 files changed, 65 insertions(+), 112 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/d030947e/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java
----------------------------------------------------------------------
diff --cc 
jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java
index 933c8e7,e20efd2..46d7f7b
--- 
a/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java
+++ 
b/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java
@@@ -444,37 -433,12 +444,37 @@@ public class QueryEngineHTTP implement
          return model;
      }
  
 +    private Dataset execDataset(Dataset dataset) {
 +        Pair<InputStream, Lang> p = execConstructWorker(datasetContentType);
 +        InputStream in = p.getLeft() ;
 +        Lang lang = p.getRight() ;
 +        try { RDFDataMgr.read(dataset, in, lang); }
 +        finally { this.close(); }
 +        return dataset;
 +    }
 +
      private Iterator<Triple> execTriples() {
 +        Pair<InputStream, Lang> p = execConstructWorker(modelContentType) ;
 +        InputStream in = p.getLeft() ;
 +        Lang lang = p.getRight() ;
 +        // Base URI?
-         return RiotReader.createIteratorTriples(in, lang, null);
++        return RDFDataMgr.createIteratorTriples(in, lang, null);
 +    }
 +    
 +    private Iterator<Quad> execQuads() {
 +        Pair<InputStream, Lang> p = execConstructWorker(datasetContentType) ;
 +        InputStream in = p.getLeft() ;
 +        Lang lang = p.getRight() ;
 +        // Base URI?
-         return RiotReader.createIteratorQuads(in, lang, null);
++        return RDFDataMgr.createIteratorQuads(in, lang, null);
 +    }
 +
 +    private Pair<InputStream, Lang> execConstructWorker(String contentType) {
          checkNotClosed() ;
          HttpQuery httpQuery = makeHttpQuery();
 -        httpQuery.setAccept(modelContentType);
 +        httpQuery.setAccept(contentType);
          InputStream in = httpQuery.exec();
 -
 +        
          // Don't assume the endpoint actually gives back the content type we
          // asked for
          String actualContentType = httpQuery.getContentType();