From 4d9b37a06cbc1e20e84a171d2a69baaa998bb4a2 Mon Sep 17 00:00:00 2001
From: Mirco Nasuti <mirco.nasuti@chuv.ch>
Date: Mon, 5 Sep 2016 17:36:12 +0200
Subject: [PATCH] add compatibility with old frontend version by adding empty
groups list when no sub-group exist (only for deprecated API)
---
Dockerfile | 2 +-
src/main/java/eu/hbp/mip/controllers/GroupsApi.java | 4 ++++
tests/test-build.sh | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index b0d399603..91b19277d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ RUN apk add --update ca-certificates wget \
COPY docker/runner/config/application.tmpl /config/application.tmpl
COPY docker/runner/README.md docker/runner/run.sh /
-COPY target/portal-backend-DOCKER_BUILD.jar backend.jar
+COPY target/portal-backend-1.0.0-docker-packaging.jar backend.jar
EXPOSE 8080
diff --git a/src/main/java/eu/hbp/mip/controllers/GroupsApi.java b/src/main/java/eu/hbp/mip/controllers/GroupsApi.java
index 297d33e55..541f51726 100644
--- a/src/main/java/eu/hbp/mip/controllers/GroupsApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/GroupsApi.java
@@ -5,6 +5,7 @@
package eu.hbp.mip.controllers;
import com.google.gson.Gson;
+import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import eu.hbp.mip.model.Group;
@@ -71,6 +72,9 @@ public class GroupsApi {
removeVariablesRecursive(child.getAsJsonObject());
}
}
+ else {
+ element.add("groups", new JsonArray()); // Only for compatibility with olf frontend
+ }
if(element.has("variables")) {
element.remove("variables");
}
diff --git a/tests/test-build.sh b/tests/test-build.sh
index 89b65881e..81eef036b 100755
--- a/tests/test-build.sh
+++ b/tests/test-build.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-if [ ! -f ./target/portal-backend-DOCKER_BUILD.jar ]; then
+if [ ! -f ./target/portal-backend-1.0.0-docker-packaging.jar ]; then
exit 1
fi
--
GitLab