You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by rw...@apache.org on 2014/05/09 07:03:48 UTC
svn commit: r1593488 - in
/stanbol/branches/release-0.12/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql:
SparqlEndpointWebFragment.java resource/SparqlEndpointResource.java
Author: rwesten
Date: Fri May 9 05:03:47 2014
New Revision: 1593488
URL: http://svn.apache.org/r1593488
Log:
STANBOL-1324: updated code to avoid usage of deprecated API after clerezza dependency version upgrade
Modified:
stanbol/branches/release-0.12/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/SparqlEndpointWebFragment.java
stanbol/branches/release-0.12/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/resource/SparqlEndpointResource.java
Modified: stanbol/branches/release-0.12/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/SparqlEndpointWebFragment.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/SparqlEndpointWebFragment.java?rev=1593488&r1=1593487&r2=1593488&view=diff
==============================================================================
--- stanbol/branches/release-0.12/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/SparqlEndpointWebFragment.java (original)
+++ stanbol/branches/release-0.12/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/SparqlEndpointWebFragment.java Fri May 9 05:03:47 2014
@@ -46,7 +46,7 @@ public class SparqlEndpointWebFragment i
private static final String NAME = "sparql";
- private BundleContext bundleContext;
+ //private BundleContext bundleContext;
private String htmlDescription = "This is the <strong>SPARQL endpoint</strong> for the Stanbol store."+
"<a href=\"http://en.wikipedia.org/wiki/Sparql\">SPARQL</a> is the"+
@@ -58,10 +58,10 @@ public class SparqlEndpointWebFragment i
return NAME;
}
- @Activate
- protected void activate(ComponentContext ctx) {
- this.bundleContext = ctx.getBundleContext();
- }
+// @Activate
+// protected void activate(ComponentContext ctx) {
+// this.bundleContext = ctx.getBundleContext();
+// }
@Override
public Set<Class<?>> getJaxrsResourceClasses() {
Modified: stanbol/branches/release-0.12/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/resource/SparqlEndpointResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/resource/SparqlEndpointResource.java?rev=1593488&r1=1593487&r2=1593488&view=diff
==============================================================================
--- stanbol/branches/release-0.12/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/resource/SparqlEndpointResource.java (original)
+++ stanbol/branches/release-0.12/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/resource/SparqlEndpointResource.java Fri May 9 05:03:47 2014
@@ -140,26 +140,32 @@ public class SparqlEndpointResource exte
@Produces({TEXT_HTML + ";qs=2", "application/sparql-results+xml", "application/rdf+xml"})
public Response sparql(@QueryParam(value = "graphuri") String graphUri,
@QueryParam(value = "query") String sparqlQuery,
- @Context HttpHeaders headers) throws ParseException, InvalidSyntaxException {
+ @Context HttpHeaders headers) throws InvalidSyntaxException {
if (sparqlQuery == null) {
populateTripleCollectionList(getServices(null));
return Response.ok(new Viewable("index", this), TEXT_HTML).build();
}
- Query query = QueryParser.getInstance().parse(sparqlQuery);
- String mediaType = "application/sparql-results+xml";
- if (query instanceof DescribeQuery || query instanceof ConstructQuery) {
- mediaType = "application/rdf+xml";
- }
-
- TripleCollection tripleCollection = getTripleCollection(graphUri);
ResponseBuilder rb;
- if (tripleCollection != null) {
- Object result = tcManager.executeSparqlQuery(query, tripleCollection);
- rb = Response.ok(result, mediaType);
- } else {
- rb = Response.status(Status.NOT_FOUND).entity(
- String.format("There is no registered graph with given uri: %s", graphUri));
+ Query query;
+ try {
+ query = QueryParser.getInstance().parse(sparqlQuery);
+ String mediaType = "application/sparql-results+xml";
+ if (query instanceof DescribeQuery || query instanceof ConstructQuery) {
+ mediaType = "application/rdf+xml";
+ }
+
+ TripleCollection tripleCollection = getTripleCollection(graphUri);
+ if (tripleCollection != null) {
+ Object result = tcManager.executeSparqlQuery(query, tripleCollection);
+ rb = Response.ok(result, mediaType);
+ } else {
+ rb = Response.status(Status.NOT_FOUND).entity(
+ String.format("There is no registered graph with given uri: %s", graphUri));
+ }
+ } catch (ParseException e) {
+ rb = Response.status(Response.Status.BAD_REQUEST)
+ .entity(e.getMessage());
}
addCORSOrigin(servletContext, rb, headers);
return rb.build();
@@ -174,7 +180,7 @@ public class SparqlEndpointResource exte
@Produces({"application/sparql-results+xml", "application/rdf+xml"})
public Response postSparql(@FormParam("graphuri") String graphUri,
@FormParam("query") String sparqlQuery,
- @Context HttpHeaders headers) throws ParseException, InvalidSyntaxException {
+ @Context HttpHeaders headers) throws InvalidSyntaxException {
return sparql(graphUri, sparqlQuery, headers);
}