diff --git a/mocks/README.md b/mocks/README.md deleted file mode 100644 index 7135682..0000000 --- a/mocks/README.md +++ /dev/null @@ -1,29 +0,0 @@ -In this directory are some files to mock an auction house to test WebSub local. - -To run a local WebSubHub instance - -1. Start a mongodb in docker: - -- docker run -d -p 27017:27017 -p 28017:28017 -e AUTH=no tutum/mongodb - -2. Install a local hub - -- yarn global add websub-hub - -3. Run the hub localy - -- websub-hub -l info -m mongodb://localhost:27017/hub - -Create an example subscription - -- node auction-house/subscriber.js - -Create an example auctionhouse - -- node auction-house/auctions.js - -Publish to the hub - -- node auction-house/publisher.js - -Mostly inspired by: https://github.com/hemerajs/websub-hub diff --git a/mocks/auction-house/auctions.js b/mocks/auction-house/auctions.js deleted file mode 100644 index 68a6aa5..0000000 --- a/mocks/auction-house/auctions.js +++ /dev/null @@ -1,39 +0,0 @@ -// Require the framework and instantiate it -const fastify = require('fastify')({ logger: true }) - -// Declare a route -fastify.get('/auctions', async (request, reply) => { - console.log('content provided') - - return [ - { - id: '2', - content_text: 'This is a second item.', - url: 'https://example.org/second-item' - }, - { - id: '1', - content_html: '

Hello, world!

