Save some garbage in the providers

Author: jeffgbutler

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

@@ -25,7 +25,7 @@ public class DefaultDeleteStatementProvider implements DeleteStatementProvider {
 
     private DefaultDeleteStatementProvider(Builder builder) {
         deleteStatement = Objects.requireNonNull(builder.deleteStatement);
-        parameters = Objects.requireNonNull(builder.parameters);
+        parameters = builder.parameters;
     }
 
     @Override

src/main/java/org/mybatis/dynamic/sql/insert/render/DefaultGeneralInsertStatementProvider.java

@@ -22,11 +22,11 @@
 public class DefaultGeneralInsertStatementProvider
         implements GeneralInsertStatementProvider, InsertSelectStatementProvider {
     private final String insertStatement;
-    private final Map<String, Object> parameters = new HashMap<>();
+    private final Map<String, Object> parameters;
 
     private DefaultGeneralInsertStatementProvider(Builder builder) {
         insertStatement = Objects.requireNonNull(builder.insertStatement);
-        parameters.putAll(builder.parameters);
+        parameters = builder.parameters;
     }
 
     @Override

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

@@ -21,11 +21,11 @@
 
 public class DefaultUpdateStatementProvider implements UpdateStatementProvider {
     private final String updateStatement;
-    private final Map<String, Object> parameters = new HashMap<>();
+    private final Map<String, Object> parameters;
 
     private DefaultUpdateStatementProvider(Builder builder) {
         updateStatement = Objects.requireNonNull(builder.updateStatement);
-        parameters.putAll(builder.parameters);
+        parameters = builder.parameters;
     }
 
     @Override

src/main/java/org/mybatis/dynamic/sql/util/FragmentAndParameters.java

@@ -15,6 +15,7 @@
  */
 package org.mybatis.dynamic.sql.util;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -28,7 +29,7 @@ public class FragmentAndParameters {
 
     private FragmentAndParameters(Builder builder) {
         fragment = Objects.requireNonNull(builder.fragment);
-        parameters = Objects.requireNonNull(builder.parameters);
+        parameters = Collections.unmodifiableMap(builder.parameters);
     }
 
     public String fragment() {

src/main/java/org/mybatis/dynamic/sql/where/WhereModel.java

@@ -24,6 +24,7 @@
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.render.TableAliasCalculator;
 import org.mybatis.dynamic.sql.util.FragmentAndParameters;
+import org.mybatis.dynamic.sql.where.render.DefaultWhereClauseProvider;
 import org.mybatis.dynamic.sql.where.render.WhereClauseProvider;
 import org.mybatis.dynamic.sql.where.render.WhereRenderer;
 
@@ -92,7 +93,7 @@ private Optional<WhereClauseProvider> render(RenderingContext renderingContext)
     }
 
     private WhereClauseProvider toWhereClauseProvider(FragmentAndParameters fragmentAndParameters) {
-        return WhereClauseProvider.withWhereClause(fragmentAndParameters.fragment())
+        return DefaultWhereClauseProvider.withWhereClause(fragmentAndParameters.fragment())
                 .withParameters(fragmentAndParameters.parameters())
                 .build();
     }

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

@@ -0,0 +1,63 @@
+/*
+ *    Copyright 2016-2024 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
+ *
+ *       https://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 org.mybatis.dynamic.sql.where.render;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+public class DefaultWhereClauseProvider implements WhereClauseProvider {
+    private final String whereClause;
+    private final Map<String, Object> parameters;
+
+    private DefaultWhereClauseProvider(Builder builder) {
+        whereClause = Objects.requireNonNull(builder.whereClause);
+        parameters = builder.parameters;
+    }
+
+    @Override
+    public Map<String, Object> getParameters() {
+        return parameters;
+    }
+
+    @Override
+    public String getWhereClause() {
+        return whereClause;
+    }
+
+    public static Builder withWhereClause(String whereClause) {
+        return new Builder().withWhereClause(whereClause);
+    }
+
+    public static class Builder {
+        private String whereClause;
+        private final Map<String, Object> parameters = new HashMap<>();
+
+        public Builder withWhereClause(String whereClause) {
+            this.whereClause = whereClause;
+            return this;
+        }
+
+        public Builder withParameters(Map<String, Object> parameters) {
+            this.parameters.putAll(parameters);
+            return this;
+        }
+
+        public DefaultWhereClauseProvider build() {
+            return new DefaultWhereClauseProvider(this);
+        }
+    }
+}

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

@@ -15,48 +15,10 @@
  */
 package org.mybatis.dynamic.sql.where.render;
 
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
 
-public class WhereClauseProvider {
-    private final String whereClause;
-    private final Map<String, Object> parameters;
+public interface WhereClauseProvider {
+    Map<String, Object> getParameters();
 
-    private WhereClauseProvider(Builder builder) {
-        whereClause = Objects.requireNonNull(builder.whereClause);
-        parameters = Objects.requireNonNull(builder.parameters);
-    }
-
-    public Map<String, Object> getParameters() {
-        return Collections.unmodifiableMap(parameters);
-    }
-
-    public String getWhereClause() {
-        return whereClause;
-    }
-
-    public static Builder withWhereClause(String whereClause) {
-        return new Builder().withWhereClause(whereClause);
-    }
-
-    public static class Builder {
-        private String whereClause;
-        private final Map<String, Object> parameters = new HashMap<>();
-
-        public Builder withWhereClause(String whereClause) {
-            this.whereClause = whereClause;
-            return this;
-        }
-
-        public Builder withParameters(Map<String, Object> parameters) {
-            this.parameters.putAll(parameters);
-            return this;
-        }
-
-        public WhereClauseProvider build() {
-            return new WhereClauseProvider(this);
-        }
-    }
+    String getWhereClause();
 }