Polishing

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/common/AbstractBooleanExpressionRenderer.java

@@ -33,7 +33,7 @@ public abstract class AbstractBooleanExpressionRenderer<M extends AbstractBoolea
     private final CriterionRenderer criterionRenderer;
     private final String prefix;
 
-    protected AbstractBooleanExpressionRenderer(AbstractBuilder<M, ?> builder) {
+    protected AbstractBooleanExpressionRenderer(String prefix, AbstractBuilder<M, ?> builder) {
         model = Objects.requireNonNull(builder.model);
 
         criterionRenderer = new CriterionRenderer.Builder()
@@ -43,7 +43,7 @@ protected AbstractBooleanExpressionRenderer(AbstractBuilder<M, ?> builder) {
                 .withParameterName(builder.parameterName)
                 .build();
 
-        prefix = Objects.requireNonNull(builder.prefix);
+        this.prefix = Objects.requireNonNull(prefix);
     }
 
     public Optional<FragmentAndParameters> render() {
@@ -92,10 +92,7 @@ public abstract static class AbstractBuilder<M, B extends AbstractBuilder<M, B>>
         private AtomicInteger sequence;
         private String parameterName;
 
-        private final String prefix;
-
-        protected AbstractBuilder(String prefix, M model) {
-            this.prefix = prefix;
+        protected AbstractBuilder(M model) {
             this.model = model;
         }
 

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

@@ -20,7 +20,7 @@
 
 public class HavingRenderer extends AbstractBooleanExpressionRenderer<HavingModel> {
     private HavingRenderer(Builder builder) {
-        super(builder);
+        super("having", builder); //$NON-NLS-1$
     }
 
     public static Builder withHavingModel(HavingModel havingModel) {
@@ -29,7 +29,7 @@ public static Builder withHavingModel(HavingModel havingModel) {
 
     public static class Builder extends AbstractBuilder<HavingModel, Builder> {
         public Builder(HavingModel havingModel) {
-            super("having", havingModel);  //$NON-NLS-1$
+            super(havingModel);
         }
 
         @Override

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

@@ -24,7 +24,7 @@
 
 public class WhereRenderer extends AbstractBooleanExpressionRenderer<WhereModel> {
     private WhereRenderer(Builder builder) {
-        super(builder);
+        super("where", builder); //$NON-NLS-1$
     }
 
     @Override
@@ -44,7 +44,7 @@ public static Builder withWhereModel(WhereModel whereModel) {
 
     public static class Builder extends AbstractBuilder<WhereModel, Builder> {
         public Builder(WhereModel whereModel) {
-            super("where", whereModel); //$NON-NLS-1$
+            super(whereModel);
         }
 
         @Override