Make the builders a bit more intuitive

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/delete/render/DeleteStatement.java

@@ -17,7 +17,6 @@
 
 import static org.mybatis.dynamic.sql.util.StringUtilities.spaceBefore;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -57,12 +56,15 @@ public Builder withTableName(String tableName) {
         }
 
         public Builder withWhereClause(Optional<WhereClauseAndParameters> whereClauseAndParameters) {
-            whereClause = whereClauseAndParameters.map(WhereClauseAndParameters::whereClause);
-            parameters.putAll(whereClauseAndParameters.map(WhereClauseAndParameters::parameters)
-                    .orElse(Collections.emptyMap()));
+            whereClauseAndParameters.ifPresent(this::handleWhereClause);
             return this;
         }
 
+        private void handleWhereClause(WhereClauseAndParameters whereClauseAndParameters) {
+            this.whereClause = Optional.of(whereClauseAndParameters.whereClause());
+            parameters.putAll(whereClauseAndParameters.parameters());
+        }
+        
         public DeleteStatement build() {
             return new DeleteStatement(this);
         }

src/main/java/org/mybatis/dynamic/sql/select/render/QueryExpression.java

@@ -18,7 +18,6 @@
 import static org.mybatis.dynamic.sql.util.StringUtilities.spaceAfter;
 import static org.mybatis.dynamic.sql.util.StringUtilities.spaceBefore;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -90,9 +89,7 @@ public Builder isDistinct(boolean isDistinct) {
         }
 
         public Builder withWhereClause(Optional<WhereClauseAndParameters> whereClauseAndParameters) {
-            whereClause = whereClauseAndParameters.map(WhereClauseAndParameters::whereClause);
-            parameters.putAll(whereClauseAndParameters.map(WhereClauseAndParameters::parameters)
-                    .orElse(Collections.emptyMap()));
+            whereClauseAndParameters.ifPresent(this::handleWhereClause);
             return this;
         }
 
@@ -116,6 +113,11 @@ public Builder withGroupByClause(Optional<String> groupByClause) {
             return this;
         }
 
+        private void handleWhereClause(WhereClauseAndParameters whereClauseAndParameters) {
+            this.whereClause = Optional.of(whereClauseAndParameters.whereClause());
+            parameters.putAll(whereClauseAndParameters.parameters());
+        }
+        
         public QueryExpression build() {
             return new QueryExpression(this);
         }

src/main/java/org/mybatis/dynamic/sql/update/render/UpdateStatement.java

@@ -17,7 +17,6 @@
 
 import static org.mybatis.dynamic.sql.util.StringUtilities.spaceBefore;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -73,9 +72,7 @@ public Builder withSetClause(String setClause) {
         }
 
         public Builder withWhereClause(Optional<WhereClauseAndParameters> whereClauseAndParameters) {
-            whereClause = whereClauseAndParameters.map(WhereClauseAndParameters::whereClause);
-            parameters.putAll(whereClauseAndParameters.map(WhereClauseAndParameters::parameters)
-                    .orElse(Collections.emptyMap()));
+            whereClauseAndParameters.ifPresent(this::handleWhereClause);
             return this;
         }
 
@@ -84,6 +81,11 @@ public Builder withParameters(Map<String, Object> parameters) {
             return this;
         }
 
+        private void handleWhereClause(WhereClauseAndParameters whereClauseAndParameters) {
+            this.whereClause = Optional.of(whereClauseAndParameters.whereClause());
+            parameters.putAll(whereClauseAndParameters.parameters());
+        }
+        
         public UpdateStatement build() {
             return new UpdateStatement(this);
         }