Else functions can be infix

Infix not as useful in this case because using it requires an explicit "this", but some might prefer that syntax.

Author: jeffgbutler

src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/elements/CaseDSLs.kt

@@ -38,10 +38,9 @@ class KSearchedCaseDSL : KElseDSL {
                 .withSubCriteria(subCriteria)
                 .withThenValue(thenValue)
                 .build())
-
         }
 
-    override fun `else`(column: BasicColumn) {
+    override infix fun `else`(column: BasicColumn) {
         this.elseValue = column
     }
 }
@@ -53,7 +52,7 @@ class SearchedCaseCriteriaCollector : GroupingCriteriaCollector(), KThenDSL {
             field = value
         }
 
-    override fun then(column: BasicColumn) {
+    override infix fun then(column: BasicColumn) {
         thenValue = column
     }
 }
@@ -67,26 +66,26 @@ class KSimpleCaseDSL<T : Any> : KElseDSL {
     internal val whenConditions = mutableListOf<SimpleCaseWhenCondition<T>>()
 
     fun `when`(firstCondition: VisitableCondition<T>, vararg subsequentConditions: VisitableCondition<T>) =
-        SimpleCaseThenGatherer {
+        SimpleCaseThenGatherer { thenValue ->
             val allConditions = buildList {
                 add(firstCondition)
                 addAll(subsequentConditions)
             }
 
-            whenConditions.add(ConditionBasedWhenCondition(allConditions, it))
+            whenConditions.add(ConditionBasedWhenCondition(allConditions, thenValue))
         }
 
     fun `when`(firstValue: T, vararg subsequentValues: T) =
-        SimpleCaseThenGatherer {
+        SimpleCaseThenGatherer { thenValue ->
             val allConditions = buildList {
                 add(firstValue)
                 addAll(subsequentValues)
             }
 
-            whenConditions.add(BasicWhenCondition(allConditions, it))
+            whenConditions.add(BasicWhenCondition(allConditions, thenValue))
         }
 
-    override fun `else`(column: BasicColumn) {
+    override infix fun `else`(column: BasicColumn) {
         this.elseValue = column
     }
 }
@@ -122,25 +121,25 @@ interface KThenDSL {
 }
 
 interface KElseDSL {
-    fun `else`(value: String) {
+    infix fun `else`(value: String) {
         `else`(stringConstant(value))
     }
 
-    fun `else`(value: Boolean) {
+    infix fun `else`(value: Boolean) {
         `else`(constant<String>(value.toString()))
     }
 
-    fun `else`(value: Int) {
+    infix fun `else`(value: Int) {
         `else`(constant<String>(value.toString()))
     }
 
-    fun `else`(value: Long) {
+    infix fun `else`(value: Long) {
         `else`(constant<String>(value.toString()))
     }
 
-    fun `else`(value: Double) {
+    infix fun `else`(value: Double) {
         `else`(constant<String>(value.toString()))
     }
 
-    fun `else`(column: BasicColumn)
+    infix fun `else`(column: BasicColumn)
 }

src/test/kotlin/examples/kotlin/animal/data/KCaseExpressionTest.kt

@@ -888,7 +888,7 @@ class KCaseExpressionTest {
     fun testInvalidDoubleElseSimple() {
         assertThatExceptionOfType(KInvalidSQLException::class.java).isThrownBy {
             case(animalName) {
-                `when`(isEqualTo("Artic fox"), isEqualTo("Red fox")) then "'yes'"
+                `when`(isEqualTo("Artic fox"), isEqualTo("Red fox")) then "yes"
                 `else`("Fred")
                 `else`("Wilma")
             }
@@ -901,9 +901,9 @@ class KCaseExpressionTest {
             case {
                 `when` {
                     id isEqualTo 22
-                    then("'yes'")
+                    this then "yes"
                 }
-                `else`("Fred")
+                this `else` "Fred"
                 `else`("Wilma")
             }
         }.withMessage(Messages.getString("ERROR.42"))
@@ -915,8 +915,8 @@ class KCaseExpressionTest {
             case {
                 `when` {
                     id isEqualTo 22
-                    then("'yes'")
-                    then("'no'")
+                    then("yes")
+                    then("no")
                 }
             }
         }.withMessage(Messages.getString("ERROR.41"))