Only the finishers are buildable

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/select/HavingDSL.java

@@ -19,8 +19,7 @@
 import org.mybatis.dynamic.sql.CriteriaGroup;
 import org.mybatis.dynamic.sql.util.Buildable;
 
-public class HavingDSL extends AbstractHavingStarter <HavingDSL.StandaloneHavingFinisher>
-        implements Buildable<HavingModel> {
+public class HavingDSL extends AbstractHavingStarter <HavingDSL.StandaloneHavingFinisher> {
     private StandaloneHavingFinisher havingFinisher;
 
     @Override
@@ -32,15 +31,11 @@ protected StandaloneHavingFinisher having() {
         return havingFinisher;
     }
 
-    @NotNull
-    @Override
-    public HavingModel build() {
-        return havingFinisher.buildModel();
-    }
-
-    public class StandaloneHavingFinisher extends AbstractHavingFinisher<StandaloneHavingFinisher>
+    public static class StandaloneHavingFinisher extends AbstractHavingFinisher<StandaloneHavingFinisher>
             implements Buildable<HavingModel> {
 
+        private StandaloneHavingFinisher() {}
+
         @Override
         protected StandaloneHavingFinisher getThis() {
             return this;
@@ -49,7 +44,7 @@ protected StandaloneHavingFinisher getThis() {
         @NotNull
         @Override
         public HavingModel build() {
-            return HavingDSL.this.build();
+            return buildModel();
         }
 
         public HavingApplier toHavingApplier() {

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

@@ -22,8 +22,7 @@
 import org.mybatis.dynamic.sql.configuration.StatementConfiguration;
 import org.mybatis.dynamic.sql.util.Buildable;
 
-public class WhereDSL extends AbstractWhereStarter<WhereDSL.StandaloneWhereFinisher, WhereDSL>
-        implements Buildable<WhereModel> {
+public class WhereDSL extends AbstractWhereStarter<WhereDSL.StandaloneWhereFinisher, WhereDSL> {
     private StandaloneWhereFinisher whereBuilder;
     private final StatementConfiguration statementConfiguration = new StatementConfiguration();
 
@@ -37,12 +36,6 @@ public StandaloneWhereFinisher where() {
         return whereBuilder;
     }
 
-    @NotNull
-    @Override
-    public WhereModel build() {
-        return whereBuilder.buildModel();
-    }
-
     @Override
     public WhereDSL configureStatement(Consumer<StatementConfiguration> consumer) {
         consumer.accept(statementConfiguration);
@@ -63,7 +56,7 @@ protected StandaloneWhereFinisher getThis() {
         @NotNull
         @Override
         public WhereModel build() {
-            return WhereDSL.this.build();
+            return buildModel();
         }
 
         public WhereApplier toWhereApplier() {