diff --git a/.deployment/docker-compose.yml b/.deployment/docker-compose.yml index 5aee641..5a1329f 100644 --- a/.deployment/docker-compose.yml +++ b/.deployment/docker-compose.yml @@ -41,20 +41,35 @@ services: - "traefik.http.routers.tapas-tasks.entryPoints=web,websecure" - "traefik.http.routers.tapas-tasks.tls.certresolver=le" - assignment: + tapas-auction-house: image: openjdk - command: "java -jar /data/assignment-0.0.1-SNAPSHOT.jar" + command: "java -jar /data/tapas-auction-house-0.0.1-SNAPSHOT.jar" restart: unless-stopped volumes: - ./:/data/ labels: - "traefik.enable=true" - - "traefik.http.routers.assignment.rule=Host(`assignment.${PUB_IP}.nip.io`)" - - "traefik.http.routers.assignment.service=assignment" - - "traefik.http.services.assignment.loadbalancer.server.port=8082" - - "traefik.http.routers.assignment.tls=true" - - "traefik.http.routers.assignment.entryPoints=web,websecure" - - "traefik.http.routers.assignment.tls.certresolver=le" + - "traefik.http.routers.tapas-auction-house.rule=Host(`tapas-auction-house.${PUB_IP}.nip.io`)" + - "traefik.http.routers.tapas-auction-house.service=tapas-auction-house" + - "traefik.http.services.tapas-auction-house.loadbalancer.server.port=8086" + - "traefik.http.routers.tapas-auction-house.tls=true" + - "traefik.http.routers.tapas-auction-house.entryPoints=web,websecure" + - "traefik.http.routers.tapas-auction-house.tls.certresolver=le" + + roster: + image: openjdk + command: "java -jar /data/roster-0.0.1-SNAPSHOT.jar" + restart: unless-stopped + volumes: + - ./:/data/ + labels: + - "traefik.enable=true" + - "traefik.http.routers.roster.rule=Host(`roster.${PUB_IP}.nip.io`)" + - "traefik.http.routers.roster.service=roster" + - "traefik.http.services.roster.loadbalancer.server.port=8082" + - "traefik.http.routers.roster.tls=true" + - "traefik.http.routers.roster.entryPoints=web,websecure" + - "traefik.http.routers.roster.tls.certresolver=le" executor-pool: image: openjdk @@ -71,38 +86,38 @@ services: - "traefik.http.routers.executor-pool.entryPoints=web,websecure" - "traefik.http.routers.executor-pool.tls.certresolver=le" - executor1: + executor-computation: image: openjdk - command: "java -jar /data/executor1-0.0.1-SNAPSHOT.jar" + command: "java -jar /data/executor-computation-0.0.1-SNAPSHOT.jar" restart: unless-stopped depends_on: - executor-pool - - assignment + - roster volumes: - ./:/data/ labels: - "traefik.enable=true" - - "traefik.http.routers.executor1.rule=Host(`executor1.${PUB_IP}.nip.io`)" - - "traefik.http.routers.executor1.service=executor1" - - "traefik.http.services.executor1.loadbalancer.server.port=8084" - - "traefik.http.routers.executor1.tls=true" - - "traefik.http.routers.executor1.entryPoints=web,websecure" - - "traefik.http.routers.executor1.tls.certresolver=le" + - "traefik.http.routers.executor-computation.rule=Host(`executor-computation.${PUB_IP}.nip.io`)" + - "traefik.http.routers.executor-computation.service=executor-computation" + - "traefik.http.services.executor-computation.loadbalancer.server.port=8084" + - "traefik.http.routers.executor-computation.tls=true" + - "traefik.http.routers.executor-computation.entryPoints=web,websecure" + - "traefik.http.routers.executor-computation.tls.certresolver=le" - executor2: + executor-robot: image: openjdk - command: "java -jar /data/executor2-0.0.1-SNAPSHOT.jar" + command: "java -jar /data/executor-robot-0.0.1-SNAPSHOT.jar" restart: unless-stopped depends_on: - executor-pool - - assignment + - roster volumes: - ./:/data/ labels: - "traefik.enable=true" - - "traefik.http.routers.executor2.rule=Host(`executor2.${PUB_IP}.nip.io`)" - - "traefik.http.routers.executor2.service=executor2" - - "traefik.http.services.executor2.loadbalancer.server.port=8085" - - "traefik.http.routers.executor2.tls=true" - - "traefik.http.routers.executor2.entryPoints=web,websecure" - - "traefik.http.routers.executor2.tls.certresolver=le" + - "traefik.http.routers.executor-robot.rule=Host(`executor-robot.${PUB_IP}.nip.io`)" + - "traefik.http.routers.executor-robot.service=executor-robot" + - "traefik.http.services.executor-robot.loadbalancer.server.port=8085" + - "traefik.http.routers.executor-robot.tls=true" + - "traefik.http.routers.executor-robot.entryPoints=web,websecure" + - "traefik.http.routers.executor-robot.tls.certresolver=le" diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 3b82a91..7290452 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -33,29 +33,36 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - - name: Build with Maven - run: mvn -f assignment/pom.xml --batch-mode --update-snapshots verify - - run: cp ./assignment/target/assignment-0.0.1-SNAPSHOT.jar ./target + - name: Build common library + run: mvn -f common/pom.xml --batch-mode --update-snapshots install - - name: Build with Maven + - name: Build roster service + run: mvn -f roster/pom.xml --batch-mode --update-snapshots verify + - run: cp ./roster/target/roster-0.0.1-SNAPSHOT.jar ./target + + - name: Build executor-pool service run: mvn -f executor-pool/pom.xml --batch-mode --update-snapshots verify - run: cp ./executor-pool/target/executor-pool-0.0.1-SNAPSHOT.jar ./target - - name: Build with Maven + - name: Build executor-base library run: mvn -f executor-base/pom.xml --batch-mode --update-snapshots install - - name: Build with Maven - run: mvn -f executor1/pom.xml --batch-mode --update-snapshots verify - - run: cp ./executor1/target/executor1-0.0.1-SNAPSHOT.jar ./target + - name: Build executor-computation service + run: mvn -f executor-computation/pom.xml --batch-mode --update-snapshots verify + - run: cp ./executor-computation/target/executor-computation-0.0.1-SNAPSHOT.jar ./target - - name: Build with Maven - run: mvn -f executor2/pom.xml --batch-mode --update-snapshots verify - - run: cp ./executor2/target/executor2-0.0.1-SNAPSHOT.jar ./target + - name: Build executor-robot service + run: mvn -f executor-robot/pom.xml --batch-mode --update-snapshots verify + - run: cp ./executor-robot/target/executor-robot-0.0.1-SNAPSHOT.jar ./target - - name: Build with Maven + - name: Build tapas-task service run: mvn -f tapas-tasks/pom.xml --batch-mode --update-snapshots verify - run: cp ./tapas-tasks/target/tapas-tasks-0.0.1-SNAPSHOT.jar ./target + - name: Build tapas-auction-house service + run: mvn -f tapas-auction-house/pom.xml --batch-mode --update-snapshots verify + - run: cp ./tapas-auction-house/target/tapas-auction-house-0.0.1-SNAPSHOT.jar ./target + - run: cp ./.deployment/docker-compose.yml ./target - name: Archive artifacts uses: actions/upload-artifact@v1 diff --git a/.github/workflows/ci.assignment.yml b/.github/workflows/ci.assignment.yml deleted file mode 100644 index 394fe54..0000000 --- a/.github/workflows/ci.assignment.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: CI Assignment -on: - push: - branches: [main, dev] - paths: - - "assignment/**" - pull_request: - branches: [main, dev] - paths: - - "assignment/**" - - workflow_dispatch: -jobs: - build: - name: Build - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Set up JDK 11 - uses: actions/setup-java@v1 - with: - java-version: 11 - - name: Cache SonarCloud packages - uses: actions/cache@v1 - with: - path: ~/.sonar/cache - key: ${{ runner.os }}-sonar - restore-keys: ${{ runner.os }}-sonar - - name: Cache Maven packages - uses: actions/cache@v1 - with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 - - name: Build and analyze - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: mvn -f assignment/pom.xml -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=scs-asse-fs21-group1_tapas-assignment diff --git a/.github/workflows/ci.executor2.yml b/.github/workflows/ci.executor-computation.yml similarity index 75% rename from .github/workflows/ci.executor2.yml rename to .github/workflows/ci.executor-computation.yml index 5ae38f0..5832883 100644 --- a/.github/workflows/ci.executor2.yml +++ b/.github/workflows/ci.executor-computation.yml @@ -1,15 +1,17 @@ -name: CI Executor 2 +name: CI executor-computation on: push: branches: [main, dev] paths: - "executor-base/**" - - "executor2/**" + - "executor-computation/**" + - "common/**" pull_request: branches: [main, dev] paths: - "executor-base/**" - - "executor2/**" + - "executor-computation/**" + - "common/**" workflow_dispatch: jobs: @@ -36,10 +38,12 @@ jobs: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 + - name: Build common + run: mvn -f common/pom.xml -B install - name: Build executorBase run: mvn -f executor-base/pom.xml -B install - name: Build and analyze env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: mvn -f executor2/pom.xml -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=scs-asse-fs21-group1_tapas-executor2 + run: mvn -f executor-computation/pom.xml -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=scs-asse-fs21-group1_tapas-executor2 diff --git a/.github/workflows/ci.executor1.yml b/.github/workflows/ci.executor-robot.yml similarity index 76% rename from .github/workflows/ci.executor1.yml rename to .github/workflows/ci.executor-robot.yml index 708d7d4..7a216aa 100644 --- a/.github/workflows/ci.executor1.yml +++ b/.github/workflows/ci.executor-robot.yml @@ -1,15 +1,17 @@ -name: CI Executor 1 +name: CI executor-robot on: push: branches: [main, dev] paths: - "executor-base/**" - - "executor1/**" + - "executor-robot/**" + - "common/**" pull_request: branches: [main, dev] paths: - "executor-base/**" - - "executor1/**" + - "executor-robot/**" + - "common/**" workflow_dispatch: jobs: @@ -36,10 +38,12 @@ jobs: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 + - name: Build executorBase + run: mvn -f common/pom.xml -B install - name: Build executorBase run: mvn -f executor-base/pom.xml -B install - name: Build and analyze env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: mvn -f executor1/pom.xml -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=scs-asse-fs21-group1_tapas-executor1 + run: mvn -f executor-robot/pom.xml -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=scs-asse-fs21-group1_tapas-executor1 diff --git a/.github/workflows/ci.roster.yml b/.github/workflows/ci.roster.yml new file mode 100644 index 0000000..b38355e --- /dev/null +++ b/.github/workflows/ci.roster.yml @@ -0,0 +1,45 @@ +name: CI Roster +on: + push: + branches: [main, dev] + paths: + - "roster/**" + - "common/**" + pull_request: + branches: [main, dev] + paths: + - "roster/**" + - "common/**" + + workflow_dispatch: +jobs: + build: + name: Build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Set up JDK 11 + uses: actions/setup-java@v1 + with: + java-version: 11 + - name: Cache SonarCloud packages + uses: actions/cache@v1 + with: + path: ~/.sonar/cache + key: ${{ runner.os }}-sonar + restore-keys: ${{ runner.os }}-sonar + - name: Cache Maven packages + uses: actions/cache@v1 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2 + - name: Build common package + run: mvn -f common/pom.xml -B install + - name: Build and analyze + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + run: mvn -f roster/pom.xml -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=scs-asse-fs21-group1_tapas-assignment diff --git a/assignment/src/main/java/ch/unisg/assignment/AssignmentApplication.java b/assignment/src/main/java/ch/unisg/assignment/AssignmentApplication.java deleted file mode 100644 index 30d7782..0000000 --- a/assignment/src/main/java/ch/unisg/assignment/AssignmentApplication.java +++ /dev/null @@ -1,13 +0,0 @@ -package ch.unisg.assignment; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class AssignmentApplication { - - public static void main(String[] args) { - SpringApplication.run(AssignmentApplication.class, args); - } - -} diff --git a/assignment/src/main/java/ch/unisg/assignment/assignment/adapter/in/web/WebControllerExceptionHandler.java b/assignment/src/main/java/ch/unisg/assignment/assignment/adapter/in/web/WebControllerExceptionHandler.java deleted file mode 100644 index 08a0895..0000000 --- a/assignment/src/main/java/ch/unisg/assignment/assignment/adapter/in/web/WebControllerExceptionHandler.java +++ /dev/null @@ -1,31 +0,0 @@ -package ch.unisg.assignment.assignment.adapter.in.web; - -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.ControllerAdvice; -import org.springframework.web.bind.annotation.ExceptionHandler; - -import ch.unisg.assignment.common.exception.ErrorResponse; -import ch.unisg.assignment.common.exception.InvalidIP4Exception; -import ch.unisg.assignment.common.exception.PortOutOfRangeException; - -@ControllerAdvice -public class WebControllerExceptionHandler { - - @ExceptionHandler(PortOutOfRangeException.class) - public ResponseEntity handleException(PortOutOfRangeException e){ - - ErrorResponse error = new ErrorResponse(HttpStatus.BAD_REQUEST, e.getLocalizedMessage()); - return new ResponseEntity<>(error, error.getHttpStatus()); - - } - - @ExceptionHandler(InvalidIP4Exception.class) - public ResponseEntity handleException(InvalidIP4Exception e){ - - ErrorResponse error = new ErrorResponse(HttpStatus.BAD_REQUEST, e.getLocalizedMessage()); - return new ResponseEntity<>(error, error.getHttpStatus()); - - } - -} diff --git a/assignment/src/main/java/ch/unisg/assignment/assignment/adapter/out/web/PublishNewTaskEventAdapter.java b/assignment/src/main/java/ch/unisg/assignment/assignment/adapter/out/web/PublishNewTaskEventAdapter.java deleted file mode 100644 index 5007c1c..0000000 --- a/assignment/src/main/java/ch/unisg/assignment/assignment/adapter/out/web/PublishNewTaskEventAdapter.java +++ /dev/null @@ -1,60 +0,0 @@ -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 java.util.logging.Level; -import java.util.logging.Logger; - -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.event.NewTaskEvent; - -@Component -@Primary -public class PublishNewTaskEventAdapter implements NewTaskEventPort { - - String server = "http://127.0.0.1:8084"; - String server2 = "http://127.0.0.1:8085"; - - Logger logger = Logger.getLogger(PublishNewTaskEventAdapter.class.getName()); - - @Override - public void publishNewTaskEvent(NewTaskEvent event) { - - HttpClient client = HttpClient.newHttpClient(); - HttpRequest request = HttpRequest.newBuilder() - .uri(URI.create(server + "/newtask/" + event.taskType.getValue())) - .GET() - .build(); - - - try { - client.send(request, HttpResponse.BodyHandlers.ofString()); - } catch (IOException | InterruptedException e) { - logger.log(Level.SEVERE, e.getLocalizedMessage(), e); - // Restore interrupted state... - Thread.currentThread().interrupt(); - } - - HttpClient client2 = HttpClient.newHttpClient(); - HttpRequest request2 = HttpRequest.newBuilder() - .uri(URI.create(server2 + "/newtask/" + event.taskType.getValue())) - .GET() - .build(); - - - try { - client.send(request, HttpResponse.BodyHandlers.ofString()); - } catch (IOException | InterruptedException e) { - logger.log(Level.SEVERE, e.getLocalizedMessage(), e); - // Restore interrupted state... - Thread.currentThread().interrupt(); - } - } - -} diff --git a/assignment/src/main/java/ch/unisg/assignment/assignment/adapter/out/web/PublishTaskAssignedEventAdapter.java b/assignment/src/main/java/ch/unisg/assignment/assignment/adapter/out/web/PublishTaskAssignedEventAdapter.java deleted file mode 100644 index 56cb803..0000000 --- a/assignment/src/main/java/ch/unisg/assignment/assignment/adapter/out/web/PublishTaskAssignedEventAdapter.java +++ /dev/null @@ -1,50 +0,0 @@ -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 java.util.logging.Level; -import java.util.logging.Logger; - -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.event.TaskAssignedEvent; - -@Component -@Primary -public class PublishTaskAssignedEventAdapter implements TaskAssignedEventPort { - - String server = "http://127.0.0.1:8081"; - - Logger logger = Logger.getLogger(PublishTaskAssignedEventAdapter.class.getName()); - - @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/assignTask")) - .header("Content-Type", "application/json") - .POST(HttpRequest.BodyPublishers.ofString(body)) - .build(); - - - try { - client.send(request, HttpResponse.BodyHandlers.ofString()); - } catch (IOException | InterruptedException e) { - logger.log(Level.SEVERE, e.getLocalizedMessage(), e); - // Restore interrupted state... - Thread.currentThread().interrupt(); - } - } - -} diff --git a/assignment/src/main/java/ch/unisg/assignment/assignment/application/port/in/ApplyForTaskCommand.java b/assignment/src/main/java/ch/unisg/assignment/assignment/application/port/in/ApplyForTaskCommand.java deleted file mode 100644 index df36d58..0000000 --- a/assignment/src/main/java/ch/unisg/assignment/assignment/application/port/in/ApplyForTaskCommand.java +++ /dev/null @@ -1,32 +0,0 @@ -package ch.unisg.assignment.assignment.application.port.in; - -import javax.validation.constraints.NotNull; - -import ch.unisg.assignment.assignment.domain.valueobject.ExecutorType; -import ch.unisg.assignment.assignment.domain.valueobject.IP4Adress; -import ch.unisg.assignment.assignment.domain.valueobject.Port; -import ch.unisg.assignment.common.SelfValidating; -import lombok.EqualsAndHashCode; -import lombok.Value; - -@Value -@EqualsAndHashCode(callSuper=false) -public class ApplyForTaskCommand extends SelfValidating{ - - @NotNull - private final ExecutorType taskType; - - @NotNull - private final IP4Adress executorIP; - - - @NotNull - private final Port executorPort; - - public ApplyForTaskCommand(ExecutorType taskType, IP4Adress executorIP, Port executorPort) { - this.taskType = taskType; - this.executorIP = executorIP; - this.executorPort = executorPort; - this.validateSelf(); - } -} diff --git a/assignment/src/main/java/ch/unisg/assignment/assignment/application/port/in/ApplyForTaskUseCase.java b/assignment/src/main/java/ch/unisg/assignment/assignment/application/port/in/ApplyForTaskUseCase.java deleted file mode 100644 index 1e7180a..0000000 --- a/assignment/src/main/java/ch/unisg/assignment/assignment/application/port/in/ApplyForTaskUseCase.java +++ /dev/null @@ -1,7 +0,0 @@ -package ch.unisg.assignment.assignment.application.port.in; - -import ch.unisg.assignment.assignment.domain.Task; - -public interface ApplyForTaskUseCase { - Task applyForTask(ApplyForTaskCommand applyForTaskCommand); -} diff --git a/assignment/src/main/java/ch/unisg/assignment/assignment/application/port/out/GetAllExecutorInExecutorPoolByTypePort.java b/assignment/src/main/java/ch/unisg/assignment/assignment/application/port/out/GetAllExecutorInExecutorPoolByTypePort.java deleted file mode 100644 index e751727..0000000 --- a/assignment/src/main/java/ch/unisg/assignment/assignment/application/port/out/GetAllExecutorInExecutorPoolByTypePort.java +++ /dev/null @@ -1,9 +0,0 @@ -package ch.unisg.assignment.assignment.application.port.out; - -import ch.unisg.assignment.assignment.domain.valueobject.ExecutorType; - -public interface GetAllExecutorInExecutorPoolByTypePort { - boolean doesExecutorTypeExist(ExecutorType type); -} - - diff --git a/assignment/src/main/java/ch/unisg/assignment/assignment/application/port/out/NewTaskEventPort.java b/assignment/src/main/java/ch/unisg/assignment/assignment/application/port/out/NewTaskEventPort.java deleted file mode 100644 index 909a9ba..0000000 --- a/assignment/src/main/java/ch/unisg/assignment/assignment/application/port/out/NewTaskEventPort.java +++ /dev/null @@ -1,7 +0,0 @@ -package ch.unisg.assignment.assignment.application.port.out; - -import ch.unisg.assignment.assignment.domain.event.NewTaskEvent; - -public interface NewTaskEventPort { - void publishNewTaskEvent(NewTaskEvent event); -} diff --git a/assignment/src/main/java/ch/unisg/assignment/assignment/application/port/out/TaskAssignedEventPort.java b/assignment/src/main/java/ch/unisg/assignment/assignment/application/port/out/TaskAssignedEventPort.java deleted file mode 100644 index fefd4a1..0000000 --- a/assignment/src/main/java/ch/unisg/assignment/assignment/application/port/out/TaskAssignedEventPort.java +++ /dev/null @@ -1,7 +0,0 @@ -package ch.unisg.assignment.assignment.application.port.out; - -import ch.unisg.assignment.assignment.domain.event.TaskAssignedEvent; - -public interface TaskAssignedEventPort { - void publishTaskAssignedEvent(TaskAssignedEvent taskAssignedEvent); -} diff --git a/assignment/src/main/java/ch/unisg/assignment/assignment/application/port/out/TaskCompletedEventPort.java b/assignment/src/main/java/ch/unisg/assignment/assignment/application/port/out/TaskCompletedEventPort.java deleted file mode 100644 index 43a8aa5..0000000 --- a/assignment/src/main/java/ch/unisg/assignment/assignment/application/port/out/TaskCompletedEventPort.java +++ /dev/null @@ -1,7 +0,0 @@ -package ch.unisg.assignment.assignment.application.port.out; - -import ch.unisg.assignment.assignment.domain.event.TaskCompletedEvent; - -public interface TaskCompletedEventPort { - void publishTaskCompleted(TaskCompletedEvent event); -} diff --git a/assignment/src/main/java/ch/unisg/assignment/assignment/application/service/ApplyForTaskService.java b/assignment/src/main/java/ch/unisg/assignment/assignment/application/service/ApplyForTaskService.java deleted file mode 100644 index 0593a30..0000000 --- a/assignment/src/main/java/ch/unisg/assignment/assignment/application/service/ApplyForTaskService.java +++ /dev/null @@ -1,34 +0,0 @@ -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.event.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; - } - -} diff --git a/assignment/src/main/java/ch/unisg/assignment/assignment/application/service/NewTaskService.java b/assignment/src/main/java/ch/unisg/assignment/assignment/application/service/NewTaskService.java deleted file mode 100644 index 7d7de5c..0000000 --- a/assignment/src/main/java/ch/unisg/assignment/assignment/application/service/NewTaskService.java +++ /dev/null @@ -1,46 +0,0 @@ -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.GetAllExecutorInExecutorPoolByTypePort; -import ch.unisg.assignment.assignment.application.port.out.NewTaskEventPort; -import ch.unisg.assignment.assignment.domain.Roster; -import ch.unisg.assignment.assignment.domain.Task; -import ch.unisg.assignment.assignment.domain.event.NewTaskEvent; -import lombok.RequiredArgsConstructor; - -@RequiredArgsConstructor -@Component -@Transactional -public class NewTaskService implements NewTaskUseCase { - - private final NewTaskEventPort newTaskEventPort; - private final GetAllExecutorInExecutorPoolByTypePort getAllExecutorInExecutorPoolByTypePort; - - @Override - public boolean addNewTaskToQueue(NewTaskCommand command) { - - // TODO Get availableTaskTypes from executor pool - if (!getAllExecutorInExecutorPoolByTypePort.doesExecutorTypeExist(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; - } - -} diff --git a/assignment/src/main/java/ch/unisg/assignment/assignment/domain/ExecutorInfo.java b/assignment/src/main/java/ch/unisg/assignment/assignment/domain/ExecutorInfo.java deleted file mode 100644 index 6b19dcc..0000000 --- a/assignment/src/main/java/ch/unisg/assignment/assignment/domain/ExecutorInfo.java +++ /dev/null @@ -1,21 +0,0 @@ -package ch.unisg.assignment.assignment.domain; - -import ch.unisg.assignment.assignment.domain.valueobject.ExecutorType; -import ch.unisg.assignment.assignment.domain.valueobject.IP4Adress; -import ch.unisg.assignment.assignment.domain.valueobject.Port; -import lombok.Getter; -import lombok.Setter; - -public class ExecutorInfo { - @Getter - @Setter - private IP4Adress ip; - - @Getter - @Setter - private Port port; - - @Getter - @Setter - private ExecutorType executorType; -} diff --git a/assignment/src/main/java/ch/unisg/assignment/assignment/domain/Roster.java b/assignment/src/main/java/ch/unisg/assignment/assignment/domain/Roster.java deleted file mode 100644 index 521a748..0000000 --- a/assignment/src/main/java/ch/unisg/assignment/assignment/domain/Roster.java +++ /dev/null @@ -1,53 +0,0 @@ -package ch.unisg.assignment.assignment.domain; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; - -import ch.unisg.assignment.assignment.domain.valueobject.ExecutorType; -import ch.unisg.assignment.assignment.domain.valueobject.IP4Adress; -import ch.unisg.assignment.assignment.domain.valueobject.Port; - -public class Roster { - - private static final Roster roster = new Roster(); - - private HashMap> queues = new HashMap<>(); - - private HashMap rosterMap = new HashMap<>(); - - public static Roster getInstance() { - return roster; - } - - private Roster() {} - - public void addTaskToQueue(Task task) { - if (queues.containsKey(task.getTaskType().getValue())) { - queues.get(task.getTaskType().getValue()).add(task); - } else { - queues.put(task.getTaskType().getValue(), new ArrayList<>(Arrays.asList(task))); - } - } - - public Task assignTaskToExecutor(ExecutorType taskType, IP4Adress executorIP, Port executorPort) { - if (!queues.containsKey(taskType.getValue())) { - return null; - } - if (queues.get(taskType.getValue()).isEmpty()) { - return null; - } - - Task task = queues.get(taskType.getValue()).remove(0); - - rosterMap.put(task.getTaskID(), new RosterItem(task.getTaskID(), - task.getTaskType().getValue(), executorIP, executorPort)); - - return task; - } - - public void taskCompleted(String taskID) { - rosterMap.remove(taskID); - } - -} diff --git a/assignment/src/main/java/ch/unisg/assignment/assignment/domain/RosterItem.java b/assignment/src/main/java/ch/unisg/assignment/assignment/domain/RosterItem.java deleted file mode 100644 index 2c3bb52..0000000 --- a/assignment/src/main/java/ch/unisg/assignment/assignment/domain/RosterItem.java +++ /dev/null @@ -1,29 +0,0 @@ -package ch.unisg.assignment.assignment.domain; - -import ch.unisg.assignment.assignment.domain.valueobject.IP4Adress; -import ch.unisg.assignment.assignment.domain.valueobject.Port; -import lombok.Getter; - -public class RosterItem { - - @Getter - private String taskID; - - @Getter - private String taskType; - - @Getter - private IP4Adress executorIP; - - @Getter - private Port executorPort; - - - public RosterItem(String taskID, String taskType, IP4Adress executorIP, Port executorPort) { - this.taskID = taskID; - this.taskType = taskType; - this.executorIP = executorIP; - this.executorPort = executorPort; - } - -} diff --git a/assignment/src/main/java/ch/unisg/assignment/assignment/domain/valueobject/IP4Adress.java b/assignment/src/main/java/ch/unisg/assignment/assignment/domain/valueobject/IP4Adress.java deleted file mode 100644 index cd23b6b..0000000 --- a/assignment/src/main/java/ch/unisg/assignment/assignment/domain/valueobject/IP4Adress.java +++ /dev/null @@ -1,23 +0,0 @@ -package ch.unisg.assignment.assignment.domain.valueobject; - -import ch.unisg.assignment.common.exception.InvalidIP4Exception; -import lombok.Value; - -@Value -public class IP4Adress { - private String value; - - public IP4Adress(String ip4) throws InvalidIP4Exception { - if (ip4.equalsIgnoreCase("localhost") || - ip4.matches("^((25[0-5]|(2[0-4]|1\\d|[1-9]|)\\d)(\\.(?!$)|$)){4}$")) { - this.value = ip4; - } else { - throw new InvalidIP4Exception(); - } - } -} - - - - - diff --git a/assignment/src/main/java/ch/unisg/assignment/assignment/domain/valueobject/Port.java b/assignment/src/main/java/ch/unisg/assignment/assignment/domain/valueobject/Port.java deleted file mode 100644 index a66dbbd..0000000 --- a/assignment/src/main/java/ch/unisg/assignment/assignment/domain/valueobject/Port.java +++ /dev/null @@ -1,17 +0,0 @@ -package ch.unisg.assignment.assignment.domain.valueobject; - -import ch.unisg.assignment.common.exception.PortOutOfRangeException; -import lombok.Value; - -@Value -public class Port { - private int value; - - public Port(int port) throws PortOutOfRangeException { - if (1024 <= port && port <= 65535) { - this.value = port; - } else { - throw new PortOutOfRangeException(); - } - } -} diff --git a/assignment/src/main/java/ch/unisg/assignment/common/exception/InvalidIP4Exception.java b/assignment/src/main/java/ch/unisg/assignment/common/exception/InvalidIP4Exception.java deleted file mode 100644 index fecbfcb..0000000 --- a/assignment/src/main/java/ch/unisg/assignment/common/exception/InvalidIP4Exception.java +++ /dev/null @@ -1,7 +0,0 @@ -package ch.unisg.assignment.common.exception; - -public class InvalidIP4Exception extends Exception { - public InvalidIP4Exception() { - super("IP4 is invalid"); - } -} diff --git a/assignment/src/main/java/ch/unisg/assignment/common/exception/PortOutOfRangeException.java b/assignment/src/main/java/ch/unisg/assignment/common/exception/PortOutOfRangeException.java deleted file mode 100644 index 2772256..0000000 --- a/assignment/src/main/java/ch/unisg/assignment/common/exception/PortOutOfRangeException.java +++ /dev/null @@ -1,7 +0,0 @@ -package ch.unisg.assignment.common.exception; - -public class PortOutOfRangeException extends Exception { - public PortOutOfRangeException() { - super("Port is out of available range (1024-65535)"); - } -} diff --git a/assignment/src/main/resources/application.properties b/assignment/src/main/resources/application.properties deleted file mode 100644 index 3cf12af..0000000 --- a/assignment/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -server.port=8082 diff --git a/assignment/.mvn/wrapper/MavenWrapperDownloader.java b/common/.mvn/wrapper/MavenWrapperDownloader.java similarity index 100% rename from assignment/.mvn/wrapper/MavenWrapperDownloader.java rename to common/.mvn/wrapper/MavenWrapperDownloader.java diff --git a/assignment/.mvn/wrapper/maven-wrapper.jar b/common/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from assignment/.mvn/wrapper/maven-wrapper.jar rename to common/.mvn/wrapper/maven-wrapper.jar diff --git a/assignment/.mvn/wrapper/maven-wrapper.properties b/common/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from assignment/.mvn/wrapper/maven-wrapper.properties rename to common/.mvn/wrapper/maven-wrapper.properties diff --git a/assignment/mvnw b/common/mvnw similarity index 100% rename from assignment/mvnw rename to common/mvnw diff --git a/assignment/mvnw.cmd b/common/mvnw.cmd similarity index 100% rename from assignment/mvnw.cmd rename to common/mvnw.cmd diff --git a/common/pom.xml b/common/pom.xml new file mode 100644 index 0000000..f4e8342 --- /dev/null +++ b/common/pom.xml @@ -0,0 +1,72 @@ + + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.5.5 + + + + ch.unisg + common + 0.0.1-SNAPSHOT + + common + + http://www.example.com + + + 11 + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + org.springframework.boot + spring-boot-starter-validation + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + + javax.validation + validation-api + 1.1.0.Final + + + + javax.transaction + javax.transaction-api + 1.2 + + + + org.json + json + 20210307 + + + + + diff --git a/assignment/src/main/java/ch/unisg/assignment/common/exception/ErrorResponse.java b/common/src/main/java/ch/unisg/common/exception/ErrorResponse.java similarity index 84% rename from assignment/src/main/java/ch/unisg/assignment/common/exception/ErrorResponse.java rename to common/src/main/java/ch/unisg/common/exception/ErrorResponse.java index 2fb834e..aeef41c 100644 --- a/assignment/src/main/java/ch/unisg/assignment/common/exception/ErrorResponse.java +++ b/common/src/main/java/ch/unisg/common/exception/ErrorResponse.java @@ -1,4 +1,4 @@ -package ch.unisg.assignment.common.exception; +package ch.unisg.common.exception; import org.springframework.http.HttpStatus; diff --git a/common/src/main/java/ch/unisg/common/exception/InvalidExecutorURIException.java b/common/src/main/java/ch/unisg/common/exception/InvalidExecutorURIException.java new file mode 100644 index 0000000..1d619e9 --- /dev/null +++ b/common/src/main/java/ch/unisg/common/exception/InvalidExecutorURIException.java @@ -0,0 +1,7 @@ +package ch.unisg.common.exception; + +public class InvalidExecutorURIException extends Exception { + public InvalidExecutorURIException() { + super("URI is invalid"); + } +} diff --git a/assignment/src/main/java/ch/unisg/assignment/common/SelfValidating.java b/common/src/main/java/ch/unisg/common/validation/SelfValidating.java similarity index 95% rename from assignment/src/main/java/ch/unisg/assignment/common/SelfValidating.java rename to common/src/main/java/ch/unisg/common/validation/SelfValidating.java index a8d366f..bb2d0fe 100644 --- a/assignment/src/main/java/ch/unisg/assignment/common/SelfValidating.java +++ b/common/src/main/java/ch/unisg/common/validation/SelfValidating.java @@ -1,4 +1,4 @@ -package ch.unisg.assignment.common; +package ch.unisg.common.validation; import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolationException; diff --git a/common/src/main/java/ch/unisg/common/valueobject/ExecutorURI.java b/common/src/main/java/ch/unisg/common/valueobject/ExecutorURI.java new file mode 100644 index 0000000..627104e --- /dev/null +++ b/common/src/main/java/ch/unisg/common/valueobject/ExecutorURI.java @@ -0,0 +1,13 @@ +package ch.unisg.common.valueobject; + +import java.net.URI; +import lombok.Value; + +@Value +public class ExecutorURI { + private URI value; + + public ExecutorURI(String uri) { + this.value = URI.create(uri); + } +} diff --git a/diagram_1.bpmn b/diagram_1.bpmn deleted file mode 100644 index 313a860..0000000 --- a/diagram_1.bpmn +++ /dev/null @@ -1,653 +0,0 @@ - - - - - - - - - - - - - - Gateway_1vd3as7 - Activity_1jd11bs - Gateway_1e4ckdq - Activity_1dl4fvt - Gateway_1e3rabp - Event_1lm6x5y - Event_1ysgenb - Event_00rvb9o - Activity_0u3tts0 - Activity_0vs4eam - Activity_0mwpp9o - Event_0v7hm2z - Activity_0paecdb - Activity_0srcl99 - Activity_0assw9c - - - Activity_0jai885 - StartEvent_1 - - - - Flow_1hc51tx - Flow_1sajzlx - Flow_1ijfkpz - - - Flow_1sajzlx - Flow_0cpd5ad - - - Flow_0cpd5ad - Flow_0kwvrmc - Flow_1w3uh2m - - - Flow_0kwvrmc - Flow_0vpcut0 - - - Flow_0vpcut0 - Flow_179e0hl - Flow_12nh0g5 - - - Flow_179e0hl - - - Flow_0366zqm - - - Flow_1n8jm89 - - - Flow_1w3uh2m - Flow_1n8jm89 - - - Flow_19dbo28 - Flow_1rwgf2n - - - Flow_19dbo28 - - - Flow_1ijfkpz - Flow_1gvdy5x - - - Flow_1gvdy5x - Flow_1yxp4e8 - - - Flow_1yxp4e8 - - - Flow_1rwgf2n - Flow_1hc51tx - - - - Flow_12nh0g5 - Flow_0366zqm - - - - - - - - - - - - - - - - - - - - Flow_119ldsr - - - Flow_1mm9swr - - - Flow_119ldsr - Flow_1mm9swr - - - - - - - - Event_0v73rhy - Activity_0n8uuvk - - - Activity_06xjrrk - - - Activity_0uxkytf - Event_01nh9j2 - Activity_1qgjnyh - - - - Flow_17d0j42 - - - Flow_17d0j42 - Flow_0opy5tp - - - Flow_0opy5tp - Flow_0sudw7l - - - Flow_0sudw7l - Flow_02uzxx3 - - - Flow_0rpv16j - - - Flow_02uzxx3 - Flow_0rpv16j - - - - - - - - - - - Event_1oz3tr5 - Activity_0xk9kck - - - Gateway_079742h - Activity_0umieiz - Event_062x6a9 - Activity_0b6bh6v - Event_1achffx - Activity_1mme68o - - - - Flow_0od6iot - - - Flow_0od6iot - Flow_0k07ofo - - - Flow_0k07ofo - Flow_1fwmda3 - Flow_050yku1 - - - Flow_1fwmda3 - Flow_15lkkxa - - - Flow_15lkkxa - - - Flow_050yku1 - Flow_1lgcq8d - - - Flow_0oqra8s - - - Flow_1lgcq8d - Flow_0oqra8s - - - - - - - - - - - - - Event_1b2jt5y - Activity_1ikvmpl - Event_0y66dbe - Activity_11lqrhg - Activity_1oownmu - - - Activity_1ohwol1 - Event_0bbqq3x - - - Activity_1e9hb9h - Event_0l7ljcr - - - - Flow_046hsk4 - - - Flow_046hsk4 - Flow_0zoqmub - - - Flow_0nyxv8e - - - Flow_0zoqmub - Flow_0ip5x3i - Flow_1bqiz65 - Flow_142xsjm - - - Flow_1bqiz65 - Flow_0znvsoe - - - Flow_142xsjm - Flow_0ue2i8v - - - Flow_0ue2i8v - - - Flow_0znvsoe - - - Flow_0ip5x3i - Flow_0nyxv8e - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/workflow.bpmn b/doc/workflow.bpmn new file mode 100644 index 0000000..6d68a24 --- /dev/null +++ b/doc/workflow.bpmn @@ -0,0 +1,337 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + Flow_1rie16h + Flow_159tlyd + Flow_01pbz6s + + + Flow_159tlyd + + + Flow_01pbz6s + + + Flow_1urp3d2 + + + Flow_1urp3d2 + Flow_1oy6e8u + Flow_1rxws1j + + + Flow_1oy6e8u + + + Flow_1rxws1j + + + + + Flow_1rie16h + + + + + + + + + + + + + + + Flow_0nuuhk7 + + + Flow_0nuuhk7 + Flow_197gie6 + Flow_0ruufha + + + Flow_197gie6 + + + + Flow_0ruufha + Flow_1duwugb + + + + Flow_19m4xhk + + + Flow_19m4xhk + Flow_0b4g73l + Flow_1duwugb + + + Flow_0b4g73l + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/workflow.png b/doc/workflow.png new file mode 100644 index 0000000..4946693 Binary files /dev/null and b/doc/workflow.png differ diff --git a/executor-base/pom.xml b/executor-base/pom.xml index 2acba18..4ea8d2a 100644 --- a/executor-base/pom.xml +++ b/executor-base/pom.xml @@ -9,9 +9,9 @@ ch.unisg - executorBase + executor-base 0.0.1-SNAPSHOT - executorBase + executor-base Demo project for Spring Boot 11 @@ -60,6 +60,12 @@ json 20210307 + + + ch.unisg + common + 0.0.1-SNAPSHOT + diff --git a/executor-base/src/main/java/ch/unisg/executorBase/Executor1Application.java b/executor-base/src/main/java/ch/unisg/executorBase/Executor1Application.java deleted file mode 100644 index 9bd3fa5..0000000 --- a/executor-base/src/main/java/ch/unisg/executorBase/Executor1Application.java +++ /dev/null @@ -1,13 +0,0 @@ -package ch.unisg.executorBase; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class Executor1Application { - - public static void main(String[] args) { - SpringApplication.run(Executor1Application.class, args); - } - -} diff --git a/executor-base/src/main/java/ch/unisg/executorBase/executor/adapter/in/web/TaskAvailableController.java b/executor-base/src/main/java/ch/unisg/executorBase/executor/adapter/in/web/TaskAvailableController.java index 182f2ba..66ef496 100644 --- a/executor-base/src/main/java/ch/unisg/executorBase/executor/adapter/in/web/TaskAvailableController.java +++ b/executor-base/src/main/java/ch/unisg/executorBase/executor/adapter/in/web/TaskAvailableController.java @@ -1,4 +1,6 @@ -package ch.unisg.executorBase.executor.adapter.in.web; +package ch.unisg.executorbase.executor.adapter.in.web; + +import java.util.logging.Logger; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; @@ -7,9 +9,9 @@ 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; +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 { @@ -19,9 +21,17 @@ public class TaskAvailableController { this.taskAvailableUseCase = taskAvailableUseCase; } - @GetMapping(path = "/newtask/{taskType}") + Logger logger = Logger.getLogger(TaskAvailableController.class.getName()); + + /** + * Controller for notification about new events. + * @return 200 OK + **/ + @GetMapping(path = "/newtask/{taskType}", consumes = { "application/json" }) public ResponseEntity retrieveTaskFromTaskList(@PathVariable("taskType") String taskType) { + logger.info("New " + taskType + " available"); + if (ExecutorType.contains(taskType.toUpperCase())) { TaskAvailableCommand command = new TaskAvailableCommand( ExecutorType.valueOf(taskType.toUpperCase())); diff --git a/executor-base/src/main/java/ch/unisg/executorBase/executor/adapter/out/web/ExecutionFinishedEventAdapter.java b/executor-base/src/main/java/ch/unisg/executorBase/executor/adapter/out/web/ExecutionFinishedEventAdapter.java index 971e583..e618c79 100644 --- a/executor-base/src/main/java/ch/unisg/executorBase/executor/adapter/out/web/ExecutionFinishedEventAdapter.java +++ b/executor-base/src/main/java/ch/unisg/executorBase/executor/adapter/out/web/ExecutionFinishedEventAdapter.java @@ -1,4 +1,4 @@ -package ch.unisg.executorBase.executor.adapter.out.web; +package ch.unisg.executorbase.executor.adapter.out.web; import java.io.IOException; import java.net.URI; @@ -9,22 +9,29 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.json.JSONObject; +import org.springframework.beans.factory.annotation.Value; -import ch.unisg.executorBase.executor.application.port.out.ExecutionFinishedEventPort; -import ch.unisg.executorBase.executor.domain.ExecutionFinishedEvent; +import ch.unisg.executorbase.executor.application.port.out.ExecutionFinishedEventPort; +import ch.unisg.executorbase.executor.domain.ExecutionFinishedEvent; public class ExecutionFinishedEventAdapter implements ExecutionFinishedEventPort { - String server = "http://127.0.0.1:8082"; + // TODO url doesn't get mapped bc no autowiring + @Value("${roster.url}") + String server = "http://localhost:8082"; Logger logger = Logger.getLogger(ExecutionFinishedEventAdapter.class.getName()); + /** + * Publishes the execution finished event + * @return void + **/ @Override public void publishExecutionFinishedEvent(ExecutionFinishedEvent event) { String body = new JSONObject() .put("taskID", event.getTaskID()) - .put("result", event.getResult()) + .put("outputData", event.getOutputData()) .put("status", event.getStatus()) .toString(); @@ -35,15 +42,17 @@ public class ExecutionFinishedEventAdapter implements ExecutionFinishedEventPort .POST(HttpRequest.BodyPublishers.ofString(body)) .build(); + try { client.send(request, HttpResponse.BodyHandlers.ofString()); - } catch (IOException | InterruptedException e) { + } catch (InterruptedException e) { logger.log(Level.SEVERE, e.getLocalizedMessage(), e); - // Restore interrupted state... Thread.currentThread().interrupt(); + } catch (IOException e) { + logger.log(Level.SEVERE, e.getLocalizedMessage(), e); } - System.out.println("Finish execution event sent with result:" + event.getResult()); + logger.log(Level.INFO, "Finish execution event sent with result: {0}", event.getOutputData()); } diff --git a/executor-base/src/main/java/ch/unisg/executorBase/executor/adapter/out/web/GetAssignmentAdapter.java b/executor-base/src/main/java/ch/unisg/executorBase/executor/adapter/out/web/GetAssignmentAdapter.java index 05852fa..92cea92 100644 --- a/executor-base/src/main/java/ch/unisg/executorBase/executor/adapter/out/web/GetAssignmentAdapter.java +++ b/executor-base/src/main/java/ch/unisg/executorBase/executor/adapter/out/web/GetAssignmentAdapter.java @@ -1,4 +1,4 @@ -package ch.unisg.executorBase.executor.adapter.out.web; +package ch.unisg.executorbase.executor.adapter.out.web; import java.io.IOException; import java.net.URI; @@ -8,12 +8,14 @@ import java.net.http.HttpResponse; import java.util.logging.Level; import java.util.logging.Logger; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Component; -import ch.unisg.executorBase.executor.application.port.out.GetAssignmentPort; -import ch.unisg.executorBase.executor.domain.ExecutorType; -import ch.unisg.executorBase.executor.domain.Task; +import ch.unisg.common.valueobject.ExecutorURI; +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; @@ -21,17 +23,23 @@ import org.json.JSONObject; @Primary public class GetAssignmentAdapter implements GetAssignmentPort { + // TODO Not working for now bc it doesn't get autowired + @Value("${roster.url}") String server = "http://127.0.0.1:8082"; Logger logger = Logger.getLogger(GetAssignmentAdapter.class.getName()); + /** + * Requests a new task assignment + * @return the assigned task + * @see Task + **/ @Override - public Task getAssignment(ExecutorType executorType, String ip, int port) { + public Task getAssignment(ExecutorType executorType, ExecutorURI executorURI) { String body = new JSONObject() .put("executorType", executorType) - .put("ip", ip) - .put("port", port) + .put("executorURI", executorURI.getValue()) .toString(); HttpClient client = HttpClient.newHttpClient(); @@ -42,17 +50,22 @@ public class GetAssignmentAdapter implements GetAssignmentPort { .build(); try { + logger.info("Sending getAssignment Request"); HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofString()); + logger.log(Level.INFO, "getAssignment request result:\n {0}", response.body()); if (response.body().equals("")) { return null; } + JSONObject responseBody = new JSONObject(response.body()); - return new Task(new JSONObject(response.body()).getString("taskID")); + String inputData = responseBody.getString("inputData"); + return new Task(responseBody.getString("taskID"), inputData); - } catch (IOException | InterruptedException e) { + } catch (InterruptedException e) { logger.log(Level.SEVERE, e.getLocalizedMessage(), e); - // Restore interrupted state... Thread.currentThread().interrupt(); + } catch (IOException e) { + logger.log(Level.SEVERE, e.getLocalizedMessage(), e); } return null; diff --git a/executor-base/src/main/java/ch/unisg/executorBase/executor/adapter/out/web/NotifyExecutorPoolAdapter.java b/executor-base/src/main/java/ch/unisg/executorBase/executor/adapter/out/web/NotifyExecutorPoolAdapter.java index 720b015..abc0cf5 100644 --- a/executor-base/src/main/java/ch/unisg/executorBase/executor/adapter/out/web/NotifyExecutorPoolAdapter.java +++ b/executor-base/src/main/java/ch/unisg/executorBase/executor/adapter/out/web/NotifyExecutorPoolAdapter.java @@ -1,4 +1,4 @@ -package ch.unisg.executorBase.executor.adapter.out.web; +package ch.unisg.executorbase.executor.adapter.out.web; import java.io.IOException; import java.net.URI; @@ -9,28 +9,35 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.json.JSONObject; +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.executorBase.executor.application.port.out.NotifyExecutorPoolPort; -import ch.unisg.executorBase.executor.domain.ExecutorType; +import ch.unisg.common.valueobject.ExecutorURI; +import ch.unisg.executorbase.executor.application.port.out.NotifyExecutorPoolPort; +import ch.unisg.executorbase.executor.domain.ExecutorType; @Component @Primary public class NotifyExecutorPoolAdapter implements NotifyExecutorPoolPort { + // TODO Not working for now bc it doesn't get autowired + @Value("${executor.pool.url}") String server = "http://127.0.0.1:8083"; Logger logger = Logger.getLogger(NotifyExecutorPoolAdapter.class.getName()); + /** + * Notifies the executor-pool about the startup of this executor + * @return if the notification was successful + **/ @Override - public boolean notifyExecutorPool(String ip, int port, ExecutorType executorType) { + public boolean notifyExecutorPool(ExecutorURI executorURI, ExecutorType executorType) { String body = new JSONObject() .put("executorTaskType", executorType) - .put("executorIp", ip) - .put("executorPort", Integer.toString(port)) + .put("executorUri", executorURI.getValue()) .toString(); HttpClient client = HttpClient.newHttpClient(); @@ -45,10 +52,11 @@ public class NotifyExecutorPoolAdapter implements NotifyExecutorPoolPort { if (response.statusCode() == HttpStatus.CREATED.value()) { return true; } - } catch (IOException | InterruptedException e) { + } catch (InterruptedException e) { logger.log(Level.SEVERE, e.getLocalizedMessage(), e); - // Restore interrupted state... Thread.currentThread().interrupt(); + } catch (IOException e) { + logger.log(Level.SEVERE, e.getLocalizedMessage(), e); } return false; diff --git a/executor-base/src/main/java/ch/unisg/executorBase/executor/application/port/in/TaskAvailableCommand.java b/executor-base/src/main/java/ch/unisg/executorBase/executor/application/port/in/TaskAvailableCommand.java index cfa32bb..57bee60 100644 --- a/executor-base/src/main/java/ch/unisg/executorBase/executor/application/port/in/TaskAvailableCommand.java +++ b/executor-base/src/main/java/ch/unisg/executorBase/executor/application/port/in/TaskAvailableCommand.java @@ -1,10 +1,9 @@ -package ch.unisg.executorBase.executor.application.port.in; - -import ch.unisg.executorBase.common.SelfValidating; -import ch.unisg.executorBase.executor.domain.ExecutorType; +package ch.unisg.executorbase.executor.application.port.in; import javax.validation.constraints.NotNull; +import ch.unisg.common.validation.SelfValidating; +import ch.unisg.executorbase.executor.domain.ExecutorType; import lombok.Value; @Value diff --git a/executor-base/src/main/java/ch/unisg/executorBase/executor/application/port/in/TaskAvailableUseCase.java b/executor-base/src/main/java/ch/unisg/executorBase/executor/application/port/in/TaskAvailableUseCase.java index cc5215f..5e000da 100644 --- a/executor-base/src/main/java/ch/unisg/executorBase/executor/application/port/in/TaskAvailableUseCase.java +++ b/executor-base/src/main/java/ch/unisg/executorBase/executor/application/port/in/TaskAvailableUseCase.java @@ -1,4 +1,4 @@ -package ch.unisg.executorBase.executor.application.port.in; +package ch.unisg.executorbase.executor.application.port.in; public interface TaskAvailableUseCase { void newTaskAvailable(TaskAvailableCommand command); diff --git a/executor-base/src/main/java/ch/unisg/executorBase/executor/application/port/out/ExecutionFinishedEventPort.java b/executor-base/src/main/java/ch/unisg/executorBase/executor/application/port/out/ExecutionFinishedEventPort.java index 1bf668e..ef65922 100644 --- a/executor-base/src/main/java/ch/unisg/executorBase/executor/application/port/out/ExecutionFinishedEventPort.java +++ b/executor-base/src/main/java/ch/unisg/executorBase/executor/application/port/out/ExecutionFinishedEventPort.java @@ -1,6 +1,6 @@ -package ch.unisg.executorBase.executor.application.port.out; +package ch.unisg.executorbase.executor.application.port.out; -import ch.unisg.executorBase.executor.domain.ExecutionFinishedEvent; +import ch.unisg.executorbase.executor.domain.ExecutionFinishedEvent; public interface ExecutionFinishedEventPort { void publishExecutionFinishedEvent(ExecutionFinishedEvent event); diff --git a/executor-base/src/main/java/ch/unisg/executorBase/executor/application/port/out/GetAssignmentPort.java b/executor-base/src/main/java/ch/unisg/executorBase/executor/application/port/out/GetAssignmentPort.java index 79d3a0a..95dc15d 100644 --- a/executor-base/src/main/java/ch/unisg/executorBase/executor/application/port/out/GetAssignmentPort.java +++ b/executor-base/src/main/java/ch/unisg/executorBase/executor/application/port/out/GetAssignmentPort.java @@ -1,8 +1,9 @@ -package ch.unisg.executorBase.executor.application.port.out; +package ch.unisg.executorbase.executor.application.port.out; -import ch.unisg.executorBase.executor.domain.ExecutorType; -import ch.unisg.executorBase.executor.domain.Task; +import ch.unisg.common.valueobject.ExecutorURI; +import ch.unisg.executorbase.executor.domain.ExecutorType; +import ch.unisg.executorbase.executor.domain.Task; public interface GetAssignmentPort { - Task getAssignment(ExecutorType executorType, String ip, int port); + Task getAssignment(ExecutorType executorType, ExecutorURI executorURI); } diff --git a/executor-base/src/main/java/ch/unisg/executorBase/executor/application/port/out/NotifyExecutorPoolPort.java b/executor-base/src/main/java/ch/unisg/executorBase/executor/application/port/out/NotifyExecutorPoolPort.java index 6d41ab4..1d4d3d3 100644 --- a/executor-base/src/main/java/ch/unisg/executorBase/executor/application/port/out/NotifyExecutorPoolPort.java +++ b/executor-base/src/main/java/ch/unisg/executorBase/executor/application/port/out/NotifyExecutorPoolPort.java @@ -1,7 +1,8 @@ -package ch.unisg.executorBase.executor.application.port.out; +package ch.unisg.executorbase.executor.application.port.out; -import ch.unisg.executorBase.executor.domain.ExecutorType; +import ch.unisg.common.valueobject.ExecutorURI; +import ch.unisg.executorbase.executor.domain.ExecutorType; public interface NotifyExecutorPoolPort { - boolean notifyExecutorPool(String ip, int port, ExecutorType executorType); + boolean notifyExecutorPool(ExecutorURI executorURI, ExecutorType executorType); } diff --git a/executor-base/src/main/java/ch/unisg/executorBase/executor/application/service/NotifyExecutorPoolService.java b/executor-base/src/main/java/ch/unisg/executorBase/executor/application/service/NotifyExecutorPoolService.java index a5ccb64..aee3142 100644 --- a/executor-base/src/main/java/ch/unisg/executorBase/executor/application/service/NotifyExecutorPoolService.java +++ b/executor-base/src/main/java/ch/unisg/executorBase/executor/application/service/NotifyExecutorPoolService.java @@ -1,7 +1,8 @@ -package ch.unisg.executorBase.executor.application.service; +package ch.unisg.executorbase.executor.application.service; -import ch.unisg.executorBase.executor.application.port.out.NotifyExecutorPoolPort; -import ch.unisg.executorBase.executor.domain.ExecutorType; +import ch.unisg.common.valueobject.ExecutorURI; +import ch.unisg.executorbase.executor.application.port.out.NotifyExecutorPoolPort; +import ch.unisg.executorbase.executor.domain.ExecutorType; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor @@ -9,7 +10,7 @@ public class NotifyExecutorPoolService { private final NotifyExecutorPoolPort notifyExecutorPoolPort; - public boolean notifyExecutorPool(String ip, int port, ExecutorType executorType) { - return notifyExecutorPoolPort.notifyExecutorPool(ip, port, executorType); + public boolean notifyExecutorPool(ExecutorURI executorURI, ExecutorType executorType) { + return notifyExecutorPoolPort.notifyExecutorPool(executorURI, executorType); } } diff --git a/executor-base/src/main/java/ch/unisg/executorBase/executor/application/service/TaskAvailableService.java b/executor-base/src/main/java/ch/unisg/executorBase/executor/application/service/TaskAvailableService.java index a4f5e6e..050a807 100644 --- a/executor-base/src/main/java/ch/unisg/executorBase/executor/application/service/TaskAvailableService.java +++ b/executor-base/src/main/java/ch/unisg/executorBase/executor/application/service/TaskAvailableService.java @@ -1,9 +1,9 @@ -package ch.unisg.executorBase.executor.application.service; +package ch.unisg.executorbase.executor.application.service; import org.springframework.stereotype.Component; -import ch.unisg.executorBase.executor.application.port.in.TaskAvailableCommand; -import ch.unisg.executorBase.executor.application.port.in.TaskAvailableUseCase; +import ch.unisg.executorbase.executor.application.port.in.TaskAvailableCommand; +import ch.unisg.executorbase.executor.application.port.in.TaskAvailableUseCase; import lombok.RequiredArgsConstructor; import javax.transaction.Transactional; @@ -15,6 +15,6 @@ public class TaskAvailableService implements TaskAvailableUseCase { @Override public void newTaskAvailable(TaskAvailableCommand command) { - // Placeholder so spring can create a bean + // Placeholder so spring can create a bean, implementation of this function is inside the executors } } diff --git a/executor-base/src/main/java/ch/unisg/executorBase/executor/domain/ExecutionFinishedEvent.java b/executor-base/src/main/java/ch/unisg/executorBase/executor/domain/ExecutionFinishedEvent.java index 31fd0e6..56637c4 100644 --- a/executor-base/src/main/java/ch/unisg/executorBase/executor/domain/ExecutionFinishedEvent.java +++ b/executor-base/src/main/java/ch/unisg/executorBase/executor/domain/ExecutionFinishedEvent.java @@ -1,21 +1,21 @@ -package ch.unisg.executorBase.executor.domain; +package ch.unisg.executorbase.executor.domain; import lombok.Getter; public class ExecutionFinishedEvent { - + @Getter private String taskID; - + @Getter - private String result; + private String outputData; @Getter private String status; - public ExecutionFinishedEvent(String taskID, String result, String status) { + public ExecutionFinishedEvent(String taskID, String outputData, String status) { this.taskID = taskID; - this.result = result; + this.outputData = outputData; this.status = status; } } diff --git a/executor-base/src/main/java/ch/unisg/executorBase/executor/domain/ExecutorBase.java b/executor-base/src/main/java/ch/unisg/executorBase/executor/domain/ExecutorBase.java index c9df1a8..14582e7 100644 --- a/executor-base/src/main/java/ch/unisg/executorBase/executor/domain/ExecutorBase.java +++ b/executor-base/src/main/java/ch/unisg/executorBase/executor/domain/ExecutorBase.java @@ -1,45 +1,46 @@ -package ch.unisg.executorBase.executor.domain; +package ch.unisg.executorbase.executor.domain; -import ch.unisg.executorBase.executor.application.port.out.ExecutionFinishedEventPort; -import ch.unisg.executorBase.executor.application.port.out.GetAssignmentPort; -import ch.unisg.executorBase.executor.application.port.out.NotifyExecutorPoolPort; +import java.util.logging.Logger; -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; -import ch.unisg.executorBase.executor.application.service.NotifyExecutorPoolService; +import ch.unisg.common.valueobject.ExecutorURI; +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; +import ch.unisg.executorbase.executor.application.port.out.ExecutionFinishedEventPort; +import ch.unisg.executorbase.executor.application.port.out.GetAssignmentPort; +import ch.unisg.executorbase.executor.application.port.out.NotifyExecutorPoolPort; +import ch.unisg.executorbase.executor.application.service.NotifyExecutorPoolService; import lombok.Getter; public abstract class ExecutorBase { @Getter - private String ip; + private ExecutorURI executorURI; @Getter private ExecutorType executorType; - @Getter - private int port; - @Getter private ExecutorStatus status; - // TODO Violation of the Dependency Inversion Principle?, but we havn't really got a better solutions to send a http request / access a service from a domain model - // TODO I guess we can somehow autowire this but I don't know why it's not working :D + // TODO Violation of the Dependency Inversion Principle?, + // TODO do this with only services private final NotifyExecutorPoolPort notifyExecutorPoolPort = new NotifyExecutorPoolAdapter(); private final NotifyExecutorPoolService notifyExecutorPoolService = new NotifyExecutorPoolService(notifyExecutorPoolPort); private final GetAssignmentPort getAssignmentPort = new GetAssignmentAdapter(); private final ExecutionFinishedEventPort executionFinishedEventPort = new ExecutionFinishedEventAdapter(); - public ExecutorBase(ExecutorType executorType) { - System.out.println("Starting Executor"); - // TODO set this automaticly - this.ip = "localhost"; - this.port = 8084; - this.executorType = executorType; + Logger logger = Logger.getLogger(ExecutorBase.class.getName()); + protected ExecutorBase(ExecutorType executorType) { + logger.info("Starting Executor"); this.status = ExecutorStatus.STARTING_UP; - if(!notifyExecutorPoolService.notifyExecutorPool(this.ip, this.port, this.executorType)) { + this.executorType = executorType; + // TODO set this automaticly + this.executorURI = new ExecutorURI("http://localhost:8084"); + // TODO do this in main + // Notify executor-pool about existence. If executor-pools response is successfull start with getting an assignment, else shut down executor. + if(!notifyExecutorPoolService.notifyExecutorPool(this.executorURI, this.executorType)) { System.exit(0); } else { this.status = ExecutorStatus.IDLING; @@ -47,9 +48,14 @@ public abstract class ExecutorBase { } } + /** + * Requests a new task from the task queue + * @return void + **/ public void getAssignment() { - Task newTask = getAssignmentPort.getAssignment(this.getExecutorType(), this.getIp(), - this.getPort()); + Task newTask = getAssignmentPort.getAssignment(this.getExecutorType(), this.getExecutorURI()); + System.out.println("New assignment"); + System.out.println(newTask); if (newTask != null) { this.executeTask(newTask); } else { @@ -57,19 +63,28 @@ public abstract class ExecutorBase { } } + /** + * Start the execution of a task + * @return void + **/ private void executeTask(Task task) { - System.out.println("Starting execution"); + logger.info("Starting execution"); this.status = ExecutorStatus.EXECUTING; - task.setResult(execution()); + task.setOutputData(execution(task.getInputData())); + // TODO implement logic if execution was not successful executionFinishedEventPort.publishExecutionFinishedEvent( - new ExecutionFinishedEvent(task.getTaskID(), task.getResult(), "SUCCESS")); + new ExecutionFinishedEvent(task.getTaskID(), task.getOutputData(), "SUCCESS")); - System.out.println("Finish execution"); + logger.info("Finish execution"); getAssignment(); } - protected abstract String execution(); + /** + * Implementation of the actual execution method of an executor + * @return the execution result + **/ + protected abstract String execution(String input); } diff --git a/executor-base/src/main/java/ch/unisg/executorBase/executor/domain/ExecutorStatus.java b/executor-base/src/main/java/ch/unisg/executorBase/executor/domain/ExecutorStatus.java index 8bd5bc3..1fcf7de 100644 --- a/executor-base/src/main/java/ch/unisg/executorBase/executor/domain/ExecutorStatus.java +++ b/executor-base/src/main/java/ch/unisg/executorBase/executor/domain/ExecutorStatus.java @@ -1,7 +1,7 @@ -package ch.unisg.executorBase.executor.domain; +package ch.unisg.executorbase.executor.domain; public enum ExecutorStatus { - STARTING_UP, - EXECUTING, - IDLING, + STARTING_UP, // Executor is starting + EXECUTING, // Executor is currently executing a task + IDLING, // Executor has no tasks left and is waiting for new instructions } diff --git a/executor-base/src/main/java/ch/unisg/executorBase/executor/domain/ExecutorType.java b/executor-base/src/main/java/ch/unisg/executorBase/executor/domain/ExecutorType.java index 0b2b305..ca9533a 100644 --- a/executor-base/src/main/java/ch/unisg/executorBase/executor/domain/ExecutorType.java +++ b/executor-base/src/main/java/ch/unisg/executorBase/executor/domain/ExecutorType.java @@ -1,8 +1,12 @@ -package ch.unisg.executorBase.executor.domain; +package ch.unisg.executorbase.executor.domain; public enum ExecutorType { ADDITION, ROBOT; + /** + * Checks if the give executor type exists. + * @return Wheter the given executor type exists + **/ public static boolean contains(String test) { for (ExecutorType x : ExecutorType.values()) { diff --git a/executor-base/src/main/java/ch/unisg/executorBase/executor/domain/Task.java b/executor-base/src/main/java/ch/unisg/executorBase/executor/domain/Task.java index fec330f..44595e1 100644 --- a/executor-base/src/main/java/ch/unisg/executorBase/executor/domain/Task.java +++ b/executor-base/src/main/java/ch/unisg/executorBase/executor/domain/Task.java @@ -1,4 +1,4 @@ -package ch.unisg.executorBase.executor.domain; +package ch.unisg.executorbase.executor.domain; import lombok.Getter; import lombok.Setter; @@ -10,10 +10,16 @@ public class Task { @Getter @Setter - private String result; + private String outputData; - public Task(String taskID) { + // TODO maybe create a value object for inputData so we can make sure it is in the right + // format. + @Getter + private String inputData; + + public Task(String taskID, String inputData) { this.taskID = taskID; + this.inputData= inputData; } } diff --git a/executor-base/src/main/resources/application.properties b/executor-base/src/main/resources/application.properties index 4d360de..4316ebf 100644 --- a/executor-base/src/main/resources/application.properties +++ b/executor-base/src/main/resources/application.properties @@ -1 +1,6 @@ server.port=8081 +roster.url=http://127.0.0.1:8082 +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 diff --git a/assignment/.gitignore b/executor-computation/.gitignore similarity index 100% rename from assignment/.gitignore rename to executor-computation/.gitignore diff --git a/executor1/.mvn/wrapper/MavenWrapperDownloader.java b/executor-computation/.mvn/wrapper/MavenWrapperDownloader.java similarity index 100% rename from executor1/.mvn/wrapper/MavenWrapperDownloader.java rename to executor-computation/.mvn/wrapper/MavenWrapperDownloader.java diff --git a/executor1/.mvn/wrapper/maven-wrapper.jar b/executor-computation/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from executor1/.mvn/wrapper/maven-wrapper.jar rename to executor-computation/.mvn/wrapper/maven-wrapper.jar diff --git a/executor1/.mvn/wrapper/maven-wrapper.properties b/executor-computation/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from executor1/.mvn/wrapper/maven-wrapper.properties rename to executor-computation/.mvn/wrapper/maven-wrapper.properties diff --git a/assignment/Dockerfile b/executor-computation/Dockerfile similarity index 100% rename from assignment/Dockerfile rename to executor-computation/Dockerfile diff --git a/executor1/mvnw b/executor-computation/mvnw similarity index 100% rename from executor1/mvnw rename to executor-computation/mvnw diff --git a/executor1/mvnw.cmd b/executor-computation/mvnw.cmd similarity index 100% rename from executor1/mvnw.cmd rename to executor-computation/mvnw.cmd diff --git a/executor2/pom.xml b/executor-computation/pom.xml similarity index 94% rename from executor2/pom.xml rename to executor-computation/pom.xml index 1f970e0..c319081 100644 --- a/executor2/pom.xml +++ b/executor-computation/pom.xml @@ -9,9 +9,9 @@ ch.unisg - executor2 + executor-computation 0.0.1-SNAPSHOT - executor2 + executor-computation Demo project for Spring Boot 11 @@ -42,7 +42,7 @@ ch.unisg - executorBase + executor-base 0.0.1-SNAPSHOT compile diff --git a/executor2/src/main/java/ch/unisg/executor2/Executor2Application.java b/executor-computation/src/main/java/ch/unisg/executorcomputation/ExecutorcomputationApplication.java similarity index 50% rename from executor2/src/main/java/ch/unisg/executor2/Executor2Application.java rename to executor-computation/src/main/java/ch/unisg/executorcomputation/ExecutorcomputationApplication.java index 03edb3d..81975ba 100644 --- a/executor2/src/main/java/ch/unisg/executor2/Executor2Application.java +++ b/executor-computation/src/main/java/ch/unisg/executorcomputation/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/executor-computation/src/main/java/ch/unisg/executorcomputation/executor/adapter/in/web/TaskAvailableController.java similarity index 82% rename from executor2/src/main/java/ch/unisg/executor2/executor/adapter/in/web/TaskAvailableController.java rename to executor-computation/src/main/java/ch/unisg/executorcomputation/executor/adapter/in/web/TaskAvailableController.java index a14b58f..a421924 100644 --- a/executor2/src/main/java/ch/unisg/executor2/executor/adapter/in/web/TaskAvailableController.java +++ b/executor-computation/src/main/java/ch/unisg/executorcomputation/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; @@ -9,9 +9,9 @@ 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; +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 { diff --git a/executor1/src/main/java/ch/unisg/executor1/executor/application/service/TaskAvailableService.java b/executor-computation/src/main/java/ch/unisg/executorcomputation/executor/application/service/TaskAvailableService.java similarity index 65% rename from executor1/src/main/java/ch/unisg/executor1/executor/application/service/TaskAvailableService.java rename to executor-computation/src/main/java/ch/unisg/executorcomputation/executor/application/service/TaskAvailableService.java index d502053..6a94577 100644 --- a/executor1/src/main/java/ch/unisg/executor1/executor/application/service/TaskAvailableService.java +++ b/executor-computation/src/main/java/ch/unisg/executorcomputation/executor/application/service/TaskAvailableService.java @@ -1,11 +1,11 @@ -package ch.unisg.executor1.executor.application.service; +package ch.unisg.executorcomputation.executor.application.service; import org.springframework.stereotype.Component; -import ch.unisg.executor1.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; +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; import lombok.RequiredArgsConstructor; import javax.transaction.Transactional; @@ -20,7 +20,7 @@ public class TaskAvailableService implements TaskAvailableUseCase { Executor executor = Executor.getExecutor(); - if (executor.getExecutorType() == command.getTaskType() && + if (executor.getExecutorType() == command.getTaskType() && executor.getStatus() == ExecutorStatus.IDLING) { executor.getAssignment(); } diff --git a/executor-computation/src/main/java/ch/unisg/executorcomputation/executor/domain/Executor.java b/executor-computation/src/main/java/ch/unisg/executorcomputation/executor/domain/Executor.java new file mode 100644 index 0000000..532099b --- /dev/null +++ b/executor-computation/src/main/java/ch/unisg/executorcomputation/executor/domain/Executor.java @@ -0,0 +1,65 @@ +package ch.unisg.executorcomputation.executor.domain; + +import java.util.concurrent.TimeUnit; + +import ch.unisg.executorbase.executor.domain.ExecutorBase; +import ch.unisg.executorbase.executor.domain.ExecutorType; + +public class Executor extends ExecutorBase { + + private static final Executor executor = new Executor(ExecutorType.ADDITION); + + public static Executor getExecutor() { + return executor; + } + + private Executor(ExecutorType executorType) { + super(executorType); + } + + @Override + protected + String execution(String inputData) { + + System.out.println(inputData); + + String operator = ""; + if (inputData.contains("+")) { + operator = "+"; + } else if (inputData.contains("-")) { + operator = "-"; + } else if (inputData.contains("*")) { + operator = "*"; + } + + // System.out.println(operator); + + // double result = Double.NaN; + + // System.out.print(inputData.split("+")); + + // 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); + + double result = 0.0; + + return Double.toString(result); + } + +} diff --git a/executor2/src/main/resources/application.properties b/executor-computation/src/main/resources/application.properties similarity index 100% rename from executor2/src/main/resources/application.properties rename to executor-computation/src/main/resources/application.properties diff --git a/executor2/src/test/java/ch/unisg/executor2/Executor2ApplicationTests.java b/executor-computation/src/test/java/ch/unisg/executorcomputation/ExecutorcomputationApplicationTests.java similarity index 64% rename from executor2/src/test/java/ch/unisg/executor2/Executor2ApplicationTests.java rename to executor-computation/src/test/java/ch/unisg/executorcomputation/ExecutorcomputationApplicationTests.java index 5724a1c..f17d100 100644 --- a/executor2/src/test/java/ch/unisg/executor2/Executor2ApplicationTests.java +++ b/executor-computation/src/test/java/ch/unisg/executorcomputation/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/executor-pool/pom.xml b/executor-pool/pom.xml index 2e75dcc..512235d 100644 --- a/executor-pool/pom.xml +++ b/executor-pool/pom.xml @@ -63,6 +63,12 @@ javax.transaction-api compile + + org.eclipse.paho + org.eclipse.paho.client.mqttv3 + 1.2.5 + compile + diff --git a/executor-pool/src/main/java/ch/unisg/common/ConfigProperties.java b/executor-pool/src/main/java/ch/unisg/common/ConfigProperties.java new file mode 100644 index 0000000..253922c --- /dev/null +++ b/executor-pool/src/main/java/ch/unisg/common/ConfigProperties.java @@ -0,0 +1,22 @@ +package ch.unisg.common; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.env.Environment; +import org.springframework.stereotype.Component; + +import java.net.URI; + +@Component +public class ConfigProperties { + @Autowired + private Environment environment; + + /** + * Retrieves the URI of the MQTT broker. + * + * @return the URI of the MQTT broker + */ + public URI getMqttBrokerUri() { + return URI.create(environment.getProperty("mqtt.broker.uri")); + } +} diff --git a/executor-pool/src/main/java/ch/unisg/executorpool/TestController.java b/executor-pool/src/main/java/ch/unisg/executorpool/TestController.java deleted file mode 100644 index ca29e09..0000000 --- a/executor-pool/src/main/java/ch/unisg/executorpool/TestController.java +++ /dev/null @@ -1,12 +0,0 @@ -package ch.unisg.executorpool; - -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! Executor Pool"; - } -} diff --git a/executor-pool/src/main/java/ch/unisg/executorpool/adapter/common/clients/TapasMqttClient.java b/executor-pool/src/main/java/ch/unisg/executorpool/adapter/common/clients/TapasMqttClient.java new file mode 100644 index 0000000..0b24b81 --- /dev/null +++ b/executor-pool/src/main/java/ch/unisg/executorpool/adapter/common/clients/TapasMqttClient.java @@ -0,0 +1,41 @@ +package ch.unisg.executorpool.adapter.common.clients; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.eclipse.paho.client.mqttv3.*; +import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; + +import java.nio.charset.StandardCharsets; +import java.util.UUID; + +public class TapasMqttClient { + private static final Logger LOGGER = LogManager.getLogger(TapasMqttClient.class); + + private static TapasMqttClient tapasClient = null; + + private MqttClient mqttClient; + private final String mqttClientId; + private final String brokerAddress; + + private TapasMqttClient(String brokerAddress) { + this.mqttClientId = UUID.randomUUID().toString(); + this.brokerAddress = brokerAddress; + } + + public static synchronized TapasMqttClient getInstance(String brokerAddress) { + + if (tapasClient == null) { + tapasClient = new TapasMqttClient(brokerAddress); + } + + return tapasClient; + } + + public void publishMessage(String topic, String payload) throws MqttException { + mqttClient = new org.eclipse.paho.client.mqttv3.MqttClient(brokerAddress, mqttClientId, new MemoryPersistence()); + mqttClient.connect(); + MqttMessage message = new MqttMessage(payload.getBytes(StandardCharsets.UTF_8)); + mqttClient.publish(topic, message); + mqttClient.disconnect(); + } +} diff --git a/executor-pool/src/main/java/ch/unisg/executorpool/adapter/common/formats/ExecutorJsonRepresentation.java b/executor-pool/src/main/java/ch/unisg/executorpool/adapter/common/formats/ExecutorJsonRepresentation.java new file mode 100644 index 0000000..3c8f6e4 --- /dev/null +++ b/executor-pool/src/main/java/ch/unisg/executorpool/adapter/common/formats/ExecutorJsonRepresentation.java @@ -0,0 +1,51 @@ +package ch.unisg.executorpool.adapter.common.formats; + +import ch.unisg.executorpool.domain.ExecutorClass; +import lombok.Getter; +import lombok.Setter; +import org.json.JSONArray; +import org.json.JSONObject; + +import java.util.List; + +public class ExecutorJsonRepresentation { + public static final String EXECUTOR_MEDIA_TYPE = "application/json"; + + @Getter @Setter + private String executorUri; + + @Getter @Setter + private String executorTaskType; + + // TODO Check if this need Setters. Also applies to AuctionJsonRepresentation + public ExecutorJsonRepresentation(String executorUri, String executorTaskType){ + this.executorUri = executorUri; + this.executorTaskType = executorTaskType; + } + + public static String serialize(ExecutorClass executorClass) { + JSONObject payload = new JSONObject(); + + payload.put("executorUri", executorClass.getExecutorUri().getValue()); + payload.put("executorTaskType", executorClass.getExecutorTaskType().getValue()); + + return payload.toString(); + } + + public static String serialize(List listOfExecutors) { + JSONArray jsonArray = new JSONArray(); + + for (ExecutorClass executor: listOfExecutors) { + JSONObject jsonObject = new JSONObject(); + + jsonObject.put("executorUri", executor.getExecutorUri().getValue()); + jsonObject.put("executorTaskType", executor.getExecutorTaskType().getValue()); + + jsonArray.put(jsonObject); + } + + return jsonArray.toString(); + } + + private ExecutorJsonRepresentation() { } +} diff --git a/executor-pool/src/main/java/ch/unisg/executorpool/adapter/in/web/AddNewExecutorToExecutorPoolWebController.java b/executor-pool/src/main/java/ch/unisg/executorpool/adapter/in/web/AddNewExecutorToExecutorPoolWebController.java index 7967b6b..ff464d3 100644 --- a/executor-pool/src/main/java/ch/unisg/executorpool/adapter/in/web/AddNewExecutorToExecutorPoolWebController.java +++ b/executor-pool/src/main/java/ch/unisg/executorpool/adapter/in/web/AddNewExecutorToExecutorPoolWebController.java @@ -1,5 +1,7 @@ package ch.unisg.executorpool.adapter.in.web; +import ch.unisg.executorpool.adapter.common.clients.TapasMqttClient; +import ch.unisg.executorpool.adapter.common.formats.ExecutorJsonRepresentation; import ch.unisg.executorpool.application.port.in.AddNewExecutorToExecutorPoolUseCase; import ch.unisg.executorpool.application.port.in.AddNewExecutorToExecutorPoolCommand; import ch.unisg.executorpool.domain.ExecutorClass; @@ -11,6 +13,11 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ResponseStatusException; import javax.validation.ConstraintViolationException; +import java.net.URI; +import java.nio.charset.StandardCharsets; +import java.util.UUID; + +import org.eclipse.paho.client.mqttv3.*; @RestController public class AddNewExecutorToExecutorPoolWebController { @@ -20,19 +27,21 @@ public class AddNewExecutorToExecutorPoolWebController { this.addNewExecutorToExecutorPoolUseCase = addNewExecutorToExecutorPoolUseCase; } - @PostMapping(path = "/executor-pool/AddExecutor", consumes = {ExecutorMediaType.EXECUTOR_MEDIA_TYPE}) - public ResponseEntity addNewExecutorToExecutorPool(@RequestBody ExecutorClass executorClass){ - try{ + @PostMapping(path = "/executor-pool/AddExecutor", consumes = {ExecutorJsonRepresentation.EXECUTOR_MEDIA_TYPE}) + public ResponseEntity addNewExecutorToExecutorPool(@RequestBody ExecutorJsonRepresentation payload){ + try { AddNewExecutorToExecutorPoolCommand command = new AddNewExecutorToExecutorPoolCommand( - executorClass.getExecutorIp(), executorClass.getExecutorPort(), executorClass.getExecutorTaskType() + new ExecutorClass.ExecutorUri(URI.create(payload.getExecutorUri())), + new ExecutorClass.ExecutorTaskType(payload.getExecutorTaskType()) ); ExecutorClass newExecutor = addNewExecutorToExecutorPoolUseCase.addNewExecutorToExecutorPool(command); HttpHeaders responseHeaders = new HttpHeaders(); - responseHeaders.add(HttpHeaders.CONTENT_TYPE, ExecutorMediaType.EXECUTOR_MEDIA_TYPE); + responseHeaders.add(HttpHeaders.CONTENT_TYPE, ExecutorJsonRepresentation.EXECUTOR_MEDIA_TYPE); + + return new ResponseEntity<>(ExecutorJsonRepresentation.serialize(newExecutor), responseHeaders, HttpStatus.CREATED); - return new ResponseEntity<>(ExecutorMediaType.serialize(newExecutor), responseHeaders, HttpStatus.CREATED); } catch (ConstraintViolationException e){ throw new ResponseStatusException(HttpStatus.BAD_REQUEST, e.getMessage()); } diff --git a/executor-pool/src/main/java/ch/unisg/executorpool/adapter/in/web/ExecutorMediaType.java b/executor-pool/src/main/java/ch/unisg/executorpool/adapter/in/web/ExecutorMediaType.java deleted file mode 100644 index 0ca4e1f..0000000 --- a/executor-pool/src/main/java/ch/unisg/executorpool/adapter/in/web/ExecutorMediaType.java +++ /dev/null @@ -1,38 +0,0 @@ -package ch.unisg.executorpool.adapter.in.web; - -import ch.unisg.executorpool.domain.ExecutorClass; -import org.json.JSONArray; -import org.json.JSONObject; - -import java.util.List; - -final public class ExecutorMediaType { - public static final String EXECUTOR_MEDIA_TYPE = "application/json"; - - public static String serialize(ExecutorClass executorClass) { - JSONObject payload = new JSONObject(); - - payload.put("executorIp", executorClass.getExecutorIp().getValue()); - payload.put("executorPort", executorClass.getExecutorPort().getValue()); - payload.put("executorTaskType", executorClass.getExecutorTaskType().getValue()); - - return payload.toString(); - } - - public static String serialize(List listOfExecutors) { - String serializedList = "[ \n"; - - for (ExecutorClass executor: listOfExecutors) { - serializedList += serialize(executor) + "\n"; - } - - // return serializedList + "\n ]"; - JSONArray jsonArray = new JSONArray(); - JSONObject jsonObject = new JSONObject(); - jsonObject.put("executorIp", "localhost"); - jsonArray.put(jsonObject); - return jsonArray.toString(); - } - - private ExecutorMediaType() { } -} diff --git a/executor-pool/src/main/java/ch/unisg/executorpool/adapter/in/web/GetAllExecutorInExecutorPoolByTypeWebController.java b/executor-pool/src/main/java/ch/unisg/executorpool/adapter/in/web/GetAllExecutorInExecutorPoolByTypeWebController.java deleted file mode 100644 index 2595781..0000000 --- a/executor-pool/src/main/java/ch/unisg/executorpool/adapter/in/web/GetAllExecutorInExecutorPoolByTypeWebController.java +++ /dev/null @@ -1,35 +0,0 @@ -package ch.unisg.executorpool.adapter.in.web; - -import ch.unisg.executorpool.application.port.in.GetAllExecutorInExecutorPoolByTypeQuery; -import ch.unisg.executorpool.application.port.in.GetAllExecutorInExecutorPoolByTypeUseCase; -import ch.unisg.executorpool.domain.ExecutorClass; -import ch.unisg.executorpool.domain.ExecutorClass.ExecutorTaskType; -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 java.util.List; - -@RestController -public class GetAllExecutorInExecutorPoolByTypeWebController { - private final GetAllExecutorInExecutorPoolByTypeUseCase getAllExecutorInExecutorPoolByTypeUseCase; - - public GetAllExecutorInExecutorPoolByTypeWebController(GetAllExecutorInExecutorPoolByTypeUseCase getAllExecutorInExecutorPoolByTypeUseCase){ - this.getAllExecutorInExecutorPoolByTypeUseCase = getAllExecutorInExecutorPoolByTypeUseCase; - } - - @GetMapping(path = "/executor-pool/GetAllExecutorInExecutorPoolByType/{taskType}") - public ResponseEntity getAllExecutorInExecutorPoolByType(@PathVariable("taskType") String taskType){ - GetAllExecutorInExecutorPoolByTypeQuery query = new GetAllExecutorInExecutorPoolByTypeQuery(new ExecutorTaskType(taskType)); - List matchedExecutors = getAllExecutorInExecutorPoolByTypeUseCase.getAllExecutorInExecutorPoolByType(query); - - // Add the content type as a response header - HttpHeaders responseHeaders = new HttpHeaders(); - responseHeaders.add(HttpHeaders.CONTENT_TYPE, ExecutorMediaType.EXECUTOR_MEDIA_TYPE); - - return new ResponseEntity<>(ExecutorMediaType.serialize(matchedExecutors), responseHeaders, HttpStatus.OK); - } -} diff --git a/executor-pool/src/main/java/ch/unisg/executorpool/adapter/in/web/GetAllExecutorsInExecutorPoolByTypeWebController.java b/executor-pool/src/main/java/ch/unisg/executorpool/adapter/in/web/GetAllExecutorsInExecutorPoolByTypeWebController.java new file mode 100644 index 0000000..8c7ce3d --- /dev/null +++ b/executor-pool/src/main/java/ch/unisg/executorpool/adapter/in/web/GetAllExecutorsInExecutorPoolByTypeWebController.java @@ -0,0 +1,36 @@ +package ch.unisg.executorpool.adapter.in.web; + +import ch.unisg.executorpool.adapter.common.formats.ExecutorJsonRepresentation; +import ch.unisg.executorpool.application.port.in.GetAllExecutorsInExecutorPoolByTypeQuery; +import ch.unisg.executorpool.application.port.in.GetAllExecutorsInExecutorPoolByTypeUseCase; +import ch.unisg.executorpool.domain.ExecutorClass; +import ch.unisg.executorpool.domain.ExecutorClass.ExecutorTaskType; +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 java.util.List; + +@RestController +public class GetAllExecutorsInExecutorPoolByTypeWebController { + private final GetAllExecutorsInExecutorPoolByTypeUseCase getAllExecutorsInExecutorPoolByTypeUseCase; + + public GetAllExecutorsInExecutorPoolByTypeWebController(GetAllExecutorsInExecutorPoolByTypeUseCase getAllExecutorInExecutorPoolByTypeUseCase){ + this.getAllExecutorsInExecutorPoolByTypeUseCase = getAllExecutorInExecutorPoolByTypeUseCase; + } + + @GetMapping(path = "/executor-pool/GetAllExecutorsInExecutorPoolByType/{taskType}") + public ResponseEntity getAllExecutorInExecutorPoolByType(@PathVariable("taskType") String taskType){ + GetAllExecutorsInExecutorPoolByTypeQuery query = new GetAllExecutorsInExecutorPoolByTypeQuery(new ExecutorTaskType(taskType)); + List matchedExecutors = getAllExecutorsInExecutorPoolByTypeUseCase.getAllExecutorsInExecutorPoolByType(query); + + // Add the content type as a response header + HttpHeaders responseHeaders = new HttpHeaders(); + responseHeaders.add(HttpHeaders.CONTENT_TYPE, ExecutorJsonRepresentation.EXECUTOR_MEDIA_TYPE); + + return new ResponseEntity<>(ExecutorJsonRepresentation.serialize(matchedExecutors), responseHeaders, HttpStatus.OK); + } +} diff --git a/executor-pool/src/main/java/ch/unisg/executorpool/adapter/in/web/GetAllExecutorsInExecutorPoolWebController.java b/executor-pool/src/main/java/ch/unisg/executorpool/adapter/in/web/GetAllExecutorsInExecutorPoolWebController.java index 70a5fd2..13a631a 100644 --- a/executor-pool/src/main/java/ch/unisg/executorpool/adapter/in/web/GetAllExecutorsInExecutorPoolWebController.java +++ b/executor-pool/src/main/java/ch/unisg/executorpool/adapter/in/web/GetAllExecutorsInExecutorPoolWebController.java @@ -1,5 +1,6 @@ package ch.unisg.executorpool.adapter.in.web; +import ch.unisg.executorpool.adapter.common.formats.ExecutorJsonRepresentation; import ch.unisg.executorpool.application.port.in.GetAllExecutorsInExecutorPoolUseCase; import ch.unisg.executorpool.domain.ExecutorClass; import org.springframework.http.HttpHeaders; @@ -24,8 +25,8 @@ public class GetAllExecutorsInExecutorPoolWebController { // Add the content type as a response header HttpHeaders responseHeaders = new HttpHeaders(); - responseHeaders.add(HttpHeaders.CONTENT_TYPE, ExecutorMediaType.EXECUTOR_MEDIA_TYPE); + responseHeaders.add(HttpHeaders.CONTENT_TYPE, ExecutorJsonRepresentation.EXECUTOR_MEDIA_TYPE); - return new ResponseEntity<>(ExecutorMediaType.serialize(executorClassList), responseHeaders, HttpStatus.OK); + return new ResponseEntity<>(ExecutorJsonRepresentation.serialize(executorClassList), responseHeaders, HttpStatus.OK); } } diff --git a/executor-pool/src/main/java/ch/unisg/executorpool/adapter/in/web/RemoveExecutorFromExecutorPoolWebController.java b/executor-pool/src/main/java/ch/unisg/executorpool/adapter/in/web/RemoveExecutorFromExecutorPoolWebController.java index 69bbde3..28c3511 100644 --- a/executor-pool/src/main/java/ch/unisg/executorpool/adapter/in/web/RemoveExecutorFromExecutorPoolWebController.java +++ b/executor-pool/src/main/java/ch/unisg/executorpool/adapter/in/web/RemoveExecutorFromExecutorPoolWebController.java @@ -1,5 +1,6 @@ package ch.unisg.executorpool.adapter.in.web; +import ch.unisg.executorpool.adapter.common.formats.ExecutorJsonRepresentation; import ch.unisg.executorpool.application.port.in.RemoveExecutorFromExecutorPoolCommand; import ch.unisg.executorpool.application.port.in.RemoveExecutorFromExecutorPoolUseCase; import ch.unisg.executorpool.domain.ExecutorClass; @@ -11,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ResponseStatusException; +import java.net.URI; import java.util.Optional; @RestController @@ -21,9 +23,11 @@ public class RemoveExecutorFromExecutorPoolWebController { this.removeExecutorFromExecutorPoolUseCase = removeExecutorFromExecutorPoolUseCase; } - @PostMapping(path = "/executor-pool/RemoveExecutor", consumes = {ExecutorMediaType.EXECUTOR_MEDIA_TYPE}) - public ResponseEntity removeExecutorFromExecutorPool(@RequestBody ExecutorClass executorClass){ - RemoveExecutorFromExecutorPoolCommand command = new RemoveExecutorFromExecutorPoolCommand(executorClass.getExecutorIp(), executorClass.getExecutorPort()); + @PostMapping(path = "/executor-pool/RemoveExecutor", consumes = {ExecutorJsonRepresentation.EXECUTOR_MEDIA_TYPE}) + public ResponseEntity removeExecutorFromExecutorPool(@RequestBody ExecutorJsonRepresentation executorJsonRepresentation){ + RemoveExecutorFromExecutorPoolCommand command = new RemoveExecutorFromExecutorPoolCommand( + new ExecutorClass.ExecutorUri(URI.create(executorJsonRepresentation.getExecutorUri())) + ); Optional removedExecutor = removeExecutorFromExecutorPoolUseCase.removeExecutorFromExecutorPool(command); if(removedExecutor.isEmpty()){ @@ -31,9 +35,9 @@ public class RemoveExecutorFromExecutorPoolWebController { } HttpHeaders responseHeaders = new HttpHeaders(); - responseHeaders.add(HttpHeaders.CONTENT_TYPE, ExecutorMediaType.EXECUTOR_MEDIA_TYPE); + responseHeaders.add(HttpHeaders.CONTENT_TYPE, ExecutorJsonRepresentation.EXECUTOR_MEDIA_TYPE); - return new ResponseEntity<>(ExecutorMediaType.serialize(removedExecutor.get()), responseHeaders, + return new ResponseEntity<>(ExecutorJsonRepresentation.serialize(removedExecutor.get()), responseHeaders, HttpStatus.OK); } } diff --git a/executor-pool/src/main/java/ch/unisg/executorpool/adapter/out/messaging/PublishExecutorAddedEventAdapter.java b/executor-pool/src/main/java/ch/unisg/executorpool/adapter/out/messaging/PublishExecutorAddedEventAdapter.java new file mode 100644 index 0000000..323bcbb --- /dev/null +++ b/executor-pool/src/main/java/ch/unisg/executorpool/adapter/out/messaging/PublishExecutorAddedEventAdapter.java @@ -0,0 +1,43 @@ +package ch.unisg.executorpool.adapter.out.messaging; + +import ch.unisg.common.ConfigProperties; +import ch.unisg.executorpool.adapter.common.clients.TapasMqttClient; +import ch.unisg.executorpool.adapter.common.formats.ExecutorJsonRepresentation; +import ch.unisg.executorpool.application.port.out.ExecutorAddedEventPort; +import ch.unisg.executorpool.domain.ExecutorAddedEvent; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.eclipse.paho.client.mqttv3.MqttException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Primary; +import org.springframework.core.env.Environment; +import org.springframework.stereotype.Component; + +import java.net.URI; + +@Component +@Primary +public class PublishExecutorAddedEventAdapter implements ExecutorAddedEventPort { + + private static final Logger LOGGER = LogManager.getLogger(PublishExecutorAddedEventAdapter.class); + + // TODO Can't autowire. Find fix + /* + @Autowired + private ConfigProperties config; + */ + + @Autowired + private Environment environment; + + @Override + public void publishExecutorAddedEvent(ExecutorAddedEvent event){ + try{ + var mqttClient = TapasMqttClient.getInstance(environment.getProperty("mqtt.broker.uri")); + mqttClient.publishMessage("ch/unisg/tapas/executors/added", ExecutorJsonRepresentation.serialize(event.getExecutorClass())); + } + catch (MqttException e){ + LOGGER.error(e.getMessage(), e); + } + } +} diff --git a/executor-pool/src/main/java/ch/unisg/executorpool/adapter/out/messaging/PublishExecutorRemovedEventAdapter.java b/executor-pool/src/main/java/ch/unisg/executorpool/adapter/out/messaging/PublishExecutorRemovedEventAdapter.java new file mode 100644 index 0000000..aa01165 --- /dev/null +++ b/executor-pool/src/main/java/ch/unisg/executorpool/adapter/out/messaging/PublishExecutorRemovedEventAdapter.java @@ -0,0 +1,41 @@ +package ch.unisg.executorpool.adapter.out.messaging; + +import ch.unisg.executorpool.adapter.common.clients.TapasMqttClient; +import ch.unisg.executorpool.adapter.common.formats.ExecutorJsonRepresentation; +import ch.unisg.executorpool.application.port.out.ExecutorRemovedEventPort; +import ch.unisg.executorpool.domain.ExecutorAddedEvent; +import ch.unisg.executorpool.domain.ExecutorRemovedEvent; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.eclipse.paho.client.mqttv3.MqttException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Primary; +import org.springframework.core.env.Environment; +import org.springframework.stereotype.Component; + +@Component +@Primary +public class PublishExecutorRemovedEventAdapter implements ExecutorRemovedEventPort { + + private static final Logger LOGGER = LogManager.getLogger(PublishExecutorAddedEventAdapter.class); + + // TODO Can't autowire. Find fix + /* + @Autowired + private ConfigProperties config; + */ + + @Autowired + private Environment environment; + + @Override + public void publishExecutorRemovedEvent(ExecutorRemovedEvent event){ + try{ + var mqttClient = TapasMqttClient.getInstance(environment.getProperty("mqtt.broker.uri")); + mqttClient.publishMessage("ch/unisg/tapas/executors/removed", ExecutorJsonRepresentation.serialize(event.getExecutorClass())); + } + catch (MqttException e){ + LOGGER.error(e.getMessage(), e); + } + } +} diff --git a/executor-pool/src/main/java/ch/unisg/executorpool/application/port/in/AddNewExecutorToExecutorPoolCommand.java b/executor-pool/src/main/java/ch/unisg/executorpool/application/port/in/AddNewExecutorToExecutorPoolCommand.java index 2682610..ddd7da9 100644 --- a/executor-pool/src/main/java/ch/unisg/executorpool/application/port/in/AddNewExecutorToExecutorPoolCommand.java +++ b/executor-pool/src/main/java/ch/unisg/executorpool/application/port/in/AddNewExecutorToExecutorPoolCommand.java @@ -2,8 +2,7 @@ package ch.unisg.executorpool.application.port.in; import ch.unisg.common.SelfValidating; import ch.unisg.executorpool.domain.ExecutorPool; -import ch.unisg.executorpool.domain.ExecutorClass.ExecutorIp; -import ch.unisg.executorpool.domain.ExecutorClass.ExecutorPort; +import ch.unisg.executorpool.domain.ExecutorClass.ExecutorUri; import ch.unisg.executorpool.domain.ExecutorClass.ExecutorTaskType; import lombok.Value; import javax.validation.constraints.NotNull; @@ -11,17 +10,13 @@ import javax.validation.constraints.NotNull; @Value public class AddNewExecutorToExecutorPoolCommand extends SelfValidating { @NotNull - private final ExecutorIp executorIp; - - @NotNull - private final ExecutorPort executorPort; + private final ExecutorUri executorUri; @NotNull private final ExecutorTaskType executorTaskType; - public AddNewExecutorToExecutorPoolCommand(ExecutorIp executorIp, ExecutorPort executorPort, ExecutorTaskType executorTaskType){ - this.executorIp = executorIp; - this.executorPort = executorPort; + public AddNewExecutorToExecutorPoolCommand(ExecutorUri executorUri, ExecutorTaskType executorTaskType){ + this.executorUri = executorUri; this.executorTaskType = executorTaskType; this.validateSelf(); } diff --git a/executor-pool/src/main/java/ch/unisg/executorpool/application/port/in/GetAllExecutorInExecutorPoolByTypeUseCase.java b/executor-pool/src/main/java/ch/unisg/executorpool/application/port/in/GetAllExecutorInExecutorPoolByTypeUseCase.java deleted file mode 100644 index 9f612bf..0000000 --- a/executor-pool/src/main/java/ch/unisg/executorpool/application/port/in/GetAllExecutorInExecutorPoolByTypeUseCase.java +++ /dev/null @@ -1,9 +0,0 @@ -package ch.unisg.executorpool.application.port.in; - -import ch.unisg.executorpool.domain.ExecutorClass; - -import java.util.List; - -public interface GetAllExecutorInExecutorPoolByTypeUseCase { - List getAllExecutorInExecutorPoolByType(GetAllExecutorInExecutorPoolByTypeQuery query); -} diff --git a/executor-pool/src/main/java/ch/unisg/executorpool/application/port/in/GetAllExecutorInExecutorPoolByTypeQuery.java b/executor-pool/src/main/java/ch/unisg/executorpool/application/port/in/GetAllExecutorsInExecutorPoolByTypeQuery.java similarity index 64% rename from executor-pool/src/main/java/ch/unisg/executorpool/application/port/in/GetAllExecutorInExecutorPoolByTypeQuery.java rename to executor-pool/src/main/java/ch/unisg/executorpool/application/port/in/GetAllExecutorsInExecutorPoolByTypeQuery.java index c812eab..079e7e1 100644 --- a/executor-pool/src/main/java/ch/unisg/executorpool/application/port/in/GetAllExecutorInExecutorPoolByTypeQuery.java +++ b/executor-pool/src/main/java/ch/unisg/executorpool/application/port/in/GetAllExecutorsInExecutorPoolByTypeQuery.java @@ -7,11 +7,11 @@ import lombok.Value; import javax.validation.constraints.NotNull; @Value -public class GetAllExecutorInExecutorPoolByTypeQuery extends SelfValidating { +public class GetAllExecutorsInExecutorPoolByTypeQuery extends SelfValidating { @NotNull private final ExecutorTaskType executorTaskType; - public GetAllExecutorInExecutorPoolByTypeQuery(ExecutorTaskType executorTaskType){ + public GetAllExecutorsInExecutorPoolByTypeQuery(ExecutorTaskType executorTaskType){ this.executorTaskType = executorTaskType; this.validateSelf(); } diff --git a/executor-pool/src/main/java/ch/unisg/executorpool/application/port/in/GetAllExecutorsInExecutorPoolByTypeUseCase.java b/executor-pool/src/main/java/ch/unisg/executorpool/application/port/in/GetAllExecutorsInExecutorPoolByTypeUseCase.java new file mode 100644 index 0000000..4821284 --- /dev/null +++ b/executor-pool/src/main/java/ch/unisg/executorpool/application/port/in/GetAllExecutorsInExecutorPoolByTypeUseCase.java @@ -0,0 +1,9 @@ +package ch.unisg.executorpool.application.port.in; + +import ch.unisg.executorpool.domain.ExecutorClass; + +import java.util.List; + +public interface GetAllExecutorsInExecutorPoolByTypeUseCase { + List getAllExecutorsInExecutorPoolByType(GetAllExecutorsInExecutorPoolByTypeQuery query); +} diff --git a/executor-pool/src/main/java/ch/unisg/executorpool/application/port/in/RemoveExecutorFromExecutorPoolCommand.java b/executor-pool/src/main/java/ch/unisg/executorpool/application/port/in/RemoveExecutorFromExecutorPoolCommand.java index 11763a9..162426c 100644 --- a/executor-pool/src/main/java/ch/unisg/executorpool/application/port/in/RemoveExecutorFromExecutorPoolCommand.java +++ b/executor-pool/src/main/java/ch/unisg/executorpool/application/port/in/RemoveExecutorFromExecutorPoolCommand.java @@ -1,9 +1,7 @@ package ch.unisg.executorpool.application.port.in; -import ch.unisg.executorpool.domain.ExecutorClass; import ch.unisg.common.SelfValidating; -import ch.unisg.executorpool.domain.ExecutorClass.ExecutorIp; -import ch.unisg.executorpool.domain.ExecutorClass.ExecutorPort; +import ch.unisg.executorpool.domain.ExecutorClass.ExecutorUri; import lombok.Value; import javax.validation.constraints.NotNull; @@ -11,14 +9,10 @@ import javax.validation.constraints.NotNull; @Value public class RemoveExecutorFromExecutorPoolCommand extends SelfValidating { @NotNull - private final ExecutorIp executorIp; + private final ExecutorUri executorUri; - @NotNull - private final ExecutorPort executorPort; - - public RemoveExecutorFromExecutorPoolCommand(ExecutorIp executorIp, ExecutorPort executorPort){ - this.executorIp = executorIp; - this.executorPort = executorPort; + public RemoveExecutorFromExecutorPoolCommand(ExecutorUri executorUri){ + this.executorUri = executorUri; this.validateSelf(); } } diff --git a/executor-pool/src/main/java/ch/unisg/executorpool/application/port/out/ExecutorAddedEventPort.java b/executor-pool/src/main/java/ch/unisg/executorpool/application/port/out/ExecutorAddedEventPort.java new file mode 100644 index 0000000..ad75c75 --- /dev/null +++ b/executor-pool/src/main/java/ch/unisg/executorpool/application/port/out/ExecutorAddedEventPort.java @@ -0,0 +1,8 @@ +package ch.unisg.executorpool.application.port.out; + +import ch.unisg.executorpool.domain.ExecutorAddedEvent; +import org.eclipse.paho.client.mqttv3.MqttException; + +public interface ExecutorAddedEventPort { + void publishExecutorAddedEvent(ExecutorAddedEvent event); +} diff --git a/executor-pool/src/main/java/ch/unisg/executorpool/application/port/out/ExecutorRemovedEventPort.java b/executor-pool/src/main/java/ch/unisg/executorpool/application/port/out/ExecutorRemovedEventPort.java new file mode 100644 index 0000000..b905858 --- /dev/null +++ b/executor-pool/src/main/java/ch/unisg/executorpool/application/port/out/ExecutorRemovedEventPort.java @@ -0,0 +1,7 @@ +package ch.unisg.executorpool.application.port.out; + +import ch.unisg.executorpool.domain.ExecutorRemovedEvent; + +public interface ExecutorRemovedEventPort { + void publishExecutorRemovedEvent(ExecutorRemovedEvent event); +} diff --git a/executor-pool/src/main/java/ch/unisg/executorpool/application/service/AddNewExecutorToExecutorPoolService.java b/executor-pool/src/main/java/ch/unisg/executorpool/application/service/AddNewExecutorToExecutorPoolService.java index e1ef237..393024a 100644 --- a/executor-pool/src/main/java/ch/unisg/executorpool/application/service/AddNewExecutorToExecutorPoolService.java +++ b/executor-pool/src/main/java/ch/unisg/executorpool/application/service/AddNewExecutorToExecutorPoolService.java @@ -2,24 +2,33 @@ package ch.unisg.executorpool.application.service; import ch.unisg.executorpool.application.port.in.AddNewExecutorToExecutorPoolUseCase; import ch.unisg.executorpool.application.port.in.AddNewExecutorToExecutorPoolCommand; +import ch.unisg.executorpool.application.port.out.ExecutorAddedEventPort; +import ch.unisg.executorpool.domain.ExecutorAddedEvent; import ch.unisg.executorpool.domain.ExecutorClass; import ch.unisg.executorpool.domain.ExecutorPool; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; -import org.yaml.snakeyaml.constructor.DuplicateKeyException; import javax.transaction.Transactional; -import javax.validation.ConstraintViolationException; -@RequiredArgsConstructor @Component @Transactional public class AddNewExecutorToExecutorPoolService implements AddNewExecutorToExecutorPoolUseCase { + private final ExecutorAddedEventPort executorAddedEventPort; + + public AddNewExecutorToExecutorPoolService(ExecutorAddedEventPort executorAddedEventPort){ + this.executorAddedEventPort = executorAddedEventPort; + } + @Override public ExecutorClass addNewExecutorToExecutorPool(AddNewExecutorToExecutorPoolCommand command){ ExecutorPool executorPool = ExecutorPool.getExecutorPool(); + var newExecutor = executorPool.addNewExecutor(command.getExecutorUri(), command.getExecutorTaskType()); - return executorPool.addNewExecutor(command.getExecutorIp(), command.getExecutorPort(), command.getExecutorTaskType()); + var executorAddedEvent = new ExecutorAddedEvent(newExecutor); + executorAddedEventPort.publishExecutorAddedEvent(executorAddedEvent); + + return newExecutor; } } diff --git a/executor-pool/src/main/java/ch/unisg/executorpool/application/service/GetAllExecutorInExecutorPoolByTypeService.java b/executor-pool/src/main/java/ch/unisg/executorpool/application/service/GetAllExecutorsInExecutorPoolByTypeService.java similarity index 56% rename from executor-pool/src/main/java/ch/unisg/executorpool/application/service/GetAllExecutorInExecutorPoolByTypeService.java rename to executor-pool/src/main/java/ch/unisg/executorpool/application/service/GetAllExecutorsInExecutorPoolByTypeService.java index 74988b2..00d1636 100644 --- a/executor-pool/src/main/java/ch/unisg/executorpool/application/service/GetAllExecutorInExecutorPoolByTypeService.java +++ b/executor-pool/src/main/java/ch/unisg/executorpool/application/service/GetAllExecutorsInExecutorPoolByTypeService.java @@ -1,7 +1,7 @@ package ch.unisg.executorpool.application.service; -import ch.unisg.executorpool.application.port.in.GetAllExecutorInExecutorPoolByTypeQuery; -import ch.unisg.executorpool.application.port.in.GetAllExecutorInExecutorPoolByTypeUseCase; +import ch.unisg.executorpool.application.port.in.GetAllExecutorsInExecutorPoolByTypeQuery; +import ch.unisg.executorpool.application.port.in.GetAllExecutorsInExecutorPoolByTypeUseCase; import ch.unisg.executorpool.domain.ExecutorClass; import ch.unisg.executorpool.domain.ExecutorPool; import lombok.RequiredArgsConstructor; @@ -13,10 +13,10 @@ import java.util.List; @RequiredArgsConstructor @Component @Transactional -public class GetAllExecutorInExecutorPoolByTypeService implements GetAllExecutorInExecutorPoolByTypeUseCase { +public class GetAllExecutorsInExecutorPoolByTypeService implements GetAllExecutorsInExecutorPoolByTypeUseCase { @Override - public List getAllExecutorInExecutorPoolByType(GetAllExecutorInExecutorPoolByTypeQuery query){ + public List getAllExecutorsInExecutorPoolByType(GetAllExecutorsInExecutorPoolByTypeQuery query){ ExecutorPool executorPool = ExecutorPool.getExecutorPool(); return executorPool.getAllExecutorsByType(query.getExecutorTaskType()); } diff --git a/executor-pool/src/main/java/ch/unisg/executorpool/application/service/RemoveExecutorFromExecutorPoolService.java b/executor-pool/src/main/java/ch/unisg/executorpool/application/service/RemoveExecutorFromExecutorPoolService.java index 639ba7f..4d2457d 100644 --- a/executor-pool/src/main/java/ch/unisg/executorpool/application/service/RemoveExecutorFromExecutorPoolService.java +++ b/executor-pool/src/main/java/ch/unisg/executorpool/application/service/RemoveExecutorFromExecutorPoolService.java @@ -2,21 +2,36 @@ package ch.unisg.executorpool.application.service; import ch.unisg.executorpool.application.port.in.RemoveExecutorFromExecutorPoolCommand; import ch.unisg.executorpool.application.port.in.RemoveExecutorFromExecutorPoolUseCase; +import ch.unisg.executorpool.application.port.out.ExecutorRemovedEventPort; import ch.unisg.executorpool.domain.ExecutorClass; import ch.unisg.executorpool.domain.ExecutorPool; +import ch.unisg.executorpool.domain.ExecutorRemovedEvent; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; import javax.transaction.Transactional; import java.util.Optional; -@RequiredArgsConstructor @Component @Transactional public class RemoveExecutorFromExecutorPoolService implements RemoveExecutorFromExecutorPoolUseCase { + + private final ExecutorRemovedEventPort executorRemovedEventPort; + + public RemoveExecutorFromExecutorPoolService(ExecutorRemovedEventPort executorRemovedEventPort){ + this.executorRemovedEventPort = executorRemovedEventPort; + } + @Override public Optional removeExecutorFromExecutorPool(RemoveExecutorFromExecutorPoolCommand command){ ExecutorPool executorPool = ExecutorPool.getExecutorPool(); - return executorPool.removeExecutorByIpAndPort(command.getExecutorIp(), command.getExecutorPort()); + var removedExecutor = executorPool.removeExecutorByIpAndPort(command.getExecutorUri()); + + if(removedExecutor.isPresent()){ + var executorRemovedEvent = new ExecutorRemovedEvent(removedExecutor.get()); + executorRemovedEventPort.publishExecutorRemovedEvent(executorRemovedEvent); + } + + return removedExecutor; } } diff --git a/executor-pool/src/main/java/ch/unisg/executorpool/domain/ExecutorAddedEvent.java b/executor-pool/src/main/java/ch/unisg/executorpool/domain/ExecutorAddedEvent.java new file mode 100644 index 0000000..6ec291e --- /dev/null +++ b/executor-pool/src/main/java/ch/unisg/executorpool/domain/ExecutorAddedEvent.java @@ -0,0 +1,10 @@ +package ch.unisg.executorpool.domain; + +import lombok.Getter; + +public class ExecutorAddedEvent { + @Getter + private ExecutorClass executorClass; + + public ExecutorAddedEvent(ExecutorClass executorClass) { this.executorClass = executorClass; } +} diff --git a/executor-pool/src/main/java/ch/unisg/executorpool/domain/ExecutorClass.java b/executor-pool/src/main/java/ch/unisg/executorpool/domain/ExecutorClass.java index d1fca00..5da6fe7 100644 --- a/executor-pool/src/main/java/ch/unisg/executorpool/domain/ExecutorClass.java +++ b/executor-pool/src/main/java/ch/unisg/executorpool/domain/ExecutorClass.java @@ -3,36 +3,29 @@ package ch.unisg.executorpool.domain; import lombok.Getter; import lombok.Value; +import java.net.URI; + public class ExecutorClass { @Getter - private final ExecutorIp executorIp; - - @Getter - private final ExecutorPort executorPort; + private final ExecutorUri executorUri; @Getter private final ExecutorTaskType executorTaskType; - public ExecutorClass(ExecutorIp executorIp, ExecutorPort executorPort, ExecutorTaskType executorTaskType){ - this.executorIp = executorIp; - this.executorPort = executorPort; + public ExecutorClass(ExecutorUri executorUri, ExecutorTaskType executorTaskType){ + this.executorUri = executorUri; this.executorTaskType = executorTaskType; } - protected static ExecutorClass createExecutorClass(ExecutorIp executorIp, ExecutorPort executorPort, ExecutorTaskType executorTaskType){ - System.out.println("New Task: " + executorIp.getValue() + " " + executorPort.getValue() + " " + executorTaskType.getValue()); - return new ExecutorClass(executorIp, executorPort, executorTaskType); + protected static ExecutorClass createExecutorClass(ExecutorUri executorUri, ExecutorTaskType executorTaskType){ + System.out.println("New Executor: " + executorUri.value.toString() + " " + executorTaskType.getValue()); + return new ExecutorClass(executorUri, executorTaskType); } @Value - public static class ExecutorIp { - private String value; - } - - @Value - public static class ExecutorPort { - private String value; + public static class ExecutorUri { + private URI value; } @Value diff --git a/executor-pool/src/main/java/ch/unisg/executorpool/domain/ExecutorPool.java b/executor-pool/src/main/java/ch/unisg/executorpool/domain/ExecutorPool.java index dd5375b..0ca0d5e 100644 --- a/executor-pool/src/main/java/ch/unisg/executorpool/domain/ExecutorPool.java +++ b/executor-pool/src/main/java/ch/unisg/executorpool/domain/ExecutorPool.java @@ -1,5 +1,8 @@ package ch.unisg.executorpool.domain; +import ch.unisg.executorpool.domain.ExecutorClass.ExecutorUri; +import ch.unisg.executorpool.domain.ExecutorClass.ExecutorTaskType; + import lombok.Getter; import lombok.Value; @@ -20,19 +23,17 @@ public class ExecutorPool { public static ExecutorPool getExecutorPool() { return executorPool; } - public ExecutorClass addNewExecutor(ExecutorClass.ExecutorIp executorIp, ExecutorClass.ExecutorPort executorPort, ExecutorClass.ExecutorTaskType executorTaskType){ - ExecutorClass newExecutor = ExecutorClass.createExecutorClass(executorIp, executorPort, executorTaskType); + public ExecutorClass addNewExecutor(ExecutorUri executorUri, ExecutorTaskType executorTaskType){ + ExecutorClass newExecutor = ExecutorClass.createExecutorClass(executorUri, executorTaskType); listOfExecutors.value.add(newExecutor); System.out.println("Number of executors: " + listOfExecutors.value.size()); return newExecutor; } - public Optional getExecutorByIpAndPort(ExecutorClass.ExecutorIp executorIp, ExecutorClass.ExecutorPort executorPort){ + public Optional getExecutorByUri(ExecutorUri executorUri){ for (ExecutorClass executor : listOfExecutors.value ) { - // TODO can this be simplified by overwriting equals()? - if(executor.getExecutorIp().getValue().equalsIgnoreCase(executorIp.getValue()) && - executor.getExecutorPort().getValue().equalsIgnoreCase(executorPort.getValue())){ + if(executor.getExecutorUri().getValue().equals(executorUri)){ return Optional.of(executor); } } @@ -54,11 +55,10 @@ public class ExecutorPool { return matchedExecutors; } - public Optional removeExecutorByIpAndPort(ExecutorClass.ExecutorIp executorIp, ExecutorClass.ExecutorPort executorPort){ + public Optional removeExecutorByIpAndPort(ExecutorUri executorUri){ for (ExecutorClass executor : listOfExecutors.value ) { // TODO can this be simplified by overwriting equals()? - if(executor.getExecutorIp().getValue().equalsIgnoreCase(executorIp.getValue()) && - executor.getExecutorPort().getValue().equalsIgnoreCase(executorPort.getValue())){ + if(executor.getExecutorUri().getValue().equals(executorUri.getValue())){ listOfExecutors.value.remove(executor); return Optional.of(executor); } diff --git a/executor-pool/src/main/java/ch/unisg/executorpool/domain/ExecutorRemovedEvent.java b/executor-pool/src/main/java/ch/unisg/executorpool/domain/ExecutorRemovedEvent.java new file mode 100644 index 0000000..a038928 --- /dev/null +++ b/executor-pool/src/main/java/ch/unisg/executorpool/domain/ExecutorRemovedEvent.java @@ -0,0 +1,11 @@ +package ch.unisg.executorpool.domain; + +import ch.unisg.executorpool.domain.ExecutorClass; +import lombok.Getter; + +public class ExecutorRemovedEvent { + @Getter + private ExecutorClass executorClass; + + public ExecutorRemovedEvent(ExecutorClass executorClass) { this.executorClass = executorClass; } +} diff --git a/executor-pool/src/main/resources/application.properties b/executor-pool/src/main/resources/application.properties index 8f91ca7..c8fd60a 100644 --- a/executor-pool/src/main/resources/application.properties +++ b/executor-pool/src/main/resources/application.properties @@ -1 +1,3 @@ server.port=8083 + +mqtt.broker.uri=tcp://broker.hivemq.com:1883 diff --git a/executor1/.gitignore b/executor-robot/.gitignore similarity index 100% rename from executor1/.gitignore rename to executor-robot/.gitignore diff --git a/executor2/.mvn/wrapper/MavenWrapperDownloader.java b/executor-robot/.mvn/wrapper/MavenWrapperDownloader.java similarity index 100% rename from executor2/.mvn/wrapper/MavenWrapperDownloader.java rename to executor-robot/.mvn/wrapper/MavenWrapperDownloader.java diff --git a/executor2/.mvn/wrapper/maven-wrapper.jar b/executor-robot/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from executor2/.mvn/wrapper/maven-wrapper.jar rename to executor-robot/.mvn/wrapper/maven-wrapper.jar diff --git a/executor2/.mvn/wrapper/maven-wrapper.properties b/executor-robot/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from executor2/.mvn/wrapper/maven-wrapper.properties rename to executor-robot/.mvn/wrapper/maven-wrapper.properties diff --git a/executor1/Dockerfile b/executor-robot/Dockerfile similarity index 100% rename from executor1/Dockerfile rename to executor-robot/Dockerfile diff --git a/executor2/mvnw b/executor-robot/mvnw similarity index 100% rename from executor2/mvnw rename to executor-robot/mvnw diff --git a/executor2/mvnw.cmd b/executor-robot/mvnw.cmd similarity index 100% rename from executor2/mvnw.cmd rename to executor-robot/mvnw.cmd diff --git a/executor1/pom.xml b/executor-robot/pom.xml similarity index 94% rename from executor1/pom.xml rename to executor-robot/pom.xml index 8a5b9e3..ca95edf 100644 --- a/executor1/pom.xml +++ b/executor-robot/pom.xml @@ -9,9 +9,9 @@ ch.unisg - executor1 + executor-robot 0.0.1-SNAPSHOT - executor1 + executor-robot Demo project for Spring Boot 11 @@ -42,7 +42,7 @@ ch.unisg - executorBase + executor-base 0.0.1-SNAPSHOT diff --git a/executor1/src/main/java/ch/unisg/executor1/Executor1Application.java b/executor-robot/src/main/java/ch/unisg/executorrobot/ExecutorrobotApplication.java similarity index 53% rename from executor1/src/main/java/ch/unisg/executor1/Executor1Application.java rename to executor-robot/src/main/java/ch/unisg/executorrobot/ExecutorrobotApplication.java index dfb8d8c..fcee5ee 100644 --- a/executor1/src/main/java/ch/unisg/executor1/Executor1Application.java +++ b/executor-robot/src/main/java/ch/unisg/executorrobot/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/executor-robot/src/main/java/ch/unisg/executorrobot/executor/adapter/in/web/TaskAvailableController.java similarity index 84% rename from executor1/src/main/java/ch/unisg/executor1/executor/adapter/in/web/TaskAvailableController.java rename to executor-robot/src/main/java/ch/unisg/executorrobot/executor/adapter/in/web/TaskAvailableController.java index 1f08545..7f256df 100644 --- a/executor1/src/main/java/ch/unisg/executor1/executor/adapter/in/web/TaskAvailableController.java +++ b/executor-robot/src/main/java/ch/unisg/executorrobot/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; @@ -9,9 +9,9 @@ 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; +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 { diff --git a/executor1/src/main/java/ch/unisg/executor1/executor/adapter/out/DeleteUserFromRobotAdapter.java b/executor-robot/src/main/java/ch/unisg/executorrobot/executor/adapter/out/DeleteUserFromRobotAdapter.java similarity index 89% rename from executor1/src/main/java/ch/unisg/executor1/executor/adapter/out/DeleteUserFromRobotAdapter.java rename to executor-robot/src/main/java/ch/unisg/executorrobot/executor/adapter/out/DeleteUserFromRobotAdapter.java index 94c2309..157bc3e 100644 --- a/executor1/src/main/java/ch/unisg/executor1/executor/adapter/out/DeleteUserFromRobotAdapter.java +++ b/executor-robot/src/main/java/ch/unisg/executorrobot/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/executor-robot/src/main/java/ch/unisg/executorrobot/executor/adapter/out/InstructionToRobotAdapter.java similarity index 90% rename from executor1/src/main/java/ch/unisg/executor1/executor/adapter/out/InstructionToRobotAdapter.java rename to executor-robot/src/main/java/ch/unisg/executorrobot/executor/adapter/out/InstructionToRobotAdapter.java index f8b7012..c7507e4 100644 --- a/executor1/src/main/java/ch/unisg/executor1/executor/adapter/out/InstructionToRobotAdapter.java +++ b/executor-robot/src/main/java/ch/unisg/executorrobot/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/executor-robot/src/main/java/ch/unisg/executorrobot/executor/adapter/out/UserToRobotAdapter.java similarity index 91% rename from executor1/src/main/java/ch/unisg/executor1/executor/adapter/out/UserToRobotAdapter.java rename to executor-robot/src/main/java/ch/unisg/executorrobot/executor/adapter/out/UserToRobotAdapter.java index f874892..92ca8c1 100644 --- a/executor1/src/main/java/ch/unisg/executor1/executor/adapter/out/UserToRobotAdapter.java +++ b/executor-robot/src/main/java/ch/unisg/executorrobot/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/executor-robot/src/main/java/ch/unisg/executorrobot/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 executor-robot/src/main/java/ch/unisg/executorrobot/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/executor-robot/src/main/java/ch/unisg/executorrobot/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/executor-robot/src/main/java/ch/unisg/executorrobot/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 executor-robot/src/main/java/ch/unisg/executorrobot/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/executor-robot/src/main/java/ch/unisg/executorrobot/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/executor-robot/src/main/java/ch/unisg/executorrobot/executor/application/port/out/UserToRobotPort.java b/executor-robot/src/main/java/ch/unisg/executorrobot/executor/application/port/out/UserToRobotPort.java new file mode 100644 index 0000000..3da8ded --- /dev/null +++ b/executor-robot/src/main/java/ch/unisg/executorrobot/executor/application/port/out/UserToRobotPort.java @@ -0,0 +1,7 @@ +package ch.unisg.executorrobot.executor.application.port.out; + +import ch.unisg.executorbase.executor.domain.ExecutorType; + +public interface UserToRobotPort { + String userToRobot(); +} diff --git a/executor2/src/main/java/ch/unisg/executor2/executor/application/service/TaskAvailableService.java b/executor-robot/src/main/java/ch/unisg/executorrobot/executor/application/service/TaskAvailableService.java similarity index 66% rename from executor2/src/main/java/ch/unisg/executor2/executor/application/service/TaskAvailableService.java rename to executor-robot/src/main/java/ch/unisg/executorrobot/executor/application/service/TaskAvailableService.java index 6fa918d..5d26502 100644 --- a/executor2/src/main/java/ch/unisg/executor2/executor/application/service/TaskAvailableService.java +++ b/executor-robot/src/main/java/ch/unisg/executorrobot/executor/application/service/TaskAvailableService.java @@ -1,11 +1,11 @@ -package ch.unisg.executor2.executor.application.service; +package ch.unisg.executorrobot.executor.application.service; import org.springframework.stereotype.Component; -import ch.unisg.executor2.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; +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; import lombok.RequiredArgsConstructor; import javax.transaction.Transactional; diff --git a/executor1/src/main/java/ch/unisg/executor1/executor/domain/Executor.java b/executor-robot/src/main/java/ch/unisg/executorrobot/executor/domain/Executor.java similarity index 64% rename from executor1/src/main/java/ch/unisg/executor1/executor/domain/Executor.java rename to executor-robot/src/main/java/ch/unisg/executorrobot/executor/domain/Executor.java index cc11e64..e83579c 100644 --- a/executor1/src/main/java/ch/unisg/executor1/executor/domain/Executor.java +++ b/executor-robot/src/main/java/ch/unisg/executorrobot/executor/domain/Executor.java @@ -1,17 +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.executorBase.executor.domain.ExecutorBase; -import ch.unisg.executorBase.executor.domain.ExecutorType; +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; public class Executor extends ExecutorBase { @@ -30,7 +28,7 @@ public class Executor extends ExecutorBase { @Override protected - String execution() { + String execution(String input) { String key = userToRobotPort.userToRobot(); try { diff --git a/executor1/src/main/resources/application.properties b/executor-robot/src/main/resources/application.properties similarity index 100% rename from executor1/src/main/resources/application.properties rename to executor-robot/src/main/resources/application.properties diff --git a/executor-base/src/test/java/ch/unisg/executorBase/Executor1ApplicationTests.java b/executor-robot/src/test/java/ch/unisg/executorrobot/ExecutorrobotApplicationTests.java similarity index 68% rename from executor-base/src/test/java/ch/unisg/executorBase/Executor1ApplicationTests.java rename to executor-robot/src/test/java/ch/unisg/executorrobot/ExecutorrobotApplicationTests.java index 6fec034..82f67a8 100644 --- a/executor-base/src/test/java/ch/unisg/executorBase/Executor1ApplicationTests.java +++ b/executor-robot/src/test/java/ch/unisg/executorrobot/ExecutorrobotApplicationTests.java @@ -1,10 +1,10 @@ -package ch.unisg.executorBase; +package ch.unisg.executorrobot; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest -class executorBaseApplicationTests { +class ExecutorrobotApplicationTests { @Test void contextLoads() { diff --git a/executor1/src/main/java/ch/unisg/executor1/executor/application/port/out/UserToRobotPort.java b/executor1/src/main/java/ch/unisg/executor1/executor/application/port/out/UserToRobotPort.java deleted file mode 100644 index 5b011c1..0000000 --- a/executor1/src/main/java/ch/unisg/executor1/executor/application/port/out/UserToRobotPort.java +++ /dev/null @@ -1,7 +0,0 @@ -package ch.unisg.executor1.executor.application.port.out; - -import ch.unisg.executorBase.executor.domain.ExecutorType; - -public interface UserToRobotPort { - String userToRobot(); -} diff --git a/executor2/src/main/java/ch/unisg/executor2/executor/domain/Executor.java b/executor2/src/main/java/ch/unisg/executor2/executor/domain/Executor.java deleted file mode 100644 index 4d022b5..0000000 --- a/executor2/src/main/java/ch/unisg/executor2/executor/domain/Executor.java +++ /dev/null @@ -1,36 +0,0 @@ -package ch.unisg.executor2.executor.domain; - -import java.util.concurrent.TimeUnit; -import ch.unisg.executorBase.executor.domain.ExecutorBase; -import ch.unisg.executorBase.executor.domain.ExecutorType; - -public class Executor extends ExecutorBase { - - private static final Executor executor = new Executor(ExecutorType.ADDITION); - - public static Executor getExecutor() { - return executor; - } - - private Executor(ExecutorType executorType) { - super(executorType); - } - - @Override - protected - String execution() { - - int a = 20; - int b = 20; - try { - TimeUnit.SECONDS.sleep(20); - } catch (InterruptedException e) { - e.printStackTrace(); - } - - int result = a + b; - - return Integer.toString(result); - } - -} diff --git a/mocks/README.md b/mocks/README.md new file mode 100644 index 0000000..7135682 --- /dev/null +++ b/mocks/README.md @@ -0,0 +1,29 @@ +In this directory are some files to mock an auction house to test WebSub local. + +To run a local WebSubHub instance + +1. Start a mongodb in docker: + +- docker run -d -p 27017:27017 -p 28017:28017 -e AUTH=no tutum/mongodb + +2. Install a local hub + +- yarn global add websub-hub + +3. Run the hub localy + +- websub-hub -l info -m mongodb://localhost:27017/hub + +Create an example subscription + +- node auction-house/subscriber.js + +Create an example auctionhouse + +- node auction-house/auctions.js + +Publish to the hub + +- node auction-house/publisher.js + +Mostly inspired by: https://github.com/hemerajs/websub-hub diff --git a/mocks/auction-house/auctions.js b/mocks/auction-house/auctions.js new file mode 100644 index 0000000..68a6aa5 --- /dev/null +++ b/mocks/auction-house/auctions.js @@ -0,0 +1,39 @@ +// Require the framework and instantiate it +const fastify = require('fastify')({ logger: true }) + +// Declare a route +fastify.get('/auctions', async (request, reply) => { + console.log('content provided') + + return [ + { + id: '2', + content_text: 'This is a second item.', + url: 'https://example.org/second-item' + }, + { + id: '1', + content_html: '

Hello, world!

', + url: 'https://example.org/initial-post' + } + ] +}) + +fastify.get('/websub', async (request, reply) => { + console.log('content provided') + + return { + topic: 'http://localhost:3100/auctions' + } +}) + +// Run the server! +const start = async () => { + try { + await fastify.listen(3100) + } catch (err) { + fastify.log.error(err) + process.exit(1) + } +} +start() diff --git a/mocks/auction-house/publisher.js b/mocks/auction-house/publisher.js new file mode 100644 index 0000000..c760820 --- /dev/null +++ b/mocks/auction-house/publisher.js @@ -0,0 +1,17 @@ +const axios = require('axios').default + +// Run the server! +const start = async () => { + await axios + .post('http://localhost:3000/publish', { + 'hub.mode': 'publish', + 'hub.url': 'http://localhost:3100/auctions' + }) + .then(response => { + console.log(response.data) + }) + .catch(error => { + console.log(error) + }) +} +start() diff --git a/mocks/auction-house/subscriber.js b/mocks/auction-house/subscriber.js new file mode 100644 index 0000000..ce27197 --- /dev/null +++ b/mocks/auction-house/subscriber.js @@ -0,0 +1,42 @@ +// Require the framework and instantiate it +const fastify = require('fastify')({ logger: true }) +const axios = require('axios').default + +// Declare a route +fastify.get('/auction-created', async (request, reply) => { + console.log('subscription verified', request.query) + console.log(request.query) + return request.query +}) + +fastify.post('/auction-created', async (request, reply) => { + console.log('received blog content', request.body) + reply.send() +}) + +// Run the server! +const start = async () => { + // subscribe to the feed + + try { + await fastify.listen(3200) + } catch (err) { + fastify.log.error(err) + process.exit(1) + } + + await axios + .post('http://localhost:3000', { + 'hub.callback': 'http://localhost:3200/auction-created', + 'hub.mode': 'subscribe', + 'hub.topic': 'http://localhost:3100/auctions', + 'hub.ws': false + }) + .then(response => { + console.log(response.data) + }) + .catch(error => { + console.log(error) + }) +} +start() diff --git a/executor2/.gitignore b/roster/.gitignore similarity index 100% rename from executor2/.gitignore rename to roster/.gitignore diff --git a/roster/.mvn/wrapper/MavenWrapperDownloader.java b/roster/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 0000000..e76d1f3 --- /dev/null +++ b/roster/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,117 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if(mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if(mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if(!outputFile.getParentFile().exists()) { + if(!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/roster/.mvn/wrapper/maven-wrapper.jar b/roster/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..2cc7d4a Binary files /dev/null and b/roster/.mvn/wrapper/maven-wrapper.jar differ diff --git a/roster/.mvn/wrapper/maven-wrapper.properties b/roster/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..abd303b --- /dev/null +++ b/roster/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.2/apache-maven-3.8.2-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/executor2/Dockerfile b/roster/Dockerfile similarity index 100% rename from executor2/Dockerfile rename to roster/Dockerfile diff --git a/roster/mvnw b/roster/mvnw new file mode 100755 index 0000000..a16b543 --- /dev/null +++ b/roster/mvnw @@ -0,0 +1,310 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/roster/mvnw.cmd b/roster/mvnw.cmd new file mode 100644 index 0000000..c8d4337 --- /dev/null +++ b/roster/mvnw.cmd @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/assignment/pom.xml b/roster/pom.xml similarity index 87% rename from assignment/pom.xml rename to roster/pom.xml index 99996b8..791e0d0 100644 --- a/assignment/pom.xml +++ b/roster/pom.xml @@ -9,9 +9,9 @@ ch.unisg - assignment + roster 0.0.1-SNAPSHOT - assignment + roster Demo project for Spring Boot 11 @@ -56,12 +56,24 @@ 1.2 + + org.eclipse.paho + org.eclipse.paho.client.mqttv3 + 1.2.5 + + org.json json 20210307 + + ch.unisg + common + 0.0.1-SNAPSHOT + + diff --git a/roster/src/main/java/ch/unisg/roster/RosterApplication.java b/roster/src/main/java/ch/unisg/roster/RosterApplication.java new file mode 100644 index 0000000..bc9ed86 --- /dev/null +++ b/roster/src/main/java/ch/unisg/roster/RosterApplication.java @@ -0,0 +1,41 @@ +package ch.unisg.roster; + +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.eclipse.paho.client.mqttv3.MqttException; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +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.ExecutorEventsMqttDispatcher; + +@SpringBootApplication +public class RosterApplication { + + static Logger logger = Logger.getLogger(RosterApplication.class.getName()); + + public static String MQTT_BROKER = "tcp://broker.hivemq.com:1883"; + + public static void main(String[] args) { + SpringApplication.run(RosterApplication.class, args); + + bootstrapMarketplaceWithMqtt(); + } + + /** + * Connects to an MQTT broker, presumably the one used by all TAPAS groups to communicate with + * one another + */ + private static void bootstrapMarketplaceWithMqtt() { + try { + ExecutorEventsMqttDispatcher dispatcher = new ExecutorEventsMqttDispatcher(); + TapasMqttClient client = TapasMqttClient.getInstance(MQTT_BROKER, dispatcher); + client.startReceivingMessages(); + } catch (MqttException e) { + logger.log(Level.SEVERE, e.getMessage(), e); + } + } + +} diff --git a/roster/src/main/java/ch/unisg/roster/roster/adapter/common/clients/TapasMqttClient.java b/roster/src/main/java/ch/unisg/roster/roster/adapter/common/clients/TapasMqttClient.java new file mode 100644 index 0000000..78f2d0c --- /dev/null +++ b/roster/src/main/java/ch/unisg/roster/roster/adapter/common/clients/TapasMqttClient.java @@ -0,0 +1,94 @@ +package ch.unisg.roster.roster.adapter.common.clients; + +import ch.unisg.roster.roster.adapter.in.messaging.mqtt.ExecutorEventsMqttDispatcher; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.eclipse.paho.client.mqttv3.*; +import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; + +import java.nio.charset.StandardCharsets; +import java.util.UUID; + +/** + * MQTT client for your TAPAS application. This class is defined as a singleton, but it does not have + * to be this way. This class is only provided as an example to help you bootstrap your project. + * You are welcomed to change this class as you see fit. + */ +public class TapasMqttClient { + private static final Logger LOGGER = LogManager.getLogger(TapasMqttClient.class); + + private static TapasMqttClient tapasClient = null; + + private MqttClient mqttClient; + private final String mqttClientId; + private final String brokerAddress; + + private final MessageReceivedCallback messageReceivedCallback; + + private final ExecutorEventsMqttDispatcher dispatcher; + + private TapasMqttClient(String brokerAddress, ExecutorEventsMqttDispatcher dispatcher) { + this.mqttClientId = UUID.randomUUID().toString(); + this.brokerAddress = brokerAddress; + + this.messageReceivedCallback = new MessageReceivedCallback(); + + this.dispatcher = dispatcher; + } + + public static synchronized TapasMqttClient getInstance(String brokerAddress, + ExecutorEventsMqttDispatcher dispatcher) { + + if (tapasClient == null) { + tapasClient = new TapasMqttClient(brokerAddress, dispatcher); + } + + return tapasClient; + } + + public void startReceivingMessages() throws MqttException { + mqttClient = new org.eclipse.paho.client.mqttv3.MqttClient(brokerAddress, mqttClientId, new MemoryPersistence()); + mqttClient.connect(); + mqttClient.setCallback(messageReceivedCallback); + + subscribeToAllTopics(); + } + + public void stopReceivingMessages() throws MqttException { + mqttClient.disconnect(); + } + + private void subscribeToAllTopics() throws MqttException { + for (String topic : dispatcher.getAllTopics()) { + subscribeToTopic(topic); + } + } + + private void subscribeToTopic(String topic) throws MqttException { + mqttClient.subscribe(topic); + } + + private void publishMessage(String topic, String payload) throws MqttException { + MqttMessage message = new MqttMessage(payload.getBytes(StandardCharsets.UTF_8)); + mqttClient.publish(topic, message); + } + + private class MessageReceivedCallback implements MqttCallback { + + @Override + public void connectionLost(Throwable cause) { } + + @Override + public void messageArrived(String topic, MqttMessage message) { + LOGGER.info("Received new MQTT message for topic " + topic + ": " + + new String(message.getPayload())); + + if (topic != null && !topic.isEmpty()) { + dispatcher.dispatchEvent(topic, message); + } + } + + @Override + public void deliveryComplete(IMqttDeliveryToken token) { } + } +} diff --git a/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/ExecutorAddedEventListenerMqttAdapter.java b/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/ExecutorAddedEventListenerMqttAdapter.java new file mode 100644 index 0000000..10e907e --- /dev/null +++ b/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/ExecutorAddedEventListenerMqttAdapter.java @@ -0,0 +1,47 @@ +package ch.unisg.roster.roster.adapter.in.messaging.mqtt; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.eclipse.paho.client.mqttv3.MqttMessage; + +import ch.unisg.common.valueobject.ExecutorURI; +import ch.unisg.roster.roster.application.handler.ExecutorAddedHandler; +import ch.unisg.roster.roster.application.port.in.ExecutorAddedEvent; +import ch.unisg.roster.roster.domain.valueobject.ExecutorType; + +public class ExecutorAddedEventListenerMqttAdapter extends ExecutorEventMqttListener { + private static final Logger LOGGER = LogManager.getLogger(ExecutorAddedEventListenerMqttAdapter.class); + + @Override + public boolean handleEvent(MqttMessage message) { + + System.out.println("New Executor added!"); + + String payload = new String(message.getPayload()); + + try { + // Note: this messge representation is provided only as an example. You should use a + // representation that makes sense in the context of your application. + JsonNode data = new ObjectMapper().readTree(payload); + + String taskType = data.get("executorTaskType").asText(); + String executorId = data.get("executorUri").asText(); + + ExecutorAddedEvent executorAddedEvent = new ExecutorAddedEvent( + new ExecutorURI(executorId), + new ExecutorType(taskType) + ); + + ExecutorAddedHandler newExecutorHandler = new ExecutorAddedHandler(); + newExecutorHandler.handleNewExecutorEvent(executorAddedEvent); + } catch (JsonProcessingException | NullPointerException e) { + LOGGER.error(e.getMessage(), e); + return false; + } + + return true; + } +} diff --git a/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/ExecutorEventMqttListener.java b/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/ExecutorEventMqttListener.java new file mode 100644 index 0000000..df46b00 --- /dev/null +++ b/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/ExecutorEventMqttListener.java @@ -0,0 +1,11 @@ +package ch.unisg.roster.roster.adapter.in.messaging.mqtt; + +import org.eclipse.paho.client.mqttv3.MqttMessage; + +/** + * Abstract MQTT listener for auction-related events + */ +public abstract class ExecutorEventMqttListener { + + public abstract boolean handleEvent(MqttMessage message); +} diff --git a/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/ExecutorEventsMqttDispatcher.java b/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/ExecutorEventsMqttDispatcher.java new file mode 100644 index 0000000..c1b7649 --- /dev/null +++ b/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/ExecutorEventsMqttDispatcher.java @@ -0,0 +1,42 @@ +package ch.unisg.roster.roster.adapter.in.messaging.mqtt; + +import org.eclipse.paho.client.mqttv3.*; + +import java.util.Hashtable; +import java.util.Map; +import java.util.Set; + +public class ExecutorEventsMqttDispatcher { + private final Map router; + + public ExecutorEventsMqttDispatcher() { + this.router = new Hashtable<>(); + initRouter(); + } + + // TODO: Register here your topics and event listener adapters + private void initRouter() { + router.put("ch/unisg/tapas/executors/added", new ExecutorAddedEventListenerMqttAdapter()); + router.put("ch/unisg/tapas/executors/removed", new ExecutorRemovedEventListenerMqttAdapter()); + } + + /** + * Returns all topics registered with this dispatcher. + * + * @return the set of registered topics + */ + public Set getAllTopics() { + return router.keySet(); + } + + /** + * Dispatches an event received via MQTT for a given topic. + * + * @param topic the topic for which the MQTT message was received + * @param message the received MQTT message + */ + public void dispatchEvent(String topic, MqttMessage message) { + ExecutorEventMqttListener listener = router.get(topic); + listener.handleEvent(message); + } +} diff --git a/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/ExecutorRemovedEventListenerMqttAdapter.java b/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/ExecutorRemovedEventListenerMqttAdapter.java new file mode 100644 index 0000000..0d0923a --- /dev/null +++ b/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/ExecutorRemovedEventListenerMqttAdapter.java @@ -0,0 +1,41 @@ +package ch.unisg.roster.roster.adapter.in.messaging.mqtt; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.eclipse.paho.client.mqttv3.MqttMessage; + +import ch.unisg.common.valueobject.ExecutorURI; +import ch.unisg.roster.roster.application.handler.ExecutorRemovedHandler; +import ch.unisg.roster.roster.application.port.in.ExecutorRemovedEvent; + +public class ExecutorRemovedEventListenerMqttAdapter extends ExecutorEventMqttListener { + private static final Logger LOGGER = LogManager.getLogger(ExecutorRemovedEventListenerMqttAdapter.class); + + @Override + public boolean handleEvent(MqttMessage message) { + String payload = new String(message.getPayload()); + + try { + // Note: this messge representation is provided only as an example. You should use a + // representation that makes sense in the context of your application. + JsonNode data = new ObjectMapper().readTree(payload); + + String executorId = data.get("executorUri").asText(); + + ExecutorRemovedEvent executorRemovedEvent = new ExecutorRemovedEvent( + new ExecutorURI(executorId)); + + ExecutorRemovedHandler executorRemovedHandler = new ExecutorRemovedHandler(); + executorRemovedHandler.handleExecutorRemovedEvent(executorRemovedEvent); + + } catch (JsonProcessingException | NullPointerException e) { + LOGGER.error(e.getMessage(), e); + return false; + } + + return true; + } +} diff --git a/assignment/src/main/java/ch/unisg/assignment/assignment/adapter/in/web/ApplyForTaskController.java b/roster/src/main/java/ch/unisg/roster/roster/adapter/in/web/ApplyForTaskController.java similarity index 62% rename from assignment/src/main/java/ch/unisg/assignment/assignment/adapter/in/web/ApplyForTaskController.java rename to roster/src/main/java/ch/unisg/roster/roster/adapter/in/web/ApplyForTaskController.java index 1d0111d..28170f0 100644 --- a/assignment/src/main/java/ch/unisg/assignment/assignment/adapter/in/web/ApplyForTaskController.java +++ b/roster/src/main/java/ch/unisg/roster/roster/adapter/in/web/ApplyForTaskController.java @@ -1,13 +1,13 @@ -package ch.unisg.assignment.assignment.adapter.in.web; +package ch.unisg.roster.roster.adapter.in.web; 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.ApplyForTaskCommand; -import ch.unisg.assignment.assignment.application.port.in.ApplyForTaskUseCase; -import ch.unisg.assignment.assignment.domain.ExecutorInfo; -import ch.unisg.assignment.assignment.domain.Task; +import ch.unisg.roster.roster.application.port.in.ApplyForTaskCommand; +import ch.unisg.roster.roster.application.port.in.ApplyForTaskUseCase; +import ch.unisg.roster.roster.domain.ExecutorInfo; +import ch.unisg.roster.roster.domain.Task; @RestController public class ApplyForTaskController { @@ -17,13 +17,16 @@ public class ApplyForTaskController { this.applyForTaskUseCase = applyForTaskUseCase; } + /** + * Checks if task is available for the requesting executor. + * @return a task or null if no task found + **/ @PostMapping(path = "/task/apply", consumes = {"application/json"}) public Task applyForTask(@RequestBody ExecutorInfo executorInfo) { ApplyForTaskCommand command = new ApplyForTaskCommand(executorInfo.getExecutorType(), - executorInfo.getIp(), executorInfo.getPort()); + executorInfo.getExecutorURI()); return applyForTaskUseCase.applyForTask(command); - } } diff --git a/roster/src/main/java/ch/unisg/roster/roster/adapter/in/web/DeleteTaskController.java b/roster/src/main/java/ch/unisg/roster/roster/adapter/in/web/DeleteTaskController.java new file mode 100644 index 0000000..eef8b71 --- /dev/null +++ b/roster/src/main/java/ch/unisg/roster/roster/adapter/in/web/DeleteTaskController.java @@ -0,0 +1,35 @@ +package ch.unisg.roster.roster.adapter.in.web; + +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import ch.unisg.roster.roster.application.port.in.DeleteTaskCommand; +import ch.unisg.roster.roster.application.port.in.DeleteTaskUseCase; +import ch.unisg.roster.roster.domain.Task; + +@RestController +public class DeleteTaskController { + private final DeleteTaskUseCase deleteTaskUseCase; + + public DeleteTaskController(DeleteTaskUseCase deleteTaskUseCase) { + this.deleteTaskUseCase = deleteTaskUseCase; + } + + /** + * Controller to delete a task + * @return 200 OK, 409 Conflict + **/ + @DeleteMapping(path = "/task", consumes = {"application/task+json"}) + public ResponseEntity applyForTask(@RequestBody Task task) { + + DeleteTaskCommand command = new DeleteTaskCommand(task.getTaskID(), task.getTaskType()); + + if (deleteTaskUseCase.deleteTask(command)) { + return new ResponseEntity<>(HttpStatus.OK); + } + return new ResponseEntity<>(HttpStatus.CONFLICT); + } +} diff --git a/assignment/src/main/java/ch/unisg/assignment/assignment/adapter/in/web/NewTaskController.java b/roster/src/main/java/ch/unisg/roster/roster/adapter/in/web/NewTaskController.java similarity index 55% rename from assignment/src/main/java/ch/unisg/assignment/assignment/adapter/in/web/NewTaskController.java rename to roster/src/main/java/ch/unisg/roster/roster/adapter/in/web/NewTaskController.java index 18bad8f..7ff5349 100644 --- a/assignment/src/main/java/ch/unisg/assignment/assignment/adapter/in/web/NewTaskController.java +++ b/roster/src/main/java/ch/unisg/roster/roster/adapter/in/web/NewTaskController.java @@ -1,4 +1,6 @@ -package ch.unisg.assignment.assignment.adapter.in.web; +package ch.unisg.roster.roster.adapter.in.web; + +import java.util.logging.Logger; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -6,9 +8,9 @@ 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.NewTaskCommand; -import ch.unisg.assignment.assignment.application.port.in.NewTaskUseCase; -import ch.unisg.assignment.assignment.domain.Task; +import ch.unisg.roster.roster.application.port.in.NewTaskCommand; +import ch.unisg.roster.roster.application.port.in.NewTaskUseCase; +import ch.unisg.roster.roster.domain.Task; @RestController public class NewTaskController { @@ -18,13 +20,24 @@ public class NewTaskController { this.newTaskUseCase = newTaskUseCase; } - @PostMapping(path = "/task", consumes = {"application/json"}) + Logger logger = Logger.getLogger(NewTaskController.class.getName()); + + /** + * Controller which handles the new task event from the tasklist + * @return 201 Create or 409 Conflict + **/ + @PostMapping(path = "/task", consumes = {"application/task+json"}) public ResponseEntity newTaskController(@RequestBody Task task) { - NewTaskCommand command = new NewTaskCommand(task.getTaskID(), task.getTaskType()); + logger.info("New task with id:" + task.getTaskID()); + + NewTaskCommand command = new NewTaskCommand(task.getTaskID(), task.getTaskType(), + task.getInputData()); boolean success = newTaskUseCase.addNewTaskToQueue(command); + logger.info("Could create task: " + success); + if (success) { return new ResponseEntity<>(HttpStatus.CREATED); } diff --git a/assignment/src/main/java/ch/unisg/assignment/assignment/adapter/in/web/TaskCompletedController.java b/roster/src/main/java/ch/unisg/roster/roster/adapter/in/web/TaskCompletedController.java similarity index 67% rename from assignment/src/main/java/ch/unisg/assignment/assignment/adapter/in/web/TaskCompletedController.java rename to roster/src/main/java/ch/unisg/roster/roster/adapter/in/web/TaskCompletedController.java index cde4c0a..5adfd7e 100644 --- a/assignment/src/main/java/ch/unisg/assignment/assignment/adapter/in/web/TaskCompletedController.java +++ b/roster/src/main/java/ch/unisg/roster/roster/adapter/in/web/TaskCompletedController.java @@ -1,4 +1,4 @@ -package ch.unisg.assignment.assignment.adapter.in.web; +package ch.unisg.roster.roster.adapter.in.web; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -6,9 +6,9 @@ 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; +import ch.unisg.roster.roster.application.port.in.TaskCompletedCommand; +import ch.unisg.roster.roster.application.port.in.TaskCompletedUseCase; +import ch.unisg.roster.roster.domain.Task; @RestController public class TaskCompletedController { @@ -19,11 +19,15 @@ public class TaskCompletedController { this.taskCompletedUseCase = taskCompletedUseCase; } + /** + * Controller which handles the task completed event from executors + * @return 200 OK + **/ @PostMapping(path = "/task/completed", consumes = {"application/json"}) public ResponseEntity addNewTaskTaskToTaskList(@RequestBody Task task) { - + System.out.println("TEST"); TaskCompletedCommand command = new TaskCompletedCommand(task.getTaskID(), - task.getStatus(), task.getResult()); + task.getStatus(), task.getOutputData()); taskCompletedUseCase.taskCompleted(command); diff --git a/roster/src/main/java/ch/unisg/roster/roster/adapter/in/web/WebControllerExceptionHandler.java b/roster/src/main/java/ch/unisg/roster/roster/adapter/in/web/WebControllerExceptionHandler.java new file mode 100644 index 0000000..f0a4974 --- /dev/null +++ b/roster/src/main/java/ch/unisg/roster/roster/adapter/in/web/WebControllerExceptionHandler.java @@ -0,0 +1,25 @@ +package ch.unisg.roster.roster.adapter.in.web; + +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; + +import ch.unisg.common.exception.ErrorResponse; +import ch.unisg.common.exception.InvalidExecutorURIException; + +@ControllerAdvice +public class WebControllerExceptionHandler { + + /** + * Handles error of type InvalidExecutorURIException + * @return 404 Bad Request + **/ + @ExceptionHandler(InvalidExecutorURIException.class) + public ResponseEntity handleException(InvalidExecutorURIException e){ + + ErrorResponse error = new ErrorResponse(HttpStatus.BAD_REQUEST, e.getLocalizedMessage()); + return new ResponseEntity<>(error, error.getHttpStatus()); + + } +} diff --git a/assignment/src/main/java/ch/unisg/assignment/assignment/adapter/out/web/GetAllExecutorInExecutorPoolByTypeAdapter.java b/roster/src/main/java/ch/unisg/roster/roster/adapter/out/web/GetAllExecutorInExecutorPoolByTypeAdapter.java similarity index 65% rename from assignment/src/main/java/ch/unisg/assignment/assignment/adapter/out/web/GetAllExecutorInExecutorPoolByTypeAdapter.java rename to roster/src/main/java/ch/unisg/roster/roster/adapter/out/web/GetAllExecutorInExecutorPoolByTypeAdapter.java index 4163a53..df444ca 100644 --- a/assignment/src/main/java/ch/unisg/assignment/assignment/adapter/out/web/GetAllExecutorInExecutorPoolByTypeAdapter.java +++ b/roster/src/main/java/ch/unisg/roster/roster/adapter/out/web/GetAllExecutorInExecutorPoolByTypeAdapter.java @@ -1,4 +1,4 @@ -package ch.unisg.assignment.assignment.adapter.out.web; +package ch.unisg.roster.roster.adapter.out.web; import java.io.IOException; import java.net.URI; @@ -9,21 +9,28 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.json.JSONArray; -import org.json.JSONObject; +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.assignment.assignment.application.port.out.GetAllExecutorInExecutorPoolByTypePort; -import ch.unisg.assignment.assignment.domain.valueobject.ExecutorType; +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) { - String server = "http://127.0.0.1:8083"; Logger logger = Logger.getLogger(PublishNewTaskEventAdapter.class.getName()); @@ -37,17 +44,18 @@ public class GetAllExecutorInExecutorPoolByTypeAdapter implements GetAllExecutor try { - HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofString()); + HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofString()); if (response.statusCode() == HttpStatus.OK.value()) { - JSONArray jsonArray = new JSONArray(response.body().toString()); + JSONArray jsonArray = new JSONArray(response.body()); if (jsonArray.length() > 0) { return true; } } - } catch (IOException | InterruptedException e) { + } catch (InterruptedException e) { logger.log(Level.SEVERE, e.getLocalizedMessage(), e); - // Restore interrupted state... Thread.currentThread().interrupt(); + } catch (IOException e) { + logger.log(Level.SEVERE, e.getLocalizedMessage(), e); } return false; } diff --git a/roster/src/main/java/ch/unisg/roster/roster/adapter/out/web/PublishNewTaskEventAdapter.java b/roster/src/main/java/ch/unisg/roster/roster/adapter/out/web/PublishNewTaskEventAdapter.java new file mode 100644 index 0000000..274d639 --- /dev/null +++ b/roster/src/main/java/ch/unisg/roster/roster/adapter/out/web/PublishNewTaskEventAdapter.java @@ -0,0 +1,70 @@ +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.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Primary; +import org.springframework.stereotype.Component; + +import ch.unisg.roster.roster.application.port.out.NewTaskEventPort; +import ch.unisg.roster.roster.domain.event.NewTaskEvent; + +@Component +@Primary +public class PublishNewTaskEventAdapter implements NewTaskEventPort { + + @Value("${executor1.url}") + private String server; + + @Value("${executor2.url}") + private String server2; + + Logger logger = Logger.getLogger(PublishNewTaskEventAdapter.class.getName()); + + /** + * Informs executors about the availability of a new task. + * @return void + **/ + @Override + public void publishNewTaskEvent(NewTaskEvent event) { + + // HttpClient client = HttpClient.newHttpClient(); + // HttpRequest request = HttpRequest.newBuilder() + // .uri(URI.create(server + "/newtask/" + event.taskType.getValue())) + // .GET() + // .build(); + + + // try { + // client.send(request, HttpResponse.BodyHandlers.ofString()); + // } catch (InterruptedException e) { + // logger.log(Level.SEVERE, e.getLocalizedMessage(), e); + // Thread.currentThread().interrupt(); + // } catch (IOException e) { + // logger.log(Level.SEVERE, e.getLocalizedMessage(), e); + // } + + HttpClient client2 = HttpClient.newHttpClient(); + HttpRequest request2 = HttpRequest.newBuilder() + .uri(URI.create(server2 + "/newtask/" + event.taskType.getValue())) + .GET() + .build(); + + + try { + client2.send(request2, HttpResponse.BodyHandlers.ofString()); + } catch (InterruptedException e) { + logger.log(Level.SEVERE, e.getLocalizedMessage(), e); + Thread.currentThread().interrupt(); + } catch (IOException e) { + logger.log(Level.SEVERE, e.getLocalizedMessage(), e); + } + } + +} diff --git a/roster/src/main/java/ch/unisg/roster/roster/adapter/out/web/PublishTaskAssignedEventAdapter.java b/roster/src/main/java/ch/unisg/roster/roster/adapter/out/web/PublishTaskAssignedEventAdapter.java new file mode 100644 index 0000000..2c75a03 --- /dev/null +++ b/roster/src/main/java/ch/unisg/roster/roster/adapter/out/web/PublishTaskAssignedEventAdapter.java @@ -0,0 +1,57 @@ +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.JSONObject; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Primary; +import org.springframework.stereotype.Component; + +import ch.unisg.roster.roster.application.port.out.TaskAssignedEventPort; +import ch.unisg.roster.roster.domain.event.TaskAssignedEvent; + +@Component +@Primary +public class PublishTaskAssignedEventAdapter implements TaskAssignedEventPort { + + @Value("${task-list.url}") + private String server; + + Logger logger = Logger.getLogger(PublishTaskAssignedEventAdapter.class.getName()); + + /** + * Informs the task service about the assignment of the task. + * @return void + **/ + @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/assignTask")) + // .header("Content-Type", "application/task+json") + // .POST(HttpRequest.BodyPublishers.ofString(body)) + // .build(); + + + // try { + // client.send(request, HttpResponse.BodyHandlers.ofString()); + // } catch (InterruptedException e) { + // logger.log(Level.SEVERE, e.getLocalizedMessage(), e); + // Thread.currentThread().interrupt(); + // } catch (IOException e) { + // logger.log(Level.SEVERE, e.getLocalizedMessage(), e); + // } + } + +} diff --git a/assignment/src/main/java/ch/unisg/assignment/assignment/adapter/out/web/PublishTaskCompletedEventAdapter.java b/roster/src/main/java/ch/unisg/roster/roster/adapter/out/web/PublishTaskCompletedEventAdapter.java similarity index 55% rename from assignment/src/main/java/ch/unisg/assignment/assignment/adapter/out/web/PublishTaskCompletedEventAdapter.java rename to roster/src/main/java/ch/unisg/roster/roster/adapter/out/web/PublishTaskCompletedEventAdapter.java index f9f2833..3773621 100644 --- a/assignment/src/main/java/ch/unisg/assignment/assignment/adapter/out/web/PublishTaskCompletedEventAdapter.java +++ b/roster/src/main/java/ch/unisg/roster/roster/adapter/out/web/PublishTaskCompletedEventAdapter.java @@ -1,4 +1,4 @@ -package ch.unisg.assignment.assignment.adapter.out.web; +package ch.unisg.roster.roster.adapter.out.web; import java.io.IOException; import java.net.URI; @@ -9,43 +9,55 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.json.JSONObject; +import org.springframework.beans.factory.annotation.Value; 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.event.TaskCompletedEvent; +import ch.unisg.roster.roster.application.port.out.TaskCompletedEventPort; +import ch.unisg.roster.roster.domain.event.TaskCompletedEvent; @Component @Primary public class PublishTaskCompletedEventAdapter implements TaskCompletedEventPort { - String server = "http://127.0.0.1:8081"; + @Value("${task-list.url}") + private String server; Logger logger = Logger.getLogger(PublishTaskCompletedEventAdapter.class.getName()); + /** + * Informs the task service about the completion of the task. + * @return void + **/ @Override public void publishTaskCompleted(TaskCompletedEvent event) { + System.out.println("PublishTaskCompletedEventAdapter.publishTaskCompleted()"); + System.out.print(server); + String body = new JSONObject() .put("taskId", event.taskID) .put("status", event.status) - .put("taskResult", event.result) + .put("outputData", event.result) .toString(); + System.out.println(event.taskID); + HttpClient client = HttpClient.newHttpClient(); HttpRequest request = HttpRequest.newBuilder() - .uri(URI.create(server + "/tasks/completeTask")) - .header("Content-Type", "application/json") - .POST(HttpRequest.BodyPublishers.ofString(body)) + .uri(URI.create(server + "/tasks/completeTask/" + event.taskID)) + .header("Content-Type", "application/task+json") + .GET() .build(); try { client.send(request, HttpResponse.BodyHandlers.ofString()); - } catch (IOException | InterruptedException e) { + } catch (InterruptedException e) { logger.log(Level.SEVERE, e.getLocalizedMessage(), e); - // Restore interrupted state... Thread.currentThread().interrupt(); + } catch (IOException e) { + logger.log(Level.SEVERE, e.getLocalizedMessage(), e); } } diff --git a/roster/src/main/java/ch/unisg/roster/roster/application/handler/ExecutorAddedHandler.java b/roster/src/main/java/ch/unisg/roster/roster/application/handler/ExecutorAddedHandler.java new file mode 100644 index 0000000..9545c07 --- /dev/null +++ b/roster/src/main/java/ch/unisg/roster/roster/application/handler/ExecutorAddedHandler.java @@ -0,0 +1,16 @@ +package ch.unisg.roster.roster.application.handler; + +import ch.unisg.roster.roster.application.port.in.ExecutorAddedEvent; +import ch.unisg.roster.roster.application.port.in.ExecutorAddedEventHandler; +import ch.unisg.roster.roster.domain.ExecutorRegistry; +import org.springframework.stereotype.Component; + +@Component +public class ExecutorAddedHandler implements ExecutorAddedEventHandler { + + @Override + public boolean handleNewExecutorEvent(ExecutorAddedEvent executorAddedEvent) { + return ExecutorRegistry.getInstance().addExecutor(executorAddedEvent.getExecutorType(), + executorAddedEvent.getExecutorURI()); + } +} diff --git a/roster/src/main/java/ch/unisg/roster/roster/application/handler/ExecutorRemovedHandler.java b/roster/src/main/java/ch/unisg/roster/roster/application/handler/ExecutorRemovedHandler.java new file mode 100644 index 0000000..c6e3f68 --- /dev/null +++ b/roster/src/main/java/ch/unisg/roster/roster/application/handler/ExecutorRemovedHandler.java @@ -0,0 +1,19 @@ +package ch.unisg.roster.roster.application.handler; + +import ch.unisg.roster.roster.application.port.in.ExecutorRemovedEvent; +import ch.unisg.roster.roster.application.port.in.ExecutorRemovedEventHandler; +import ch.unisg.roster.roster.domain.ExecutorRegistry; +import org.springframework.stereotype.Component; + +/** + * Handler for executor removed events. It removes the executor from this roster's executor + * registry. + */ +@Component +public class ExecutorRemovedHandler implements ExecutorRemovedEventHandler { + + @Override + public boolean handleExecutorRemovedEvent(ExecutorRemovedEvent executorRemovedEvent) { + return ExecutorRegistry.getInstance().removeExecutor(executorRemovedEvent.getExecutorURI()); + } +} diff --git a/roster/src/main/java/ch/unisg/roster/roster/application/port/in/ApplyForTaskCommand.java b/roster/src/main/java/ch/unisg/roster/roster/application/port/in/ApplyForTaskCommand.java new file mode 100644 index 0000000..f03ef5f --- /dev/null +++ b/roster/src/main/java/ch/unisg/roster/roster/application/port/in/ApplyForTaskCommand.java @@ -0,0 +1,26 @@ +package ch.unisg.roster.roster.application.port.in; + +import javax.validation.constraints.NotNull; + +import ch.unisg.roster.roster.domain.valueobject.ExecutorType; +import ch.unisg.common.validation.SelfValidating; +import ch.unisg.common.valueobject.ExecutorURI; +import lombok.EqualsAndHashCode; +import lombok.Value; + +@Value +@EqualsAndHashCode(callSuper=false) +public class ApplyForTaskCommand extends SelfValidating{ + + @NotNull + private final ExecutorType taskType; + + @NotNull + private final ExecutorURI executorURI; + + public ApplyForTaskCommand(ExecutorType taskType, ExecutorURI executorURI) { + this.taskType = taskType; + this.executorURI = executorURI; + this.validateSelf(); + } +} diff --git a/roster/src/main/java/ch/unisg/roster/roster/application/port/in/ApplyForTaskUseCase.java b/roster/src/main/java/ch/unisg/roster/roster/application/port/in/ApplyForTaskUseCase.java new file mode 100644 index 0000000..61b7bd4 --- /dev/null +++ b/roster/src/main/java/ch/unisg/roster/roster/application/port/in/ApplyForTaskUseCase.java @@ -0,0 +1,7 @@ +package ch.unisg.roster.roster.application.port.in; + +import ch.unisg.roster.roster.domain.Task; + +public interface ApplyForTaskUseCase { + Task applyForTask(ApplyForTaskCommand applyForTaskCommand); +} diff --git a/roster/src/main/java/ch/unisg/roster/roster/application/port/in/DeleteTaskCommand.java b/roster/src/main/java/ch/unisg/roster/roster/application/port/in/DeleteTaskCommand.java new file mode 100644 index 0000000..9f59dc3 --- /dev/null +++ b/roster/src/main/java/ch/unisg/roster/roster/application/port/in/DeleteTaskCommand.java @@ -0,0 +1,24 @@ +package ch.unisg.roster.roster.application.port.in; + +import javax.validation.constraints.NotNull; + +import ch.unisg.roster.roster.domain.valueobject.ExecutorType; +import ch.unisg.common.validation.SelfValidating; +import lombok.EqualsAndHashCode; +import lombok.Value; + +@Value +@EqualsAndHashCode(callSuper=false) +public class DeleteTaskCommand extends SelfValidating { + @NotNull + private final String taskId; + + @NotNull + private final ExecutorType taskType; + + public DeleteTaskCommand(String taskId, ExecutorType taskType) { + this.taskId = taskId; + this.taskType = taskType; + this.validateSelf(); + } +} diff --git a/roster/src/main/java/ch/unisg/roster/roster/application/port/in/DeleteTaskUseCase.java b/roster/src/main/java/ch/unisg/roster/roster/application/port/in/DeleteTaskUseCase.java new file mode 100644 index 0000000..2acfc63 --- /dev/null +++ b/roster/src/main/java/ch/unisg/roster/roster/application/port/in/DeleteTaskUseCase.java @@ -0,0 +1,5 @@ +package ch.unisg.roster.roster.application.port.in; + +public interface DeleteTaskUseCase { + boolean deleteTask(DeleteTaskCommand deleteTaskCommand); +} diff --git a/roster/src/main/java/ch/unisg/roster/roster/application/port/in/ExecutorAddedEvent.java b/roster/src/main/java/ch/unisg/roster/roster/application/port/in/ExecutorAddedEvent.java new file mode 100644 index 0000000..0e10b8e --- /dev/null +++ b/roster/src/main/java/ch/unisg/roster/roster/application/port/in/ExecutorAddedEvent.java @@ -0,0 +1,33 @@ +package ch.unisg.roster.roster.application.port.in; + +import lombok.Value; + +import javax.validation.constraints.NotNull; + +import ch.unisg.common.validation.SelfValidating; +import ch.unisg.common.valueobject.ExecutorURI; +import ch.unisg.roster.roster.domain.valueobject.ExecutorType; + +/** + * Event that notifies the auction house that an executor has been added to this TAPAS application. + */ +@Value +public class ExecutorAddedEvent extends SelfValidating { + @NotNull + private final ExecutorURI executorURI; + + @NotNull + private final ExecutorType executorType; + + /** + * Constructs an executor added event. + * + * @param executorURI the identifier of the executor that was added to this TAPAS application + */ + public ExecutorAddedEvent(ExecutorURI executorURI, ExecutorType executorType) { + this.executorURI = executorURI; + this.executorType = executorType; + + this.validateSelf(); + } +} diff --git a/roster/src/main/java/ch/unisg/roster/roster/application/port/in/ExecutorAddedEventHandler.java b/roster/src/main/java/ch/unisg/roster/roster/application/port/in/ExecutorAddedEventHandler.java new file mode 100644 index 0000000..c7a9076 --- /dev/null +++ b/roster/src/main/java/ch/unisg/roster/roster/application/port/in/ExecutorAddedEventHandler.java @@ -0,0 +1,6 @@ +package ch.unisg.roster.roster.application.port.in; + +public interface ExecutorAddedEventHandler { + + boolean handleNewExecutorEvent(ExecutorAddedEvent executorAddedEvent); +} diff --git a/roster/src/main/java/ch/unisg/roster/roster/application/port/in/ExecutorRemovedEvent.java b/roster/src/main/java/ch/unisg/roster/roster/application/port/in/ExecutorRemovedEvent.java new file mode 100644 index 0000000..8753683 --- /dev/null +++ b/roster/src/main/java/ch/unisg/roster/roster/application/port/in/ExecutorRemovedEvent.java @@ -0,0 +1,27 @@ +package ch.unisg.roster.roster.application.port.in; + +import lombok.Value; + +import javax.validation.constraints.NotNull; + +import ch.unisg.common.validation.SelfValidating; +import ch.unisg.common.valueobject.ExecutorURI; + +/** + * Event that notifies the auction house that an executor has been removed from this TAPAS application. + */ +@Value +public class ExecutorRemovedEvent extends SelfValidating { + @NotNull + private final ExecutorURI executorURI; + + /** + * Constructs an executor removed event. + * + * @param executorURI the identifier of the executor that was removed from this TAPAS application + */ + public ExecutorRemovedEvent(ExecutorURI executorURI) { + this.executorURI = executorURI; + this.validateSelf(); + } +} diff --git a/roster/src/main/java/ch/unisg/roster/roster/application/port/in/ExecutorRemovedEventHandler.java b/roster/src/main/java/ch/unisg/roster/roster/application/port/in/ExecutorRemovedEventHandler.java new file mode 100644 index 0000000..79ee6a7 --- /dev/null +++ b/roster/src/main/java/ch/unisg/roster/roster/application/port/in/ExecutorRemovedEventHandler.java @@ -0,0 +1,6 @@ +package ch.unisg.roster.roster.application.port.in; + +public interface ExecutorRemovedEventHandler { + + boolean handleExecutorRemovedEvent(ExecutorRemovedEvent executorRemovedEvent); +} diff --git a/assignment/src/main/java/ch/unisg/assignment/assignment/application/port/in/NewTaskCommand.java b/roster/src/main/java/ch/unisg/roster/roster/application/port/in/NewTaskCommand.java similarity index 55% rename from assignment/src/main/java/ch/unisg/assignment/assignment/application/port/in/NewTaskCommand.java rename to roster/src/main/java/ch/unisg/roster/roster/application/port/in/NewTaskCommand.java index ab6838e..5db2b9f 100644 --- a/assignment/src/main/java/ch/unisg/assignment/assignment/application/port/in/NewTaskCommand.java +++ b/roster/src/main/java/ch/unisg/roster/roster/application/port/in/NewTaskCommand.java @@ -1,9 +1,9 @@ -package ch.unisg.assignment.assignment.application.port.in; +package ch.unisg.roster.roster.application.port.in; import javax.validation.constraints.NotNull; -import ch.unisg.assignment.assignment.domain.valueobject.ExecutorType; -import ch.unisg.assignment.common.SelfValidating; +import ch.unisg.roster.roster.domain.valueobject.ExecutorType; +import ch.unisg.common.validation.SelfValidating; import lombok.EqualsAndHashCode; import lombok.Value; @@ -17,9 +17,13 @@ public class NewTaskCommand extends SelfValidating { @NotNull private final ExecutorType taskType; - public NewTaskCommand(String taskID, ExecutorType taskType) { + @NotNull + private final String inputData; + + public NewTaskCommand(String taskID, ExecutorType taskType, String inputData) { this.taskID = taskID; this.taskType = taskType; + this.inputData = inputData; this.validateSelf(); } } diff --git a/assignment/src/main/java/ch/unisg/assignment/assignment/application/port/in/NewTaskUseCase.java b/roster/src/main/java/ch/unisg/roster/roster/application/port/in/NewTaskUseCase.java similarity index 62% rename from assignment/src/main/java/ch/unisg/assignment/assignment/application/port/in/NewTaskUseCase.java rename to roster/src/main/java/ch/unisg/roster/roster/application/port/in/NewTaskUseCase.java index 21f084e..f1bd733 100644 --- a/assignment/src/main/java/ch/unisg/assignment/assignment/application/port/in/NewTaskUseCase.java +++ b/roster/src/main/java/ch/unisg/roster/roster/application/port/in/NewTaskUseCase.java @@ -1,4 +1,4 @@ -package ch.unisg.assignment.assignment.application.port.in; +package ch.unisg.roster.roster.application.port.in; public interface NewTaskUseCase { boolean addNewTaskToQueue(NewTaskCommand newTaskCommand); diff --git a/assignment/src/main/java/ch/unisg/assignment/assignment/application/port/in/TaskCompletedCommand.java b/roster/src/main/java/ch/unisg/roster/roster/application/port/in/TaskCompletedCommand.java similarity index 84% rename from assignment/src/main/java/ch/unisg/assignment/assignment/application/port/in/TaskCompletedCommand.java rename to roster/src/main/java/ch/unisg/roster/roster/application/port/in/TaskCompletedCommand.java index b0af2b4..b7438c0 100644 --- a/assignment/src/main/java/ch/unisg/assignment/assignment/application/port/in/TaskCompletedCommand.java +++ b/roster/src/main/java/ch/unisg/roster/roster/application/port/in/TaskCompletedCommand.java @@ -1,8 +1,8 @@ -package ch.unisg.assignment.assignment.application.port.in; +package ch.unisg.roster.roster.application.port.in; import javax.validation.constraints.NotNull; -import ch.unisg.assignment.common.SelfValidating; +import ch.unisg.common.validation.SelfValidating; import lombok.EqualsAndHashCode; import lombok.Value; diff --git a/assignment/src/main/java/ch/unisg/assignment/assignment/application/port/in/TaskCompletedUseCase.java b/roster/src/main/java/ch/unisg/roster/roster/application/port/in/TaskCompletedUseCase.java similarity index 64% rename from assignment/src/main/java/ch/unisg/assignment/assignment/application/port/in/TaskCompletedUseCase.java rename to roster/src/main/java/ch/unisg/roster/roster/application/port/in/TaskCompletedUseCase.java index 1902952..51b305a 100644 --- a/assignment/src/main/java/ch/unisg/assignment/assignment/application/port/in/TaskCompletedUseCase.java +++ b/roster/src/main/java/ch/unisg/roster/roster/application/port/in/TaskCompletedUseCase.java @@ -1,4 +1,4 @@ -package ch.unisg.assignment.assignment.application.port.in; +package ch.unisg.roster.roster.application.port.in; public interface TaskCompletedUseCase { void taskCompleted(TaskCompletedCommand taskCompletedCommand); diff --git a/roster/src/main/java/ch/unisg/roster/roster/application/port/out/GetAllExecutorInExecutorPoolByTypePort.java b/roster/src/main/java/ch/unisg/roster/roster/application/port/out/GetAllExecutorInExecutorPoolByTypePort.java new file mode 100644 index 0000000..f32a3f5 --- /dev/null +++ b/roster/src/main/java/ch/unisg/roster/roster/application/port/out/GetAllExecutorInExecutorPoolByTypePort.java @@ -0,0 +1,13 @@ +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); +} + + diff --git a/roster/src/main/java/ch/unisg/roster/roster/application/port/out/NewTaskEventPort.java b/roster/src/main/java/ch/unisg/roster/roster/application/port/out/NewTaskEventPort.java new file mode 100644 index 0000000..75fda6d --- /dev/null +++ b/roster/src/main/java/ch/unisg/roster/roster/application/port/out/NewTaskEventPort.java @@ -0,0 +1,11 @@ +package ch.unisg.roster.roster.application.port.out; + +import ch.unisg.roster.roster.domain.event.NewTaskEvent; + +public interface NewTaskEventPort { + /** + * Publishes the new task event. + * @return void + **/ + void publishNewTaskEvent(NewTaskEvent event); +} diff --git a/roster/src/main/java/ch/unisg/roster/roster/application/port/out/TaskAssignedEventPort.java b/roster/src/main/java/ch/unisg/roster/roster/application/port/out/TaskAssignedEventPort.java new file mode 100644 index 0000000..2bcb2ae --- /dev/null +++ b/roster/src/main/java/ch/unisg/roster/roster/application/port/out/TaskAssignedEventPort.java @@ -0,0 +1,11 @@ +package ch.unisg.roster.roster.application.port.out; + +import ch.unisg.roster.roster.domain.event.TaskAssignedEvent; + +public interface TaskAssignedEventPort { + /** + * Publishes the task assigned event. + * @return void + **/ + void publishTaskAssignedEvent(TaskAssignedEvent taskAssignedEvent); +} diff --git a/roster/src/main/java/ch/unisg/roster/roster/application/port/out/TaskCompletedEventPort.java b/roster/src/main/java/ch/unisg/roster/roster/application/port/out/TaskCompletedEventPort.java new file mode 100644 index 0000000..a8c11ef --- /dev/null +++ b/roster/src/main/java/ch/unisg/roster/roster/application/port/out/TaskCompletedEventPort.java @@ -0,0 +1,11 @@ +package ch.unisg.roster.roster.application.port.out; + +import ch.unisg.roster.roster.domain.event.TaskCompletedEvent; + +public interface TaskCompletedEventPort { + /** + * Publishes the task completed event. + * @return void + **/ + void publishTaskCompleted(TaskCompletedEvent event); +} diff --git a/roster/src/main/java/ch/unisg/roster/roster/application/service/ApplyForTaskService.java b/roster/src/main/java/ch/unisg/roster/roster/application/service/ApplyForTaskService.java new file mode 100644 index 0000000..26b75aa --- /dev/null +++ b/roster/src/main/java/ch/unisg/roster/roster/application/service/ApplyForTaskService.java @@ -0,0 +1,39 @@ +package ch.unisg.roster.roster.application.service; + +import javax.transaction.Transactional; + +import org.springframework.stereotype.Component; + +import ch.unisg.roster.roster.application.port.in.ApplyForTaskCommand; +import ch.unisg.roster.roster.application.port.in.ApplyForTaskUseCase; +import ch.unisg.roster.roster.application.port.out.TaskAssignedEventPort; +import ch.unisg.roster.roster.domain.Roster; +import ch.unisg.roster.roster.domain.Task; +import ch.unisg.roster.roster.domain.event.TaskAssignedEvent; +import lombok.RequiredArgsConstructor; + +@RequiredArgsConstructor +@Component +@Transactional +public class ApplyForTaskService implements ApplyForTaskUseCase { + + private final TaskAssignedEventPort taskAssignedEventPort; + + /** + * Checks if a task is available and assignes it to the executor. If task got assigned a task + * assigned event gets published. + * @return assigned task or null if no task is found + **/ + @Override + public Task applyForTask(ApplyForTaskCommand command) { + Task task = Roster.getInstance().assignTaskToExecutor(command.getTaskType(), + command.getExecutorURI()); + + if (task != null) { + taskAssignedEventPort.publishTaskAssignedEvent(new TaskAssignedEvent(task.getTaskID())); + } + + return task; + } + +} diff --git a/roster/src/main/java/ch/unisg/roster/roster/application/service/DeleteTaskService.java b/roster/src/main/java/ch/unisg/roster/roster/application/service/DeleteTaskService.java new file mode 100644 index 0000000..a6b4841 --- /dev/null +++ b/roster/src/main/java/ch/unisg/roster/roster/application/service/DeleteTaskService.java @@ -0,0 +1,27 @@ +package ch.unisg.roster.roster.application.service; + +import javax.transaction.Transactional; + +import org.springframework.stereotype.Component; + +import ch.unisg.roster.roster.application.port.in.DeleteTaskCommand; +import ch.unisg.roster.roster.application.port.in.DeleteTaskUseCase; +import ch.unisg.roster.roster.domain.Roster; +import lombok.RequiredArgsConstructor; + +@RequiredArgsConstructor +@Component +@Transactional +public class DeleteTaskService implements DeleteTaskUseCase { + + /** + * Check if task can get deleted + * @return if task can get deleted + **/ + @Override + public boolean deleteTask(DeleteTaskCommand command) { + Roster roster = Roster.getInstance(); + return roster.deleteTask(command.getTaskId(), command.getTaskType()); + } + +} diff --git a/roster/src/main/java/ch/unisg/roster/roster/application/service/NewTaskService.java b/roster/src/main/java/ch/unisg/roster/roster/application/service/NewTaskService.java new file mode 100644 index 0000000..c1aab5c --- /dev/null +++ b/roster/src/main/java/ch/unisg/roster/roster/application/service/NewTaskService.java @@ -0,0 +1,47 @@ +package ch.unisg.roster.roster.application.service; + +import javax.transaction.Transactional; + +import org.springframework.stereotype.Component; + +import ch.unisg.roster.roster.application.port.in.NewTaskCommand; +import ch.unisg.roster.roster.application.port.in.NewTaskUseCase; +import ch.unisg.roster.roster.application.port.out.NewTaskEventPort; +import ch.unisg.roster.roster.domain.ExecutorRegistry; +import ch.unisg.roster.roster.domain.Roster; +import ch.unisg.roster.roster.domain.Task; +import ch.unisg.roster.roster.domain.event.NewTaskEvent; +import lombok.RequiredArgsConstructor; + +@RequiredArgsConstructor +@Component +@Transactional +public class NewTaskService implements NewTaskUseCase { + + private final NewTaskEventPort newTaskEventPort; + + /** + * Checks if we can execute the give task, if yes the task gets added to the task queue and return true. + * If the task can not be executed by an internal or auction house executor, the method return false. + * @return boolean + **/ + @Override + public boolean addNewTaskToQueue(NewTaskCommand command) { + + ExecutorRegistry executorRegistry = ExecutorRegistry.getInstance(); + + if (!executorRegistry.containsTaskType(command.getTaskType())) { + return false; + } + + Task task = new Task(command.getTaskID(), command.getTaskType(), command.getInputData()); + + Roster.getInstance().addTaskToQueue(task); + + NewTaskEvent newTaskEvent = new NewTaskEvent(task.getTaskType()); + newTaskEventPort.publishNewTaskEvent(newTaskEvent); + + return true; + } + +} diff --git a/assignment/src/main/java/ch/unisg/assignment/assignment/application/service/TaskCompletedService.java b/roster/src/main/java/ch/unisg/roster/roster/application/service/TaskCompletedService.java similarity index 56% rename from assignment/src/main/java/ch/unisg/assignment/assignment/application/service/TaskCompletedService.java rename to roster/src/main/java/ch/unisg/roster/roster/application/service/TaskCompletedService.java index c8273ff..69b65d1 100644 --- a/assignment/src/main/java/ch/unisg/assignment/assignment/application/service/TaskCompletedService.java +++ b/roster/src/main/java/ch/unisg/roster/roster/application/service/TaskCompletedService.java @@ -1,14 +1,14 @@ -package ch.unisg.assignment.assignment.application.service; +package ch.unisg.roster.roster.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.event.TaskCompletedEvent; +import ch.unisg.roster.roster.application.port.in.TaskCompletedCommand; +import ch.unisg.roster.roster.application.port.in.TaskCompletedUseCase; +import ch.unisg.roster.roster.application.port.out.TaskCompletedEventPort; +import ch.unisg.roster.roster.domain.Roster; +import ch.unisg.roster.roster.domain.event.TaskCompletedEvent; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor @@ -18,6 +18,10 @@ public class TaskCompletedService implements TaskCompletedUseCase { private final TaskCompletedEventPort taskCompletedEventPort; + /** + * Completes the task in the roster and publishes a task completed event. + * @return void + **/ @Override public void taskCompleted(TaskCompletedCommand command) { diff --git a/roster/src/main/java/ch/unisg/roster/roster/domain/ExecutorInfo.java b/roster/src/main/java/ch/unisg/roster/roster/domain/ExecutorInfo.java new file mode 100644 index 0000000..eb32ec0 --- /dev/null +++ b/roster/src/main/java/ch/unisg/roster/roster/domain/ExecutorInfo.java @@ -0,0 +1,16 @@ +package ch.unisg.roster.roster.domain; + +import ch.unisg.roster.roster.domain.valueobject.ExecutorType; +import ch.unisg.common.valueobject.ExecutorURI; +import lombok.Getter; +import lombok.Setter; + +public class ExecutorInfo { + @Getter + @Setter + private ExecutorURI executorURI; + + @Getter + @Setter + private ExecutorType executorType; +} diff --git a/roster/src/main/java/ch/unisg/roster/roster/domain/ExecutorRegistry.java b/roster/src/main/java/ch/unisg/roster/roster/domain/ExecutorRegistry.java new file mode 100644 index 0000000..4ddba0f --- /dev/null +++ b/roster/src/main/java/ch/unisg/roster/roster/domain/ExecutorRegistry.java @@ -0,0 +1,92 @@ +package ch.unisg.roster.roster.domain; + +import java.util.*; + +import ch.unisg.common.valueobject.ExecutorURI; +import ch.unisg.roster.roster.domain.valueobject.ExecutorType; + +/** + * Registry that keeps a track of executors internal to the TAPAS application and the types of tasks + * they can achieve. One executor may correspond to multiple task types. + * This class is a singleton. + */ +public class ExecutorRegistry { + private static ExecutorRegistry registry; + + private final Map> executors; + + private ExecutorRegistry() { + this.executors = new Hashtable<>(); + } + + public static synchronized ExecutorRegistry getInstance() { + if (registry == null) { + registry = new ExecutorRegistry(); + } + + return registry; + } + + /** + * Adds an executor to the registry for a given task type. + * + * @param taskType the type of the task + * @param executorIdentifier the identifier of the executor (can be any string) + * @return true unless a runtime exception occurs + */ + public boolean addExecutor(ExecutorType executorType, ExecutorURI executorURI) { + Set taskTypeExecs = executors.getOrDefault(executorType, + Collections.synchronizedSet(new HashSet<>())); + + taskTypeExecs.add(executorURI); + executors.put(executorType, taskTypeExecs); + + return true; + } + + /** + * Removes an executor from the registry. The executor is disassociated from all known task types. + * + * @param executorURI the identifier of the executor + * @return true unless a runtime exception occurs + */ + public boolean removeExecutor(ExecutorURI executorURI) { + Iterator iterator = executors.keySet().iterator(); + + while (iterator.hasNext()) { + ExecutorType executorType = iterator.next(); + Set set = executors.get(executorType); + + set.remove(executorURI); + + if (set.isEmpty()) { + iterator.remove(); + } + } + + return true; + } + + /** + * Checks if the registry contains an executor for a given task type. Used during task creation + * to decide if a task can be executed. + * + * @param taskType the task type being auctioned + * @return + */ + public boolean containsTaskType(ExecutorType taskType) { + return executors.containsKey(taskType); + } + + /** + * Adds a list of executors to current executor list. Should only be used on startup to + * add all available executors from the executor pool to the registry. + * + * @param executors the initial executors + * @return + */ + public void init(Map> executors) { + this.executors.putAll(executors); + } + +} diff --git a/roster/src/main/java/ch/unisg/roster/roster/domain/Roster.java b/roster/src/main/java/ch/unisg/roster/roster/domain/Roster.java new file mode 100644 index 0000000..cc9a0a6 --- /dev/null +++ b/roster/src/main/java/ch/unisg/roster/roster/domain/Roster.java @@ -0,0 +1,86 @@ +package ch.unisg.roster.roster.domain; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.logging.Level; +import java.util.logging.Logger; + +import ch.unisg.roster.roster.domain.valueobject.ExecutorType; +import ch.unisg.common.valueobject.ExecutorURI; + +public class Roster { + + private static final Roster roster = new Roster(); + + // Queues which hold all the tasks which need to be assigned | Will be replaced by message queue later + private HashMap> queues = new HashMap<>(); + + // Roster witch holds information about which executor is assigned to a task + private HashMap rosterMap = new HashMap<>(); + + Logger logger = Logger.getLogger(Roster.class.getName()); + + public static Roster getInstance() { + return roster; + } + + private Roster() {} + + /** + * Adds a task to the task queue. + * @return void + * @see Task + **/ + public void addTaskToQueue(Task task) { + if (queues.containsKey(task.getTaskType().getValue())) { + queues.get(task.getTaskType().getValue()).add(task); + } else { + queues.put(task.getTaskType().getValue(), new ArrayList<>(Arrays.asList(task))); + } + logger.log(Level.INFO, "Added task with id {0} to queue", task.getTaskID()); + } + + /** + * Checks if a task of this type is in a queue and if so assignes it to the executor. + * @return assigned task or null if no task is found + * @see Task + **/ + public Task assignTaskToExecutor(ExecutorType taskType, ExecutorURI executorURI) { + // TODO I don't think we need this if + if (!queues.containsKey(taskType.getValue())) { + return null; + } + if (queues.get(taskType.getValue()).isEmpty()) { + return null; + } + + Task task = queues.get(taskType.getValue()).remove(0); + + rosterMap.put(task.getTaskID(), new RosterItem(task.getTaskID(), + task.getTaskType().getValue(), executorURI)); + + return task; + } + + /** + * Removed a task from the roster after if got completed + * @return void + * @see Task + * @see Roster + **/ + public void taskCompleted(String taskID) { + rosterMap.remove(taskID); + logger.log(Level.INFO, "Task {0} completed", taskID); + } + + /** + * Deletes a task if it is still in the queue. + * @return Whether the task got deleted or not + **/ + public boolean deleteTask(String taskID, ExecutorType taskType) { + logger.log(Level.INFO, "Try to delete task with id {0}", taskID); + return queues.get(taskType.getValue()).removeIf(task -> task.getTaskID().equalsIgnoreCase(taskID)); + } + +} diff --git a/roster/src/main/java/ch/unisg/roster/roster/domain/RosterItem.java b/roster/src/main/java/ch/unisg/roster/roster/domain/RosterItem.java new file mode 100644 index 0000000..cc39c6c --- /dev/null +++ b/roster/src/main/java/ch/unisg/roster/roster/domain/RosterItem.java @@ -0,0 +1,23 @@ +package ch.unisg.roster.roster.domain; + +import ch.unisg.common.valueobject.ExecutorURI; +import lombok.Getter; + +public class RosterItem { + + @Getter + private String taskID; + + @Getter + private String taskType; + + @Getter + private ExecutorURI executorURI; + + public RosterItem(String taskID, String taskType, ExecutorURI executorURI) { + this.taskID = taskID; + this.taskType = taskType; + this.executorURI = executorURI; + } + +} diff --git a/assignment/src/main/java/ch/unisg/assignment/assignment/domain/Task.java b/roster/src/main/java/ch/unisg/roster/roster/domain/Task.java similarity index 58% rename from assignment/src/main/java/ch/unisg/assignment/assignment/domain/Task.java rename to roster/src/main/java/ch/unisg/roster/roster/domain/Task.java index 7daa738..ee30763 100644 --- a/assignment/src/main/java/ch/unisg/assignment/assignment/domain/Task.java +++ b/roster/src/main/java/ch/unisg/roster/roster/domain/Task.java @@ -1,6 +1,6 @@ -package ch.unisg.assignment.assignment.domain; +package ch.unisg.roster.roster.domain; -import ch.unisg.assignment.assignment.domain.valueobject.ExecutorType; +import ch.unisg.roster.roster.domain.valueobject.ExecutorType; import lombok.Getter; import lombok.Setter; @@ -14,7 +14,11 @@ public class Task { @Getter @Setter - private String result; + private String inputData; + + @Getter + @Setter + private String outputData; @Getter @Setter @@ -30,6 +34,12 @@ public class Task { this.taskType = taskType; } + public Task(String taskID, ExecutorType taskType, String inputData) { + this.taskID = taskID; + this.taskType = taskType; + this.inputData = inputData; + } + public Task() {} } diff --git a/assignment/src/main/java/ch/unisg/assignment/assignment/domain/event/NewTaskEvent.java b/roster/src/main/java/ch/unisg/roster/roster/domain/event/NewTaskEvent.java similarity index 56% rename from assignment/src/main/java/ch/unisg/assignment/assignment/domain/event/NewTaskEvent.java rename to roster/src/main/java/ch/unisg/roster/roster/domain/event/NewTaskEvent.java index 34e7f0b..1457f1d 100644 --- a/assignment/src/main/java/ch/unisg/assignment/assignment/domain/event/NewTaskEvent.java +++ b/roster/src/main/java/ch/unisg/roster/roster/domain/event/NewTaskEvent.java @@ -1,6 +1,6 @@ -package ch.unisg.assignment.assignment.domain.event; +package ch.unisg.roster.roster.domain.event; -import ch.unisg.assignment.assignment.domain.valueobject.ExecutorType; +import ch.unisg.roster.roster.domain.valueobject.ExecutorType; public class NewTaskEvent { public final ExecutorType taskType; diff --git a/assignment/src/main/java/ch/unisg/assignment/assignment/domain/event/TaskAssignedEvent.java b/roster/src/main/java/ch/unisg/roster/roster/domain/event/TaskAssignedEvent.java similarity index 74% rename from assignment/src/main/java/ch/unisg/assignment/assignment/domain/event/TaskAssignedEvent.java rename to roster/src/main/java/ch/unisg/roster/roster/domain/event/TaskAssignedEvent.java index d0178d4..9c57270 100644 --- a/assignment/src/main/java/ch/unisg/assignment/assignment/domain/event/TaskAssignedEvent.java +++ b/roster/src/main/java/ch/unisg/roster/roster/domain/event/TaskAssignedEvent.java @@ -1,4 +1,4 @@ -package ch.unisg.assignment.assignment.domain.event; +package ch.unisg.roster.roster.domain.event; public class TaskAssignedEvent { public final String taskID; diff --git a/assignment/src/main/java/ch/unisg/assignment/assignment/domain/event/TaskCompletedEvent.java b/roster/src/main/java/ch/unisg/roster/roster/domain/event/TaskCompletedEvent.java similarity index 85% rename from assignment/src/main/java/ch/unisg/assignment/assignment/domain/event/TaskCompletedEvent.java rename to roster/src/main/java/ch/unisg/roster/roster/domain/event/TaskCompletedEvent.java index 432a8f0..926f601 100644 --- a/assignment/src/main/java/ch/unisg/assignment/assignment/domain/event/TaskCompletedEvent.java +++ b/roster/src/main/java/ch/unisg/roster/roster/domain/event/TaskCompletedEvent.java @@ -1,4 +1,4 @@ -package ch.unisg.assignment.assignment.domain.event; +package ch.unisg.roster.roster.domain.event; public class TaskCompletedEvent { public final String taskID; diff --git a/assignment/src/main/java/ch/unisg/assignment/assignment/domain/valueobject/ExecutorType.java b/roster/src/main/java/ch/unisg/roster/roster/domain/valueobject/ExecutorType.java similarity index 74% rename from assignment/src/main/java/ch/unisg/assignment/assignment/domain/valueobject/ExecutorType.java rename to roster/src/main/java/ch/unisg/roster/roster/domain/valueobject/ExecutorType.java index bc5f467..72368e3 100644 --- a/assignment/src/main/java/ch/unisg/assignment/assignment/domain/valueobject/ExecutorType.java +++ b/roster/src/main/java/ch/unisg/roster/roster/domain/valueobject/ExecutorType.java @@ -1,4 +1,4 @@ -package ch.unisg.assignment.assignment.domain.valueobject; +package ch.unisg.roster.roster.domain.valueobject; import lombok.Value; diff --git a/roster/src/main/resources/application.properties b/roster/src/main/resources/application.properties new file mode 100644 index 0000000..dc443ab --- /dev/null +++ b/roster/src/main/resources/application.properties @@ -0,0 +1,5 @@ +server.port=8082 +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 diff --git a/executor1/src/test/java/ch/unisg/executor1/Executor1ApplicationTests.java b/roster/src/test/java/ch/unisg/roster/RosterApplicationTests.java similarity index 70% rename from executor1/src/test/java/ch/unisg/executor1/Executor1ApplicationTests.java rename to roster/src/test/java/ch/unisg/roster/RosterApplicationTests.java index 889c9cd..5ee712b 100644 --- a/executor1/src/test/java/ch/unisg/executor1/Executor1ApplicationTests.java +++ b/roster/src/test/java/ch/unisg/roster/RosterApplicationTests.java @@ -1,10 +1,10 @@ -package ch.unisg.executor1; +package ch.unisg.roster; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest -class Executor1ApplicationTests { +class RosterApplicationTests { @Test void contextLoads() { diff --git a/tapas-auction-house/.editorconfig b/tapas-auction-house/.editorconfig new file mode 100644 index 0000000..c4f3e5b --- /dev/null +++ b/tapas-auction-house/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +charset = utf-8 +indent_style = space +indent_size = 4 +trim_trailing_whitespace = true +end_of_line = lf +insert_final_newline = true diff --git a/tapas-auction-house/.gitignore b/tapas-auction-house/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/tapas-auction-house/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/tapas-auction-house/.mvn/wrapper/MavenWrapperDownloader.java b/tapas-auction-house/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 0000000..e76d1f3 --- /dev/null +++ b/tapas-auction-house/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,117 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if(mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if(mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if(!outputFile.getParentFile().exists()) { + if(!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/tapas-auction-house/.mvn/wrapper/maven-wrapper.jar b/tapas-auction-house/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..2cc7d4a Binary files /dev/null and b/tapas-auction-house/.mvn/wrapper/maven-wrapper.jar differ diff --git a/tapas-auction-house/.mvn/wrapper/maven-wrapper.properties b/tapas-auction-house/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..ffdc10e --- /dev/null +++ b/tapas-auction-house/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/tapas-auction-house/BROKERS.md b/tapas-auction-house/BROKERS.md new file mode 100644 index 0000000..7e0d37a --- /dev/null +++ b/tapas-auction-house/BROKERS.md @@ -0,0 +1,121 @@ +# Event-based Interaction with W3C WebSub and MQTT + +## Setting up a local WebSub Hub + +W3C WebSub Recommendation: [https://www.w3.org/TR/websub/](https://www.w3.org/TR/websub/) + +There are several implementations of W3C WebSub available. One implementation that is easy to set up is: +[https://github.com/hemerajs/websub-hub](https://github.com/hemerajs/websub-hub) + +Running this WebSub Hub implementation requires Docker, Node.js, and npm: +* installation instructions for Docker: [https://docs.docker.com/get-docker/](https://docs.docker.com/get-docker/) +* installation instructions for Node.js and npm: [https://docs.npmjs.com/downloading-and-installing-node-js-and-npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm) + +### How to run + +```shell +git clone https://github.com/hemerajs/websub-hub.git +cd websub-hub +docker run -d -p 27017:27017 -p 28017:28017 -e AUTH=no tutum/mongodb +npm i -g websub-hub-cli +websub-hub -l info -m mongodb://localhost:27017/hub +``` + +The third command launches a Docker container with a [MongoDB](https://www.mongodb.com/) instance, +which is used to persist all subscriptions made with the hub. See the README of the original project +for further details: [https://github.com/hemerajs/websub-hub](https://github.com/hemerajs/websub-hub) + +### Implementation note on verification of intents + +There are 3 main W3C WebSub hub implementations out of which: +* 2 are public but closed-source: [Google' WebHub hub](http://pubsubhubbub.appspot.com/) +and [Superfeedr's WebSub hub](https://websub.superfeedr.com/) +* 1 is public and open-source, but it requires additional overhead to set up for local development: + [Switchboard](https://switchboard.p3k.io/) + +The project we recommend above provides by far one of the easiest ways to run a W3C WebSub Hub locally. However, +**interoperability is hard**: this project diverges in one significant way from the [W3C WebSub Recommendation](https://www.w3.org/TR/websub/) +and the main [WebSub Hub](http://pubsubhubbub.appspot.com/) implementations. To save you from the +interoperability headaches, we document this divergence below. + +#### Verifying subscriber intents + +When a Subscriber registers with a WebSub Hub, the Hub is required to verify the intent of the subscriber +in order to prevent an attacker from creating unwanted subscriptions. + +To verify the Subscriber's intent, the Hub sends an HTTP GET request to the subscriber's callback +URL. The HTTP GET request includes several parameters, one of which is a hub-generated random string +with the name `hub.challenge`. To confirm the subscription, a Susbcriber must then respond with an +HTTP 2xx status code and a response body equal to the `hub.challenge` parameter. For more details on +the verification of intents, see [Section 5.3 in the W3C WebSub Recommendation](https://www.w3.org/TR/websub/#hub-verifies-intent). + +#### Verifying subscriber intents with the Hemerajs implementation + +The above Hemerajs implementation differs from the W3C WebSub Recommendation in that the Hub expects the +response body confirming the intent to be in the JSON format with the `application/json` media type. + +Sample HTTP request and the HTTP response expected by the Hemerajs WeSub Hub: + +```shell +curl -i --location --request GET 'localhost:8084/websub/?hub.mode=subscribe&hub.topic=http://example.org&hub.challenge=hub-generated-challenge' + +HTTP/1.1 200 +Content-Type: application/json +Content-Length: 46 +Date: Fri, 22 Oct 2021 10:14:03 GMT + +{ + "hub.challenge": "hub-generated-challenge" +} +``` + +#### Verifying subscriber intents in a standard W3C WebSub implementation + +In contrast to the Hemerajs implementation, a standard WebSub Hub implementation would require the reponse body to be exactly equal to the +hub-generated challenge parameter. Here is an example of a standard response, as expected by WebSub Hubs +that are fully standard-compliant: + +```shell +curl -i --location --request GET 'https://websub.flus.io/dummy-subscriber?hub.mode=subscribe&hub.topic=http://example.org&hub.challenge=hub-generated-challenge' + +HTTP/2 200 +server: nginx +date: Fri, 22 Oct 2021 10:15:58 GMT +content-type: text/plain;charset=UTF-8 +content-security-policy: default-src 'self' +strict-transport-security: max-age=63072000 + +hub-generated-challenge +``` + +#### What this means for your TAPAS application + +We recommend using the Hemerajs WebSub Hub implementation for local development. + +In our deployment, however, we will use one of the publicly available W3C WebSub hubs. You will then +have to change the response for intent verification to match the standard response: that is, to return +directly the `hub.challenge` parameter as shown above. + + +## Setting up a local MQTT broker + +An easy way to set up a local MQTT broker is with HiveMQ and Docker: +[https://www.hivemq.com/downloads/docker/](https://www.hivemq.com/downloads/docker/) + +```shell +docker run -p 8080:8080 -p 1883:1883 hivemq/hivemq4 +``` + +The above command launches a Docker container with a HiveMQT broker and binds to the container on 2 ports: +* port `1883` is used by the MQTT protocol +* port `8080` is used for the HiveMQ dashboard; point your browser to: [http://localhost:8080/](http://localhost:8080/) + +To bind the Docker container to a different HTTP port, you can configure the first parameter. E.g., +this command binds the HiveMQT dashboard to port `8085`: + +```shell +docker run -p 8085:8080 -p 1883:1883 hivemq/hivemq4 +``` + +For development and debugging, it might help to install an MQTT client as well. HiveMQ provides an MQTT +Command-Line Interface (CLI) that may help: [https://hivemq.github.io/mqtt-cli/](https://hivemq.github.io/mqtt-cli/) diff --git a/tapas-auction-house/README.md b/tapas-auction-house/README.md new file mode 100644 index 0000000..683500d --- /dev/null +++ b/tapas-auction-house/README.md @@ -0,0 +1,101 @@ +# tapas-auction-house + +The Auction House is the part of your TAPAS application that is largely responsible for the interactions +with the TAPAS applications developed by the other groups. More precisely, it is responsible for +launching and managing auctions and it is implemented following the Hexagonal Architecture (based on +examples from book "Get Your Hands Dirty on Clean Architecture" by Tom Hombergs). + +Technologies: Spring Boot, Maven + +**Note:** this repository contains an [EditorConfig](https://editorconfig.org/) file (`.editorconfig`) +with default editor settings. EditorConfig is supported out-of-the-box by the IntelliJ IDE. To help maintain +consistent code styles, we recommend to reuse this editor configuration file in all your services. + +## Project Overview + +This project provides a partial implementation of the Auction House. The code is documented in detail, +here we only include a summary of implemented features: +* running and managing auctions: + * each auction has a deadline by which it is open for bids + * once the deadline has passed, the auction house closes the auction and selects a random bid +* starting an auction using a command via an HTTP adapter (see sample request below) +* retrieving the list of open auctions via an HTTP adapter, i.e. auctions accepting bids (see sample + request below) +* receiving events when executors are added to the TAPAS application (both via HTTP and MQTT adapters) +* the logic for automatic placement of bids in auctions: the auction house will place a bid in every + auction for which there is at least one executor that can handle the type of task + being auctioned +* discovery of auction houses via a provided resource directory (see assignment sheet for + Exercises 5 & 6 for more details) + +## Overview of Adapters + +In addition to the overall skeleton of the auction house, the current partial implementation provides +several adapters to help you get started. + +### HTTP Adapters + +Sample HTTP request for launching an auction: + +```shell +curl -i --location --request POST 'http://localhost:8083/auctions/' \ +--header 'Content-Type: application/json' \ +--data-raw '{ + "taskUri" : "http://example.org", + "taskType" : "taskType1", + "deadline" : 10000 +}' + +HTTP/1.1 201 +Content-Type: application/json +Content-Length: 131 +Date: Sun, 17 Oct 2021 22:34:13 GMT + +{ + "auctionId":"1", + "auctionHouseUri":"http://localhost:8083/", + "taskUri":"http://example.org", + "taskType":"taskType1", + "deadline":10000 +} +``` + +Sample HTTP request for retrieving auctions currently open for bids: + +```shell +curl -i --location --request GET 'http://localhost:8083/auctions/' + +HTTP/1.1 200 +Content-Type: application/json +Content-Length: 133 +Date: Sun, 17 Oct 2021 22:34:20 GMT + +[ + { + "auctionId":"1", + "auctionHouseUri":"http://localhost:8083/", + "taskUri":"http://example.org", + "taskType":"taskType1", + "deadline":10000 + } +] +``` + +Sending an [ExecutorAddedEvent](src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/ExecutorAddedEvent.java) +via an HTTP request: + +```shell +curl -i --location --request POST 'http://localhost:8083/executors/taskType1/executor1' + +HTTP/1.1 204 +Date: Sun, 17 Oct 2021 22:38:45 GMT +``` + +### MQTT Adapters + +Sending an [ExecutorAddedEvent](src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/ExecutorAddedEvent.java) +via an MQTT message via HiveMQ's [MQTT CLI](https://hivemq.github.io/mqtt-cli/): + +```shell + mqtt pub -t ch/unisg/tapas-group1/executors -m '{ "taskType" : "taskType1", "executorId" : "executor1" }' +``` diff --git a/tapas-auction-house/mvnw b/tapas-auction-house/mvnw new file mode 100755 index 0000000..a16b543 --- /dev/null +++ b/tapas-auction-house/mvnw @@ -0,0 +1,310 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/tapas-auction-house/mvnw.cmd b/tapas-auction-house/mvnw.cmd new file mode 100644 index 0000000..c8d4337 --- /dev/null +++ b/tapas-auction-house/mvnw.cmd @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/tapas-auction-house/pom.xml b/tapas-auction-house/pom.xml new file mode 100644 index 0000000..df44681 --- /dev/null +++ b/tapas-auction-house/pom.xml @@ -0,0 +1,91 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.5.3 + + + ch.unisg + tapas-auction-house + 0.0.1-SNAPSHOT + tapas-auction-house + TAPAS Auction House + + 11 + + + + Eclipse Paho Repo + https://repo.eclipse.org/content/repositories/paho-releases/ + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + org.eclipse.paho + org.eclipse.paho.client.mqttv3 + 1.2.0 + + + javax.transaction + javax.transaction-api + 1.2 + + + javax.validation + validation-api + 1.1.0.Final + + + org.json + json + 20210307 + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + + diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/TapasAuctionHouseApplication.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/TapasAuctionHouseApplication.java new file mode 100644 index 0000000..18c7631 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/TapasAuctionHouseApplication.java @@ -0,0 +1,75 @@ +package ch.unisg.tapas; + +import ch.unisg.tapas.auctionhouse.adapter.common.clients.TapasMqttClient; +import ch.unisg.tapas.auctionhouse.adapter.in.messaging.mqtt.AuctionEventsMqttDispatcher; +import ch.unisg.tapas.auctionhouse.adapter.common.clients.WebSubSubscriber; +import ch.unisg.tapas.common.AuctionHouseResourceDirectory; +import ch.unisg.tapas.common.ConfigProperties; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.eclipse.paho.client.mqttv3.MqttException; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +import java.net.URI; +import java.util.List; + +/** + * Main TAPAS Auction House application. + */ +@SpringBootApplication +public class TapasAuctionHouseApplication { + private static final Logger LOGGER = LogManager.getLogger(TapasAuctionHouseApplication.class); + + @Autowired + private ConfigProperties config; + + public static String RESOURCE_DIRECTORY = "https://api.interactions.ics.unisg.ch/auction-houses/"; + public static String MQTT_BROKER = "tcp://broker.hivemq.com:1883"; + + public static void main(String[] args) { + SpringApplication tapasAuctioneerApp = new SpringApplication(TapasAuctionHouseApplication.class); + + // We will use these bootstrap methods in Week 6: + bootstrapMarketplaceWithWebSub(); + bootstrapMarketplaceWithMqtt(); + + tapasAuctioneerApp.run(args); + } + /** + * Discovers auction houses and subscribes to WebSub notifications + */ + private static void bootstrapMarketplaceWithWebSub() { + List auctionHouseEndpoints = discoverAuctionHouseEndpoints(); + + WebSubSubscriber subscriber = new WebSubSubscriber(); + + for (String endpoint : auctionHouseEndpoints) { + subscriber.subscribeToAuctionHouseEndpoint(URI.create(endpoint)); + } + } + + /** + * Connects to an MQTT broker, presumably the one used by all TAPAS groups to communicate with + * one another + */ + private static void bootstrapMarketplaceWithMqtt() { + try { + AuctionEventsMqttDispatcher dispatcher = new AuctionEventsMqttDispatcher(); + TapasMqttClient client = TapasMqttClient.getInstance(MQTT_BROKER, dispatcher); + client.startReceivingMessages(); + } catch (MqttException e) { + LOGGER.error(e.getMessage(), e); + } + } + + private static List discoverAuctionHouseEndpoints() { + AuctionHouseResourceDirectory rd = new AuctionHouseResourceDirectory( + URI.create(RESOURCE_DIRECTORY) + ); + + return rd.retrieveAuctionHouseEndpoints(); + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/common/clients/TapasMqttClient.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/common/clients/TapasMqttClient.java new file mode 100644 index 0000000..1a30bc4 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/common/clients/TapasMqttClient.java @@ -0,0 +1,97 @@ +package ch.unisg.tapas.auctionhouse.adapter.common.clients; + +import ch.unisg.tapas.auctionhouse.adapter.in.messaging.mqtt.AuctionEventsMqttDispatcher; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.eclipse.paho.client.mqttv3.*; +import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; + +import java.nio.charset.StandardCharsets; +import java.util.UUID; + +/** + * MQTT client for your TAPAS application. This class is defined as a singleton, but it does not have + * to be this way. This class is only provided as an example to help you bootstrap your project. + * You are welcomed to change this class as you see fit. + */ +public class TapasMqttClient { + private static final Logger LOGGER = LogManager.getLogger(TapasMqttClient.class); + + private static TapasMqttClient tapasClient = null; + + private MqttClient mqttClient; + private final String mqttClientId; + private final String brokerAddress; + + private final MessageReceivedCallback messageReceivedCallback; + + private final AuctionEventsMqttDispatcher dispatcher; + + private TapasMqttClient(String brokerAddress, AuctionEventsMqttDispatcher dispatcher) { + this.mqttClientId = UUID.randomUUID().toString(); + this.brokerAddress = brokerAddress; + + this.messageReceivedCallback = new MessageReceivedCallback(); + + this.dispatcher = dispatcher; + } + + public static synchronized TapasMqttClient getInstance(String brokerAddress, + AuctionEventsMqttDispatcher dispatcher) { + + if (tapasClient == null) { + tapasClient = new TapasMqttClient(brokerAddress, dispatcher); + } + + return tapasClient; + } + + public void startReceivingMessages() throws MqttException { + mqttClient = new org.eclipse.paho.client.mqttv3.MqttClient(brokerAddress, mqttClientId, new MemoryPersistence()); + mqttClient.connect(); + mqttClient.setCallback(messageReceivedCallback); + + subscribeToAllTopics(); + } + + public void stopReceivingMessages() throws MqttException { + mqttClient.disconnect(); + } + + private void subscribeToAllTopics() throws MqttException { + for (String topic : dispatcher.getAllTopics()) { + subscribeToTopic(topic); + } + } + + private void subscribeToTopic(String topic) throws MqttException { + mqttClient.subscribe(topic); + } + + public void publishMessage(String topic, String payload) throws MqttException { + mqttClient = new org.eclipse.paho.client.mqttv3.MqttClient(brokerAddress, mqttClientId, new MemoryPersistence()); + mqttClient.connect(); + + MqttMessage message = new MqttMessage(payload.getBytes(StandardCharsets.UTF_8)); + mqttClient.publish(topic, message); + } + + private class MessageReceivedCallback implements MqttCallback { + + @Override + public void connectionLost(Throwable cause) { } + + @Override + public void messageArrived(String topic, MqttMessage message) { + LOGGER.info("Received new MQTT message for topic " + topic + ": " + + new String(message.getPayload())); + + if (topic != null && !topic.isEmpty()) { + dispatcher.dispatchEvent(topic, message); + } + } + + @Override + public void deliveryComplete(IMqttDeliveryToken token) { } + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/common/clients/WebSubSubscriber.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/common/clients/WebSubSubscriber.java new file mode 100644 index 0000000..5b3fc32 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/common/clients/WebSubSubscriber.java @@ -0,0 +1,111 @@ +package ch.unisg.tapas.auctionhouse.adapter.common.clients; + +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.JSONObject; +import org.springframework.http.HttpStatus; + +/** + * Subscribes to the WebSub hubs of auction houses discovered at run time. This class is instantiated + * from {@link ch.unisg.tapas.TapasAuctionHouseApplication} when boostraping the TAPAS marketplace + * via WebSub. + */ +public class WebSubSubscriber { + + // TODO get this somehow from properties file. But on clue how to do this with static variables + static String WEBSUB_HUB_ENDPOINT = "http://localhost:3000"; + static String AUCTION_HOUSE_ENDPOINT = "http://localhost:8086"; + + Logger logger = Logger.getLogger(WebSubSubscriber.class.getName()); + + public void subscribeToAuctionHouseEndpoint(URI endpoint) { + // TODO decide with other groups about auction house endpoint uri to discover websub topics + // and replace the hardcoded one with it + String topic = discoverWebSubTopic("http://localhost:3100/websub"); + + if (topic == null) { + return; + } + + subscribeToWebSub(topic); + + // Shoudl be done :D + // TODO Subscribe to the auction house endpoint via WebSub: + // 1. Send a request to the auction house in order to discover the WebSub hub to subscribe to. + // The request URI should depend on the design of the Auction House HTTP API. + // 2. Send a subscription request to the discovered WebSub hub to subscribe to events relevant + // for this auction house. + // 3. Handle the validation of intent from the WebSub hub (see WebSub protocol). + // + // Once the subscription is activated, the hub will send "fat pings" with content updates. + // The content received from the hub will depend primarily on the design of the Auction House + // HTTP API. + // + // For further details see: + // - W3C WebSub Recommendation: https://www.w3.org/TR/websub/ + // - the implementation notes of the WebSub hub you are using to distribute events + } + + private String discoverWebSubTopic(String endpoint) { + HttpClient client = HttpClient.newHttpClient(); + HttpRequest request = HttpRequest.newBuilder() + .uri(URI.create(endpoint)) + .header("Content-Type", "application/json") + .GET() + .build(); + + + try { + HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofString()); + if (response.statusCode() == HttpStatus.OK.value()) { + // TODO decide with other groups about response structure and replace the hardcoded + // uri with response uri + JSONObject jsonObject = new JSONObject(response.body()); + System.out.println(jsonObject); + return jsonObject.getString("topic"); + } else { + logger.log(Level.SEVERE, "Could not find a websub uri"); + } + } catch (InterruptedException e) { + logger.log(Level.SEVERE, e.getLocalizedMessage(), e); + Thread.currentThread().interrupt(); + } catch (IOException e) { + logger.log(Level.SEVERE, e.getLocalizedMessage(), e); + } + return null; + } + + private void subscribeToWebSub(String topic) { + HttpClient client = HttpClient.newHttpClient(); + + String body = new JSONObject() + .put("hub.callback", AUCTION_HOUSE_ENDPOINT + "/auction-started") + .put("hub.mode", "subscribe") + .put("hub.topic", topic) + .put("hub.ws", false) + .toString(); + + + HttpRequest request = HttpRequest.newBuilder() + .uri(URI.create(WEBSUB_HUB_ENDPOINT)) + .header("Content-Type", "application/json") + .POST(HttpRequest.BodyPublishers.ofString(body)) + .build(); + + + try { + client.send(request, HttpResponse.BodyHandlers.ofString()); + } catch (InterruptedException e) { + logger.log(Level.SEVERE, e.getLocalizedMessage(), e); + Thread.currentThread().interrupt(); + } catch (IOException e) { + logger.log(Level.SEVERE, e.getLocalizedMessage(), e); + } + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/common/formats/AuctionJsonRepresentation.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/common/formats/AuctionJsonRepresentation.java new file mode 100644 index 0000000..757c8c8 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/common/formats/AuctionJsonRepresentation.java @@ -0,0 +1,63 @@ +package ch.unisg.tapas.auctionhouse.adapter.common.formats; + +import ch.unisg.tapas.auctionhouse.domain.Auction; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.Getter; +import lombok.Setter; + +import java.sql.Timestamp; +import java.text.SimpleDateFormat; + +/** + * Used to expose a representation of the state of an auction through an interface. This class is + * only meant as a starting point when defining a uniform HTTP API for the Auction House: feel free + * to modify this class as you see fit! + */ +public class AuctionJsonRepresentation { + public static final String MEDIA_TYPE = "application/auction+json"; + + @Getter @Setter + private String auctionId; + + @Getter @Setter + private String auctionHouseUri; + + @Getter @Setter + private String taskUri; + + @Getter @Setter + private String taskType; + + @Getter @Setter + private Timestamp deadline; + + public AuctionJsonRepresentation() { } + + public AuctionJsonRepresentation(String auctionId, String auctionHouseUri, String taskUri, + String taskType, Timestamp deadline) { + this.auctionId = auctionId; + this.auctionHouseUri = auctionHouseUri; + this.taskUri = taskUri; + this.taskType = taskType; + this.deadline = deadline; + } + + public AuctionJsonRepresentation(Auction auction) { + this.auctionId = auction.getAuctionId().getValue(); + this.auctionHouseUri = auction.getAuctionHouseUri().getValue().toString(); + this.taskUri = auction.getTaskUri().getValue().toString(); + this.taskType = auction.getTaskType().getValue(); + this.deadline = auction.getDeadline().getValue(); + } + + public static String serialize(Auction auction) throws JsonProcessingException { + AuctionJsonRepresentation representation = new AuctionJsonRepresentation(auction); + + ObjectMapper mapper = new ObjectMapper(); + mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); + mapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")); + return mapper.writeValueAsString(representation); + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/common/formats/BidJsonRepresentation.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/common/formats/BidJsonRepresentation.java new file mode 100644 index 0000000..7ae3dda --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/common/formats/BidJsonRepresentation.java @@ -0,0 +1,43 @@ +package ch.unisg.tapas.auctionhouse.adapter.common.formats; + +import ch.unisg.tapas.auctionhouse.domain.Bid; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.Getter; +import lombok.Setter; + +import java.text.SimpleDateFormat; + +public class BidJsonRepresentation { + public static final String MEDIA_TYPE = "application/bid+json"; + + @Getter @Setter + private String auctionId; + + @Getter @Setter + private String bidderName; + + @Getter @Setter + private String bidderAuctionHouseUri; + + @Getter @Setter + private String bidderTaskListUri; + + public BidJsonRepresentation() {} + + public BidJsonRepresentation(Bid bid){ + this.auctionId = bid.getAuctionId().getValue(); + this.bidderName = bid.getBidderName().getValue(); + this.bidderAuctionHouseUri = bid.getBidderAuctionHouseUri().getValue().toString(); + this.bidderTaskListUri = bid.getBidderTaskListUri().getValue().toString(); + } + + public static String serialize(Bid bid) throws JsonProcessingException { + BidJsonRepresentation representation = new BidJsonRepresentation(bid); + + ObjectMapper mapper = new ObjectMapper(); + mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); + return mapper.writeValueAsString(representation); + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/common/formats/TaskJsonRepresentation.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/common/formats/TaskJsonRepresentation.java new file mode 100644 index 0000000..782978c --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/common/formats/TaskJsonRepresentation.java @@ -0,0 +1,124 @@ +package ch.unisg.tapas.auctionhouse.adapter.common.formats; + +import ch.unisg.tapas.auctionhouse.domain.Task; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.Getter; +import lombok.Setter; + +/** + * This class is used to expose and consume representations of tasks through the HTTP interface. The + * representations conform to the custom JSON-based media type "application/task+json". The media type + * is just an identifier and can be registered with + * IANA to promote interoperability. + */ +final public class TaskJsonRepresentation { + // The media type used for this task representation format + public static final String MEDIA_TYPE = "application/task+json"; + + // A task identifier specific to our implementation (e.g., a UUID). This identifier is then used + // to generate the task's URI. URIs are standard uniform identifiers and use a universal syntax + // that can be referenced (and dereferenced) independent of context. In our uniform HTTP API, + // we identify tasks via URIs and not implementation-specific identifiers. + @Getter @Setter + private String taskId; + + // A string that represents the task's name + @Getter + private final String taskName; + + // A string that identifies the task's type. This string could also be a URI (e.g., defined in some + // Web ontology, as we shall see later in the course), but it's not constrained to be a URI. + // The task's type can be used to assign executors to tasks, to decide what tasks to bid for, etc. + @Getter + private final String taskType; + + // The task's status: OPEN, ASSIGNED, RUNNING, or EXECUTED (see Task.Status) + @Getter @Setter + private String taskStatus; + + // If this task is a delegated task (i.e., a shadow of another task), this URI points to the + // original task. Because URIs are standard and uniform, we can just dereference this URI to + // retrieve a representation of the original task. + @Getter @Setter + private String originalTaskUri; + + // The service provider who executes this task. The service provider is a any string that identifies + // a TAPAS group (e.g., tapas-group1). This identifier could also be a URI (if we have a good reason + // for it), but it's not constrained to be a URI. + @Getter @Setter + private String serviceProvider; + + // A string that provides domain-specific input data for this task. In the context of this project, + // we can parse and interpret the input data based on the task's type. + @Getter @Setter + private String inputData; + + // A string that provides domain-specific output data for this task. In the context of this project, + // we can parse and interpret the output data based on the task's type. + @Getter @Setter + private String outputData; + + /** + * Instantiate a task representation with a task name and type. + * + * @param taskName string that represents the task's name + * @param taskType string that represents the task's type + */ + public TaskJsonRepresentation(String taskName, String taskType) { + this.taskName = taskName; + this.taskType = taskType; + + this.taskStatus = null; + this.originalTaskUri = null; + this.serviceProvider = null; + this.inputData = null; + this.outputData = null; + } + + /** + * Instantiate a task representation from a domain concept. + * + * @param task the task + */ + public TaskJsonRepresentation(Task task) { + this(task.getTaskName().getValue(), task.getTaskType().getValue()); + + this.taskId = task.getTaskId().getValue(); + this.taskStatus = task.getTaskStatus().getValue().name(); + + this.originalTaskUri = (task.getOriginalTaskUri() == null) ? + null : task.getOriginalTaskUri().getValue(); + + this.serviceProvider = (task.getProvider() == null) ? null : task.getProvider().getValue(); + this.inputData = (task.getInputData() == null) ? null : task.getInputData().getValue(); + this.outputData = (task.getOutputData() == null) ? null : task.getOutputData().getValue(); + } + + /** + * Convenience method used to serialize a task provided as a domain concept in the format exposed + * through the uniform HTTP API. + * + * @param task the task as defined in the domain + * @return a string serialization using the JSON-based representation format defined for tasks + * @throws JsonProcessingException if a runtime exception occurs during object serialization + */ + public static String serialize(Task task) throws JsonProcessingException { + TaskJsonRepresentation representation = new TaskJsonRepresentation(task); + + ObjectMapper mapper = new ObjectMapper(); + mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); + + return mapper.writeValueAsString(representation); + } + + public String serialize() throws JsonProcessingException { + TaskJsonRepresentation representation = this; + + ObjectMapper mapper = new ObjectMapper(); + mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); + + return mapper.writeValueAsString(representation); + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/AuctionEventMqttListener.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/AuctionEventMqttListener.java new file mode 100644 index 0000000..6da39e6 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/AuctionEventMqttListener.java @@ -0,0 +1,11 @@ +package ch.unisg.tapas.auctionhouse.adapter.in.messaging.mqtt; + +import org.eclipse.paho.client.mqttv3.MqttMessage; + +/** + * Abstract MQTT listener for auction-related events + */ +public abstract class AuctionEventMqttListener { + + public abstract boolean handleEvent(MqttMessage message); +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/AuctionEventsMqttDispatcher.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/AuctionEventsMqttDispatcher.java new file mode 100644 index 0000000..91872f2 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/AuctionEventsMqttDispatcher.java @@ -0,0 +1,53 @@ +package ch.unisg.tapas.auctionhouse.adapter.in.messaging.mqtt; + +import org.eclipse.paho.client.mqttv3.*; + +import java.util.Hashtable; +import java.util.Map; +import java.util.Set; + +/** + * Dispatches MQTT messages for known topics to associated event listeners. Used in conjunction with + * {@link ch.unisg.tapas.auctionhouse.adapter.common.clients.TapasMqttClient}. + * + * This is where you would define MQTT topics and map them to event listeners (see + * {@link AuctionEventsMqttDispatcher#initRouter()}). + * + * This class is only provided as an example to help you bootstrap the project. You are welcomed to + * change this class as you see fit. + */ +public class AuctionEventsMqttDispatcher { + private final Map router; + + public AuctionEventsMqttDispatcher() { + this.router = new Hashtable<>(); + initRouter(); + } + + // TODO: Register here your topics and event listener adapters + private void initRouter() { + router.put("ch/unisg/tapas/executors/added", new ExecutorAddedEventListenerMqttAdapter()); + router.put("ch/unisg/tapas/executors/removed", new ExecutorRemovedEventListenerMqttAdapter()); + router.put("ch/unisg/tapas/auctions", new ExternalAuctionStartedEventListenerMqttAdapter()); + } + + /** + * Returns all topics registered with this dispatcher. + * + * @return the set of registered topics + */ + public Set getAllTopics() { + return router.keySet(); + } + + /** + * Dispatches an event received via MQTT for a given topic. + * + * @param topic the topic for which the MQTT message was received + * @param message the received MQTT message + */ + public void dispatchEvent(String topic, MqttMessage message) { + AuctionEventMqttListener listener = router.get(topic); + listener.handleEvent(message); + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/BidReceivedEventListenerMqttAdapter.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/BidReceivedEventListenerMqttAdapter.java new file mode 100644 index 0000000..29f45da --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/BidReceivedEventListenerMqttAdapter.java @@ -0,0 +1,52 @@ +package ch.unisg.tapas.auctionhouse.adapter.in.messaging.mqtt; + +import ch.unisg.tapas.auctionhouse.application.handler.BidReceivedHandler; +import ch.unisg.tapas.auctionhouse.application.handler.ExecutorAddedHandler; +import ch.unisg.tapas.auctionhouse.application.port.in.ExecutorAddedEvent; +import ch.unisg.tapas.auctionhouse.domain.Auction; +import ch.unisg.tapas.auctionhouse.domain.Bid; +import ch.unisg.tapas.auctionhouse.application.port.in.BidReceivedEvent; +import ch.unisg.tapas.auctionhouse.domain.ExecutorRegistry; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.eclipse.paho.client.mqttv3.MqttMessage; + +import java.net.URI; + +public class BidReceivedEventListenerMqttAdapter extends AuctionEventMqttListener { + private static final Logger LOGGER = LogManager.getLogger(BidReceivedEventListenerMqttAdapter.class); + + @Override + public boolean handleEvent(MqttMessage message){ + String payload = new String(message.getPayload()); + + try { + // Note: this message representation is provided only as an example. You should use a + // representation that makes sense in the context of your application. + JsonNode data = new ObjectMapper().readTree(payload); + + String auctionId = data.get("auctionId").asText(); + String bidderName = data.get("bidderName").asText(); + String bidderAuctionHouseUri = data.get("bidderAuctionHouseUri").asText(); + String bidderTaskListUri = data.get("bidderTaskListUri").asText(); + + BidReceivedEvent bidReceivedEvent = new BidReceivedEvent( new Bid( + new Auction.AuctionId(auctionId), + new Bid.BidderName(bidderName), + new Bid.BidderAuctionHouseUri(URI.create(bidderAuctionHouseUri)), + new Bid.BidderTaskListUri(URI.create(bidderTaskListUri)) + )); + + BidReceivedHandler bidReceivedHandler = new BidReceivedHandler(); + bidReceivedHandler.handleNewBidReceivedEvent(bidReceivedEvent); + } catch (JsonProcessingException | NullPointerException e) { + LOGGER.error(e.getMessage(), e); + return false; + } + + return true; + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/ExecutorAddedEventListenerMqttAdapter.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/ExecutorAddedEventListenerMqttAdapter.java new file mode 100644 index 0000000..dd2d120 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/ExecutorAddedEventListenerMqttAdapter.java @@ -0,0 +1,50 @@ +package ch.unisg.tapas.auctionhouse.adapter.in.messaging.mqtt; + +import ch.unisg.tapas.auctionhouse.application.handler.ExecutorAddedHandler; +import ch.unisg.tapas.auctionhouse.application.port.in.ExecutorAddedEvent; +import ch.unisg.tapas.auctionhouse.domain.Auction; +import ch.unisg.tapas.auctionhouse.domain.ExecutorRegistry; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.eclipse.paho.client.mqttv3.MqttMessage; + +import java.net.URI; + +/** + * Listener that handles events when an executor was added to this TAPAS application. + * + * This class is only provided as an example to help you bootstrap the project. + */ +public class ExecutorAddedEventListenerMqttAdapter extends AuctionEventMqttListener { + private static final Logger LOGGER = LogManager.getLogger(ExecutorAddedEventListenerMqttAdapter.class); + + @Override + public boolean handleEvent(MqttMessage message) { + String payload = new String(message.getPayload()); + + try { + // Note: this message representation is provided only as an example. You should use a + // representation that makes sense in the context of your application. + JsonNode data = new ObjectMapper().readTree(payload); + + String executorUri = data.get("executorUri").asText(); + String executorTaskType = data.get("executorTaskType").asText(); + + ExecutorAddedEvent executorAddedEvent = new ExecutorAddedEvent( + new ExecutorRegistry.ExecutorUri(URI.create(executorUri)), + new Auction.AuctionedTaskType(executorTaskType) + ); + + ExecutorAddedHandler newExecutorHandler = new ExecutorAddedHandler(); + newExecutorHandler.handleNewExecutorEvent(executorAddedEvent); + } catch (JsonProcessingException | NullPointerException e) { + LOGGER.error(e.getMessage(), e); + return false; + } + + return true; + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/ExecutorRemovedEventListenerMqttAdapter.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/ExecutorRemovedEventListenerMqttAdapter.java new file mode 100644 index 0000000..4f4db7a --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/ExecutorRemovedEventListenerMqttAdapter.java @@ -0,0 +1,48 @@ +package ch.unisg.tapas.auctionhouse.adapter.in.messaging.mqtt; + +import ch.unisg.tapas.auctionhouse.application.handler.ExecutorRemovedHandler; +import ch.unisg.tapas.auctionhouse.application.port.in.ExecutorRemovedEvent; +import ch.unisg.tapas.auctionhouse.domain.Auction; +import ch.unisg.tapas.auctionhouse.domain.ExecutorRegistry; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.eclipse.paho.client.mqttv3.MqttMessage; + +import java.net.URI; + +/** + * Listener that handles events when an executor was removed to this TAPAS application. + * + * This class is only provided as an example to help you bootstrap the project. + */ +public class ExecutorRemovedEventListenerMqttAdapter extends AuctionEventMqttListener { + private static final Logger LOGGER = LogManager.getLogger(ExecutorRemovedEventListenerMqttAdapter.class); + + @Override + public boolean handleEvent(MqttMessage message) { + String payload = new String(message.getPayload()); + + try { + // Note: this messge representation is provided only as an example. You should use a + // representation that makes sense in the context of your application. + JsonNode data = new ObjectMapper().readTree(payload); + + String executorUri = data.get("executorUri").asText(); + + ExecutorRemovedEvent executorRemovedEvent = new ExecutorRemovedEvent( + new ExecutorRegistry.ExecutorUri(URI.create(executorUri)) + ); + + ExecutorRemovedHandler newExecutorHandler = new ExecutorRemovedHandler(); + newExecutorHandler.handleExecutorRemovedEvent(executorRemovedEvent); + } catch (JsonProcessingException | NullPointerException e) { + LOGGER.error(e.getMessage(), e); + return false; + } + + return true; + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/ExternalAuctionStartedEventListenerMqttAdapter.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/ExternalAuctionStartedEventListenerMqttAdapter.java new file mode 100644 index 0000000..5e17d96 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/ExternalAuctionStartedEventListenerMqttAdapter.java @@ -0,0 +1,86 @@ +package ch.unisg.tapas.auctionhouse.adapter.in.messaging.mqtt; + +import ch.unisg.tapas.auctionhouse.adapter.common.formats.BidJsonRepresentation; +import ch.unisg.tapas.auctionhouse.adapter.common.formats.TaskJsonRepresentation; +import ch.unisg.tapas.auctionhouse.application.handler.BidReceivedHandler; +import ch.unisg.tapas.auctionhouse.application.port.in.BidReceivedEvent; +import ch.unisg.tapas.auctionhouse.domain.Auction; +import ch.unisg.tapas.auctionhouse.domain.Bid; +import ch.unisg.tapas.auctionhouse.domain.ExecutorRegistry; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.eclipse.paho.client.mqttv3.MqttMessage; +import org.springframework.beans.factory.annotation.Value; + +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.sql.Timestamp; + +public class ExternalAuctionStartedEventListenerMqttAdapter extends AuctionEventMqttListener{ + private static final Logger LOGGER = LogManager.getLogger(ExternalAuctionStartedEventListenerMqttAdapter.class); + + @Value("${auction.house.uri}") + String auctionHouseURI; + + @Value("${tasks.list.uri}") + String taskListURI; + + @Override + public boolean handleEvent(MqttMessage message){ + String payload = new String(message.getPayload()); + + try { + // Note: this message representation is provided only as an example. You should use a + // representation that makes sense in the context of your application. + JsonNode data = new ObjectMapper().readTree(payload); + + String auctionId = data.get("auctionId").asText(); + String auctionHouseUri = data.get("auctionHouseUri").asText(); + String taskUri = data.get("taskUri").asText(); + String taskType = data.get("taskType").asText(); + String deadline = data.get("deadline").asText(); + + var capable = ExecutorRegistry.getInstance().containsTaskType(new Auction.AuctionedTaskType(taskType)); + // TODO check deadline + if(capable){ + var bid = new Bid( + new Auction.AuctionId(auctionId), + new Bid.BidderName("Group-1"), + new Bid.BidderAuctionHouseUri(URI.create(auctionHouseUri)), + new Bid.BidderTaskListUri(URI.create(taskListURI)) + ); + + String body = BidJsonRepresentation.serialize(bid); + LOGGER.info(body); + var postURI = URI.create(auctionHouseUri + "/bid"); + HttpRequest postRequest = HttpRequest.newBuilder() + .uri(postURI) + .header("Content-Type", BidJsonRepresentation.MEDIA_TYPE) + .POST(HttpRequest.BodyPublishers.ofString(body)) + .build(); + + HttpClient client = HttpClient.newHttpClient(); + var postResponse = client.send(postRequest, HttpResponse.BodyHandlers.ofString()); + + LOGGER.info(postResponse.statusCode()); + } + } catch (JsonProcessingException | NullPointerException e) { + LOGGER.error(e.getMessage(), e); + return false; + } catch (IOException e) { + e.printStackTrace(); + } catch (InterruptedException e) { + e.printStackTrace(); + } catch (Exception e){ + LOGGER.error(e.getMessage(), e); + } + + return true; + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/websub/AuctionStartedEventListenerWebSubAdapter.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/websub/AuctionStartedEventListenerWebSubAdapter.java new file mode 100644 index 0000000..4f67dad --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/websub/AuctionStartedEventListenerWebSubAdapter.java @@ -0,0 +1,53 @@ +package ch.unisg.tapas.auctionhouse.adapter.in.messaging.websub; + +import ch.unisg.tapas.auctionhouse.adapter.common.formats.AuctionJsonRepresentation; +import ch.unisg.tapas.auctionhouse.application.handler.AuctionStartedHandler; +import ch.unisg.tapas.auctionhouse.application.port.in.AuctionStartedEvent; +import ch.unisg.tapas.auctionhouse.domain.Auction; +import ch.unisg.tapas.auctionhouse.domain.Auction.AuctionDeadline; +import ch.unisg.tapas.auctionhouse.domain.Auction.AuctionHouseUri; +import ch.unisg.tapas.auctionhouse.domain.Auction.AuctionId; +import ch.unisg.tapas.auctionhouse.domain.Auction.AuctionedTaskType; +import ch.unisg.tapas.auctionhouse.domain.Auction.AuctionedTaskUri; + +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Collection; + +import org.json.JSONArray; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +/** + * This class is a template for handling auction started events received via WebSub + */ +@RestController +public class AuctionStartedEventListenerWebSubAdapter { + private final AuctionStartedHandler auctionStartedHandler; + + public AuctionStartedEventListenerWebSubAdapter(AuctionStartedHandler auctionStartedHandler) { + this.auctionStartedHandler = auctionStartedHandler; + } + /** + * Controller which listens to auction-started callbacks + * @return 200 OK + * @throws URISyntaxException + **/ + @PostMapping(path = "/auction-started") + public ResponseEntity handleExecutorAddedEvent(@RequestBody Collection payload) throws URISyntaxException { + + for (AuctionJsonRepresentation auction : payload) { + auctionStartedHandler.handleAuctionStartedEvent( + new AuctionStartedEvent( + new Auction(new AuctionId(auction.getAuctionId()), + new AuctionHouseUri(new URI(auction.getAuctionHouseUri())), + new AuctionedTaskUri(new URI(auction.getTaskUri())), + new AuctionedTaskType(auction.getTaskType()), + new AuctionDeadline(auction.getDeadline())) + )); + } + + return new ResponseEntity<>(HttpStatus.OK); + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/websub/ValidateIntentWebSubAdapter.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/websub/ValidateIntentWebSubAdapter.java new file mode 100644 index 0000000..7bfb450 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/websub/ValidateIntentWebSubAdapter.java @@ -0,0 +1,33 @@ +package ch.unisg.tapas.auctionhouse.adapter.in.messaging.websub; + +import org.json.JSONObject; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +/** + * This class validates the subscription intent from the websub hub + */ +@RestController +public class ValidateIntentWebSubAdapter { + + @Value("${application.environment}") + private String environment; + + @GetMapping(path = "/auction-started") + public ResponseEntity validateIntent(@RequestParam("hub.challenge") String challenge) { + // Different implementation depending on local development or production + if (environment.equalsIgnoreCase("development")) { + HttpHeaders headers = new HttpHeaders(); + headers.add("Content-Type", "application/json"); + String body = new JSONObject() + .put("hub.challenge", challenge) + .toString(); + return new ResponseEntity<>(body, headers, HttpStatus.OK); + } else { + return new ResponseEntity<>(challenge, HttpStatus.OK); + } + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/web/AddBidWebController.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/web/AddBidWebController.java new file mode 100644 index 0000000..3431c8d --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/web/AddBidWebController.java @@ -0,0 +1,38 @@ +package ch.unisg.tapas.auctionhouse.adapter.in.web; + +import ch.unisg.tapas.auctionhouse.adapter.common.formats.AuctionJsonRepresentation; +import ch.unisg.tapas.auctionhouse.adapter.common.formats.BidJsonRepresentation; +import ch.unisg.tapas.auctionhouse.application.handler.BidReceivedHandler; +import ch.unisg.tapas.auctionhouse.application.port.in.BidReceivedEvent; +import ch.unisg.tapas.auctionhouse.domain.Auction; +import ch.unisg.tapas.auctionhouse.domain.Bid; +import org.springframework.http.HttpHeaders; +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 java.net.URI; + +// TODO Fix structure due to MQTT +@RestController +public class AddBidWebController { + @PostMapping(path = "/bid", consumes = BidJsonRepresentation.MEDIA_TYPE) + public ResponseEntity addBid(@RequestBody BidJsonRepresentation payload) { + BidReceivedEvent bidReceivedEvent = new BidReceivedEvent(new Bid( + new Auction.AuctionId(payload.getAuctionId()), + new Bid.BidderName(payload.getBidderName()), + new Bid.BidderAuctionHouseUri(URI.create(payload.getBidderAuctionHouseUri())), + new Bid.BidderTaskListUri(URI.create(payload.getBidderTaskListUri())) + )); + + BidReceivedHandler bidReceivedHandler = new BidReceivedHandler(); + bidReceivedHandler.handleNewBidReceivedEvent(bidReceivedEvent); + + HttpHeaders responseHeaders = new HttpHeaders(); + + return new ResponseEntity<>(responseHeaders, HttpStatus.NO_CONTENT); + } + +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/web/LaunchAuctionWebController.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/web/LaunchAuctionWebController.java new file mode 100644 index 0000000..c65631e --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/web/LaunchAuctionWebController.java @@ -0,0 +1,72 @@ +package ch.unisg.tapas.auctionhouse.adapter.in.web; + +import ch.unisg.tapas.auctionhouse.adapter.common.formats.AuctionJsonRepresentation; +import ch.unisg.tapas.auctionhouse.application.port.in.LaunchAuctionCommand; +import ch.unisg.tapas.auctionhouse.application.port.in.LaunchAuctionUseCase; +import ch.unisg.tapas.auctionhouse.domain.Auction; +import com.fasterxml.jackson.core.JsonProcessingException; +import org.springframework.http.HttpHeaders; +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 java.net.URI; + +/** + * Controller that handles HTTP requests for launching auctions. This controller implements the + * {@link LaunchAuctionUseCase} use case using the {@link LaunchAuctionCommand}. + */ +@RestController +public class LaunchAuctionWebController { + private final LaunchAuctionUseCase launchAuctionUseCase; + + /** + * Constructs the controller. + * + * @param launchAuctionUseCase an implementation of the launch auction use case + */ + public LaunchAuctionWebController(LaunchAuctionUseCase launchAuctionUseCase) { + this.launchAuctionUseCase = launchAuctionUseCase; + } + + /** + * Handles HTTP POST requests for launching auctions. Note: you are free to modify this handler + * as you see fit to reflect the discussions for the uniform HTTP API for the auction house. + * You should also ensure that this handler has the exact behavior you would expect from the + * defined uniform HTTP API (status codes, returned payload, HTTP headers, etc.) + * + * @param payload a representation of the auction to be launched + * @return + */ + @PostMapping(path = "/auctions/", consumes = AuctionJsonRepresentation.MEDIA_TYPE) + public ResponseEntity launchAuction(@RequestBody AuctionJsonRepresentation payload) { + Auction.AuctionDeadline deadline = (payload.getDeadline() == null) ? + null : new Auction.AuctionDeadline(payload.getDeadline()); + + LaunchAuctionCommand command = new LaunchAuctionCommand( + new Auction.AuctionedTaskUri(URI.create(payload.getTaskUri())), + new Auction.AuctionedTaskType(payload.getTaskType()), + deadline + ); + + // This command returns the created auction. We need the created auction to be able to + // include a representation of it in the HTTP response. + Auction auction = launchAuctionUseCase.launchAuction(command); + + try { + AuctionJsonRepresentation representation = new AuctionJsonRepresentation(auction); + String auctionJson = AuctionJsonRepresentation.serialize(auction); + + HttpHeaders responseHeaders = new HttpHeaders(); + responseHeaders.add(HttpHeaders.CONTENT_TYPE, AuctionJsonRepresentation.MEDIA_TYPE); + + // Return a 201 Created status code and a representation of the created auction + return new ResponseEntity<>(auctionJson, responseHeaders, HttpStatus.CREATED); + } catch (JsonProcessingException e) { + throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR); + } + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/web/RetrieveOpenAuctionsWebController.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/web/RetrieveOpenAuctionsWebController.java new file mode 100644 index 0000000..c96a919 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/web/RetrieveOpenAuctionsWebController.java @@ -0,0 +1,58 @@ +package ch.unisg.tapas.auctionhouse.adapter.in.web; + +import ch.unisg.tapas.auctionhouse.adapter.common.formats.AuctionJsonRepresentation; +import ch.unisg.tapas.auctionhouse.application.port.in.RetrieveOpenAuctionsQuery; +import ch.unisg.tapas.auctionhouse.application.port.in.RetrieveOpenAuctionsUseCase; +import ch.unisg.tapas.auctionhouse.domain.Auction; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ArrayNode; +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.RestController; + +import java.util.Collection; + +/** + * Controller that handles HTTP requests for retrieving auctions hosted by this auction house that + * are open for bids. This controller implements the {@link RetrieveOpenAuctionsUseCase} use case + * using the {@link RetrieveOpenAuctionsQuery}. + */ +@RestController +public class RetrieveOpenAuctionsWebController { + private final RetrieveOpenAuctionsUseCase retrieveAuctionListUseCase; + + public RetrieveOpenAuctionsWebController(RetrieveOpenAuctionsUseCase retrieveAuctionListUseCase) { + this.retrieveAuctionListUseCase = retrieveAuctionListUseCase; + } + + /** + * Handles HTTP GET requests to retrieve the auctions that are open. Note: you are free to modify + * this handler as you see fit to reflect the discussions for the uniform HTTP API for the + * auction house. You should also ensure that this handler has the exact behavior you would expect + * from the defined uniform HTTP API (status codes, returned payload, HTTP headers, etc.). + * + * @return a representation of a collection with the auctions that are open for bids + */ + @GetMapping(path = "/auctions/") + public ResponseEntity retrieveOpenAuctions() { + Collection auctions = + retrieveAuctionListUseCase.retrieveAuctions(new RetrieveOpenAuctionsQuery()); + + ObjectMapper mapper = new ObjectMapper(); + ArrayNode array = mapper.createArrayNode(); + + for (Auction auction : auctions) { + AuctionJsonRepresentation representation = new AuctionJsonRepresentation(auction); + JsonNode node = mapper.valueToTree(representation); + array.add(node); + } + + HttpHeaders responseHeaders = new HttpHeaders(); + responseHeaders.add(HttpHeaders.CONTENT_TYPE, "application/json"); + + return new ResponseEntity<>(array.toString(), responseHeaders, HttpStatus.OK); + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/web/WinningBidWebController.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/web/WinningBidWebController.java new file mode 100644 index 0000000..9d252b5 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/web/WinningBidWebController.java @@ -0,0 +1,59 @@ +package ch.unisg.tapas.auctionhouse.adapter.in.web; + +import ch.unisg.tapas.auctionhouse.adapter.common.formats.AuctionJsonRepresentation; +import ch.unisg.tapas.auctionhouse.adapter.common.formats.BidJsonRepresentation; +import ch.unisg.tapas.auctionhouse.adapter.common.formats.TaskJsonRepresentation; +import ch.unisg.tapas.auctionhouse.adapter.in.messaging.mqtt.ExternalAuctionStartedEventListenerMqttAdapter; +import ch.unisg.tapas.auctionhouse.domain.Task; +import com.fasterxml.jackson.core.JsonProcessingException; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpHeaders; +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 java.io.IOException; +import java.net.URI; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; + +@RestController +public class WinningBidWebController { + private static final Logger LOGGER = LogManager.getLogger(WinningBidWebController.class); + + @Value("${tasks.list.uri}") + String taskListURI; + + @PostMapping(path = "/taskwinner", consumes = TaskJsonRepresentation.MEDIA_TYPE) + public ResponseEntity winningBid(@RequestBody TaskJsonRepresentation payload){ + try { + var body = payload.serialize(); + LOGGER.info(body); + var postURI = URI.create(taskListURI + "/tasks/"); + HttpRequest postRequest = HttpRequest.newBuilder() + .uri(postURI) + .header("Content-Type", TaskJsonRepresentation.MEDIA_TYPE) + .POST(HttpRequest.BodyPublishers.ofString(body)) + .build(); + + HttpClient client = HttpClient.newHttpClient(); + var postResponse = client.send(postRequest, HttpResponse.BodyHandlers.ofString()); + + LOGGER.info(postResponse.statusCode()); + + + HttpHeaders responseHeaders = new HttpHeaders(); + return new ResponseEntity<>(responseHeaders, HttpStatus.NO_CONTENT); + } + catch ( + IOException | InterruptedException e) { + throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, e.getMessage()); + } + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/out/messaging/mqtt/PublishAuctionStartedEventMqttAdapter.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/out/messaging/mqtt/PublishAuctionStartedEventMqttAdapter.java new file mode 100644 index 0000000..a041b4f --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/out/messaging/mqtt/PublishAuctionStartedEventMqttAdapter.java @@ -0,0 +1,36 @@ +package ch.unisg.tapas.auctionhouse.adapter.out.messaging.mqtt; + +import ch.unisg.tapas.auctionhouse.adapter.common.clients.TapasMqttClient; +import ch.unisg.tapas.auctionhouse.adapter.common.formats.AuctionJsonRepresentation; +import ch.unisg.tapas.auctionhouse.adapter.in.messaging.mqtt.AuctionEventsMqttDispatcher; +import ch.unisg.tapas.auctionhouse.application.port.out.AuctionStartedEventPort; +import ch.unisg.tapas.auctionhouse.domain.AuctionStartedEvent; +import ch.unisg.tapas.common.ConfigProperties; +import com.fasterxml.jackson.core.JsonProcessingException; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.eclipse.paho.client.mqttv3.MqttException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Primary; +import org.springframework.stereotype.Component; + +@Component +@Primary +public class PublishAuctionStartedEventMqttAdapter implements AuctionStartedEventPort { + + private static final Logger LOGGER = LogManager.getLogger(PublishAuctionStartedEventMqttAdapter.class); + + @Autowired + private ConfigProperties config; + + @Override + public void publishAuctionStartedEvent(AuctionStartedEvent event) { + try{ + var mqttClient = TapasMqttClient.getInstance(config.getMqttBrokerUri().toString(), new AuctionEventsMqttDispatcher()); + mqttClient.publishMessage("ch/unisg/tapas/auctions", AuctionJsonRepresentation.serialize(event.getAuction())); + } + catch (MqttException | JsonProcessingException e){ + LOGGER.error(e.getMessage(), e); + } + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/out/messaging/websub/PublishAuctionStartedEventWebSubAdapter.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/out/messaging/websub/PublishAuctionStartedEventWebSubAdapter.java new file mode 100644 index 0000000..228f43b --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/out/messaging/websub/PublishAuctionStartedEventWebSubAdapter.java @@ -0,0 +1,72 @@ +package ch.unisg.tapas.auctionhouse.adapter.out.messaging.websub; + +import ch.unisg.tapas.auctionhouse.application.port.out.AuctionStartedEventPort; +import ch.unisg.tapas.auctionhouse.domain.Auction; +import ch.unisg.tapas.auctionhouse.domain.AuctionStartedEvent; +import ch.unisg.tapas.common.ConfigProperties; + +import org.json.JSONObject; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Primary; +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Component; + +import java.io.IOException; +import java.net.URI; +import java.net.URLEncoder; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.stream.Collectors; + +/** + * This class is a template for publishing auction started events via WebSub. + */ +@Component +public class PublishAuctionStartedEventWebSubAdapter implements AuctionStartedEventPort { + // You can use this object to retrieve properties from application.properties, e.g. the + // WebSub hub publish endpoint, etc. + @Autowired + private ConfigProperties config; + + @Value("${auctionhouse.uri}") + private String auctionHouseUri; + + @Value("${websub.hub.uri}") + private String webSubHubUri; + + Logger logger = Logger.getLogger(PublishAuctionStartedEventWebSubAdapter.class.getName()); + + @Override + public void publishAuctionStartedEvent(AuctionStartedEvent event) { + HttpClient client = HttpClient.newHttpClient(); + + String body = new JSONObject() + .put("hub.url", auctionHouseUri + "/auctions") + .put("hub.mode", "publish") + .toString(); + + + HttpRequest request = HttpRequest.newBuilder() + .uri(URI.create(webSubHubUri)) + .header("Content-Type", "application/json") + .POST(HttpRequest.BodyPublishers.ofString(body)) + .build(); + + + try { + client.send(request, HttpResponse.BodyHandlers.ofString()); + } catch (InterruptedException e) { + logger.log(Level.SEVERE, e.getLocalizedMessage(), e); + Thread.currentThread().interrupt(); + } catch (IOException e) { + logger.log(Level.SEVERE, e.getLocalizedMessage(), e); + } + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/out/web/AuctionWonEventHttpAdapter.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/out/web/AuctionWonEventHttpAdapter.java new file mode 100644 index 0000000..4583892 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/out/web/AuctionWonEventHttpAdapter.java @@ -0,0 +1,80 @@ +package ch.unisg.tapas.auctionhouse.adapter.out.web; + +import ch.unisg.tapas.auctionhouse.adapter.common.formats.TaskJsonRepresentation; +import ch.unisg.tapas.auctionhouse.application.handler.AuctionStartedHandler; +import ch.unisg.tapas.auctionhouse.application.port.out.AuctionWonEventPort; +import ch.unisg.tapas.auctionhouse.domain.AuctionRegistry; +import ch.unisg.tapas.auctionhouse.domain.AuctionWonEvent; +import ch.unisg.tapas.auctionhouse.domain.Task; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.json.JSONObject; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Primary; +import org.springframework.stereotype.Component; + +import java.io.IOException; +import java.net.URI; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; + +/** + * This class is a template for sending auction won events via HTTP. This class was created here only + * as a placeholder, it is up to you to decide how such events should be sent (e.g., via HTTP, + * WebSub, etc.). + */ +@Component +@Primary +public class AuctionWonEventHttpAdapter implements AuctionWonEventPort { + private static final Logger LOGGER = LogManager.getLogger(AuctionWonEventHttpAdapter.class); + + @Value("${tasks.list.uri}") + String server; + + @Override + public void publishAuctionWonEvent(AuctionWonEvent event) { + + try{ + var auction = AuctionRegistry.getInstance().getAuctionById(event.getWinningBid().getAuctionId()); + + HttpClient client = HttpClient.newHttpClient(); + HttpRequest request = HttpRequest.newBuilder() + .uri(auction.get().getTaskUri().getValue()) + .GET() + .build(); + var response = client.send(request, HttpResponse.BodyHandlers.ofString()); + LOGGER.info(response.body()); + JSONObject responseBody = new JSONObject(response.body()); + + var task = new Task( + new Task.TaskName(responseBody.getString("taskName")), + new Task.TaskType(responseBody.getString("taskType")), + new Task.OriginalTaskUri(auction.get().getTaskUri().getValue().toString()), + new Task.TaskStatus(ch.unisg.tapas.auctionhouse.domain.Task.Status.ASSIGNED), + new Task.TaskId(responseBody.getString("taskId")), + new Task.InputData(responseBody.getString("inputData")), + new Task.ServiceProvider("TODO") + ); + + String body = TaskJsonRepresentation.serialize(task); + LOGGER.info(body); + var postURI = URI.create(auction.get().getAuctionHouseUri().getValue().toString() + "/taskwinner"); + HttpRequest postRequest = HttpRequest.newBuilder() + .uri(postURI) + .header("Content-Type", TaskJsonRepresentation.MEDIA_TYPE) + .POST(HttpRequest.BodyPublishers.ofString(body)) + .build(); + + var postResponse = client.send(request, HttpResponse.BodyHandlers.ofString()); + + LOGGER.info(postResponse.statusCode()); + } catch (IOException e) { + e.printStackTrace(); + } catch (InterruptedException e) { + e.printStackTrace(); + } catch (Exception e){ + LOGGER.error(e.getMessage(), e); + } + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/out/web/PlaceBidForAuctionCommandHttpAdapter.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/out/web/PlaceBidForAuctionCommandHttpAdapter.java new file mode 100644 index 0000000..6db8c68 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/out/web/PlaceBidForAuctionCommandHttpAdapter.java @@ -0,0 +1,19 @@ +package ch.unisg.tapas.auctionhouse.adapter.out.web; + +import ch.unisg.tapas.auctionhouse.application.port.out.PlaceBidForAuctionCommand; +import ch.unisg.tapas.auctionhouse.application.port.out.PlaceBidForAuctionCommandPort; +import org.springframework.context.annotation.Primary; +import org.springframework.stereotype.Component; + +/** + * This class is a tempalte for implementing a place bid for auction command via HTTP. + */ +@Component +@Primary +public class PlaceBidForAuctionCommandHttpAdapter implements PlaceBidForAuctionCommandPort { + + @Override + public void placeBid(PlaceBidForAuctionCommand command) { + // TODO + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/handler/AuctionStartedHandler.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/handler/AuctionStartedHandler.java new file mode 100644 index 0000000..e4b312f --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/handler/AuctionStartedHandler.java @@ -0,0 +1,59 @@ +package ch.unisg.tapas.auctionhouse.application.handler; + +import ch.unisg.tapas.auctionhouse.application.port.in.AuctionStartedEvent; +import ch.unisg.tapas.auctionhouse.application.port.in.AuctionStartedEventHandler; +import ch.unisg.tapas.auctionhouse.application.port.out.PlaceBidForAuctionCommand; +import ch.unisg.tapas.auctionhouse.application.port.out.PlaceBidForAuctionCommandPort; +import ch.unisg.tapas.auctionhouse.domain.Auction; +import ch.unisg.tapas.auctionhouse.domain.Bid; +import ch.unisg.tapas.auctionhouse.domain.ExecutorRegistry; +import ch.unisg.tapas.common.ConfigProperties; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * Handler for auction started events. This handler will automatically bid in any auction for a + * task of known type, i.e. a task for which the auction house knows an executor is available. + */ +@Component +public class AuctionStartedHandler implements AuctionStartedEventHandler { + private static final Logger LOGGER = LogManager.getLogger(AuctionStartedHandler.class); + + @Autowired + private ConfigProperties config; + + @Autowired + private PlaceBidForAuctionCommandPort placeBidForAuctionCommandPort; + + /** + * Handles an auction started event and bids in all auctions for tasks of known types. + * + * @param auctionStartedEvent the auction started domain event + * @return true unless a runtime exception occurs + */ + @Override + public boolean handleAuctionStartedEvent(AuctionStartedEvent auctionStartedEvent) { + Auction auction = auctionStartedEvent.getAuction(); + + if (ExecutorRegistry.getInstance().containsTaskType(auction.getTaskType())) { + LOGGER.info("Placing bid for task " + auction.getTaskUri() + " of type " + + auction.getTaskType() + " in auction " + auction.getAuctionId() + + " from auction house " + auction.getAuctionHouseUri().getValue().toString()); + + Bid bid = new Bid(auction.getAuctionId(), + new Bid.BidderName(config.getGroupName()), + new Bid.BidderAuctionHouseUri(config.getAuctionHouseUri()), + new Bid.BidderTaskListUri(config.getTaskListUri()) + ); + + PlaceBidForAuctionCommand command = new PlaceBidForAuctionCommand(auction, bid); + placeBidForAuctionCommandPort.placeBid(command); + } else { + LOGGER.info("Cannot execute this task type: " + auction.getTaskType().getValue()); + } + + return true; + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/handler/BidReceivedHandler.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/handler/BidReceivedHandler.java new file mode 100644 index 0000000..dc992ac --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/handler/BidReceivedHandler.java @@ -0,0 +1,17 @@ +package ch.unisg.tapas.auctionhouse.application.handler; + +import ch.unisg.tapas.auctionhouse.application.port.in.BidReceivedEvent; +import ch.unisg.tapas.auctionhouse.application.port.in.BidReceivedEventHandler; +import ch.unisg.tapas.auctionhouse.domain.AuctionRegistry; +import org.springframework.stereotype.Component; + +@Component +public class BidReceivedHandler implements BidReceivedEventHandler { + @Override + public boolean handleNewBidReceivedEvent(BidReceivedEvent bidReceivedEvent){ + var auction = AuctionRegistry.getInstance().getAuctionById(bidReceivedEvent.bid.getAuctionId()); + // TODO Handle if auction not there + auction.get().addBid(bidReceivedEvent.bid); + return true; + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/handler/ExecutorAddedHandler.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/handler/ExecutorAddedHandler.java new file mode 100644 index 0000000..fc30e11 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/handler/ExecutorAddedHandler.java @@ -0,0 +1,16 @@ +package ch.unisg.tapas.auctionhouse.application.handler; + +import ch.unisg.tapas.auctionhouse.application.port.in.ExecutorAddedEvent; +import ch.unisg.tapas.auctionhouse.application.port.in.ExecutorAddedEventHandler; +import ch.unisg.tapas.auctionhouse.domain.ExecutorRegistry; +import org.springframework.stereotype.Component; + +@Component +public class ExecutorAddedHandler implements ExecutorAddedEventHandler { + + @Override + public boolean handleNewExecutorEvent(ExecutorAddedEvent executorAddedEvent) { + return ExecutorRegistry.getInstance().addExecutor(executorAddedEvent.getTaskType(), + executorAddedEvent.getExecutorUri()); + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/handler/ExecutorRemovedHandler.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/handler/ExecutorRemovedHandler.java new file mode 100644 index 0000000..9a68da1 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/handler/ExecutorRemovedHandler.java @@ -0,0 +1,19 @@ +package ch.unisg.tapas.auctionhouse.application.handler; + +import ch.unisg.tapas.auctionhouse.application.port.in.ExecutorRemovedEvent; +import ch.unisg.tapas.auctionhouse.application.port.in.ExecutorRemovedEventHandler; +import ch.unisg.tapas.auctionhouse.domain.ExecutorRegistry; +import org.springframework.stereotype.Component; + +/** + * Handler for executor removed events. It removes the executor from this auction house's executor + * registry. + */ +@Component +public class ExecutorRemovedHandler implements ExecutorRemovedEventHandler { + + @Override + public boolean handleExecutorRemovedEvent(ExecutorRemovedEvent executorRemovedEvent) { + return ExecutorRegistry.getInstance().removeExecutor(executorRemovedEvent.getExecutorUri()); + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/AuctionStartedEvent.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/AuctionStartedEvent.java new file mode 100644 index 0000000..b937e26 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/AuctionStartedEvent.java @@ -0,0 +1,21 @@ +package ch.unisg.tapas.auctionhouse.application.port.in; + +import ch.unisg.tapas.auctionhouse.domain.Auction; +import ch.unisg.tapas.common.SelfValidating; +import lombok.Value; + +import javax.validation.constraints.NotNull; + +/** + * Event that notifies this auction house that an auction was started by another auction house. + */ +@Value +public class AuctionStartedEvent extends SelfValidating { + @NotNull + private final Auction auction; + + public AuctionStartedEvent(Auction auction) { + this.auction = auction; + this.validateSelf(); + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/AuctionStartedEventHandler.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/AuctionStartedEventHandler.java new file mode 100644 index 0000000..1eed1d9 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/AuctionStartedEventHandler.java @@ -0,0 +1,6 @@ +package ch.unisg.tapas.auctionhouse.application.port.in; + +public interface AuctionStartedEventHandler { + + boolean handleAuctionStartedEvent(AuctionStartedEvent auctionStartedEvent); +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/BidReceivedEvent.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/BidReceivedEvent.java new file mode 100644 index 0000000..560f50b --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/BidReceivedEvent.java @@ -0,0 +1,17 @@ +package ch.unisg.tapas.auctionhouse.application.port.in; + +import ch.unisg.tapas.auctionhouse.domain.Bid; +import ch.unisg.tapas.common.SelfValidating; +import lombok.Getter; + +import javax.validation.constraints.NotNull; + +public class BidReceivedEvent extends SelfValidating { + @NotNull + public Bid bid; + + public BidReceivedEvent(Bid bid){ + this.bid = bid; + validateSelf(); + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/BidReceivedEventHandler.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/BidReceivedEventHandler.java new file mode 100644 index 0000000..b17ac6b --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/BidReceivedEventHandler.java @@ -0,0 +1,5 @@ +package ch.unisg.tapas.auctionhouse.application.port.in; + +public interface BidReceivedEventHandler { + boolean handleNewBidReceivedEvent(BidReceivedEvent bidReceivedEvent); +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/ExecutorAddedEvent.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/ExecutorAddedEvent.java new file mode 100644 index 0000000..7d647e1 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/ExecutorAddedEvent.java @@ -0,0 +1,33 @@ +package ch.unisg.tapas.auctionhouse.application.port.in; + +import ch.unisg.tapas.auctionhouse.domain.Auction.AuctionedTaskType; +import ch.unisg.tapas.auctionhouse.domain.ExecutorRegistry; +import ch.unisg.tapas.auctionhouse.domain.ExecutorRegistry.ExecutorUri; +import ch.unisg.tapas.common.SelfValidating; +import lombok.Value; + +import javax.validation.constraints.NotNull; + +/** + * Event that notifies the auction house that an executor has been added to this TAPAS application. + */ +@Value +public class ExecutorAddedEvent extends SelfValidating { + @NotNull + private final ExecutorRegistry.ExecutorUri executorUri; + + @NotNull + private final AuctionedTaskType taskType; + + /** + * Constructs an executor added event. + * + * @param executorUri the identifier of the executor that was added to this TAPAS application + */ + public ExecutorAddedEvent(ExecutorUri executorUri, AuctionedTaskType taskType) { + this.executorUri = executorUri; + this.taskType = taskType; + + this.validateSelf(); + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/ExecutorAddedEventHandler.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/ExecutorAddedEventHandler.java new file mode 100644 index 0000000..ca82a1c --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/ExecutorAddedEventHandler.java @@ -0,0 +1,6 @@ +package ch.unisg.tapas.auctionhouse.application.port.in; + +public interface ExecutorAddedEventHandler { + + boolean handleNewExecutorEvent(ExecutorAddedEvent executorAddedEvent); +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/ExecutorRemovedEvent.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/ExecutorRemovedEvent.java new file mode 100644 index 0000000..a1633fe --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/ExecutorRemovedEvent.java @@ -0,0 +1,27 @@ +package ch.unisg.tapas.auctionhouse.application.port.in; + +import ch.unisg.tapas.auctionhouse.domain.ExecutorRegistry; +import ch.unisg.tapas.auctionhouse.domain.ExecutorRegistry.ExecutorUri; +import ch.unisg.tapas.common.SelfValidating; +import lombok.Value; + +import javax.validation.constraints.NotNull; + +/** + * Event that notifies the auction house that an executor has been removed from this TAPAS application. + */ +@Value +public class ExecutorRemovedEvent extends SelfValidating { + @NotNull + private final ExecutorUri executorUri; + + /** + * Constructs an executor removed event. + * + * @param executorUri + */ + public ExecutorRemovedEvent(ExecutorUri executorUri) { + this.executorUri = executorUri; + this.validateSelf(); + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/ExecutorRemovedEventHandler.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/ExecutorRemovedEventHandler.java new file mode 100644 index 0000000..6d92422 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/ExecutorRemovedEventHandler.java @@ -0,0 +1,6 @@ +package ch.unisg.tapas.auctionhouse.application.port.in; + +public interface ExecutorRemovedEventHandler { + + boolean handleExecutorRemovedEvent(ExecutorRemovedEvent executorRemovedEvent); +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/LaunchAuctionCommand.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/LaunchAuctionCommand.java new file mode 100644 index 0000000..626fa49 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/LaunchAuctionCommand.java @@ -0,0 +1,37 @@ +package ch.unisg.tapas.auctionhouse.application.port.in; + +import ch.unisg.tapas.auctionhouse.domain.Auction; +import ch.unisg.tapas.common.SelfValidating; +import lombok.Value; + +import javax.validation.constraints.NotNull; + +/** + * Command for launching an auction in this auction house. + */ +@Value +public class LaunchAuctionCommand extends SelfValidating { + @NotNull + private final Auction.AuctionedTaskUri taskUri; + + @NotNull + private final Auction.AuctionedTaskType taskType; + + private final Auction.AuctionDeadline deadline; + + /** + * Constructs the launch action command. + * + * @param taskUri the URI of the auctioned task + * @param taskType the type of the auctioned task + * @param deadline the deadline by which the auction should receive bids (can be null if none) + */ + public LaunchAuctionCommand(Auction.AuctionedTaskUri taskUri, Auction.AuctionedTaskType taskType, + Auction.AuctionDeadline deadline) { + this.taskUri = taskUri; + this.taskType = taskType; + this.deadline = deadline; + + this.validateSelf(); + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/LaunchAuctionUseCase.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/LaunchAuctionUseCase.java new file mode 100644 index 0000000..261240b --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/LaunchAuctionUseCase.java @@ -0,0 +1,8 @@ +package ch.unisg.tapas.auctionhouse.application.port.in; + +import ch.unisg.tapas.auctionhouse.domain.Auction; + +public interface LaunchAuctionUseCase { + + Auction launchAuction(LaunchAuctionCommand command); +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/RetrieveOpenAuctionsQuery.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/RetrieveOpenAuctionsQuery.java new file mode 100644 index 0000000..a77f267 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/RetrieveOpenAuctionsQuery.java @@ -0,0 +1,7 @@ +package ch.unisg.tapas.auctionhouse.application.port.in; + +/** + * Query used to retrieve open auctions. Although this query is empty, we model it to convey the + * domain semantics and to reduce coupling. + */ +public class RetrieveOpenAuctionsQuery { } diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/RetrieveOpenAuctionsUseCase.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/RetrieveOpenAuctionsUseCase.java new file mode 100644 index 0000000..4f94df2 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/in/RetrieveOpenAuctionsUseCase.java @@ -0,0 +1,10 @@ +package ch.unisg.tapas.auctionhouse.application.port.in; + +import ch.unisg.tapas.auctionhouse.domain.Auction; + +import java.util.Collection; + +public interface RetrieveOpenAuctionsUseCase { + + Collection retrieveAuctions(RetrieveOpenAuctionsQuery query); +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/out/AuctionStartedEventPort.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/out/AuctionStartedEventPort.java new file mode 100644 index 0000000..9a432c9 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/out/AuctionStartedEventPort.java @@ -0,0 +1,11 @@ +package ch.unisg.tapas.auctionhouse.application.port.out; + +import ch.unisg.tapas.auctionhouse.domain.AuctionStartedEvent; + +/** + * Port for sending out auction started events + */ +public interface AuctionStartedEventPort { + + void publishAuctionStartedEvent(AuctionStartedEvent event); +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/out/AuctionWonEventPort.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/out/AuctionWonEventPort.java new file mode 100644 index 0000000..7ed440f --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/out/AuctionWonEventPort.java @@ -0,0 +1,11 @@ +package ch.unisg.tapas.auctionhouse.application.port.out; + +import ch.unisg.tapas.auctionhouse.domain.AuctionWonEvent; + +/** + * Port for sending out auction won events + */ +public interface AuctionWonEventPort { + + void publishAuctionWonEvent(AuctionWonEvent event); +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/out/PlaceBidForAuctionCommand.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/out/PlaceBidForAuctionCommand.java new file mode 100644 index 0000000..e207891 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/out/PlaceBidForAuctionCommand.java @@ -0,0 +1,25 @@ +package ch.unisg.tapas.auctionhouse.application.port.out; + +import ch.unisg.tapas.auctionhouse.domain.Auction; +import ch.unisg.tapas.auctionhouse.domain.Bid; +import ch.unisg.tapas.common.SelfValidating; +import lombok.Value; + +import javax.validation.constraints.NotNull; + +/** + * Command to place a bid for a given auction. + */ +@Value +public class PlaceBidForAuctionCommand extends SelfValidating { + @NotNull + private final Auction auction; + @NotNull + private final Bid bid; + + public PlaceBidForAuctionCommand(Auction auction, Bid bid) { + this.auction = auction; + this.bid = bid; + this.validateSelf(); + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/out/PlaceBidForAuctionCommandPort.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/out/PlaceBidForAuctionCommandPort.java new file mode 100644 index 0000000..3bf5a16 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/port/out/PlaceBidForAuctionCommandPort.java @@ -0,0 +1,6 @@ +package ch.unisg.tapas.auctionhouse.application.port.out; + +public interface PlaceBidForAuctionCommandPort { + + void placeBid(PlaceBidForAuctionCommand command); +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/service/RetrieveOpenAuctionsService.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/service/RetrieveOpenAuctionsService.java new file mode 100644 index 0000000..bdba393 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/service/RetrieveOpenAuctionsService.java @@ -0,0 +1,22 @@ +package ch.unisg.tapas.auctionhouse.application.service; + +import ch.unisg.tapas.auctionhouse.application.port.in.RetrieveOpenAuctionsQuery; +import ch.unisg.tapas.auctionhouse.application.port.in.RetrieveOpenAuctionsUseCase; +import ch.unisg.tapas.auctionhouse.domain.Auction; +import ch.unisg.tapas.auctionhouse.domain.AuctionRegistry; +import org.springframework.stereotype.Component; + +import java.util.Collection; + +/** + * Service that implements {@link RetrieveOpenAuctionsUseCase} to retrieve all auctions in this auction + * house that are open for bids. + */ +@Component +public class RetrieveOpenAuctionsService implements RetrieveOpenAuctionsUseCase { + + @Override + public Collection retrieveAuctions(RetrieveOpenAuctionsQuery query) { + return AuctionRegistry.getInstance().getOpenAuctions(); + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/service/StartAuctionService.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/service/StartAuctionService.java new file mode 100644 index 0000000..60c5f24 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/service/StartAuctionService.java @@ -0,0 +1,115 @@ +package ch.unisg.tapas.auctionhouse.application.service; + +import ch.unisg.tapas.auctionhouse.application.port.in.LaunchAuctionCommand; +import ch.unisg.tapas.auctionhouse.application.port.in.LaunchAuctionUseCase; +import ch.unisg.tapas.auctionhouse.application.port.in.LaunchAuctionUseCase; +import ch.unisg.tapas.auctionhouse.application.port.out.AuctionWonEventPort; +import ch.unisg.tapas.auctionhouse.application.port.out.AuctionStartedEventPort; +import ch.unisg.tapas.auctionhouse.domain.*; +import ch.unisg.tapas.common.ConfigProperties; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.sql.Timestamp; +import java.util.Optional; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; + +/** + * Service that implements the {@link LaunchAuctionUseCase} to start an auction. If a deadline is + * specified for the auction, the service automatically closes the auction at the deadline. If a + * deadline is not specified, the service closes the auction after 10s by default. + */ +@Component +public class StartAuctionService implements LaunchAuctionUseCase { + private static final Logger LOGGER = LogManager.getLogger(StartAuctionService.class); + + private final Timestamp DEFAULT_AUCTION_DEADLINE_MILLIS = Timestamp.valueOf("1970-01-01 00:00:01"); + + // Event port used to publish an auction started event + private final AuctionStartedEventPort auctionStartedEventPort; + // Event port used to publish an auction won event + private final AuctionWonEventPort auctionWonEventPort; + + private final ScheduledExecutorService service; + private final AuctionRegistry auctions; + + @Autowired + private ConfigProperties config; + + public StartAuctionService(AuctionStartedEventPort auctionStartedEventPort, + AuctionWonEventPort auctionWonEventPort) { + this.auctionStartedEventPort = auctionStartedEventPort; + this.auctionWonEventPort = auctionWonEventPort; + this.auctions = AuctionRegistry.getInstance(); + this.service = Executors.newScheduledThreadPool(1); + } + + /** + * Launches an auction. + * + * @param command the domain command used to launch the auction (see {@link LaunchAuctionCommand}) + * @return the launched auction + */ + @Override + public Auction launchAuction(LaunchAuctionCommand command) { + Auction.AuctionDeadline deadline = (command.getDeadline() == null) ? + new Auction.AuctionDeadline(DEFAULT_AUCTION_DEADLINE_MILLIS) : command.getDeadline(); + + // Create a new auction and add it to the auction registry + Auction auction = new Auction(new Auction.AuctionHouseUri(config.getAuctionHouseUri()), + command.getTaskUri(), command.getTaskType(), deadline); + auctions.addAuction(auction); + + // Schedule the closing of the auction at the deadline + service.schedule(new CloseAuctionTask(auction.getAuctionId()), deadline.getValue().getTime() - System.currentTimeMillis(), + TimeUnit.MILLISECONDS); + + // Publish an auction started event + AuctionStartedEvent auctionStartedEvent = new AuctionStartedEvent(auction); + auctionStartedEventPort.publishAuctionStartedEvent(auctionStartedEvent); + + return auction; + } + + /** + * This task closes the auction at the deadline and selects a winner if any bids were placed. It + * also sends out associated events and commands. + */ + private class CloseAuctionTask implements Runnable { + Auction.AuctionId auctionId; + + public CloseAuctionTask(Auction.AuctionId auctionId) { + this.auctionId = auctionId; + } + + @Override + public void run() { + Optional auctionOpt = auctions.getAuctionById(auctionId); + + if (auctionOpt.isPresent()) { + Auction auction = auctionOpt.get(); + Optional bid = auction.selectBid(); + + // Close the auction + auction.close(); + + if (bid.isPresent()) { + // Notify the bidder + Bid.BidderName bidderName = bid.get().getBidderName(); + LOGGER.info("Auction #" + auction.getAuctionId().getValue() + " for task " + + auction.getTaskUri().getValue() + " won by " + bidderName.getValue()); + + // Send an auction won event for the winning bid + auctionWonEventPort.publishAuctionWonEvent(new AuctionWonEvent(bid.get())); + } else { + LOGGER.info("Auction #" + auction.getAuctionId().getValue() + " ended with no bids for task " + + auction.getTaskUri().getValue()); + } + } + } + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/domain/Auction.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/domain/Auction.java new file mode 100644 index 0000000..c6d9333 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/domain/Auction.java @@ -0,0 +1,172 @@ +package ch.unisg.tapas.auctionhouse.domain; + +import lombok.Getter; +import lombok.Value; + +import java.net.URI; +import java.sql.Timestamp; +import java.util.*; + +/** + * Domain entity that models an auction. + */ +public class Auction { + // Auctions have two possible states: + // - open: waiting for bids + // - closed: the auction deadline has expired, there may or may not be a winning bid + public enum Status { + OPEN, CLOSED + } + + // One way to generate auction identifiers is incremental starting from 1. This makes identifiers + // predictable, which can help with debugging when multiple parties are interacting, but it also + // means that auction identifiers are not universally unique unless they are part of a URI. + // An alternative would be to use UUIDs (see constructor). + private static long AUCTION_COUNTER = 1; + + @Getter + private AuctionId auctionId; + + @Getter + private AuctionStatus auctionStatus; + + // URI that identifies the auction house that started this auction. Given a uniform, standard + // HTTP API for auction houses, this URI can then be used as a base URI for interacting with + // the identified auction house. + @Getter + private final AuctionHouseUri auctionHouseUri; + + // URI that identifies the task for which the auction was launched. URIs are uniform identifiers + // and can be referenced independent of context: because we have defined a uniform HTTP API for + // TAPAS-Tasks, we can dereference this URI to retrieve a complete representation of the + // auctioned task. + @Getter + private final AuctionedTaskUri taskUri; + + // The type of the task being auctioned. We could also retrieve the task type by dereferencing + // the task's URI, but given that the bidding is defined primarily based on task types, knowing + // the task type avoids an additional HTTP request. + @Getter + private final AuctionedTaskType taskType; + + // The deadline by which bids can be placed. Once the deadline expires, the auction is closed. + @Getter + private final AuctionDeadline deadline; + + // Available bids. + @Getter + private final List bids; + + /** + * Constructs an auction. + * + * @param auctionHouseUri the URI of the auction hause that started the auction + * @param taskUri the URI of the task being auctioned + * @param taskType the type of the task being auctioned + * @param deadline the deadline by which the auction is open for bids + */ + public Auction(AuctionHouseUri auctionHouseUri, AuctionedTaskUri taskUri, + AuctionedTaskType taskType, AuctionDeadline deadline) { + // Generates an incremental identifier + this.auctionId = new AuctionId("" + AUCTION_COUNTER ++); + // As an alternative, we could also generate an UUID + // this.auctionId = new AuctionId(UUID.randomUUID().toString()); + + this.auctionStatus = new AuctionStatus(Status.OPEN); + + this.auctionHouseUri = auctionHouseUri; + this.taskUri = taskUri; + this.taskType = taskType; + + this.deadline = deadline; + this.bids = new ArrayList<>(); + } + + /** + * Constructs an auction. + * + * @param auctionId the identifier of the auction + * @param auctionHouseUri the URI of the auction hause that started the auction + * @param taskUri the URI of the task being auctioned + * @param taskType the type of the task being auctioned + * @param deadline the deadline by which the auction is open for bids + */ + public Auction(AuctionId auctionId, AuctionHouseUri auctionHouseUri, AuctionedTaskUri taskUri, + AuctionedTaskType taskType, AuctionDeadline deadline) { + this(auctionHouseUri, taskUri, taskType, deadline); + this.auctionId = auctionId; + } + + /** + * Places a bid for this auction. + * + * @param bid the bid + */ + public void addBid(Bid bid) { + bids.add(bid); + } + + /** + * Selects a bid randomly from the bids available for this auction. + * + * @return a winning bid or Optional.empty if no bid was made in this auction. + */ + public Optional selectBid() { + if (bids.isEmpty()) { + return Optional.empty(); + } + + int index = new Random().nextInt(bids.size()); + return Optional.of(bids.get(index)); + } + + /** + * Checks if the auction is open for bids. + * + * @return true if open for bids, false if the auction is closed + */ + public boolean isOpen() { + return auctionStatus.getValue() == Status.OPEN; + } + + /** + * Closes the auction. Called by the StartAuctionService after the auction deadline has expired. + */ + public void close() { + auctionStatus = new AuctionStatus(Status.CLOSED); + } + + /* + * Definitions of Value Objects + */ + + @Value + public static class AuctionId { + String value; + } + + @Value + public static class AuctionStatus { + Status value; + } + + @Value + public static class AuctionHouseUri { + URI value; + } + + @Value + public static class AuctionedTaskUri { + URI value; + } + + @Value + public static class AuctionedTaskType { + String value; + } + + @Value + public static class AuctionDeadline { + Timestamp value; + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/domain/AuctionRegistry.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/domain/AuctionRegistry.java new file mode 100644 index 0000000..858589d --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/domain/AuctionRegistry.java @@ -0,0 +1,105 @@ +package ch.unisg.tapas.auctionhouse.domain; + +import java.util.Collection; +import java.util.Hashtable; +import java.util.Map; +import java.util.Optional; +import java.util.stream.Collectors; + +/** + * Registry that keeps an in-memory history of auctions (both open for bids and closed). This class + * is a singleton. See also {@link Auction}. + */ +public class AuctionRegistry { + private static AuctionRegistry registry; + + private final Map auctions; + + private AuctionRegistry() { + this.auctions = new Hashtable<>(); + } + + /** + * Retrieves a reference to the auction registry. + * + * @return the auction registry + */ + public static synchronized AuctionRegistry getInstance() { + if (registry == null) { + registry = new AuctionRegistry(); + } + + return registry; + } + + /** + * Adds a new auction to the registry + * @param auction the new auction + */ + public void addAuction(Auction auction) { + auctions.put(auction.getAuctionId(), auction); + } + + /** + * Places a bid. See also {@link Bid}. + * + * @param bid the bid to be placed. + * @return false if the bid is for an auction with an unknown identifier, true otherwise + */ + public boolean placeBid(Bid bid) { + if (!containsAuctionWithId(bid.getAuctionId())) { + return false; + } + + Auction auction = getAuctionById(bid.getAuctionId()).get(); + auction.addBid(bid); + auctions.put(bid.getAuctionId(), auction); + + return true; + } + + /** + * Checks if the registry contains an auction with the given identifier. + * + * @param auctionId the auction's identifier + * @return true if the registry contains an auction with the given identifier, false otherwise + */ + public boolean containsAuctionWithId(Auction.AuctionId auctionId) { + return auctions.containsKey(auctionId); + } + + /** + * Retrieves the auction with the given identifier if it exists. + * + * @param auctionId the auction's identifier + * @return the auction or Optional.empty if the identifier is unknown + */ + public Optional getAuctionById(Auction.AuctionId auctionId) { + if (containsAuctionWithId(auctionId)) { + return Optional.of(auctions.get(auctionId)); + } + + return Optional.empty(); + } + + /** + * Retrieves all auctions in the registry. + * + * @return a collection with all auctions + */ + public Collection getAllAuctions() { + return auctions.values(); + } + + /** + * Retrieves only the auctions that are open for bids. + * + * @return a collection with all open auctions + */ + public Collection getOpenAuctions() { + return getAllAuctions() + .stream() + .filter(auction -> auction.isOpen()) + .collect(Collectors.toList()); + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/domain/AuctionStartedEvent.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/domain/AuctionStartedEvent.java new file mode 100644 index 0000000..7cac1ec --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/domain/AuctionStartedEvent.java @@ -0,0 +1,15 @@ +package ch.unisg.tapas.auctionhouse.domain; + +import lombok.Getter; + +/** + * A domain event that models an auction has started. + */ +public class AuctionStartedEvent { + @Getter + private Auction auction; + + public AuctionStartedEvent(Auction auction) { + this.auction = auction; + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/domain/AuctionWonEvent.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/domain/AuctionWonEvent.java new file mode 100644 index 0000000..484646c --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/domain/AuctionWonEvent.java @@ -0,0 +1,16 @@ +package ch.unisg.tapas.auctionhouse.domain; + +import lombok.Getter; + +/** + * A domain event that models an auction was won. + */ +public class AuctionWonEvent { + // The winning bid + @Getter + private Bid winningBid; + + public AuctionWonEvent(Bid winningBid) { + this.winningBid = winningBid; + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/domain/Bid.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/domain/Bid.java new file mode 100644 index 0000000..4f24f30 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/domain/Bid.java @@ -0,0 +1,66 @@ +package ch.unisg.tapas.auctionhouse.domain; + +import lombok.Getter; +import lombok.Value; + +import java.net.URI; + +/** + * Domain entity that models a bid. + */ +public class Bid { + // The identifier of the auction for which the bid is placed + @Getter + private final Auction.AuctionId auctionId; + + // The name of the bidder, i.e. the identifier of the TAPAS group + @Getter + private final BidderName bidderName; + + // URI that identifies the auction house of the bidder. Given a uniform, standard HTTP API for + // auction houses, this URI can then be used as a base URI for interacting with the auction house + // of the bidder. + @Getter + private final BidderAuctionHouseUri bidderAuctionHouseUri; + + // URI that identifies the TAPAS-Tasks task list of the bidder. Given a uniform, standard HTTP API + // for TAPAS-Tasks, this URI can then be used as a base URI for interacting with the list of tasks + // of the bidder, e.g. to delegate a task. + @Getter + private final BidderTaskListUri bidderTaskListUri; + + /** + * Constructs a bid. + * + * @param auctionId the identifier of the auction for which the bid is placed + * @param bidderName the name of the bidder, i.e. the identifier of the TAPAS group + * @param auctionHouseUri the URI of the bidder's auction house + * @param taskListUri the URI fo the bidder's list of tasks + */ + public Bid(Auction.AuctionId auctionId, BidderName bidderName, BidderAuctionHouseUri auctionHouseUri, + BidderTaskListUri taskListUri) { + this.auctionId = auctionId; + this.bidderName = bidderName; + this.bidderAuctionHouseUri = auctionHouseUri; + this.bidderTaskListUri = taskListUri; + } + + /* + * Definitions of Value Objects + */ + + @Value + public static class BidderName { + private String value; + } + + @Value + public static class BidderAuctionHouseUri { + private URI value; + } + + @Value + public static class BidderTaskListUri { + private URI value; + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/domain/ExecutorRegistry.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/domain/ExecutorRegistry.java new file mode 100644 index 0000000..1aedc80 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/domain/ExecutorRegistry.java @@ -0,0 +1,87 @@ +package ch.unisg.tapas.auctionhouse.domain; + +import lombok.Value; + +import java.net.URI; +import java.util.*; + +/** + * Registry that keeps a track of executors internal to the TAPAS application and the types of tasks + * they can achieve. One executor may correspond to multiple task types. This mapping is used when + * bidding for tasks: the auction house will only bid for tasks for which there is a known executor. + * This class is a singleton. + */ +public class ExecutorRegistry { + private static ExecutorRegistry registry; + + private final Map> executors; + + private ExecutorRegistry() { + this.executors = new Hashtable<>(); + } + + public static synchronized ExecutorRegistry getInstance() { + if (registry == null) { + registry = new ExecutorRegistry(); + } + + return registry; + } + + /** + * Adds an executor to the registry for a given task type. + * + * @param taskType the type of the task + * @param executorUri the executor's URI + * @return true unless a runtime exception occurs + */ + public boolean addExecutor(Auction.AuctionedTaskType taskType, ExecutorUri executorUri) { + Set taskTypeExecs = executors.getOrDefault(taskType, + Collections.synchronizedSet(new HashSet<>())); + + taskTypeExecs.add(executorUri); + executors.put(taskType, taskTypeExecs); + + return true; + } + + /** + * Removes an executor from the registry. The executor is disassociated from all known task types. + * + * @param executorUri the executor's URI + * @return true unless a runtime exception occurs + */ + public boolean removeExecutor(ExecutorUri executorUri) { + Iterator iterator = executors.keySet().iterator(); + + while (iterator.hasNext()) { + Auction.AuctionedTaskType taskType = iterator.next(); + Set set = executors.get(taskType); + + set.remove(executorUri); + + if (set.isEmpty()) { + iterator.remove(); + } + } + + return true; + } + + /** + * Checks if the registry contains an executor for a given task type. Used during an auction to + * decide if a bid should be placed. + * + * @param taskType the task type being auctioned + * @return + */ + public boolean containsTaskType(Auction.AuctionedTaskType taskType) { + return executors.containsKey(taskType); + } + + // Value Object for the executor identifier + @Value + public static class ExecutorUri { + URI value; + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/domain/Task.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/domain/Task.java new file mode 100644 index 0000000..3fd0d89 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/domain/Task.java @@ -0,0 +1,122 @@ +package ch.unisg.tapas.auctionhouse.domain; + +import lombok.Getter; +import lombok.Setter; +import lombok.Value; + +import java.util.UUID; + +/**This is a domain entity**/ +public class Task { + public enum Status { + OPEN, ASSIGNED, RUNNING, EXECUTED + } + + @Getter + private final TaskId taskId; + + @Getter + private final TaskName taskName; + + @Getter + private final TaskType taskType; + + @Getter @Setter + public TaskStatus taskStatus; // had to make public for CompleteTaskService + + @Getter + public TaskResult taskResult; // same as above + + @Getter + private final OriginalTaskUri originalTaskUri; + + @Getter @Setter + private ServiceProvider provider; + + @Getter @Setter + private InputData inputData; + + @Getter @Setter + private OutputData outputData; + + public Task(TaskName taskName, TaskType taskType, OriginalTaskUri taskUri) { + this.taskName = taskName; + this.taskType = taskType; + this.taskStatus = new TaskStatus(Status.OPEN); + this.taskId = new TaskId(UUID.randomUUID().toString()); + this.taskResult = new TaskResult(""); + this.originalTaskUri = taskUri; + + this.inputData = null; + this.outputData = null; + } + + public Task(TaskName taskName, TaskType taskType, OriginalTaskUri taskUri, TaskStatus taskStatus, TaskId taskId, InputData inputData, ServiceProvider serviceProvider) { + this.taskName = taskName; + this.taskType = taskType; + this.taskStatus = taskStatus; + this.taskId = taskId; + this.taskResult = new TaskResult(""); + this.originalTaskUri = taskUri; + this.provider = serviceProvider; + + this.inputData = inputData; + this.outputData = new OutputData(""); + } + + 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 + System.out.println("New Task: " + name.getValue() + " " + type.getValue()); + return new Task(name, type, null); + } + + protected static Task createTaskWithNameAndTypeAndOriginalTaskUri(TaskName name, TaskType type, + OriginalTaskUri originalTaskUri) { + return new Task(name, type, originalTaskUri); + } + + @Value + public static class TaskId { + String value; + } + + @Value + public static class TaskName { + String value; + } + + @Value + public static class TaskType { + String value; + } + + @Value + public static class OriginalTaskUri { + String value; + } + + @Value + public static class TaskStatus { + Status value; + } + + @Value + public static class ServiceProvider { + String value; + } + + @Value + public static class InputData { + String value; + } + + @Value + public static class OutputData { + String value; + } + + @Value + public static class TaskResult{ + private String value; + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/common/AuctionHouseResourceDirectory.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/common/AuctionHouseResourceDirectory.java new file mode 100644 index 0000000..c4809ef --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/common/AuctionHouseResourceDirectory.java @@ -0,0 +1,57 @@ +package ch.unisg.tapas.common; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; + +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.ArrayList; +import java.util.List; + +/** + * Class that wraps up the resource directory used to discover auction houses in Week 6. + */ +public class AuctionHouseResourceDirectory { + private final URI rdEndpoint; + + /** + * Constructs a resource directory for auction house given a known URI. + * + * @param rdEndpoint the based endpoint of the resource directory + */ + public AuctionHouseResourceDirectory(URI rdEndpoint) { + this.rdEndpoint = rdEndpoint; + } + + /** + * Retrieves the endpoints of all auctions houses registered with this directory. + * @return + */ + public List retrieveAuctionHouseEndpoints() { + List auctionHouseEndpoints = new ArrayList<>(); + + try { + HttpRequest request = HttpRequest.newBuilder() + .uri(rdEndpoint).GET().build(); + + HttpResponse response = HttpClient.newBuilder().build() + .send(request, HttpResponse.BodyHandlers.ofString()); + + // For simplicity, here we just hard code the current representation used by our + // resource directory for auction houses + ObjectMapper objectMapper = new ObjectMapper(); + JsonNode payload = objectMapper.readTree(response.body()); + + for (JsonNode node : payload) { + auctionHouseEndpoints.add(node.get("endpoint").asText()); + } + } catch (IOException | InterruptedException e) { + e.printStackTrace(); + } + + return auctionHouseEndpoints; + } +} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/common/ConfigProperties.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/common/ConfigProperties.java new file mode 100644 index 0000000..2933465 --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/common/ConfigProperties.java @@ -0,0 +1,74 @@ +package ch.unisg.tapas.common; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.env.Environment; +import org.springframework.stereotype.Component; + +import java.net.URI; + +/** + * Used to access properties provided via application.properties + */ +@Component +public class ConfigProperties { + @Autowired + private Environment environment; + + /** + * Retrieves the URI of the WebSub hub. In this project, we use a single WebSub hub, but we could + * use multiple. + * + * @return the URI of the WebSub hub + */ + public URI getWebSubHub() { + return URI.create(environment.getProperty("websub.hub")); + } + + /** + * Retrieves the URI used to publish content via WebSub. In this project, we use a single + * WebSub hub, but we could use multiple. This URI is usually different from the WebSub hub URI. + * + * @return URI used to publish content via the WebSub hub + */ + public URI getWebSubPublishEndpoint() { + return URI.create(environment.getProperty("websub.hub.publish")); + } + + /** + * Retrieves the name of the group providing this auction house. + * + * @return the identifier of the group, e.g. tapas-group1 + */ + public String getGroupName() { + return environment.getProperty("group"); + } + + /** + * Retrieves the base URI of this auction house. + * + * @return the base URI of this auction house + */ + public URI getAuctionHouseUri() { + return URI.create(environment.getProperty("auction.house.uri")); + } + + /** + * Retrieves the URI of the TAPAS-Tasks task list of this TAPAS applicatoin. This is used, e.g., + * when placing a bid during the auction (see also {@link ch.unisg.tapas.auctionhouse.domain.Bid}). + * + * @return + */ + public URI getTaskListUri() { + return URI.create(environment.getProperty("tasks.list.uri")); + } + + + /** + * Retrieves the URI of the MQTT broker. + * + * @return the URI of the MQTT broker + */ + public URI getMqttBrokerUri() { + return URI.create(environment.getProperty("mqtt.broker.uri")); + } +} diff --git a/executor-base/src/main/java/ch/unisg/executorBase/common/SelfValidating.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/common/SelfValidating.java similarity index 66% rename from executor-base/src/main/java/ch/unisg/executorBase/common/SelfValidating.java rename to tapas-auction-house/src/main/java/ch/unisg/tapas/common/SelfValidating.java index 5119ac5..1b56db4 100644 --- a/executor-base/src/main/java/ch/unisg/executorBase/common/SelfValidating.java +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/common/SelfValidating.java @@ -1,10 +1,6 @@ -package ch.unisg.executorBase.common; +package ch.unisg.tapas.common; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import javax.validation.*; import java.util.Set; public class SelfValidating { @@ -21,7 +17,6 @@ public class SelfValidating { * instance. */ protected void validateSelf() { - @SuppressWarnings("unchecked") Set> violations = validator.validate((T) this); if (!violations.isEmpty()) { throw new ConstraintViolationException(violations); diff --git a/tapas-auction-house/src/main/resources/application.properties b/tapas-auction-house/src/main/resources/application.properties new file mode 100644 index 0000000..7b94a5a --- /dev/null +++ b/tapas-auction-house/src/main/resources/application.properties @@ -0,0 +1,13 @@ +server.port=8086 + +websub.hub=https://websub.appspot.com/ +websub.hub.publish=https://websub.appspot.com/ + +group=tapas-group-tutors +auction.house.uri=https://tapas-auction-house.86-119-34-23.nip.io/ +tasks.list.uri=http://localhost:8081 + +application.environment=development +auctionhouse.uri=http://localhost:8086 +websub.hub.uri=http://localhost:3000 +mqtt.broker.uri=tcp://localhost:1883 diff --git a/assignment/src/test/java/ch/unisg/assignment/AssignmentApplicationTests.java b/tapas-auction-house/src/test/java/ch/unisg/tapas/TapasAuctionHouseApplicationTests.java similarity index 69% rename from assignment/src/test/java/ch/unisg/assignment/AssignmentApplicationTests.java rename to tapas-auction-house/src/test/java/ch/unisg/tapas/TapasAuctionHouseApplicationTests.java index 9da24b5..ce414c3 100644 --- a/assignment/src/test/java/ch/unisg/assignment/AssignmentApplicationTests.java +++ b/tapas-auction-house/src/test/java/ch/unisg/tapas/TapasAuctionHouseApplicationTests.java @@ -1,10 +1,10 @@ -package ch.unisg.assignment; +package ch.unisg.tapas; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest -class AssignmentApplicationTests { +class TapasAuctionHouseApplicationTests { @Test void contextLoads() { diff --git a/tapas-tasks/README.md b/tapas-tasks/README.md index f083776..90016c3 100644 --- a/tapas-tasks/README.md +++ b/tapas-tasks/README.md @@ -11,61 +11,159 @@ with default editor settings. EditorConfig is supported out-of-the-box by the In consistent code styles, we recommend to reuse this editor configuration file in all your services. ## HTTP API Overview -The code we provide includes a minimalistic HTTP API for (i) creating a new task and (ii) retrieving -the representation of a task. +The code we provide includes a minimalistic uniform HTTP API for (i) creating a new task, (ii) retrieving +a representation of the current state of a task, and (iii) patching the representation of a task, which +is mapped to a domain/integration event. + +The representations exchanged with the API use two media types: +* a JSON-based format for task with the media type `application/task+json`; this media type is defined + in the context of our project, but could be [registered with IANA](https://www.iana.org/assignments/media-types) + to promote interoperability (see + [TaskJsonRepresentation](src/main/java/ch/unisg/tapastasks/tasks/adapter/in/formats/TaskJsonRepresentation.java) + for more details) +* the [JSON Patch](http://jsonpatch.com/) format with the registered media type `application/json-patch+json`, which is also a + JSON-based format (see sample HTTP requests below). For further developing and working with your HTTP API, we recommend to use [Postman](https://www.postman.com/). ### Creating a new task A new task is created via an `HTTP POST` request to the `/tasks/` endpoint. The body of the request -must include a JSON payload with the content type `application/json` and two required fields: +must include a representation of the task to be created using the content type `application/task+json` +defined in the context of this project. A valid representation must include at least two required fields +(see [TaskJsonRepresentation](src/main/java/ch/unisg/tapastasks/tasks/adapter/in/formats/TaskJsonRepresentation.java) +for more details): * `taskName`: a string that represents the name of the task to be created * `taskType`: a string that represents the type of the task to be created A sample HTTP request with `curl`: ```shell -curl -i --location --request POST 'http://localhost:8081/tasks/' --header 'Content-Type: application/json' --data-raw '{ - "taskName" : "task1", - "taskType" : "type1" +curl -i --location --request POST 'http://localhost:8081/tasks/' \ +--header 'Content-Type: application/task+json' \ +--data-raw '{ + "taskName" : "task1", + "taskType" : "computation", + "originalTaskUri" : "http://example.org", + "inputData" : "1+1" }' HTTP/1.1 201 -Content-Type: application/json -Content-Length: 142 -Date: Sun, 03 Oct 2021 17:25:32 GMT +Location: http://localhost:8081/tasks/cef2fa9d-367b-4e7f-bf06-3b1fea35f354 +Content-Type: application/task+json +Content-Length: 170 +Date: Sun, 17 Oct 2021 21:03:34 GMT { - "taskType" : "type1", - "taskState" : "OPEN", - "taskListName" : "tapas-tasks-tutors", - "taskName" : "task1", - "taskId" : "53cb19d6-2d9b-486f-98c7-c96c93b037f0" + "taskId":"cef2fa9d-367b-4e7f-bf06-3b1fea35f354", + "taskName":"task1", + "taskType":"computation", + "taskStatus":"OPEN", + "originalTaskUri":"http://example.org", + "inputData":"1+1" } ``` -If the task is created successfuly, a `201 Created` status code is returned together with a JSON -representation of the created task. The representation includes, among others, a _universally unique -identifier (UUID)_ for the newly created task (`taskId`). +If the task is created successfuly, a `201 Created` status code is returned together with a +representation of the created task. The response also includes a `Location` header filed that points +to the URI of the newly created task. ### Retrieving a task -The representation of a task is retrieved via an `HTTP GET` request to the `/tasks/` endpoint. +The representation of a task is retrieved via an `HTTP GET` request to the URI of task. A sample HTTP request with `curl`: ```shell -curl -i --location --request GET 'http://localhost:8081/tasks/53cb19d6-2d9b-486f-98c7-c96c93b037f0' +curl -i --location --request GET 'http://localhost:8081/tasks/cef2fa9d-367b-4e7f-bf06-3b1fea35f354' HTTP/1.1 200 -Content-Type: application/json -Content-Length: 142 -Date: Sun, 03 Oct 2021 17:27:06 GMT +Content-Type: application/task+json +Content-Length: 170 +Date: Sun, 17 Oct 2021 21:07:04 GMT { - "taskType" : "type1", - "taskState" : "OPEN", - "taskListName" : "tapas-tasks-tutors", - "taskName" : "task1", - "taskId" : "53cb19d6-2d9b-486f-98c7-c96c93b037f0" + "taskId":"cef2fa9d-367b-4e7f-bf06-3b1fea35f354", + "taskName":"task1", + "taskType":"computation", + "taskStatus":"OPEN", + "originalTaskUri":"http://example.org", + "inputData":"1+1" } ``` + +### Patching a task + +REST emphasizes the generality of interfaces to promote uniform interaction. For instance, we can use +the `HTTP PATCH` method to implement fine-grained updates to the representational state of a task, which +may translate to various domain/integration events. However, to conform to the uniform interface +contraint in REST, any such updates have to rely on standard knowledge — and thus to hide away the +implementation details of our service. + +In addition to the `application/task+json` media type we defined for our uniform HTTP API, a standard +representation format we can use to specify fine-grained updates to the representation of tasks +is [JSON Patch](http://jsonpatch.com/). In what follow, we provide a few examples of `HTTP PATCH` requests. +For further details on the JSON Patch format, see also [RFC 6902](https://datatracker.ietf.org/doc/html/rfc6902)). + +#### Changing the status of a task from OPEN to ASSIGNED + +Sample HTTP request that assigns the previously created task to group `tapas-group1`: + +```shell +curl -i --location --request PATCH 'http://localhost:8081/tasks/cef2fa9d-367b-4e7f-bf06-3b1fea35f354' \ +--header 'Content-Type: application/json-patch+json' \ +--data-raw '[ {"op" : "replace", "path": "/taskStatus", "value" : "ASSIGNED" }, + {"op" : "add", "path": "/serviceProvider", "value" : "tapas-group1" } ]' + +HTTP/1.1 200 +Content-Type: application/task+json +Content-Length: 207 +Date: Sun, 17 Oct 2021 21:20:58 GMT + +{ + "taskId":"cef2fa9d-367b-4e7f-bf06-3b1fea35f354", + "taskName":"task1", + "taskType":"computation", + "taskStatus":"ASSIGNED", + "originalTaskUri":"http://example.org", + "serviceProvider":"tapas-group1", + "inputData":"1+1" +} +``` + +In this example, the requested patch includes two JSON Patch operations: +* an operation to `replace` the `taskStatus` already in the task's representation with the value `ASSIGNED` +* an operation to `add` to the task's representation a `serviceProvider` with the value `tapas-group1` + +Internally, this request is mapped to a +[TaskAssignedEvent](src/main/java/ch/unisg/tapastasks/tasks/application/port/in/TaskAssignedEvent.java). +The HTTP response returns a `200 OK` status code together with the updated representation of the task. + +#### Changing the status of a task from to EXECUTED + +Sample HTTP request that changes the status of the task to `EXECUTED` and adds an output result: + +```shell +curl -i --location --request PATCH 'http://localhost:8081/tasks/cef2fa9d-367b-4e7f-bf06-3b1fea35f354' \ +--header 'Content-Type: application/json-patch+json' \ +--data-raw '[ {"op" : "replace", "path": "/taskStatus", "value" : "EXECUTED" }, + {"op" : "add", "path": "/outputData", "value" : "2" } ]' + +HTTP/1.1 200 +Content-Type: application/task+json +Content-Length: 224 +Date: Sun, 17 Oct 2021 21:32:25 GMT + +{ + "taskId":"cef2fa9d-367b-4e7f-bf06-3b1fea35f354", + "taskName":"task1", + "taskType":"computation", + "taskStatus":"EXECUTED", + "originalTaskUri":"http://example.org", + "serviceProvider":"tapas-group1", + "inputData":"1+1", + "outputData":"2" +} +``` + +Internally, this request is mapped to a +[TaskExecutedEvent](src/main/java/ch/unisg/tapastasks/tasks/application/port/in/TaskExecutedEvent.java). +The HTTP response returns a `200 OK` status code together with the updated representation of the task. diff --git a/tapas-tasks/pom.xml b/tapas-tasks/pom.xml index f3989f4..39e1e67 100644 --- a/tapas-tasks/pom.xml +++ b/tapas-tasks/pom.xml @@ -18,6 +18,12 @@ scs-asse-fs21-group1 https://sonarcloud.io + + + Eclipse Paho Repo + https://repo.eclipse.org/content/repositories/paho-releases/ + + org.springframework.boot @@ -51,17 +57,13 @@ 1.1.0.Final - - org.json - json - 20210307 - com.github.java-json-tools json-patch 1.13 + org.springframework.boot spring-boot-devtools @@ -69,6 +71,20 @@ true + + + org.eclipse.paho + org.eclipse.paho.client.mqttv3 + 1.2.0 + + + + com.vaadin.external.google + android-json + 0.0.20131108.vaadin1 + compile + + diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/TapasTasksApplication.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/TapasTasksApplication.java index 90d1716..2675391 100644 --- a/tapas-tasks/src/main/java/ch/unisg/tapastasks/TapasTasksApplication.java +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/TapasTasksApplication.java @@ -3,15 +3,12 @@ package ch.unisg.tapastasks; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import java.util.Collections; - @SpringBootApplication public class TapasTasksApplication { public static void main(String[] args) { - - SpringApplication tapasTasksApp = new SpringApplication(TapasTasksApplication.class); - tapasTasksApp.run(args); + SpringApplication tapasTasksApp = new SpringApplication(TapasTasksApplication.class); + tapasTasksApp.run(args); } } diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/formats/TaskJsonPatchRepresentation.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/formats/TaskJsonPatchRepresentation.java new file mode 100644 index 0000000..94c1f47 --- /dev/null +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/formats/TaskJsonPatchRepresentation.java @@ -0,0 +1,102 @@ +package ch.unisg.tapastasks.tasks.adapter.in.formats; + +import ch.unisg.tapastasks.tasks.domain.Task; +import com.fasterxml.jackson.databind.JsonNode; + +import java.util.Optional; +import java.util.function.Predicate; +import java.util.stream.Stream; +import java.util.stream.StreamSupport; + +/** + * This class is used to process JSON Patch operations for tasks: given a + * JSON Patch for updating the representational state of a task, + * this class provides methods for extracting various operations of interest for our domain (e.g., + * changing the status of a task). + */ +public class TaskJsonPatchRepresentation { + public static final String MEDIA_TYPE = "application/json-patch+json"; + + private final JsonNode patch; + + /** + * Constructs the JSON Patch representation. + * + * @param patch a JSON Patch as JsonNode + */ + public TaskJsonPatchRepresentation(JsonNode patch) { + this.patch = patch; + } + + /** + * Extracts the first task status replaced in this patch. + * + * @return the first task status changed in this patch or an empty {@link Optional} if none is + * found + */ + public Optional extractFirstTaskStatusChange() { + Optional status = extractFirst(node -> + isPatchReplaceOperation(node) && hasPath(node, "/taskStatus") + ); + + if (status.isPresent()) { + String taskStatus = status.get().get("value").asText(); + return Optional.of(Task.Status.valueOf(taskStatus)); + } + + return Optional.empty(); + } + + /** + * Extracts the first service provider added or replaced in this patch. + * + * @return the first service provider changed in this patch or an empty {@link Optional} if none + * is found + */ + public Optional extractFirstServiceProviderChange() { + Optional serviceProvider = extractFirst(node -> + (isPatchReplaceOperation(node) || isPatchAddOperation(node)) + && hasPath(node, "/serviceProvider") + ); + + return (serviceProvider.isEmpty()) ? Optional.empty() + : Optional.of(new Task.ServiceProvider(serviceProvider.get().get("value").asText())); + } + + /** + * Extracts the first output data addition in this patch. + * + * @return the output data added in this patch or an empty {@link Optional} if none is found + */ + public Optional extractFirstOutputDataAddition() { + Optional output = extractFirst(node -> + isPatchAddOperation(node) && hasPath(node, "/outputData") + ); + + return (output.isEmpty()) ? Optional.empty() + : Optional.of(new Task.OutputData(output.get().get("value").asText())); + } + + private Optional extractFirst(Predicate predicate) { + Stream stream = StreamSupport.stream(patch.spliterator(), false); + return stream.filter(predicate).findFirst(); + } + + private boolean isPatchAddOperation(JsonNode node) { + return isPatchOperationOfType(node, "add"); + } + + private boolean isPatchReplaceOperation(JsonNode node) { + return isPatchOperationOfType(node, "replace"); + } + + private boolean isPatchOperationOfType(JsonNode node, String operation) { + return node.isObject() && node.get("op") != null + && node.get("op").asText().equalsIgnoreCase(operation); + } + + private boolean hasPath(JsonNode node, String path) { + return node.isObject() && node.get("path") != null + && node.get("path").asText().equalsIgnoreCase(path); + } +} diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/formats/TaskJsonRepresentation.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/formats/TaskJsonRepresentation.java new file mode 100644 index 0000000..eb89415 --- /dev/null +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/formats/TaskJsonRepresentation.java @@ -0,0 +1,115 @@ +package ch.unisg.tapastasks.tasks.adapter.in.formats; + +import ch.unisg.tapastasks.tasks.domain.Task; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.Getter; +import lombok.Setter; + +/** + * This class is used to expose and consume representations of tasks through the HTTP interface. The + * representations conform to the custom JSON-based media type "application/task+json". The media type + * is just an identifier and can be registered with + * IANA to promote interoperability. + */ +final public class TaskJsonRepresentation { + // The media type used for this task representation format + public static final String MEDIA_TYPE = "application/task+json"; + + // A task identifier specific to our implementation (e.g., a UUID). This identifier is then used + // to generate the task's URI. URIs are standard uniform identifiers and use a universal syntax + // that can be referenced (and dereferenced) independent of context. In our uniform HTTP API, + // we identify tasks via URIs and not implementation-specific identifiers. + @Getter @Setter + private String taskId; + + // A string that represents the task's name + @Getter + private final String taskName; + + // A string that identifies the task's type. This string could also be a URI (e.g., defined in some + // Web ontology, as we shall see later in the course), but it's not constrained to be a URI. + // The task's type can be used to assign executors to tasks, to decide what tasks to bid for, etc. + @Getter + private final String taskType; + + // The task's status: OPEN, ASSIGNED, RUNNING, or EXECUTED (see Task.Status) + @Getter @Setter + private String taskStatus; + + // If this task is a delegated task (i.e., a shadow of another task), this URI points to the + // original task. Because URIs are standard and uniform, we can just dereference this URI to + // retrieve a representation of the original task. + @Getter @Setter + private String originalTaskUri; + + // The service provider who executes this task. The service provider is a any string that identifies + // a TAPAS group (e.g., tapas-group1). This identifier could also be a URI (if we have a good reason + // for it), but it's not constrained to be a URI. + @Getter @Setter + private String serviceProvider; + + // A string that provides domain-specific input data for this task. In the context of this project, + // we can parse and interpret the input data based on the task's type. + @Getter @Setter + private String inputData; + + // A string that provides domain-specific output data for this task. In the context of this project, + // we can parse and interpret the output data based on the task's type. + @Getter @Setter + private String outputData; + + /** + * Instantiate a task representation with a task name and type. + * + * @param taskName string that represents the task's name + * @param taskType string that represents the task's type + */ + public TaskJsonRepresentation(String taskName, String taskType) { + this.taskName = taskName; + this.taskType = taskType; + + this.taskStatus = null; + this.originalTaskUri = null; + this.serviceProvider = null; + this.inputData = null; + this.outputData = null; + } + + /** + * Instantiate a task representation from a domain concept. + * + * @param task the task + */ + public TaskJsonRepresentation(Task task) { + this(task.getTaskName().getValue(), task.getTaskType().getValue()); + + this.taskId = task.getTaskId().getValue(); + this.taskStatus = task.getTaskStatus().getValue().name(); + + this.originalTaskUri = (task.getOriginalTaskUri() == null) ? + null : task.getOriginalTaskUri().getValue(); + + this.serviceProvider = (task.getProvider() == null) ? null : task.getProvider().getValue(); + this.inputData = (task.getInputData() == null) ? null : task.getInputData().getValue(); + this.outputData = (task.getOutputData() == null) ? null : task.getOutputData().getValue(); + } + + /** + * Convenience method used to serialize a task provided as a domain concept in the format exposed + * through the uniform HTTP API. + * + * @param task the task as defined in the domain + * @return a string serialization using the JSON-based representation format defined for tasks + * @throws JsonProcessingException if a runtime exception occurs during object serialization + */ + public static String serialize(Task task) throws JsonProcessingException { + TaskJsonRepresentation representation = new TaskJsonRepresentation(task); + + ObjectMapper mapper = new ObjectMapper(); + mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); + + return mapper.writeValueAsString(representation); + } +} diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/messaging/UnknownEventException.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/messaging/UnknownEventException.java new file mode 100644 index 0000000..fbeb7b7 --- /dev/null +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/messaging/UnknownEventException.java @@ -0,0 +1,3 @@ +package ch.unisg.tapastasks.tasks.adapter.in.messaging; + +public class UnknownEventException extends RuntimeException { } diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/messaging/http/TaskAssignedEventListenerHttpAdapter.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/messaging/http/TaskAssignedEventListenerHttpAdapter.java new file mode 100644 index 0000000..4c26b80 --- /dev/null +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/messaging/http/TaskAssignedEventListenerHttpAdapter.java @@ -0,0 +1,39 @@ +package ch.unisg.tapastasks.tasks.adapter.in.messaging.http; + +import ch.unisg.tapastasks.tasks.adapter.in.formats.TaskJsonPatchRepresentation; +import ch.unisg.tapastasks.tasks.application.handler.TaskAssignedHandler; +import ch.unisg.tapastasks.tasks.application.port.in.TaskAssignedEvent; +import ch.unisg.tapastasks.tasks.application.port.in.TaskAssignedEventHandler; +import ch.unisg.tapastasks.tasks.domain.Task; +import ch.unisg.tapastasks.tasks.domain.Task.TaskId; +import com.fasterxml.jackson.databind.JsonNode; + +import java.util.Optional; + +/** + * Listener for task assigned events. A task assigned event corresponds to a JSON Patch that attempts + * to change the task's status to ASSIGNED and may also add/replace a service provider (i.e., to what + * group the task was assigned). This implementation does not impose that a task assigned event + * includes the service provider (i.e., can be null). + * + * See also {@link TaskAssignedEvent}, {@link Task}, and {@link TaskEventHttpDispatcher}. + */ +public class TaskAssignedEventListenerHttpAdapter extends TaskEventListener { + + /** + * Handles the task assigned event. + * + * @param taskId the identifier of the task for which an event was received + * @param payload the JSON Patch payload of the HTTP PATCH request received for this task + * @return + */ + public Task handleTaskEvent(String taskId, JsonNode payload) { + TaskJsonPatchRepresentation representation = new TaskJsonPatchRepresentation(payload); + Optional serviceProvider = representation.extractFirstServiceProviderChange(); + + TaskAssignedEvent taskAssignedEvent = new TaskAssignedEvent(new TaskId(taskId), serviceProvider); + TaskAssignedEventHandler taskAssignedEventHandler = new TaskAssignedHandler(); + + return taskAssignedEventHandler.handleTaskAssigned(taskAssignedEvent); + } +} diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/messaging/http/TaskEventHttpDispatcher.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/messaging/http/TaskEventHttpDispatcher.java new file mode 100644 index 0000000..940d6fa --- /dev/null +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/messaging/http/TaskEventHttpDispatcher.java @@ -0,0 +1,103 @@ +package ch.unisg.tapastasks.tasks.adapter.in.messaging.http; + +import ch.unisg.tapastasks.tasks.adapter.in.formats.TaskJsonPatchRepresentation; +import ch.unisg.tapastasks.tasks.adapter.in.formats.TaskJsonRepresentation; +import ch.unisg.tapastasks.tasks.adapter.in.messaging.UnknownEventException; +import ch.unisg.tapastasks.tasks.domain.Task; +import ch.unisg.tapastasks.tasks.domain.TaskNotFoundException; +import com.fasterxml.jackson.databind.JsonNode; +import com.github.fge.jsonpatch.JsonPatch; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.server.ResponseStatusException; + +import java.io.IOException; +import java.util.Optional; + + +/** + * This REST Controller handles HTTP PATCH requests for updating the representational state of Task + * resources. Each request to update the representational state of a Task resource can correspond to + * at most one domain/integration event. Request payloads use the + * JSON PATCH format and media type. + * + * A JSON Patch can contain multiple operations (e.g., add, remove, replace) for updating various + * parts of a task's representations. One or more JSON Patch operations can represent a domain/integration + * event. Therefore, the events can only be determined by inspecting the requested patch (e.g., a request + * to change a task's status from RUNNING to EXECUTED). This class is responsible to inspect requested + * patches, identify events, and to route them to appropriate listeners. + * + * For more details on JSON Patch, see: http://jsonpatch.com/ + * For some sample HTTP requests, see the README. + */ +@RestController +public class TaskEventHttpDispatcher { + // The standard media type for JSON Patch registered with IANA + // See: https://www.iana.org/assignments/media-types/application/json-patch+json + private final static String JSON_PATCH_MEDIA_TYPE = "application/json-patch+json"; + + /** + * Handles HTTP PATCH requests with a JSON Patch payload. Routes the requests based on the + * the operations requested in the patch. In this implementation, one HTTP Patch request is + * mapped to at most one domain event. + * + * @param taskId the local (i.e., implementation-specific) identifier of the task to the patched; + * this identifier is extracted from the task's URI + * @param payload the reuqested patch for this task + * @return 200 OK and a representation of the task after processing the event; 404 Not Found if + * the request URI does not match any task; 400 Bad Request if the request is invalid + */ + @PatchMapping(path = "/tasks/{taskId}", consumes = {JSON_PATCH_MEDIA_TYPE}) + public ResponseEntity dispatchTaskEvents(@PathVariable("taskId") String taskId, + @RequestBody JsonNode payload) { + try { + // Throw an exception if the JSON Patch format is invalid. This call is only used to + // validate the JSON PATCH syntax. + JsonPatch.fromJson(payload); + + // Check for known events and route the events to appropriate listeners + TaskJsonPatchRepresentation representation = new TaskJsonPatchRepresentation(payload); + Optional status = representation.extractFirstTaskStatusChange(); + + TaskEventListener listener = null; + + // Route events related to task status changes + if (status.isPresent()) { + switch (status.get()) { + case ASSIGNED: + listener = new TaskAssignedEventListenerHttpAdapter(); + break; + case RUNNING: + listener = new TaskStartedEventListenerHttpAdapter(); + break; + case EXECUTED: + listener = new TaskExecutedEventListenerHttpAdapter(); + break; + } + } + + if (listener == null) { + // The HTTP PATCH request is valid, but the patch does not match any known event + throw new UnknownEventException(); + } + + Task task = listener.handleTaskEvent(taskId, payload); + + // Add the content type as a response header + HttpHeaders responseHeaders = new HttpHeaders(); + responseHeaders.add(HttpHeaders.CONTENT_TYPE, TaskJsonRepresentation.MEDIA_TYPE); + + return new ResponseEntity<>(TaskJsonRepresentation.serialize(task), responseHeaders, + HttpStatus.OK); + } catch (TaskNotFoundException e) { + throw new ResponseStatusException(HttpStatus.NOT_FOUND); + } catch (IOException | RuntimeException e) { + throw new ResponseStatusException(HttpStatus.BAD_REQUEST, e.getMessage()); + } + } +} diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/messaging/http/TaskEventListener.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/messaging/http/TaskEventListener.java new file mode 100644 index 0000000..8912968 --- /dev/null +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/messaging/http/TaskEventListener.java @@ -0,0 +1,24 @@ +package ch.unisg.tapastasks.tasks.adapter.in.messaging.http; + +import ch.unisg.tapastasks.tasks.domain.Task; +import ch.unisg.tapastasks.tasks.domain.TaskNotFoundException; +import com.fasterxml.jackson.databind.JsonNode; + +/** + * Abstract class that handles events specific to a Task. Events are received via an HTTP PATCH + * request for a given task and dispatched to Task event listeners (see {@link TaskEventHttpDispatcher}). + * Each listener must implement the abstract method {@link #handleTaskEvent(String, JsonNode)}, which + * may require additional event-specific validations. + */ +public abstract class TaskEventListener { + + /** + * This abstract method handles a task event and returns the task after the event was handled. + * + * @param taskId the identifier of the task for which an event was received + * @param payload the JSON Patch payload of the HTTP PATCH request received for this task + * @return the task for which the HTTP PATCH request is handled + * @throws TaskNotFoundException + */ + public abstract Task handleTaskEvent(String taskId, JsonNode payload) throws TaskNotFoundException; +} diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/messaging/http/TaskExecutedEventListenerHttpAdapter.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/messaging/http/TaskExecutedEventListenerHttpAdapter.java new file mode 100644 index 0000000..f1db541 --- /dev/null +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/messaging/http/TaskExecutedEventListenerHttpAdapter.java @@ -0,0 +1,34 @@ +package ch.unisg.tapastasks.tasks.adapter.in.messaging.http; + +import ch.unisg.tapastasks.tasks.adapter.in.formats.TaskJsonPatchRepresentation; +import ch.unisg.tapastasks.tasks.application.handler.TaskExecutedHandler; +import ch.unisg.tapastasks.tasks.application.port.in.TaskExecutedEvent; +import ch.unisg.tapastasks.tasks.application.port.in.TaskExecutedEventHandler; +import ch.unisg.tapastasks.tasks.domain.Task; +import com.fasterxml.jackson.databind.JsonNode; + +import java.util.Optional; + +/** + * Listener for task executed events. A task executed event corresponds to a JSON Patch that attempts + * to change the task's status to EXECUTED, may add/replace a service provider, and may also add an + * output result. This implementation does not impose that a task executed event includes either the + * service provider or an output result (i.e., both can be null). + * + * See also {@link TaskExecutedEvent}, {@link Task}, and {@link TaskEventHttpDispatcher}. + */ +public class TaskExecutedEventListenerHttpAdapter extends TaskEventListener { + + public Task handleTaskEvent(String taskId, JsonNode payload) { + TaskJsonPatchRepresentation representation = new TaskJsonPatchRepresentation(payload); + + Optional serviceProvider = representation.extractFirstServiceProviderChange(); + Optional outputData = representation.extractFirstOutputDataAddition(); + + TaskExecutedEvent taskExecutedEvent = new TaskExecutedEvent(new Task.TaskId(taskId), + serviceProvider, outputData); + TaskExecutedEventHandler taskExecutedEventHandler = new TaskExecutedHandler(); + + return taskExecutedEventHandler.handleTaskExecuted(taskExecutedEvent); + } +} diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/messaging/http/TaskStartedEventListenerHttpAdapter.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/messaging/http/TaskStartedEventListenerHttpAdapter.java new file mode 100644 index 0000000..aa2f6b4 --- /dev/null +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/messaging/http/TaskStartedEventListenerHttpAdapter.java @@ -0,0 +1,32 @@ +package ch.unisg.tapastasks.tasks.adapter.in.messaging.http; + +import ch.unisg.tapastasks.tasks.adapter.in.formats.TaskJsonPatchRepresentation; +import ch.unisg.tapastasks.tasks.application.handler.TaskStartedHandler; +import ch.unisg.tapastasks.tasks.application.port.in.TaskStartedEvent; +import ch.unisg.tapastasks.tasks.application.port.in.TaskStartedEventHandler; +import ch.unisg.tapastasks.tasks.domain.Task; +import ch.unisg.tapastasks.tasks.domain.Task.TaskId; +import com.fasterxml.jackson.databind.JsonNode; + +import java.util.Optional; + +/** + * Listener for task started events. A task started event corresponds to a JSON Patch that attempts + * to change the task's status to RUNNING and may also add/replace a service provider. This + * implementation does not impose that a task started event includes the service provider (i.e., + * can be null). + * + * See also {@link TaskStartedEvent}, {@link Task}, and {@link TaskEventHttpDispatcher}. + */ +public class TaskStartedEventListenerHttpAdapter extends TaskEventListener { + + public Task handleTaskEvent(String taskId, JsonNode payload) { + TaskJsonPatchRepresentation representation = new TaskJsonPatchRepresentation(payload); + Optional serviceProvider = representation.extractFirstServiceProviderChange(); + + TaskStartedEvent taskStartedEvent = new TaskStartedEvent(new TaskId(taskId), serviceProvider); + TaskStartedEventHandler taskStartedEventHandler = new TaskStartedHandler(); + + return taskStartedEventHandler.handleTaskStarted(taskStartedEvent); + } +} diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/web/AddNewTaskToTaskListWebController.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/web/AddNewTaskToTaskListWebController.java index 53bebc1..15c3ebb 100644 --- a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/web/AddNewTaskToTaskListWebController.java +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/web/AddNewTaskToTaskListWebController.java @@ -1,8 +1,12 @@ package ch.unisg.tapastasks.tasks.adapter.in.web; +import ch.unisg.tapastasks.tasks.adapter.in.formats.TaskJsonRepresentation; import ch.unisg.tapastasks.tasks.application.port.in.AddNewTaskToTaskListCommand; import ch.unisg.tapastasks.tasks.application.port.in.AddNewTaskToTaskListUseCase; import ch.unisg.tapastasks.tasks.domain.Task; +import com.fasterxml.jackson.core.JsonProcessingException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.env.Environment; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -12,29 +16,66 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ResponseStatusException; import javax.validation.ConstraintViolationException; +import java.util.Optional; +/** + * Controller that handles HTTP requests for creating new tasks. This controller implements the + * {@link AddNewTaskToTaskListUseCase} use case using the {@link AddNewTaskToTaskListCommand}. + * + * A new task is created via an HTTP POST request to the /tasks/ endpoint. The body of the request + * contains a JSON-based representation with the "application/task+json" media type defined for this + * project. This custom media type allows to capture the semantics of our JSON representations for + * tasks. + * + * If the request is successful, the controller returns an HTTP 201 Created status code and a + * representation of the created task with Content-Type "application/task+json". The HTTP response + * also include a Location header field that points to the URI of the created task. + */ @RestController public class AddNewTaskToTaskListWebController { private final AddNewTaskToTaskListUseCase addNewTaskToTaskListUseCase; + // Used to retrieve properties from application.properties + @Autowired + private Environment environment; + public AddNewTaskToTaskListWebController(AddNewTaskToTaskListUseCase addNewTaskToTaskListUseCase) { this.addNewTaskToTaskListUseCase = addNewTaskToTaskListUseCase; } - @PostMapping(path = "/tasks/", consumes = {TaskMediaType.TASK_MEDIA_TYPE}) - public ResponseEntity addNewTaskTaskToTaskList(@RequestBody Task task) { + @PostMapping(path = "/tasks/", consumes = {TaskJsonRepresentation.MEDIA_TYPE}) + public ResponseEntity addNewTaskTaskToTaskList(@RequestBody TaskJsonRepresentation payload) { try { - AddNewTaskToTaskListCommand command = new AddNewTaskToTaskListCommand( - task.getTaskName(), task.getTaskType() - ); + Task.TaskName taskName = new Task.TaskName(payload.getTaskName()); + Task.TaskType taskType = new Task.TaskType(payload.getTaskType()); - Task newTask = addNewTaskToTaskListUseCase.addNewTaskToTaskList(command); + // If the created task is a delegated task, the representation contains a URI reference + // to the original task + Optional originalTaskUriOptional = + (payload.getOriginalTaskUri() == null) ? Optional.empty() + : Optional.of(new Task.OriginalTaskUri(payload.getOriginalTaskUri())); + + Optional inputData = + (payload.getInputData() == null) ? Optional.empty() + : Optional.of(new Task.InputData(payload.getInputData())); + + AddNewTaskToTaskListCommand command = new AddNewTaskToTaskListCommand(taskName, taskType, + originalTaskUriOptional, inputData); + + Task createdTask = addNewTaskToTaskListUseCase.addNewTaskToTaskList(command); // Add the content type as a response header HttpHeaders responseHeaders = new HttpHeaders(); - responseHeaders.add(HttpHeaders.CONTENT_TYPE, TaskMediaType.TASK_MEDIA_TYPE); + responseHeaders.add(HttpHeaders.CONTENT_TYPE, TaskJsonRepresentation.MEDIA_TYPE); + // Construct and advertise the URI of the newly created task; we retrieve the base URI + // from the application.properties file + responseHeaders.add(HttpHeaders.LOCATION, environment.getProperty("baseuri") + + "tasks/" + createdTask.getTaskId().getValue()); - return new ResponseEntity<>(TaskMediaType.serialize(newTask), responseHeaders, HttpStatus.CREATED); + return new ResponseEntity<>(TaskJsonRepresentation.serialize(createdTask), responseHeaders, + HttpStatus.CREATED); + } catch (JsonProcessingException e) { + throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, e.getMessage()); } catch (ConstraintViolationException e) { throw new ResponseStatusException(HttpStatus.BAD_REQUEST, e.getMessage()); } diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/web/CompleteTaskWebController.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/web/CompleteTaskWebController.java index 536b72c..fa5578b 100644 --- a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/web/CompleteTaskWebController.java +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/web/CompleteTaskWebController.java @@ -1,13 +1,18 @@ package ch.unisg.tapastasks.tasks.adapter.in.web; +import ch.unisg.tapastasks.tasks.adapter.in.formats.TaskJsonRepresentation; import ch.unisg.tapastasks.tasks.application.port.in.CompleteTaskCommand; import ch.unisg.tapastasks.tasks.application.port.in.CompleteTaskUseCase; import ch.unisg.tapastasks.tasks.domain.Task; +import com.fasterxml.jackson.core.JsonProcessingException; 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.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ResponseStatusException; @@ -21,21 +26,28 @@ public class CompleteTaskWebController { this.completeTaskUseCase = completeTaskUseCase; } - @PostMapping(path = "/tasks/completeTask", consumes = {TaskMediaType.TASK_MEDIA_TYPE}) - public ResponseEntity completeTask (@RequestBody Task task){ + @GetMapping(path = "/tasks/completeTask/{taskId}") + public ResponseEntity completeTask (@PathVariable("taskId") String taskId){ + + System.out.println("completeTask"); + System.out.println(taskId); + + String taskResult = "0"; try { CompleteTaskCommand command = new CompleteTaskCommand( - task.getTaskId(), task.getTaskResult() + new Task.TaskId(taskId), new Task.OutputData(taskResult) ); Task updateATask = completeTaskUseCase.completeTask(command); HttpHeaders responseHeaders = new HttpHeaders(); - responseHeaders.add(HttpHeaders.CONTENT_TYPE, TaskMediaType.TASK_MEDIA_TYPE); + responseHeaders.add(HttpHeaders.CONTENT_TYPE, TaskJsonRepresentation.MEDIA_TYPE); - return new ResponseEntity<>(TaskMediaType.serialize(updateATask), responseHeaders, HttpStatus.ACCEPTED); - } catch(ConstraintViolationException e){ + return new ResponseEntity<>(TaskJsonRepresentation.serialize(updateATask), responseHeaders, HttpStatus.ACCEPTED); + } catch (JsonProcessingException e) { + throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, e.getMessage()); + } catch (ConstraintViolationException e) { throw new ResponseStatusException(HttpStatus.BAD_REQUEST, e.getMessage()); } } diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/web/DeleteTaskWebController.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/web/DeleteTaskWebController.java index af721d1..ef79e6a 100644 --- a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/web/DeleteTaskWebController.java +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/web/DeleteTaskWebController.java @@ -1,9 +1,11 @@ package ch.unisg.tapastasks.tasks.adapter.in.web; +import ch.unisg.tapastasks.tasks.adapter.in.formats.TaskJsonRepresentation; import ch.unisg.tapastasks.tasks.application.port.in.DeleteTaskCommand; import ch.unisg.tapastasks.tasks.application.port.in.DeleteTaskUseCase; import ch.unisg.tapastasks.tasks.domain.Task; +import com.fasterxml.jackson.core.JsonProcessingException; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -23,26 +25,27 @@ public class DeleteTaskWebController { this.deleteClassUseCase = deleteClassUseCase; } - @PostMapping(path="/tasks/deleteTask", consumes = {TaskMediaType.TASK_MEDIA_TYPE}) + @PostMapping(path="/tasks/deleteTask", consumes = {TaskJsonRepresentation.MEDIA_TYPE}) public ResponseEntity deleteTask (@RequestBody Task task){ try { - DeleteTaskCommand command = new DeleteTaskCommand(task.getTaskId()); + DeleteTaskCommand command = new DeleteTaskCommand(task.getTaskId(), task.getOriginalTaskUri()); Optional deleteATask = deleteClassUseCase.deleteTask(command); // Check if the task with the given identifier exists if (deleteATask.isEmpty()) { - // If not, through a 404 Not Found status code throw new ResponseStatusException(HttpStatus.NOT_FOUND); } HttpHeaders responseHeaders = new HttpHeaders(); - responseHeaders.add(HttpHeaders.CONTENT_TYPE, TaskMediaType.TASK_MEDIA_TYPE); + responseHeaders.add(HttpHeaders.CONTENT_TYPE, TaskJsonRepresentation.MEDIA_TYPE); - return new ResponseEntity<>(TaskMediaType.serialize(deleteATask.get()), responseHeaders, HttpStatus.ACCEPTED); - } catch(ConstraintViolationException e){ + return new ResponseEntity<>(TaskJsonRepresentation.serialize(deleteATask.get()), responseHeaders, HttpStatus.ACCEPTED); + } catch (JsonProcessingException e) { + throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, e.getMessage()); + } catch (ConstraintViolationException e) { throw new ResponseStatusException(HttpStatus.BAD_REQUEST, e.getMessage()); } } diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/web/RetrieveTaskFromTaskListWebController.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/web/RetrieveTaskFromTaskListWebController.java index 0eb6bea..d60e4d1 100644 --- a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/web/RetrieveTaskFromTaskListWebController.java +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/web/RetrieveTaskFromTaskListWebController.java @@ -1,8 +1,10 @@ package ch.unisg.tapastasks.tasks.adapter.in.web; +import ch.unisg.tapastasks.tasks.adapter.in.formats.TaskJsonRepresentation; import ch.unisg.tapastasks.tasks.application.port.in.RetrieveTaskFromTaskListQuery; import ch.unisg.tapastasks.tasks.application.port.in.RetrieveTaskFromTaskListUseCase; import ch.unisg.tapastasks.tasks.domain.Task; +import com.fasterxml.jackson.core.JsonProcessingException; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -11,6 +13,11 @@ import org.springframework.web.server.ResponseStatusException; import java.util.Optional; +/** + * Controller that handles HTTP GET requests for retrieving tasks. This controller implements the + * {@link RetrieveTaskFromTaskListUseCase} use case using the {@link RetrieveTaskFromTaskListQuery} + * query. + */ @RestController public class RetrieveTaskFromTaskListWebController { private final RetrieveTaskFromTaskListUseCase retrieveTaskFromTaskListUseCase; @@ -19,10 +26,17 @@ public class RetrieveTaskFromTaskListWebController { this.retrieveTaskFromTaskListUseCase = retrieveTaskFromTaskListUseCase; } + /** + * Retrieves a representation of task. Returns HTTP 200 OK if the request is successful with a + * representation of the task using the Content-Type "applicatoin/task+json". + * + * @param taskId the local identifier of the requested task (extracted from the task's URI) + * @return a representation of the task if the task exists + */ @GetMapping(path = "/tasks/{taskId}") public ResponseEntity retrieveTaskFromTaskList(@PathVariable("taskId") String taskId) { - RetrieveTaskFromTaskListQuery command = new RetrieveTaskFromTaskListQuery(new Task.TaskId(taskId)); - Optional updatedTaskOpt = retrieveTaskFromTaskListUseCase.retrieveTaskFromTaskList(command); + RetrieveTaskFromTaskListQuery query = new RetrieveTaskFromTaskListQuery(new Task.TaskId(taskId)); + Optional updatedTaskOpt = retrieveTaskFromTaskListUseCase.retrieveTaskFromTaskList(query); // Check if the task with the given identifier exists if (updatedTaskOpt.isEmpty()) { @@ -30,11 +44,16 @@ public class RetrieveTaskFromTaskListWebController { throw new ResponseStatusException(HttpStatus.NOT_FOUND); } - // Add the content type as a response header - HttpHeaders responseHeaders = new HttpHeaders(); - responseHeaders.add(HttpHeaders.CONTENT_TYPE, TaskMediaType.TASK_MEDIA_TYPE); + try { + String taskRepresentation = TaskJsonRepresentation.serialize(updatedTaskOpt.get()); - return new ResponseEntity<>(TaskMediaType.serialize(updatedTaskOpt.get()), responseHeaders, - HttpStatus.OK); + // Add the content type as a response header + HttpHeaders responseHeaders = new HttpHeaders(); + responseHeaders.add(HttpHeaders.CONTENT_TYPE, TaskJsonRepresentation.MEDIA_TYPE); + + return new ResponseEntity<>(taskRepresentation, responseHeaders, HttpStatus.OK); + } catch (JsonProcessingException e) { + throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, e.getMessage()); + } } } diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/web/TaskAssignedWebController.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/web/TaskAssignedWebController.java index 9dfa6a2..b58d159 100644 --- a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/web/TaskAssignedWebController.java +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/web/TaskAssignedWebController.java @@ -1,8 +1,10 @@ package ch.unisg.tapastasks.tasks.adapter.in.web; +import ch.unisg.tapastasks.tasks.adapter.in.formats.TaskJsonRepresentation; import ch.unisg.tapastasks.tasks.application.port.in.TaskAssignedCommand; import ch.unisg.tapastasks.tasks.application.port.in.TaskAssignedUseCase; import ch.unisg.tapastasks.tasks.domain.Task; +import com.fasterxml.jackson.core.JsonProcessingException; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -21,7 +23,7 @@ public class TaskAssignedWebController { this.taskAssignedUseCase = taskAssignedUseCase; } - @PostMapping(path="/tasks/assignTask", consumes= {TaskMediaType.TASK_MEDIA_TYPE}) + @PostMapping(path="/tasks/assignTask", consumes= {TaskJsonRepresentation.MEDIA_TYPE}) public ResponseEntity assignTask(@RequestBody Task task){ try{ TaskAssignedCommand command = new TaskAssignedCommand( @@ -31,10 +33,12 @@ public class TaskAssignedWebController { Task updateATask = taskAssignedUseCase.assignTask(command); HttpHeaders responseHeaders = new HttpHeaders(); - responseHeaders.add(HttpHeaders.CONTENT_TYPE, TaskMediaType.TASK_MEDIA_TYPE); + responseHeaders.add(HttpHeaders.CONTENT_TYPE, TaskJsonRepresentation.MEDIA_TYPE); - return new ResponseEntity<>(TaskMediaType.serialize(updateATask), responseHeaders, HttpStatus.ACCEPTED); - } catch (ConstraintViolationException e){ + return new ResponseEntity<>(TaskJsonRepresentation.serialize(updateATask), responseHeaders, HttpStatus.ACCEPTED); + } catch (JsonProcessingException e) { + throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, e.getMessage()); + } catch (ConstraintViolationException e) { throw new ResponseStatusException(HttpStatus.BAD_REQUEST, e.getMessage()); } } diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/web/TaskMediaType.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/web/TaskMediaType.java deleted file mode 100644 index d9a0a46..0000000 --- a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/in/web/TaskMediaType.java +++ /dev/null @@ -1,23 +0,0 @@ -package ch.unisg.tapastasks.tasks.adapter.in.web; - -import ch.unisg.tapastasks.tasks.domain.Task; -import ch.unisg.tapastasks.tasks.domain.TaskList; -import org.json.JSONObject; - -final public class TaskMediaType { - public static final String TASK_MEDIA_TYPE = "application/json"; - - public static String serialize(Task task) { - JSONObject payload = new JSONObject(); - - payload.put("taskId", task.getTaskId().getValue()); - payload.put("taskName", task.getTaskName().getValue()); - payload.put("taskType", task.getTaskType().getValue()); - payload.put("taskState", task.getTaskState().getValue()); - payload.put("taskListName", TaskList.getTapasTaskList().getTaskListName().getValue()); - payload.put("taskResult", task.getTaskResult().getValue()); - return payload.toString(); - } - - private TaskMediaType() { } -} diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/out/web/CanTaskBeDeletedWebAdapter.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/out/web/CanTaskBeDeletedWebAdapter.java new file mode 100644 index 0000000..5061e3d --- /dev/null +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/out/web/CanTaskBeDeletedWebAdapter.java @@ -0,0 +1,59 @@ +package ch.unisg.tapastasks.tasks.adapter.out.web; + + +import ch.unisg.tapastasks.tasks.application.port.out.CanTaskBeDeletedPort; +import ch.unisg.tapastasks.tasks.domain.DeleteTaskEvent; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.context.annotation.Primary; +import org.springframework.stereotype.Component; + +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.HashMap; + +@Component +@Primary +public class CanTaskBeDeletedWebAdapter implements CanTaskBeDeletedPort { + + // Base URI of the service interested in this event + //Todo: Add the right IP address + String server = null; + + @Override + public void canTaskBeDeletedEvent(DeleteTaskEvent event){ + + var values = new HashMap<> () {{ + put("taskId", event.taskId); + put("taskUri", event.taskUri); + }}; + + var objectMapper = new ObjectMapper(); + String requestBody = null; + try { + requestBody = objectMapper.writeValueAsString(values); + } catch (JsonProcessingException e){ + e.printStackTrace(); + } + + //Todo: Question: How do we include the URI from the DeleteTaskEvent? Do we even need it? + HttpClient client = HttpClient.newHttpClient(); + HttpRequest request = HttpRequest.newBuilder() + .uri(URI.create(server+"task")) + .header("Content-Type", "application/task+json") + .POST(HttpRequest.BodyPublishers.ofString(requestBody)) + .build(); + + //Todo: The following parameters probably need to be changed to get the right error code + try { + HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofString()); + } catch (IOException e){ + e.printStackTrace(); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } +} diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/out/web/ExternalTaskExecutedWebAdapter.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/out/web/ExternalTaskExecutedWebAdapter.java new file mode 100644 index 0000000..8e6f106 --- /dev/null +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/out/web/ExternalTaskExecutedWebAdapter.java @@ -0,0 +1,74 @@ +package ch.unisg.tapastasks.tasks.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 com.github.fge.jsonpatch.JsonPatch; +import com.github.fge.jsonpatch.JsonPatchOperation; + +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; +import org.springframework.context.annotation.Primary; +import org.springframework.stereotype.Component; + +import ch.unisg.tapastasks.tasks.adapter.in.formats.TaskJsonPatchRepresentation; +import ch.unisg.tapastasks.tasks.application.port.out.ExternalTaskExecutedEvent; +import ch.unisg.tapastasks.tasks.application.port.out.ExternalTaskExecutedEventHandler; + +@Component +@Primary +public class ExternalTaskExecutedWebAdapter implements ExternalTaskExecutedEventHandler { + + Logger logger = Logger.getLogger(ExternalTaskExecutedWebAdapter.class.getName()); + + /** + * Updates an external task which got executed in our system. + **/ + @Override + public void handleEvent(ExternalTaskExecutedEvent externalTaskExecutedEvent) { + + JSONObject op1; + JSONObject op2; + try { + op1 = new JSONObject() + .put("op", "replace") + .put("path", "/taskStatus") + .put("value", "EXECUTED"); + + op2 = new JSONObject() + .put("op", "add") + .put("path", "/outputData") + .put("value", "0"); + } catch (JSONException e) { + logger.log(Level.SEVERE, e.getLocalizedMessage(), e); + return; + } + + String body = new JSONArray().put(op1).put(op2).toString(); + + HttpClient client = HttpClient.newHttpClient(); + HttpRequest request = HttpRequest.newBuilder() + .uri(URI.create(externalTaskExecutedEvent.getOriginalTaskUri().getValue())) + .header("Content-Type", "application/json") + .method("PATCH", HttpRequest.BodyPublishers.ofString(body)) + .build(); + + + try { + client.send(request, HttpResponse.BodyHandlers.ofString()); + } catch (InterruptedException e) { + logger.log(Level.SEVERE, e.getLocalizedMessage(), e); + Thread.currentThread().interrupt(); + } catch (IOException e) { + logger.log(Level.SEVERE, e.getLocalizedMessage(), e); + } + + } + +} diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/out/web/PublishNewTaskAddedEventWebAdapter.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/out/web/PublishNewTaskAddedEventWebAdapter.java index d642eca..80b3d09 100644 --- a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/out/web/PublishNewTaskAddedEventWebAdapter.java +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/adapter/out/web/PublishNewTaskAddedEventWebAdapter.java @@ -29,6 +29,7 @@ public class PublishNewTaskAddedEventWebAdapter implements NewTaskAddedEventPort var values = new HashMap() {{ put("taskID", event.taskId); put("taskType", event.taskType); + put("inputData", event.inputData); }}; var objectMapper = new ObjectMapper(); @@ -42,7 +43,7 @@ public class PublishNewTaskAddedEventWebAdapter implements NewTaskAddedEventPort HttpClient client = HttpClient.newHttpClient(); HttpRequest request = HttpRequest.newBuilder() .uri(URI.create(server+"/task")) - .header("Content-Type", "application/json") + .header("Content-Type", "application/task+json") .POST(HttpRequest.BodyPublishers.ofString(requestBody)) .build(); diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/handler/TaskAssignedHandler.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/handler/TaskAssignedHandler.java new file mode 100644 index 0000000..7deb844 --- /dev/null +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/handler/TaskAssignedHandler.java @@ -0,0 +1,19 @@ +package ch.unisg.tapastasks.tasks.application.handler; + +import ch.unisg.tapastasks.tasks.application.port.in.TaskAssignedEvent; +import ch.unisg.tapastasks.tasks.application.port.in.TaskAssignedEventHandler; +import ch.unisg.tapastasks.tasks.domain.Task; +import ch.unisg.tapastasks.tasks.domain.TaskList; +import ch.unisg.tapastasks.tasks.domain.TaskNotFoundException; +import org.springframework.stereotype.Component; + +@Component +public class TaskAssignedHandler implements TaskAssignedEventHandler { + + @Override + public Task handleTaskAssigned(TaskAssignedEvent taskAssignedEvent) throws TaskNotFoundException { + TaskList taskList = TaskList.getTapasTaskList(); + return taskList.changeTaskStatusToAssigned(taskAssignedEvent.getTaskId(), + taskAssignedEvent.getServiceProvider()); + } +} diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/handler/TaskExecutedHandler.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/handler/TaskExecutedHandler.java new file mode 100644 index 0000000..ec21e8c --- /dev/null +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/handler/TaskExecutedHandler.java @@ -0,0 +1,19 @@ +package ch.unisg.tapastasks.tasks.application.handler; + +import ch.unisg.tapastasks.tasks.application.port.in.TaskExecutedEvent; +import ch.unisg.tapastasks.tasks.application.port.in.TaskExecutedEventHandler; +import ch.unisg.tapastasks.tasks.domain.Task; +import ch.unisg.tapastasks.tasks.domain.TaskList; +import ch.unisg.tapastasks.tasks.domain.TaskNotFoundException; +import org.springframework.stereotype.Component; + +@Component +public class TaskExecutedHandler implements TaskExecutedEventHandler { + + @Override + public Task handleTaskExecuted(TaskExecutedEvent taskExecutedEvent) throws TaskNotFoundException { + TaskList taskList = TaskList.getTapasTaskList(); + return taskList.changeTaskStatusToExecuted(taskExecutedEvent.getTaskId(), + taskExecutedEvent.getServiceProvider(), taskExecutedEvent.getOutputData()); + } +} diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/handler/TaskStartedHandler.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/handler/TaskStartedHandler.java new file mode 100644 index 0000000..758be0b --- /dev/null +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/handler/TaskStartedHandler.java @@ -0,0 +1,19 @@ +package ch.unisg.tapastasks.tasks.application.handler; + +import ch.unisg.tapastasks.tasks.application.port.in.TaskStartedEvent; +import ch.unisg.tapastasks.tasks.application.port.in.TaskStartedEventHandler; +import ch.unisg.tapastasks.tasks.domain.Task; +import ch.unisg.tapastasks.tasks.domain.TaskList; +import ch.unisg.tapastasks.tasks.domain.TaskNotFoundException; +import org.springframework.stereotype.Component; + +@Component +public class TaskStartedHandler implements TaskStartedEventHandler { + + @Override + public Task handleTaskStarted(TaskStartedEvent taskStartedEvent) throws TaskNotFoundException { + TaskList taskList = TaskList.getTapasTaskList(); + return taskList.changeTaskStatusToRunning(taskStartedEvent.getTaskId(), + taskStartedEvent.getServiceProvider()); + } +} diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/AddNewTaskToTaskListCommand.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/AddNewTaskToTaskListCommand.java index a0e0fec..d307a1f 100644 --- a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/AddNewTaskToTaskListCommand.java +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/AddNewTaskToTaskListCommand.java @@ -1,23 +1,38 @@ package ch.unisg.tapastasks.tasks.application.port.in; import ch.unisg.tapastasks.common.SelfValidating; -import ch.unisg.tapastasks.tasks.domain.Task.TaskType; -import ch.unisg.tapastasks.tasks.domain.Task.TaskName; +import ch.unisg.tapastasks.tasks.domain.Task; +import lombok.Getter; import lombok.Value; import javax.validation.constraints.NotNull; +import java.util.Optional; @Value public class AddNewTaskToTaskListCommand extends SelfValidating { @NotNull - private final TaskName taskName; + private final Task.TaskName taskName; @NotNull - private final TaskType taskType; + private final Task.TaskType taskType; - public AddNewTaskToTaskListCommand(TaskName taskName, TaskType taskType) { + @Getter + private final Optional originalTaskUri; + + @Getter + private final Optional inputData; + + public AddNewTaskToTaskListCommand( + Task.TaskName taskName, + Task.TaskType taskType, + Optional originalTaskUri, + Optional inputData + ) { this.taskName = taskName; this.taskType = taskType; + this.originalTaskUri = originalTaskUri; + this.inputData = inputData; + this.validateSelf(); } } diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/CompleteTaskCommand.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/CompleteTaskCommand.java index 0634165..238abd2 100644 --- a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/CompleteTaskCommand.java +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/CompleteTaskCommand.java @@ -1,6 +1,7 @@ package ch.unisg.tapastasks.tasks.application.port.in; import ch.unisg.tapastasks.common.SelfValidating; +import ch.unisg.tapastasks.tasks.domain.Task.OutputData; import ch.unisg.tapastasks.tasks.domain.Task.TaskId; import ch.unisg.tapastasks.tasks.domain.Task.TaskResult; import lombok.Value; @@ -13,11 +14,11 @@ public class CompleteTaskCommand extends SelfValidating { private final TaskId taskId; @NotNull - private final TaskResult taskResult; + private final OutputData outputData; - public CompleteTaskCommand(TaskId taskId, TaskResult taskResult){ + public CompleteTaskCommand(TaskId taskId, OutputData outputData){ this.taskId = taskId; - this.taskResult = taskResult; + this.outputData = outputData; this.validateSelf(); } } diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/DeleteTaskCommand.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/DeleteTaskCommand.java index 24acbb8..b57c719 100644 --- a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/DeleteTaskCommand.java +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/DeleteTaskCommand.java @@ -2,6 +2,7 @@ package ch.unisg.tapastasks.tasks.application.port.in; import ch.unisg.tapastasks.common.SelfValidating; import ch.unisg.tapastasks.tasks.domain.Task.TaskId; +import ch.unisg.tapastasks.tasks.domain.Task.OriginalTaskUri; import lombok.Value; import javax.validation.constraints.NotNull; @@ -11,8 +12,12 @@ public class DeleteTaskCommand extends SelfValidating { @NotNull private final TaskId taskId; - public DeleteTaskCommand(TaskId taskId){ + @NotNull + private final OriginalTaskUri taskUri; + + public DeleteTaskCommand(TaskId taskId, OriginalTaskUri taskUri){ this.taskId=taskId; + this.taskUri = taskUri; this.validateSelf(); } } diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/RetrieveTaskFromTaskListUseCase.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/RetrieveTaskFromTaskListUseCase.java index 40afc1d..cf7d787 100644 --- a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/RetrieveTaskFromTaskListUseCase.java +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/RetrieveTaskFromTaskListUseCase.java @@ -5,5 +5,5 @@ import ch.unisg.tapastasks.tasks.domain.Task; import java.util.Optional; public interface RetrieveTaskFromTaskListUseCase { - Optional retrieveTaskFromTaskList(RetrieveTaskFromTaskListQuery command); + Optional retrieveTaskFromTaskList(RetrieveTaskFromTaskListQuery query); } diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/TaskAssignedEvent.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/TaskAssignedEvent.java new file mode 100644 index 0000000..c58d034 --- /dev/null +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/TaskAssignedEvent.java @@ -0,0 +1,25 @@ +package ch.unisg.tapastasks.tasks.application.port.in; + +import ch.unisg.tapastasks.common.SelfValidating; +import ch.unisg.tapastasks.tasks.domain.Task; +import lombok.Getter; +import lombok.Value; + +import javax.validation.constraints.NotNull; +import java.util.Optional; + +@Value +public class TaskAssignedEvent extends SelfValidating { + @NotNull + private final Task.TaskId taskId; + + @Getter + private final Optional serviceProvider; + + public TaskAssignedEvent(Task.TaskId taskId, Optional serviceProvider) { + this.taskId = taskId; + this.serviceProvider = serviceProvider; + + this.validateSelf(); + } +} diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/TaskAssignedEventHandler.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/TaskAssignedEventHandler.java new file mode 100644 index 0000000..67f78dd --- /dev/null +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/TaskAssignedEventHandler.java @@ -0,0 +1,8 @@ +package ch.unisg.tapastasks.tasks.application.port.in; + +import ch.unisg.tapastasks.tasks.domain.Task; + +public interface TaskAssignedEventHandler { + + Task handleTaskAssigned(TaskAssignedEvent taskStartedEvent); +} diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/TaskExecutedEvent.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/TaskExecutedEvent.java new file mode 100644 index 0000000..7ed9c84 --- /dev/null +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/TaskExecutedEvent.java @@ -0,0 +1,34 @@ +package ch.unisg.tapastasks.tasks.application.port.in; + +import ch.unisg.tapastasks.common.SelfValidating; +import ch.unisg.tapastasks.tasks.domain.Task.*; +import lombok.Getter; +import lombok.Value; + +import javax.validation.constraints.NotNull; +import java.util.Optional; + +@Value +public class TaskExecutedEvent extends SelfValidating { + @NotNull + private final TaskId taskId; + + @Getter + private final Optional serviceProvider; + + @Getter + private final Optional outputData; + + public TaskExecutedEvent(TaskId taskId, Optional serviceProvider, + Optional outputData) { + this.taskId = taskId; + + this.serviceProvider = serviceProvider; + this.outputData = outputData; + + this.validateSelf(); + } + + + +} diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/TaskExecutedEventHandler.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/TaskExecutedEventHandler.java new file mode 100644 index 0000000..c1a18dc --- /dev/null +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/TaskExecutedEventHandler.java @@ -0,0 +1,8 @@ +package ch.unisg.tapastasks.tasks.application.port.in; + +import ch.unisg.tapastasks.tasks.domain.Task; + +public interface TaskExecutedEventHandler { + + Task handleTaskExecuted(TaskExecutedEvent taskExecutedEvent); +} diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/TaskStartedEvent.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/TaskStartedEvent.java new file mode 100644 index 0000000..8fad698 --- /dev/null +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/TaskStartedEvent.java @@ -0,0 +1,28 @@ +package ch.unisg.tapastasks.tasks.application.port.in; + +import ch.unisg.tapastasks.common.SelfValidating; +import ch.unisg.tapastasks.tasks.domain.Task; +import lombok.Getter; +import lombok.Value; + +import javax.validation.constraints.NotNull; +import java.util.Optional; + +@Value +public class TaskStartedEvent extends SelfValidating { + @NotNull + private final Task.TaskId taskId; + + @Getter + private final Optional serviceProvider; + + public TaskStartedEvent(Task.TaskId taskId, Optional serviceProvider) { + this.taskId = taskId; + this.serviceProvider = serviceProvider; + + this.validateSelf(); + } + + + +} diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/TaskStartedEventHandler.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/TaskStartedEventHandler.java new file mode 100644 index 0000000..0da730e --- /dev/null +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/in/TaskStartedEventHandler.java @@ -0,0 +1,8 @@ +package ch.unisg.tapastasks.tasks.application.port.in; + +import ch.unisg.tapastasks.tasks.domain.Task; + +public interface TaskStartedEventHandler { + + Task handleTaskStarted(TaskStartedEvent taskStartedEvent); +} diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/out/CanTaskBeDeletedPort.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/out/CanTaskBeDeletedPort.java new file mode 100644 index 0000000..67bde16 --- /dev/null +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/out/CanTaskBeDeletedPort.java @@ -0,0 +1,7 @@ +package ch.unisg.tapastasks.tasks.application.port.out; + +import ch.unisg.tapastasks.tasks.domain.DeleteTaskEvent; + +public interface CanTaskBeDeletedPort { + void canTaskBeDeletedEvent(DeleteTaskEvent event); +} diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/out/ExternalTaskExecutedEvent.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/out/ExternalTaskExecutedEvent.java new file mode 100644 index 0000000..43bad47 --- /dev/null +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/out/ExternalTaskExecutedEvent.java @@ -0,0 +1,28 @@ +package ch.unisg.tapastasks.tasks.application.port.out; + +import javax.validation.constraints.NotNull; + +import ch.unisg.tapastasks.common.SelfValidating; +import ch.unisg.tapastasks.tasks.domain.Task; +import lombok.Getter; +import lombok.Value; + +@Value +public class ExternalTaskExecutedEvent extends SelfValidating { + @NotNull + private final Task.TaskId taskId; + + @Getter + private final Task.OriginalTaskUri originalTaskUri; + + @Getter + private final Task.OutputData outputData; + + public ExternalTaskExecutedEvent(Task.TaskId taskId, Task.OriginalTaskUri originalTaskUri, Task.OutputData outputData) { + this.taskId = taskId; + this.originalTaskUri = originalTaskUri; + this.outputData = outputData; + + this.validateSelf(); + } +} diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/out/ExternalTaskExecutedEventHandler.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/out/ExternalTaskExecutedEventHandler.java new file mode 100644 index 0000000..90bff49 --- /dev/null +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/port/out/ExternalTaskExecutedEventHandler.java @@ -0,0 +1,5 @@ +package ch.unisg.tapastasks.tasks.application.port.out; + +public interface ExternalTaskExecutedEventHandler { + void handleEvent(ExternalTaskExecutedEvent externalTaskExecutedEvent); +} diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/service/AddNewTaskToTaskListService.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/service/AddNewTaskToTaskListService.java index 24f68d0..26234ce 100644 --- a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/service/AddNewTaskToTaskListService.java +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/service/AddNewTaskToTaskListService.java @@ -21,7 +21,27 @@ public class AddNewTaskToTaskListService implements AddNewTaskToTaskListUseCase @Override public Task addNewTaskToTaskList(AddNewTaskToTaskListCommand command) { TaskList taskList = TaskList.getTapasTaskList(); - Task newTask = taskList.addNewTaskWithNameAndType(command.getTaskName(), command.getTaskType()); + + Task newTask; + + System.out.println("TEST:"); + System.out.println(command.getInputData().get()); + + if (command.getOriginalTaskUri().isPresent() && command.getInputData().isPresent()) { + System.out.println("TEST2:"); + newTask = taskList.addNewTaskWithNameAndTypeAndOriginalTaskUriAndInputData(command.getTaskName(), + command.getTaskType(), command.getOriginalTaskUri().get(), command.getInputData().get()); + } else if (command.getOriginalTaskUri().isPresent()) { + newTask = taskList.addNewTaskWithNameAndTypeAndOriginalTaskUri(command.getTaskName(), + command.getTaskType(), command.getOriginalTaskUri().get()); + } else if (command.getOriginalTaskUri().isPresent()) { + newTask = null; + } else { + 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. //This event should be considered as a light-weight "integration event" to communicate with other services. @@ -29,8 +49,13 @@ public class AddNewTaskToTaskListService implements AddNewTaskToTaskListUseCase //not recommended to emit a domain event via an application service! You should first emit the domain event in //the core and then the integration event in the application layer. if (newTask != null) { - NewTaskAddedEvent newTaskAdded = new NewTaskAddedEvent(newTask.getTaskName().getValue(), - taskList.getTaskListName().getValue(), newTask.getTaskId().getValue(), newTask.getTaskType().getValue()); + NewTaskAddedEvent newTaskAdded = new NewTaskAddedEvent( + newTask.getTaskName().getValue(), + taskList.getTaskListName().getValue(), + newTask.getTaskId().getValue(), + newTask.getTaskType().getValue(), + newTask.getInputData().getValue() + ); newTaskAddedEventPort.publishNewTaskAddedEvent(newTaskAdded); } diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/service/CompleteTaskService.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/service/CompleteTaskService.java index bade832..df22421 100644 --- a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/service/CompleteTaskService.java +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/service/CompleteTaskService.java @@ -2,10 +2,11 @@ package ch.unisg.tapastasks.tasks.application.service; import ch.unisg.tapastasks.tasks.application.port.in.CompleteTaskCommand; import ch.unisg.tapastasks.tasks.application.port.in.CompleteTaskUseCase; +import ch.unisg.tapastasks.tasks.application.port.out.ExternalTaskExecutedEvent; +import ch.unisg.tapastasks.tasks.application.port.out.ExternalTaskExecutedEventHandler; import ch.unisg.tapastasks.tasks.domain.Task; import ch.unisg.tapastasks.tasks.domain.Task.*; import ch.unisg.tapastasks.tasks.domain.TaskList; -import lombok.Getter; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; @@ -17,19 +18,26 @@ import java.util.Optional; @Transactional public class CompleteTaskService implements CompleteTaskUseCase { + private final ExternalTaskExecutedEventHandler externalTaskExecutedEventHandler; + @Override public Task completeTask(CompleteTaskCommand command){ - // TODO Retrieve the task based on ID TaskList taskList = TaskList.getTapasTaskList(); Optional updatedTask = taskList.retrieveTaskById(command.getTaskId()); - // TODO Update the status and result (and save?) Task newTask = updatedTask.get(); - newTask.taskResult = new TaskResult(command.getTaskResult().getValue()); - newTask.taskState = new TaskState(Task.State.EXECUTED); + newTask.taskResult = new TaskResult(command.getOutputData().getValue()); + newTask.taskStatus = new TaskStatus(Task.Status.EXECUTED); + if (!newTask.getOriginalTaskUri().getValue().equalsIgnoreCase("")) { + ExternalTaskExecutedEvent event = new ExternalTaskExecutedEvent( + newTask.getTaskId(), + newTask.getOriginalTaskUri(), + newTask.getOutputData() + ); + externalTaskExecutedEventHandler.handleEvent(event); + } - // TODO return the updated task return newTask; } } diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/service/DeleteTaskService.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/service/DeleteTaskService.java index cfebcd6..35685a3 100644 --- a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/service/DeleteTaskService.java +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/service/DeleteTaskService.java @@ -5,6 +5,7 @@ import ch.unisg.tapastasks.tasks.application.port.in.DeleteTaskCommand; import ch.unisg.tapastasks.tasks.application.port.in.DeleteTaskUseCase; import ch.unisg.tapastasks.tasks.domain.Task; import ch.unisg.tapastasks.tasks.domain.TaskList; +import jdk.jshell.spi.ExecutionControl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; @@ -19,10 +20,14 @@ public class DeleteTaskService implements DeleteTaskUseCase { @Override public Optional deleteTask(DeleteTaskCommand command){ - // TODO check with assignment service if we can delte - TaskList taskList = TaskList.getTapasTaskList(); - return taskList.deleteTaskById(command.getTaskId()); - + Optional updatedTask = taskList.retrieveTaskById(command.getTaskId()); + Task newTask = updatedTask.get(); + // TODO: Fill in the right condition into the if-statement and the else-statement + if (true){ + return taskList.deleteTaskById(command.getTaskId()); + } + // TODO Handle with a return message + return Optional.empty(); } } diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/service/RetrieveTaskFromTaskListService.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/service/RetrieveTaskFromTaskListService.java index 46043b0..fd6aea5 100644 --- a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/service/RetrieveTaskFromTaskListService.java +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/service/RetrieveTaskFromTaskListService.java @@ -15,8 +15,8 @@ import java.util.Optional; @Transactional public class RetrieveTaskFromTaskListService implements RetrieveTaskFromTaskListUseCase { @Override - public Optional retrieveTaskFromTaskList(RetrieveTaskFromTaskListQuery command) { + public Optional retrieveTaskFromTaskList(RetrieveTaskFromTaskListQuery query) { TaskList taskList = TaskList.getTapasTaskList(); - return taskList.retrieveTaskById(command.getTaskId()); + return taskList.retrieveTaskById(query.getTaskId()); } } diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/service/TaskAssignedService.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/service/TaskAssignedService.java index baa6059..6c580e4 100644 --- a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/service/TaskAssignedService.java +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/application/service/TaskAssignedService.java @@ -24,7 +24,7 @@ public class TaskAssignedService implements TaskAssignedUseCase { // update the status to assigned Task updatedTask = task.get(); - updatedTask.taskState = new TaskState(State.ASSIGNED); + updatedTask.taskStatus = new TaskStatus(Status.ASSIGNED); return updatedTask; } diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/domain/DeleteTaskEvent.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/domain/DeleteTaskEvent.java new file mode 100644 index 0000000..16e803b --- /dev/null +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/domain/DeleteTaskEvent.java @@ -0,0 +1,11 @@ +package ch.unisg.tapastasks.tasks.domain; + +public class DeleteTaskEvent { + public String taskId; + public String taskUri; + + public DeleteTaskEvent(String taskId, String taskUri){ + this.taskId = taskId; + this.taskUri = taskUri; + } +} diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/domain/NewTaskAddedEvent.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/domain/NewTaskAddedEvent.java index a4703f2..049c2fb 100644 --- a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/domain/NewTaskAddedEvent.java +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/domain/NewTaskAddedEvent.java @@ -6,12 +6,14 @@ public class NewTaskAddedEvent { public String taskListName; public String taskId; public String taskType; + public String inputData; - public NewTaskAddedEvent(String taskName, String taskListName, String taskId, String taskType) { + public NewTaskAddedEvent(String taskName, String taskListName, String taskId, String taskType, String inputData) { this.taskName = taskName; this.taskListName = taskListName; this.taskId = taskId; this.taskType = taskType; + this.inputData = inputData; } } diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/domain/Task.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/domain/Task.java index 3decd1f..d07f0f1 100644 --- a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/domain/Task.java +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/domain/Task.java @@ -8,7 +8,7 @@ import java.util.UUID; /**This is a domain entity**/ public class Task { - public enum State { + public enum Status { OPEN, ASSIGNED, RUNNING, EXECUTED } @@ -21,45 +21,102 @@ public class Task { @Getter private final TaskType taskType; - @Getter - public TaskState taskState; // had to make public for CompleteTaskService + @Getter @Setter + public TaskStatus taskStatus; // had to make public for CompleteTaskService @Getter public TaskResult taskResult; // same as above + @Getter + private final OriginalTaskUri originalTaskUri; - public Task(TaskName taskName, TaskType taskType) { + @Getter @Setter + private ServiceProvider provider; + + @Getter @Setter + private InputData inputData; + + @Getter @Setter + private OutputData outputData; + + public Task(TaskName taskName, TaskType taskType, OriginalTaskUri taskUri) { this.taskName = taskName; this.taskType = taskType; - this.taskState = new TaskState(State.OPEN); + this.taskStatus = new TaskStatus(Status.OPEN); this.taskId = new TaskId(UUID.randomUUID().toString()); this.taskResult = new TaskResult(""); + this.originalTaskUri = taskUri; + + this.inputData = null; + this.outputData = null; + } + + public Task(TaskName taskName, TaskType taskType, OriginalTaskUri taskUri, InputData inputData) { + this.taskName = taskName; + this.taskType = taskType; + this.taskStatus = new TaskStatus(Status.OPEN); + this.taskId = new TaskId(UUID.randomUUID().toString()); + this.taskResult = new TaskResult(""); + this.originalTaskUri = taskUri; + + this.inputData = inputData; + this.outputData = null; } 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 System.out.println("New Task: " + name.getValue() + " " + type.getValue()); - return new Task(name,type); + return new Task(name, type, null); + } + + protected static Task createTaskWithNameAndTypeAndOriginalTaskUri(TaskName name, TaskType type, + OriginalTaskUri originalTaskUri) { + return new Task(name, type, originalTaskUri); + } + + protected static Task createTaskWithNameAndTypeAndOriginalTaskUriAndInputData(TaskName name, TaskType type, + OriginalTaskUri originalTaskUri, InputData inputData) { + return new Task(name, type, originalTaskUri, inputData); } @Value public static class TaskId { - private String value; + String value; } @Value public static class TaskName { - private String value; - } - - @Value - public static class TaskState { - private State value; + String value; } @Value public static class TaskType { - private String value; + String value; + } + + @Value + public static class OriginalTaskUri { + String value; + } + + @Value + public static class TaskStatus { + Status value; + } + + @Value + public static class ServiceProvider { + String value; + } + + @Value + public static class InputData { + String value; + } + + @Value + public static class OutputData { + String value; } @Value diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/domain/TaskList.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/domain/TaskList.java index ccdc59a..72160e8 100644 --- a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/domain/TaskList.java +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/domain/TaskList.java @@ -3,7 +3,6 @@ package ch.unisg.tapastasks.tasks.domain; import lombok.Getter; import lombok.Value; -import javax.swing.text.html.Option; import java.util.LinkedList; import java.util.List; import java.util.Optional; @@ -20,6 +19,7 @@ public class TaskList { //Note: We do not care about the management of task lists, there is only one within this service //--> using the Singleton pattern here to make lives easy; we will later load it from a repo + private static final TaskList taskList = new TaskList(new TaskListName("tapas-tasks-group1")); private TaskList(TaskListName taskListName) { @@ -34,14 +34,36 @@ public class TaskList { //Only the aggregate root is allowed to create new tasks and add them to the task list. //Note: Here we could add some sophisticated invariants/business rules that the aggregate root checks public Task addNewTaskWithNameAndType(Task.TaskName name, Task.TaskType type) { - Task newTask = Task.createTaskWithNameAndType(name,type); - listOfTasks.value.add(newTask); - //This is a simple debug message to see that the task list is growing with each new request - System.out.println("Number of tasks: "+listOfTasks.value.size()); + Task newTask = Task.createTaskWithNameAndType(name, type); + this.addNewTaskToList(newTask); + + return newTask; + } + + public Task addNewTaskWithNameAndTypeAndOriginalTaskUri(Task.TaskName name, Task.TaskType type, + Task.OriginalTaskUri originalTaskUri) { + Task newTask = Task.createTaskWithNameAndTypeAndOriginalTaskUri(name, type, originalTaskUri); + this.addNewTaskToList(newTask); + + return newTask; + } + + public Task addNewTaskWithNameAndTypeAndOriginalTaskUriAndInputData(Task.TaskName name, Task.TaskType type, + Task.OriginalTaskUri originalTaskUri, Task.InputData inputData) { + Task newTask = Task.createTaskWithNameAndTypeAndOriginalTaskUriAndInputData(name, type, originalTaskUri, inputData); + this.addNewTaskToList(newTask); + + return newTask; + } + + + private void addNewTaskToList(Task newTask) { //Here we would also publish a domain event to other entities in the core interested in this event. //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). - return newTask; + listOfTasks.value.add(newTask); + //This is a simple debug message to see that the task list is growing with each new request + System.out.println("Number of tasks: " + listOfTasks.value.size()); } public Optional retrieveTaskById(Task.TaskId id) { @@ -55,8 +77,8 @@ public class TaskList { } public Optional deleteTaskById(Task.TaskId id) { - for (Task task: listOfTasks.value){ - if(task.getTaskId().getValue().equalsIgnoreCase(id.getValue())){ + for (Task task : listOfTasks.value) { + if (task.getTaskId().getValue().equalsIgnoreCase(id.getValue())) { listOfTasks.value.remove(task); return Optional.of(task); } @@ -64,6 +86,42 @@ public class TaskList { return Optional.empty(); } + public Task changeTaskStatusToAssigned(Task.TaskId id, Optional serviceProvider) + throws TaskNotFoundException { + return changeTaskStatus(id, new Task.TaskStatus(Task.Status.ASSIGNED), serviceProvider, Optional.empty()); + } + + public Task changeTaskStatusToRunning(Task.TaskId id, Optional serviceProvider) + throws TaskNotFoundException { + return changeTaskStatus(id, new Task.TaskStatus(Task.Status.RUNNING), serviceProvider, Optional.empty()); + } + + public Task changeTaskStatusToExecuted(Task.TaskId id, Optional serviceProvider, + Optional outputData) throws TaskNotFoundException { + return changeTaskStatus(id, new Task.TaskStatus(Task.Status.EXECUTED), serviceProvider, outputData); + } + + private Task changeTaskStatus(Task.TaskId id, Task.TaskStatus status, Optional serviceProvider, + Optional outputData) { + Optional taskOpt = retrieveTaskById(id); + + if (taskOpt.isEmpty()) { + throw new TaskNotFoundException(); + } + + Task task = taskOpt.get(); + task.setTaskStatus(status); + + if (serviceProvider.isPresent()) { + task.setProvider(serviceProvider.get()); + } + + if (outputData.isPresent()) { + task.setOutputData(outputData.get()); + } + + return task; + } @Value public static class TaskListName { @@ -74,5 +132,4 @@ public class TaskList { public static class ListOfTasks { private List value; } - } diff --git a/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/domain/TaskNotFoundException.java b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/domain/TaskNotFoundException.java new file mode 100644 index 0000000..830b934 --- /dev/null +++ b/tapas-tasks/src/main/java/ch/unisg/tapastasks/tasks/domain/TaskNotFoundException.java @@ -0,0 +1,3 @@ +package ch.unisg.tapastasks.tasks.domain; + +public class TaskNotFoundException extends RuntimeException { } diff --git a/tapas-tasks/src/main/resources/application.properties b/tapas-tasks/src/main/resources/application.properties index 4d360de..fe25873 100644 --- a/tapas-tasks/src/main/resources/application.properties +++ b/tapas-tasks/src/main/resources/application.properties @@ -1 +1,2 @@ server.port=8081 +baseuri=https://tapas-tasks.86-119-34-23.nip.io/