assignment/pom.xml

@@ -30,6 +30,11 @@
 			<scope>runtime</scope>
 			<optional>true</optional>
 		</dependency>
+
+        <dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-validation</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
@@ -40,6 +45,24 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>1.1.0.Final</version>
+        </dependency>
+        <dependency>
+			<groupId>javax.transaction</groupId>
+			<artifactId>javax.transaction-api</artifactId>
+			<version>1.2</version>
+		</dependency>
+
+        <dependency>
+			<groupId>org.json</groupId>
+			<artifactId>json</artifactId>
+			<version>20210307</version>
+		</dependency>
+
+
 	</dependencies>
 
 	<build>

assignment/src/main/java/ch/unisg/assignment/TestController.java

@@ -1,12 +0,0 @@
-package ch.unisg.assignment;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class TestController {
-    @RequestMapping("/")
-    public String index() {
-        return "Hello World! Assignment";
-    }
-}

assignment/src/main/java/ch/unisg/assignment/assignment/adapter/in/web/ApplyForTaskController.java

@@ -0,0 +1,36 @@
+package ch.unisg.assignment.assignment.adapter.in.web;
+
+import javax.validation.ConstraintViolationException;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.server.ResponseStatusException;
+
+import ch.unisg.assignment.assignment.application.port.in.ApplyForTaskCommand;
+import ch.unisg.assignment.assignment.application.port.in.ApplyForTaskUseCase;
+import ch.unisg.assignment.assignment.domain.ExecutorInfo;
+import ch.unisg.assignment.assignment.domain.Task;
+
+@RestController
+public class ApplyForTaskController {
+    private final ApplyForTaskUseCase applyForTaskUseCase;
+
+    public ApplyForTaskController(ApplyForTaskUseCase applyForTaskUseCase) {
+        this.applyForTaskUseCase = applyForTaskUseCase;
+    }
+
+    @PostMapping(path = "/task/apply", consumes = {"application/json"})
+    public Task applyForTask(@RequestBody ExecutorInfo executorInfo) {
+        try {
+            ApplyForTaskCommand command = new ApplyForTaskCommand(executorInfo.getExecutorType(),
+                executorInfo.getIp(), executorInfo.getPort());
+
+            return applyForTaskUseCase.applyForTask(command);
+
+        } catch (ConstraintViolationException e) {
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, e.getMessage());
+        }
+    }
+}

assignment/src/main/java/ch/unisg/assignment/assignment/adapter/in/web/NewTaskController.java

@@ -0,0 +1,41 @@
+package ch.unisg.assignment.assignment.adapter.in.web;
+
+import javax.validation.ConstraintViolationException;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.server.ResponseStatusException;
+
+import ch.unisg.assignment.assignment.application.port.in.NewTaskCommand;
+import ch.unisg.assignment.assignment.application.port.in.NewTaskUseCase;
+import ch.unisg.assignment.assignment.domain.Task;
+
+@RestController
+public class NewTaskController {
+    private final NewTaskUseCase newTaskUseCase;
+
+    public NewTaskController(NewTaskUseCase newTaskUseCase) {
+        this.newTaskUseCase = newTaskUseCase;
+    }
+
+    @PostMapping(path = "/task", consumes = {"application/json"})
+    public ResponseEntity<Void> addNewTaskTaskToTaskList(@RequestBody Task task) {
+        try {
+            NewTaskCommand command = new NewTaskCommand(
+                    task.getTaskID(), task.getTaskType()
+            );
+
+            boolean success = newTaskUseCase.addNewTaskToQueue(command);
+
+            if (success) {
+                return new ResponseEntity<>(HttpStatus.CREATED);
+            }
+            return new ResponseEntity<>(HttpStatus.CONFLICT);
+        } catch (ConstraintViolationException e) {
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, e.getMessage());
+        }
+    }
+}

assignment/src/main/java/ch/unisg/assignment/assignment/adapter/in/web/TaskCompletedController.java

