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 2015/09/05 18:58:16 UTC
[1/4] jena git commit: Typo
Repository: jena
Updated Branches:
refs/heads/master 737098902 -> af1697aca
Typo
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0b8c50b4
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0b8c50b4
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0b8c50b4
Branch: refs/heads/master
Commit: 0b8c50b41ea945231b1890c3738ced0e75db976d
Parents: 7370989
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Sep 5 17:08:59 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Sep 5 17:08:59 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/jena/fuseki/servlets/ResponseModel.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/0b8c50b4/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java
index e46fbe6..831e42c 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java
@@ -37,7 +37,7 @@ import org.apache.jena.riot.RDFLanguages ;
import static org.apache.jena.riot.WebContent.* ;
import org.apache.jena.web.HttpSC ;
-// REPLACED by RssponseDataset
+// REPLACED by ResponseDataset
// Kept here in case we need to revert it (Aug 2015)
// Delete after release of Fusek 2.3.1 or earlier if specific confirmation
// the new code is OK.
[4/4] jena git commit: JENA-1022 : Handle models.
Posted by an...@apache.org.
JENA-1022 : Handle models.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/af1697ac
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/af1697ac
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/af1697ac
Branch: refs/heads/master
Commit: af1697aca1c0ea9dc9b55966baebb5ee755233d5
Parents: 06e1641
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Sep 5 17:57:38 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Sep 5 17:57:38 2015 +0100
----------------------------------------------------------------------
.../jena/fuseki/servlets/SPARQL_Query.java | 2 +-
.../java/org/apache/jena/fuseki/TestQuery.java | 41 +++++++++++++++++++-
2 files changed, 41 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/af1697ac/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
index 6d7e8a6..55225c9 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
@@ -382,7 +382,7 @@ public abstract class SPARQL_Query extends SPARQL_Protocol
// CONSTRUCT is processed as a extended CONSTRUCT - result is a dataset.
ResponseDataset.doResponseDataset(action, result.getDataset());
else if ( result.isModel() )
- // DESCRIBE rsults are models
+ // DESCRIBE results are models
ResponseDataset.doResponseModel(action, result.getModel());
else if ( result.isBoolean() )
ResponseResultSet.doResponseResultSet(action, result.getBooleanResult()) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/af1697ac/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestQuery.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestQuery.java b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestQuery.java
index dabe10d..08c837d 100644
--- a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestQuery.java
+++ b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestQuery.java
@@ -18,7 +18,12 @@
package org.apache.jena.fuseki ;
-import static org.apache.jena.fuseki.ServerTest.* ;
+import static org.apache.jena.fuseki.ServerTest.gn1 ;
+import static org.apache.jena.fuseki.ServerTest.gn2 ;
+import static org.apache.jena.fuseki.ServerTest.model1 ;
+import static org.apache.jena.fuseki.ServerTest.model2 ;
+import static org.apache.jena.fuseki.ServerTest.serviceQuery ;
+import static org.apache.jena.fuseki.ServerTest.serviceREST ;
import java.io.IOException ;
import java.net.HttpURLConnection ;
@@ -190,6 +195,24 @@ public class TestQuery extends BaseTest {
}
}
+ @Test
+ public void query_describe_01() {
+ String query = "DESCRIBE ?s WHERE {?s ?p ?o}" ;
+ try ( QueryExecution qExec = QueryExecutionFactory.sparqlService(serviceQuery, query) ) {
+ Model result = qExec.execDescribe();
+ assertFalse(result.isEmpty()) ;
+ }
+ }
+
+ @Test
+ public void query_describe_02() {
+ String query = "DESCRIBE <http://example/somethingelse> WHERE { }" ;
+ try ( QueryExecution qExec = QueryExecutionFactory.sparqlService(serviceQuery, query) ) {
+ Model result = qExec.execDescribe();
+ assertTrue(result.isEmpty()) ;
+ }
+ }
+
private static final AcceptList rdfOfferTest = DEF.rdfOffer ;
private static final AcceptList quadsOfferTest = DEF.quadsOffer ;
@@ -223,6 +246,22 @@ public class TestQuery extends BaseTest {
}
}
}
+
+ @Test
+ public void query_describe_conneg() {
+ String query = "DESCRIBE ?s WHERE {?s ?p ?o}" ;
+ for (MediaType type: rdfOfferTest.entries()){
+ String contentType = type.toHeaderString();
+ try ( QueryEngineHTTP qExec = (QueryEngineHTTP) QueryExecutionFactory.sparqlService(serviceQuery, query) ) {
+ qExec.setModelContentType( contentType );
+ Model m = qExec.execDescribe() ;
+ String x = qExec.getHttpResponseContentType() ;
+ assertEquals( contentType , x ) ;
+ assertFalse(m.isEmpty()) ;
+ }
+ }
+ }
+
private void execQuery(String queryString, int exceptedRowCount) {
QueryExecution qExec = QueryExecutionFactory.sparqlService(serviceQuery, queryString) ;
[2/4] jena git commit: DESCRIBE results are models;
CONSTRUCT results are datasets.
Posted by an...@apache.org.
DESCRIBE results are models; CONSTRUCT results are datasets.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a25376aa
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a25376aa
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a25376aa
Branch: refs/heads/master
Commit: a25376aa8d717ede9720270154def6af343a2e0c
Parents: 0b8c50b
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Sep 5 17:09:31 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Sep 5 17:09:31 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a25376aa/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
index c43b257..6d7e8a6 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
@@ -379,7 +379,11 @@ public abstract class SPARQL_Query extends SPARQL_Protocol
if ( result.isResultSet() )
ResponseResultSet.doResponseResultSet(action, result.getResultSet(), qPrologue) ;
else if ( result.isDataset() )
+ // CONSTRUCT is processed as a extended CONSTRUCT - result is a dataset.
ResponseDataset.doResponseDataset(action, result.getDataset());
+ else if ( result.isModel() )
+ // DESCRIBE rsults are models
+ ResponseDataset.doResponseModel(action, result.getModel());
else if ( result.isBoolean() )
ResponseResultSet.doResponseResultSet(action, result.getBooleanResult()) ;
else
[3/4] jena git commit: Add Model-based operation.
Posted by an...@apache.org.
Add Model-based operation.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/06e1641e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/06e1641e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/06e1641e
Branch: refs/heads/master
Commit: 06e1641e2ea214cf5526ef351755dc90f4202246
Parents: a25376a
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Sep 5 17:09:56 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Sep 5 17:09:56 2015 +0100
----------------------------------------------------------------------
.../org/apache/jena/fuseki/servlets/ResponseDataset.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/06e1641e/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseDataset.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseDataset.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseDataset.java
index f05331d..5a5c7ac 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseDataset.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseDataset.java
@@ -33,6 +33,8 @@ import org.apache.jena.fuseki.Fuseki;
import org.apache.jena.fuseki.conneg.ConNeg;
import org.apache.jena.fuseki.conneg.WebLib;
import org.apache.jena.query.Dataset;
+import org.apache.jena.query.DatasetFactory ;
+import org.apache.jena.rdf.model.Model ;
import org.apache.jena.riot.Lang;
import org.apache.jena.riot.RDFDataMgr;
import org.apache.jena.riot.RDFLanguages;
@@ -66,8 +68,12 @@ public class ResponseDataset
ResponseOps.put(shortNamesModel, contentOutputTriG, WebContent.contentTypeTriG) ;
}
- public static void doResponseDataset(HttpAction action, Dataset dataset)
- {
+ public static void doResponseModel(HttpAction action, Model model) {
+ Dataset ds = DatasetFactory.create(model) ;
+ ResponseDataset.doResponseDataset(action, ds);
+ }
+
+ public static void doResponseDataset(HttpAction action, Dataset dataset) {
HttpServletRequest request = action.request ;
HttpServletResponse response = action.response ;