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

integration + fixes

Browse Source
This commit is contained in:
Marcel
2021-10-17 15:38:04 +02:00
parent 8b0eea1270
commit f461c5f3cb
25 changed files with 252 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
executor-pool/src/main/java/ch/unisg/executorpool/adapter/in/web/ExecutorMediaType.java
View File

@@ -23,10 +23,15 @@ final public class ExecutorMediaType {
String serializedList = "[ \n";
for (ExecutorClass executor: listOfExecutors) {
serializedList += serialize(executor) + ",\n";
serializedList += serialize(executor) + "\n";
}
return serializedList + "\n ]";
// return serializedList + "\n ]";
JSONArray jsonArray = new JSONArray();
JSONObject jsonObject = new JSONObject();
jsonObject.put("executorIp", "localhost");
jsonArray.put(jsonObject);
return jsonArray.toString();
}
private ExecutorMediaType() { }

1
executor-pool/src/main/java/ch/unisg/executorpool/adapter/in/web/GetAllExecutorsInExecutorPoolWebController.java
View File

@@ -2,7 +2,6 @@ package ch.unisg.executorpool.adapter.in.web;
import ch.unisg.executorpool.application.port.in.GetAllExecutorsInExecutorPoolUseCase;
import ch.unisg.executorpool.domain.ExecutorClass;
import ch.unisg.tapastasks.tasks.adapter.in.web.TaskMediaType;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;

2
executor-pool/src/main/resources/application.properties
View File

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