diff --git a/pom.xml b/pom.xml index 8d178814884b80e28b2388e5480cc40d80d6b88e..5da5c5a91ad4464d9ff8e02f2c69cc92035ee897 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 711ca45b3ac9b9defafc7271e92d208dfe09aea3..d68280fc90136005213ec9a2c058bcfad48405c5 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 073fbf3b6b44ab54e2ef3643285e5f3ea06d62e1..aab7efb29b0c8b7c0e884872cb99fb637d628158 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