single-expressions.10 : When instead of if

Duncan McGregor · dmcg · commit 14be1250e294 · 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,17 +9,16 @@ data class EmailAddress(
 
     companion object {
         @JvmStatic
-        fun parse(value: String): EmailAddress {
-            return emailAddress(value, value.lastIndexOf('@'))
-        }
+        fun parse(value: String) =
+            emailAddress(value, value.lastIndexOf('@'))
 
         private fun emailAddress(value: String, atIndex: Int): EmailAddress =
-            if ((atIndex < 1 || atIndex == value.length - 1)) {
-                throw IllegalArgumentException(
-                    "EmailAddress must be two parts separated by @"
-                )
-            } else {
-                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)
                 )
