From ee06c0b80e0b325eedfe951426a0a55e6fc32fca Mon Sep 17 00:00:00 2001 From: Marcel Date: Mon, 8 Nov 2021 14:48:12 +0100 Subject: [PATCH] error fixes --- .../ExecutorcomputationApplication.java | 0 .../executor/adapter/in/web/TaskAvailableController.java | 0 .../executor/application/service/TaskAvailableService.java | 0 .../executor/domain/Executor.java | 0 .../ExecutorcomputationApplicationTests.java | 0 .../ExecutorrobotApplication.java | 0 .../executor/adapter/in/web/TaskAvailableController.java | 0 .../executor/adapter/out/DeleteUserFromRobotAdapter.java | 0 .../executor/adapter/out/InstructionToRobotAdapter.java | 0 .../executor/adapter/out/UserToRobotAdapter.java | 0 .../application/port/out/DeleteUserFromRobotPort.java | 0 .../executor/application/port/out/InstructionToRobotPort.java | 0 .../executor/application/port/out/UserToRobotPort.java | 0 .../executor/application/service/TaskAvailableService.java | 0 .../executor/domain/Executor.java | 4 +--- .../ExecutorrobotApplicationTests.java | 0 16 files changed, 1 insertion(+), 3 deletions(-) rename executorcomputation/src/main/java/ch/unisg/{executor2 => executorcomputation}/ExecutorcomputationApplication.java (100%) rename executorcomputation/src/main/java/ch/unisg/{executor2 => executorcomputation}/executor/adapter/in/web/TaskAvailableController.java (100%) rename executorcomputation/src/main/java/ch/unisg/{executor2 => executorcomputation}/executor/application/service/TaskAvailableService.java (100%) rename executorcomputation/src/main/java/ch/unisg/{executor2 => executorcomputation}/executor/domain/Executor.java (100%) rename executorcomputation/src/test/java/ch/unisg/{executor2 => executorcomputation}/ExecutorcomputationApplicationTests.java (100%) rename executorrobot/src/main/java/ch/unisg/{executor1 => executorrobot}/ExecutorrobotApplication.java (100%) rename executorrobot/src/main/java/ch/unisg/{executor1 => executorrobot}/executor/adapter/in/web/TaskAvailableController.java (100%) rename executorrobot/src/main/java/ch/unisg/{executor1 => executorrobot}/executor/adapter/out/DeleteUserFromRobotAdapter.java (100%) rename executorrobot/src/main/java/ch/unisg/{executor1 => executorrobot}/executor/adapter/out/InstructionToRobotAdapter.java (100%) rename executorrobot/src/main/java/ch/unisg/{executor1 => executorrobot}/executor/adapter/out/UserToRobotAdapter.java (100%) rename executorrobot/src/main/java/ch/unisg/{executor1 => executorrobot}/executor/application/port/out/DeleteUserFromRobotPort.java (100%) rename executorrobot/src/main/java/ch/unisg/{executor1 => executorrobot}/executor/application/port/out/InstructionToRobotPort.java (100%) rename executorrobot/src/main/java/ch/unisg/{executor1 => executorrobot}/executor/application/port/out/UserToRobotPort.java (100%) rename executorrobot/src/main/java/ch/unisg/{executor1 => executorrobot}/executor/application/service/TaskAvailableService.java (100%) rename executorrobot/src/main/java/ch/unisg/{executor1 => executorrobot}/executor/domain/Executor.java (95%) rename executorrobot/src/test/java/ch/unisg/{executor1 => executorrobot}/ExecutorrobotApplicationTests.java (100%) diff --git a/executorcomputation/src/main/java/ch/unisg/executor2/ExecutorcomputationApplication.java b/executorcomputation/src/main/java/ch/unisg/executorcomputation/ExecutorcomputationApplication.java similarity index 100% rename from executorcomputation/src/main/java/ch/unisg/executor2/ExecutorcomputationApplication.java rename to executorcomputation/src/main/java/ch/unisg/executorcomputation/ExecutorcomputationApplication.java diff --git a/executorcomputation/src/main/java/ch/unisg/executor2/executor/adapter/in/web/TaskAvailableController.java b/executorcomputation/src/main/java/ch/unisg/executorcomputation/executor/adapter/in/web/TaskAvailableController.java similarity index 100% rename from executorcomputation/src/main/java/ch/unisg/executor2/executor/adapter/in/web/TaskAvailableController.java rename to executorcomputation/src/main/java/ch/unisg/executorcomputation/executor/adapter/in/web/TaskAvailableController.java diff --git a/executorcomputation/src/main/java/ch/unisg/executor2/executor/application/service/TaskAvailableService.java b/executorcomputation/src/main/java/ch/unisg/executorcomputation/executor/application/service/TaskAvailableService.java similarity index 100% rename from executorcomputation/src/main/java/ch/unisg/executor2/executor/application/service/TaskAvailableService.java rename to executorcomputation/src/main/java/ch/unisg/executorcomputation/executor/application/service/TaskAvailableService.java diff --git a/executorcomputation/src/main/java/ch/unisg/executor2/executor/domain/Executor.java b/executorcomputation/src/main/java/ch/unisg/executorcomputation/executor/domain/Executor.java similarity index 100% rename from executorcomputation/src/main/java/ch/unisg/executor2/executor/domain/Executor.java rename to executorcomputation/src/main/java/ch/unisg/executorcomputation/executor/domain/Executor.java diff --git a/executorcomputation/src/test/java/ch/unisg/executor2/ExecutorcomputationApplicationTests.java b/executorcomputation/src/test/java/ch/unisg/executorcomputation/ExecutorcomputationApplicationTests.java similarity index 100% rename from executorcomputation/src/test/java/ch/unisg/executor2/ExecutorcomputationApplicationTests.java rename to executorcomputation/src/test/java/ch/unisg/executorcomputation/ExecutorcomputationApplicationTests.java diff --git a/executorrobot/src/main/java/ch/unisg/executor1/ExecutorrobotApplication.java b/executorrobot/src/main/java/ch/unisg/executorrobot/ExecutorrobotApplication.java similarity index 100% rename from executorrobot/src/main/java/ch/unisg/executor1/ExecutorrobotApplication.java rename to executorrobot/src/main/java/ch/unisg/executorrobot/ExecutorrobotApplication.java diff --git a/executorrobot/src/main/java/ch/unisg/executor1/executor/adapter/in/web/TaskAvailableController.java b/executorrobot/src/main/java/ch/unisg/executorrobot/executor/adapter/in/web/TaskAvailableController.java similarity index 100% rename from executorrobot/src/main/java/ch/unisg/executor1/executor/adapter/in/web/TaskAvailableController.java rename to executorrobot/src/main/java/ch/unisg/executorrobot/executor/adapter/in/web/TaskAvailableController.java diff --git a/executorrobot/src/main/java/ch/unisg/executor1/executor/adapter/out/DeleteUserFromRobotAdapter.java b/executorrobot/src/main/java/ch/unisg/executorrobot/executor/adapter/out/DeleteUserFromRobotAdapter.java similarity index 100% rename from executorrobot/src/main/java/ch/unisg/executor1/executor/adapter/out/DeleteUserFromRobotAdapter.java rename to executorrobot/src/main/java/ch/unisg/executorrobot/executor/adapter/out/DeleteUserFromRobotAdapter.java diff --git a/executorrobot/src/main/java/ch/unisg/executor1/executor/adapter/out/InstructionToRobotAdapter.java b/executorrobot/src/main/java/ch/unisg/executorrobot/executor/adapter/out/InstructionToRobotAdapter.java similarity index 100% rename from executorrobot/src/main/java/ch/unisg/executor1/executor/adapter/out/InstructionToRobotAdapter.java rename to executorrobot/src/main/java/ch/unisg/executorrobot/executor/adapter/out/InstructionToRobotAdapter.java diff --git a/executorrobot/src/main/java/ch/unisg/executor1/executor/adapter/out/UserToRobotAdapter.java b/executorrobot/src/main/java/ch/unisg/executorrobot/executor/adapter/out/UserToRobotAdapter.java similarity index 100% rename from executorrobot/src/main/java/ch/unisg/executor1/executor/adapter/out/UserToRobotAdapter.java rename to executorrobot/src/main/java/ch/unisg/executorrobot/executor/adapter/out/UserToRobotAdapter.java diff --git a/executorrobot/src/main/java/ch/unisg/executor1/executor/application/port/out/DeleteUserFromRobotPort.java b/executorrobot/src/main/java/ch/unisg/executorrobot/executor/application/port/out/DeleteUserFromRobotPort.java similarity index 100% rename from executorrobot/src/main/java/ch/unisg/executor1/executor/application/port/out/DeleteUserFromRobotPort.java rename to executorrobot/src/main/java/ch/unisg/executorrobot/executor/application/port/out/DeleteUserFromRobotPort.java diff --git a/executorrobot/src/main/java/ch/unisg/executor1/executor/application/port/out/InstructionToRobotPort.java b/executorrobot/src/main/java/ch/unisg/executorrobot/executor/application/port/out/InstructionToRobotPort.java similarity index 100% rename from executorrobot/src/main/java/ch/unisg/executor1/executor/application/port/out/InstructionToRobotPort.java rename to executorrobot/src/main/java/ch/unisg/executorrobot/executor/application/port/out/InstructionToRobotPort.java diff --git a/executorrobot/src/main/java/ch/unisg/executor1/executor/application/port/out/UserToRobotPort.java b/executorrobot/src/main/java/ch/unisg/executorrobot/executor/application/port/out/UserToRobotPort.java similarity index 100% rename from executorrobot/src/main/java/ch/unisg/executor1/executor/application/port/out/UserToRobotPort.java rename to executorrobot/src/main/java/ch/unisg/executorrobot/executor/application/port/out/UserToRobotPort.java diff --git a/executorrobot/src/main/java/ch/unisg/executor1/executor/application/service/TaskAvailableService.java b/executorrobot/src/main/java/ch/unisg/executorrobot/executor/application/service/TaskAvailableService.java similarity index 100% rename from executorrobot/src/main/java/ch/unisg/executor1/executor/application/service/TaskAvailableService.java rename to executorrobot/src/main/java/ch/unisg/executorrobot/executor/application/service/TaskAvailableService.java diff --git a/executorrobot/src/main/java/ch/unisg/executor1/executor/domain/Executor.java b/executorrobot/src/main/java/ch/unisg/executorrobot/executor/domain/Executor.java similarity index 95% rename from executorrobot/src/main/java/ch/unisg/executor1/executor/domain/Executor.java rename to executorrobot/src/main/java/ch/unisg/executorrobot/executor/domain/Executor.java index 44ddcb4..4124e9e 100644 --- a/executorrobot/src/main/java/ch/unisg/executor1/executor/domain/Executor.java +++ b/executorrobot/src/main/java/ch/unisg/executorrobot/executor/domain/Executor.java @@ -1,7 +1,5 @@ package ch.unisg.executorrobot.executor.domain; -import java.net.http.HttpClient; -import java.net.http.HttpResponse; import java.util.concurrent.TimeUnit; import ch.unisg.executorrobot.executor.adapter.out.DeleteUserFromRobotAdapter; @@ -30,7 +28,7 @@ public class Executor extends ExecutorBase { @Override protected - String execution() { + String execution(String... input) { String key = userToRobotPort.userToRobot(); try { diff --git a/executorrobot/src/test/java/ch/unisg/executor1/ExecutorrobotApplicationTests.java b/executorrobot/src/test/java/ch/unisg/executorrobot/ExecutorrobotApplicationTests.java similarity index 100% rename from executorrobot/src/test/java/ch/unisg/executor1/ExecutorrobotApplicationTests.java rename to executorrobot/src/test/java/ch/unisg/executorrobot/ExecutorrobotApplicationTests.java