bugfixes + env variables

This commit is contained in:
Marcel 2021-11-17 21:35:38 +01:00
parent 9d75a87dd6
commit 6fe4b4dfbe
22 changed files with 130 additions and 175 deletions

View File

@ -49,6 +49,8 @@ services:
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- ./:/data/ - ./:/data/
environment:
mqtt.broker.uri: tcp://broker.hivemq.com:1883
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.tapas-auction-house.rule=Host(`tapas-auction-house.${PUB_IP}.nip.io`)" - "traefik.http.routers.tapas-auction-house.rule=Host(`tapas-auction-house.${PUB_IP}.nip.io`)"
@ -64,6 +66,11 @@ services:
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- ./:/data/ - ./:/data/
environment:
task-list.uri: http://tapas-tasks:8081
executor-robot.uri: http://executor-robot:8084
executor-computation.uri: http://executor-computation:8085
mqtt.broker.uri: tcp://broker.hivemq.com:1883
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.roster.rule=Host(`roster.${PUB_IP}.nip.io`)" - "traefik.http.routers.roster.rule=Host(`roster.${PUB_IP}.nip.io`)"
@ -79,6 +86,8 @@ services:
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- ./:/data/ - ./:/data/
environment:
mqtt.broker.uri: tcp://broker.hivemq.com:1883
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.executor-pool.rule=Host(`executor-pool.${PUB_IP}.nip.io`)" - "traefik.http.routers.executor-pool.rule=Host(`executor-pool.${PUB_IP}.nip.io`)"

View File

