From 061a76288de891a3432555d558f655cf229018bf Mon Sep 17 00:00:00 2001 From: Andrei Ciortea Date: Mon, 18 Oct 2021 09:45:52 +0200 Subject: [PATCH] Update project template for Auction House --- .../http/ExecutorAddedEventListenerHttpAdapter.java | 7 +++---- .../mqtt/ExecutorAddedEventListenerMqttAdapter.java | 6 ++++-- .../adapter/in/web/RetrieveOpenAuctionsWebController.java | 4 ---- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/http/ExecutorAddedEventListenerHttpAdapter.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/http/ExecutorAddedEventListenerHttpAdapter.java index 999c61c..3511b7d 100644 --- a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/http/ExecutorAddedEventListenerHttpAdapter.java +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/http/ExecutorAddedEventListenerHttpAdapter.java @@ -11,10 +11,9 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; -/* - THIS CLASS WILL BE PROVIDED ONLY AS A TEMPLATE; POINT OUT THE API NEEDS TO BE DEFINED -*/ - +/** + * Template for receiving an executor added event via HTTP + */ @RestController public class ExecutorAddedEventListenerHttpAdapter { diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/ExecutorAddedEventListenerMqttAdapter.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/ExecutorAddedEventListenerMqttAdapter.java index 87413f0..2f661d1 100644 --- a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/ExecutorAddedEventListenerMqttAdapter.java +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/ExecutorAddedEventListenerMqttAdapter.java @@ -7,6 +7,8 @@ import ch.unisg.tapas.auctionhouse.domain.ExecutorRegistry; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.eclipse.paho.client.mqttv3.MqttMessage; /** @@ -15,6 +17,7 @@ import org.eclipse.paho.client.mqttv3.MqttMessage; * This class is only provided as an example to help you bootstrap the project. */ public class ExecutorAddedEventListenerMqttAdapter extends AuctionEventMqttListener { + private static final Logger LOGGER = LogManager.getLogger(ExecutorAddedEventListenerMqttAdapter.class); @Override public boolean handleEvent(MqttMessage message) { @@ -36,8 +39,7 @@ public class ExecutorAddedEventListenerMqttAdapter extends AuctionEventMqttListe ExecutorAddedHandler newExecutorHandler = new ExecutorAddedHandler(); newExecutorHandler.handleNewExecutorEvent(executorAddedEvent); } catch (JsonProcessingException | NullPointerException e) { - // TODO: refactor logging - e.printStackTrace(); + LOGGER.error(e.getMessage(), e); return false; } diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/web/RetrieveOpenAuctionsWebController.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/web/RetrieveOpenAuctionsWebController.java index bcbf38c..c96a919 100644 --- a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/web/RetrieveOpenAuctionsWebController.java +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/web/RetrieveOpenAuctionsWebController.java @@ -53,10 +53,6 @@ public class RetrieveOpenAuctionsWebController { HttpHeaders responseHeaders = new HttpHeaders(); responseHeaders.add(HttpHeaders.CONTENT_TYPE, "application/json"); - // TODO before providing to students: remove hub links - responseHeaders.add(HttpHeaders.LINK, "; rel=\"hub\""); - responseHeaders.add(HttpHeaders.LINK, "; rel=\"self\""); - return new ResponseEntity<>(array.toString(), responseHeaders, HttpStatus.OK); } }