Simplify Boolean Expression Renderer

Author: jeffgbutler

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

@@ -28,13 +28,13 @@
 import org.mybatis.dynamic.sql.where.render.CriterionRenderer;
 import org.mybatis.dynamic.sql.where.render.RenderedCriterion;
 
-public abstract class AbstractBooleanExpressionRenderer<M extends AbstractBooleanExpressionModel> {
-    protected final M model;
+public abstract class AbstractBooleanExpressionRenderer {
+    protected final AbstractBooleanExpressionModel model;
     private final String prefix;
     private final CriterionRenderer criterionRenderer;
     protected final RenderingContext renderingContext;
 
-    protected AbstractBooleanExpressionRenderer(String prefix, AbstractBuilder<M, ?> builder) {
+    protected AbstractBooleanExpressionRenderer(String prefix, AbstractBuilder<?> builder) {
         model = Objects.requireNonNull(builder.model);
         this.prefix = Objects.requireNonNull(prefix);
         renderingContext = Objects.requireNonNull(builder.renderingContext);
@@ -82,11 +82,11 @@ private String addPrefix(String fragment) {
         return spaceAfter(prefix) + fragment;
     }
 
-    public abstract static class AbstractBuilder<M, B extends AbstractBuilder<M, B>> {
-        private final M model;
+    public abstract static class AbstractBuilder<B extends AbstractBuilder<B>> {
+        private final AbstractBooleanExpressionModel model;
         private RenderingContext renderingContext;
 
-        protected AbstractBuilder(M model) {
+        protected AbstractBuilder(AbstractBooleanExpressionModel model) {
             this.model = model;
         }
 

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

@@ -18,7 +18,7 @@
 import org.mybatis.dynamic.sql.common.AbstractBooleanExpressionRenderer;
 import org.mybatis.dynamic.sql.select.HavingModel;
 
-public class HavingRenderer extends AbstractBooleanExpressionRenderer<HavingModel> {
+public class HavingRenderer extends AbstractBooleanExpressionRenderer {
     private HavingRenderer(Builder builder) {
         super("having", builder); //$NON-NLS-1$
     }
@@ -27,7 +27,7 @@ public static Builder withHavingModel(HavingModel havingModel) {
         return new Builder(havingModel);
     }
 
-    public static class Builder extends AbstractBuilder<HavingModel, Builder> {
+    public static class Builder extends AbstractBuilder<Builder> {
         public Builder(HavingModel havingModel) {
             super(havingModel);
         }

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

@@ -18,13 +18,13 @@
 import org.mybatis.dynamic.sql.common.AbstractBooleanExpressionRenderer;
 import org.mybatis.dynamic.sql.select.caseexpression.SearchedCaseWhenCondition;
 
-public class SearchedCaseWhenConditionRenderer extends AbstractBooleanExpressionRenderer<SearchedCaseWhenCondition> {
+public class SearchedCaseWhenConditionRenderer extends AbstractBooleanExpressionRenderer {
     protected SearchedCaseWhenConditionRenderer(Builder builder) {
         super("when", builder);
     }
 
     public static class Builder
-            extends AbstractBooleanExpressionRenderer.AbstractBuilder<SearchedCaseWhenCondition, Builder> {
+            extends AbstractBooleanExpressionRenderer.AbstractBuilder<Builder> {
 
         protected Builder(SearchedCaseWhenCondition model) {
             super(model);

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

@@ -17,12 +17,12 @@
 
 import java.util.Optional;
 
+import org.mybatis.dynamic.sql.common.AbstractBooleanExpressionModel;
 import org.mybatis.dynamic.sql.common.AbstractBooleanExpressionRenderer;
 import org.mybatis.dynamic.sql.exception.NonRenderingWhereClauseException;
 import org.mybatis.dynamic.sql.util.FragmentAndParameters;
-import org.mybatis.dynamic.sql.where.WhereModel;
 
-public class WhereRenderer extends AbstractBooleanExpressionRenderer<WhereModel> {
+public class WhereRenderer extends AbstractBooleanExpressionRenderer {
     private WhereRenderer(Builder builder) {
         super("where", builder); //$NON-NLS-1$
     }
@@ -38,12 +38,12 @@ public Optional<FragmentAndParameters> render() {
         }
     }
 
-    public static Builder withWhereModel(WhereModel whereModel) {
+    public static Builder withWhereModel(AbstractBooleanExpressionModel whereModel) {
         return new Builder(whereModel);
     }
 
-    public static class Builder extends AbstractBuilder<WhereModel, Builder> {
-        public Builder(WhereModel whereModel) {
+    public static class Builder extends AbstractBuilder<Builder> {
+        public Builder(AbstractBooleanExpressionModel whereModel) {
             super(whereModel);
         }