diff --git a/executor1/.gitignore b/executorcomputation/.gitignore similarity index 100% rename from executor1/.gitignore rename to executorcomputation/.gitignore diff --git a/executor1/.mvn/wrapper/MavenWrapperDownloader.java b/executorcomputation/.mvn/wrapper/MavenWrapperDownloader.java similarity index 100% rename from executor1/.mvn/wrapper/MavenWrapperDownloader.java rename to executorcomputation/.mvn/wrapper/MavenWrapperDownloader.java diff --git a/executor1/.mvn/wrapper/maven-wrapper.jar b/executorcomputation/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from executor1/.mvn/wrapper/maven-wrapper.jar rename to executorcomputation/.mvn/wrapper/maven-wrapper.jar diff --git a/executor1/.mvn/wrapper/maven-wrapper.properties b/executorcomputation/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from executor1/.mvn/wrapper/maven-wrapper.properties rename to executorcomputation/.mvn/wrapper/maven-wrapper.properties diff --git a/executor1/Dockerfile b/executorcomputation/Dockerfile similarity index 100% rename from executor1/Dockerfile rename to executorcomputation/Dockerfile diff --git a/executor1/mvnw b/executorcomputation/mvnw similarity index 100% rename from executor1/mvnw rename to executorcomputation/mvnw diff --git a/executor1/mvnw.cmd b/executorcomputation/mvnw.cmd similarity index 100% rename from executor1/mvnw.cmd rename to executorcomputation/mvnw.cmd diff --git a/executor2/pom.xml b/executorcomputation/pom.xml similarity index 97% rename from executor2/pom.xml rename to executorcomputation/pom.xml index 1f970e0..f422c55 100644 --- a/executor2/pom.xml +++ b/executorcomputation/pom.xml @@ -9,7 +9,7 @@ ch.unisg - executor2 + executorcomputation 0.0.1-SNAPSHOT executor2 Demo project for Spring Boot diff --git a/executor2/src/main/java/ch/unisg/executor2/Executor2Application.java b/executorcomputation/src/main/java/ch/unisg/executor2/ExecutorcomputationApplication.java similarity index 50% rename from executor2/src/main/java/ch/unisg/executor2/Executor2Application.java rename to executorcomputation/src/main/java/ch/unisg/executor2/ExecutorcomputationApplication.java index 03edb3d..81975ba 100644 --- a/executor2/src/main/java/ch/unisg/executor2/Executor2Application.java +++ b/executorcomputation/src/main/java/ch/unisg/executor2/ExecutorcomputationApplication.java @@ -1,15 +1,15 @@ -package ch.unisg.executor2; +package ch.unisg.executorcomputation; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import ch.unisg.executor2.executor.domain.Executor; +import ch.unisg.executorcomputation.executor.domain.Executor; @SpringBootApplication -public class Executor2Application { +public class ExecutorcomputationApplication { public static void main(String[] args) { - SpringApplication.run(Executor2Application.class, args); + SpringApplication.run(ExecutorcomputationApplication.class, args); Executor.getExecutor(); } diff --git a/executor2/src/main/java/ch/unisg/executor2/executor/adapter/in/web/TaskAvailableController.java b/executorcomputation/src/main/java/ch/unisg/executor2/executor/adapter/in/web/TaskAvailableController.java similarity index 95% rename from executor2/src/main/java/ch/unisg/executor2/executor/adapter/in/web/TaskAvailableController.java rename to executorcomputation/src/main/java/ch/unisg/executor2/executor/adapter/in/web/TaskAvailableController.java index bf53c24..a421924 100644 --- a/executor2/src/main/java/ch/unisg/executor2/executor/adapter/in/web/TaskAvailableController.java +++ b/executorcomputation/src/main/java/ch/unisg/executor2/executor/adapter/in/web/TaskAvailableController.java @@ -1,4 +1,4 @@ -package ch.unisg.executor2.executor.adapter.in.web; +package ch.unisg.executorcomputation.executor.adapter.in.web; import java.util.concurrent.CompletableFuture; diff --git a/executor2/src/main/java/ch/unisg/executor2/executor/application/service/TaskAvailableService.java b/executorcomputation/src/main/java/ch/unisg/executor2/executor/application/service/TaskAvailableService.java similarity index 85% rename from executor2/src/main/java/ch/unisg/executor2/executor/application/service/TaskAvailableService.java rename to executorcomputation/src/main/java/ch/unisg/executor2/executor/application/service/TaskAvailableService.java index 49b8e70..6a94577 100644 --- a/executor2/src/main/java/ch/unisg/executor2/executor/application/service/TaskAvailableService.java +++ b/executorcomputation/src/main/java/ch/unisg/executor2/executor/application/service/TaskAvailableService.java @@ -1,8 +1,8 @@ -package ch.unisg.executor2.executor.application.service; +package ch.unisg.executorcomputation.executor.application.service; import org.springframework.stereotype.Component; -import ch.unisg.executor2.executor.domain.Executor; +import ch.unisg.executorcomputation.executor.domain.Executor; import ch.unisg.executorbase.executor.application.port.in.TaskAvailableCommand; import ch.unisg.executorbase.executor.application.port.in.TaskAvailableUseCase; import ch.unisg.executorbase.executor.domain.ExecutorStatus; diff --git a/executor2/src/main/java/ch/unisg/executor2/executor/domain/Executor.java b/executorcomputation/src/main/java/ch/unisg/executor2/executor/domain/Executor.java similarity index 95% rename from executor2/src/main/java/ch/unisg/executor2/executor/domain/Executor.java rename to executorcomputation/src/main/java/ch/unisg/executor2/executor/domain/Executor.java index 5cc2358..eb09699 100644 --- a/executor2/src/main/java/ch/unisg/executor2/executor/domain/Executor.java +++ b/executorcomputation/src/main/java/ch/unisg/executor2/executor/domain/Executor.java @@ -1,4 +1,4 @@ -package ch.unisg.executor2.executor.domain; +package ch.unisg.executorcomputation.executor.domain; import java.util.concurrent.TimeUnit; diff --git a/executor2/src/main/resources/application.properties b/executorcomputation/src/main/resources/application.properties similarity index 100% rename from executor2/src/main/resources/application.properties rename to executorcomputation/src/main/resources/application.properties diff --git a/executor2/src/test/java/ch/unisg/executor2/Executor2ApplicationTests.java b/executorcomputation/src/test/java/ch/unisg/executor2/ExecutorcomputationApplicationTests.java similarity index 64% rename from executor2/src/test/java/ch/unisg/executor2/Executor2ApplicationTests.java rename to executorcomputation/src/test/java/ch/unisg/executor2/ExecutorcomputationApplicationTests.java index 5724a1c..f17d100 100644 --- a/executor2/src/test/java/ch/unisg/executor2/Executor2ApplicationTests.java +++ b/executorcomputation/src/test/java/ch/unisg/executor2/ExecutorcomputationApplicationTests.java @@ -1,10 +1,10 @@ -package ch.unisg.executor2; +package ch.unisg.executorcomputation; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest -class Executor2ApplicationTests { +class ExecutorcomputationApplicationTests { @Test void contextLoads() { diff --git a/executor2/.gitignore b/executorrobot/.gitignore similarity index 100% rename from executor2/.gitignore rename to executorrobot/.gitignore diff --git a/executor2/.mvn/wrapper/MavenWrapperDownloader.java b/executorrobot/.mvn/wrapper/MavenWrapperDownloader.java similarity index 100% rename from executor2/.mvn/wrapper/MavenWrapperDownloader.java rename to executorrobot/.mvn/wrapper/MavenWrapperDownloader.java diff --git a/executor2/.mvn/wrapper/maven-wrapper.jar b/executorrobot/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from executor2/.mvn/wrapper/maven-wrapper.jar rename to executorrobot/.mvn/wrapper/maven-wrapper.jar diff --git a/executor2/.mvn/wrapper/maven-wrapper.properties b/executorrobot/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from executor2/.mvn/wrapper/maven-wrapper.properties rename to executorrobot/.mvn/wrapper/maven-wrapper.properties diff --git a/executor2/Dockerfile b/executorrobot/Dockerfile similarity index 100% rename from executor2/Dockerfile rename to executorrobot/Dockerfile diff --git a/executor2/mvnw b/executorrobot/mvnw similarity index 100% rename from executor2/mvnw rename to executorrobot/mvnw diff --git a/executor2/mvnw.cmd b/executorrobot/mvnw.cmd similarity index 100% rename from executor2/mvnw.cmd rename to executorrobot/mvnw.cmd diff --git a/executor1/pom.xml b/executorrobot/pom.xml similarity index 98% rename from executor1/pom.xml rename to executorrobot/pom.xml index 8a5b9e3..f5348d4 100644 --- a/executor1/pom.xml +++ b/executorrobot/pom.xml @@ -9,7 +9,7 @@ ch.unisg - executor1 + executorrobot 0.0.1-SNAPSHOT executor1 Demo project for Spring Boot diff --git a/executor1/src/main/java/ch/unisg/executor1/Executor1Application.java b/executorrobot/src/main/java/ch/unisg/executor1/ExecutorrobotApplication.java similarity index 53% rename from executor1/src/main/java/ch/unisg/executor1/Executor1Application.java rename to executorrobot/src/main/java/ch/unisg/executor1/ExecutorrobotApplication.java index dfb8d8c..fcee5ee 100644 --- a/executor1/src/main/java/ch/unisg/executor1/Executor1Application.java +++ b/executorrobot/src/main/java/ch/unisg/executor1/ExecutorrobotApplication.java @@ -1,15 +1,15 @@ -package ch.unisg.executor1; +package ch.unisg.executorrobot; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import ch.unisg.executor1.executor.domain.Executor; +import ch.unisg.executorrobot.executor.domain.Executor; @SpringBootApplication -public class Executor1Application { +public class ExecutorrobotApplication { public static void main(String[] args) { - SpringApplication.run(Executor1Application.class, args); + SpringApplication.run(ExecutorrobotApplication.class, args); Executor.getExecutor(); } diff --git a/executor1/src/main/java/ch/unisg/executor1/executor/adapter/in/web/TaskAvailableController.java b/executorrobot/src/main/java/ch/unisg/executor1/executor/adapter/in/web/TaskAvailableController.java similarity index 96% rename from executor1/src/main/java/ch/unisg/executor1/executor/adapter/in/web/TaskAvailableController.java rename to executorrobot/src/main/java/ch/unisg/executor1/executor/adapter/in/web/TaskAvailableController.java index a0e4f75..7f256df 100644 --- a/executor1/src/main/java/ch/unisg/executor1/executor/adapter/in/web/TaskAvailableController.java +++ b/executorrobot/src/main/java/ch/unisg/executor1/executor/adapter/in/web/TaskAvailableController.java @@ -1,4 +1,4 @@ -package ch.unisg.executor1.executor.adapter.in.web; +package ch.unisg.executorrobot.executor.adapter.in.web; import java.util.concurrent.CompletableFuture; diff --git a/executor1/src/main/java/ch/unisg/executor1/executor/adapter/out/DeleteUserFromRobotAdapter.java b/executorrobot/src/main/java/ch/unisg/executor1/executor/adapter/out/DeleteUserFromRobotAdapter.java similarity index 89% rename from executor1/src/main/java/ch/unisg/executor1/executor/adapter/out/DeleteUserFromRobotAdapter.java rename to executorrobot/src/main/java/ch/unisg/executor1/executor/adapter/out/DeleteUserFromRobotAdapter.java index 94c2309..157bc3e 100644 --- a/executor1/src/main/java/ch/unisg/executor1/executor/adapter/out/DeleteUserFromRobotAdapter.java +++ b/executorrobot/src/main/java/ch/unisg/executor1/executor/adapter/out/DeleteUserFromRobotAdapter.java @@ -1,4 +1,4 @@ -package ch.unisg.executor1.executor.adapter.out; +package ch.unisg.executorrobot.executor.adapter.out; import java.io.IOException; import java.net.URI; import java.net.http.HttpClient; @@ -8,7 +8,7 @@ import java.net.http.HttpResponse; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Component; -import ch.unisg.executor1.executor.application.port.out.DeleteUserFromRobotPort; +import ch.unisg.executorrobot.executor.application.port.out.DeleteUserFromRobotPort; @Component @Primary diff --git a/executor1/src/main/java/ch/unisg/executor1/executor/adapter/out/InstructionToRobotAdapter.java b/executorrobot/src/main/java/ch/unisg/executor1/executor/adapter/out/InstructionToRobotAdapter.java similarity index 90% rename from executor1/src/main/java/ch/unisg/executor1/executor/adapter/out/InstructionToRobotAdapter.java rename to executorrobot/src/main/java/ch/unisg/executor1/executor/adapter/out/InstructionToRobotAdapter.java index f8b7012..c7507e4 100644 --- a/executor1/src/main/java/ch/unisg/executor1/executor/adapter/out/InstructionToRobotAdapter.java +++ b/executorrobot/src/main/java/ch/unisg/executor1/executor/adapter/out/InstructionToRobotAdapter.java @@ -1,4 +1,4 @@ -package ch.unisg.executor1.executor.adapter.out; +package ch.unisg.executorrobot.executor.adapter.out; import java.io.IOException; import java.net.URI; import java.net.http.HttpClient; @@ -8,7 +8,7 @@ import java.net.http.HttpResponse; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Component; -import ch.unisg.executor1.executor.application.port.out.InstructionToRobotPort; +import ch.unisg.executorrobot.executor.application.port.out.InstructionToRobotPort; @Component @Primary diff --git a/executor1/src/main/java/ch/unisg/executor1/executor/adapter/out/UserToRobotAdapter.java b/executorrobot/src/main/java/ch/unisg/executor1/executor/adapter/out/UserToRobotAdapter.java similarity index 91% rename from executor1/src/main/java/ch/unisg/executor1/executor/adapter/out/UserToRobotAdapter.java rename to executorrobot/src/main/java/ch/unisg/executor1/executor/adapter/out/UserToRobotAdapter.java index f874892..92ca8c1 100644 --- a/executor1/src/main/java/ch/unisg/executor1/executor/adapter/out/UserToRobotAdapter.java +++ b/executorrobot/src/main/java/ch/unisg/executor1/executor/adapter/out/UserToRobotAdapter.java @@ -1,4 +1,4 @@ -package ch.unisg.executor1.executor.adapter.out; +package ch.unisg.executorrobot.executor.adapter.out; import java.io.IOException; import java.net.URI; import java.net.http.HttpClient; @@ -8,7 +8,7 @@ import java.net.http.HttpResponse; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Component; -import ch.unisg.executor1.executor.application.port.out.UserToRobotPort; +import ch.unisg.executorrobot.executor.application.port.out.UserToRobotPort; @Component @Primary diff --git a/executor1/src/main/java/ch/unisg/executor1/executor/application/port/out/DeleteUserFromRobotPort.java b/executorrobot/src/main/java/ch/unisg/executor1/executor/application/port/out/DeleteUserFromRobotPort.java similarity index 59% rename from executor1/src/main/java/ch/unisg/executor1/executor/application/port/out/DeleteUserFromRobotPort.java rename to executorrobot/src/main/java/ch/unisg/executor1/executor/application/port/out/DeleteUserFromRobotPort.java index fc6f5d7..2411353 100644 --- a/executor1/src/main/java/ch/unisg/executor1/executor/application/port/out/DeleteUserFromRobotPort.java +++ b/executorrobot/src/main/java/ch/unisg/executor1/executor/application/port/out/DeleteUserFromRobotPort.java @@ -1,4 +1,4 @@ -package ch.unisg.executor1.executor.application.port.out; +package ch.unisg.executorrobot.executor.application.port.out; public interface DeleteUserFromRobotPort { boolean deleteUserFromRobot(String key); diff --git a/executor1/src/main/java/ch/unisg/executor1/executor/application/port/out/InstructionToRobotPort.java b/executorrobot/src/main/java/ch/unisg/executor1/executor/application/port/out/InstructionToRobotPort.java similarity index 58% rename from executor1/src/main/java/ch/unisg/executor1/executor/application/port/out/InstructionToRobotPort.java rename to executorrobot/src/main/java/ch/unisg/executor1/executor/application/port/out/InstructionToRobotPort.java index bbf4034..97985b0 100644 --- a/executor1/src/main/java/ch/unisg/executor1/executor/application/port/out/InstructionToRobotPort.java +++ b/executorrobot/src/main/java/ch/unisg/executor1/executor/application/port/out/InstructionToRobotPort.java @@ -1,4 +1,4 @@ -package ch.unisg.executor1.executor.application.port.out; +package ch.unisg.executorrobot.executor.application.port.out; public interface InstructionToRobotPort { boolean instructionToRobot(String key); diff --git a/executor1/src/main/java/ch/unisg/executor1/executor/application/port/out/UserToRobotPort.java b/executorrobot/src/main/java/ch/unisg/executor1/executor/application/port/out/UserToRobotPort.java similarity index 66% rename from executor1/src/main/java/ch/unisg/executor1/executor/application/port/out/UserToRobotPort.java rename to executorrobot/src/main/java/ch/unisg/executor1/executor/application/port/out/UserToRobotPort.java index 35bbb93..3da8ded 100644 --- a/executor1/src/main/java/ch/unisg/executor1/executor/application/port/out/UserToRobotPort.java +++ b/executorrobot/src/main/java/ch/unisg/executor1/executor/application/port/out/UserToRobotPort.java @@ -1,4 +1,4 @@ -package ch.unisg.executor1.executor.application.port.out; +package ch.unisg.executorrobot.executor.application.port.out; import ch.unisg.executorbase.executor.domain.ExecutorType; diff --git a/executor1/src/main/java/ch/unisg/executor1/executor/application/service/TaskAvailableService.java b/executorrobot/src/main/java/ch/unisg/executor1/executor/application/service/TaskAvailableService.java similarity index 87% rename from executor1/src/main/java/ch/unisg/executor1/executor/application/service/TaskAvailableService.java rename to executorrobot/src/main/java/ch/unisg/executor1/executor/application/service/TaskAvailableService.java index c709fcf..5d26502 100644 --- a/executor1/src/main/java/ch/unisg/executor1/executor/application/service/TaskAvailableService.java +++ b/executorrobot/src/main/java/ch/unisg/executor1/executor/application/service/TaskAvailableService.java @@ -1,8 +1,8 @@ -package ch.unisg.executor1.executor.application.service; +package ch.unisg.executorrobot.executor.application.service; import org.springframework.stereotype.Component; -import ch.unisg.executor1.executor.domain.Executor; +import ch.unisg.executorrobot.executor.domain.Executor; import ch.unisg.executorbase.executor.application.port.in.TaskAvailableCommand; import ch.unisg.executorbase.executor.application.port.in.TaskAvailableUseCase; import ch.unisg.executorbase.executor.domain.ExecutorStatus; diff --git a/executor1/src/main/java/ch/unisg/executor1/executor/domain/Executor.java b/executorrobot/src/main/java/ch/unisg/executor1/executor/domain/Executor.java similarity index 73% rename from executor1/src/main/java/ch/unisg/executor1/executor/domain/Executor.java rename to executorrobot/src/main/java/ch/unisg/executor1/executor/domain/Executor.java index 84b576a..44ddcb4 100644 --- a/executor1/src/main/java/ch/unisg/executor1/executor/domain/Executor.java +++ b/executorrobot/src/main/java/ch/unisg/executor1/executor/domain/Executor.java @@ -1,15 +1,15 @@ -package ch.unisg.executor1.executor.domain; +package ch.unisg.executorrobot.executor.domain; import java.net.http.HttpClient; import java.net.http.HttpResponse; import java.util.concurrent.TimeUnit; -import ch.unisg.executor1.executor.adapter.out.DeleteUserFromRobotAdapter; -import ch.unisg.executor1.executor.adapter.out.InstructionToRobotAdapter; -import ch.unisg.executor1.executor.adapter.out.UserToRobotAdapter; -import ch.unisg.executor1.executor.application.port.out.DeleteUserFromRobotPort; -import ch.unisg.executor1.executor.application.port.out.InstructionToRobotPort; -import ch.unisg.executor1.executor.application.port.out.UserToRobotPort; +import ch.unisg.executorrobot.executor.adapter.out.DeleteUserFromRobotAdapter; +import ch.unisg.executorrobot.executor.adapter.out.InstructionToRobotAdapter; +import ch.unisg.executorrobot.executor.adapter.out.UserToRobotAdapter; +import ch.unisg.executorrobot.executor.application.port.out.DeleteUserFromRobotPort; +import ch.unisg.executorrobot.executor.application.port.out.InstructionToRobotPort; +import ch.unisg.executorrobot.executor.application.port.out.UserToRobotPort; import ch.unisg.executorbase.executor.domain.ExecutorBase; import ch.unisg.executorbase.executor.domain.ExecutorType; diff --git a/executor1/src/main/resources/application.properties b/executorrobot/src/main/resources/application.properties similarity index 100% rename from executor1/src/main/resources/application.properties rename to executorrobot/src/main/resources/application.properties diff --git a/executor1/src/test/java/ch/unisg/executor1/Executor1ApplicationTests.java b/executorrobot/src/test/java/ch/unisg/executor1/ExecutorrobotApplicationTests.java similarity index 68% rename from executor1/src/test/java/ch/unisg/executor1/Executor1ApplicationTests.java rename to executorrobot/src/test/java/ch/unisg/executor1/ExecutorrobotApplicationTests.java index 889c9cd..82f67a8 100644 --- a/executor1/src/test/java/ch/unisg/executor1/Executor1ApplicationTests.java +++ b/executorrobot/src/test/java/ch/unisg/executor1/ExecutorrobotApplicationTests.java @@ -1,10 +1,10 @@ -package ch.unisg.executor1; +package ch.unisg.executorrobot; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest -class Executor1ApplicationTests { +class ExecutorrobotApplicationTests { @Test void contextLoads() {