Throw exceptions immediately

Author: jakobkmar

simplekotlinmail-server/src/main/kotlin/net/axay/simplekotlinmail/server/MessageListener.kt

@@ -37,7 +37,6 @@ class MailHandler(
         if (fromListener != null) {
             val incomingFrom = IncomingFrom(from, context)
             fromListener.invoke(incomingFrom)
-            incomingFrom.throwExceptions()
         }
     }
 
@@ -47,15 +46,13 @@ class MailHandler(
         if (recipientListener != null) {
             val incomingRecipient = IncomingRecipient(from, recipient, recipients, context)
             recipientListener.invoke(incomingRecipient)
-            incomingRecipient.throwExceptions()
         }
     }
 
     override fun data(data: InputStream): String? {
         return if (mailListener != null) {
             val incomingMail = IncomingMail(from, recipients, EmailConverter.emlToEmail(data), context)
             mailListener.invoke(incomingMail)
-            incomingMail.throwExceptions()
 
             incomingMail.response
         } else null

simplekotlinmail-server/src/main/kotlin/net/axay/simplekotlinmail/server/exchange/IncomingMail.kt

@@ -15,9 +15,6 @@ class IncomingMail internal constructor(
 ) : IncomingMailExchange(context) {
     internal var response: String? = null
 
-    private var ifTooMuchData = false
-    private var tooMuchDataMessage: String? = null
-
     /**
      * Set a custom response success message.
      */
@@ -29,15 +26,6 @@ class IncomingMail internal constructor(
      * Reject the message if an input stream provides
      * more data than the listener can handle
      */
-    fun tooMuchData(message: String? = null) {
-        ifTooMuchData = true
-        tooMuchDataMessage = message
-    }
-
-    override fun throwSpecificExceptions() {
-        if (ifTooMuchData)
-            if (tooMuchDataMessage != null)
-                throw TooMuchDataException(tooMuchDataMessage)
-            else throw TooMuchDataException()
-    }
+    fun tooMuchData(message: String? = null): Nothing =
+        if (message != null) throw TooMuchDataException(message) else throw TooMuchDataException()
 }

simplekotlinmail-server/src/main/kotlin/net/axay/simplekotlinmail/server/exchange/IncomingMailExchange.kt

@@ -5,45 +5,21 @@ import org.subethamail.smtp.MessageContext
 import org.subethamail.smtp.RejectException
 
 abstract class IncomingMailExchange(val context: MessageContext) {
-    private var ifReject = false
-    private var rejectMessage: String? = null
-    private var rejectCode: Int? = null
-
-    private var ifDropConnection = false
-    private var dropConnectionMessage: String? = null
-    private var dropConnectionCode: Int? = null
-
     /**
      * Reject this message.
      */
-    fun reject(message: String? = null, statusCode: Int? = null) {
-        ifReject = true
-        rejectMessage = message
-        rejectCode = statusCode
-    }
+    fun reject(message: String? = null, statusCode: Int? = null): Nothing =
+        throw RejectException(
+            statusCode ?: RejectException.DEFAULT_CODE,
+            message ?: RejectException.DEFAULT_MESSAGE
+        )
 
     /**
      * Drop the connection.
      */
-    fun dropConnection(message: String? = null, statusCode: Int? = null) {
-        ifDropConnection = true
-        dropConnectionMessage = message
-        dropConnectionCode = statusCode
-    }
-
-    internal fun throwExceptions() {
-        if (ifReject)
-            throw RejectException(
-                rejectCode ?: RejectException.DEFAULT_CODE,
-                rejectMessage ?: RejectException.DEFAULT_MESSAGE
-            )
-        if (ifDropConnection)
-            throw DropConnectionException(
-                dropConnectionCode ?: DropConnectionException.DEFAULT_CODE,
-                dropConnectionMessage ?: DropConnectionException.DEFAULT_MESSAGE
-            )
-        throwSpecificExceptions()
-    }
-
-    protected open fun throwSpecificExceptions() { }
+    fun dropConnection(message: String? = null, statusCode: Int? = null): Nothing =
+        throw DropConnectionException(
+            statusCode ?: DropConnectionException.DEFAULT_CODE,
+            message ?: DropConnectionException.DEFAULT_MESSAGE
+        )
 }