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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
reynisson 2021-12-14 23:46:42 +01:00
commit 48d5c6fe90
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.deployment/docker-compose.yml
View File

@ -86,6 +86,7 @@ services:
- ./:/data/ - ./:/data/
environment: environment:
task.list.uri: http://tapas-tasks:8081 task.list.uri: http://tapas-tasks:8081
auction.house.uri: http://tapas-auction-house:8086
executor.robot.uri: http://executor-robot:8084 executor.robot.uri: http://executor-robot:8084
executor.computation.uri: http://executor-computation:8085 executor.computation.uri: http://executor-computation:8085
mqtt.broker.uri: tcp://broker.hivemq.com:1883 mqtt.broker.uri: tcp://broker.hivemq.com:1883

8
roster/src/main/java/ch/unisg/roster/roster/adapter/out/web/LaunchAuctionEventAdapter.java
View File

@ -11,10 +11,14 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Component;
import ch.unisg.roster.roster.application.port.out.LaunchAuctionEventPort; import ch.unisg.roster.roster.application.port.out.LaunchAuctionEventPort;
import ch.unisg.roster.roster.domain.event.LaunchAuctionEvent; import ch.unisg.roster.roster.domain.event.LaunchAuctionEvent;
@Component
@Primary
public class LaunchAuctionEventAdapter implements LaunchAuctionEventPort { public class LaunchAuctionEventAdapter implements LaunchAuctionEventPort {
@Value("${auction.house.uri}") @Value("${auction.house.uri}")
@ -27,7 +31,7 @@ public class LaunchAuctionEventAdapter implements LaunchAuctionEventPort {
put("taskUri", launchAuctionEvent.taskUri); put("taskUri", launchAuctionEvent.taskUri);
put("taskType", launchAuctionEvent.taskType.getValue()); put("taskType", launchAuctionEvent.taskType.getValue());
}}; }};
var objectMapper = new ObjectMapper(); var objectMapper = new ObjectMapper();
@ -54,5 +58,5 @@ public class LaunchAuctionEventAdapter implements LaunchAuctionEventPort {
} }
} }
} }

1
roster/src/main/resources/application.properties
View File

@ -1,6 +1,7 @@
server.port=8082 server.port=8082
executor.robot.uri=http://127.0.0.1:8084 executor.robot.uri=http://127.0.0.1:8084
executor.computation.uri=http://127.0.0.1:8085 executor.computation.uri=http://127.0.0.1:8085
auction.house.uri=http://127.0.0.1:8086
task.list.uri=http://127.0.0.1:8081 task.list.uri=http://127.0.0.1:8081
mqtt.broker.uri=tcp://localhost:1883 mqtt.broker.uri=tcp://localhost:1883