Merge remote-tracking branch 'origin/dev' into common

executorcomputation/pom.xml

@@ -9,7 +9,7 @@
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>ch.unisg</groupId>
-	<artifactId>executor2</artifactId>
+	<artifactId>executorcomputation</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>executor2</name>
 	<description>Demo project for Spring Boot</description>

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();
 	}
 

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;
 

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;

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;
 

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() {

executorrobot/pom.xml

@@ -9,7 +9,7 @@
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>ch.unisg</groupId>
-	<artifactId>executor1</artifactId>
+	<artifactId>executorrobot</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>executor1</name>
 	<description>Demo project for Spring Boot</description>

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();
 	}
 

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;
 

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

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

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

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);

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);

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;
 

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;

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.executorrobot.executor.adapter.out.DeleteUserFromRobotAdapter;
-import ch.unisg.executor1.executor.adapter.out.InstructionToRobotAdapter;
+import ch.unisg.executorrobot.executor.adapter.out.InstructionToRobotAdapter;
-import ch.unisg.executor1.executor.adapter.out.UserToRobotAdapter;
+import ch.unisg.executorrobot.executor.adapter.out.UserToRobotAdapter;
-import ch.unisg.executor1.executor.application.port.out.DeleteUserFromRobotPort;
+import ch.unisg.executorrobot.executor.application.port.out.DeleteUserFromRobotPort;
-import ch.unisg.executor1.executor.application.port.out.InstructionToRobotPort;
+import ch.unisg.executorrobot.executor.application.port.out.InstructionToRobotPort;
-import ch.unisg.executor1.executor.application.port.out.UserToRobotPort;
+import ch.unisg.executorrobot.executor.application.port.out.UserToRobotPort;
 import ch.unisg.executorbase.executor.domain.ExecutorBase;
 import ch.unisg.executorbase.executor.domain.ExecutorType;
 

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() {