diff --git a/.deployment/docker-compose.yml b/.deployment/docker-compose.yml index c13b0f7..f86baf5 100644 --- a/.deployment/docker-compose.yml +++ b/.deployment/docker-compose.yml @@ -67,7 +67,7 @@ services: - ./:/data/ environment: mqtt.broker.uri: tcp://broker.hivemq.com:1883 - discovery.endpoint.uri: http://tapas-auction-house.86-119-34-242.nip.io + discovery.endpoint.uri: https://tapas-auction-house.86-119-34-242.nip.io auction.house.uri: https://tapas-auction-house.86-119-35-40.nip.io labels: - "traefik.enable=true" @@ -92,6 +92,7 @@ services: executor.robot.uri: http://executor-robot:8084 executor.computation.uri: http://executor-computation:8085 executor.humidity.uri: http://executor-humidity:8087 + executor.humidity.demo.uri: http://executor-humidity-demo:8088 mqtt.broker.uri: tcp://broker.hivemq.com:1883 spring.data.mongodb.uri: mongodb://root:password@tapas-db:27017 labels: diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/TapasAuctionHouseApplication.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/TapasAuctionHouseApplication.java index f329cad..0da7bd7 100644 --- a/tapas-auction-house/src/main/java/ch/unisg/tapas/TapasAuctionHouseApplication.java +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/TapasAuctionHouseApplication.java @@ -49,7 +49,7 @@ public class TapasAuctionHouseApplication { WebSubSubscriber subscriber = new WebSubSubscriber(ENVIRONMENT.getProperty("auction.house.uri")); try { - subscriber.subscribeToAuctionHouseEndpoint(new URI("http://tapas-auction-house.86-119-34-242.nip.io/websub-discovery")); + subscriber.subscribeToAuctionHouseEndpoint(new URI("https://tapas-auction-house.86-119-34-242.nip.io/websub-discovery")); } catch (URISyntaxException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/ExternalAuctionStartedEventListenerMqttAdapter.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/ExternalAuctionStartedEventListenerMqttAdapter.java index c952771..67f5390 100644 --- a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/ExternalAuctionStartedEventListenerMqttAdapter.java +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/ExternalAuctionStartedEventListenerMqttAdapter.java @@ -22,11 +22,11 @@ import java.net.http.HttpResponse; public class ExternalAuctionStartedEventListenerMqttAdapter extends AuctionEventMqttListener{ private static final Logger LOGGER = LogManager.getLogger(ExternalAuctionStartedEventListenerMqttAdapter.class); - // String auctionHouseURI = "https://tapas-auction-house.86-119-35-40.nip.io/"; - String auctionHouseURI = "http://a888-77-59-152-182.eu.ngrok.io"; + String auctionHouseURI = "https://tapas-auction-house.86-119-35-40.nip.io/"; + // String auctionHouseURI = "http://a888-77-59-152-182.eu.ngrok.io"; - // String taskListURI = "https://tapas-tasks.86-119-35-40.nip.io"; - String taskListURI = "http://e021-77-59-152-182.ngrok.io"; + String taskListURI = "https://tapas-tasks.86-119-35-40.nip.io"; + // String taskListURI = "http://e021-77-59-152-182.ngrok.io"; @Override public boolean handleEvent(MqttMessage message){ diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/websub/AuctionStartedEventListenerWebSubAdapter.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/websub/AuctionStartedEventListenerWebSubAdapter.java index 520e0a5..1a1aaed 100644 --- a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/websub/AuctionStartedEventListenerWebSubAdapter.java +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/websub/AuctionStartedEventListenerWebSubAdapter.java @@ -69,11 +69,11 @@ public class AuctionStartedEventListenerWebSubAdapter { // } - // String auctionHouseURI = "https://tapas-auction-house.86-119-35-40.nip.io/"; - String auctionHouseURI = "http://b311-130-82-247-153.eu.ngrok.io"; + String auctionHouseURI = "https://tapas-auction-house.86-119-35-40.nip.io/"; + // String auctionHouseURI = "http://b311-130-82-247-153.eu.ngrok.io"; - // String taskListURI = "https://tapas-tasks.86-119-35-40.nip.io"; - String taskListURI = "http://c64f-130-82-247-153.ngrok.io"; + String taskListURI = "https://tapas-tasks.86-119-35-40.nip.io"; + // String taskListURI = "http://c64f-130-82-247-153.ngrok.io"; // TODO Sanitize URIs String auctionId = auction.getString("auctionId"); diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/out/web/AuctionHouseDiscoveryHttpAdapter.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/out/web/AuctionHouseDiscoveryHttpAdapter.java index f7f13c3..fbc033e 100644 --- a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/out/web/AuctionHouseDiscoveryHttpAdapter.java +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/out/web/AuctionHouseDiscoveryHttpAdapter.java @@ -34,9 +34,12 @@ public class AuctionHouseDiscoveryHttpAdapter implements AuctionHouseDiscoveryPo HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofString()); LOGGER.info("Response status code: " + response.statusCode()); LOGGER.info("Response body:" + response.body()); - if (response.statusCode() == HttpStatus.OK.value()) { - var responseBody = new JSONObject(response.body()); + if (response.statusCode() == HttpStatus.OK.value() || response.statusCode() == HttpStatus.FOUND.value()) { + var responseBody = new JSONObject(response.body().toString()); + // new JSON + + System.out.print(responseBody); var arrayOfInformation = responseBody.getJSONArray("auctionHouseInfo"); var returnList = new LinkedList(); diff --git a/tapas-auction-house/src/main/resources/application.properties b/tapas-auction-house/src/main/resources/application.properties index 2b21048..dade5ce 100644 --- a/tapas-auction-house/src/main/resources/application.properties +++ b/tapas-auction-house/src/main/resources/application.properties @@ -15,4 +15,4 @@ websub.hub.uri=https://pubsubhubbub.appspot.com mqtt.broker.uri=tcp://broker.hivemq.com # mqtt.broker.uri=tcp://localhost:1883 -discovery.endpoint.uri=http://tapas-auction-house.86-119-34-242.nip.io +discovery.endpoint.uri=https://tapas-auction-house.86-119-34-242.nip.io