Created new module sparql, externalized related classes and tests fro…

…m module basil. See #5

basil/pom.xml

@@ -165,6 +165,11 @@
 			<artifactId>rendering</artifactId>
 			<version>${basil.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>io.github.basilapi</groupId>
+			<artifactId>sparql</artifactId>
+			<version>${basil.version}</version>
+		</dependency>
 	</dependencies>
 
 </project>

basil/src/test/java/io/github/basilapi/basil/TestUtils.java

@@ -0,0 +1,41 @@
+package io.github.basilapi.basil;
+
+import io.github.basilapi.basil.sparql.QueryParameter;
+import io.github.basilapi.basil.sparql.Specification;
+import io.github.basilapi.basil.sparql.SpecificationFactory;
+import io.github.basilapi.basil.sparql.UnknownQueryTypeException;
+import org.apache.commons.io.IOUtils;
+
+import java.io.IOException;
+
+public class TestUtils {
+//
+	public static String loadQueryString(String qname) throws IOException {
+		return IOUtils.toString(TestUtils.class.getClassLoader().getResourceAsStream("./sparql/" + qname + ".txt"),
+				"UTF-8");
+	}
+//
+	public static String endpoint(String qname) {
+		int pos = qname.indexOf("X-Basil-Endpoint:");
+		int len = ("X-Basil-Endpoint:").length();
+		int eol = qname.indexOf('\n', pos);
+		return qname.substring(pos + len, eol).trim();
+	}
+//
+	public static Specification loadQuery(String fileName) throws IOException {
+		String sparql = loadQueryString(fileName);
+		String endpoint = endpoint(sparql);
+		// System.out.println(endpoint);
+		try {
+			return SpecificationFactory.create(endpoint, sparql);
+		} catch (UnknownQueryTypeException e) {
+			throw new IOException(e);
+		}
+	}
+
+
+	public static String loadTemplate(String type, String qname) throws IOException {
+		return IOUtils.toString(
+				TestUtils.class.getClassLoader().getResourceAsStream("./" + type + "/" + qname + ".tmpl"), "UTF-8");
+	}
+}

basil/src/test/java/io/github/basilapi/basil/store/FileStoreTest.java

@@ -9,7 +9,7 @@
 import java.util.List;
 import java.util.Set;
 
-import io.github.basilapi.basil.sparql.TestUtils;
+import io.github.basilapi.basil.TestUtils;
 import org.apache.commons.io.FileUtils;
 import org.junit.Assert;
 import org.junit.Before;
@@ -55,7 +55,7 @@ public void before() throws IOException {
 	@Test
 	public void serializeQueryParameter() throws IOException,
 			ClassNotFoundException {
-		QueryParameter param = TestUtils.buildQueryParameter("param1",
+		QueryParameter param = QueryParameter.buildQueryParameter("param1",
 				Type.LangedLiteral, "en", null);
 		store.write(testName.getMethodName(), param, "qp");
 		QueryParameter param2 = (QueryParameter) store.read(

basil/src/test/java/io/github/basilapi/basil/test/ConfigTest.java

@@ -1,6 +1,6 @@
 package io.github.basilapi.basil.test;
 
-import io.github.basilapi.basil.sparql.TestUtils;
+import io.github.basilapi.basil.TestUtils;
 import org.apache.shiro.config.Ini;
 import org.junit.Assert;
 import org.junit.Before;

basil/src/test/java/io/github/basilapi/basil/view/JavascriptTest.java

@@ -9,7 +9,7 @@
 import java.util.List;
 import java.util.Map;
 
-import io.github.basilapi.basil.sparql.TestUtils;
+import io.github.basilapi.basil.TestUtils;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;

basil/src/test/java/io/github/basilapi/basil/view/MustacheTest.java

@@ -9,7 +9,7 @@
 import java.util.List;
 import java.util.Map;
 
-import io.github.basilapi.basil.sparql.TestUtils;
+import io.github.basilapi.basil.TestUtils;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;

parent/pom.xml

@@ -30,13 +30,14 @@
 
 		<!-- github server corresponds to entry in ~/.m2/settings.xml -->
 		<github.global.server>github</github.global.server>
+		<localRepo>file://${project.build.directory}/mvn-repo</localRepo>
 	</properties>
 
 	<distributionManagement>
 		<repository>
 			<id>internal.repo</id>
 			<name>Temporary Staging Repository</name>
-			<url>file://${project.build.directory}/mvn-repo</url>
+			<url>${localRepo}</url>
 		</repository>
 	</distributionManagement>
 
@@ -294,7 +295,7 @@
 					<artifactId>maven-deploy-plugin</artifactId>
 					<version>2.8.1</version>
 					<configuration>
-						<altDeploymentRepository>internal.repo::default::file://${project.build.directory}/mvn-repo</altDeploymentRepository>
+						<altDeploymentRepository>internal.repo::default::${localRepo}</altDeploymentRepository>
 					</configuration>
 				</plugin>
 

pom.xml

@@ -20,6 +20,7 @@
 		<module>rendering</module>
 		<module>basil</module>
 		<module>server</module>
+		<module>sparql</module>
 	</modules>
 	<profiles>
 		<profile>

sparql/pom.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>reactor</artifactId>
+        <groupId>io.github.basilapi</groupId>
+        <version>0.8.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>sparql</artifactId>
+    <name>BASIL :: SPARQL</name>
+
+
+    <dependencies>
+
+        <!-- Logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+
+        <!-- Test -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.apache.jena</groupId>
+            <artifactId>jena-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.jena</groupId>
+            <artifactId>jena-arq</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+</project>

basil/src/main/java/io/github/basilapi/basil/sparql/QueryParameter.java → sparql/src/main/java/io/github/basilapi/basil/sparql/QueryParameter.java

@@ -186,4 +186,19 @@ public void setNumber() {
 		this.datatype = null;
 		this.lang = null;
 	}
+
+	public static QueryParameter buildQueryParameter(String name, QueryParameter.Type type, String lang, String datatype) {
+		QueryParameter qp = new QueryParameter();
+		qp.setName(name);
+		if (type == Type.IRI) {
+			qp.setIri();
+		} else if (type == Type.TypedLiteral) {
+			qp.setDatatype(datatype);
+		} else if (type == Type.LangedLiteral) {
+			qp.setLang(lang);
+		} else if (type == Type.PlainLiteral) {
+			qp.setPlainLiteral();
+		}
+		return qp;
+	}
 }

basil/src/test/java/io/github/basilapi/basil/sparql/TestUtils.java → sparql/src/test/java/io/github/basilapi/basil/sparql/TestUtils.java

@@ -1,7 +1,7 @@
 package io.github.basilapi.basil.sparql;
 
 import org.apache.commons.io.IOUtils;
-import io.github.basilapi.basil.rest.core.Headers;
+//import io.github.basilapi.basil.rest.core.Headers;
 import io.github.basilapi.basil.sparql.QueryParameter.Type;
 
 import java.io.IOException;
@@ -14,8 +14,8 @@ public static String loadQueryString(String qname) throws IOException {
 	}
 
 	public static String endpoint(String qname) {
-		int pos = qname.indexOf(Headers.Endpoint + ":");
-		int len = (Headers.Endpoint + ":").length();
+		int pos = qname.indexOf("X-Basil-Endpoint:");
+		int len = ("X-Basil-Endpoint:").length();
 		int eol = qname.indexOf('\n', pos);
 		return qname.substring(pos + len, eol).trim();
 	}

sparql/src/test/resources/sparql/ask_1.txt

@@ -0,0 +1,10 @@
+# X-Basil-Endpoint: http://data.open.ac.uk/sparql
+PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+PREFIX mlo: <http://purl.org/net/mlo/> 
+PREFIX aiiso: <http://purl.org/vocab/aiiso/schema#> 
+
+# Eg value for ?_geoid 2328926
+ASK {
+ BIND(iri(CONCAT('http://sws.geonames.org/',?_geoid,'/')) as ?location) .
+ ?course mlo:location ?location . ?course a aiiso:Module 
+}

sparql/src/test/resources/sparql/construct_1.txt

@@ -0,0 +1,12 @@
+# X-Basil-Endpoint: http://data.open.ac.uk/sparql
+PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+PREFIX mlo: <http://purl.org/net/mlo/> 
+PREFIX aiiso: <http://purl.org/vocab/aiiso/schema#> 
+
+# Eg value for ?_geoid 2328926
+CONSTRUCT {
+?course mlo:location ?location . ?course a aiiso:Module 
+}WHERE{
+ BIND(iri(CONCAT('http://sws.geonames.org/',?_geoid,'/')) as ?location) .
+ ?course mlo:location ?location . ?course a aiiso:Module 
+}

sparql/src/test/resources/sparql/delete_1.txt

@@ -0,0 +1,7 @@
+PREFIX dc: <http://purl.org/dc/elements/1.1/>
+
+DELETE DATA
+{
+  <http://example/book2> dc:title ?_title ;
+                         dc:creator ?_creator .
+}

sparql/src/test/resources/sparql/delete_2.txt

@@ -0,0 +1,10 @@
+PREFIX dc:  <http://purl.org/dc/elements/1.1/>
+PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+
+DELETE
+ { ?book ?p ?v }
+WHERE
+ { ?book dc:date ?date .
+   FILTER ( ?date > ?_date_dateTime )
+   ?book ?p ?v
+ }

sparql/src/test/resources/sparql/delete_3.txt

@@ -0,0 +1,5 @@
+PREFIX foaf:  <http://xmlns.com/foaf/0.1/>
+
+WITH <http://example/addresses>
+DELETE { ?person ?property ?value } 
+WHERE { ?person ?property ?value ; foaf:givenName ?_givenName ; rdfs:label "$This $is ?not a ?_variable" } 

sparql/src/test/resources/sparql/delete_insert_1.txt

@@ -0,0 +1,7 @@
+PREFIX dc: <http://purl.org/dc/elements/1.1/>
+DELETE DATA
+{ GRAPH <http://example/bookStore> { <http://example/book1>  dc:title  ?_delete } } ;
+
+PREFIX dc: <http://purl.org/dc/elements/1.1/>
+INSERT DATA
+{ GRAPH <http://example/bookStore> { <http://example/book1>  dc:title  ?_insert } }

sparql/src/test/resources/sparql/delete_insert_2.txt

@@ -0,0 +1,7 @@
+PREFIX foaf:  <http://xmlns.com/foaf/0.1/>
+
+WITH <http://example/addresses>
+DELETE { ?person foaf:givenName ?_delete }
+INSERT { ?person foaf:givenName ?_insert }
+WHERE
+  { ?person foaf:givenName ?_delete } 

sparql/src/test/resources/sparql/insert_1.txt

@@ -0,0 +1,3 @@
+# X-Basil-Endpoint: http://data.open.ac.uk/sparql
+PREFIX dc: <http://purl.org/dc/elements/1.1/> 
+INSERT { <http://example/egbook> dc:title  ?_title } WHERE {}

sparql/src/test/resources/sparql/insert_2.txt

@@ -0,0 +1,6 @@
+PREFIX dc: <http://purl.org/dc/elements/1.1/>
+INSERT DATA
+{ 
+  <http://example/book1> dc:title ?_title_string ;
+                         dc:creator ?_creator .
+}

sparql/src/test/resources/sparql/insert_3.txt

@@ -0,0 +1,4 @@
+PREFIX dc: <http://purl.org/dc/elements/1.1/>
+PREFIX ns: <http://example.org/ns#>
+INSERT DATA
+{ GRAPH <http://example/bookStore> { <http://example/book1>  ns:price  ?_price_number } }

sparql/src/test/resources/sparql/insert_4.txt

@@ -0,0 +1,11 @@
+PREFIX dc:  <http://purl.org/dc/elements/1.1/>
+PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+
+INSERT 
+  { GRAPH ?_target_iri { ?book ?p ?v } }
+WHERE
+  { GRAPH  <http://example/bookStore>
+       { ?book dc:date ?date .
+         FILTER ( ?date > ?_date_dateTime )
+         ?book ?p ?v
+  } }	

sparql/src/test/resources/sparql/select_1.txt

@@ -0,0 +1,11 @@
+# X-Basil-Endpoint: http://data.open.ac.uk/sparql
+PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+PREFIX mlo: <http://purl.org/net/mlo/> 
+PREFIX aiiso: <http://purl.org/vocab/aiiso/schema#> 
+
+# Eg value for ?_geoid 2328926
+SELECT ?course FROM <http://data.open.ac.uk/context/course> 
+WHERE {
+ BIND(iri(CONCAT('http://sws.geonames.org/',?_geoid,'/')) as ?location) .
+ ?course mlo:location ?location . ?course a aiiso:Module 
+} 

sparql/src/test/resources/sparql/select_10.txt

@@ -0,0 +1,11 @@
+# X-Basil-Endpoint: http://dbpedia.org/sparql
+
+PREFIX some: <http://www.example.com/insert#> .
+
+select ?subject ?label ?nationality where {
+  ?subject a <http://dbpedia.org/ontology/Person> ;
+    <http://www.w3.org/2000/01/rdf-schema#label> ?label ;
+    <http://dbpedia.org/property/dateOfBirth> ?_year_number ;
+    <http://dbpedia.org/ontology/nationality> ?nationality .
+    filter(lang(?label)="en")
+    }

sparql/src/test/resources/sparql/select_11.txt

@@ -0,0 +1,15 @@
+# X-Basil-Endpoint: http://dbpedia.org/sparql
+
+   # a DELETE command should be considered in a comment
+
+	select
+
+	?insert ?subject ?label ?nationality where { # insert a comment here
+
+
+  	?subject a <http://dbpedia.org/ontology/Person> ;
+    		<http://www.w3.org/2000/01/rdf-schema#label> ?label ;
+    <http://dbpedia.org/property/dateOfBirth> ?_year_number ;
+    <http://dbpedia.org/ontology/nationality> ?nationality .
+    filter(lang(?label)="en")
+    }

sparql/src/test/resources/sparql/select_12.txt

@@ -0,0 +1,9 @@
+# X-Basil-Endpoint: http://dbpedia.org/sparql
+select ?subject ?label ?nationality where {
+  ?subject a <http://dbpedia.org/ontology/Person> ;
+    <http://www.w3.org/2000/01/rdf-schema#label> ?label ;
+    <http://dbpedia.org/property/dateOfBirth> 1964 ;
+    <http://dbpedia.org/ontology/nationality> ?nationality .
+    filter(lang(?label)="en")
+    }
+LIMIT ?_limit_number

sparql/src/test/resources/sparql/select_13.txt

@@ -0,0 +1,10 @@
+# X-Basil-Endpoint: http://dbpedia.org/sparql
+select ?subject ?label ?nationality where {
+  ?subject a <http://dbpedia.org/ontology/Person> ;
+    <http://www.w3.org/2000/01/rdf-schema#label> ?label ;
+    <http://dbpedia.org/property/dateOfBirth> 1964 ;
+    <http://dbpedia.org/ontology/nationality> ?nationality .
+    filter(lang(?label)="en")
+    }
+LIMIT ?_limit_number
+OFFSET ?_offset_number