removed data from dataset and load it on the fly (work remaining)

src/main/java/eu/hbp/mip/controllers/RequestsApi.java

@@ -54,7 +54,7 @@ public class RequestsApi {
         List<String> variables = new LinkedList<>();
         List<String> groupings = new LinkedList<>();
         List<String> covariables = new LinkedList<>();
-        Map<String, List<Object>> data = new HashMap<>();
+        JsonObject data = new JsonObject();
 
         Gson gson = new Gson();
         JsonObject q = gson.fromJson(gson.toJson(query, Query.class), JsonObject.class);
@@ -85,7 +85,7 @@ public class RequestsApi {
 
         for(String varCode : allVars)
         {
-            List<Object> currentVarData = new LinkedList<>();
+            JsonArray currentVarData = new JsonArray();
             String sqlQuery = "SELECT " + varCode + " FROM science.adni_merge";
             for (Map resultMap : scienceJdbcTemplate.queryForList(sqlQuery))
             {
@@ -97,7 +97,7 @@ public class RequestsApi {
                     currentVarData.add(strValue);
                 }
             }
-            data.put(varCode, currentVarData);
+            data.add(varCode, currentVarData);
         }
 
         dataset.addProperty("code", code);
@@ -105,7 +105,7 @@ public class RequestsApi {
         dataset.add("variable", gson.toJsonTree(variables));
         dataset.add("grouping", gson.toJsonTree(groupings));
         dataset.add("header", gson.toJsonTree(covariables));
-        dataset.add("data", new Gson().toJsonTree(data));
+        dataset.add("data", data);
 
         return ResponseEntity.ok(new Gson().fromJson(dataset, Object.class));
     }

src/main/java/eu/hbp/mip/model/Dataset.java

@@ -33,10 +33,6 @@ public class Dataset {
     @CollectionTable(name = "dataset_variable", joinColumns = @JoinColumn(name = "dataset_code"))
     private List<String> variable = new LinkedList<>();
 
-    @ElementCollection(fetch=FetchType.EAGER)
-    @CollectionTable(name = "dataset_data", joinColumns = @JoinColumn(name = "dataset_code"))
-    private Map<String, LinkedList<Object>> data = new HashMap<>();
-
 
     public Dataset() {
         /*
@@ -89,13 +85,4 @@ public class Dataset {
         this.variable = variable;
     }
 
-
-    public Map<String, LinkedList<Object>> getData() {
-        return data;
-    }
-
-    public void setData(Map<String, LinkedList<Object>> data) {
-        this.data = data;
-    }
-
 }