maece/HSG-MCS-HS21_tapas
1
0
Fork 0
Code Issues 14 Pull Requests Packages Projects Releases 6 Wiki Activity

Common library + roster service updates #52

Merged
Maece97 merged 7 commits from common into dev 2021-11-08 13:35:38 +00:00
Conversation 0 Commits 7 Files Changed 114 +1231 -931
61 changed files with 1231 additions and 931 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6752454838 - Show all commits

6
assignment/pom.xml
View File

@ -62,6 +62,12 @@
<version>20210307</version> <version>20210307</version>
</dependency> </dependency>
<dependency>
<groupId>ch.unisg</groupId>
<artifactId>common</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
</dependencies> </dependencies>

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

@ -21,7 +21,7 @@ public class ApplyForTaskController {
public Task applyForTask(@RequestBody ExecutorInfo executorInfo) { public Task applyForTask(@RequestBody ExecutorInfo executorInfo) {
ApplyForTaskCommand command = new ApplyForTaskCommand(executorInfo.getExecutorType(), ApplyForTaskCommand command = new ApplyForTaskCommand(executorInfo.getExecutorType(),
executorInfo.getIp(), executorInfo.getPort()); executorInfo.getExecutorURI());
return applyForTaskUseCase.applyForTask(command); return applyForTaskUseCase.applyForTask(command);

18
assignment/src/main/java/ch/unisg/assignment/assignment/adapter/in/web/WebControllerExceptionHandler.java
View File

@ -5,27 +5,17 @@ import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ExceptionHandler;
import ch.unisg.assignment.common.exception.ErrorResponse; import ch.unisg.common.exception.ErrorResponse;
import ch.unisg.assignment.common.exception.InvalidIP4Exception; import ch.unisg.common.exception.InvalidExecutorURIException;
import ch.unisg.assignment.common.exception.PortOutOfRangeException;
@ControllerAdvice @ControllerAdvice
public class WebControllerExceptionHandler { public class WebControllerExceptionHandler {
@ExceptionHandler(PortOutOfRangeException.class) @ExceptionHandler(InvalidExecutorURIException.class)
public ResponseEntity<ErrorResponse> handleException(PortOutOfRangeException e){ public ResponseEntity<ErrorResponse> handleException(InvalidExecutorURIException e){
ErrorResponse error = new ErrorResponse(HttpStatus.BAD_REQUEST, e.getLocalizedMessage()); ErrorResponse error = new ErrorResponse(HttpStatus.BAD_REQUEST, e.getLocalizedMessage());
return new ResponseEntity<>(error, error.getHttpStatus()); return new ResponseEntity<>(error, error.getHttpStatus());
} }
@ExceptionHandler(InvalidIP4Exception.class)
public ResponseEntity<ErrorResponse> handleException(InvalidIP4Exception e){
ErrorResponse error = new ErrorResponse(HttpStatus.BAD_REQUEST, e.getLocalizedMessage());
return new ResponseEntity<>(error, error.getHttpStatus());
}
} }

15
assignment/src/main/java/ch/unisg/assignment/assignment/adapter/out/web/GetAllExecutorInExecutorPoolByTypeAdapter.java
View File

@ -9,7 +9,7 @@ import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONObject; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.Primary;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -21,9 +21,11 @@ import ch.unisg.assignment.assignment.domain.valueobject.ExecutorType;
@Primary @Primary
public class GetAllExecutorInExecutorPoolByTypeAdapter implements GetAllExecutorInExecutorPoolByTypePort { public class GetAllExecutorInExecutorPoolByTypeAdapter implements GetAllExecutorInExecutorPoolByTypePort {
@Value("${executor-pool.url}")
private String server;
@Override @Override
public boolean doesExecutorTypeExist(ExecutorType type) { public boolean doesExecutorTypeExist(ExecutorType type) {
String server = "http://127.0.0.1:8083";
Logger logger = Logger.getLogger(PublishNewTaskEventAdapter.class.getName()); Logger logger = Logger.getLogger(PublishNewTaskEventAdapter.class.getName());
@ -37,17 +39,18 @@ public class GetAllExecutorInExecutorPoolByTypeAdapter implements GetAllExecutor
try { try {
HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofString()); HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
if (response.statusCode() == HttpStatus.OK.value()) { if (response.statusCode() == HttpStatus.OK.value()) {
JSONArray jsonArray = new JSONArray(response.body().toString()); JSONArray jsonArray = new JSONArray(response.body());
if (jsonArray.length() > 0) { if (jsonArray.length() > 0) {
return true; return true;
} }
} }
} catch (IOException | InterruptedException e) { } catch (InterruptedException e) {
logger.log(Level.SEVERE, e.getLocalizedMessage(), e); logger.log(Level.SEVERE, e.getLocalizedMessage(), e);
// Restore interrupted state...
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
} catch (IOException e) {
logger.log(Level.SEVERE, e.getLocalizedMessage(), e);
} }
return false; return false;
} }

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

@ -8,6 +8,7 @@ import java.net.http.HttpResponse;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -18,8 +19,11 @@ import ch.unisg.assignment.assignment.domain.event.NewTaskEvent;
@Primary @Primary
public class PublishNewTaskEventAdapter implements NewTaskEventPort { public class PublishNewTaskEventAdapter implements NewTaskEventPort {
String server = "http://127.0.0.1:8084"; @Value("${executor1.url}")
String server2 = "http://127.0.0.1:8085"; private String server;
@Value("${executor2.url}")
private String server2;
Logger logger = Logger.getLogger(PublishNewTaskEventAdapter.class.getName()); Logger logger = Logger.getLogger(PublishNewTaskEventAdapter.class.getName());
@ -35,10 +39,11 @@ public class PublishNewTaskEventAdapter implements NewTaskEventPort {
try { try {
client.send(request, HttpResponse.BodyHandlers.ofString()); client.send(request, HttpResponse.BodyHandlers.ofString());
} catch (IOException | InterruptedException e) { } catch (InterruptedException e) {
logger.log(Level.SEVERE, e.getLocalizedMessage(), e); logger.log(Level.SEVERE, e.getLocalizedMessage(), e);
// Restore interrupted state...
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
} catch (IOException e) {
logger.log(Level.SEVERE, e.getLocalizedMessage(), e);
} }
HttpClient client2 = HttpClient.newHttpClient(); HttpClient client2 = HttpClient.newHttpClient();
@ -49,11 +54,12 @@ public class PublishNewTaskEventAdapter implements NewTaskEventPort {
try { try {
client.send(request, HttpResponse.BodyHandlers.ofString()); client2.send(request2, HttpResponse.BodyHandlers.ofString());
} catch (IOException | InterruptedException e) { } catch (InterruptedException e) {
logger.log(Level.SEVERE, e.getLocalizedMessage(), e); logger.log(Level.SEVERE, e.getLocalizedMessage(), e);
// Restore interrupted state...
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
} catch (IOException e) {
logger.log(Level.SEVERE, e.getLocalizedMessage(), e);
} }
} }

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

@ -9,6 +9,7 @@ import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.json.JSONObject; import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -19,7 +20,8 @@ import ch.unisg.assignment.assignment.domain.event.TaskAssignedEvent;
@Primary @Primary
public class PublishTaskAssignedEventAdapter implements TaskAssignedEventPort { public class PublishTaskAssignedEventAdapter implements TaskAssignedEventPort {
String server = "http://127.0.0.1:8081"; @Value("${task-list.url}")
private String server;
Logger logger = Logger.getLogger(PublishTaskAssignedEventAdapter.class.getName()); Logger logger = Logger.getLogger(PublishTaskAssignedEventAdapter.class.getName());
@ -40,10 +42,11 @@ public class PublishTaskAssignedEventAdapter implements TaskAssignedEventPort {
try { try {
client.send(request, HttpResponse.BodyHandlers.ofString()); client.send(request, HttpResponse.BodyHandlers.ofString());
} catch (IOException | InterruptedException e) { } catch (InterruptedException e) {
logger.log(Level.SEVERE, e.getLocalizedMessage(), e); logger.log(Level.SEVERE, e.getLocalizedMessage(), e);
// Restore interrupted state...
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
} catch (IOException e) {
logger.log(Level.SEVERE, e.getLocalizedMessage(), e);
} }
} }

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

@ -9,6 +9,7 @@ import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.json.JSONObject; import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -19,7 +20,8 @@ import ch.unisg.assignment.assignment.domain.event.TaskCompletedEvent;
@Primary @Primary
public class PublishTaskCompletedEventAdapter implements TaskCompletedEventPort { 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()); Logger logger = Logger.getLogger(PublishTaskCompletedEventAdapter.class.getName());
@ -42,10 +44,11 @@ public class PublishTaskCompletedEventAdapter implements TaskCompletedEventPort
try { try {
client.send(request, HttpResponse.BodyHandlers.ofString()); client.send(request, HttpResponse.BodyHandlers.ofString());
} catch (IOException | InterruptedException e) { } catch (InterruptedException e) {
logger.log(Level.SEVERE, e.getLocalizedMessage(), e); logger.log(Level.SEVERE, e.getLocalizedMessage(), e);
// Restore interrupted state...
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
} catch (IOException e) {
logger.log(Level.SEVERE, e.getLocalizedMessage(), e);
} }
} }

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

@ -3,9 +3,8 @@ package ch.unisg.assignment.assignment.application.port.in;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import ch.unisg.assignment.assignment.domain.valueobject.ExecutorType; import ch.unisg.assignment.assignment.domain.valueobject.ExecutorType;
import ch.unisg.assignment.assignment.domain.valueobject.IP4Adress; import ch.unisg.common.validation.SelfValidating;
import ch.unisg.assignment.assignment.domain.valueobject.Port; import ch.unisg.common.valueobject.ExecutorURI;
import ch.unisg.assignment.common.SelfValidating;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Value; import lombok.Value;
@ -17,16 +16,11 @@ public class ApplyForTaskCommand extends SelfValidating<ApplyForTaskCommand>{
private final ExecutorType taskType; private final ExecutorType taskType;
@NotNull @NotNull
private final IP4Adress executorIP; private final ExecutorURI executorURI;
public ApplyForTaskCommand(ExecutorType taskType, ExecutorURI executorURI) {
@NotNull
private final Port executorPort;
public ApplyForTaskCommand(ExecutorType taskType, IP4Adress executorIP, Port executorPort) {
this.taskType = taskType; this.taskType = taskType;
this.executorIP = executorIP; this.executorURI = executorURI;
this.executorPort = executorPort;
this.validateSelf(); this.validateSelf();
} }
} }

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

@ -3,7 +3,7 @@ package ch.unisg.assignment.assignment.application.port.in;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import ch.unisg.assignment.assignment.domain.valueobject.ExecutorType; import ch.unisg.assignment.assignment.domain.valueobject.ExecutorType;
import ch.unisg.assignment.common.SelfValidating; import ch.unisg.common.validation.SelfValidating;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Value; import lombok.Value;

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

@ -2,7 +2,7 @@ package ch.unisg.assignment.assignment.application.port.in;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import ch.unisg.assignment.common.SelfValidating; import ch.unisg.common.validation.SelfValidating;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Value; import lombok.Value;

2
assignment/src/main/java/ch/unisg/assignment/assignment/application/service/ApplyForTaskService.java
View File

@ -22,7 +22,7 @@ public class ApplyForTaskService implements ApplyForTaskUseCase {
@Override @Override
public Task applyForTask(ApplyForTaskCommand command) { public Task applyForTask(ApplyForTaskCommand command) {
Task task = Roster.getInstance().assignTaskToExecutor(command.getTaskType(), Task task = Roster.getInstance().assignTaskToExecutor(command.getTaskType(),
command.getExecutorIP(), command.getExecutorPort()); command.getExecutorURI());
if (task != null) { if (task != null) {
taskAssignedEventPort.publishTaskAssignedEvent(new TaskAssignedEvent(task.getTaskID())); taskAssignedEventPort.publishTaskAssignedEvent(new TaskAssignedEvent(task.getTaskID()));

4
assignment/src/main/java/ch/unisg/assignment/assignment/application/service/NewTaskService.java
View File

@ -1,8 +1,5 @@
package ch.unisg.assignment.assignment.application.service; package ch.unisg.assignment.assignment.application.service;
import java.util.Arrays;
import java.util.List;
import javax.transaction.Transactional; import javax.transaction.Transactional;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -27,7 +24,6 @@ public class NewTaskService implements NewTaskUseCase {
@Override @Override
public boolean addNewTaskToQueue(NewTaskCommand command) { public boolean addNewTaskToQueue(NewTaskCommand command) {
// TODO Get availableTaskTypes from executor pool
if (!getAllExecutorInExecutorPoolByTypePort.doesExecutorTypeExist(command.getTaskType())) { if (!getAllExecutorInExecutorPoolByTypePort.doesExecutorTypeExist(command.getTaskType())) {
return false; return false;
} }

9
assignment/src/main/java/ch/unisg/assignment/assignment/domain/ExecutorInfo.java
View File

@ -1,19 +1,14 @@
package ch.unisg.assignment.assignment.domain; package ch.unisg.assignment.assignment.domain;
import ch.unisg.assignment.assignment.domain.valueobject.ExecutorType; import ch.unisg.assignment.assignment.domain.valueobject.ExecutorType;
import ch.unisg.assignment.assignment.domain.valueobject.IP4Adress; import ch.unisg.common.valueobject.ExecutorURI;
import ch.unisg.assignment.assignment.domain.valueobject.Port;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
public class ExecutorInfo { public class ExecutorInfo {
@Getter @Getter
@Setter @Setter
private IP4Adress ip; private ExecutorURI executorURI;
@Getter
@Setter
private Port port;
@Getter @Getter
@Setter @Setter

7
assignment/src/main/java/ch/unisg/assignment/assignment/domain/Roster.java
View File

@ -5,8 +5,7 @@ import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import ch.unisg.assignment.assignment.domain.valueobject.ExecutorType; import ch.unisg.assignment.assignment.domain.valueobject.ExecutorType;
import ch.unisg.assignment.assignment.domain.valueobject.IP4Adress; import ch.unisg.common.valueobject.ExecutorURI;
import ch.unisg.assignment.assignment.domain.valueobject.Port;
public class Roster { public class Roster {
@ -30,7 +29,7 @@ public class Roster {
} }
} }
public Task assignTaskToExecutor(ExecutorType taskType, IP4Adress executorIP, Port executorPort) { public Task assignTaskToExecutor(ExecutorType taskType, ExecutorURI executorURI) {
if (!queues.containsKey(taskType.getValue())) { if (!queues.containsKey(taskType.getValue())) {
return null; return null;
} }
@ -41,7 +40,7 @@ public class Roster {
Task task = queues.get(taskType.getValue()).remove(0); Task task = queues.get(taskType.getValue()).remove(0);
rosterMap.put(task.getTaskID(), new RosterItem(task.getTaskID(), rosterMap.put(task.getTaskID(), new RosterItem(task.getTaskID(),
task.getTaskType().getValue(), executorIP, executorPort)); task.getTaskType().getValue(), executorURI));
return task; return task;
} }

14
assignment/src/main/java/ch/unisg/assignment/assignment/domain/RosterItem.java
View File

@ -1,7 +1,6 @@
package ch.unisg.assignment.assignment.domain; package ch.unisg.assignment.assignment.domain;
import ch.unisg.assignment.assignment.domain.valueobject.IP4Adress; import ch.unisg.common.valueobject.ExecutorURI;
import ch.unisg.assignment.assignment.domain.valueobject.Port;
import lombok.Getter; import lombok.Getter;
public class RosterItem { public class RosterItem {
@ -13,17 +12,12 @@ public class RosterItem {
private String taskType; private String taskType;
@Getter @Getter
private IP4Adress executorIP; private ExecutorURI executorURI;
@Getter public RosterItem(String taskID, String taskType, ExecutorURI executorURI) {
private Port executorPort;
public RosterItem(String taskID, String taskType, IP4Adress executorIP, Port executorPort) {
this.taskID = taskID; this.taskID = taskID;
this.taskType = taskType; this.taskType = taskType;
this.executorIP = executorIP; this.executorURI = executorURI;
this.executorPort = executorPort;
} }
} }

23
assignment/src/main/java/ch/unisg/assignment/assignment/domain/valueobject/IP4Adress.java
View File

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

17
assignment/src/main/java/ch/unisg/assignment/assignment/domain/valueobject/Port.java
View File

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

7
assignment/src/main/java/ch/unisg/assignment/common/exception/InvalidIP4Exception.java
View File

@ -1,7 +0,0 @@
package ch.unisg.assignment.common.exception;
public class InvalidIP4Exception extends Exception {
public InvalidIP4Exception() {
super("IP4 is invalid");
}
}

7
assignment/src/main/java/ch/unisg/assignment/common/exception/PortOutOfRangeException.java
View File

@ -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)");
}
}

4
assignment/src/main/resources/application.properties
View File

@ -1 +1,5 @@
server.port=8082 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

117
common/.mvn/wrapper/MavenWrapperDownloader.java vendored Normal file
View File

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

BIN
common/.mvn/wrapper/maven-wrapper.jar vendored Normal file
View File

Binary file not shown.

2
common/.mvn/wrapper/maven-wrapper.properties vendored Normal file
View File

@ -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

310
common/mvnw vendored Executable file
View File

@ -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 "$@"

182
common/mvnw.cmd vendored Normal file
View File

@ -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%

72
common/pom.xml Normal file
View File

@ -0,0 +1,72 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.5.5</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>ch.unisg</groupId>
<artifactId>common</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>common</name>
<!-- FIXME change it to the project's website -->
<url>http://www.example.com</url>
<properties>
<java.version>11</java.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>1.1.0.Final</version>
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>javax.transaction-api</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20210307</version>
</dependency>
</dependencies>
</project>

2
assignment/src/main/java/ch/unisg/assignment/common/exception/ErrorResponse.java → common/src/main/java/ch/unisg/common/exception/ErrorResponse.java
View File

@ -1,4 +1,4 @@
package ch.unisg.assignment.common.exception; package ch.unisg.common.exception;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;

7
common/src/main/java/ch/unisg/common/exception/InvalidExecutorURIException.java Normal file
View File

@ -0,0 +1,7 @@
package ch.unisg.common.exception;
public class InvalidExecutorURIException extends Exception {
public InvalidExecutorURIException() {
super("URI is invalid");
}
}

2
assignment/src/main/java/ch/unisg/assignment/common/SelfValidating.java → common/src/main/java/ch/unisg/common/validation/SelfValidating.java
View File

@ -1,4 +1,4 @@
package ch.unisg.assignment.common; package ch.unisg.common.validation;
import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolation;
import javax.validation.ConstraintViolationException; import javax.validation.ConstraintViolationException;

18
common/src/main/java/ch/unisg/common/valueobject/ExecutorURI.java Normal file
View File

@ -0,0 +1,18 @@
package ch.unisg.common.valueobject;
import ch.unisg.common.exception.InvalidExecutorURIException;
import lombok.Value;
@Value
public class ExecutorURI {
private String value;
public ExecutorURI(String uri) throws InvalidExecutorURIException {
if (uri.equalsIgnoreCase("localhost") ||
uri.matches("^((25[0-5]|(2[0-4]|1\\d|[1-9]|)\\d)(\\.(?!$)|$)){4}$")) {
this.value = uri;
} else {
throw new InvalidExecutorURIException();
}
}
}

653
diagram_1.bpmn
View File

@ -1,653 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:modeler="http://camunda.org/schema/modeler/1.0" id="Definitions_0qxgodh" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.8.1" modeler:executionPlatform="Camunda Platform" modeler:executionPlatformVersion="7.15.0">
<bpmn:collaboration id="Collaboration_0anvhsf">
<bpmn:participant id="Participant_0q8hukc" name="Create Task" processRef="Process_0g1u0dm" />
<bpmn:participant id="Participant_143daut" name="Executor Ideling" processRef="Process_0s8woey" />
<bpmn:participant id="Participant_1q0bjfl" name="Request more executors" processRef="Process_0p5wk5x" />
<bpmn:participant id="Participant_062djli" name="Executor Requests for work" processRef="Process_1iep78l" />
<bpmn:participant id="Participant_1ova0gb" name="Executor finish task" processRef="Process_102ufh8" />
<bpmn:messageFlow id="Flow_1xo6v1g" sourceRef="Activity_0u3tts0" targetRef="Activity_1q87dyp" />
</bpmn:collaboration>
<bpmn:process id="Process_0g1u0dm" isExecutable="false">
<bpmn:laneSet id="LaneSet_1lcmyw6">
<bpmn:lane id="Lane_1qeq039" name="Assignment Service">
<bpmn:flowNodeRef>Gateway_1vd3as7</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Activity_1jd11bs</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Gateway_1e4ckdq</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Activity_1dl4fvt</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Gateway_1e3rabp</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Event_1lm6x5y</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Event_1ysgenb</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Event_00rvb9o</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Activity_0u3tts0</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Activity_0vs4eam</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Activity_0mwpp9o</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Event_0v7hm2z</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Activity_0paecdb</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Activity_0srcl99</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Activity_0assw9c</bpmn:flowNodeRef>
</bpmn:lane>
<bpmn:lane id="Lane_12khd4k" name="Task Service">
<bpmn:flowNodeRef>Activity_0jai885</bpmn:flowNodeRef>
<bpmn:flowNodeRef>StartEvent_1</bpmn:flowNodeRef>
</bpmn:lane>
</bpmn:laneSet>
<bpmn:exclusiveGateway id="Gateway_1vd3as7">
<bpmn:incoming>Flow_1hc51tx</bpmn:incoming>
<bpmn:outgoing>Flow_1sajzlx</bpmn:outgoing>
<bpmn:outgoing>Flow_1ijfkpz</bpmn:outgoing>
</bpmn:exclusiveGateway>
<bpmn:task id="Activity_1jd11bs" name="Check if more tasks of the same are in a queue">
<bpmn:incoming>Flow_1sajzlx</bpmn:incoming>
<bpmn:outgoing>Flow_0cpd5ad</bpmn:outgoing>
</bpmn:task>
<bpmn:exclusiveGateway id="Gateway_1e4ckdq">
<bpmn:incoming>Flow_0cpd5ad</bpmn:incoming>
<bpmn:outgoing>Flow_0kwvrmc</bpmn:outgoing>
<bpmn:outgoing>Flow_1w3uh2m</bpmn:outgoing>
</bpmn:exclusiveGateway>
<bpmn:task id="Activity_1dl4fvt" name="Add task to queue">
<bpmn:incoming>Flow_0kwvrmc</bpmn:incoming>
<bpmn:outgoing>Flow_0vpcut0</bpmn:outgoing>
</bpmn:task>
<bpmn:exclusiveGateway id="Gateway_1e3rabp">
<bpmn:incoming>Flow_0vpcut0</bpmn:incoming>
<bpmn:outgoing>Flow_179e0hl</bpmn:outgoing>
<bpmn:outgoing>Flow_12nh0g5</bpmn:outgoing>
</bpmn:exclusiveGateway>
<bpmn:endEvent id="Event_1lm6x5y">
<bpmn:incoming>Flow_179e0hl</bpmn:incoming>
</bpmn:endEvent>
<bpmn:endEvent id="Event_1ysgenb">
<bpmn:incoming>Flow_0366zqm</bpmn:incoming>
</bpmn:endEvent>
<bpmn:endEvent id="Event_00rvb9o">
<bpmn:incoming>Flow_1n8jm89</bpmn:incoming>
</bpmn:endEvent>
<bpmn:sendTask id="Activity_0u3tts0" name="Let executors know that there is work">
<bpmn:incoming>Flow_1w3uh2m</bpmn:incoming>
<bpmn:outgoing>Flow_1n8jm89</bpmn:outgoing>
</bpmn:sendTask>
<bpmn:task id="Activity_0jai885" name="Create Task">
<bpmn:incoming>Flow_19dbo28</bpmn:incoming>
<bpmn:outgoing>Flow_1rwgf2n</bpmn:outgoing>
</bpmn:task>
<bpmn:startEvent id="StartEvent_1">
<bpmn:outgoing>Flow_19dbo28</bpmn:outgoing>
</bpmn:startEvent>
<bpmn:task id="Activity_0vs4eam" name="Request auctionshouse completion">
<bpmn:incoming>Flow_1ijfkpz</bpmn:incoming>
<bpmn:outgoing>Flow_1gvdy5x</bpmn:outgoing>
</bpmn:task>
<bpmn:task id="Activity_0mwpp9o" name="Some currently unknown Auctionhouse logic">
<bpmn:incoming>Flow_1gvdy5x</bpmn:incoming>
<bpmn:outgoing>Flow_1yxp4e8</bpmn:outgoing>
</bpmn:task>
<bpmn:endEvent id="Event_0v7hm2z">
<bpmn:incoming>Flow_1yxp4e8</bpmn:incoming>
</bpmn:endEvent>
<bpmn:task id="Activity_0paecdb" name="Checks if task can be handled internaly">
<bpmn:incoming>Flow_1rwgf2n</bpmn:incoming>
<bpmn:outgoing>Flow_1hc51tx</bpmn:outgoing>
</bpmn:task>
<bpmn:task id="Activity_0srcl99" name="(This can be checked here bc we are caching infos from the executor pool)" />
<bpmn:subProcess id="Activity_0assw9c" name="Request more executors">
<bpmn:incoming>Flow_12nh0g5</bpmn:incoming>
<bpmn:outgoing>Flow_0366zqm</bpmn:outgoing>
</bpmn:subProcess>
<bpmn:sequenceFlow id="Flow_1hc51tx" sourceRef="Activity_0paecdb" targetRef="Gateway_1vd3as7" />
<bpmn:sequenceFlow id="Flow_1sajzlx" name="Yes" sourceRef="Gateway_1vd3as7" targetRef="Activity_1jd11bs" />
<bpmn:sequenceFlow id="Flow_0cpd5ad" sourceRef="Activity_1jd11bs" targetRef="Gateway_1e4ckdq" />
<bpmn:sequenceFlow id="Flow_0kwvrmc" name="Yes" sourceRef="Gateway_1e4ckdq" targetRef="Activity_1dl4fvt" />
<bpmn:sequenceFlow id="Flow_0vpcut0" name="Are more than X tasks in queue?" sourceRef="Activity_1dl4fvt" targetRef="Gateway_1e3rabp" />
<bpmn:sequenceFlow id="Flow_179e0hl" name="No" sourceRef="Gateway_1e3rabp" targetRef="Event_1lm6x5y" />
<bpmn:sequenceFlow id="Flow_12nh0g5" name="Yes" sourceRef="Gateway_1e3rabp" targetRef="Activity_0assw9c" />
<bpmn:sequenceFlow id="Flow_0366zqm" sourceRef="Activity_0assw9c" targetRef="Event_1ysgenb" />
<bpmn:sequenceFlow id="Flow_1w3uh2m" name="No" sourceRef="Gateway_1e4ckdq" targetRef="Activity_0u3tts0" />
<bpmn:sequenceFlow id="Flow_1n8jm89" sourceRef="Activity_0u3tts0" targetRef="Event_00rvb9o" />
<bpmn:sequenceFlow id="Flow_1rwgf2n" sourceRef="Activity_0jai885" targetRef="Activity_0paecdb" />
<bpmn:sequenceFlow id="Flow_19dbo28" sourceRef="StartEvent_1" targetRef="Activity_0jai885" />
<bpmn:sequenceFlow id="Flow_1gvdy5x" sourceRef="Activity_0vs4eam" targetRef="Activity_0mwpp9o" />
<bpmn:sequenceFlow id="Flow_1ijfkpz" name="No" sourceRef="Gateway_1vd3as7" targetRef="Activity_0vs4eam" />
<bpmn:sequenceFlow id="Flow_1yxp4e8" sourceRef="Activity_0mwpp9o" targetRef="Event_0v7hm2z" />
</bpmn:process>
<bpmn:process id="Process_0s8woey" isExecutable="false">
<bpmn:receiveTask id="Activity_1q87dyp" name="Gets information about work">
<bpmn:outgoing>Flow_119ldsr</bpmn:outgoing>
</bpmn:receiveTask>
<bpmn:endEvent id="Event_170rm9y">
<bpmn:incoming>Flow_1mm9swr</bpmn:incoming>
</bpmn:endEvent>
<bpmn:subProcess id="Activity_0h1d3g9" name="Executor Requests for work">
<bpmn:incoming>Flow_119ldsr</bpmn:incoming>
<bpmn:outgoing>Flow_1mm9swr</bpmn:outgoing>
</bpmn:subProcess>
<bpmn:sequenceFlow id="Flow_119ldsr" sourceRef="Activity_1q87dyp" targetRef="Activity_0h1d3g9" />
<bpmn:sequenceFlow id="Flow_1mm9swr" sourceRef="Activity_0h1d3g9" targetRef="Event_170rm9y" />
</bpmn:process>
<bpmn:process id="Process_0p5wk5x" isExecutable="false">
<bpmn:laneSet id="LaneSet_1r5f5iw">
<bpmn:lane id="Lane_06e7su5" name="Assignment Service">
<bpmn:flowNodeRef>Event_0v73rhy</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Activity_0n8uuvk</bpmn:flowNodeRef>
</bpmn:lane>
<bpmn:lane id="Lane_1lg2d2q" name="Execturo Pool">
<bpmn:flowNodeRef>Activity_06xjrrk</bpmn:flowNodeRef>
</bpmn:lane>
<bpmn:lane id="Lane_19i1lbs" name="Executor">
<bpmn:flowNodeRef>Activity_0uxkytf</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Event_01nh9j2</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Activity_1qgjnyh</bpmn:flowNodeRef>
</bpmn:lane>
</bpmn:laneSet>
<bpmn:startEvent id="Event_0v73rhy">
<bpmn:outgoing>Flow_17d0j42</bpmn:outgoing>
</bpmn:startEvent>
<bpmn:task id="Activity_0n8uuvk" name="Request more executors">
<bpmn:incoming>Flow_17d0j42</bpmn:incoming>
<bpmn:outgoing>Flow_0opy5tp</bpmn:outgoing>
</bpmn:task>
<bpmn:task id="Activity_06xjrrk" name="Add/start new executors">
<bpmn:incoming>Flow_0opy5tp</bpmn:incoming>
<bpmn:outgoing>Flow_0sudw7l</bpmn:outgoing>
</bpmn:task>
<bpmn:task id="Activity_0uxkytf" name="Exectuor starts">
<bpmn:incoming>Flow_0sudw7l</bpmn:incoming>
<bpmn:outgoing>Flow_02uzxx3</bpmn:outgoing>
</bpmn:task>
<bpmn:endEvent id="Event_01nh9j2">
<bpmn:incoming>Flow_0rpv16j</bpmn:incoming>
</bpmn:endEvent>
<bpmn:subProcess id="Activity_1qgjnyh" name="Executor Requests for work">
<bpmn:incoming>Flow_02uzxx3</bpmn:incoming>
<bpmn:outgoing>Flow_0rpv16j</bpmn:outgoing>
</bpmn:subProcess>
<bpmn:sequenceFlow id="Flow_17d0j42" sourceRef="Event_0v73rhy" targetRef="Activity_0n8uuvk" />
<bpmn:sequenceFlow id="Flow_0opy5tp" sourceRef="Activity_0n8uuvk" targetRef="Activity_06xjrrk" />
<bpmn:sequenceFlow id="Flow_02uzxx3" sourceRef="Activity_0uxkytf" targetRef="Activity_1qgjnyh" />
<bpmn:sequenceFlow id="Flow_0sudw7l" sourceRef="Activity_06xjrrk" targetRef="Activity_0uxkytf" />
<bpmn:sequenceFlow id="Flow_0rpv16j" sourceRef="Activity_1qgjnyh" targetRef="Event_01nh9j2" />
</bpmn:process>
<bpmn:process id="Process_1iep78l" isExecutable="false">
<bpmn:laneSet id="LaneSet_03zwzb7">
<bpmn:lane id="Lane_06xhlk6" name="Executor">
<bpmn:flowNodeRef>Event_1oz3tr5</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Activity_0xk9kck</bpmn:flowNodeRef>
</bpmn:lane>
<bpmn:lane id="Lane_02fg9xj" name="Assignment service">
<bpmn:flowNodeRef>Gateway_079742h</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Activity_0umieiz</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Event_062x6a9</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Activity_0b6bh6v</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Event_1achffx</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Activity_1mme68o</bpmn:flowNodeRef>
</bpmn:lane>
</bpmn:laneSet>
<bpmn:startEvent id="Event_1oz3tr5">
<bpmn:outgoing>Flow_0od6iot</bpmn:outgoing>
</bpmn:startEvent>
<bpmn:task id="Activity_0xk9kck" name="Ask for work">
<bpmn:incoming>Flow_0od6iot</bpmn:incoming>
<bpmn:outgoing>Flow_0k07ofo</bpmn:outgoing>
</bpmn:task>
<bpmn:exclusiveGateway id="Gateway_079742h">
<bpmn:incoming>Flow_0k07ofo</bpmn:incoming>
<bpmn:outgoing>Flow_1fwmda3</bpmn:outgoing>
<bpmn:outgoing>Flow_050yku1</bpmn:outgoing>
</bpmn:exclusiveGateway>
<bpmn:task id="Activity_0umieiz" name="Assign task to executor">
<bpmn:incoming>Flow_1fwmda3</bpmn:incoming>
<bpmn:outgoing>Flow_15lkkxa</bpmn:outgoing>
</bpmn:task>
<bpmn:endEvent id="Event_062x6a9">
<bpmn:incoming>Flow_15lkkxa</bpmn:incoming>
</bpmn:endEvent>
<bpmn:task id="Activity_0b6bh6v" name="Some logic to reduce amount of executors if possible???">
<bpmn:incoming>Flow_050yku1</bpmn:incoming>
<bpmn:outgoing>Flow_1lgcq8d</bpmn:outgoing>
</bpmn:task>
<bpmn:endEvent id="Event_1achffx">
<bpmn:incoming>Flow_0oqra8s</bpmn:incoming>
</bpmn:endEvent>
<bpmn:task id="Activity_1mme68o" name="Executor idle&#39;s">
<bpmn:incoming>Flow_1lgcq8d</bpmn:incoming>
<bpmn:outgoing>Flow_0oqra8s</bpmn:outgoing>
</bpmn:task>
<bpmn:sequenceFlow id="Flow_0od6iot" sourceRef="Event_1oz3tr5" targetRef="Activity_0xk9kck" />
<bpmn:sequenceFlow id="Flow_0k07ofo" name="Check if tasks are in queue" sourceRef="Activity_0xk9kck" targetRef="Gateway_079742h" />
<bpmn:sequenceFlow id="Flow_1fwmda3" name="Yes" sourceRef="Gateway_079742h" targetRef="Activity_0umieiz" />
<bpmn:sequenceFlow id="Flow_15lkkxa" sourceRef="Activity_0umieiz" targetRef="Event_062x6a9" />
<bpmn:sequenceFlow id="Flow_050yku1" name="No" sourceRef="Gateway_079742h" targetRef="Activity_0b6bh6v" />
<bpmn:sequenceFlow id="Flow_1lgcq8d" sourceRef="Activity_0b6bh6v" targetRef="Activity_1mme68o" />
<bpmn:sequenceFlow id="Flow_0oqra8s" sourceRef="Activity_1mme68o" targetRef="Event_1achffx" />
</bpmn:process>
<bpmn:process id="Process_102ufh8" isExecutable="false">
<bpmn:laneSet id="LaneSet_15t2y8k">
<bpmn:lane id="Lane_0lvtv1p" name="Executor">
<bpmn:flowNodeRef>Event_1b2jt5y</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Activity_1ikvmpl</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Event_0y66dbe</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Activity_11lqrhg</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Activity_1oownmu</bpmn:flowNodeRef>
</bpmn:lane>
<bpmn:lane id="Lane_1jghhc4" name="Assignment service">
<bpmn:flowNodeRef>Activity_1ohwol1</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Event_0bbqq3x</bpmn:flowNodeRef>
</bpmn:lane>
<bpmn:lane id="Lane_0k7q1xv" name="task service">
<bpmn:flowNodeRef>Activity_1e9hb9h</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Event_0l7ljcr</bpmn:flowNodeRef>
</bpmn:lane>
</bpmn:laneSet>
<bpmn:startEvent id="Event_1b2jt5y">
<bpmn:outgoing>Flow_046hsk4</bpmn:outgoing>
</bpmn:startEvent>
<bpmn:task id="Activity_1ikvmpl" name="Executor finish work">
<bpmn:incoming>Flow_046hsk4</bpmn:incoming>
<bpmn:outgoing>Flow_0zoqmub</bpmn:outgoing>
</bpmn:task>
<bpmn:endEvent id="Event_0y66dbe">
<bpmn:incoming>Flow_0nyxv8e</bpmn:incoming>
</bpmn:endEvent>
<bpmn:sendTask id="Activity_11lqrhg" name="Send finish message">
<bpmn:incoming>Flow_0zoqmub</bpmn:incoming>
<bpmn:outgoing>Flow_0ip5x3i</bpmn:outgoing>
<bpmn:outgoing>Flow_1bqiz65</bpmn:outgoing>
<bpmn:outgoing>Flow_142xsjm</bpmn:outgoing>
</bpmn:sendTask>
<bpmn:task id="Activity_1ohwol1" name="Update tasks status to finished">
<bpmn:incoming>Flow_1bqiz65</bpmn:incoming>
<bpmn:outgoing>Flow_0znvsoe</bpmn:outgoing>
</bpmn:task>
<bpmn:task id="Activity_1e9hb9h" name="Update task status to finished">
<bpmn:incoming>Flow_142xsjm</bpmn:incoming>
<bpmn:outgoing>Flow_0ue2i8v</bpmn:outgoing>
</bpmn:task>
<bpmn:endEvent id="Event_0l7ljcr">
<bpmn:incoming>Flow_0ue2i8v</bpmn:incoming>
</bpmn:endEvent>
<bpmn:endEvent id="Event_0bbqq3x">
<bpmn:incoming>Flow_0znvsoe</bpmn:incoming>
</bpmn:endEvent>
<bpmn:subProcess id="Activity_1oownmu" name="Executor Requests for work">
<bpmn:incoming>Flow_0ip5x3i</bpmn:incoming>
<bpmn:outgoing>Flow_0nyxv8e</bpmn:outgoing>
</bpmn:subProcess>
<bpmn:sequenceFlow id="Flow_046hsk4" sourceRef="Event_1b2jt5y" targetRef="Activity_1ikvmpl" />
<bpmn:sequenceFlow id="Flow_0zoqmub" sourceRef="Activity_1ikvmpl" targetRef="Activity_11lqrhg" />
<bpmn:sequenceFlow id="Flow_0ip5x3i" sourceRef="Activity_11lqrhg" targetRef="Activity_1oownmu" />
<bpmn:sequenceFlow id="Flow_0nyxv8e" sourceRef="Activity_1oownmu" targetRef="Event_0y66dbe" />
<bpmn:sequenceFlow id="Flow_1bqiz65" sourceRef="Activity_11lqrhg" targetRef="Activity_1ohwol1" />
<bpmn:sequenceFlow id="Flow_142xsjm" sourceRef="Activity_11lqrhg" targetRef="Activity_1e9hb9h" />
<bpmn:sequenceFlow id="Flow_0ue2i8v" sourceRef="Activity_1e9hb9h" targetRef="Event_0l7ljcr" />
<bpmn:sequenceFlow id="Flow_0znvsoe" sourceRef="Activity_1ohwol1" targetRef="Event_0bbqq3x" />
</bpmn:process>
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Collaboration_0anvhsf">
<bpmndi:BPMNShape id="Participant_0q8hukc_di" bpmnElement="Participant_0q8hukc" isHorizontal="true">
<dc:Bounds x="140" y="80" width="1728" height="590" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Lane_1qeq039_di" bpmnElement="Lane_1qeq039" isHorizontal="true">
<dc:Bounds x="170" y="200" width="1698" height="470" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Lane_12khd4k_di" bpmnElement="Lane_12khd4k" isHorizontal="true">
<dc:Bounds x="170" y="80" width="1698" height="120" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_1hc51tx_di" bpmnElement="Flow_1hc51tx">
<di:waypoint x="408" y="310" />
<di:waypoint x="495" y="310" />
<bpmndi:BPMNLabel>
<dc:Bounds x="405" y="576" width="83" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1sajzlx_di" bpmnElement="Flow_1sajzlx">
<di:waypoint x="545" y="310" />
<di:waypoint x="680" y="310" />
<bpmndi:BPMNLabel>
<dc:Bounds x="604" y="292" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0cpd5ad_di" bpmnElement="Flow_0cpd5ad">
<di:waypoint x="780" y="310" />
<di:waypoint x="915" y="310" />
<bpmndi:BPMNLabel>
<dc:Bounds x="839" y="592" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0kwvrmc_di" bpmnElement="Flow_0kwvrmc">
<di:waypoint x="965" y="310" />
<di:waypoint x="1070" y="310" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1009" y="292" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0vpcut0_di" bpmnElement="Flow_0vpcut0">
<di:waypoint x="1170" y="310" />
<di:waypoint x="1345" y="310" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1217" y="276" width="81" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_179e0hl_di" bpmnElement="Flow_179e0hl">
<di:waypoint x="1395" y="310" />
<di:waypoint x="1542" y="310" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1462" y="292" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_12nh0g5_di" bpmnElement="Flow_12nh0g5">
<di:waypoint x="1370" y="335" />
<di:waypoint x="1370" y="420" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1376" y="375" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0366zqm_di" bpmnElement="Flow_0366zqm">
<di:waypoint x="1420" y="460" />
<di:waypoint x="1542" y="460" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1w3uh2m_di" bpmnElement="Flow_1w3uh2m">
<di:waypoint x="940" y="335" />
<di:waypoint x="940" y="420" />
<bpmndi:BPMNLabel>
<dc:Bounds x="948" y="368" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1n8jm89_di" bpmnElement="Flow_1n8jm89">
<di:waypoint x="990" y="460" />
<di:waypoint x="1102" y="460" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1rwgf2n_di" bpmnElement="Flow_1rwgf2n">
<di:waypoint x="358" y="180" />
<di:waypoint x="358" y="270" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_19dbo28_di" bpmnElement="Flow_19dbo28">
<di:waypoint x="258" y="140" />
<di:waypoint x="308" y="140" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1gvdy5x_di" bpmnElement="Flow_1gvdy5x">
<di:waypoint x="520" y="510" />
<di:waypoint x="520" y="560" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1ijfkpz_di" bpmnElement="Flow_1ijfkpz">
<di:waypoint x="520" y="335" />
<di:waypoint x="520" y="430" />
<bpmndi:BPMNLabel>
<dc:Bounds x="532" y="368" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1yxp4e8_di" bpmnElement="Flow_1yxp4e8">
<di:waypoint x="570" y="600" />
<di:waypoint x="662" y="600" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="Gateway_1vd3as7_di" bpmnElement="Gateway_1vd3as7" isMarkerVisible="true">
<dc:Bounds x="495" y="285" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1jd11bs_di" bpmnElement="Activity_1jd11bs">
<dc:Bounds x="680" y="270" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Gateway_1e4ckdq_di" bpmnElement="Gateway_1e4ckdq" isMarkerVisible="true">
<dc:Bounds x="915" y="285" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1dl4fvt_di" bpmnElement="Activity_1dl4fvt">
<dc:Bounds x="1070" y="270" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Gateway_1e3rabp_di" bpmnElement="Gateway_1e3rabp" isMarkerVisible="true">
<dc:Bounds x="1345" y="285" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_1lm6x5y_di" bpmnElement="Event_1lm6x5y">
<dc:Bounds x="1542" y="292" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_1ysgenb_di" bpmnElement="Event_1ysgenb">
<dc:Bounds x="1542" y="442" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_00rvb9o_di" bpmnElement="Event_00rvb9o">
<dc:Bounds x="1102" y="442" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_190bh4a_di" bpmnElement="Activity_0u3tts0">
<dc:Bounds x="890" y="420" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0jai885_di" bpmnElement="Activity_0jai885">
<dc:Bounds x="308" y="100" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
<dc:Bounds x="222" y="122" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0vs4eam_di" bpmnElement="Activity_0vs4eam">
<dc:Bounds x="470" y="430" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0mwpp9o_di" bpmnElement="Activity_0mwpp9o">
<dc:Bounds x="470" y="560" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0v7hm2z_di" bpmnElement="Event_0v7hm2z">
<dc:Bounds x="662" y="582" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0paecdb_di" bpmnElement="Activity_0paecdb">
<dc:Bounds x="308" y="270" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0srcl99_di" bpmnElement="Activity_0srcl99">
<dc:Bounds x="308" y="350" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1iyu1x2_di" bpmnElement="Activity_0assw9c">
<dc:Bounds x="1320" y="420" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Participant_143daut_di" bpmnElement="Participant_143daut" isHorizontal="true">
<dc:Bounds x="820" y="710" width="1048" height="250" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_119ldsr_di" bpmnElement="Flow_119ldsr">
<di:waypoint x="990" y="820" />
<di:waypoint x="1110" y="820" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1mm9swr_di" bpmnElement="Flow_1mm9swr">
<di:waypoint x="1210" y="820" />
<di:waypoint x="1312" y="820" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="Activity_0fc3d7o_di" bpmnElement="Activity_1q87dyp">
<dc:Bounds x="890" y="780" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_170rm9y_di" bpmnElement="Event_170rm9y">
<dc:Bounds x="1312" y="802" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0t1gk0s_di" bpmnElement="Activity_0h1d3g9">
<dc:Bounds x="1110" y="780" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Participant_062djli_di" bpmnElement="Participant_062djli" isHorizontal="true">
<dc:Bounds x="820" y="1000" width="1048" height="470" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Lane_06xhlk6_di" bpmnElement="Lane_06xhlk6" isHorizontal="true">
<dc:Bounds x="850" y="1000" width="1018" height="125" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Lane_02fg9xj_di" bpmnElement="Lane_02fg9xj" isHorizontal="true">
<dc:Bounds x="850" y="1125" width="1018" height="345" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_0od6iot_di" bpmnElement="Flow_0od6iot">
<di:waypoint x="948" y="1060" />
<di:waypoint x="1060" y="1060" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0k07ofo_di" bpmnElement="Flow_0k07ofo">
<di:waypoint x="1110" y="1100" />
<di:waypoint x="1110" y="1215" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1116" y="1155" width="88" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1fwmda3_di" bpmnElement="Flow_1fwmda3">
<di:waypoint x="1135" y="1240" />
<di:waypoint x="1250" y="1240" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1184" y="1222" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_15lkkxa_di" bpmnElement="Flow_15lkkxa">
<di:waypoint x="1350" y="1240" />
<di:waypoint x="1472" y="1240" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_050yku1_di" bpmnElement="Flow_050yku1">
<di:waypoint x="1110" y="1265" />
<di:waypoint x="1110" y="1380" />
<di:waypoint x="1250" y="1380" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1118" y="1320" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1lgcq8d_di" bpmnElement="Flow_1lgcq8d">
<di:waypoint x="1350" y="1380" />
<di:waypoint x="1430" y="1380" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0oqra8s_di" bpmnElement="Flow_0oqra8s">
<di:waypoint x="1530" y="1380" />
<di:waypoint x="1602" y="1380" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="Event_1oz3tr5_di" bpmnElement="Event_1oz3tr5">
<dc:Bounds x="912" y="1042" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0xk9kck_di" bpmnElement="Activity_0xk9kck">
<dc:Bounds x="1060" y="1020" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Gateway_079742h_di" bpmnElement="Gateway_079742h" isMarkerVisible="true">
<dc:Bounds x="1085" y="1215" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0umieiz_di" bpmnElement="Activity_0umieiz">
<dc:Bounds x="1250" y="1200" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_062x6a9_di" bpmnElement="Event_062x6a9">
<dc:Bounds x="1472" y="1222" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0b6bh6v_di" bpmnElement="Activity_0b6bh6v">
<dc:Bounds x="1250" y="1340" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_1achffx_di" bpmnElement="Event_1achffx">
<dc:Bounds x="1602" y="1362" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1mme68o_di" bpmnElement="Activity_1mme68o">
<dc:Bounds x="1430" y="1340" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Participant_0xytik6_di" bpmnElement="Participant_1q0bjfl" isHorizontal="true">
<dc:Bounds x="140" y="710" width="600" height="370" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Lane_06e7su5_di" bpmnElement="Lane_06e7su5" isHorizontal="true">
<dc:Bounds x="170" y="710" width="570" height="125" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Lane_1lg2d2q_di" bpmnElement="Lane_1lg2d2q" isHorizontal="true">
<dc:Bounds x="170" y="835" width="570" height="125" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Lane_19i1lbs_di" bpmnElement="Lane_19i1lbs" isHorizontal="true">
<dc:Bounds x="170" y="960" width="570" height="120" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_17d0j42_di" bpmnElement="Flow_17d0j42">
<di:waypoint x="268" y="770" />
<di:waypoint x="370" y="770" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0opy5tp_di" bpmnElement="Flow_0opy5tp">
<di:waypoint x="420" y="810" />
<di:waypoint x="420" y="860" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_02uzxx3_di" bpmnElement="Flow_02uzxx3">
<di:waypoint x="470" y="1020" />
<di:waypoint x="520" y="1020" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0sudw7l_di" bpmnElement="Flow_0sudw7l">
<di:waypoint x="420" y="940" />
<di:waypoint x="420" y="980" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0rpv16j_di" bpmnElement="Flow_0rpv16j">
<di:waypoint x="620" y="1020" />
<di:waypoint x="682" y="1020" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="Event_0v73rhy_di" bpmnElement="Event_0v73rhy">
<dc:Bounds x="232" y="752" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0n8uuvk_di" bpmnElement="Activity_0n8uuvk">
<dc:Bounds x="370" y="730" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_06xjrrk_di" bpmnElement="Activity_06xjrrk">
<dc:Bounds x="370" y="860" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_00bhvrm_di" bpmnElement="Activity_0uxkytf">
<dc:Bounds x="370" y="980" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_01nh9j2_di" bpmnElement="Event_01nh9j2">
<dc:Bounds x="682" y="1002" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1r1i7hf_di" bpmnElement="Activity_1qgjnyh">
<dc:Bounds x="520" y="980" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Participant_1ova0gb_di" bpmnElement="Participant_1ova0gb" isHorizontal="true">
<dc:Bounds x="140" y="1530" width="820" height="370" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Lane_0lvtv1p_di" bpmnElement="Lane_0lvtv1p" isHorizontal="true">
<dc:Bounds x="170" y="1530" width="790" height="125" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Lane_1jghhc4_di" bpmnElement="Lane_1jghhc4" isHorizontal="true">
<dc:Bounds x="170" y="1655" width="790" height="125" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Lane_0k7q1xv_di" bpmnElement="Lane_0k7q1xv" isHorizontal="true">
<dc:Bounds x="170" y="1780" width="790" height="120" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_046hsk4_di" bpmnElement="Flow_046hsk4">
<di:waypoint x="268" y="1600" />
<di:waypoint x="320" y="1600" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0zoqmub_di" bpmnElement="Flow_0zoqmub">
<di:waypoint x="420" y="1600" />
<di:waypoint x="530" y="1600" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0ip5x3i_di" bpmnElement="Flow_0ip5x3i">
<di:waypoint x="630" y="1600" />
<di:waypoint x="720" y="1600" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0nyxv8e_di" bpmnElement="Flow_0nyxv8e">
<di:waypoint x="820" y="1600" />
<di:waypoint x="902" y="1600" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1bqiz65_di" bpmnElement="Flow_1bqiz65">
<di:waypoint x="580" y="1640" />
<di:waypoint x="580" y="1710" />
<di:waypoint x="430" y="1710" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_142xsjm_di" bpmnElement="Flow_142xsjm">
<di:waypoint x="580" y="1640" />
<di:waypoint x="580" y="1800" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0ue2i8v_di" bpmnElement="Flow_0ue2i8v">
<di:waypoint x="630" y="1840" />
<di:waypoint x="682" y="1840" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0znvsoe_di" bpmnElement="Flow_0znvsoe">
<di:waypoint x="330" y="1720" />
<di:waypoint x="268" y="1720" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="Event_1b2jt5y_di" bpmnElement="Event_1b2jt5y">
<dc:Bounds x="232" y="1582" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1ikvmpl_di" bpmnElement="Activity_1ikvmpl">
<dc:Bounds x="320" y="1560" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0y66dbe_di" bpmnElement="Event_0y66dbe">
<dc:Bounds x="902" y="1582" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0ujophe_di" bpmnElement="Activity_11lqrhg">
<dc:Bounds x="530" y="1560" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1ohwol1_di" bpmnElement="Activity_1ohwol1">
<dc:Bounds x="330" y="1680" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1e9hb9h_di" bpmnElement="Activity_1e9hb9h">
<dc:Bounds x="530" y="1800" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0l7ljcr_di" bpmnElement="Event_0l7ljcr">
<dc:Bounds x="682" y="1822" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0bbqq3x_di" bpmnElement="Event_0bbqq3x">
<dc:Bounds x="232" y="1702" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1oownmu_di" bpmnElement="Activity_1oownmu">
<dc:Bounds x="720" y="1560" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_1xo6v1g_di" bpmnElement="Flow_1xo6v1g">
<di:waypoint x="940" y="500" />
<di:waypoint x="940" y="780" />
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</bpmn:definitions>

337
doc/workflow.bpmn Normal file
View File

@ -0,0 +1,337 @@
<?xml version="1.0" encoding="UTF-8"?>
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:modeler="http://camunda.org/schema/modeler/1.0" id="Definitions_0grlf6g" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.8.1" modeler:executionPlatform="Camunda Platform" modeler:executionPlatformVersion="7.15.0">
<bpmn:collaboration id="Collaboration_0p9il2x">
<bpmn:participant id="Participant_06nkquo" name="Task Service" processRef="Process_12mqbju" />
<bpmn:participant id="Participant_016oseg" name="Roster Service" processRef="Process_1s4t9qw" />
<bpmn:participant id="Participant_11sfrgz" name="Executor Pool" processRef="Process_0bur8vc" />
<bpmn:participant id="Participant_1x7nd70" name="executor" processRef="Process_1wq3sju" />
<bpmn:messageFlow id="Flow_14smr2g" sourceRef="Activity_13xp2vr" targetRef="Activity_0iljjpd" />
<bpmn:messageFlow id="Flow_1pr8430" name="Get All available executors" sourceRef="Activity_0iljjpd" targetRef="Activity_0qbi1wr" />
<bpmn:messageFlow id="Flow_0je874m" name="Return executorlist" sourceRef="Activity_0qbi1wr" targetRef="Activity_05ck4dv" />
<bpmn:messageFlow id="Flow_0z85582" name="notify executor about new tasks in event channel" sourceRef="Activity_0qh2a6b" targetRef="Activity_0feawyi" />
<bpmn:messageFlow id="Flow_02hwoew" sourceRef="Activity_1hdmlbq" targetRef="Activity_0x47yx9" />
<bpmn:messageFlow id="Flow_0jg4g6h" name="return task informations" sourceRef="Activity_0a4kzh7" targetRef="Activity_12tzfd7" />
<bpmn:messageFlow id="Flow_1ejujjc" name="Notify about status change" sourceRef="Activity_0a4kzh7" targetRef="Activity_0fiiuon" />
<bpmn:messageFlow id="Flow_1gknjes" name="Notify about task finish" sourceRef="Activity_1f06uud" targetRef="Activity_01iahon" />
<bpmn:messageFlow id="Flow_0fihv5s" name="return task results" sourceRef="Activity_12tzfd7" targetRef="Activity_1f06uud" />
<bpmn:messageFlow id="Flow_1qv7s55" name="Sends started message to executor pool" sourceRef="Activity_1r2yhx0" targetRef="Activity_14xojfa" />
<bpmn:messageFlow id="Flow_1l0z3bv" name="Return success message if added" sourceRef="Activity_14xojfa" targetRef="Activity_09ae5r2" />
</bpmn:collaboration>
<bpmn:process id="Process_12mqbju" isExecutable="true">
<bpmn:task id="Activity_0fiiuon" name="Change status to assigned" />
<bpmn:task id="Activity_01iahon" name="Update status and task" />
<bpmn:task id="Activity_13xp2vr" name="Task created" />
</bpmn:process>
<bpmn:process id="Process_1s4t9qw" isExecutable="false">
<bpmn:exclusiveGateway id="Gateway_0sqs3j7">
<bpmn:incoming>Flow_1rie16h</bpmn:incoming>
<bpmn:outgoing>Flow_159tlyd</bpmn:outgoing>
<bpmn:outgoing>Flow_01pbz6s</bpmn:outgoing>
</bpmn:exclusiveGateway>
<bpmn:task id="Activity_0qh2a6b" name="Add task to task queue">
<bpmn:incoming>Flow_159tlyd</bpmn:incoming>
</bpmn:task>
<bpmn:task id="Activity_005fqxd" name="Auction House">
<bpmn:incoming>Flow_01pbz6s</bpmn:incoming>
</bpmn:task>
<bpmn:task id="Activity_0x47yx9" name="Check if task available for this executor">
<bpmn:outgoing>Flow_1urp3d2</bpmn:outgoing>
</bpmn:task>
<bpmn:exclusiveGateway id="Gateway_1apm7h8">
<bpmn:incoming>Flow_1urp3d2</bpmn:incoming>
<bpmn:outgoing>Flow_1oy6e8u</bpmn:outgoing>
<bpmn:outgoing>Flow_1rxws1j</bpmn:outgoing>
</bpmn:exclusiveGateway>
<bpmn:task id="Activity_1v2mt3m" name="Return no task available">
<bpmn:incoming>Flow_1oy6e8u</bpmn:incoming>
</bpmn:task>
<bpmn:task id="Activity_0a4kzh7" name="Assign executor to task and add to roster">
<bpmn:incoming>Flow_1rxws1j</bpmn:incoming>
</bpmn:task>
<bpmn:task id="Activity_1f06uud" name="Remove assignment from roster" />
<bpmn:task id="Activity_0iljjpd" name="Receive Task" />
<bpmn:task id="Activity_05ck4dv" name="Check if executor is available">
<bpmn:outgoing>Flow_1rie16h</bpmn:outgoing>
</bpmn:task>
<bpmn:sequenceFlow id="Flow_1rie16h" sourceRef="Activity_05ck4dv" targetRef="Gateway_0sqs3j7" />
<bpmn:sequenceFlow id="Flow_159tlyd" name="Yes" sourceRef="Gateway_0sqs3j7" targetRef="Activity_0qh2a6b" />
<bpmn:sequenceFlow id="Flow_01pbz6s" name="No" sourceRef="Gateway_0sqs3j7" targetRef="Activity_005fqxd" />
<bpmn:sequenceFlow id="Flow_1urp3d2" sourceRef="Activity_0x47yx9" targetRef="Gateway_1apm7h8" />
<bpmn:sequenceFlow id="Flow_1oy6e8u" name="No" sourceRef="Gateway_1apm7h8" targetRef="Activity_1v2mt3m" />
<bpmn:sequenceFlow id="Flow_1rxws1j" sourceRef="Gateway_1apm7h8" targetRef="Activity_0a4kzh7" />
</bpmn:process>
<bpmn:process id="Process_0bur8vc" isExecutable="false">
<bpmn:task id="Activity_0qbi1wr" name="Retrieve executors by type" />
<bpmn:task id="Activity_14xojfa" name="Adds executor to pool" />
</bpmn:process>
<bpmn:process id="Process_1wq3sju" isExecutable="false">
<bpmn:task id="Activity_0feawyi" name="check if right tasktype and if idling">
<bpmn:outgoing>Flow_0nuuhk7</bpmn:outgoing>
</bpmn:task>
<bpmn:exclusiveGateway id="Gateway_0nyndyn">
<bpmn:incoming>Flow_0nuuhk7</bpmn:incoming>
<bpmn:outgoing>Flow_197gie6</bpmn:outgoing>
<bpmn:outgoing>Flow_0ruufha</bpmn:outgoing>
</bpmn:exclusiveGateway>
<bpmn:task id="Activity_1v0d9zm" name="Do nothing">
<bpmn:incoming>Flow_197gie6</bpmn:incoming>
</bpmn:task>
<bpmn:task id="Activity_12tzfd7" name="Execute task" />
<bpmn:task id="Activity_1hdmlbq" name="Apply for Assignment">
<bpmn:incoming>Flow_0ruufha</bpmn:incoming>
<bpmn:incoming>Flow_1duwugb</bpmn:incoming>
</bpmn:task>
<bpmn:task id="Activity_1r2yhx0" name="Executor Starts" />
<bpmn:task id="Activity_09ae5r2" name="Was startup successfull">
<bpmn:outgoing>Flow_19m4xhk</bpmn:outgoing>
</bpmn:task>
<bpmn:exclusiveGateway id="Gateway_1o0lihs">
<bpmn:incoming>Flow_19m4xhk</bpmn:incoming>
<bpmn:outgoing>Flow_0b4g73l</bpmn:outgoing>
<bpmn:outgoing>Flow_1duwugb</bpmn:outgoing>
</bpmn:exclusiveGateway>
<bpmn:task id="Activity_0n6hvhw" name="Shut down">
<bpmn:incoming>Flow_0b4g73l</bpmn:incoming>
</bpmn:task>
<bpmn:sequenceFlow id="Flow_0nuuhk7" sourceRef="Activity_0feawyi" targetRef="Gateway_0nyndyn" />
<bpmn:sequenceFlow id="Flow_197gie6" name="No" sourceRef="Gateway_0nyndyn" targetRef="Activity_1v0d9zm" />
<bpmn:sequenceFlow id="Flow_0ruufha" sourceRef="Gateway_0nyndyn" targetRef="Activity_1hdmlbq" />
<bpmn:sequenceFlow id="Flow_19m4xhk" sourceRef="Activity_09ae5r2" targetRef="Gateway_1o0lihs" />
<bpmn:sequenceFlow id="Flow_0b4g73l" name="No" sourceRef="Gateway_1o0lihs" targetRef="Activity_0n6hvhw" />
<bpmn:sequenceFlow id="Flow_1duwugb" name="Yes" sourceRef="Gateway_1o0lihs" targetRef="Activity_1hdmlbq" />
</bpmn:process>
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Collaboration_0p9il2x">
<bpmndi:BPMNShape id="Participant_016oseg_di" bpmnElement="Participant_016oseg" isHorizontal="true">
<dc:Bounds x="160" y="310" width="1950" height="260" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_1rie16h_di" bpmnElement="Flow_1rie16h">
<di:waypoint x="510" y="390" />
<di:waypoint x="805" y="390" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_159tlyd_di" bpmnElement="Flow_159tlyd">
<di:waypoint x="855" y="390" />
<di:waypoint x="950" y="390" />
<bpmndi:BPMNLabel>
<dc:Bounds x="894" y="372" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_01pbz6s_di" bpmnElement="Flow_01pbz6s">
<di:waypoint x="830" y="415" />
<di:waypoint x="830" y="500" />
<di:waypoint x="950" y="500" />
<bpmndi:BPMNLabel>
<dc:Bounds x="882" y="483" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1urp3d2_di" bpmnElement="Flow_1urp3d2">
<di:waypoint x="1490" y="400" />
<di:waypoint x="1585" y="400" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1oy6e8u_di" bpmnElement="Flow_1oy6e8u">
<di:waypoint x="1610" y="425" />
<di:waypoint x="1610" y="480" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1618" y="443" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1rxws1j_di" bpmnElement="Flow_1rxws1j">
<di:waypoint x="1635" y="400" />
<di:waypoint x="1750" y="400" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="Gateway_0sqs3j7_di" bpmnElement="Gateway_0sqs3j7" isMarkerVisible="true">
<dc:Bounds x="805" y="365" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0qh2a6b_di" bpmnElement="Activity_0qh2a6b">
<dc:Bounds x="950" y="350" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_005fqxd_di" bpmnElement="Activity_005fqxd">
<dc:Bounds x="950" y="460" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0x47yx9_di" bpmnElement="Activity_0x47yx9">
<dc:Bounds x="1390" y="360" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Gateway_1apm7h8_di" bpmnElement="Gateway_1apm7h8" isMarkerVisible="true">
<dc:Bounds x="1585" y="375" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1v2mt3m_di" bpmnElement="Activity_1v2mt3m">
<dc:Bounds x="1560" y="480" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0a4kzh7_di" bpmnElement="Activity_0a4kzh7">
<dc:Bounds x="1750" y="360" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1f06uud_di" bpmnElement="Activity_1f06uud">
<dc:Bounds x="1970" y="360" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0iljjpd_di" bpmnElement="Activity_0iljjpd">
<dc:Bounds x="230" y="350" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_05ck4dv_di" bpmnElement="Activity_05ck4dv">
<dc:Bounds x="410" y="350" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Participant_11sfrgz_di" bpmnElement="Participant_11sfrgz" isHorizontal="true">
<dc:Bounds x="160" y="640" width="860" height="250" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0qbi1wr_di" bpmnElement="Activity_0qbi1wr">
<dc:Bounds x="230" y="730" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_14xojfa_di" bpmnElement="Activity_14xojfa">
<dc:Bounds x="550" y="710" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Participant_1x7nd70_di" bpmnElement="Participant_1x7nd70" isHorizontal="true">
<dc:Bounds x="160" y="930" width="1950" height="300" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_0nuuhk7_di" bpmnElement="Flow_0nuuhk7">
<di:waypoint x="1180" y="1040" />
<di:waypoint x="1265" y="1040" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_197gie6_di" bpmnElement="Flow_197gie6">
<di:waypoint x="1290" y="1065" />
<di:waypoint x="1290" y="1150" />
<di:waypoint x="1400" y="1150" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1332" y="1133" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0ruufha_di" bpmnElement="Flow_0ruufha">
<di:waypoint x="1315" y="1040" />
<di:waypoint x="1400" y="1040" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_19m4xhk_di" bpmnElement="Flow_19m4xhk">
<di:waypoint x="810" y="1010" />
<di:waypoint x="905" y="1010" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0b4g73l_di" bpmnElement="Flow_0b4g73l">
<di:waypoint x="930" y="1035" />
<di:waypoint x="930" y="1110" />
<bpmndi:BPMNLabel>
<dc:Bounds x="938" y="1063" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1duwugb_di" bpmnElement="Flow_1duwugb">
<di:waypoint x="930" y="985" />
<di:waypoint x="930" y="960" />
<di:waypoint x="1420" y="960" />
<di:waypoint x="1420" y="1000" />
<bpmndi:BPMNLabel>
<dc:Bounds x="961" y="942" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="Activity_0feawyi_di" bpmnElement="Activity_0feawyi">
<dc:Bounds x="1080" y="1000" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Gateway_0nyndyn_di" bpmnElement="Gateway_0nyndyn" isMarkerVisible="true">
<dc:Bounds x="1265" y="1015" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1v0d9zm_di" bpmnElement="Activity_1v0d9zm">
<dc:Bounds x="1400" y="1110" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_12tzfd7_di" bpmnElement="Activity_12tzfd7">
<dc:Bounds x="1750" y="1000" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1hdmlbq_di" bpmnElement="Activity_1hdmlbq">
<dc:Bounds x="1400" y="1000" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1r2yhx0_di" bpmnElement="Activity_1r2yhx0">
<dc:Bounds x="340" y="1050" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_09ae5r2_di" bpmnElement="Activity_09ae5r2">
<dc:Bounds x="710" y="970" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Gateway_1o0lihs_di" bpmnElement="Gateway_1o0lihs" isMarkerVisible="true">
<dc:Bounds x="905" y="985" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0n6hvhw_di" bpmnElement="Activity_0n6hvhw">
<dc:Bounds x="880" y="1110" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Participant_06nkquo_di" bpmnElement="Participant_06nkquo" isHorizontal="true">
<dc:Bounds x="160" y="80" width="1970" height="150" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0fiiuon_di" bpmnElement="Activity_0fiiuon">
<dc:Bounds x="1750" y="120" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_01iahon_di" bpmnElement="Activity_01iahon">
<dc:Bounds x="1970" y="120" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_13xp2vr_di" bpmnElement="Activity_13xp2vr">
<dc:Bounds x="230" y="120" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_14smr2g_di" bpmnElement="Flow_14smr2g">
<di:waypoint x="280" y="200" />
<di:waypoint x="280" y="350" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1pr8430_di" bpmnElement="Flow_1pr8430">
<di:waypoint x="280" y="430" />
<di:waypoint x="280" y="730" />
<bpmndi:BPMNLabel>
<dc:Bounds x="285" y="661" width="80" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0je874m_di" bpmnElement="Flow_0je874m">
<di:waypoint x="330" y="770" />
<di:waypoint x="460" y="770" />
<di:waypoint x="460" y="430" />
<bpmndi:BPMNLabel>
<dc:Bounds x="379" y="736" width="56" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0z85582_di" bpmnElement="Flow_0z85582">
<di:waypoint x="1050" y="390" />
<di:waypoint x="1130" y="390" />
<di:waypoint x="1130" y="1000" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1040" y="726" width="81" height="40" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_02hwoew_di" bpmnElement="Flow_02hwoew">
<di:waypoint x="1450" y="1000" />
<di:waypoint x="1450" y="440" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0jg4g6h_di" bpmnElement="Flow_0jg4g6h">
<di:waypoint x="1800" y="440" />
<di:waypoint x="1800" y="1000" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1820" y="717" width="60" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1ejujjc_di" bpmnElement="Flow_1ejujjc">
<di:waypoint x="1800" y="360" />
<di:waypoint x="1800" y="200" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1815" y="256" width="69" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0fihv5s_di" bpmnElement="Flow_0fihv5s">
<di:waypoint x="1850" y="1040" />
<di:waypoint x="2020" y="1040" />
<di:waypoint x="2020" y="440" />
<bpmndi:BPMNLabel>
<dc:Bounds x="2036" y="724" width="88" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1gknjes_di" bpmnElement="Flow_1gknjes">
<di:waypoint x="2020" y="360" />
<di:waypoint x="2020" y="200" />
<bpmndi:BPMNLabel>
<dc:Bounds x="2029" y="262" width="82" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1qv7s55_di" bpmnElement="Flow_1qv7s55">
<di:waypoint x="440" y="1090" />
<di:waypoint x="600" y="1090" />
<di:waypoint x="600" y="790" />
<bpmndi:BPMNLabel>
<dc:Bounds x="486" y="1030" width="68" height="40" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1l0z3bv_di" bpmnElement="Flow_1l0z3bv">
<di:waypoint x="650" y="750" />
<di:waypoint x="760" y="750" />
<di:waypoint x="760" y="970" />
<bpmndi:BPMNLabel>
<dc:Bounds x="777" y="800" width="87" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</bpmn:definitions>

BIN
doc/workflow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 817 KiB

6
executor-base/pom.xml
View File

@ -60,6 +60,12 @@
<artifactId>json</artifactId> <artifactId>json</artifactId>
<version>20210307</version> <version>20210307</version>
</dependency> </dependency>
<dependency>
<groupId>ch.unisg</groupId>
<artifactId>common</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
</dependencies> </dependencies>
</project> </project>

13
executor-base/src/main/java/ch/unisg/executorBase/Executor1Application.java
View File

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

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

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

8
executor-base/src/main/java/ch/unisg/executorBase/executor/adapter/in/web/TaskAvailableController.java
View File

@ -1,4 +1,4 @@
package ch.unisg.executorBase.executor.adapter.in.web; package ch.unisg.executorbase.executor.adapter.in.web;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
@ -7,9 +7,9 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import ch.unisg.executorBase.executor.application.port.in.TaskAvailableCommand; 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.TaskAvailableUseCase;
import ch.unisg.executorBase.executor.domain.ExecutorType; import ch.unisg.executorbase.executor.domain.ExecutorType;
@RestController @RestController
public class TaskAvailableController { public class TaskAvailableController {

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

@ -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.io.IOException;
import java.net.URI; import java.net.URI;
@ -9,13 +9,15 @@ import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.json.JSONObject; 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.application.port.out.ExecutionFinishedEventPort;
import ch.unisg.executorBase.executor.domain.ExecutionFinishedEvent; import ch.unisg.executorbase.executor.domain.ExecutionFinishedEvent;
public class ExecutionFinishedEventAdapter implements ExecutionFinishedEventPort { public class ExecutionFinishedEventAdapter implements ExecutionFinishedEventPort {
String server = "http://127.0.0.1:8082"; @Value("${roster.url}")
String server;
Logger logger = Logger.getLogger(ExecutionFinishedEventAdapter.class.getName()); Logger logger = Logger.getLogger(ExecutionFinishedEventAdapter.class.getName());
@ -37,10 +39,11 @@ public class ExecutionFinishedEventAdapter implements ExecutionFinishedEventPort
try { try {
client.send(request, HttpResponse.BodyHandlers.ofString()); client.send(request, HttpResponse.BodyHandlers.ofString());
} catch (IOException | InterruptedException e) { } catch (InterruptedException e) {
logger.log(Level.SEVERE, e.getLocalizedMessage(), e); logger.log(Level.SEVERE, e.getLocalizedMessage(), e);
// Restore interrupted state...
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
} catch (IOException e) {
logger.log(Level.SEVERE, e.getLocalizedMessage(), e);
} }
System.out.println("Finish execution event sent with result:" + event.getResult()); System.out.println("Finish execution event sent with result:" + event.getResult());

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

@ -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.io.IOException;
import java.net.URI; import java.net.URI;
@ -8,12 +8,14 @@ import java.net.http.HttpResponse;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ch.unisg.executorBase.executor.application.port.out.GetAssignmentPort; import ch.unisg.common.valueobject.ExecutorURI;
import ch.unisg.executorBase.executor.domain.ExecutorType; import ch.unisg.executorbase.executor.application.port.out.GetAssignmentPort;
import ch.unisg.executorBase.executor.domain.Task; import ch.unisg.executorbase.executor.domain.ExecutorType;
import ch.unisg.executorbase.executor.domain.Task;
import org.json.JSONObject; import org.json.JSONObject;
@ -21,17 +23,17 @@ import org.json.JSONObject;
@Primary @Primary
public class GetAssignmentAdapter implements GetAssignmentPort { public class GetAssignmentAdapter implements GetAssignmentPort {
String server = "http://127.0.0.1:8082"; @Value("${roster.url}")
String server;
Logger logger = Logger.getLogger(GetAssignmentAdapter.class.getName()); Logger logger = Logger.getLogger(GetAssignmentAdapter.class.getName());
@Override @Override
public Task getAssignment(ExecutorType executorType, String ip, int port) { public Task getAssignment(ExecutorType executorType, ExecutorURI executorURI) {
String body = new JSONObject() String body = new JSONObject()
.put("executorType", executorType) .put("executorType", executorType)
.put("ip", ip) .put("executorURI", executorURI.getValue())
.put("port", port)
.toString(); .toString();
HttpClient client = HttpClient.newHttpClient(); HttpClient client = HttpClient.newHttpClient();
@ -49,10 +51,11 @@ public class GetAssignmentAdapter implements GetAssignmentPort {
return new Task(new JSONObject(response.body()).getString("taskID")); return new Task(new JSONObject(response.body()).getString("taskID"));
} catch (IOException | InterruptedException e) { } catch (InterruptedException e) {
logger.log(Level.SEVERE, e.getLocalizedMessage(), e); logger.log(Level.SEVERE, e.getLocalizedMessage(), e);
// Restore interrupted state...
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
} catch (IOException e) {
logger.log(Level.SEVERE, e.getLocalizedMessage(), e);
} }
return null; return null;

21
executor-base/src/main/java/ch/unisg/executorBase/executor/adapter/out/web/NotifyExecutorPoolAdapter.java
View File

@ -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.io.IOException;
import java.net.URI; import java.net.URI;
@ -9,28 +9,30 @@ import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.json.JSONObject; import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.Primary;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ch.unisg.executorBase.executor.application.port.out.NotifyExecutorPoolPort; import ch.unisg.common.valueobject.ExecutorURI;
import ch.unisg.executorBase.executor.domain.ExecutorType; import ch.unisg.executorbase.executor.application.port.out.NotifyExecutorPoolPort;
import ch.unisg.executorbase.executor.domain.ExecutorType;
@Component @Component
@Primary @Primary
public class NotifyExecutorPoolAdapter implements NotifyExecutorPoolPort { public class NotifyExecutorPoolAdapter implements NotifyExecutorPoolPort {
String server = "http://127.0.0.1:8083"; @Value("${executor-pool.url}")
String server;
Logger logger = Logger.getLogger(NotifyExecutorPoolAdapter.class.getName()); Logger logger = Logger.getLogger(NotifyExecutorPoolAdapter.class.getName());
@Override @Override
public boolean notifyExecutorPool(String ip, int port, ExecutorType executorType) { public boolean notifyExecutorPool(ExecutorURI executorURI, ExecutorType executorType) {
String body = new JSONObject() String body = new JSONObject()
.put("executorTaskType", executorType) .put("executorTaskType", executorType)
.put("executorIp", ip) .put("executorURI", executorURI.getValue())
.put("executorPort", Integer.toString(port))
.toString(); .toString();
HttpClient client = HttpClient.newHttpClient(); HttpClient client = HttpClient.newHttpClient();
@ -45,10 +47,11 @@ public class NotifyExecutorPoolAdapter implements NotifyExecutorPoolPort {
if (response.statusCode() == HttpStatus.CREATED.value()) { if (response.statusCode() == HttpStatus.CREATED.value()) {
return true; return true;
} }
} catch (IOException | InterruptedException e) { } catch (InterruptedException e) {
logger.log(Level.SEVERE, e.getLocalizedMessage(), e); logger.log(Level.SEVERE, e.getLocalizedMessage(), e);
// Restore interrupted state...
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
} catch (IOException e) {
logger.log(Level.SEVERE, e.getLocalizedMessage(), e);
} }
return false; return false;

7
executor-base/src/main/java/ch/unisg/executorBase/executor/application/port/in/TaskAvailableCommand.java
View File

@ -1,10 +1,9 @@
package ch.unisg.executorBase.executor.application.port.in; package ch.unisg.executorbase.executor.application.port.in;
import ch.unisg.executorBase.common.SelfValidating;
import ch.unisg.executorBase.executor.domain.ExecutorType;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import ch.unisg.common.validation.SelfValidating;
import ch.unisg.executorbase.executor.domain.ExecutorType;
import lombok.Value; import lombok.Value;
@Value @Value

2
executor-base/src/main/java/ch/unisg/executorBase/executor/application/port/in/TaskAvailableUseCase.java
View File

@ -1,4 +1,4 @@
package ch.unisg.executorBase.executor.application.port.in; package ch.unisg.executorbase.executor.application.port.in;
public interface TaskAvailableUseCase { public interface TaskAvailableUseCase {
void newTaskAvailable(TaskAvailableCommand command); void newTaskAvailable(TaskAvailableCommand command);

4
executor-base/src/main/java/ch/unisg/executorBase/executor/application/port/out/ExecutionFinishedEventPort.java
View File

@ -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 { public interface ExecutionFinishedEventPort {
void publishExecutionFinishedEvent(ExecutionFinishedEvent event); void publishExecutionFinishedEvent(ExecutionFinishedEvent event);

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

@ -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.common.valueobject.ExecutorURI;
import ch.unisg.executorBase.executor.domain.Task; import ch.unisg.executorbase.executor.domain.ExecutorType;
import ch.unisg.executorbase.executor.domain.Task;
public interface GetAssignmentPort { public interface GetAssignmentPort {
Task getAssignment(ExecutorType executorType, String ip, int port); Task getAssignment(ExecutorType executorType, ExecutorURI executorURI);
} }

7
executor-base/src/main/java/ch/unisg/executorBase/executor/application/port/out/NotifyExecutorPoolPort.java
View File

@ -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 { public interface NotifyExecutorPoolPort {
boolean notifyExecutorPool(String ip, int port, ExecutorType executorType); boolean notifyExecutorPool(ExecutorURI executorURI, ExecutorType executorType);
} }

11
executor-base/src/main/java/ch/unisg/executorBase/executor/application/service/NotifyExecutorPoolService.java
View File

@ -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.common.valueobject.ExecutorURI;
import ch.unisg.executorBase.executor.domain.ExecutorType; import ch.unisg.executorbase.executor.application.port.out.NotifyExecutorPoolPort;
import ch.unisg.executorbase.executor.domain.ExecutorType;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor @RequiredArgsConstructor
@ -9,7 +10,7 @@ public class NotifyExecutorPoolService {
private final NotifyExecutorPoolPort notifyExecutorPoolPort; private final NotifyExecutorPoolPort notifyExecutorPoolPort;
public boolean notifyExecutorPool(String ip, int port, ExecutorType executorType) { public boolean notifyExecutorPool(ExecutorURI executorURI, ExecutorType executorType) {
return notifyExecutorPoolPort.notifyExecutorPool(ip, port, executorType); return notifyExecutorPoolPort.notifyExecutorPool(executorURI, executorType);
} }
} }

6
executor-base/src/main/java/ch/unisg/executorBase/executor/application/service/TaskAvailableService.java
View File

@ -1,9 +1,9 @@
package ch.unisg.executorBase.executor.application.service; package ch.unisg.executorbase.executor.application.service;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ch.unisg.executorBase.executor.application.port.in.TaskAvailableCommand; 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.TaskAvailableUseCase;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import javax.transaction.Transactional; import javax.transaction.Transactional;

2
executor-base/src/main/java/ch/unisg/executorBase/executor/domain/ExecutionFinishedEvent.java
View File

@ -1,4 +1,4 @@
package ch.unisg.executorBase.executor.domain; package ch.unisg.executorbase.executor.domain;
import lombok.Getter; import lombok.Getter;

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

@ -1,26 +1,24 @@
package ch.unisg.executorBase.executor.domain; package ch.unisg.executorbase.executor.domain;
import ch.unisg.executorBase.executor.application.port.out.ExecutionFinishedEventPort; import ch.unisg.common.exception.InvalidExecutorURIException;
import ch.unisg.executorBase.executor.application.port.out.GetAssignmentPort; import ch.unisg.common.valueobject.ExecutorURI;
import ch.unisg.executorBase.executor.application.port.out.NotifyExecutorPoolPort; 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.ExecutionFinishedEventAdapter; import ch.unisg.executorbase.executor.adapter.out.web.NotifyExecutorPoolAdapter;
import ch.unisg.executorBase.executor.adapter.out.web.GetAssignmentAdapter; import ch.unisg.executorbase.executor.application.port.out.ExecutionFinishedEventPort;
import ch.unisg.executorBase.executor.adapter.out.web.NotifyExecutorPoolAdapter; import ch.unisg.executorbase.executor.application.port.out.GetAssignmentPort;
import ch.unisg.executorBase.executor.application.service.NotifyExecutorPoolService; import ch.unisg.executorbase.executor.application.port.out.NotifyExecutorPoolPort;
import ch.unisg.executorbase.executor.application.service.NotifyExecutorPoolService;
import lombok.Getter; import lombok.Getter;
public abstract class ExecutorBase { public abstract class ExecutorBase {
@Getter @Getter
private String ip; private ExecutorURI executorURI;
@Getter @Getter
private ExecutorType executorType; private ExecutorType executorType;
@Getter
private int port;
@Getter @Getter
private ExecutorStatus status; private ExecutorStatus status;
@ -34,12 +32,17 @@ public abstract class ExecutorBase {
public ExecutorBase(ExecutorType executorType) { public ExecutorBase(ExecutorType executorType) {
System.out.println("Starting Executor"); System.out.println("Starting Executor");
// TODO set this automaticly // TODO set this automaticly
this.ip = "localhost"; try {
this.port = 8084; this.executorURI = new ExecutorURI("localhost:8084");
} catch (InvalidExecutorURIException e) {
// Shutdown system if ip or port is not valid
System.exit(1);
}
this.executorType = executorType; this.executorType = executorType;
this.status = ExecutorStatus.STARTING_UP; this.status = ExecutorStatus.STARTING_UP;
if(!notifyExecutorPoolService.notifyExecutorPool(this.ip, this.port, this.executorType)) { if(!notifyExecutorPoolService.notifyExecutorPool(this.executorURI, this.executorType)) {
System.exit(0); System.exit(0);
} else { } else {
this.status = ExecutorStatus.IDLING; this.status = ExecutorStatus.IDLING;
@ -48,8 +51,7 @@ public abstract class ExecutorBase {
} }
public void getAssignment() { public void getAssignment() {
Task newTask = getAssignmentPort.getAssignment(this.getExecutorType(), this.getIp(), Task newTask = getAssignmentPort.getAssignment(this.getExecutorType(), this.getExecutorURI());
this.getPort());
if (newTask != null) { if (newTask != null) {
this.executeTask(newTask); this.executeTask(newTask);
} else { } else {

2
executor-base/src/main/java/ch/unisg/executorBase/executor/domain/ExecutorStatus.java
View File

@ -1,4 +1,4 @@
package ch.unisg.executorBase.executor.domain; package ch.unisg.executorbase.executor.domain;
public enum ExecutorStatus { public enum ExecutorStatus {
STARTING_UP, STARTING_UP,

2
executor-base/src/main/java/ch/unisg/executorBase/executor/domain/ExecutorType.java
View File

@ -1,4 +1,4 @@
package ch.unisg.executorBase.executor.domain; package ch.unisg.executorbase.executor.domain;
public enum ExecutorType { public enum ExecutorType {
ADDITION, ROBOT; ADDITION, ROBOT;

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

@ -1,4 +1,4 @@
package ch.unisg.executorBase.executor.domain; package ch.unisg.executorbase.executor.domain;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;

5
executor-base/src/main/resources/application.properties
View File

@ -1 +1,6 @@
server.port=8081 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

13
executor-base/src/test/java/ch/unisg/executorBase/Executor1ApplicationTests.java
View File

@ -1,13 +0,0 @@
package ch.unisg.executorBase;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@SpringBootTest
class executorBaseApplicationTests {
@Test
void contextLoads() {
}
}

6
executor1/src/main/java/ch/unisg/executor1/executor/adapter/in/web/TaskAvailableController.java
View File

@ -9,9 +9,9 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import ch.unisg.executorBase.executor.application.port.in.TaskAvailableCommand; 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.TaskAvailableUseCase;
import ch.unisg.executorBase.executor.domain.ExecutorType; import ch.unisg.executorbase.executor.domain.ExecutorType;
@RestController @RestController
public class TaskAvailableController { public class TaskAvailableController {

2
executor1/src/main/java/ch/unisg/executor1/executor/application/port/out/UserToRobotPort.java
View File

@ -1,6 +1,6 @@
package ch.unisg.executor1.executor.application.port.out; package ch.unisg.executor1.executor.application.port.out;
import ch.unisg.executorBase.executor.domain.ExecutorType; import ch.unisg.executorbase.executor.domain.ExecutorType;
public interface UserToRobotPort { public interface UserToRobotPort {
String userToRobot(); String userToRobot();

6
executor1/src/main/java/ch/unisg/executor1/executor/application/service/TaskAvailableService.java
View File

@ -3,9 +3,9 @@ package ch.unisg.executor1.executor.application.service;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ch.unisg.executor1.executor.domain.Executor; import ch.unisg.executor1.executor.domain.Executor;
import ch.unisg.executorBase.executor.application.port.in.TaskAvailableCommand; 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.TaskAvailableUseCase;
import ch.unisg.executorBase.executor.domain.ExecutorStatus; import ch.unisg.executorbase.executor.domain.ExecutorStatus;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import javax.transaction.Transactional; import javax.transaction.Transactional;

4
executor1/src/main/java/ch/unisg/executor1/executor/domain/Executor.java
View File

@ -10,8 +10,8 @@ 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.DeleteUserFromRobotPort;
import ch.unisg.executor1.executor.application.port.out.InstructionToRobotPort; import ch.unisg.executor1.executor.application.port.out.InstructionToRobotPort;
import ch.unisg.executor1.executor.application.port.out.UserToRobotPort; import ch.unisg.executor1.executor.application.port.out.UserToRobotPort;
import ch.unisg.executorBase.executor.domain.ExecutorBase; import ch.unisg.executorbase.executor.domain.ExecutorBase;
import ch.unisg.executorBase.executor.domain.ExecutorType; import ch.unisg.executorbase.executor.domain.ExecutorType;
public class Executor extends ExecutorBase { public class Executor extends ExecutorBase {

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

@ -9,9 +9,9 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import ch.unisg.executorBase.executor.application.port.in.TaskAvailableCommand; 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.TaskAvailableUseCase;
import ch.unisg.executorBase.executor.domain.ExecutorType; import ch.unisg.executorbase.executor.domain.ExecutorType;
@RestController @RestController
public class TaskAvailableController { public class TaskAvailableController {

6
executor2/src/main/java/ch/unisg/executor2/executor/application/service/TaskAvailableService.java
View File

@ -3,9 +3,9 @@ package ch.unisg.executor2.executor.application.service;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ch.unisg.executor2.executor.domain.Executor; import ch.unisg.executor2.executor.domain.Executor;
import ch.unisg.executorBase.executor.application.port.in.TaskAvailableCommand; 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.TaskAvailableUseCase;
import ch.unisg.executorBase.executor.domain.ExecutorStatus; import ch.unisg.executorbase.executor.domain.ExecutorStatus;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import javax.transaction.Transactional; import javax.transaction.Transactional;

5
executor2/src/main/java/ch/unisg/executor2/executor/domain/Executor.java
View File

@ -1,8 +1,9 @@
package ch.unisg.executor2.executor.domain; package ch.unisg.executor2.executor.domain;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import ch.unisg.executorBase.executor.domain.ExecutorBase;
import ch.unisg.executorBase.executor.domain.ExecutorType; import ch.unisg.executorbase.executor.domain.ExecutorBase;
import ch.unisg.executorbase.executor.domain.ExecutorType;
public class Executor extends ExecutorBase { public class Executor extends ExecutorBase {