You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2013/04/05 18:33:21 UTC
[4/6] git commit: query-prepasng only for get the type,
not passed to the service anymore due the potential issues could cause
query-prepasng only for get the type, not passed to the service anymore due the potential issues could cause
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/7b99a5b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/7b99a5b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/7b99a5b7
Branch: refs/heads/master
Commit: 7b99a5b7162f21ef1b5c206d86823200209a3844
Parents: 7150b1a
Author: Sergio Fernández <wi...@apache.org>
Authored: Fri Apr 5 14:14:33 2013 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Fri Apr 5 14:14:33 2013 +0200
----------------------------------------------------------------------
.../platform/sparql/api/sparql/SparqlService.java | 2 +-
.../sparql/services/sparql/SparqlServiceImpl.java | 4 +-
.../sparql/webservices/SparqlWebService.java | 45 +++++++--------
3 files changed, 25 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/7b99a5b7/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/api/sparql/SparqlService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/api/sparql/SparqlService.java b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/api/sparql/SparqlService.java
index 3a226b3..50f10b2 100644
--- a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/api/sparql/SparqlService.java
+++ b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/api/sparql/SparqlService.java
@@ -79,7 +79,7 @@ public interface SparqlService {
* @param format mimetype
* @throws MarmottaException
*/
- void query(Query query, OutputStream output, String format) throws MarmottaException;
+ void query(QueryLanguage language, String query, OutputStream output, String format) throws MarmottaException;
/**
* Evaluate a SPARQL ASK query on the KiWi TripleStore
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/7b99a5b7/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlServiceImpl.java b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlServiceImpl.java
index 93f0bff..2fd604c 100644
--- a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlServiceImpl.java
+++ b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlServiceImpl.java
@@ -127,7 +127,7 @@ public class SparqlServiceImpl implements SparqlService {
}
@Override
- public void query(Query query, OutputStream output, String format) throws MarmottaException {
+ public void query(QueryLanguage language, String query, OutputStream output, String format) throws MarmottaException {
long start = System.currentTimeMillis();
log.debug("executing SPARQL query:\n{}", query);
@@ -136,7 +136,7 @@ public class SparqlServiceImpl implements SparqlService {
RepositoryConnection connection = sesameService.getConnection();
try {
connection.begin();
- Query sparqlQuery = connection.prepareQuery(QueryLanguage.SPARQL, query.toString());
+ Query sparqlQuery = connection.prepareQuery(language, query);
if (sparqlQuery instanceof TupleQuery) {
query((TupleQuery)sparqlQuery, output, format);
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/7b99a5b7/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java
index 56dd26a..ec827e5 100644
--- a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java
+++ b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java
@@ -59,7 +59,6 @@ import org.openrdf.query.BooleanQuery;
import org.openrdf.query.GraphQuery;
import org.openrdf.query.MalformedQueryException;
import org.openrdf.query.Query;
-import org.openrdf.query.QueryEvaluationException;
import org.openrdf.query.QueryLanguage;
import org.openrdf.query.TupleQuery;
import org.openrdf.query.UpdateExecutionException;
@@ -180,7 +179,7 @@ public class SparqlWebService {
format = resultType; //FIXME: validate?
}
- return buildQueryResponse(format, sparqlQuery);
+ return buildQueryResponse(format, query);
} catch (RepositoryException e) {
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).build();
@@ -490,38 +489,38 @@ public class SparqlWebService {
return params;
}
- private Response buildQueryResponse(final String resultType, final String query) throws Exception {
- StreamingOutput entity = new StreamingOutput() {
- @Override
- public void write(OutputStream output) throws IOException, WebApplicationException {
- try {
- sparqlService.query(QueryLanguage.SPARQL, query, SparqlWritersHelper.getTupleResultWriter(resultType, output), SparqlWritersHelper.getBooleanResultWriter(resultType, output), SparqlWritersHelper.getGraphResultWriter(resultType, output));
- } catch (MarmottaException ex) {
- throw new WebApplicationException(ex.getCause(), Response.status(Response.Status.BAD_REQUEST).entity(WebServiceUtil.jsonErrorResponse(ex)).build());
- } catch (QueryEvaluationException e) {
- throw new WebApplicationException(e.getCause(), Response.status(Response.Status.BAD_REQUEST).entity(WebServiceUtil.jsonErrorResponse(e)).build());
- } catch (MalformedQueryException e) {
- throw new WebApplicationException(e.getCause(), Response.status(Response.Status.BAD_REQUEST).entity(WebServiceUtil.jsonErrorResponse(e)).build());
- }
- }
- };
-
- return Response.ok().entity(entity).header("Content-Type", SparqlWritersHelper.buildSparqlContentType(resultType)).build();
- }
+// private Response buildQueryResponse(final String resultType, final String query) throws Exception {
+// StreamingOutput entity = new StreamingOutput() {
+// @Override
+// public void write(OutputStream output) throws IOException, WebApplicationException {
+// try {
+// sparqlService.query(QueryLanguage.SPARQL, query, SparqlWritersHelper.getTupleResultWriter(resultType, output), SparqlWritersHelper.getBooleanResultWriter(resultType, output), SparqlWritersHelper.getGraphResultWriter(resultType, output));
+// } catch (MarmottaException ex) {
+// throw new WebApplicationException(ex.getCause(), Response.status(Response.Status.BAD_REQUEST).entity(WebServiceUtil.jsonErrorResponse(ex)).build());
+// } catch (QueryEvaluationException e) {
+// throw new WebApplicationException(e.getCause(), Response.status(Response.Status.BAD_REQUEST).entity(WebServiceUtil.jsonErrorResponse(e)).build());
+// } catch (MalformedQueryException e) {
+// throw new WebApplicationException(e.getCause(), Response.status(Response.Status.BAD_REQUEST).entity(WebServiceUtil.jsonErrorResponse(e)).build());
+// }
+// }
+// };
+//
+// return Response.ok().entity(entity).header("Content-Type", SparqlWritersHelper.buildSparqlContentType(resultType)).build();
+// }
- private Response buildQueryResponse(final String resultType, final Query query) throws Exception {
+ private Response buildQueryResponse(final String format, final String query) throws Exception {
StreamingOutput entity = new StreamingOutput() {
@Override
public void write(OutputStream output) throws IOException, WebApplicationException {
try {
- sparqlService.query(query, output, resultType);
+ sparqlService.query(QueryLanguage.SPARQL, query, output, format);
} catch (MarmottaException e) {
throw new WebApplicationException(e.getCause(), Response.status(Response.Status.BAD_REQUEST).entity(WebServiceUtil.jsonErrorResponse(e)).build());
}
}
};
- return Response.ok().entity(entity).header("Content-Type", SparqlWritersHelper.buildSparqlContentType(resultType)).build();
+ return Response.ok().entity(entity).header("Content-Type", SparqlWritersHelper.buildSparqlContentType(format)).build();
}
}