@@ -0,0 +1,34 @@
+package ch.unisg.assignment.assignment.adapter.in.web;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import ch.unisg.assignment.assignment.application.port.in.TaskCompletedCommand;
+import ch.unisg.assignment.assignment.application.port.in.TaskCompletedUseCase;
+import ch.unisg.assignment.assignment.domain.Task;
+
+@RestController
+public class TaskCompletedController {
+
+    private final TaskCompletedUseCase taskCompletedUseCase;
+
+    public TaskCompletedController(TaskCompletedUseCase taskCompletedUseCase) {
+        this.taskCompletedUseCase = taskCompletedUseCase;
+    }
+
+    @PostMapping(path = "/task/completed", consumes = {"application/json"})
+    public ResponseEntity<Void> addNewTaskTaskToTaskList(@RequestBody Task task) {
+
+        TaskCompletedCommand command = new TaskCompletedCommand(task.getTaskID(), task.getTaskType(),
+            task.getStatus(), task.getResult());
+
+        taskCompletedUseCase.taskCompleted(command);
+
+        return new ResponseEntity<>(HttpStatus.OK);
+
+    }
+
+}

assignment/src/main/java/ch/unisg/assignment/assignment/adapter/out/web/PublishNewTaskEventAdapter.java

@@ -0,0 +1,40 @@
+package ch.unisg.assignment.assignment.adapter.out.web;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Component;
+
+import ch.unisg.assignment.assignment.application.port.out.NewTaskEventPort;
+import ch.unisg.assignment.assignment.domain.NewTaskEvent;
+
+@Component
+@Primary
+public class PublishNewTaskEventAdapter implements NewTaskEventPort {
+
+    String server = "http://127.0.0.1:8085";
+
+    @Override
+    public void publishNewTaskEvent(NewTaskEvent event) {
+
+        HttpClient client = HttpClient.newHttpClient();
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(URI.create(server + "/newtask/" + event.taskType))
+                .GET()
+                .build();
+
+
+        try {
+            client.send(request, HttpResponse.BodyHandlers.ofString());
+        } catch (IOException | InterruptedException e) {
+            e.printStackTrace();
+            // Restore interrupted state...
+            Thread.currentThread().interrupt();
+        }
+    }
+
+}

assignment/src/main/java/ch/unisg/assignment/assignment/adapter/out/web/PublishTaskAssignedEventAdapter.java

@@ -0,0 +1,46 @@
+package ch.unisg.assignment.assignment.adapter.out.web;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+
+import org.json.JSONObject;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Component;
+
+import ch.unisg.assignment.assignment.application.port.out.TaskAssignedEventPort;
+import ch.unisg.assignment.assignment.domain.TaskAssignedEvent;
+
+@Component
+@Primary
+public class PublishTaskAssignedEventAdapter implements TaskAssignedEventPort {
+
+    String server = "http://127.0.0.1:8085";
+
+    @Override
+    public void publishTaskAssignedEvent(TaskAssignedEvent event) {
+
+        String body = new JSONObject()
+                  .put("taskId", event.taskID)
+                  .toString();
+
+        HttpClient client = HttpClient.newHttpClient();
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(URI.create(server + "/tasks/completeTask"))
+                .header("Content-Type", "application/json")
+                .POST(HttpRequest.BodyPublishers.ofString(body))
+                .build();
+
+
+        try {
+            client.send(request, HttpResponse.BodyHandlers.ofString());
+        } catch (IOException | InterruptedException e) {
+            e.printStackTrace();
+            // Restore interrupted state...
+            Thread.currentThread().interrupt();
+        }
+    }
+
+}

assignment/src/main/java/ch/unisg/assignment/assignment/adapter/out/web/PublishTaskCompletedEventAdapter.java

@@ -0,0 +1,49 @@
+package ch.unisg.assignment.assignment.adapter.out.web;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+
+import org.json.JSONObject;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Component;
+
+import ch.unisg.assignment.assignment.application.port.out.TaskCompletedEventPort;
+import ch.unisg.assignment.assignment.domain.TaskCompletedEvent;
+
+@Component
+@Primary
+public class PublishTaskCompletedEventAdapter implements TaskCompletedEventPort {
+
+    String server = "http://127.0.0.1:8081";
+
+    @Override
+    public void publishTaskCompleted(TaskCompletedEvent event) {
+
+        String body = new JSONObject()
+                  .put("taskId", event.taskID)
+                  .put("status", event.status)
+                  .put("taskResult", event.result)
+                  .toString();
+
+        HttpClient client = HttpClient.newHttpClient();
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(URI.create(server + "/tasks/completeTask"))
+                .header("Content-Type", "application/json")
+                .POST(HttpRequest.BodyPublishers.ofString(body))
+                .build();
+
+
+        try {
+            client.send(request, HttpResponse.BodyHandlers.ofString());
+        } catch (IOException | InterruptedException e) {
+            e.printStackTrace();
+            // Restore interrupted state...
+            Thread.currentThread().interrupt();
+        }
+
+    }
+
+}

