2 files changed, 19 insertions, 16 deletions

diff --git a/src/main/java/at/gv/egiz/moazs/process/SafeResponseToFileSink.java b/src/main/java/at/gv/egiz/moazs/process/SaveResponseToFileSink.java
index 12a9fe3..09d8570 100644
--- a/src/main/java/at/gv/egiz/moazs/process/SafeResponseToFileSink.java
+++ b/src/main/java/at/gv/egiz/moazs/process/SaveResponseToFileSink.java
@@ -16,27 +16,28 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.CompletableFuture;
 
+import static at.gv.egiz.moazs.MoaZSException.moaZSException;
 import static java.lang.String.format;
 import static java.util.concurrent.CompletableFuture.allOf;
 import static java.util.concurrent.CompletableFuture.supplyAsync;
 
 @Component
-public class SafeResponseToFileSink implements MsgResponseSink {
+public class SaveResponseToFileSink implements MsgResponseSink {
 
-    private static final Logger log = LoggerFactory.getLogger(SafeResponseToFileSink.class);
-    private static final String SAFING_FAILED_MSG = "Could not save response with AppDeliveryId=%s.";
-    private static final SimpleDateFormat ISO_FORMATTER = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+    private static final Logger log = LoggerFactory.getLogger(SaveResponseToFileSink.class);
+    private static final String SAVING_FAILED_MSG = "Could not save response with AppDeliveryId=%s.";
 
+    private final SimpleDateFormat isoFormatter;
     private final Marshaller msgMarshaller;
-    private final DeliveryRepository respository;
+    private final DeliveryRepository repository;
     private final String root;
 
-
     @Autowired
-    public SafeResponseToFileSink(Marshaller msgMarshaller, DeliveryRepository binaryRepository, String root) {
+    public SaveResponseToFileSink(Marshaller msgMarshaller, DeliveryRepository repository, String root) {
         this.msgMarshaller = msgMarshaller;
-        this.respository = binaryRepository;
+        this.repository = repository;
         this.root = root;
+        this.isoFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
     }
 
     @Override
@@ -48,12 +49,12 @@ public class SafeResponseToFileSink implements MsgResponseSink {
         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(() -> respository.retrieveBinaryResponse(responseID).get())
+        var storeBinaryResponseToFileSystemFuture = supplyAsync(() -> repository.retrieveBinaryResponse(responseID).get())
                 .thenAccept(binaryResponseByteArray -> storeToFile(binaryResponsePath, binaryResponseByteArray))
-                .exceptionally((ex) -> logException(ex, responseID));
+                .exceptionally(ex -> logException(ex, responseID));
 
         return allOf(storeResponseToFileSystemFuture, storeBinaryResponseToFileSystemFuture);
 
@@ -61,8 +62,8 @@ public class SafeResponseToFileSink implements MsgResponseSink {
 
     private String generatePath(String id, String suffix) {
         var folder = sanitizeFileString(id);
-        var iso8601_now = ISO_FORMATTER.format(new Date());
-        return format("%s/%s/%s.%s", root, folder, iso8601_now,  suffix);
+        var nowInIso8601 = isoFormatter.format(new Date());
+        return format("%s/%s/%s.%s", root, folder, nowInIso8601,  suffix);
     }
 
     private String sanitizeFileString(String fileString) {
@@ -70,7 +71,9 @@ public class SafeResponseToFileSink implements MsgResponseSink {
     }
 
     private Void logException(Throwable ex, String appDeliveryID) {
-        log.error(format(SAFING_FAILED_MSG, appDeliveryID), ex);
+        if(log.isErrorEnabled()) {
+            log.error(format(SAVING_FAILED_MSG, appDeliveryID), ex);
+        }
         return null;
     }
 
@@ -78,7 +81,7 @@ public class SafeResponseToFileSink implements MsgResponseSink {
         try {
             FileUtils.writeByteArrayToFile(new File(path), content);
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            throw moaZSException(e.getMessage(), e);
         }
     }
 }
diff --git a/src/main/java/at/gv/egiz/moazs/process/SingleNodeResponseHandler.java b/src/main/java/at/gv/egiz/moazs/process/SingleNodeResponseHandler.java
index b115e27..65f5eed 100644
--- a/src/main/java/at/gv/egiz/moazs/process/SingleNodeResponseHandler.java
+++ b/src/main/java/at/gv/egiz/moazs/process/SingleNodeResponseHandler.java
@@ -21,6 +21,6 @@ public class SingleNodeResponseHandler implements MsgResponseHandler {
     @Override
     public void handle(String responseID) {
         supplyAsync(() -> verifier.verify(responseID))
-                .thenAcceptAsync((response) -> sink.handle(response));
+                .thenAcceptAsync(response -> sink.handle(response));
     }
 }