Fix crash for clients without global sender

Author: runeflobakk

src/main/java/no/digipost/signature/client/asice/CreateASiCE.java

@@ -8,6 +8,7 @@
 import no.digipost.signature.client.core.Sender;
 import no.digipost.signature.client.core.SignatureJob;
 import no.digipost.signature.client.core.exceptions.RuntimeIOException;
+import no.digipost.signature.client.core.internal.ActualSender;
 import no.digipost.signature.client.security.KeyStoreConfig;
 
 import java.io.ByteArrayInputStream;
@@ -16,8 +17,6 @@
 import java.util.List;
 import java.util.Optional;
 
-import static no.digipost.signature.client.core.exceptions.SenderNotSpecifiedException.SENDER_NOT_SPECIFIED;
-
 public class CreateASiCE<JOB extends SignatureJob> {
 
     private final CreateZip createZip = new CreateZip();
@@ -37,10 +36,7 @@ public CreateASiCE(ManifestCreator<JOB> manifestCreator, ASiCEConfiguration clie
     }
 
     public DocumentBundle createASiCE(JOB job) {
-        Sender sender = job.getSender()
-                .orElse(globalSender
-                .orElseThrow(SENDER_NOT_SPECIFIED));
-
+        Sender sender = ActualSender.getActualSender(job.getSender(), globalSender);
         Manifest manifest = manifestCreator.createManifest(job, sender);
 
         List<ASiCEAttachable> files = new ArrayList<>();

src/main/java/no/digipost/signature/client/core/internal/ActualSender.java

@@ -6,8 +6,11 @@
 
 import static no.digipost.signature.client.core.exceptions.SenderNotSpecifiedException.SENDER_NOT_SPECIFIED;
 
-public class ActualSender {
+public final class ActualSender {
     public static Sender getActualSender(Optional<Sender> messageSpecificSender, Optional<Sender> globalSender) {
-        return messageSpecificSender.orElse(globalSender.orElseThrow(SENDER_NOT_SPECIFIED));
+        return messageSpecificSender.orElseGet(() -> globalSender.orElseThrow(SENDER_NOT_SPECIFIED));
+    }
+
+    private ActualSender() {
     }
 }

src/test/java/no/digipost/signature/client/core/internal/ActualSenderTest.java

@@ -0,0 +1,35 @@
+package no.digipost.signature.client.core.internal;
+
+import no.digipost.signature.client.core.Sender;
+import no.digipost.signature.client.core.exceptions.SenderNotSpecifiedException;
+import org.junit.jupiter.api.Test;
+
+import java.util.Optional;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.sameInstance;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class ActualSenderTest {
+
+    @Test
+    void throwsIfNoSenderIsAvailable() {
+        assertThrows(SenderNotSpecifiedException.class, () -> ActualSender.getActualSender(Optional.empty(), Optional.empty()));
+    }
+
+    @Test
+    void prioritizesSenderOnJob() {
+        Sender senderOnJob = new Sender("123456789");
+        Sender actualSender = ActualSender.getActualSender(Optional.of(senderOnJob), Optional.empty());
+        assertThat(actualSender, sameInstance(senderOnJob));
+    }
+
+    @Test
+    void fallsBackToGlobalSender() {
+        Sender globalSender = new Sender("123456789");
+        Sender actualSender = ActualSender.getActualSender(Optional.empty(), Optional.of(globalSender));
+        assertThat(actualSender, sameInstance(globalSender));
+    }
+
+
+}