From 930e6ab6d604963ae6a48c58fc1bd3735071d9ee Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 20 Nov 2018 00:07:06 +0300
Subject: getMessage refactoring

---
 src/main/java/com/juick/server/EmailManager.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/com/juick/server/EmailManager.java')

diff --git a/src/main/java/com/juick/server/EmailManager.java b/src/main/java/com/juick/server/EmailManager.java
index 1cdafac6..af4ed416 100644
--- a/src/main/java/com/juick/server/EmailManager.java
+++ b/src/main/java/com/juick/server/EmailManager.java
@@ -55,7 +55,7 @@ public class EmailManager implements NotificationListener {
                 emailNotify(email, subject, msg);
             });
         } else if (MessageUtils.isReply(msg)) {
-            Message originalMessage = messagesService.getMessage(msg.getMid());
+            Message originalMessage = messagesService.getMessage(msg.getMid()).orElseThrow(IllegalStateException::new);
             String subject = String.format("New reply to %s", originalMessage.getUser().getName());
             subscribedUsers.stream()
                     .flatMap(user -> emailService.getEmails(user.getUid(), true).stream())
@@ -103,7 +103,7 @@ public class EmailManager implements NotificationListener {
                 Message replyto = messagesService.getReply(msg.getMid(), msg.getReplyto());
                 headers.put("In-Reply-To", String.format("<%d.%d@juick.com>", replyto.getMid(), replyto.getRid()));
             } else {
-                Message original = messagesService.getMessage(msg.getMid());
+                Message original = messagesService.getMessage(msg.getMid()).orElseThrow(IllegalStateException::new);
                 headers.put("In-Reply-To", String.format("<%d.%d@juick.com>", original.getMid(), original.getRid()));
             }
         }
-- 
cgit v1.2.3