assignment/src/main/java/ch/unisg/assignment/assignment/application/port/in/ApplyForTaskCommand.java

@@ -0,0 +1,29 @@
+package ch.unisg.assignment.assignment.application.port.in;
+
+import javax.validation.constraints.NotNull;
+
+import ch.unisg.assignment.common.SelfValidating;
+import lombok.EqualsAndHashCode;
+import lombok.Value;
+
+@Value
+@EqualsAndHashCode(callSuper=false)
+public class ApplyForTaskCommand extends SelfValidating<ApplyForTaskCommand>{
+
+    @NotNull
+    private final String taskType;
+
+    @NotNull
+    private final String executorIP;
+
+
+    @NotNull
+    private final int executorPort;
+
+    public ApplyForTaskCommand(String taskType, String executorIP, int executorPort) {
+        this.taskType = taskType;
+        this.executorIP = executorIP;
+        this.executorPort = executorPort;
+        this.validateSelf();
+    }
+}

assignment/src/main/java/ch/unisg/assignment/assignment/application/port/in/ApplyForTaskUseCase.java

@@ -0,0 +1,7 @@
+package ch.unisg.assignment.assignment.application.port.in;
+
+import ch.unisg.assignment.assignment.domain.Task;
+
+public interface ApplyForTaskUseCase {
+    Task applyForTask(ApplyForTaskCommand applyForTaskCommand);
+}

assignment/src/main/java/ch/unisg/assignment/assignment/application/port/in/NewTaskCommand.java

@@ -0,0 +1,23 @@
+package ch.unisg.assignment.assignment.application.port.in;
+
+import javax.validation.constraints.NotNull;
+
+import ch.unisg.assignment.common.SelfValidating;
+
+import lombok.Value;
+
+@Value
+public class NewTaskCommand extends SelfValidating<NewTaskCommand> {
+
+    @NotNull
+    private final String taskID;
+
+    @NotNull
+    private final String taskType;
+
+    public NewTaskCommand(String taskID, String taskType) {
+        this.taskID = taskID;
+        this.taskType = taskType;
+        this.validateSelf();
+    }
+}

assignment/src/main/java/ch/unisg/assignment/assignment/application/port/in/NewTaskUseCase.java

@@ -0,0 +1,5 @@
+package ch.unisg.assignment.assignment.application.port.in;
+
+public interface NewTaskUseCase {
+    boolean addNewTaskToQueue(NewTaskCommand newTaskCommand);
+}

assignment/src/main/java/ch/unisg/assignment/assignment/application/port/in/TaskCompletedCommand.java

@@ -0,0 +1,33 @@
+package ch.unisg.assignment.assignment.application.port.in;
+
+import javax.validation.constraints.NotNull;
+
+import ch.unisg.assignment.common.SelfValidating;
+import lombok.EqualsAndHashCode;
+import lombok.Value;
+
+@Value
+@EqualsAndHashCode(callSuper=false)
+public class TaskCompletedCommand extends SelfValidating<TaskCompletedCommand>{
+
+    @NotNull
+    private final String taskID;
+
+    @NotNull
+    private final String taskType;
+
+    @NotNull
+    private final String taskStatus;
+
+    @NotNull
+    private final String taskResult;
+
+    public TaskCompletedCommand(String taskID, String taskType, String taskStatus, String taskResult) {
+        this.taskID = taskID;
+        this.taskType = taskType;
+        this.taskStatus = taskStatus;
+        this.taskResult = taskResult;
+        this.validateSelf();
+    }
+
+}

assignment/src/main/java/ch/unisg/assignment/assignment/application/port/in/TaskCompletedUseCase.java

