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 2011/08/31 23:31:19 UTC
svn commit: r1163831 - in
/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets:
SPARQL_QueryDataset.java SPARQL_QueryGeneral.java
Author: andy
Date: Wed Aug 31 21:31:18 2011
New Revision: 1163831
URL: http://svn.apache.org/viewvc?rev=1163831&view=rev
Log:
Tidy up
Modified:
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_QueryDataset.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_QueryGeneral.java
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_QueryDataset.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_QueryDataset.java?rev=1163831&r1=1163830&r2=1163831&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_QueryDataset.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_QueryDataset.java Wed Aug 31 21:31:18 2011
@@ -49,18 +49,6 @@ public class SPARQL_QueryDataset extends
static String[] tails = { HttpNames.ServiceQuery, HttpNames.ServiceQueryAlt } ;
- @Override
- protected String mapRequestToDataset(String uri)
- {
- for ( String tail : tails )
- {
- String x = mapRequestToDataset(uri, tail) ;
- if ( x != null )
- return x ;
- }
- return uri ;
- }
-
// All the params we support
private static String[] params_ = { paramQuery,
//paramDefaultGraphURI, paramNamedGraphURI, -- only a fixed dataset
@@ -92,6 +80,18 @@ public class SPARQL_QueryDataset extends
}
@Override
+ protected String mapRequestToDataset(String uri)
+ {
+ for ( String tail : tails )
+ {
+ String x = mapRequestToDataset(uri, tail) ;
+ if ( x != null )
+ return x ;
+ }
+ return uri ;
+ }
+
+ @Override
protected boolean requestNoQueryString(HttpServletRequest request, HttpServletResponse response)
{
if ( HttpNames.METHOD_POST.equals(request.getMethod().toUpperCase()) )
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_QueryGeneral.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_QueryGeneral.java?rev=1163831&r1=1163830&r2=1163831&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_QueryGeneral.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_QueryGeneral.java Wed Aug 31 21:31:18 2011
@@ -86,13 +86,6 @@ public class SPARQL_QueryGeneral extends
}
@Override
- protected boolean requestNoQueryString(HttpServletRequest request, HttpServletResponse response)
- {
- errorBadRequest("No query string given") ;
- return false ;
- }
-
- @Override
protected String mapRequestToDataset(String uri)
{ return null ; }
@@ -107,6 +100,13 @@ public class SPARQL_QueryGeneral extends
return ds ;
}
+ @Override
+ protected boolean requestNoQueryString(HttpServletRequest request, HttpServletResponse response)
+ {
+ errorBadRequest("No query string given") ;
+ return false ;
+ }
+
private boolean datasetInProtocol(HttpServletRequest request)
{
String d = request.getParameter(paramDefaultGraphURI) ;