Added parameters to query multiple end points

queries/endpoints.ttl

@@ -0,0 +1,12 @@
+@prefix :    <http://example.org#>.
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs:<http://www.w3.org/2000/01/rdf-schema#> .
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
+@prefix sd:  <http://www.w3.org/ns/sparql-service-description#> .
+
+
+_:dbpedia
+	a sd:Service;
+	sd:defaultGraph "http://dbpedia.org";
+	sd:endpoint "http://dbpedia.org/sparql";
+	sd:supportedLanguage "virtuoso".

src/main/java/nl/vu/queryfinder/ServiceExec.java

@@ -1,38 +1,51 @@
 package nl.vu.queryfinder;
 
-import java.io.FileNotFoundException;
-import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
+import nl.vu.queryfinder.model.Directory;
 import nl.vu.queryfinder.model.Query;
 import nl.vu.queryfinder.services.Service;
 import nl.vu.queryfinder.services.impl.Copy;
+import nl.vu.queryfinder.services.impl.SPARQLMatcher;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
 import org.apache.commons.cli.PosixParser;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFParseException;
 
 public class ServiceExec {
+	// The parameters given to the component
+	private final Map<String, String> parameters = new HashMap<String, String>();
 
 	/**
 	 * @param input
 	 * @param component
 	 * @return
-	 * @throws IOException
-	 * @throws RepositoryException
-	 * @throws RDFParseException
+	 * @throws Exception
 	 */
-	public Query process(String input, String component) throws RDFParseException, RepositoryException, IOException {
+	public Query process(String input, String component) throws Exception {
 		Query inputQuery = new Query();
 		inputQuery.loadFrom(input);
 
-		Service service = new Copy();
-		return service.process(inputQuery);
+		// If a component fail, we will return the input query
+		Query outputQuery = inputQuery;
+
+		if (component.equals("copy")) {
+			Service service = new Copy();
+			outputQuery = service.process(inputQuery);
+		}
+
+		if (component.equals("sparqlmatcher")) {
+			if (!parameters.containsKey("endpoints"))
+				throw new Exception("Requiered parameter is missing");
+			Directory directory = Directory.create(parameters.get("endpoints"));
+			Service service = new SPARQLMatcher(directory);
+			outputQuery = service.process(inputQuery);
+		}
+
+		return outputQuery;
 	}
 
 	/**
@@ -46,15 +59,9 @@ public static void printHelpAndExit(Options options, int exitCode) {
 
 	/**
 	 * @param args
-	 * @throws ParseException
-	 * @throws IOException
-	 * @throws FileNotFoundException
-	 * @throws RDFHandlerException
-	 * @throws RDFParseException
-	 * @throws RepositoryException
+	 * @throws Exception
 	 */
-	public static void main(String[] args) throws ParseException, RDFParseException, RDFHandlerException,
-			FileNotFoundException, IOException, RepositoryException {
+	public static void main(String[] args) throws Exception {
 		// Compose the options
 		Options options = new Options();
 		options.addOption("c", "component", true, "name of the processing component");
@@ -78,6 +85,16 @@ public static void main(String[] args) throws ParseException, RDFParseException,
 		// Create an instance
 		ServiceExec instance = new ServiceExec();
 
+		// Handle parameters
+		if (line.hasOption("p")) {
+			String[] params = line.getOptionValue("p").split("'");
+			for (String param : params) {
+				String[] keyvalue = param.split("=");
+				if (keyvalue.length == 2)
+					instance.parameters.put(keyvalue[0], keyvalue[1]);
+			}
+		}
+
 		// Process the input query and get the new one
 		Query newQuery = instance.process(line.getOptionValue("i"), line.getOptionValue("c"));
 

src/main/java/nl/vu/queryfinder/model/Directory.java

@@ -0,0 +1,30 @@
+/**
+ * 
+ */
+package nl.vu.queryfinder.model;
+
+import java.util.ArrayList;
+
+/**
+ * A directory is a collection of end points
+ * 
+ * @author Christophe Guéret <christophe.gueret@gmail.com>
+ * 
+ */
+public class Directory extends ArrayList<EndPoint> {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -7897336454073821165L;
+
+	/**
+	 * @param fileName
+	 * @return
+	 */
+	public static Directory create(String fileName) {
+		Directory directory = new Directory();
+
+		return directory;
+	}
+}

src/main/java/nl/vu/queryfinder/services/EndPoint.java → src/main/java/nl/vu/queryfinder/model/EndPoint.java

@@ -1,4 +1,4 @@
-package nl.vu.queryfinder.services;
+package nl.vu.queryfinder.model;
 
 import java.net.URI;
 
@@ -73,8 +73,8 @@ public String toString() {
 	 * @param uri
 	 * @param defaultGraph
 	 */
-	public EndPoint(URI uri, String defaultGraph, EndPointType type) {
-		this.uri = uri;
+	public EndPoint(String uri, String defaultGraph, EndPointType type) {
+		this.uri = URI.create(uri);
 		this.defaultGraph = defaultGraph;
 		this.type = type;
 	}