From bce36196384416cc30a626ba1b595530e224c362 Mon Sep 17 00:00:00 2001 From: Marcel Date: Tue, 16 Nov 2021 15:48:46 +0100 Subject: [PATCH] renaming --- executor-base/pom.xml | 4 ++-- .../.gitignore | 0 .../.mvn/wrapper/MavenWrapperDownloader.java | 0 .../.mvn/wrapper/maven-wrapper.jar | Bin .../.mvn/wrapper/maven-wrapper.properties | 0 .../Dockerfile | 0 {executorcomputation => executor-computation}/mvnw | 0 .../mvnw.cmd | 0 .../pom.xml | 6 +++--- .../ExecutorcomputationApplication.java | 0 .../adapter/in/web/TaskAvailableController.java | 0 .../application/service/TaskAvailableService.java | 0 .../executor/domain/Executor.java | 0 .../src/main/resources/application.properties | 0 .../ExecutorcomputationApplicationTests.java | 0 {executorrobot => executor-robot}/.gitignore | 0 .../.mvn/wrapper/MavenWrapperDownloader.java | 0 .../.mvn/wrapper/maven-wrapper.jar | Bin .../.mvn/wrapper/maven-wrapper.properties | 0 {executorrobot => executor-robot}/Dockerfile | 0 {executorrobot => executor-robot}/mvnw | 0 {executorrobot => executor-robot}/mvnw.cmd | 0 {executorrobot => executor-robot}/pom.xml | 6 +++--- .../executorrobot/ExecutorrobotApplication.java | 0 .../adapter/in/web/TaskAvailableController.java | 0 .../adapter/out/DeleteUserFromRobotAdapter.java | 0 .../adapter/out/InstructionToRobotAdapter.java | 0 .../executor/adapter/out/UserToRobotAdapter.java | 0 .../port/out/DeleteUserFromRobotPort.java | 0 .../port/out/InstructionToRobotPort.java | 0 .../application/port/out/UserToRobotPort.java | 0 .../application/service/TaskAvailableService.java | 0 .../executorrobot/executor/domain/Executor.java | 0 .../src/main/resources/application.properties | 0 .../ExecutorrobotApplicationTests.java | 0 .../ExecutorRemovedEventListenerMqttAdapter.java | 2 +- .../adapter/out/web/PublishNewTaskEventAdapter.java | 2 -- 37 files changed, 9 insertions(+), 11 deletions(-) rename {executorcomputation => executor-computation}/.gitignore (100%) rename {executorcomputation => executor-computation}/.mvn/wrapper/MavenWrapperDownloader.java (100%) rename {executorcomputation => executor-computation}/.mvn/wrapper/maven-wrapper.jar (100%) rename {executorcomputation => executor-computation}/.mvn/wrapper/maven-wrapper.properties (100%) rename {executorcomputation => executor-computation}/Dockerfile (100%) rename {executorcomputation => executor-computation}/mvnw (100%) rename {executorcomputation => executor-computation}/mvnw.cmd (100%) rename {executorcomputation => executor-computation}/pom.xml (94%) rename {executorcomputation => executor-computation}/src/main/java/ch/unisg/executorcomputation/ExecutorcomputationApplication.java (100%) rename {executorcomputation => executor-computation}/src/main/java/ch/unisg/executorcomputation/executor/adapter/in/web/TaskAvailableController.java (100%) rename {executorcomputation => executor-computation}/src/main/java/ch/unisg/executorcomputation/executor/application/service/TaskAvailableService.java (100%) rename {executorcomputation => executor-computation}/src/main/java/ch/unisg/executorcomputation/executor/domain/Executor.java (100%) rename {executorcomputation => executor-computation}/src/main/resources/application.properties (100%) rename {executorcomputation => executor-computation}/src/test/java/ch/unisg/executorcomputation/ExecutorcomputationApplicationTests.java (100%) rename {executorrobot => executor-robot}/.gitignore (100%) rename {executorrobot => executor-robot}/.mvn/wrapper/MavenWrapperDownloader.java (100%) rename {executorrobot => executor-robot}/.mvn/wrapper/maven-wrapper.jar (100%) rename {executorrobot => executor-robot}/.mvn/wrapper/maven-wrapper.properties (100%) rename {executorrobot => executor-robot}/Dockerfile (100%) rename {executorrobot => executor-robot}/mvnw (100%) rename {executorrobot => executor-robot}/mvnw.cmd (100%) rename {executorrobot => executor-robot}/pom.xml (94%) rename {executorrobot => executor-robot}/src/main/java/ch/unisg/executorrobot/ExecutorrobotApplication.java (100%) rename {executorrobot => executor-robot}/src/main/java/ch/unisg/executorrobot/executor/adapter/in/web/TaskAvailableController.java (100%) rename {executorrobot => executor-robot}/src/main/java/ch/unisg/executorrobot/executor/adapter/out/DeleteUserFromRobotAdapter.java (100%) rename {executorrobot => executor-robot}/src/main/java/ch/unisg/executorrobot/executor/adapter/out/InstructionToRobotAdapter.java (100%) rename {executorrobot => executor-robot}/src/main/java/ch/unisg/executorrobot/executor/adapter/out/UserToRobotAdapter.java (100%) rename {executorrobot => executor-robot}/src/main/java/ch/unisg/executorrobot/executor/application/port/out/DeleteUserFromRobotPort.java (100%) rename {executorrobot => executor-robot}/src/main/java/ch/unisg/executorrobot/executor/application/port/out/InstructionToRobotPort.java (100%) rename {executorrobot => executor-robot}/src/main/java/ch/unisg/executorrobot/executor/application/port/out/UserToRobotPort.java (100%) rename {executorrobot => executor-robot}/src/main/java/ch/unisg/executorrobot/executor/application/service/TaskAvailableService.java (100%) rename {executorrobot => executor-robot}/src/main/java/ch/unisg/executorrobot/executor/domain/Executor.java (100%) rename {executorrobot => executor-robot}/src/main/resources/application.properties (100%) rename {executorrobot => executor-robot}/src/test/java/ch/unisg/executorrobot/ExecutorrobotApplicationTests.java (100%) diff --git a/executor-base/pom.xml b/executor-base/pom.xml index 7893d45..4ea8d2a 100644 --- a/executor-base/pom.xml +++ b/executor-base/pom.xml @@ -9,9 +9,9 @@ ch.unisg - executorbase + executor-base 0.0.1-SNAPSHOT - executorbase + executor-base Demo project for Spring Boot 11 diff --git a/executorcomputation/.gitignore b/executor-computation/.gitignore similarity index 100% rename from executorcomputation/.gitignore rename to executor-computation/.gitignore diff --git a/executorcomputation/.mvn/wrapper/MavenWrapperDownloader.java b/executor-computation/.mvn/wrapper/MavenWrapperDownloader.java similarity index 100% rename from executorcomputation/.mvn/wrapper/MavenWrapperDownloader.java rename to executor-computation/.mvn/wrapper/MavenWrapperDownloader.java diff --git a/executorcomputation/.mvn/wrapper/maven-wrapper.jar b/executor-computation/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from executorcomputation/.mvn/wrapper/maven-wrapper.jar rename to executor-computation/.mvn/wrapper/maven-wrapper.jar diff --git a/executorcomputation/.mvn/wrapper/maven-wrapper.properties b/executor-computation/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from executorcomputation/.mvn/wrapper/maven-wrapper.properties rename to executor-computation/.mvn/wrapper/maven-wrapper.properties diff --git a/executorcomputation/Dockerfile b/executor-computation/Dockerfile similarity index 100% rename from executorcomputation/Dockerfile rename to executor-computation/Dockerfile diff --git a/executorcomputation/mvnw b/executor-computation/mvnw similarity index 100% rename from executorcomputation/mvnw rename to executor-computation/mvnw diff --git a/executorcomputation/mvnw.cmd b/executor-computation/mvnw.cmd similarity index 100% rename from executorcomputation/mvnw.cmd rename to executor-computation/mvnw.cmd diff --git a/executorcomputation/pom.xml b/executor-computation/pom.xml similarity index 94% rename from executorcomputation/pom.xml rename to executor-computation/pom.xml index b9e45ac..c319081 100644 --- a/executorcomputation/pom.xml +++ b/executor-computation/pom.xml @@ -9,9 +9,9 @@ ch.unisg - executorcomputation + executor-computation 0.0.1-SNAPSHOT - executorcomputation + executor-computation Demo project for Spring Boot 11 @@ -42,7 +42,7 @@ ch.unisg - executorbase + executor-base 0.0.1-SNAPSHOT compile diff --git a/executorcomputation/src/main/java/ch/unisg/executorcomputation/ExecutorcomputationApplication.java b/executor-computation/src/main/java/ch/unisg/executorcomputation/ExecutorcomputationApplication.java similarity index 100% rename from executorcomputation/src/main/java/ch/unisg/executorcomputation/ExecutorcomputationApplication.java rename to executor-computation/src/main/java/ch/unisg/executorcomputation/ExecutorcomputationApplication.java diff --git a/executorcomputation/src/main/java/ch/unisg/executorcomputation/executor/adapter/in/web/TaskAvailableController.java b/executor-computation/src/main/java/ch/unisg/executorcomputation/executor/adapter/in/web/TaskAvailableController.java similarity index 100% rename from executorcomputation/src/main/java/ch/unisg/executorcomputation/executor/adapter/in/web/TaskAvailableController.java rename to executor-computation/src/main/java/ch/unisg/executorcomputation/executor/adapter/in/web/TaskAvailableController.java diff --git a/executorcomputation/src/main/java/ch/unisg/executorcomputation/executor/application/service/TaskAvailableService.java b/executor-computation/src/main/java/ch/unisg/executorcomputation/executor/application/service/TaskAvailableService.java similarity index 100% rename from executorcomputation/src/main/java/ch/unisg/executorcomputation/executor/application/service/TaskAvailableService.java rename to executor-computation/src/main/java/ch/unisg/executorcomputation/executor/application/service/TaskAvailableService.java diff --git a/executorcomputation/src/main/java/ch/unisg/executorcomputation/executor/domain/Executor.java b/executor-computation/src/main/java/ch/unisg/executorcomputation/executor/domain/Executor.java similarity index 100% rename from executorcomputation/src/main/java/ch/unisg/executorcomputation/executor/domain/Executor.java rename to executor-computation/src/main/java/ch/unisg/executorcomputation/executor/domain/Executor.java diff --git a/executorcomputation/src/main/resources/application.properties b/executor-computation/src/main/resources/application.properties similarity index 100% rename from executorcomputation/src/main/resources/application.properties rename to executor-computation/src/main/resources/application.properties diff --git a/executorcomputation/src/test/java/ch/unisg/executorcomputation/ExecutorcomputationApplicationTests.java b/executor-computation/src/test/java/ch/unisg/executorcomputation/ExecutorcomputationApplicationTests.java similarity index 100% rename from executorcomputation/src/test/java/ch/unisg/executorcomputation/ExecutorcomputationApplicationTests.java rename to executor-computation/src/test/java/ch/unisg/executorcomputation/ExecutorcomputationApplicationTests.java diff --git a/executorrobot/.gitignore b/executor-robot/.gitignore similarity index 100% rename from executorrobot/.gitignore rename to executor-robot/.gitignore diff --git a/executorrobot/.mvn/wrapper/MavenWrapperDownloader.java b/executor-robot/.mvn/wrapper/MavenWrapperDownloader.java similarity index 100% rename from executorrobot/.mvn/wrapper/MavenWrapperDownloader.java rename to executor-robot/.mvn/wrapper/MavenWrapperDownloader.java diff --git a/executorrobot/.mvn/wrapper/maven-wrapper.jar b/executor-robot/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from executorrobot/.mvn/wrapper/maven-wrapper.jar rename to executor-robot/.mvn/wrapper/maven-wrapper.jar diff --git a/executorrobot/.mvn/wrapper/maven-wrapper.properties b/executor-robot/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from executorrobot/.mvn/wrapper/maven-wrapper.properties rename to executor-robot/.mvn/wrapper/maven-wrapper.properties diff --git a/executorrobot/Dockerfile b/executor-robot/Dockerfile similarity index 100% rename from executorrobot/Dockerfile rename to executor-robot/Dockerfile diff --git a/executorrobot/mvnw b/executor-robot/mvnw similarity index 100% rename from executorrobot/mvnw rename to executor-robot/mvnw diff --git a/executorrobot/mvnw.cmd b/executor-robot/mvnw.cmd similarity index 100% rename from executorrobot/mvnw.cmd rename to executor-robot/mvnw.cmd diff --git a/executorrobot/pom.xml b/executor-robot/pom.xml similarity index 94% rename from executorrobot/pom.xml rename to executor-robot/pom.xml index 101c268..ca95edf 100644 --- a/executorrobot/pom.xml +++ b/executor-robot/pom.xml @@ -9,9 +9,9 @@ ch.unisg - executorrobot + executor-robot 0.0.1-SNAPSHOT - executorrobot + executor-robot Demo project for Spring Boot 11 @@ -42,7 +42,7 @@ ch.unisg - executorbase + executor-base 0.0.1-SNAPSHOT diff --git a/executorrobot/src/main/java/ch/unisg/executorrobot/ExecutorrobotApplication.java b/executor-robot/src/main/java/ch/unisg/executorrobot/ExecutorrobotApplication.java similarity index 100% rename from executorrobot/src/main/java/ch/unisg/executorrobot/ExecutorrobotApplication.java rename to executor-robot/src/main/java/ch/unisg/executorrobot/ExecutorrobotApplication.java diff --git a/executorrobot/src/main/java/ch/unisg/executorrobot/executor/adapter/in/web/TaskAvailableController.java b/executor-robot/src/main/java/ch/unisg/executorrobot/executor/adapter/in/web/TaskAvailableController.java similarity index 100% rename from executorrobot/src/main/java/ch/unisg/executorrobot/executor/adapter/in/web/TaskAvailableController.java rename to executor-robot/src/main/java/ch/unisg/executorrobot/executor/adapter/in/web/TaskAvailableController.java diff --git a/executorrobot/src/main/java/ch/unisg/executorrobot/executor/adapter/out/DeleteUserFromRobotAdapter.java b/executor-robot/src/main/java/ch/unisg/executorrobot/executor/adapter/out/DeleteUserFromRobotAdapter.java similarity index 100% rename from executorrobot/src/main/java/ch/unisg/executorrobot/executor/adapter/out/DeleteUserFromRobotAdapter.java rename to executor-robot/src/main/java/ch/unisg/executorrobot/executor/adapter/out/DeleteUserFromRobotAdapter.java diff --git a/executorrobot/src/main/java/ch/unisg/executorrobot/executor/adapter/out/InstructionToRobotAdapter.java b/executor-robot/src/main/java/ch/unisg/executorrobot/executor/adapter/out/InstructionToRobotAdapter.java similarity index 100% rename from executorrobot/src/main/java/ch/unisg/executorrobot/executor/adapter/out/InstructionToRobotAdapter.java rename to executor-robot/src/main/java/ch/unisg/executorrobot/executor/adapter/out/InstructionToRobotAdapter.java diff --git a/executorrobot/src/main/java/ch/unisg/executorrobot/executor/adapter/out/UserToRobotAdapter.java b/executor-robot/src/main/java/ch/unisg/executorrobot/executor/adapter/out/UserToRobotAdapter.java similarity index 100% rename from executorrobot/src/main/java/ch/unisg/executorrobot/executor/adapter/out/UserToRobotAdapter.java rename to executor-robot/src/main/java/ch/unisg/executorrobot/executor/adapter/out/UserToRobotAdapter.java diff --git a/executorrobot/src/main/java/ch/unisg/executorrobot/executor/application/port/out/DeleteUserFromRobotPort.java b/executor-robot/src/main/java/ch/unisg/executorrobot/executor/application/port/out/DeleteUserFromRobotPort.java similarity index 100% rename from executorrobot/src/main/java/ch/unisg/executorrobot/executor/application/port/out/DeleteUserFromRobotPort.java rename to executor-robot/src/main/java/ch/unisg/executorrobot/executor/application/port/out/DeleteUserFromRobotPort.java diff --git a/executorrobot/src/main/java/ch/unisg/executorrobot/executor/application/port/out/InstructionToRobotPort.java b/executor-robot/src/main/java/ch/unisg/executorrobot/executor/application/port/out/InstructionToRobotPort.java similarity index 100% rename from executorrobot/src/main/java/ch/unisg/executorrobot/executor/application/port/out/InstructionToRobotPort.java rename to executor-robot/src/main/java/ch/unisg/executorrobot/executor/application/port/out/InstructionToRobotPort.java diff --git a/executorrobot/src/main/java/ch/unisg/executorrobot/executor/application/port/out/UserToRobotPort.java b/executor-robot/src/main/java/ch/unisg/executorrobot/executor/application/port/out/UserToRobotPort.java similarity index 100% rename from executorrobot/src/main/java/ch/unisg/executorrobot/executor/application/port/out/UserToRobotPort.java rename to executor-robot/src/main/java/ch/unisg/executorrobot/executor/application/port/out/UserToRobotPort.java diff --git a/executorrobot/src/main/java/ch/unisg/executorrobot/executor/application/service/TaskAvailableService.java b/executor-robot/src/main/java/ch/unisg/executorrobot/executor/application/service/TaskAvailableService.java similarity index 100% rename from executorrobot/src/main/java/ch/unisg/executorrobot/executor/application/service/TaskAvailableService.java rename to executor-robot/src/main/java/ch/unisg/executorrobot/executor/application/service/TaskAvailableService.java diff --git a/executorrobot/src/main/java/ch/unisg/executorrobot/executor/domain/Executor.java b/executor-robot/src/main/java/ch/unisg/executorrobot/executor/domain/Executor.java similarity index 100% rename from executorrobot/src/main/java/ch/unisg/executorrobot/executor/domain/Executor.java rename to executor-robot/src/main/java/ch/unisg/executorrobot/executor/domain/Executor.java diff --git a/executorrobot/src/main/resources/application.properties b/executor-robot/src/main/resources/application.properties similarity index 100% rename from executorrobot/src/main/resources/application.properties rename to executor-robot/src/main/resources/application.properties diff --git a/executorrobot/src/test/java/ch/unisg/executorrobot/ExecutorrobotApplicationTests.java b/executor-robot/src/test/java/ch/unisg/executorrobot/ExecutorrobotApplicationTests.java similarity index 100% rename from executorrobot/src/test/java/ch/unisg/executorrobot/ExecutorrobotApplicationTests.java rename to executor-robot/src/test/java/ch/unisg/executorrobot/ExecutorrobotApplicationTests.java diff --git a/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/ExecutorRemovedEventListenerMqttAdapter.java b/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/ExecutorRemovedEventListenerMqttAdapter.java index 71af86d..0d0923a 100644 --- a/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/ExecutorRemovedEventListenerMqttAdapter.java +++ b/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/ExecutorRemovedEventListenerMqttAdapter.java @@ -23,7 +23,7 @@ public class ExecutorRemovedEventListenerMqttAdapter extends ExecutorEventMqttLi // representation that makes sense in the context of your application. JsonNode data = new ObjectMapper().readTree(payload); - String executorId = data.get("executorURI").asText(); + String executorId = data.get("executorUri").asText(); ExecutorRemovedEvent executorRemovedEvent = new ExecutorRemovedEvent( new ExecutorURI(executorId)); diff --git a/roster/src/main/java/ch/unisg/roster/roster/adapter/out/web/PublishNewTaskEventAdapter.java b/roster/src/main/java/ch/unisg/roster/roster/adapter/out/web/PublishNewTaskEventAdapter.java index 0b16567..274d639 100644 --- a/roster/src/main/java/ch/unisg/roster/roster/adapter/out/web/PublishNewTaskEventAdapter.java +++ b/roster/src/main/java/ch/unisg/roster/roster/adapter/out/web/PublishNewTaskEventAdapter.java @@ -34,8 +34,6 @@ public class PublishNewTaskEventAdapter implements NewTaskEventPort { @Override public void publishNewTaskEvent(NewTaskEvent event) { - System.out.println(server2); - // HttpClient client = HttpClient.newHttpClient(); // HttpRequest request = HttpRequest.newBuilder() // .uri(URI.create(server + "/newtask/" + event.taskType.getValue()))