@@ -0,0 +1,5 @@
+package ch.unisg.assignment.assignment.application.port.in;
+
+public interface TaskCompletedUseCase {
+    void taskCompleted(TaskCompletedCommand taskCompletedCommand);
+}

assignment/src/main/java/ch/unisg/assignment/assignment/application/port/out/NewTaskEventPort.java

@@ -0,0 +1,7 @@
+package ch.unisg.assignment.assignment.application.port.out;
+
+import ch.unisg.assignment.assignment.domain.NewTaskEvent;
+
+public interface NewTaskEventPort {
+    void publishNewTaskEvent(NewTaskEvent event);
+}

assignment/src/main/java/ch/unisg/assignment/assignment/application/port/out/TaskAssignedEventPort.java

@@ -0,0 +1,7 @@
+package ch.unisg.assignment.assignment.application.port.out;
+
+import ch.unisg.assignment.assignment.domain.TaskAssignedEvent;
+
+public interface TaskAssignedEventPort {
+    void publishTaskAssignedEvent(TaskAssignedEvent taskAssignedEvent);
+}

assignment/src/main/java/ch/unisg/assignment/assignment/application/port/out/TaskCompletedEventPort.java

@@ -0,0 +1,7 @@
+package ch.unisg.assignment.assignment.application.port.out;
+
+import ch.unisg.assignment.assignment.domain.TaskCompletedEvent;
+
+public interface TaskCompletedEventPort {
+    void publishTaskCompleted(TaskCompletedEvent event);
+}

assignment/src/main/java/ch/unisg/assignment/assignment/application/service/ApplyForTaskService.java

@@ -0,0 +1,34 @@
+package ch.unisg.assignment.assignment.application.service;
+
+import javax.transaction.Transactional;
+
+import org.springframework.stereotype.Component;
+
+import ch.unisg.assignment.assignment.application.port.in.ApplyForTaskCommand;
+import ch.unisg.assignment.assignment.application.port.in.ApplyForTaskUseCase;
+import ch.unisg.assignment.assignment.application.port.out.TaskAssignedEventPort;
+import ch.unisg.assignment.assignment.domain.Roster;
+import ch.unisg.assignment.assignment.domain.Task;
+import ch.unisg.assignment.assignment.domain.TaskAssignedEvent;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Component
+@Transactional
+public class ApplyForTaskService implements ApplyForTaskUseCase {
+
+    private final TaskAssignedEventPort taskAssignedEventPort;
+
+    @Override
+    public Task applyForTask(ApplyForTaskCommand command) {
+        Task task = Roster.getInstance().assignTaskToExecutor(command.getTaskType(),
+            command.getExecutorIP(), command.getExecutorPort());
+
+        if (task != null) {
+            taskAssignedEventPort.publishTaskAssignedEvent(new TaskAssignedEvent(task.getTaskID()));
+        }
+
+        return task;
+    }
+
+}

assignment/src/main/java/ch/unisg/assignment/assignment/application/service/NewTaskService.java

@@ -0,0 +1,46 @@
+package ch.unisg.assignment.assignment.application.service;
+
+import java.util.Arrays;
+import java.util.List;
+
+import javax.transaction.Transactional;
+
+import org.springframework.stereotype.Component;
+
+import ch.unisg.assignment.assignment.application.port.in.NewTaskCommand;
+import ch.unisg.assignment.assignment.application.port.in.NewTaskUseCase;
+import ch.unisg.assignment.assignment.application.port.out.NewTaskEventPort;
+import ch.unisg.assignment.assignment.domain.NewTaskEvent;
+import ch.unisg.assignment.assignment.domain.Roster;
+import ch.unisg.assignment.assignment.domain.Task;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Component
+@Transactional
+public class NewTaskService implements NewTaskUseCase {
+
+    private final NewTaskEventPort newTaskEventPort;
+
+    @Override
+    public boolean addNewTaskToQueue(NewTaskCommand command) {
+
+        // TODO Get availableTaskTypes from  executor pool
+        List<String> availableTaskTypes = Arrays.asList("addition", "robot");
+
+        if (!availableTaskTypes.contains(command.getTaskType())) {
+            return false;
+        }
+
+        Task task = new Task(command.getTaskID(), command.getTaskType());
+
+        Roster.getInstance().addTaskToQueue(task);
+
+        // TODO this event should be in the roster function xyz
+        NewTaskEvent newTaskEvent = new NewTaskEvent(task.getTaskType());
+        newTaskEventPort.publishNewTaskEvent(newTaskEvent);
+
+        return true;
+    }
+
+}

