From 2d91ef6330c2ae11a2350edf33b5a119139f26be Mon Sep 17 00:00:00 2001 From: Marcel Date: Sun, 19 Dec 2021 18:42:26 +0100 Subject: [PATCH] fixes --- .../tapas/TapasAuctionHouseApplication.java | 17 ++++++++++------- .../web/AuctionHouseDiscoveryWebController.java | 2 +- .../src/main/resources/application.properties | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) 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 c57c8c5..24aa76a 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 @@ -50,16 +50,19 @@ 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")); + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + for (AuctionHouseDiscoveryInformation endpoint : AuctionHouseDiscovery.getInstance().getAuctionHouseDiscoveryList()) { System.out.println(endpoint.getWebSubUri().getValue()); - subscriber.subscribeToAuctionHouseEndpoint(endpoint.getWebSubUri().getValue()); + if (!endpoint.getWebSubUri().getValue().toString().equalsIgnoreCase("https://tapas-auction-house.86-119-35-40.nip.io/websub/auctions")) { + subscriber.subscribeToAuctionHouseEndpoint(endpoint.getWebSubUri().getValue()); + } } - // try { - // subscriber.subscribeToAuctionHouseEndpoint(new URI("http://6b4e-130-82-250-227.ngrok.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/web/AuctionHouseDiscoveryWebController.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/web/AuctionHouseDiscoveryWebController.java index 22fbb09..5845c69 100644 --- a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/web/AuctionHouseDiscoveryWebController.java +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/web/AuctionHouseDiscoveryWebController.java @@ -30,7 +30,7 @@ public class AuctionHouseDiscoveryWebController { this.auctionHouseDiscoveryUseCase = auctionHouseDiscoveryUseCase; } - @GetMapping(path="/discovery/", consumes = AuctionHouseDiscoveryJsonRepresentation.MEDIA_TYPE) + @GetMapping(path="/discovery/"/*, consumes = AuctionHouseDiscoveryJsonRepresentation.MEDIA_TYPE */) public ResponseEntity auctionHouseDiscovery() { List auctionHouseDiscoveryInformation = auctionHouseDiscoveryUseCase.auctionHouseDiscovery(); diff --git a/tapas-auction-house/src/main/resources/application.properties b/tapas-auction-house/src/main/resources/application.properties index dade5ce..2b21048 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=https://tapas-auction-house.86-119-34-242.nip.io +discovery.endpoint.uri=http://tapas-auction-house.86-119-34-242.nip.io