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 2012/08/13 22:31:50 UTC
svn commit: r1372588 - in
/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets:
SPARQL_Query.java SPARQL_QueryDataset.java SPARQL_QueryGeneral.java
Author: andy
Date: Mon Aug 13 20:31:49 2012
New Revision: 1372588
URL: http://svn.apache.org/viewvc?rev=1372588&view=rev
Log:
Warn about default-graph-uri being ignored on queries to hosted datasets.
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryDataset.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryGeneral.java
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java?rev=1372588&r1=1372587&r2=1372588&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java Mon Aug 13 20:31:49 2012
@@ -138,7 +138,8 @@ public abstract class SPARQL_Query exten
}
// All the params we support
- private static String[] params_ = { paramQuery, paramDefaultGraphURI, paramNamedGraphURI,
+ private static String[] params_1 = { paramQuery,
+ paramDefaultGraphURI, paramNamedGraphURI,
paramQueryRef,
paramStyleSheet,
paramAccept,
@@ -146,7 +147,19 @@ public abstract class SPARQL_Query exten
paramCallback,
paramForceAccept,
paramTimeout } ;
- protected static Set<String> allParams = new HashSet<String>(Arrays.asList(params_)) ;
+ private static String[] params_2 = { paramQuery,
+ // paramDefaultGraphURI, paramNamedGraphURI,
+ paramQueryRef,
+ paramStyleSheet,
+ paramAccept,
+ paramOutput1, paramOutput2,
+ paramCallback,
+ paramForceAccept,
+ paramTimeout } ;
+
+ protected static Set<String> allParams = new HashSet<String>(Arrays.asList(params_1)) ;
+ protected static Set<String> dsParams = new HashSet<String>(Arrays.asList(params_2)) ;
+
/** Called to validate arguments */
@Override
protected abstract void validate(HttpServletRequest request) ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryDataset.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryDataset.java?rev=1372588&r1=1372587&r2=1372588&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryDataset.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryDataset.java Mon Aug 13 20:31:49 2012
@@ -48,7 +48,7 @@ public class SPARQL_QueryDataset extends
errorNotFound("Service Description: "+request.getRequestURI()) ;
}
- validate(request, allParams) ;
+ validate(request, dsParams) ;
}
@Override
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryGeneral.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryGeneral.java?rev=1372588&r1=1372587&r2=1372588&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryGeneral.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryGeneral.java Mon Aug 13 20:31:49 2012
@@ -58,8 +58,7 @@ public class SPARQL_QueryGeneral extends
@Override
protected void validateQuery(HttpActionQuery action, Query query)
- {
- }
+ { }
@Override
protected String mapRequestToDataset(String uri)