assignment/src/main/java/ch/unisg/assignment/assignment/application/service/TaskCompletedService.java

@@ -0,0 +1,31 @@
+package ch.unisg.assignment.assignment.application.service;
+
+import javax.transaction.Transactional;
+
+import org.springframework.stereotype.Component;
+
+import ch.unisg.assignment.assignment.application.port.in.TaskCompletedCommand;
+import ch.unisg.assignment.assignment.application.port.in.TaskCompletedUseCase;
+import ch.unisg.assignment.assignment.application.port.out.TaskCompletedEventPort;
+import ch.unisg.assignment.assignment.domain.Roster;
+import ch.unisg.assignment.assignment.domain.TaskCompletedEvent;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Component
+@Transactional
+public class TaskCompletedService implements TaskCompletedUseCase {
+
+    private final TaskCompletedEventPort taskCompletedEventPort;
+
+    @Override
+    public void taskCompleted(TaskCompletedCommand command) {
+
+        Roster.getInstance().taskCompleted(command.getTaskID());
+
+        taskCompletedEventPort.publishTaskCompleted(new TaskCompletedEvent(command.getTaskID(),
+            command.getTaskStatus(), command.getTaskResult()));
+
+    }
+
+}

assignment/src/main/java/ch/unisg/assignment/assignment/domain/ExecutorInfo.java

@@ -0,0 +1,18 @@
+package ch.unisg.assignment.assignment.domain;
+
+import lombok.Getter;
+import lombok.Setter;
+
+public class ExecutorInfo {
+    @Getter
+    @Setter
+    private String ip;
+
+    @Getter
+    @Setter
+    private int port;
+
+    @Getter
+    @Setter
+    private String executorType;
+}

assignment/src/main/java/ch/unisg/assignment/assignment/domain/NewTaskEvent.java

@@ -0,0 +1,9 @@
+package ch.unisg.assignment.assignment.domain;
+
+public class NewTaskEvent {
+    public String taskType;
+
+    public NewTaskEvent(String taskType) {
+        this.taskType = taskType;
+    }
+}

assignment/src/main/java/ch/unisg/assignment/assignment/domain/Roster.java

@@ -0,0 +1,49 @@
+package ch.unisg.assignment.assignment.domain;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+
+public class Roster {
+
+    private static final Roster roster = new Roster();
+
+    private HashMap<String, ArrayList<Task>> queues = new HashMap<>();
+
+    private HashMap<String, RosterItem> rosterMap = new HashMap<>();
+
+    public static Roster getInstance() {
+        return roster;
+    }
+
+    private Roster() {}
+
+    public void addTaskToQueue(Task task) {
+        if (queues.containsKey(task.getTaskType().toUpperCase())) {
+            queues.get(task.getTaskType().toUpperCase()).add(task);
+        } else {
+            queues.put(task.getTaskType().toUpperCase(), new ArrayList<>(Arrays.asList(task)));
+        }
+    }
+
+    public Task assignTaskToExecutor(String taskType, String executorIP, int executorPort) {
+        if (!queues.containsKey(taskType.toUpperCase())) {
+            return null;
+        }
+        if (queues.get(taskType.toUpperCase()).isEmpty()) {
+            return null;
+        }
+
+        Task task = queues.get(taskType.toUpperCase()).remove(0);
+
+        rosterMap.put(task.getTaskID(), new RosterItem(task.getTaskID(), task.getTaskType(),
+            executorIP, executorPort));
+
+        return task;
+    }
+
+    public void taskCompleted(String taskID) {
+        rosterMap.remove(taskID);
+    }
+
+}

assignment/src/main/java/ch/unisg/assignment/assignment/domain/RosterItem.java

