diff --git a/.deployment/docker-compose.yml b/.deployment/docker-compose.yml index 0b83518..fb1d481 100644 --- a/.deployment/docker-compose.yml +++ b/.deployment/docker-compose.yml @@ -69,7 +69,7 @@ services: mqtt.broker.uri: tcp://broker.hivemq.com:1883 discovery.endpoint.uri: https://tapas-auction-house.86-119-34-242.nip.io auction.house.uri: https://tapas-auction-house.86-119-35-40.nip.io - tasks.list.uri: http://tapas-tasks.86-119-35-40.nip.io + tasks.list.uri: https://tapas-tasks.86-119-35-40.nip.io labels: - "traefik.enable=true" - "traefik.http.routers.tapas-auction-house.rule=Host(`tapas-auction-house.${PUB_IP}.nip.io`)" diff --git a/executor-robot/src/main/java/ch/unisg/executorrobot/executor/domain/Executor.java b/executor-robot/src/main/java/ch/unisg/executorrobot/executor/domain/Executor.java index cc08bc1..4468f14 100644 --- a/executor-robot/src/main/java/ch/unisg/executorrobot/executor/domain/Executor.java +++ b/executor-robot/src/main/java/ch/unisg/executorrobot/executor/domain/Executor.java @@ -21,7 +21,8 @@ public class Executor extends ExecutorBase { @Override protected String execution(String input) { - return userToRobotPort.userToRobot(); + userToRobotPort.userToRobot(); + return ""; } } diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/out/web/ExternalTaskExecutedWebAdapter.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/out/web/ExternalTaskExecutedWebAdapter.java index 8d28159..b74e89b 100644 --- a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/out/web/ExternalTaskExecutedWebAdapter.java +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/out/web/ExternalTaskExecutedWebAdapter.java @@ -43,7 +43,7 @@ public class ExternalTaskExecutedWebAdapter implements ExternalTaskExecutedEvent op2 = new JSONObject() .put("op", "add") .put("path", "/outputData") - .put("value", externalTaskExecutedEvent.getOutputData()); + .put("value", externalTaskExecutedEvent.getOutputData().getValue()); } catch (JSONException e) { logger.log(Level.SEVERE, e.getLocalizedMessage(), e); return;