You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by ha...@apache.org on 2014/01/24 21:57:35 UTC
git commit: CLEREZZA-761: Fixed bug in SparqlPreParser in getting
referred graphs in describe-queries
Updated Branches:
refs/heads/master dab83e474 -> f9dd60554
CLEREZZA-761: Fixed bug in SparqlPreParser in getting referred graphs in describe-queries
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/f9dd6055
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/f9dd6055
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/f9dd6055
Branch: refs/heads/master
Commit: f9dd60554089d7582b1df42de8f8c2c5f8089850
Parents: dab83e4
Author: Hasan <ha...@apache.org>
Authored: Fri Jan 24 21:56:46 2014 +0100
Committer: Hasan <ha...@getunik.com>
Committed: Fri Jan 24 21:56:46 2014 +0100
----------------------------------------------------------------------
.../rdf/core/sparql/SparqlPreParser.java | 9 ++++++--
.../rdf/core/sparql/SparqlPreParserTest.java | 22 ++++++++++----------
2 files changed, 18 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f9dd6055/rdf.core/src/main/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParser.java
----------------------------------------------------------------------
diff --git a/rdf.core/src/main/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParser.java b/rdf.core/src/main/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParser.java
index c052991..a367642 100644
--- a/rdf.core/src/main/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParser.java
+++ b/rdf.core/src/main/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParser.java
@@ -82,8 +82,10 @@ public class SparqlPreParser {
referredGraphs = new HashSet<UriRef>();
}
GroupGraphPattern queryPattern = q.getQueryPattern();
- Set<GraphPattern> graphPatterns = queryPattern.getGraphPatterns();
- for (GraphPattern graphPattern : graphPatterns) {
+ if (queryPattern != null) {
+ Set<GraphPattern> graphPatterns = queryPattern.getGraphPatterns();
+ for (GraphPattern graphPattern : graphPatterns) {
+ }
}
// referringVariableNamedGraph = q.referringVariableNamedGraph();
referringVariableNamedGraph = referringVariableNamedGraph(q);
@@ -102,6 +104,9 @@ public class SparqlPreParser {
private boolean referringVariableNamedGraph(Query query) {
GroupGraphPattern queryPattern = query.getQueryPattern();
+ if (queryPattern == null) {
+ return false;
+ }
Set<GraphPattern> graphPatterns = queryPattern.getGraphPatterns();
return referringVariableNamedGraph(graphPatterns);
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f9dd6055/rdf.core/src/test/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParserTest.java
----------------------------------------------------------------------
diff --git a/rdf.core/src/test/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParserTest.java b/rdf.core/src/test/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParserTest.java
index 3b5bdbc..aeaa67f 100644
--- a/rdf.core/src/test/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParserTest.java
+++ b/rdf.core/src/test/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParserTest.java
@@ -92,6 +92,17 @@ public class SparqlPreParserTest {
}
@Test
+ public void testSimpleDescribe() throws ParseException {
+
+ String queryStr = "DESCRIBE <http://example.org/>";
+
+ SparqlPreParser parser;
+ parser = new SparqlPreParser(TcManager.getInstance());
+ Set<UriRef> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
+ }
+
+ @Test
public void testLoadingToDefaultGraph() throws ParseException {
String queryStr = "LOAD SILENT <http://example.org/mydata>";
@@ -156,17 +167,6 @@ public class SparqlPreParserTest {
Set<UriRef> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
-
- /*@Test
- public void testSimpleDescribe() throws ParseException {
-
- String queryStr = "DESCRIBE <http://example.org/>";
-
- SparqlPreParser parser;
- parser = new SparqlPreParser(TcManager.getInstance());
- Set<UriRef> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
- Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
- }*/
@Test
public void testDroppingNamedGraph() throws ParseException {