Modified backend and frontend for handling grouping of datasets

src/main/java/org/aksw/gerbil/annotator/AnnotatorConfigurationImpl.java

@@ -27,7 +27,7 @@
 /**
  * Contains all information needed to load an annotator for a specific
  * experiment type.
- * 
+ *
  * @author Michael Röder (roeder@informatik.uni-leipzig.de)
  *
  */
@@ -39,7 +39,7 @@ public class AnnotatorConfigurationImpl extends AbstractAdapterConfiguration imp
     public AnnotatorConfigurationImpl(String annotatorName, boolean couldBeCached,
             Constructor<? extends Annotator> constructor, Object constructorArgs[],
             ExperimentType applicableForExperiment) {
-        super(annotatorName, couldBeCached, applicableForExperiment);
+        super(annotatorName,"Ungrouped", couldBeCached, applicableForExperiment);
         this.constructor = constructor;
         this.constructorArgs = constructorArgs;
     }
@@ -87,4 +87,4 @@ public String toString() {
         builder.append(')');
         return builder.toString();
     }
-}
+}

src/main/java/org/aksw/gerbil/dataset/AbstractDatasetConfiguration.java

@@ -33,10 +33,10 @@ public abstract class AbstractDatasetConfiguration extends AbstractAdapterConfig
     protected EntityCheckerManager entityCheckerManager;
     protected SameAsRetriever globalRetriever;
 
