single-expressions.11 : toss it

Duncan McGregor · dmcg · commit 61e40f065c1d · 2021-06-23T10:16:26.000+01:00
diff --git a/src/main/java/travelator/EmailAddress.kt b/src/main/java/travelator/EmailAddress.kt
@@ -9,19 +9,15 @@ data class EmailAddress(
 
     companion object {
         @JvmStatic
-        fun parse(value: String) =
-            emailAddress(value, value.lastIndexOf('@'))
-
-        private fun emailAddress(value: String, atIndex: Int): EmailAddress =
-            when {
-                atIndex < 1 || atIndex == value.length - 1 ->
-                    throw IllegalArgumentException(
-                        "EmailAddress must be two parts separated by @"
-                    )
-                else -> EmailAddress(
-                    value.substring(0, atIndex),
-                    value.substring(atIndex + 1)
-                )
+        fun parse(value: String): EmailAddress {
+            val atIndex = value.lastIndexOf('@')
+            require(!(atIndex < 1 || atIndex == value.length - 1)) {
+                "EmailAddress must be two parts separated by @"
             }
+            return EmailAddress(
+                value.substring(0, atIndex),
+                value.substring(atIndex + 1)
+            )
+        }
     }
 }
