maece/HSG-MCS-HS21_tapas
1
0
Fork 0
Code Issues 14 Pull Requests Packages Projects Releases 6 Wiki Activity

Dev #65

Merged
reynisson merged 67 commits from dev into main 2021-11-16 18:14:00 +00:00
Conversation 5 Commits 67 Files Changed 295 +7 -10
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 061a76288d - Show all commits

7
tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/http/ExecutorAddedEventListenerHttpAdapter.java
View File

@ -11,10 +11,9 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController; 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 @RestController
public class ExecutorAddedEventListenerHttpAdapter { public class ExecutorAddedEventListenerHttpAdapter {

6
tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/messaging/mqtt/ExecutorAddedEventListenerMqttAdapter.java
View File

@ -7,6 +7,8 @@ import ch.unisg.tapas.auctionhouse.domain.ExecutorRegistry;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper; 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; 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. * This class is only provided as an example to help you bootstrap the project.
*/ */
public class ExecutorAddedEventListenerMqttAdapter extends AuctionEventMqttListener { public class ExecutorAddedEventListenerMqttAdapter extends AuctionEventMqttListener {
private static final Logger LOGGER = LogManager.getLogger(ExecutorAddedEventListenerMqttAdapter.class);
@Override @Override
public boolean handleEvent(MqttMessage message) { public boolean handleEvent(MqttMessage message) {
@ -36,8 +39,7 @@ public class ExecutorAddedEventListenerMqttAdapter extends AuctionEventMqttListe
ExecutorAddedHandler newExecutorHandler = new ExecutorAddedHandler(); ExecutorAddedHandler newExecutorHandler = new ExecutorAddedHandler();
newExecutorHandler.handleNewExecutorEvent(executorAddedEvent); newExecutorHandler.handleNewExecutorEvent(executorAddedEvent);
} catch (JsonProcessingException | NullPointerException e) { } catch (JsonProcessingException | NullPointerException e) {
// TODO: refactor logging LOGGER.error(e.getMessage(), e);
e.printStackTrace();
return false; return false;
} }

4
tapas-auction-house/src/main/java/ch/unisg/tapas/auctionhouse/adapter/in/web/RetrieveOpenAuctionsWebController.java
View File

@ -53,10 +53,6 @@ public class RetrieveOpenAuctionsWebController {
HttpHeaders responseHeaders = new HttpHeaders(); HttpHeaders responseHeaders = new HttpHeaders();
responseHeaders.add(HttpHeaders.CONTENT_TYPE, "application/json"); responseHeaders.add(HttpHeaders.CONTENT_TYPE, "application/json");
// TODO before providing to students: remove hub links
responseHeaders.add(HttpHeaders.LINK, "<https://pubsubhubbub.appspot.com/>; rel=\"hub\"");
responseHeaders.add(HttpHeaders.LINK, "<http://example.org/auctions/>; rel=\"self\"");
return new ResponseEntity<>(array.toString(), responseHeaders, HttpStatus.OK); return new ResponseEntity<>(array.toString(), responseHeaders, HttpStatus.OK);
} }
} }