Add a "when" method to the IsLike condition

Need to add this to all other conditions as applicable.

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/where/condition/IsLike.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2018 the original author or authors.
+ *    Copyright 2016-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 
 import java.util.function.Predicate;
 import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
 
 import org.mybatis.dynamic.sql.AbstractSingleValueCondition;
 
@@ -42,4 +43,8 @@ public static <T> IsLike<T> of(Supplier<T> valueSupplier) {
     public IsLike<T> when(Predicate<T> predicate) {
         return new IsLike<>(valueSupplier, predicate);
     }
+
+    public IsLike<T> then(UnaryOperator<T> transformer) {
+        return shouldRender() ? new IsLike<>(() -> transformer.apply(value())) : this;
+    }
 }

src/test/java/issue/gh105/Issue105Test.java

@@ -0,0 +1,111 @@
+/**
+ *    Copyright 2016-2019 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package issue.gh105;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mybatis.dynamic.sql.SqlBuilder.*;
+
+import java.util.Objects;
+
+import static issue.gh105.PersonDynamicSqlSupport.*;
+
+import org.junit.jupiter.api.Test;
+import org.mybatis.dynamic.sql.render.RenderingStrategy;
+import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
+
+public class Issue105Test {
+
+    @Test
+    public void testFuzzySearchBothPresent() {
+        String fName = "Fred";
+        String lName = "Flintstone";
+        
+        SelectStatementProvider selectStatement = select(id, firstName, lastName)
+                .from(person)
+                .where(firstName, isLike(fName).when(Objects::nonNull).then(s -> "%" + s + "%"))
+                .and(lastName, isLike(lName).when(Objects::nonNull).then(s -> "%" + s + "%"))
+                .build()
+                .render(RenderingStrategy.MYBATIS3);
+
+        String expected = "select person_id, first_name, last_name"
+                + " from Person"
+                + " where first_name like #{parameters.p1}"
+                + " and last_name like #{parameters.p2}";
+                
+        assertThat(selectStatement.getSelectStatement()).isEqualTo(expected);
+        assertThat(selectStatement.getParameters().get("p1")).isEqualTo("%Fred%");
+        assertThat(selectStatement.getParameters().get("p2")).isEqualTo("%Flintstone%");
+    }
+
+    @Test
+    public void testFuzzySearchFirstNameNull() {
+        String fName = null;
+        String lName = "Flintstone";
+        
+        SelectStatementProvider selectStatement = select(id, firstName, lastName)
+                .from(person)
+                .where(firstName, isLike(fName).when(Objects::nonNull).then(SearchUtils::addWildcards))
+                .and(lastName, isLike(lName).when(Objects::nonNull).then(SearchUtils::addWildcards))
+                .build()
+                .render(RenderingStrategy.MYBATIS3);
+
+        String expected = "select person_id, first_name, last_name"
+                + " from Person"
+                + " where last_name like #{parameters.p1}";
+                
+        assertThat(selectStatement.getSelectStatement()).isEqualTo(expected);
+        assertThat(selectStatement.getParameters().get("p1")).isEqualTo("%Flintstone%");
+    }
+
+    @Test
+    public void testFuzzySearchLastNameNull() {
+        String fName = "Fred";
+        String lName = null;
+        
+        SelectStatementProvider selectStatement = select(id, firstName, lastName)
+                .from(person)
+                .where(firstName, isLike(fName).when(Objects::nonNull).then(SearchUtils::addWildcards))
+                .and(lastName, isLike(lName).when(Objects::nonNull).then(SearchUtils::addWildcards))
+                .build()
+                .render(RenderingStrategy.MYBATIS3);
+
+        String expected = "select person_id, first_name, last_name"
+                + " from Person"
+                + " where first_name like #{parameters.p1}";
+                
+        assertThat(selectStatement.getSelectStatement()).isEqualTo(expected);
+        assertThat(selectStatement.getParameters().get("p1")).isEqualTo("%Fred%");
+    }
+
+    @Test
+    public void testFuzzySearchBothNull() {
+        String fName = null;
+        String lName = null;
+        
+        SelectStatementProvider selectStatement = select(id, firstName, lastName)
+                .from(person)
+                .where(firstName, isLike(fName).when(Objects::nonNull).then(SearchUtils::addWildcards))
+                .and(lastName, isLike(lName).when(Objects::nonNull).then(SearchUtils::addWildcards))
+                .build()
+                .render(RenderingStrategy.MYBATIS3);
+
+        String expected = "select person_id, first_name, last_name"
+                + " from Person";
+                
+        assertThat(selectStatement.getSelectStatement()).isEqualTo(expected);
+        assertThat(selectStatement.getParameters().size()).isEqualTo(0);
+    }
+}

src/test/java/issue/gh105/PersonDynamicSqlSupport.java

@@ -0,0 +1,36 @@
+/**
+ *    Copyright 2016-2019 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package issue.gh105;
+
+import org.mybatis.dynamic.sql.SqlColumn;
+import org.mybatis.dynamic.sql.SqlTable;
+
+public final class PersonDynamicSqlSupport {
+    public static final Person person = new Person();
+    public static final SqlColumn<Integer> id = person.id;
+    public static final SqlColumn<String> firstName = person.firstName;
+    public static final SqlColumn<String> lastName = person.lastName;
+
+    public static final class Person extends SqlTable {
+        public final SqlColumn<Integer> id = column("person_id");
+        public final SqlColumn<String> firstName = column("first_name");
+        public final SqlColumn<String> lastName = column("last_name");
+
+        public Person() {
+            super("Person");
+        }
+    }
+}

src/test/java/issue/gh105/SearchUtils.java

@@ -0,0 +1,22 @@
+/**
+ *    Copyright 2016-2019 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package issue.gh105;
+
+public class SearchUtils {
+    public static String addWildcards(String s) {
+        return "%" + s + "%";
+    }
+}