Merge pull request #67 from SCS-ASSE-FS21-Group1/renaming-executors

Renaming executors

executor-base/pom.xml

@@ -9,9 +9,9 @@
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>ch.unisg</groupId>
-	<artifactId>executorbase</artifactId>
+	<artifactId>executor-base</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<name>executorbase</name>
+	<name>executor-base</name>
 	<description>Demo project for Spring Boot</description>
 	<properties>
 		<java.version>11</java.version>

executor-computation/pom.xml

@@ -9,9 +9,9 @@
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>ch.unisg</groupId>
-	<artifactId>executorcomputation</artifactId>
+	<artifactId>executor-computation</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<name>executorcomputation</name>
+	<name>executor-computation</name>
 	<description>Demo project for Spring Boot</description>
 	<properties>
 		<java.version>11</java.version>
@@ -42,7 +42,7 @@
 		</dependency>
 		<dependency>
 			<groupId>ch.unisg</groupId>
-			<artifactId>executorbase</artifactId>
+			<artifactId>executor-base</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
 		</dependency>

executor-robot/pom.xml

@@ -9,9 +9,9 @@
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>ch.unisg</groupId>
-	<artifactId>executorrobot</artifactId>
+	<artifactId>executor-robot</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<name>executorrobot</name>
+	<name>executor-robot</name>
 	<description>Demo project for Spring Boot</description>
 	<properties>
 		<java.version>11</java.version>
@@ -42,7 +42,7 @@
 		</dependency>
 		<dependency>
 			<groupId>ch.unisg</groupId>
-			<artifactId>executorbase</artifactId>
+			<artifactId>executor-base</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>

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

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