From e0e54f9350309b97a3af8c7cdff243f0cfd8cfb8 Mon Sep 17 00:00:00 2001 From: rahimiankeanu Date: Sun, 7 Nov 2021 23:35:24 +0100 Subject: [PATCH 1/3] Implemented RemovedEventListener... --- .../ExecutorRemovedEventListenerHttpAdapter.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/http/ExecutorRemovedEventListenerHttpAdapter.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/http/ExecutorRemovedEventListenerHttpAdapter.java index 53811f9..fcf9b52 100644 --- a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/http/ExecutorRemovedEventListenerHttpAdapter.java +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/http/ExecutorRemovedEventListenerHttpAdapter.java @@ -1,6 +1,14 @@ package ch.unisg.tapas.auctionhouse.adapter.in.messaging.http; +import ch.unisg.tapas.auctionhouse.application.handler.ExecutorRemovedHandler; +import ch.unisg.tapas.auctionhouse.application.port.in.ExecutorRemovedEvent; +import ch.unisg.tapas.auctionhouse.domain.Auction; +import ch.unisg.tapas.auctionhouse.domain.ExecutorRegistry; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; /** @@ -12,5 +20,13 @@ public class ExecutorRemovedEventListenerHttpAdapter { // TODO: add annotations for request method, request URI, etc. public void handleExecutorRemovedEvent(@PathVariable("executorId") String executorId) { // TODO: implement logic + + ExecutorRemovedEvent executorRemovedEvent = new ExecutorRemovedEvent( + new ExecutorRegistry.ExecutorIdentifier(executorId) + ); + + ExecutorRemovedHandler newExecutorHandler = new ExecutorRemovedHandler(); + newExecutorHandler.handleExecutorRemovedEvent(executorRemovedEvent); + } } -- 2.45.1 From f652a9ecafbbb565a649a41c47c6eb891cdd086b Mon Sep 17 00:00:00 2001 From: rahimiankeanu Date: Fri, 12 Nov 2021 08:51:43 +0100 Subject: [PATCH 2/3] MQTT event adapter --- ...ecutorRemovedEventListenerHttpAdapter.java | 6 ++- .../mqtt/ExecutorRemovedEventListener | 46 +++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/ExecutorRemovedEventListener diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/http/ExecutorRemovedEventListenerHttpAdapter.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/http/ExecutorRemovedEventListenerHttpAdapter.java index fcf9b52..58bbb95 100644 --- a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/http/ExecutorRemovedEventListenerHttpAdapter.java +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/http/ExecutorRemovedEventListenerHttpAdapter.java @@ -18,7 +18,8 @@ import org.springframework.web.bind.annotation.RestController; public class ExecutorRemovedEventListenerHttpAdapter { // TODO: add annotations for request method, request URI, etc. - public void handleExecutorRemovedEvent(@PathVariable("executorId") String executorId) { + @PostMapping(path = "/executors/{taskType}/{executorId}") + public ResponseEntity handleExecutorRemovedEvent(@PathVariable("executorId") String executorId) { // TODO: implement logic ExecutorRemovedEvent executorRemovedEvent = new ExecutorRemovedEvent( @@ -27,6 +28,7 @@ public class ExecutorRemovedEventListenerHttpAdapter { ExecutorRemovedHandler newExecutorHandler = new ExecutorRemovedHandler(); newExecutorHandler.handleExecutorRemovedEvent(executorRemovedEvent); - + + return new ResponseEntity<>(HttpStatus.NO_CONTENT); } } diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/ExecutorRemovedEventListener b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/ExecutorRemovedEventListener new file mode 100644 index 0000000..087479c --- /dev/null +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/ExecutorRemovedEventListener @@ -0,0 +1,46 @@ +package ch.unisg.tapas.auctionhouse.adapter.in.messaging.mqtt; + +import ch.unisg.tapas.auctionhouse.application.handler.ExecutorRemovedHandler; +import ch.unisg.tapas.auctionhouse.application.port.in.ExecutorRemovedEvent; +import ch.unisg.tapas.auctionhouse.domain.Auction; +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; + +/** + * Listener that handles events when an executor was removed to this TAPAS application. + * + * This class is only provided as an example to help you bootstrap the project. + */ +public class ExecutorRemovedEventListenerMqttAdapter extends AuctionEventMqttListener { + private static final Logger LOGGER = LogManager.getLogger(ExecutorRemovedEventListenerMqttAdapter.class); + + @Override + public boolean handleEvent(MqttMessage message) { + String payload = new String(message.getPayload()); + + try { + // Note: this messge representation is provided only as an example. You should use a + // representation that makes sense in the context of your application. + JsonNode data = new ObjectMapper().readTree(payload); + + String executorId = data.get("executorId").asText(); + + ExecutorRemovedEvent executorRemovedEvent = new ExecutorRemovedEvent( + new ExecutorRegistry.ExecutorIdentifier(executorId) + ); + + ExecutorRemovedHandler newExecutorHandler = new ExecutorRemovedHandler(); + newExecutorHandler.handleNewExecutorEvent(executorRemovedEvent); + } catch (JsonProcessingException | NullPointerException e) { + LOGGER.error(e.getMessage(), e); + return false; + } + + return true; + } +} -- 2.45.1 From c48a402e559a39182292d07c04eb8c6c142b8a34 Mon Sep 17 00:00:00 2001 From: rahimiankeanu Date: Fri, 12 Nov 2021 08:59:09 +0100 Subject: [PATCH 3/3] 2.0 --- ...ntListener => ExecutorRemovedEventListenerMqttAdapter.java} | 0 .../application/handler/ExecutorRemovedHandler.java | 3 +++ 2 files changed, 3 insertions(+) rename tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/{ExecutorRemovedEventListener => ExecutorRemovedEventListenerMqttAdapter.java} (100%) diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/ExecutorRemovedEventListener b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/ExecutorRemovedEventListenerMqttAdapter.java similarity index 100% rename from tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/ExecutorRemovedEventListener rename to tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/ExecutorRemovedEventListenerMqttAdapter.java diff --git a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/handler/ExecutorRemovedHandler.java b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/handler/ExecutorRemovedHandler.java index c3bfed8..aa47d64 100644 --- a/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/handler/ExecutorRemovedHandler.java +++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/application/handler/ExecutorRemovedHandler.java @@ -16,4 +16,7 @@ public class ExecutorRemovedHandler implements ExecutorRemovedEventHandler { public boolean handleExecutorRemovedEvent(ExecutorRemovedEvent executorRemovedEvent) { return ExecutorRegistry.getInstance().removeExecutor(executorRemovedEvent.getExecutorId()); } + + public void handleNewExecutorEvent(ExecutorRemovedEvent executorRemovedEvent) { + } } -- 2.45.1