-    public AbstractDatasetConfiguration(String datasetName, boolean couldBeCached,
+    public AbstractDatasetConfiguration(String datasetName,String datasetGroup, boolean couldBeCached,
             ExperimentType applicableForExperiment, EntityCheckerManager entityCheckerManager,
             SameAsRetriever globalRetriever) {
-        super(datasetName, couldBeCached, applicableForExperiment);
+        super(datasetName,datasetGroup, couldBeCached, applicableForExperiment);
         this.entityCheckerManager = entityCheckerManager;
         this.globalRetriever = globalRetriever;
     }

src/main/java/org/aksw/gerbil/dataset/Dataset.java

@@ -31,6 +31,6 @@ public interface Dataset extends Closeable {
     public void setName(String name);
 
     public List<Document> getInstances();
-    
+
     public void setClosePermitionGranter(ClosePermitionGranter granter);
 }

src/main/java/org/aksw/gerbil/dataset/DatasetConfigurationImpl.java

@@ -28,11 +28,11 @@ public class DatasetConfigurationImpl extends AbstractDatasetConfiguration {
     protected Constructor<? extends Dataset> constructor;
     protected Object constructorArgs[];
 
-    public DatasetConfigurationImpl(String datasetName, boolean couldBeCached,
+    public DatasetConfigurationImpl(String datasetName,String datasetGroup, boolean couldBeCached,
             Constructor<? extends Dataset> constructor, Object constructorArgs[],
             ExperimentType applicableForExperiment, EntityCheckerManager entityCheckerManager,
             SameAsRetriever globalRetriever) {
-        super(datasetName, couldBeCached, applicableForExperiment, entityCheckerManager, globalRetriever);
+        super(datasetName, datasetGroup, couldBeCached, applicableForExperiment, entityCheckerManager, globalRetriever);
         this.constructor = constructor;
         this.constructorArgs = constructorArgs;
     }
@@ -66,4 +66,4 @@ public String toString() {
         builder.append(')');
         return builder.toString();
     }
-}
+}

src/main/java/org/aksw/gerbil/dataset/InstanceListBasedDataset.java

@@ -34,13 +34,13 @@ public InstanceListBasedDataset(List<Document> instances, ExperimentType applica
     }
 
     public InstanceListBasedDataset(String name, List<Document> instances, ExperimentType applicableForExperiment) {
-        super(name, false, applicableForExperiment, null, null);
+        super(name,"UnGrouped", false, applicableForExperiment, null, null);
         this.instances = instances;
     }
 
     public InstanceListBasedDataset(String name, List<Document> instances, ExperimentType applicableForExperiment,
             EntityCheckerManager entityCheckerManager, SameAsRetriever globalRetriever) {
-        super(name, false, applicableForExperiment, entityCheckerManager, globalRetriever);
+        super(name,"UnGrouped", false, applicableForExperiment, entityCheckerManager, globalRetriever);
         this.instances = instances;
     }
 

src/main/java/org/aksw/gerbil/dataset/SingletonDatasetConfigImpl.java

@@ -34,11 +34,11 @@ public class SingletonDatasetConfigImpl extends DatasetConfigurationImpl impleme
     protected int instanceUsages = 0;
     protected Semaphore instanceMutex = new Semaphore(1);
 
-    public SingletonDatasetConfigImpl(String annotatorName, boolean couldBeCached,
+    public SingletonDatasetConfigImpl(String annotatorName, String annotatorGroup, boolean couldBeCached,
             Constructor<? extends Dataset> constructor, Object constructorArgs[],
             ExperimentType applicableForExperiment, EntityCheckerManager entityCheckerManager,
             SameAsRetriever globalRetriever) {
-        super(annotatorName, couldBeCached, constructor, constructorArgs, applicableForExperiment, entityCheckerManager,
+        super(annotatorName, annotatorGroup, couldBeCached, constructor, constructorArgs, applicableForExperiment, entityCheckerManager,
                 globalRetriever);
     }
 

src/main/java/org/aksw/gerbil/dataset/datahub/DatahubNIFConfig.java

@@ -44,7 +44,7 @@ public class DatahubNIFConfig extends AbstractDatasetConfiguration {
 
     public DatahubNIFConfig(String datasetName, String datasetUrl, boolean couldBeCached, EntityCheckerManager entityCheckerManager,
             SameAsRetriever globalRetriever) {
-        super(datasetName, couldBeCached, ExperimentType.A2KB, entityCheckerManager, globalRetriever);
+        super(datasetName,"UnGrouped", couldBeCached, ExperimentType.A2KB, entityCheckerManager, globalRetriever);
         this.datasetUrl = datasetUrl;
         rt = new RestTemplate();
     }

src/main/java/org/aksw/gerbil/dataset/impl/AbstractDataset.java

@@ -24,6 +24,9 @@
 public abstract class AbstractDataset implements Dataset {
 
     protected String name;
+
+    protected String group;
+
     protected ClosePermitionGranter granter;
 
     public AbstractDataset() {

src/main/java/org/aksw/gerbil/dataset/impl/nif/NIFFileDatasetConfig.java

@@ -29,7 +29,7 @@ public class NIFFileDatasetConfig extends AbstractDatasetConfiguration {
 
     public NIFFileDatasetConfig(String name, String file, boolean couldBeCached, ExperimentType applicableForExperiment,
             EntityCheckerManager entityCheckerManager, SameAsRetriever globalRetriever) {
-        super(name, couldBeCached, applicableForExperiment, entityCheckerManager, globalRetriever);
+        super(name,"UnGrouped", couldBeCached, applicableForExperiment, entityCheckerManager, globalRetriever);
         this.file = file;
     }
 

src/main/java/org/aksw/gerbil/datatypes/AbstractAdapterConfiguration.java

@@ -23,11 +23,13 @@ public abstract class AbstractAdapterConfiguration implements AdapterConfigurati
     private static final ExperimentTypeComparator EXP_TYPE_COMPARATOR = new ExperimentTypeComparator();
 
     protected String name;
+    protected String group;
     protected boolean couldBeCached;
     protected ExperimentType applicableForExperiment;
 
-    public AbstractAdapterConfiguration(String name, boolean couldBeCached, ExperimentType applicableForExperiment) {
+    public AbstractAdapterConfiguration(String name,String group, boolean couldBeCached, ExperimentType applicableForExperiment) {
         this.name = name;
+        this.group = group;
         this.couldBeCached = couldBeCached;
         this.applicableForExperiment = applicableForExperiment;
     }
@@ -37,6 +39,10 @@ public String getName() {
         return name;
     }
 
+    public String getGroup() {
+        return group;
+    }
+
     @Override
     public void setName(String name) {
         this.name = name;

src/main/java/org/aksw/gerbil/datatypes/AdapterConfiguration.java

@@ -19,22 +19,22 @@
 /**
  * Interface of an adpater configuration of the GERBIL system. It represents the
  * adapter and is able to create an adapter instance.
- * 
+ *
  * @author Michael Röder
- * 
+ *
  */
 public interface AdapterConfiguration extends Comparable<AdapterConfiguration>{
 
     /**
      * Getter of the adapters name.
-     * 
+     *
      * @return The name of the adapter.
      */
     public String getName();
 
     /**
      * Setter of the adapters name.
-     * 
+     *
      * @param name
      *            The name of the adapter.
      */
@@ -43,7 +43,7 @@ public interface AdapterConfiguration extends Comparable<AdapterConfiguration>{
     /**
      * Returns true if the system is allowed to cache the results of experiments
      * in which this adapter has been involved.
-     * 
+     *
      * @return true if the results could be cached inside the database.
      *         Otherwise false is returned.
      */
@@ -53,21 +53,23 @@ public interface AdapterConfiguration extends Comparable<AdapterConfiguration>{
      * Setter for the caching flag which should be set to true if the system is
      * allowed to cache the results of experiments in which this adapter has
      * been involved.
-     * 
+     *
      * @param couldBeCached
      */
     public void setCouldBeCached(boolean couldBeCached);
 
     /**
      * Returns true if this adapter can be used for an experiment of the given
      * type.
-     * 
+     *
      * @param type
      *            the experiment type that should be checked
      * @return true if this adapter can be used for an experiment of the given
      *         type.
      */
     public boolean isApplicableForExperiment(ExperimentType type);
-    
+
     public ExperimentType getExperimentType();
+
+    public String getGroup();
 }

src/main/java/org/aksw/gerbil/web/MainController.java

@@ -18,11 +18,7 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletRequest;
@@ -306,18 +302,19 @@ public ModelAndView experiment(@RequestParam(value = "id") String id, HttpServle
     }
 
     @RequestMapping("/datasets")
-    public @ResponseBody List<String> datasets(@RequestParam(value = "experimentType") String experimentType) {
+    public @ResponseBody Map<String, List<String>> datasets(@RequestParam(value = "experimentType") String experimentType) {
         ExperimentType type = null;
+        Map<String, List<String>> response = new HashMap<>();
         try {
             type = ExperimentType.valueOf(experimentType);
         } catch (IllegalArgumentException e) {
             LOGGER.warn("Got a request containing a wrong ExperimentType (\"{}\"). Ignoring it.", experimentType);
             return null;
         }
-        Set<String> datasets = adapterManager.getDatasetNamesForExperiment(type);
-        List<String> list = Lists.newArrayList(datasets);
-        Collections.sort(list);
-        return list;
+            for(Map.Entry<String, String> entry :adapterManager.getDatasetDetailsForExperiment(type).entrySet()){
+                response.computeIfAbsent(entry.getValue(), k -> new ArrayList<>()).add(entry.getKey());
+            }
+        return response;
     }
 
     /**

src/main/java/org/aksw/gerbil/web/config/AdapterList.java

@@ -85,6 +85,15 @@ public Set<String> getAdapterNamesForExperiment(ExperimentType type) {
         return names;
     }
 
+    public Map<String, String> getAdapterDetailsForExperiment(ExperimentType type) {
+        List<T> configs = getAdaptersForExperiment(type);
+        Map<String,String> names = new HashMap<String,String>(configs.size());
+        for (T config : configs) {
+            names.put(config.getName(), config.getGroup());
+        }
+        return names;
+    }
+
     public List<T> getAdaptersForName(String name) {
         if (nameToAdapterMapping.containsKey(name)) {
             return nameToAdapterMapping.get(name);

src/main/java/org/aksw/gerbil/web/config/AdapterManager.java

@@ -17,6 +17,7 @@
 package org.aksw.gerbil.web.config;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import org.aksw.gerbil.annotator.AnnotatorConfiguration;
@@ -66,6 +67,9 @@ public Set<String> getAnnotatorNamesForExperiment(ExperimentType type) {
     public Set<String> getDatasetNamesForExperiment(ExperimentType type) {
         return datasets.getAdapterNamesForExperiment(type);
     }
+    public Map<String,String> getDatasetDetailsForExperiment(ExperimentType type) {
+        return datasets.getAdapterDetailsForExperiment(type);
+    }
 
     public AnnotatorConfiguration getAnnotatorConfig(String name, ExperimentType type) {
         List<AnnotatorConfiguration> configs = annotators.getAdaptersForName(name);

src/main/java/org/aksw/gerbil/web/config/DatasetsConfig.java

@@ -17,12 +17,7 @@
 package org.aksw.gerbil.web.config;
 
 import java.lang.reflect.Constructor;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 import org.aksw.gerbil.config.GerbilConfiguration;
 import org.aksw.gerbil.dataset.Dataset;
@@ -51,6 +46,8 @@ public class DatasetsConfig {
     public static final String ANNOTATOR_EXPERIMENT_TYPE_SUFFIX = "experimentType";
     public static final String ANNOTATOR_NAME_SUFFIX = "name";
 
+    public static final String ANNOTATOR_GROUP_SUFFIX = "group";
+
     public static final String ANNOTATOR_CHECK_CLASS_SUFFIX = "check.class";
     public static final String ANNOTATOR_CHECK_ARGS_SUFFIX = "check.args";
 
@@ -116,6 +113,12 @@ private static DatasetConfiguration getConfiguration(String datasetKey, EntityCh
         }
         String name = config.getString(key);
 
+        key = buildKey(keyBuilder, datasetKey, ANNOTATOR_GROUP_SUFFIX);
+        if (!config.containsKey(key)) {
+            LOGGER.error("Couldn't get a group for the \"" + datasetKey + "\" dataset.");
+        }
+        String group = config.getString(key,"UnGrouped");
+
         key = buildKey(keyBuilder, datasetKey, ANNOTATOR_CLASS_SUFFIX);
         if (!config.containsKey(key)) {
             LOGGER.error("Couldn't get a class for the \"" + datasetKey + "\" dataset.");
@@ -188,7 +191,7 @@ private static DatasetConfiguration getConfiguration(String datasetKey, EntityCh
 
         // return new DatasetConfigurationImpl(name, cacheable, constructor,
         // constructorArgs, type, entityCheckerManager);
-        return new SingletonDatasetConfigImpl(name, cacheable, constructor, constructorArgs, type, entityCheckerManager,
+        return new SingletonDatasetConfigImpl(name, group, cacheable, constructor, constructorArgs, type, entityCheckerManager,
                 globalRetriever);
     }