Rework query handling

.gitignore

@@ -108,14 +108,14 @@ local.properties
 # When using Gradle or Maven with auto-import, you should exclude module files,
 # since they will be recreated, and may cause churn.  Uncomment if using
 # auto-import.
-# .idea/artifacts
-# .idea/compiler.xml
-# .idea/jarRepositories.xml
-# .idea/modules.xml
-# .idea/*.iml
-# .idea/modules
-# *.iml
-# *.ipr
+.idea/artifacts
+.idea/compiler.xml
+.idea/jarRepositories.xml
+.idea/modules.xml
+.idea/*.iml
+.idea/modules
+*.iml
+*.ipr
 
 # CMake
 cmake-build-*/

iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/IguanaConfig.java

@@ -36,7 +36,6 @@
  * Further on executes the pre and post script hooks, before and after a class.
  * Following values will be exchanged in the script string {{Connection}} {{Dataset.name}} {{Dataset.file}} {{taskID}}
  * 
- * 
  * @author f.conrads
  *
  */
@@ -45,20 +44,19 @@ public class IguanaConfig {
 	private static final Logger LOGGER = LoggerFactory
 			.getLogger(IguanaConfig.class);
 
-	private String suiteID;
 	@JsonProperty(required = true)
 	private List<Dataset> datasets;
 	@JsonProperty(required = true)
 	private List<Connection> connections;
 	@JsonProperty(required = true)
 	private List<Task> tasks;
-	@JsonProperty(required = false)
+	@JsonProperty()
 	private String preScriptHook;
-	@JsonProperty(required = false)
+	@JsonProperty()
 	private String postScriptHook;
-	@JsonProperty(required = false)
+	@JsonProperty()
 	private List<MetricConfig> metrics;
-	@JsonProperty(required = false)
+	@JsonProperty()
 	private List<StorageConfig> storages;
 
 
@@ -73,7 +71,7 @@ public void start() throws ExecuteException, IOException {
 		//get SuiteID
 		String suiteID = generateSuiteID();
 		//generate ExpID
-		Integer expID = 0;
+		int expID = 0;
 
 		for(Dataset dataset: datasets){
 			expID++;
@@ -96,7 +94,7 @@ public void start() throws ExecuteException, IOException {
 						ScriptExecutor.execSafe(execScript, args);
 					}
 					LOGGER.info("Executing Task [{}/{}: {}, {}, {}]", taskID, task.getName(), dataset.getName(), con.getName(), task.getClassName());
-					controller.startTask(new String[]{suiteID, suiteID+"/"+expID.toString(), suiteID+"/"+expID.toString()+"/"+taskID.toString()}, dataset.getName(), SerializationUtils.clone(con), SerializationUtils.clone(task));
+					controller.startTask(new String[]{suiteID, suiteID + "/" + expID, suiteID + "/" + expID + "/" + taskID}, dataset.getName(), SerializationUtils.clone(con), SerializationUtils.clone(task));
 					if(postScriptHook!=null){
 						String execScript = postScriptHook.replace("{{dataset.name}}", dataset.getName())
 								.replace("{{connection}}", con.getName())
@@ -133,7 +131,7 @@ private RPController initResultProcessor() {
 			metrics.add(config);
 			config = new MetricConfig();
 			config.setClassName(QPSMetric.class.getCanonicalName());
-			Map<Object, Object> configMap = new HashMap<Object, Object>();
+			Map<Object, Object> configMap = new HashMap<>();
 			configMap.put("penalty", 180000);
 			config.setConfiguration(configMap);
 			metrics.add(config);
@@ -149,12 +147,12 @@ private RPController initResultProcessor() {
 
 		}
 		//Create Storages
-		List<Storage> storages = new ArrayList<Storage>();
+		List<Storage> storages = new ArrayList<>();
 		for(StorageConfig config : this.storages){
 			storages.add(config.createStorage());
 		}
 		//Create Metrics
-		List<Metric> metrics = new ArrayList<Metric>();
+		List<Metric> metrics = new ArrayList<>();
 		for(MetricConfig config : this.metrics){
 			metrics.add(config.createMetric());
 		}

iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/elements/Task.java

@@ -12,12 +12,12 @@
 public class Task implements Serializable {
 
     @JsonProperty(required = true)
-    private Map configuration = new HashMap();
+    private Map<Object, Object> configuration = new HashMap<>();
 
     @JsonProperty(required = true)
     private String className;
 
-    @JsonProperty(required = false)
+    @JsonProperty()
     private String name=null;
 
     public String getName() {
@@ -28,11 +28,11 @@ public void setName(String name) {
         this.name = name;
     }
 
-    public Map getConfiguration() {
+    public Map<Object, Object> getConfiguration() {
         return configuration;
     }
 
-    public void setConfiguration(Map<String, Object> configuration) {
+    public void setConfiguration(Map<Object, Object> configuration) {
         this.configuration = configuration;
     }
 

iguana.corecontroller/src/main/java/org/aksw/iguana/cc/controller/TaskController.java

@@ -1,6 +1,3 @@
-/**
- * 
- */
 package org.aksw.iguana.cc.controller;
 
 import org.aksw.iguana.cc.config.elements.Connection;
@@ -11,37 +8,27 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.concurrent.TimeoutException;
 
 
 /**
  * Task Controlling, will start the actual benchmark tasks and its {@link org.aksw.iguana.cc.tasks.TaskManager}
  *
- *
- * 
  * @author f.conrads
- *
  */
 public class TaskController {
 
-	private static Map<String, String> shortHandMap = new HashMap<String, String>();
-
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(TaskController.class);
-
-	public void startTask(String[] ids, String dataset, Connection con, Task task) {
-		TaskManager tmanager = new TaskManager();
-		String className=task.getClassName();
-		TaskFactory factory = new TaskFactory();
-		tmanager.setTask(factory.create(className, task.getConfiguration()));
-		try {
-			tmanager.startTask(ids, dataset, con, task.getName());
-		} catch (IOException | TimeoutException e) {
-			LOGGER.error("Could not start Task "+className, e);
-		}
-	}
-
-
+    private static final Logger LOGGER = LoggerFactory.getLogger(TaskController.class);
+
+    public void startTask(String[] ids, String dataset, Connection con, Task task) {
+        TaskManager tmanager = new TaskManager();
+        String className = task.getClassName();
+        TaskFactory factory = new TaskFactory();
+        tmanager.setTask(factory.create(className, task.getConfiguration()));
+        try {
+            tmanager.startTask(ids, dataset, con, task.getName());
+        } catch (IOException | TimeoutException e) {
+            LOGGER.error("Could not start Task " + className, e);
+        }
+    }
 }