@@ -0,0 +1,27 @@
+package ch.unisg.assignment.assignment.domain;
+
+import lombok.Getter;
+
+public class RosterItem {
+
+    @Getter
+    private String taskID;
+
+    @Getter
+    private String taskType;
+
+    @Getter
+    private String executorIP;
+
+    @Getter
+    private int executorPort;
+
+
+    public RosterItem(String taskID, String taskType, String executorIP, int executorPort) {
+        this.taskID = taskID;
+        this.taskType = taskType;
+        this.executorIP = executorIP;
+        this.executorPort = executorPort;
+    }
+
+}

assignment/src/main/java/ch/unisg/assignment/assignment/domain/Task.java

@@ -0,0 +1,27 @@
+package ch.unisg.assignment.assignment.domain;
+
+import lombok.Getter;
+import lombok.Setter;
+
+public class Task {
+
+    @Getter
+    private String taskID;
+
+    @Getter
+    private String taskType;
+
+    @Getter
+    @Setter
+    private String result;
+
+    @Getter
+    @Setter
+    private String status;
+
+    public Task(String taskID, String taskType) {
+        this.taskID = taskID;
+        this.taskType = taskType;
+    }
+
+}

assignment/src/main/java/ch/unisg/assignment/assignment/domain/TaskAssignedEvent.java

@@ -0,0 +1,9 @@
+package ch.unisg.assignment.assignment.domain;
+
+public class TaskAssignedEvent {
+    public String taskID;
+
+    public TaskAssignedEvent(String taskID) {
+        this.taskID = taskID;
+    }
+}

assignment/src/main/java/ch/unisg/assignment/assignment/domain/TaskCompletedEvent.java

@@ -0,0 +1,15 @@
+package ch.unisg.assignment.assignment.domain;
+
+public class TaskCompletedEvent {
+    public String taskID;
+
+    public String status;
+
+    public String result;
+
+    public TaskCompletedEvent(String taskID, String status, String result) {
+        this.taskID = taskID;
+        this.status = status;
+        this.result = result;
+    }
+}

assignment/src/main/java/ch/unisg/assignment/common/SelfValidating.java

@@ -0,0 +1,31 @@
+package ch.unisg.assignment.common;
+
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import javax.validation.Validation;
+import javax.validation.Validator;
+import javax.validation.ValidatorFactory;
+import java.util.Set;
+
+public abstract class SelfValidating<T> {
+
+    private Validator validator;
+
+    protected SelfValidating() {
+        ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
+        validator = factory.getValidator();
+    }
+
+    /**
+     * Evaluates all Bean Validations on the attributes of this
+     * instance.
+     */
+    protected void validateSelf() {
+        @SuppressWarnings("unchecked")
+        Set<ConstraintViolation<T>> violations = validator.validate((T) this);
+        if (!violations.isEmpty()) {
+            throw new ConstraintViolationException(violations);
+        }
+    }
+}
+

assignment/src/main/resources/application.properties

@@ -1 +1 @@
-server.port=8081
+server.port=8082

docker-compose.yaml

@@ -19,7 +19,7 @@ services:
             dockerfile: "Dockerfile"
             target: development
         ports:
-      - "8082:8081"
+            - "8082:8082"
             - "5006:5005"
         volumes:
             - ./assignment/src:/opt/app/src
@@ -55,7 +55,7 @@ services:
             dockerfile: "Dockerfile"
             target: development
         ports:
-      - "8085:8081"
+            - "8085:8085"
             - "5009:5005"
         volumes:
             - ./executor2/src:/opt/app/src

executor-base/pom.xml

@@ -56,6 +56,12 @@
 			<artifactId>javax.transaction-api</artifactId>
 			<version>1.2</version>
 		</dependency>
+
+        <dependency>
+			<groupId>org.json</groupId>
+			<artifactId>json</artifactId>
+			<version>20210307</version>
+		</dependency>
 	</dependencies>
 
 	<build>

executor-base/src/main/java/ch/unisg/executorBase/common/SelfValidating.java

