Random cleanup

Author: jeffgbutler

Diff for: src/test/java/issues/gh105/Issue105Test.java

@@ -49,12 +49,11 @@ void testFuzzyLikeBothPresent() {
 
     @Test
     void testFuzzyLikeFirstNameNull() {
-        String fName = null;
         String lName = "Flintstone";
 
         SelectStatementProvider selectStatement = select(id, firstName, lastName)
                 .from(person)
-                .where(firstName, isLikeWhenPresent(fName).map(SearchUtils::addWildcards))
+                .where(firstName, isLikeWhenPresent((String) null).map(SearchUtils::addWildcards))
                 .and(lastName, isLike(lName).map(SearchUtils::addWildcards))
                 .build()
                 .render(RenderingStrategies.MYBATIS3);
@@ -70,12 +69,11 @@ void testFuzzyLikeFirstNameNull() {
     @Test
     void testFuzzyLikeLastNameNull() {
         String fName = "Fred";
-        String lName = null;
 
         SelectStatementProvider selectStatement = select(id, firstName, lastName)
                 .from(person)
                 .where(firstName, isLike(fName).map(SearchUtils::addWildcards))
-                .and(lastName, isLikeWhenPresent(lName).map(SearchUtils::addWildcards))
+                .and(lastName, isLikeWhenPresent((String) null).map(SearchUtils::addWildcards))
                 .build()
                 .render(RenderingStrategies.MYBATIS3);
 
@@ -89,13 +87,10 @@ void testFuzzyLikeLastNameNull() {
 
     @Test
     void testFuzzyLikeBothNull() {
-        String fName = null;
-        String lName = null;
-
         SelectStatementProvider selectStatement = select(id, firstName, lastName)
                 .from(person)
-                .where(firstName, isLikeWhenPresent(fName).map(SearchUtils::addWildcards))
-                .and(lastName, isLikeWhenPresent(lName).map(SearchUtils::addWildcards))
+                .where(firstName, isLikeWhenPresent((String) null).map(SearchUtils::addWildcards))
+                .and(lastName, isLikeWhenPresent((String) null).map(SearchUtils::addWildcards))
                 .configureStatement(c -> c.setNonRenderingWhereClauseAllowed(true))
                 .build()
                 .render(RenderingStrategies.MYBATIS3);

Diff for: src/test/java/org/mybatis/dynamic/sql/insert/GeneralInsertStatementTest.java

@@ -85,14 +85,12 @@ void testInsertStatementBuilderWithConstants() {
 
     @Test
     void testSelectiveInsertStatementBuilder() {
-        Integer myId = null;
-        String myFirstName = null;
         String myLastName = "jones";
         String myOccupation = "dino driver";
 
         GeneralInsertStatementProvider insertStatement = insertInto(foo)
-                .set(id).toValueWhenPresent(() -> myId)
-                .set(firstName).toValueWhenPresent(myFirstName)
+                .set(id).toValueWhenPresent(() -> null)
+                .set(firstName).toValueWhenPresent((String) null)
                 .set(lastName).toValueWhenPresent(() -> myLastName)
                 .set(occupation).toValueWhenPresent(myOccupation)
                 .build()