From 25d68c8900c2cc791f03ea3db173955ca237fd55 Mon Sep 17 00:00:00 2001
From: Christof Rabensteiner <christof.rabensteiner@iaik.tugraz.at>
Date: Fri, 12 Jul 2019 15:40:05 +0200
Subject: Allow App To Choose Between MsgResponse Sinks

- MZS Schema Change: Add "MsgResponseSinks" element to
  mzs:DeliveryRequest/Config that allows sender to configure how
  MsgResponses should be archived.
- ConfigUtil: Interpret MsgResponseSink parameters from Spring
  Environment and merge with ConfigType.
- MsgResponseBackend: Send responses to sinks according to
  MsgResponseSinks in Config
- application.yaml: Add MsgResponseSinks parameter to configuration.
- Uncouple Sink implementations from java.util.function.Function,
  because the sink interfaces are going to differ and there is no need
  to unite them under one interface.
- Add and test LogResponseSink, which logs responses to it's logger.
- MsgResponse: Add JAXB getter for response. Reason: Can be passed to
  marshaller.
---
 .../gv/egiz/moazs/backend/MsgResponseBackend.java  | 41 ++++++++++++++++++----
 1 file changed, 34 insertions(+), 7 deletions(-)

(limited to 'src/main/java/at/gv/egiz/moazs/backend/MsgResponseBackend.java')

diff --git a/src/main/java/at/gv/egiz/moazs/backend/MsgResponseBackend.java b/src/main/java/at/gv/egiz/moazs/backend/MsgResponseBackend.java
index 414c2dc..1b17f34 100644
--- a/src/main/java/at/gv/egiz/moazs/backend/MsgResponseBackend.java
+++ b/src/main/java/at/gv/egiz/moazs/backend/MsgResponseBackend.java
@@ -4,14 +4,13 @@ import at.gv.egiz.moazs.MoaZSException;
 import at.gv.egiz.moazs.repository.DeliveryRepository;
 import at.gv.egiz.moazs.scheme.MsgResponse;
 import at.gv.egiz.moazs.service.MsgService;
+import at.gv.zustellung.app2mzs.xsd.MsgResponseSinksType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
-import java.util.function.Function;
 
 import static at.gv.egiz.moazs.MoaZSException.moaZSExceptionBuilder;
 import static java.lang.String.format;
@@ -27,29 +26,38 @@ public class MsgResponseBackend implements Consumer<String> {
 
     private final DeliveryRepository repository;
     private final Consumer<byte[]> signatureVerifier;
-    private final Function<MsgResponse, CompletableFuture<Void>> sink;
+    private final SaveResponseToFileSink saveResponseToFileSink;
+    private final LogResponseSink logResponseSink;
 
     @Autowired
     public MsgResponseBackend(DeliveryRepository repository,
                               Consumer<byte[]> signatureVerifier,
-                              Function<MsgResponse, CompletableFuture<Void>> sink) {
+                              SaveResponseToFileSink saveResponseToFileSink,
+                              LogResponseSink logResponseSink) {
         this.repository = repository;
         this.signatureVerifier = signatureVerifier;
-        this.sink = sink;
+        this.saveResponseToFileSink = saveResponseToFileSink;
+        this.logResponseSink = logResponseSink;
     }
 
     /**
      * Performs all {@code MsgResponse}'s Back-End Tasks, such as verifying
      * its signature and archiving the response.
      *
+     * Note: When the signature verification fails, this method will not archive
+     * the original response (the one that was received from msg) to the sink,
+     * but an error message.
+     *
      * @param responseID refers to MsgResponse Object.
      */
     @Override
     public void accept(String responseID) {
-        supplyAsync(() -> verify(responseID)).thenAcceptAsync(sink::apply);
+
+        supplyAsync(() -> verify(responseID))
+                .thenAcceptAsync(msgResponse -> applySinks(msgResponse));
     }
 
-    public MsgResponse verify(String responseID) {
+    private MsgResponse verify(String responseID) {
 
         var response = repository.retrieveResponse(responseID).get();
         var builder = moaZSExceptionBuilder().withAllParametersInAnswer(response.getAnswer());
@@ -72,4 +80,23 @@ public class MsgResponseBackend implements Consumer<String> {
 
     }
 
+    private void applySinks(MsgResponse msgResponse) {
+
+        var sinkParams = getSinkParams(msgResponse);
+
+        if (sinkParams.isSafeResponseToFile()) {
+            supplyAsync(() -> saveResponseToFileSink.save(msgResponse));
+        }
+
+        if (sinkParams.isLogResponse()) {
+            supplyAsync(() -> logResponseSink.log(msgResponse));
+        }
+    }
+
+    private MsgResponseSinksType getSinkParams(MsgResponse msgResponse) {
+        var appDeliveryID = msgResponse.getAppDeliveryID();
+        var request = repository.retrieveDeliveryRequest(appDeliveryID).get();
+        return request.getConfig().getMsgResponseSinks();
+    }
+
 }
-- 
cgit v1.2.3