@@ -21,6 +21,7 @@ public class SelfValidating<T> {
      * instance.
      */
     protected void validateSelf() {
+        @SuppressWarnings("unchecked")
         Set<ConstraintViolation<T>> violations = validator.validate((T) this);
         if (!violations.isEmpty()) {
             throw new ConstraintViolationException(violations);

executor-base/src/main/java/ch/unisg/executorBase/executor/adapter/out/web/ExecutionFinishedEventAdapter.java

@@ -8,6 +8,9 @@ import java.net.http.HttpResponse;
 import java.util.HashMap;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.json.JSONObject;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 
 import ch.unisg.executorBase.executor.application.port.out.ExecutionFinishedEventPort;
@@ -20,36 +23,27 @@ public class ExecutionFinishedEventAdapter implements ExecutionFinishedEventPort
 
     @Override
     public void publishExecutionFinishedEvent(ExecutionFinishedEvent event) {
-        ///Here we would need to work with DTOs in case the payload of calls becomes more complex
 
-        var values = new HashMap<String, String>() {{
+        String body = new JSONObject()
-            put("result",event.getResult());
+        .put("taskID", event.getTaskID())
-            put("status",event.getStatus());
+        .put("result", event.getResult())
-        }};
+        .put("status", event.getStatus())
-
+        .toString();
-        var objectMapper = new ObjectMapper();
-        String requestBody = null;
-        try {
-            requestBody = objectMapper.writeValueAsString(values);
-        } catch (JsonProcessingException e) {
-            e.printStackTrace();
-        }
 
         HttpClient client = HttpClient.newHttpClient();
         HttpRequest request = HttpRequest.newBuilder()
                 .uri(URI.create(server+"/task/"+event.getTaskID()))
-                .PUT(HttpRequest.BodyPublishers.ofString(requestBody))
+                .header("Content-Type", "application/json")
+                .PUT(HttpRequest.BodyPublishers.ofString(body))
                 .build();
 
-        /** Needs the other service running
         try {
-            HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
+            client.send(request, HttpResponse.BodyHandlers.ofString());
-        } catch (IOException e) {
+        } catch (IOException | InterruptedException e) {
-            e.printStackTrace();
-        } catch (InterruptedException e) {
             e.printStackTrace();
+            // Restore interrupted state...
+            Thread.currentThread().interrupt();
         }
-         **/
 
         System.out.println("Finish execution event sent with result:" + event.getResult());
 

executor-base/src/main/java/ch/unisg/executorBase/executor/adapter/out/web/GetAssignmentAdapter.java

@@ -1,8 +1,10 @@
 package ch.unisg.executorBase.executor.adapter.out.web;
 
+import java.io.IOException;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
 
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Component;
@@ -11,6 +13,8 @@ import ch.unisg.executorBase.executor.application.port.out.GetAssignmentPort;
 import ch.unisg.executorBase.executor.domain.ExecutorType;
 import ch.unisg.executorBase.executor.domain.Task;
 
+import org.json.JSONObject;
+
 @Component
 @Primary
 public class GetAssignmentAdapter implements GetAssignmentPort {
@@ -19,27 +23,36 @@ public class GetAssignmentAdapter implements GetAssignmentPort {
     String server = "http://127.0.0.1:8082";
 
     @Override
-    public Task getAssignment(ExecutorType executorType) {
+    public Task getAssignment(ExecutorType executorType, String ip, int port) {
+
+        String body = new JSONObject()
+                  .put("executorType", executorType)
+                  .put("ip", ip)
+                  .put("port", port)
+                  .toString();
 
         HttpClient client = HttpClient.newHttpClient();
         HttpRequest request = HttpRequest.newBuilder()
-                .uri(URI.create(server+"/assignment/" + executorType))
+                .uri(URI.create(server+"/task/apply"))
-                .GET()
+                .header("Content-Type", "application/json")
+                .POST(HttpRequest.BodyPublishers.ofString(body))
                 .build();
 
-        /** Needs the other service running
         try {
             HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
-        } catch (IOException e) {
+            if (response.body().equals("")) {
-            e.printStackTrace();
+                return null;
-        } catch (InterruptedException e) {
+            }
+
+            return new Task(new JSONObject(response.body()).getString("taskID"));
+
+        } catch (IOException | InterruptedException e) {
             e.printStackTrace();
+            // Restore interrupted state...
+            Thread.currentThread().interrupt();
         }
-         **/
 
-         // TODO return null or a new Task here depending on the response of the http call
+        return null;
-
-         return new Task("123");
     }
 
 }

executor-base/src/main/java/ch/unisg/executorBase/executor/application/port/out/GetAssignmentPort.java

@@ -4,5 +4,5 @@ import ch.unisg.executorBase.executor.domain.ExecutorType;
 import ch.unisg.executorBase.executor.domain.Task;
 
 public interface GetAssignmentPort {
-    Task getAssignment(ExecutorType executorType);
+    Task getAssignment(ExecutorType executorType, String ip, int port);
 }

executor-base/src/main/java/ch/unisg/executorBase/executor/domain/ExecutorBase.java

@@ -4,13 +4,6 @@ import ch.unisg.executorBase.executor.application.port.out.ExecutionFinishedEven
 import ch.unisg.executorBase.executor.application.port.out.GetAssignmentPort;
 import ch.unisg.executorBase.executor.application.port.out.NotifyExecutorPoolPort;
 
-import java.util.concurrent.TimeUnit;
-
-import javax.transaction.Transactional;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Configurable;
-
 import ch.unisg.executorBase.executor.adapter.out.web.ExecutionFinishedEventAdapter;
 import ch.unisg.executorBase.executor.adapter.out.web.GetAssignmentAdapter;
 import ch.unisg.executorBase.executor.adapter.out.web.NotifyExecutorPoolAdapter;
@@ -49,18 +42,14 @@ public abstract class ExecutorBase {
         if(!notifyExecutorPoolService.notifyExecutorPool(this.ip, this.port, this.executorType)) {
             System.exit(0);
         } else {
-            System.out.println(true);
             this.status = ExecutorStatus.IDLING;
             getAssignment();
         }
     }
 
-    // public static ExecutorBase getExecutor() {
-    //     return executor;
-    // }
-
     public void getAssignment() {
-        Task newTask = getAssignmentPort.getAssignment(this.getExecutorType());
+        Task newTask = getAssignmentPort.getAssignment(this.getExecutorType(), this.getIp(),
+            this.getPort());
         if (newTask != null) {
             this.executeTask(newTask);
         } else {
@@ -74,7 +63,8 @@ public abstract class ExecutorBase {
 
         task.setResult(execution());
 
-        executionFinishedEventPort.publishExecutionFinishedEvent(new ExecutionFinishedEvent(task.getTaskID(), task.getResult(), "SUCCESS"));
+        executionFinishedEventPort.publishExecutionFinishedEvent(
+            new ExecutionFinishedEvent(task.getTaskID(), task.getResult(), "SUCCESS"));
 
         System.out.println("Finish execution");
         getAssignment();

executor-base/src/main/java/ch/unisg/executorBase/executor/domain/Task.java

@@ -1,6 +1,5 @@
 package ch.unisg.executorBase.executor.domain;
 
-import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 

executor2/src/main/java/ch/unisg/executor2/executor/adapter/in/web/TaskAvailableController.java

@@ -0,0 +1,36 @@
+package ch.unisg.executor2.executor.adapter.in.web;
+
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RestController;
+
+import ch.unisg.executorBase.executor.application.port.in.TaskAvailableCommand;
+import ch.unisg.executorBase.executor.application.port.in.TaskAvailableUseCase;
+import ch.unisg.executorBase.executor.domain.ExecutorType;
+
+@RestController
+public class TaskAvailableController {
+    private final TaskAvailableUseCase taskAvailableUseCase;
+
+    public TaskAvailableController(TaskAvailableUseCase taskAvailableUseCase) {
+        this.taskAvailableUseCase = taskAvailableUseCase;
+    }
+
+    @GetMapping(path = "/newtask/{taskType}")
+    public ResponseEntity<String> retrieveTaskFromTaskList(@PathVariable("taskType") String taskType) {
+
+        if (ExecutorType.contains(taskType.toUpperCase())) {
+            TaskAvailableCommand command = new TaskAvailableCommand(
+                ExecutorType.valueOf(taskType.toUpperCase()));
+            taskAvailableUseCase.newTaskAvailable(command);
+        }
+
+        // Add the content type as a response header
+        HttpHeaders responseHeaders = new HttpHeaders();
+
+        return new ResponseEntity<>("OK", responseHeaders, HttpStatus.OK);
+    }
+}

executor2/src/main/resources/application.properties

@@ -1 +1 @@
-server.port=8081
+server.port=8085