From 661ef71d07d81ef1dfc968952866b0a08afb11a9 Mon Sep 17 00:00:00 2001
From: Manuel Spuhler <manuel.spuhler@chuv.ch>
Date: Thu, 22 Feb 2018 12:58:50 +0100
Subject: [PATCH] Fails getJsonArray
---
pom.xml | 2 +-
src/main/java/eu/hbp/mip/controllers/ExperimentApi.java | 7 +++++--
src/main/java/eu/hbp/mip/controllers/MethodsApi.java | 9 +++++----
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8d1788148..5da5c5a91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<groupId>eu.hbp.mip</groupId>
<artifactId>portal-backend</artifactId>
- <version><version>2.6.0</version><!-- BUMP_VERSION --></version><!-- BUMP_VERSION -->
+ <version>2.6.0</version><!-- BUMP_VERSION --><!-- BUMP_VERSION -->
<packaging>jar</packaging>
<name>portal-backend</name>
diff --git a/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java b/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java
index 711ca45b3..d68280fc9 100644
--- a/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java
@@ -324,8 +324,11 @@ public class ExperimentApi extends WokenClientController {
}
private static boolean isExaremeAlgo(ExperimentQuery expQuery) {
- return expQuery.getAlgorithms().size() > 0 && "WP_".equals(
- expQuery.getAlgorithms().get(0).getCode().substring(0, 3));
+ String code = expQuery.getAlgorithms().get(0).getCode();
+ return expQuery.getAlgorithms().size() > 0
+ && ("WP_".equals(code.substring(0, 3))
+ || "glm_exareme".equals(code)
+ || "K_MEANS".equals(code));
}
}
diff --git a/src/main/java/eu/hbp/mip/controllers/MethodsApi.java b/src/main/java/eu/hbp/mip/controllers/MethodsApi.java
index 073fbf3b6..aab7efb29 100644
--- a/src/main/java/eu/hbp/mip/controllers/MethodsApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/MethodsApi.java
@@ -1,8 +1,6 @@
package eu.hbp.mip.controllers;
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
+import com.google.gson.*;
import eu.hbp.mip.akka.WokenClientController;
import ch.chuv.lren.woken.messages.query.MethodsQuery$;
import ch.chuv.lren.woken.messages.query.MethodsResponse;
@@ -45,7 +43,10 @@ public class MethodsApi extends WokenClientController {
InputStream is = MethodsApi.class.getClassLoader().getResourceAsStream(EXAREME_ALGO_JSON_FILE);
InputStreamReader isr = new InputStreamReader(is);
BufferedReader br = new BufferedReader(isr);
- JsonObject exaremeAlgo = new JsonParser().parse(br).getAsJsonObject();
+ JsonElement element = new JsonParser().parse(br);
+ LOGGER.info("element" + element.toString());
+ JsonArray exaremeAlgo = element.getAsJsonArray();
+ LOGGER.info("exaremeAlgo" + exaremeAlgo.toString());
catalog.get("algorithms").getAsJsonArray().add(exaremeAlgo);
// << Temporary
--
GitLab