', - url: 'https://example.org/initial-post' - } - ] -}) - -fastify.get('/websub', async (request, reply) => { - console.log('content provided') - - return { - topic: 'http://localhost:3100/auctions' - } -}) - -// Run the server! -const start = async () => { - try { - await fastify.listen(3100) - } catch (err) { - fastify.log.error(err) - process.exit(1) - } -} -start() diff --git a/mocks/auction-house/publisher.js b/mocks/auction-house/publisher.js deleted file mode 100644 index c760820..0000000 --- a/mocks/auction-house/publisher.js +++ /dev/null @@ -1,17 +0,0 @@ -const axios = require('axios').default - -// Run the server! -const start = async () => { - await axios - .post('http://localhost:3000/publish', { - 'hub.mode': 'publish', - 'hub.url': 'http://localhost:3100/auctions' - }) - .then(response => { - console.log(response.data) - }) - .catch(error => { - console.log(error) - }) -} -start() diff --git a/mocks/auction-house/subscriber.js b/mocks/auction-house/subscriber.js deleted file mode 100644 index ce27197..0000000 --- a/mocks/auction-house/subscriber.js +++ /dev/null @@ -1,42 +0,0 @@ -// Require the framework and instantiate it -const fastify = require('fastify')({ logger: true }) -const axios = require('axios').default - -// Declare a route -fastify.get('/auction-created', async (request, reply) => { - console.log('subscription verified', request.query) - console.log(request.query) - return request.query -}) - -fastify.post('/auction-created', async (request, reply) => { - console.log('received blog content', request.body) - reply.send() -}) - -// Run the server! -const start = async () => { - // subscribe to the feed - - try { - await fastify.listen(3200) - } catch (err) { - fastify.log.error(err) - process.exit(1) - } - - await axios - .post('http://localhost:3000', { - 'hub.callback': 'http://localhost:3200/auction-created', - 'hub.mode': 'subscribe', - 'hub.topic': 'http://localhost:3100/auctions', - 'hub.ws': false - }) - .then(response => { - console.log(response.data) - }) - .catch(error => { - console.log(error) - }) -} -start() diff --git a/roster/src/main/java/ch/unisg/roster/roster/adapter/common/clients/TapasMqttClient.java b/roster/src/main/java/ch/unisg/roster/roster/adapter/common/clients/TapasMqttClient.java index 8b5411b..78f2d0c 100644 --- a/roster/src/main/java/ch/unisg/roster/roster/adapter/common/clients/TapasMqttClient.java +++ b/roster/src/main/java/ch/unisg/roster/roster/adapter/common/clients/TapasMqttClient.java @@ -1,6 +1,6 @@ package ch.unisg.roster.roster.adapter.common.clients; -import ch.unisg.roster.roster.adapter.in.messaging.mqtt.AuctionEventsMqttDispatcher; +import ch.unisg.roster.roster.adapter.in.messaging.mqtt.ExecutorEventsMqttDispatcher; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.eclipse.paho.client.mqttv3.*; @@ -25,9 +25,9 @@ public class TapasMqttClient { private final MessageReceivedCallback messageReceivedCallback; - private final AuctionEventsMqttDispatcher dispatcher; + private final ExecutorEventsMqttDispatcher dispatcher; - private TapasMqttClient(String brokerAddress, AuctionEventsMqttDispatcher dispatcher) { + private TapasMqttClient(String brokerAddress, ExecutorEventsMqttDispatcher dispatcher) { this.mqttClientId = UUID.randomUUID().toString(); this.brokerAddress = brokerAddress; @@ -37,7 +37,7 @@ public class TapasMqttClient { } public static synchronized TapasMqttClient getInstance(String brokerAddress, - AuctionEventsMqttDispatcher dispatcher) { + ExecutorEventsMqttDispatcher dispatcher) { if (tapasClient == null) { tapasClient = new TapasMqttClient(brokerAddress, dispatcher); diff --git a/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/ExecutorAddedEventListenerMqttAdapter.java b/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/ExecutorAddedEventListenerMqttAdapter.java index dd9257e..1c3cbcd 100644 --- a/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/ExecutorAddedEventListenerMqttAdapter.java +++ b/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/ExecutorAddedEventListenerMqttAdapter.java @@ -12,7 +12,7 @@ import ch.unisg.roster.roster.application.handler.ExecutorAddedHandler; import ch.unisg.roster.roster.application.port.in.ExecutorAddedEvent; import ch.unisg.roster.roster.domain.valueobject.ExecutorType; -public class ExecutorAddedEventListenerMqttAdapter extends AuctionEventMqttListener { +public class ExecutorAddedEventListenerMqttAdapter extends ExecutorEventMqttListener { private static final Logger LOGGER = LogManager.getLogger(ExecutorAddedEventListenerMqttAdapter.class); @Override @@ -24,7 +24,7 @@ public class ExecutorAddedEventListenerMqttAdapter extends AuctionEventMqttListe // representation that makes sense in the context of your application. JsonNode data = new ObjectMapper().readTree(payload); - String taskType = data.get("taskType").asText(); + String taskType = data.get("executorTaskType").asText(); String executorId = data.get("executorURI").asText(); ExecutorAddedEvent executorAddedEvent = new ExecutorAddedEvent( diff --git a/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/AuctionEventMqttListener.java b/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/ExecutorEventMqttListener.java similarity index 82% rename from roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/AuctionEventMqttListener.java rename to roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/ExecutorEventMqttListener.java index 6eb109f..df46b00 100644 --- a/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/AuctionEventMqttListener.java +++ b/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/ExecutorEventMqttListener.java @@ -5,7 +5,7 @@ import org.eclipse.paho.client.mqttv3.MqttMessage; /** * Abstract MQTT listener for auction-related events */ -public abstract class AuctionEventMqttListener { +public abstract class ExecutorEventMqttListener { public abstract boolean handleEvent(MqttMessage message); } diff --git a/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/AuctionEventsMqttDispatcher.java b/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/ExecutorEventsMqttDispatcher.java similarity index 61% rename from roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/AuctionEventsMqttDispatcher.java rename to roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/ExecutorEventsMqttDispatcher.java index d19c803..caa6202 100644 --- a/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/AuctionEventsMqttDispatcher.java +++ b/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/ExecutorEventsMqttDispatcher.java @@ -6,20 +6,10 @@ import java.util.Hashtable; import java.util.Map; import java.util.Set; -/** - * Dispatches MQTT messages for known topics to associated event listeners. Used in conjunction with - * {@link ch.unisg.tapas.auctionhouse.adapter.common.clients.TapasMqttClient}. - * - * This is where you would define MQTT topics and map them to event listeners (see - * {@link AuctionEventsMqttDispatcher#initRouter()}). - * - * This class is only provided as an example to help you bootstrap the project. You are welcomed to - * change this class as you see fit. - */ -public class AuctionEventsMqttDispatcher { - private final Map router; +public class ExecutorEventsMqttDispatcher { + private final Map router; - public AuctionEventsMqttDispatcher() { + public ExecutorEventsMqttDispatcher() { this.router = new Hashtable<>(); initRouter(); } @@ -46,7 +36,7 @@ public class AuctionEventsMqttDispatcher { * @param message the received MQTT message */ public void dispatchEvent(String topic, MqttMessage message) { - AuctionEventMqttListener listener = router.get(topic); + ExecutorEventMqttListener listener = router.get(topic); listener.handleEvent(message); } } diff --git a/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/ExecutorRemovedEventListenerMqttAdapter.java b/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/ExecutorRemovedEventListenerMqttAdapter.java index d7b5067..71af86d 100644 --- a/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/ExecutorRemovedEventListenerMqttAdapter.java +++ b/roster/src/main/java/ch/unisg/roster/roster/adapter/in/messaging/mqtt/ExecutorRemovedEventListenerMqttAdapter.java @@ -11,7 +11,7 @@ import ch.unisg.common.valueobject.ExecutorURI; import ch.unisg.roster.roster.application.handler.ExecutorRemovedHandler; import ch.unisg.roster.roster.application.port.in.ExecutorRemovedEvent; -public class ExecutorRemovedEventListenerMqttAdapter extends AuctionEventMqttListener { +public class ExecutorRemovedEventListenerMqttAdapter extends ExecutorEventMqttListener { private static final Logger LOGGER = LogManager.getLogger(ExecutorRemovedEventListenerMqttAdapter.class); @Override diff --git a/tapas-auction-house/pom.xml b/tapas-auction-house/pom.xml index df44681..4b9cbb6 100644 --- a/tapas-auction-house/pom.xml +++ b/tapas-auction-house/pom.xml @@ -58,17 +58,6 @@ validation-api 1.1.0.Final - - org.json - json - 20210307 - - - org.springframework.boot - spring-boot-devtools - runtime - true - 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 7438032..46dafb7 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 @@ -8,7 +8,6 @@ import ch.unisg.tapas.common.ConfigProperties; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.eclipse.paho.client.mqttv3.MqttException; -import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -33,16 +32,18 @@ public class TapasAuctionHouseApplication { SpringApplication tapasAuctioneerApp = new SpringApplication(TapasAuctionHouseApplication.class); // We will use these bootstrap methods in Week 6: - bootstrapMarketplaceWithWebSub(); + // bootstrapMarketplaceWithWebSub(); bootstrapMarketplaceWithMqtt(); tapasAuctioneerApp.run(args); } + /** * Discovers auction houses and subscribes to WebSub notifications */ private static void bootstrapMarketplaceWithWebSub() { List auctionHouseEndpoints = discoverAuctionHouseEndpoints(); + LOGGER.info("Found auction house endpoints: " + auctionHouseEndpoints); WebSubSubscriber subscriber = new WebSubSubscriber(); diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/common/clients/WebSubSubscriber.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/common/clients/WebSubSubscriber.java index 5b3fc32..da2b096 100644 --- a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/common/clients/WebSubSubscriber.java +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/common/clients/WebSubSubscriber.java @@ -1,15 +1,6 @@ package ch.unisg.tapas.auctionhouse.adapter.common.clients; -import java.io.IOException; import java.net.URI; -import java.net.http.HttpClient; -import java.net.http.HttpRequest; -import java.net.http.HttpResponse; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.json.JSONObject; -import org.springframework.http.HttpStatus; /** * Subscribes to the WebSub hubs of auction houses discovered at run time. This class is instantiated @@ -18,24 +9,7 @@ import org.springframework.http.HttpStatus; */ public class WebSubSubscriber { - // TODO get this somehow from properties file. But on clue how to do this with static variables - static String WEBSUB_HUB_ENDPOINT = "http://localhost:3000"; - static String AUCTION_HOUSE_ENDPOINT = "http://localhost:8086"; - - Logger logger = Logger.getLogger(WebSubSubscriber.class.getName()); - public void subscribeToAuctionHouseEndpoint(URI endpoint) { - // TODO decide with other groups about auction house endpoint uri to discover websub topics - // and replace the hardcoded one with it - String topic = discoverWebSubTopic("http://localhost:3100/websub"); - - if (topic == null) { - return; - } - - subscribeToWebSub(topic); - - // Shoudl be done :D // TODO Subscribe to the auction house endpoint via WebSub: // 1. Send a request to the auction house in order to discover the WebSub hub to subscribe to. // The request URI should depend on the design of the Auction House HTTP API. @@ -51,61 +25,4 @@ public class WebSubSubscriber { // - W3C WebSub Recommendation: https://www.w3.org/TR/websub/ // - the implementation notes of the WebSub hub you are using to distribute events } - - private String discoverWebSubTopic(String endpoint) { - HttpClient client = HttpClient.newHttpClient(); - HttpRequest request = HttpRequest.newBuilder() - .uri(URI.create(endpoint)) - .header("Content-Type", "application/json") - .GET() - .build(); - - - try { - HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofString()); - if (response.statusCode() == HttpStatus.OK.value()) { - // TODO decide with other groups about response structure and replace the hardcoded - // uri with response uri - JSONObject jsonObject = new JSONObject(response.body()); - System.out.println(jsonObject); - return jsonObject.getString("topic"); - } else { - logger.log(Level.SEVERE, "Could not find a websub uri"); - } - } catch (InterruptedException e) { - logger.log(Level.SEVERE, e.getLocalizedMessage(), e); - Thread.currentThread().interrupt(); - } catch (IOException e) { - logger.log(Level.SEVERE, e.getLocalizedMessage(), e); - } - return null; - } - - private void subscribeToWebSub(String topic) { - HttpClient client = HttpClient.newHttpClient(); - - String body = new JSONObject() - .put("hub.callback", AUCTION_HOUSE_ENDPOINT + "/auction-started") - .put("hub.mode", "subscribe") - .put("hub.topic", topic) - .put("hub.ws", false) - .toString(); - - - HttpRequest request = HttpRequest.newBuilder() - .uri(URI.create(WEBSUB_HUB_ENDPOINT)) - .header("Content-Type", "application/json") - .POST(HttpRequest.BodyPublishers.ofString(body)) - .build(); - - - try { - client.send(request, HttpResponse.BodyHandlers.ofString()); - } catch (InterruptedException e) { - logger.log(Level.SEVERE, e.getLocalizedMessage(), e); - Thread.currentThread().interrupt(); - } catch (IOException e) { - logger.log(Level.SEVERE, e.getLocalizedMessage(), e); - } - } } 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 4f67dad..d156452 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 @@ -1,22 +1,6 @@ package ch.unisg.tapas.auctionhouse.adapter.in.messaging.websub; -import ch.unisg.tapas.auctionhouse.adapter.common.formats.AuctionJsonRepresentation; import ch.unisg.tapas.auctionhouse.application.handler.AuctionStartedHandler; -import ch.unisg.tapas.auctionhouse.application.port.in.AuctionStartedEvent; -import ch.unisg.tapas.auctionhouse.domain.Auction; -import ch.unisg.tapas.auctionhouse.domain.Auction.AuctionDeadline; -import ch.unisg.tapas.auctionhouse.domain.Auction.AuctionHouseUri; -import ch.unisg.tapas.auctionhouse.domain.Auction.AuctionId; -import ch.unisg.tapas.auctionhouse.domain.Auction.AuctionedTaskType; -import ch.unisg.tapas.auctionhouse.domain.Auction.AuctionedTaskUri; - -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Collection; - -import org.json.JSONArray; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; /** @@ -29,25 +13,6 @@ public class AuctionStartedEventListenerWebSubAdapter { public AuctionStartedEventListenerWebSubAdapter(AuctionStartedHandler auctionStartedHandler) { this.auctionStartedHandler = auctionStartedHandler; } - /** - * Controller which listens to auction-started callbacks - * @return 200 OK - * @throws URISyntaxException - **/ - @PostMapping(path = "/auction-started") - public ResponseEntity handleExecutorAddedEvent(@RequestBody Collection payload) throws URISyntaxException { - for (AuctionJsonRepresentation auction : payload) { - auctionStartedHandler.handleAuctionStartedEvent( - new AuctionStartedEvent( - new Auction(new AuctionId(auction.getAuctionId()), - new AuctionHouseUri(new URI(auction.getAuctionHouseUri())), - new AuctionedTaskUri(new URI(auction.getTaskUri())), - new AuctionedTaskType(auction.getTaskType()), - new AuctionDeadline(auction.getDeadline())) - )); - } - - return new ResponseEntity<>(HttpStatus.OK); - } + //TODO } diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/websub/ValidateIntentWebSubAdapter.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/websub/ValidateIntentWebSubAdapter.java deleted file mode 100644 index 7bfb450..0000000 --- a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/websub/ValidateIntentWebSubAdapter.java +++ /dev/null @@ -1,33 +0,0 @@ -package ch.unisg.tapas.auctionhouse.adapter.in.messaging.websub; - -import org.json.JSONObject; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -/** - * This class validates the subscription intent from the websub hub - */ -@RestController -public class ValidateIntentWebSubAdapter { - - @Value("${application.environment}") - private String environment; - - @GetMapping(path = "/auction-started") - public ResponseEntity validateIntent(@RequestParam("hub.challenge") String challenge) { - // Different implementation depending on local development or production - if (environment.equalsIgnoreCase("development")) { - HttpHeaders headers = new HttpHeaders(); - headers.add("Content-Type", "application/json"); - String body = new JSONObject() - .put("hub.challenge", challenge) - .toString(); - return new ResponseEntity<>(body, headers, HttpStatus.OK); - } else { - return new ResponseEntity<>(challenge, HttpStatus.OK); - } - } -} diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/out/messaging/websub/PublishAuctionStartedEventWebSubAdapter.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/out/messaging/websub/PublishAuctionStartedEventWebSubAdapter.java index 228f43b..73451e4 100644 --- a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/out/messaging/websub/PublishAuctionStartedEventWebSubAdapter.java +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/out/messaging/websub/PublishAuctionStartedEventWebSubAdapter.java @@ -4,16 +4,12 @@ import ch.unisg.tapas.auctionhouse.application.port.out.AuctionStartedEventPort; import ch.unisg.tapas.auctionhouse.domain.Auction; import ch.unisg.tapas.auctionhouse.domain.AuctionStartedEvent; import ch.unisg.tapas.common.ConfigProperties; - -import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Primary; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Component; import java.io.IOException; -import java.net.URI; import java.net.URLEncoder; import java.net.http.HttpClient; import java.net.http.HttpRequest; @@ -21,8 +17,6 @@ import java.net.http.HttpResponse; import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; import java.util.stream.Collectors; /** @@ -35,38 +29,8 @@ public class PublishAuctionStartedEventWebSubAdapter implements AuctionStartedEv @Autowired private ConfigProperties config; - @Value("${auctionhouse.uri}") - private String auctionHouseUri; - - @Value("${websub.hub.uri}") - private String webSubHubUri; - - Logger logger = Logger.getLogger(PublishAuctionStartedEventWebSubAdapter.class.getName()); - @Override public void publishAuctionStartedEvent(AuctionStartedEvent event) { - HttpClient client = HttpClient.newHttpClient(); - - String body = new JSONObject() - .put("hub.url", auctionHouseUri + "/auctions") - .put("hub.mode", "publish") - .toString(); - - - HttpRequest request = HttpRequest.newBuilder() - .uri(URI.create(webSubHubUri)) - .header("Content-Type", "application/json") - .POST(HttpRequest.BodyPublishers.ofString(body)) - .build(); - - - try { - client.send(request, HttpResponse.BodyHandlers.ofString()); - } catch (InterruptedException e) { - logger.log(Level.SEVERE, e.getLocalizedMessage(), e); - Thread.currentThread().interrupt(); - } catch (IOException e) { - logger.log(Level.SEVERE, e.getLocalizedMessage(), e); - } + // TODO } } diff --git a/tapas-auction-house/src/main/resources/application.properties b/tapas-auction-house/src/main/resources/application.properties index 706362e..1ededee 100644 --- a/tapas-auction-house/src/main/resources/application.properties +++ b/tapas-auction-house/src/main/resources/application.properties @@ -7,7 +7,5 @@ group=tapas-group-tutors auction.house.uri=https://tapas-auction-house.86-119-34-23.nip.io/ tasks.list.uri=https://tapas-tasks.86-119-34-23.nip.io/ -application.environment=development -auctionhouse.uri=http://localhost:8086 -websub.hub.uri=http://localhost:3000 + mqtt.broker.uri=tcp://localhost:1883