2 files changed, 19 insertions, 23 deletions

diff --git a/src/main/java/at/gv/egiz/moazs/process/SafeResponseToFileSink.java b/src/main/java/at/gv/egiz/moazs/process/SafeResponseToFileSink.java
index ee32768..12a9fe3 100644
--- a/src/main/java/at/gv/egiz/moazs/process/SafeResponseToFileSink.java
+++ b/src/main/java/at/gv/egiz/moazs/process/SafeResponseToFileSink.java
@@ -1,6 +1,6 @@
 package at.gv.egiz.moazs.process;
 
-import at.gv.egiz.moazs.repository.BinaryRepository;
+import at.gv.egiz.moazs.repository.DeliveryRepository;
 import at.gv.egiz.moazs.scheme.Marshaller;
 import at.gv.egiz.moazs.scheme.MsgResponse;
 import org.apache.commons.io.FileUtils;
@@ -28,32 +28,32 @@ public class SafeResponseToFileSink implements MsgResponseSink {
     private static final SimpleDateFormat ISO_FORMATTER = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
 
     private final Marshaller msgMarshaller;
-    private final BinaryRepository binaryRepository;
+    private final DeliveryRepository respository;
     private final String root;
 
 
     @Autowired
-    public SafeResponseToFileSink(Marshaller msgMarshaller, BinaryRepository binaryRepository, String root) {
+    public SafeResponseToFileSink(Marshaller msgMarshaller, DeliveryRepository binaryRepository, String root) {
         this.msgMarshaller = msgMarshaller;
-        this.binaryRepository = binaryRepository;
+        this.respository = binaryRepository;
         this.root = root;
     }
 
     @Override
     public CompletableFuture<Void> handle(MsgResponse response) {
 
-        var responseId = response.getResponseID();
+        var responseID = response.getResponseID();
 
-        var responsePath = generatePath(responseId, "xml");
+        var responsePath = generatePath(responseID, "xml");
         var storeResponseToFileSystemFuture = supplyAsync(() -> msgMarshaller.marshallXml(response.getResponse()))
                 .thenApply(responseString -> responseString.getBytes(StandardCharsets.UTF_8))
                 .thenAccept(responseByteArray -> storeToFile(responsePath, responseByteArray))
-                .exceptionally((ex) -> logException(ex, responseId));
+                .exceptionally((ex) -> logException(ex, responseID));
 
-        var binaryResponsePath = generatePath(responseId, "binary.xml");
-        var storeBinaryResponseToFileSystemFuture = supplyAsync(() -> binaryRepository.get(responseId).get())
+        var binaryResponsePath = generatePath(responseID, "binary.xml");
+        var storeBinaryResponseToFileSystemFuture = supplyAsync(() -> respository.retrieveBinaryResponse(responseID).get())
                 .thenAccept(binaryResponseByteArray -> storeToFile(binaryResponsePath, binaryResponseByteArray))
-                .exceptionally((ex) -> logException(ex, responseId));
+                .exceptionally((ex) -> logException(ex, responseID));
 
         return allOf(storeResponseToFileSystemFuture, storeBinaryResponseToFileSystemFuture);
 
diff --git a/src/main/java/at/gv/egiz/moazs/process/SingleThreadedDeliveryPipeline.java b/src/main/java/at/gv/egiz/moazs/process/SingleThreadedDeliveryPipeline.java
index 69065d7..445f386 100644
--- a/src/main/java/at/gv/egiz/moazs/process/SingleThreadedDeliveryPipeline.java
+++ b/src/main/java/at/gv/egiz/moazs/process/SingleThreadedDeliveryPipeline.java
@@ -4,7 +4,6 @@ package at.gv.egiz.moazs.process;
 import at.gv.egiz.moazs.MoaZSException;
 import at.gv.egiz.moazs.client.ClientFactory;
 import at.gv.egiz.moazs.client.TnvzHelper;
-import at.gv.egiz.moazs.repository.BinaryRepository;
 import at.gv.egiz.moazs.repository.DeliveryRepository;
 import at.gv.egiz.moazs.scheme.Mzs2MsgConverter;
 import at.gv.egiz.moazs.scheme.RequestStatusResponse;
@@ -31,7 +30,6 @@ public class SingleThreadedDeliveryPipeline implements DeliveryPipeline {
             "An error occured while processing the DeliveryRequest with AppDeliveryID=%s. ";
 
     private final DeliveryRepository repository;
-    private final BinaryRepository binaryRepository;
     private final TnvzHelper tnvzHelper;
     private final Mzs2MsgConverter converter;
     private final ClientFactory clientFactory;
@@ -39,13 +37,11 @@ public class SingleThreadedDeliveryPipeline implements DeliveryPipeline {
 
     @Autowired
     public SingleThreadedDeliveryPipeline(DeliveryRepository repository,
-                                          BinaryRepository binaryStatusRepository,
                                           TnvzHelper tnvzHelper,
                                           Mzs2MsgConverter converter,
                                           ClientFactory clientFactory,
                                           SignatureVerifier verifier) {
         this.repository = repository;
-        this.binaryRepository = binaryStatusRepository;
         this.tnvzHelper = tnvzHelper;
         this.converter = converter;
         this.clientFactory = clientFactory;
@@ -53,12 +49,12 @@ public class SingleThreadedDeliveryPipeline implements DeliveryPipeline {
     }
 
     @Override
-    public void processRequest(String appDeliveryId) {
+    public void processRequest(String appDeliveryID) {
 
         var exceptionBuilder = moaZSExceptionBuilder();
 
         try {
-            var mzsRequest = repository.getDeliveryRequest(appDeliveryId).orElseThrow();
+            var mzsRequest = repository.retrieveDeliveryRequest(appDeliveryID).orElseThrow();
             exceptionBuilder.withDeliverySystem(mzsRequest);
 
             at.gv.zustellung.msg.xsd.DeliveryRequestType msgRequest = buildMsgRequest(mzsRequest, exceptionBuilder);
@@ -70,22 +66,22 @@ public class SingleThreadedDeliveryPipeline implements DeliveryPipeline {
             var response = new RequestStatusResponse(status);
             exceptionBuilder.withAllParametersInAnswer(response.getAnswer());
 
-            verifySignedStatus(response.getResponseID(), exceptionBuilder);
-            repository.add(response);
+            verifySignedStatus(response.getResponseID(), appDeliveryID, exceptionBuilder);
+            repository.store(response);
 
         } catch (MoaZSException exception) {
-            log.error(format(MZS_PIPELINE_ERROR_MSG, appDeliveryId), exception);
+            log.error(format(MZS_PIPELINE_ERROR_MSG, appDeliveryID), exception);
             var errorResponse = generateErrorFromException(exception);
-            repository.add(errorResponse);
+            repository.store(errorResponse);
         }
     }
 
-    private void verifySignedStatus(String appDeliveryId, MoaZSException.Builder exceptionBuilder) throws MoaZSException {
+    private void verifySignedStatus(String responseID, String appDeliveryID, MoaZSException.Builder exceptionBuilder) throws MoaZSException {
         try {
-            var signedStatus = binaryRepository.get(appDeliveryId).get();
+            var signedStatus = repository.retrieveBinaryResponse(responseID).get();
             verifier.verify(signedStatus);
         } catch (MoaZSException ex) {
-            throw exceptionBuilder.withMessage(format(MsgResponseVerifier.MOASP_SIGNATURE_INVALID_ERROR_MSG, appDeliveryId))
+            throw exceptionBuilder.withMessage(format(MsgResponseVerifier.MOASP_SIGNATURE_INVALID_ERROR_MSG, appDeliveryID))
                     .withErrorCode(MoaZSException.ERROR_MOASP_SIGNATURE_INVALID)
                     .withCause(ex)
                     .build();