Polishing

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/select/CountDSL.java

@@ -70,7 +70,7 @@ private SelectModel buildModel() {
                 .withTable(table())
                 .withTableAliases(tableAliases());
 
-        if (whereBuilder != null){
+        if (whereBuilder != null) {
             b.withWhereModel(whereBuilder.buildWhereModel());
         }
 

src/main/java/org/mybatis/dynamic/sql/where/render/WhereRenderer.java

@@ -52,9 +52,9 @@ public Optional<WhereClauseProvider> render() {
 
         if (whereClause.isPresent() || whereModel.isUnrenderableClauseAllowed()) {
             return whereClause;
+        } else {
+            throw new UnrenderableWhereClauseException();
         }
-
-        throw new UnrenderableWhereClauseException();
     }
 
     private Optional<RenderedCriterion> renderWithInitialCriterion(SqlCriterion initialCriterion) {

src/test/kotlin/examples/kotlin/spring/canonical/InfixElementsTest.kt

@@ -24,7 +24,6 @@ import examples.kotlin.spring.canonical.PersonDynamicSqlSupport.lastName
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatExceptionOfType
 import org.junit.jupiter.api.Test
-import org.mybatis.dynamic.sql.exception.UnrenderableWhereClauseException
 import org.mybatis.dynamic.sql.util.kotlin.KInvalidSQLException
 import org.mybatis.dynamic.sql.util.kotlin.elements.isLike
 import org.mybatis.dynamic.sql.util.kotlin.elements.stringConstant
@@ -96,17 +95,6 @@ open class InfixElementsTest {
         assertThat(rows[0]).isEqualTo("Bamm Bamm")
     }
 
-    @Test
-    fun testVanishingWhereClause() {
-        assertThatExceptionOfType(UnrenderableWhereClauseException::class.java).isThrownBy {
-            select(firstName) {
-                from(person)
-                where { id isEqualToWhenPresent null }
-                orderBy(id)
-            }
-        }
-    }
-
     @Test
     fun testIsEqualToWhenPresentNull() {
         val selectStatement = select(firstName) {