@ -57,11 +57,11 @@ public abstract class ExecutorBase {
**/ **/
public void getAssignment() { public void getAssignment() {
Task newTask = getAssignmentPort.getAssignment(this.getExecutorType(), this.getExecutorURI()); Task newTask = getAssignmentPort.getAssignment(this.getExecutorType(), this.getExecutorURI());
System.out.println("New assignment");
System.out.println(newTask);
if (newTask != null) { if (newTask != null) {
logger.info("Executor got a new task");
this.executeTask(newTask); this.executeTask(newTask);
} else { } else {
logger.info("Executor got no new task");
this.status = ExecutorStatus.IDLING; this.status = ExecutorStatus.IDLING;
} }
} }

View File

@ -1,6 +1,3 @@
server.port=8081 server.port=8081
roster.url=http://127.0.0.1:8082 roster.url=http://127.0.0.1:8082
executor.pool.url=http://127.0.0.1:8083 executor.pool.url=http://127.0.0.1:8083
executor1.url=http://127.0.0.1:8084
executor2.url=http://127.0.0.1:8085
task-list.url=http://127.0.0.1:8081

View File

@ -21,8 +21,6 @@ public class Executor extends ExecutorBase {
protected protected
String execution(String inputData) { String execution(String inputData) {
System.out.println(inputData);
String operator = ""; String operator = "";
if (inputData.contains("+")) { if (inputData.contains("+")) {
operator = "+"; operator = "+";
@ -30,34 +28,34 @@ public class Executor extends ExecutorBase {
operator = "-"; operator = "-";
} else if (inputData.contains("*")) { } else if (inputData.contains("*")) {
operator = "*"; operator = "*";
} else {
return "invalid data";
} }
// System.out.println(operator); double result = Double.NaN;
// double result = Double.NaN; // try {
// TimeUnit.SECONDS.sleep(5);
// System.out.print(inputData.split("+")); // } catch (InterruptedException e) {
// e.printStackTrace();
// int a = Integer.parseInt(inputData.split(operator)[0]);
// int b = Integer.parseInt(inputData.split(operator)[1]);
// // try {
// // TimeUnit.SECONDS.sleep(20);
// // } catch (InterruptedException e) {
// // e.printStackTrace();
// // }
// if (operator.equalsIgnoreCase("+")) {
// result = a + b;
// } else if (operator.equalsIgnoreCase("*")) {
// result = a * b;
// } else if (operator.equalsIgnoreCase("-")) {
// result = a - b;
// } // }
// System.out.println("Result: " + result); if (operator.equalsIgnoreCase("+")) {
String[] parts = inputData.split("\\+");
double result = 0.0; double a = Double.parseDouble(parts[0]);
double b = Double.parseDouble(parts[1]);
result = a + b;
} else if (operator.equalsIgnoreCase("*")) {
String[] parts = inputData.split("\\*");
double a = Double.parseDouble(parts[0]);
double b = Double.parseDouble(parts[1]);
result = a * b;
} else if (operator.equalsIgnoreCase("-")) {
String[] parts = inputData.split("-");
double a = Double.parseDouble(parts[0]);
double b = Double.parseDouble(parts[1]);
result = a - b;
}
return Double.toString(result); return Double.toString(result);
} }

View File

@ -1,3 +1,3 @@
server.port=8083 server.port=8083
mqtt.broker.uri=tcp://broker.hivemq.com:1883 mqtt.broker.uri=tcp://localhost:1883

View File

@ -6,6 +6,7 @@ import java.util.logging.Logger;
import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttException;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.core.env.ConfigurableEnvironment;
import ch.unisg.roster.roster.adapter.common.clients.TapasMqttClient; import ch.unisg.roster.roster.adapter.common.clients.TapasMqttClient;
import ch.unisg.roster.roster.adapter.in.messaging.mqtt.ExecutorEventMqttListener; import ch.unisg.roster.roster.adapter.in.messaging.mqtt.ExecutorEventMqttListener;
@ -16,11 +17,12 @@ public class RosterApplication {
static Logger logger = Logger.getLogger(RosterApplication.class.getName()); static Logger logger = Logger.getLogger(RosterApplication.class.getName());
public static String MQTT_BROKER = "tcp://broker.hivemq.com:1883"; private static ConfigurableEnvironment ENVIRONMENT;
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(RosterApplication.class, args);
SpringApplication rosterApp = new SpringApplication(RosterApplication.class);
ENVIRONMENT = rosterApp.run(args).getEnvironment();
bootstrapMarketplaceWithMqtt(); bootstrapMarketplaceWithMqtt();
} }
@ -29,9 +31,11 @@ public class RosterApplication {
* one another * one another
*/ */
private static void bootstrapMarketplaceWithMqtt() { private static void bootstrapMarketplaceWithMqtt() {
String broker = ENVIRONMENT.getProperty("mqtt.broker.uri");
try { try {
ExecutorEventsMqttDispatcher dispatcher = new ExecutorEventsMqttDispatcher(); ExecutorEventsMqttDispatcher dispatcher = new ExecutorEventsMqttDispatcher();
TapasMqttClient client = TapasMqttClient.getInstance(MQTT_BROKER, dispatcher); TapasMqttClient client = TapasMqttClient.getInstance(broker, dispatcher);
client.startReceivingMessages(); client.startReceivingMessages();
} catch (MqttException e) { } catch (MqttException e) {
logger.log(Level.SEVERE, e.getMessage(), e); logger.log(Level.SEVERE, e.getMessage(), e);

View File

@ -25,7 +25,6 @@ public class TaskCompletedController {
**/ **/
@PostMapping(path = "/task/completed", consumes = {"application/json"}) @PostMapping(path = "/task/completed", consumes = {"application/json"})
public ResponseEntity<Void> addNewTaskTaskToTaskList(@RequestBody Task task) { public ResponseEntity<Void> addNewTaskTaskToTaskList(@RequestBody Task task) {
System.out.println("TEST");
TaskCompletedCommand command = new TaskCompletedCommand(task.getTaskID(), TaskCompletedCommand command = new TaskCompletedCommand(task.getTaskID(),
task.getStatus(), task.getOutputData()); task.getStatus(), task.getOutputData());

View File

@ -1,63 +0,0 @@
package ch.unisg.roster.roster.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 java.util.logging.Level;
import java.util.logging.Logger;
import org.json.JSONArray;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Primary;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Component;
import ch.unisg.roster.roster.application.port.out.GetAllExecutorInExecutorPoolByTypePort;
import ch.unisg.roster.roster.domain.valueobject.ExecutorType;
@Component
@Primary
public class GetAllExecutorInExecutorPoolByTypeAdapter implements GetAllExecutorInExecutorPoolByTypePort {
@Value("${executor-pool.url}")
private String server;
/**
* Requests all executor of the give type from the executor-pool and cheks if there is one
* avaialable of this type.
* @return Whether an executor exist or not
**/
@Override
public boolean doesExecutorTypeExist(ExecutorType type) {
Logger logger = Logger.getLogger(PublishNewTaskEventAdapter.class.getName());
HttpClient client = HttpClient.newHttpClient();
HttpRequest request = HttpRequest.newBuilder()
.uri(URI.create(server + "/executor-pool/GetAllExecutorInExecutorPoolByType/" + type.getValue()))
.header("Content-Type", "application/json")
.GET()
.build();
try {
HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
if (response.statusCode() == HttpStatus.OK.value()) {
JSONArray jsonArray = new JSONArray(response.body());
if (jsonArray.length() > 0) {
return true;
}
}
} catch (InterruptedException e) {
logger.log(Level.SEVERE, e.getLocalizedMessage(), e);
Thread.currentThread().interrupt();
} catch (IOException e) {
logger.log(Level.SEVERE, e.getLocalizedMessage(), e);
}
return false;
}
}

View File

@ -19,10 +19,10 @@ import ch.unisg.roster.roster.domain.event.NewTaskEvent;
@Primary @Primary
public class PublishNewTaskEventAdapter implements NewTaskEventPort { public class PublishNewTaskEventAdapter implements NewTaskEventPort {
@Value("${executor1.url}") @Value("${executor-robot.uri}")
private String server; private String server;
@Value("${executor2.url}") @Value("${executor-computation.uri}")
private String server2; private String server2;
Logger logger = Logger.getLogger(PublishNewTaskEventAdapter.class.getName()); Logger logger = Logger.getLogger(PublishNewTaskEventAdapter.class.getName());

View File

@ -20,7 +20,7 @@ import ch.unisg.roster.roster.domain.event.TaskAssignedEvent;
@Primary @Primary
public class PublishTaskAssignedEventAdapter implements TaskAssignedEventPort { public class PublishTaskAssignedEventAdapter implements TaskAssignedEventPort {
@Value("${task-list.url}") @Value("${task-list.uri}")
private String server; private String server;
Logger logger = Logger.getLogger(PublishTaskAssignedEventAdapter.class.getName()); Logger logger = Logger.getLogger(PublishTaskAssignedEventAdapter.class.getName());
@ -32,26 +32,26 @@ public class PublishTaskAssignedEventAdapter implements TaskAssignedEventPort {
@Override @Override
public void publishTaskAssignedEvent(TaskAssignedEvent event) { public void publishTaskAssignedEvent(TaskAssignedEvent event) {
// String body = new JSONObject() String body = new JSONObject()
// .put("taskId", event.taskID) .put("taskId", event.taskID)
// .toString(); .toString();
// HttpClient client = HttpClient.newHttpClient(); HttpClient client = HttpClient.newHttpClient();
// HttpRequest request = HttpRequest.newBuilder() HttpRequest request = HttpRequest.newBuilder()
// .uri(URI.create(server + "/tasks/assignTask")) .uri(URI.create(server + "/tasks/assignTask"))
// .header("Content-Type", "application/task+json") .header("Content-Type", "application/task+json")
// .POST(HttpRequest.BodyPublishers.ofString(body)) .POST(HttpRequest.BodyPublishers.ofString(body))
// .build(); .build();
// try { try {
// client.send(request, HttpResponse.BodyHandlers.ofString()); client.send(request, HttpResponse.BodyHandlers.ofString());
// } catch (InterruptedException e) { } catch (InterruptedException e) {
// logger.log(Level.SEVERE, e.getLocalizedMessage(), e); logger.log(Level.SEVERE, e.getLocalizedMessage(), e);
// Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
// } catch (IOException e) { } catch (IOException e) {
// logger.log(Level.SEVERE, e.getLocalizedMessage(), e); logger.log(Level.SEVERE, e.getLocalizedMessage(), e);
// } }
} }
} }

View File

@ -20,7 +20,7 @@ import ch.unisg.roster.roster.domain.event.TaskCompletedEvent;
@Primary @Primary
public class PublishTaskCompletedEventAdapter implements TaskCompletedEventPort { public class PublishTaskCompletedEventAdapter implements TaskCompletedEventPort {
@Value("${task-list.url}") @Value("${task-list.uri}")
private String server; private String server;
Logger logger = Logger.getLogger(PublishTaskCompletedEventAdapter.class.getName()); Logger logger = Logger.getLogger(PublishTaskCompletedEventAdapter.class.getName());
@ -32,22 +32,17 @@ public class PublishTaskCompletedEventAdapter implements TaskCompletedEventPort
@Override @Override
public void publishTaskCompleted(TaskCompletedEvent event) { public void publishTaskCompleted(TaskCompletedEvent event) {
System.out.println("PublishTaskCompletedEventAdapter.publishTaskCompleted()");
System.out.print(server);
String body = new JSONObject() String body = new JSONObject()
.put("taskId", event.taskID) .put("taskId", event.taskID)
.put("status", event.status) .put("status", event.status)
.put("outputData", event.result) .put("outputData", event.result)
.toString(); .toString();
System.out.println(event.taskID);
HttpClient client = HttpClient.newHttpClient(); HttpClient client = HttpClient.newHttpClient();
HttpRequest request = HttpRequest.newBuilder() HttpRequest request = HttpRequest.newBuilder()
.uri(URI.create(server + "/tasks/completeTask/" + event.taskID)) .uri(URI.create(server + "/tasks/completeTask/"))
.header("Content-Type", "application/task+json") .header("Content-Type", "application/task+json")
.GET() .POST(HttpRequest.BodyPublishers.ofString(body))
.build(); .build();

View File

@ -1,13 +0,0 @@
package ch.unisg.roster.roster.application.port.out;
import ch.unisg.roster.roster.domain.valueobject.ExecutorType;
public interface GetAllExecutorInExecutorPoolByTypePort {
/**
* Checks if a executor with the given type exist in our executor pool
* @return boolean
**/
boolean doesExecutorTypeExist(ExecutorType type);
}

View File

@ -1,5 +1,5 @@
server.port=8082 server.port=8082
executor-pool.url=http://127.0.0.1:8083 executor-robot.uri=http://127.0.0.1:8084
executor1.url=http://127.0.0.1:8084 executor-computation.uri=http://127.0.0.1:8085
executor2.url=http://127.0.0.1:8085 task-list.uri=http://127.0.0.1:8081
task-list.url=http://127.0.0.1:8081 mqtt.broker.uri=tcp://localhost:1883

View File

@ -10,4 +10,4 @@ tasks.list.uri=http://localhost:8081
application.environment=development application.environment=development
auctionhouse.uri=http://localhost:8086 auctionhouse.uri=http://localhost:8086
websub.hub.uri=http://localhost:3000 websub.hub.uri=http://localhost:3000
mqtt.broker.uri=tcp://broker.hivemq.com:1883 mqtt.broker.uri=tcp://localhost:1883

View File

@ -78,6 +78,8 @@ public class AddNewTaskToTaskListWebController {
throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, e.getMessage()); throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, e.getMessage());
} catch (ConstraintViolationException e) { } catch (ConstraintViolationException e) {
throw new ResponseStatusException(HttpStatus.BAD_REQUEST, e.getMessage()); throw new ResponseStatusException(HttpStatus.BAD_REQUEST, e.getMessage());
} catch (NullPointerException e) {
throw new ResponseStatusException(HttpStatus.BAD_REQUEST, e.getMessage());
} }
} }
} }

View File

@ -26,17 +26,16 @@ public class CompleteTaskWebController {
this.completeTaskUseCase = completeTaskUseCase; this.completeTaskUseCase = completeTaskUseCase;
} }
@GetMapping(path = "/tasks/completeTask/{taskId}") @PostMapping(path = "/tasks/completeTask")
public ResponseEntity<String> completeTask (@PathVariable("taskId") String taskId){ public ResponseEntity<String> completeTask (@RequestBody TaskJsonRepresentation payload) {
System.out.println("completeTask"); System.out.println("completeTask");
System.out.println(taskId); System.out.println(payload.getTaskId());
String taskResult = "0";
try { try {
CompleteTaskCommand command = new CompleteTaskCommand( CompleteTaskCommand command = new CompleteTaskCommand(
new Task.TaskId(taskId), new Task.OutputData(taskResult) new Task.TaskId(payload.getTaskId()), new Task.OutputData(payload.getOutputData())
); );
Task updateATask = completeTaskUseCase.completeTask(command); Task updateATask = completeTaskUseCase.completeTask(command);

View File

@ -24,10 +24,10 @@ public class TaskAssignedWebController {
} }
@PostMapping(path="/tasks/assignTask", consumes= {TaskJsonRepresentation.MEDIA_TYPE}) @PostMapping(path="/tasks/assignTask", consumes= {TaskJsonRepresentation.MEDIA_TYPE})
public ResponseEntity<String> assignTask(@RequestBody Task task){ public ResponseEntity<String> assignTask(@RequestBody TaskJsonRepresentation payload) {
try{ try{
TaskAssignedCommand command = new TaskAssignedCommand( TaskAssignedCommand command = new TaskAssignedCommand(
task.getTaskId() new Task.TaskId(payload.getTaskId())
); );
Task updateATask = taskAssignedUseCase.assignTask(command); Task updateATask = taskAssignedUseCase.assignTask(command);

View File

@ -24,25 +24,19 @@ public class AddNewTaskToTaskListService implements AddNewTaskToTaskListUseCase
Task newTask; Task newTask;
System.out.println("TEST:");
System.out.println(command.getInputData().get());
if (command.getOriginalTaskUri().isPresent() && command.getInputData().isPresent()) { if (command.getOriginalTaskUri().isPresent() && command.getInputData().isPresent()) {
System.out.println("TEST2:");
newTask = taskList.addNewTaskWithNameAndTypeAndOriginalTaskUriAndInputData(command.getTaskName(), newTask = taskList.addNewTaskWithNameAndTypeAndOriginalTaskUriAndInputData(command.getTaskName(),
command.getTaskType(), command.getOriginalTaskUri().get(), command.getInputData().get()); command.getTaskType(), command.getOriginalTaskUri().get(), command.getInputData().get());
} else if (command.getOriginalTaskUri().isPresent()) { } else if (command.getOriginalTaskUri().isPresent()) {
newTask = taskList.addNewTaskWithNameAndTypeAndOriginalTaskUri(command.getTaskName(), newTask = taskList.addNewTaskWithNameAndTypeAndOriginalTaskUri(command.getTaskName(),
command.getTaskType(), command.getOriginalTaskUri().get()); command.getTaskType(), command.getOriginalTaskUri().get());
} else if (command.getOriginalTaskUri().isPresent()) { } else if (command.getInputData().isPresent()) {
newTask = null; newTask = taskList.addNewTaskWithNameAndTypeAndInputData(command.getTaskName(),
command.getTaskType(), command.getInputData().get());
} else { } else {
newTask = taskList.addNewTaskWithNameAndType(command.getTaskName(), command.getTaskType()); newTask = taskList.addNewTaskWithNameAndType(command.getTaskName(), command.getTaskType());
} }
System.out.println("TEST");
System.out.println(newTask.getInputData());
//Here we are using the application service to emit the domain event to the outside of the bounded context. //Here we are using the application service to emit the domain event to the outside of the bounded context.
//This event should be considered as a light-weight "integration event" to communicate with other services. //This event should be considered as a light-weight "integration event" to communicate with other services.
//Domain events are usually rather "fat". In our implementation we simplify at this point. In general, it is //Domain events are usually rather "fat". In our implementation we simplify at this point. In general, it is

View File

@ -26,10 +26,10 @@ public class CompleteTaskService implements CompleteTaskUseCase {
Optional<Task> updatedTask = taskList.retrieveTaskById(command.getTaskId()); Optional<Task> updatedTask = taskList.retrieveTaskById(command.getTaskId());
Task newTask = updatedTask.get(); Task newTask = updatedTask.get();
newTask.taskResult = new TaskResult(command.getOutputData().getValue()); newTask.setOutputData(command.getOutputData());
newTask.taskStatus = new TaskStatus(Task.Status.EXECUTED); newTask.setTaskStatus(new TaskStatus(Task.Status.EXECUTED));
if (!newTask.getOriginalTaskUri().getValue().equalsIgnoreCase("")) { if (newTask.getOriginalTaskUri() != null) {
ExternalTaskExecutedEvent event = new ExternalTaskExecutedEvent( ExternalTaskExecutedEvent event = new ExternalTaskExecutedEvent(
newTask.getTaskId(), newTask.getTaskId(),
newTask.getOriginalTaskUri(), newTask.getOriginalTaskUri(),

View File

@ -24,7 +24,7 @@ public class TaskAssignedService implements TaskAssignedUseCase {
// update the status to assigned // update the status to assigned
Task updatedTask = task.get(); Task updatedTask = task.get();
updatedTask.taskStatus = new TaskStatus(Status.ASSIGNED); updatedTask.setTaskStatus(new TaskStatus(Status.ASSIGNED));
return updatedTask; return updatedTask;
} }

View File

@ -22,10 +22,7 @@ public class Task {
private final TaskType taskType; private final TaskType taskType;
@Getter @Setter @Getter @Setter
public TaskStatus taskStatus; // had to make public for CompleteTaskService private TaskStatus taskStatus;
@Getter
public TaskResult taskResult; // same as above
@Getter @Getter
private final OriginalTaskUri originalTaskUri; private final OriginalTaskUri originalTaskUri;
@ -39,24 +36,44 @@ public class Task {
@Getter @Setter @Getter @Setter
private OutputData outputData; private OutputData outputData;
public Task(TaskName taskName, TaskType taskType) {
this.taskName = taskName;
this.taskType = taskType;
this.taskStatus = new TaskStatus(Status.OPEN);
this.taskId = new TaskId(UUID.randomUUID().toString());
this.originalTaskUri = null;
this.inputData = null;
this.outputData = null;
}
public Task(TaskName taskName, TaskType taskType, OriginalTaskUri taskUri) { public Task(TaskName taskName, TaskType taskType, OriginalTaskUri taskUri) {
this.taskName = taskName; this.taskName = taskName;
this.taskType = taskType; this.taskType = taskType;
this.taskStatus = new TaskStatus(Status.OPEN); this.taskStatus = new TaskStatus(Status.OPEN);
this.taskId = new TaskId(UUID.randomUUID().toString()); this.taskId = new TaskId(UUID.randomUUID().toString());
this.taskResult = new TaskResult("");
this.originalTaskUri = taskUri; this.originalTaskUri = taskUri;
this.inputData = null; this.inputData = null;
this.outputData = null; this.outputData = null;
} }
public Task(TaskName taskName, TaskType taskType, InputData inputData) {
this.taskName = taskName;
this.taskType = taskType;
this.taskStatus = new TaskStatus(Status.OPEN);
this.taskId = new TaskId(UUID.randomUUID().toString());
this.originalTaskUri = null;
this.inputData = inputData;
this.outputData = null;
}
public Task(TaskName taskName, TaskType taskType, OriginalTaskUri taskUri, InputData inputData) { public Task(TaskName taskName, TaskType taskType, OriginalTaskUri taskUri, InputData inputData) {
this.taskName = taskName; this.taskName = taskName;
this.taskType = taskType; this.taskType = taskType;
this.taskStatus = new TaskStatus(Status.OPEN); this.taskStatus = new TaskStatus(Status.OPEN);
this.taskId = new TaskId(UUID.randomUUID().toString()); this.taskId = new TaskId(UUID.randomUUID().toString());
this.taskResult = new TaskResult("");
this.originalTaskUri = taskUri; this.originalTaskUri = taskUri;
this.inputData = inputData; this.inputData = inputData;
@ -64,9 +81,7 @@ public class Task {
} }
protected static Task createTaskWithNameAndType(TaskName name, TaskType type) { protected static Task createTaskWithNameAndType(TaskName name, TaskType type) {
//This is a simple debug message to see that the request has reached the right method in the core return new Task(name, type);
System.out.println("New Task: " + name.getValue() + " " + type.getValue());
return new Task(name, type, null);
} }
protected static Task createTaskWithNameAndTypeAndOriginalTaskUri(TaskName name, TaskType type, protected static Task createTaskWithNameAndTypeAndOriginalTaskUri(TaskName name, TaskType type,
@ -74,6 +89,11 @@ public class Task {
return new Task(name, type, originalTaskUri); return new Task(name, type, originalTaskUri);
} }
protected static Task createTaskWithNameAndTypeAndInputData(TaskName name, TaskType type,
InputData inputData) {
return new Task(name, type, inputData);
}
protected static Task createTaskWithNameAndTypeAndOriginalTaskUriAndInputData(TaskName name, TaskType type, protected static Task createTaskWithNameAndTypeAndOriginalTaskUriAndInputData(TaskName name, TaskType type,
OriginalTaskUri originalTaskUri, InputData inputData) { OriginalTaskUri originalTaskUri, InputData inputData) {
return new Task(name, type, originalTaskUri, inputData); return new Task(name, type, originalTaskUri, inputData);

View File

@ -6,11 +6,15 @@ import lombok.Value;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.logging.Level;
import java.util.logging.Logger;
/**This is our aggregate root**/ /**This is our aggregate root**/
public class TaskList { public class TaskList {
Logger logger = Logger.getLogger(TaskList.class.getName());
@Getter @Getter
private final TaskListName taskListName; private final TaskListName taskListName;
@ -48,6 +52,14 @@ public class TaskList {
return newTask; return newTask;
} }
public Task addNewTaskWithNameAndTypeAndInputData(Task.TaskName name, Task.TaskType type,
Task.InputData inputData) {
Task newTask = Task.createTaskWithNameAndTypeAndInputData(name, type, inputData);
this.addNewTaskToList(newTask);
return newTask;
}
public Task addNewTaskWithNameAndTypeAndOriginalTaskUriAndInputData(Task.TaskName name, Task.TaskType type, public Task addNewTaskWithNameAndTypeAndOriginalTaskUriAndInputData(Task.TaskName name, Task.TaskType type,
Task.OriginalTaskUri originalTaskUri, Task.InputData inputData) { Task.OriginalTaskUri originalTaskUri, Task.InputData inputData) {
Task newTask = Task.createTaskWithNameAndTypeAndOriginalTaskUriAndInputData(name, type, originalTaskUri, inputData); Task newTask = Task.createTaskWithNameAndTypeAndOriginalTaskUriAndInputData(name, type, originalTaskUri, inputData);
@ -62,8 +74,10 @@ public class TaskList {
//However, we skip this here as it makes the core even more complex (e.g., we have to implement a light-weight //However, we skip this here as it makes the core even more complex (e.g., we have to implement a light-weight
//domain event publisher and subscribers (see "Implementing Domain-Driven Design by V. Vernon, pp. 296ff). //domain event publisher and subscribers (see "Implementing Domain-Driven Design by V. Vernon, pp. 296ff).
listOfTasks.value.add(newTask); listOfTasks.value.add(newTask);
//This is a simple debug message to see that the task list is growing with each new request logger.log(Level.INFO, "New task created! Id: " + newTask.getTaskId().getValue() +
System.out.println("Number of tasks: " + listOfTasks.value.size()); " | Name: " + newTask.getTaskName().getValue() +
" | InputData: " + newTask.getInputData().getValue());
logger.log(Level.INFO, "Number of tasks: {0}", listOfTasks.value.size());
} }
public Optional<Task> retrieveTaskById(Task.TaskId id) { public Optional<Task> retrieveTaskById(Task.TaskId id) {