Beginning of a fix for 100 and 102

Author: jeffgbutler

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

@@ -21,6 +21,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.function.Supplier;
 
 import org.mybatis.dynamic.sql.BasicColumn;
 import org.mybatis.dynamic.sql.BindableColumn;
@@ -49,6 +50,7 @@ public class QueryExpressionDSL<R> implements Buildable<R> {
     private GroupByModel groupByModel;
     private JoinModel joinModel;
     private List<JoinSpecification> joinSpecifications = new ArrayList<>();
+    private Supplier<R> buildDelegateMethod;
 
     private QueryExpressionDSL(FromGatherer<R> fromGatherer) {
         connector = fromGatherer.builder.connector;
@@ -57,6 +59,7 @@ private QueryExpressionDSL(FromGatherer<R> fromGatherer) {
         selectDSL = Objects.requireNonNull(fromGatherer.builder.selectDSL);
         table = Objects.requireNonNull(fromGatherer.table);
         tableAliases.putAll(fromGatherer.tableAliasMap);
+        buildDelegateMethod = this::internalBuild;
     }
 
     public <T> QueryExpressionWhereBuilder where(BindableColumn<T> column, VisitableCondition<T> condition) {
@@ -70,6 +73,10 @@ public <T> QueryExpressionWhereBuilder where(BindableColumn<T> column, Visitable
 
     @Override
     public R build() {
+        return buildDelegateMethod.get();
+    }
+
+    private R internalBuild() {
         selectDSL.addQueryExpression(buildModel());
         return selectDSL.build();
     }
@@ -117,6 +124,7 @@ public GroupByFinisher groupBy(BasicColumn...columns) {
     }
 
     public SelectDSL<R> orderBy(SortSpecification...columns) {
+        buildDelegateMethod = selectDSL::build;
         selectDSL.addQueryExpression(buildModel());
         selectDSL.setOrderByModel(OrderByModel.of(columns));
         return selectDSL;
@@ -145,16 +153,19 @@ protected QueryExpressionModel buildModel() {
     }
 
     public SelectDSL<R>.LimitFinisher limit(long limit) {
+        buildDelegateMethod = selectDSL::build;
         selectDSL.addQueryExpression(buildModel());
         return selectDSL.limit(limit);
     }
 
     public SelectDSL<R>.OffsetFirstFinisher offset(long offset) {
+        buildDelegateMethod = selectDSL::build;
         selectDSL.addQueryExpression(buildModel());
         return selectDSL.offset(offset);
     }
 
     public SelectDSL<R>.FetchFirstFinisher fetchFirst(long fetchFirstRows) {
+        buildDelegateMethod = selectDSL::build;
         selectDSL.addQueryExpression(buildModel());
         return selectDSL.fetchFirst(fetchFirstRows);
     }
@@ -216,11 +227,13 @@ public class QueryExpressionWhereBuilder extends AbstractWhereDSL<QueryExpressio
             implements Buildable<R> {
         private <T> QueryExpressionWhereBuilder(BindableColumn<T> column, VisitableCondition<T> condition) {
             super(column, condition);
+            buildDelegateMethod = this::internalBuild;
         }
 
         private <T> QueryExpressionWhereBuilder(BindableColumn<T> column, VisitableCondition<T> condition,
                 SqlCriterion<?>...subCriteria) {
             super(column, condition, subCriteria);
+            buildDelegateMethod = this::internalBuild;
         }
 
         public UnionBuilder union() {
@@ -236,6 +249,7 @@ public UnionBuilder unionAll() {
         }
 
         public SelectDSL<R> orderBy(SortSpecification...columns) {
+            buildDelegateMethod = selectDSL::build;
             whereModel = buildWhereModel();
             selectDSL.addQueryExpression(buildModel());
             selectDSL.setOrderByModel(OrderByModel.of(columns));
@@ -262,13 +276,18 @@ public SelectDSL<R>.OffsetFirstFinisher offset(long offset) {
         }
 
         public SelectDSL<R>.FetchFirstFinisher fetchFirst(long fetchFirstRows) {
+            buildDelegateMethod = selectDSL::build;
             whereModel = buildWhereModel();
             selectDSL.addQueryExpression(buildModel());
             return selectDSL.fetchFirst(fetchFirstRows);
         }
 
         @Override
         public R build() {
+            return buildDelegateMethod.get();
+        }
+        
+        private R internalBuild() {
             whereModel = buildWhereModel();
             selectDSL.addQueryExpression(buildModel());
             return selectDSL.build();
@@ -300,7 +319,6 @@ public JoinSpecificationFinisher on(BasicColumn joinColumn, JoinCondition joinCo
     }
 
     public class JoinSpecificationFinisher implements Buildable<R> {
-
         private SqlTable joinTable;
         private List<JoinCriterion> joinCriteria = new ArrayList<>();
         private JoinType joinType;
@@ -316,6 +334,7 @@ public JoinSpecificationFinisher(SqlTable table, BasicColumn joinColumn,
                     .build();
 
             joinCriteria.add(joinCriterion);
+            buildDelegateMethod = this::internalbuild;
         }
 
         public JoinSpecificationFinisher(SqlTable table, BasicColumn joinColumn,
@@ -330,6 +349,7 @@ public JoinSpecificationFinisher(SqlTable table, BasicColumn joinColumn,
 
             this.joinCriteria.add(joinCriterion);
             this.joinCriteria.addAll(Arrays.asList(joinCriteria));
+            buildDelegateMethod = this::internalbuild;
         }
 
         protected JoinSpecification buildJoinSpecification() {
@@ -346,6 +366,10 @@ protected JoinModel buildJoinModel() {
 
         @Override
         public R build() {
+            return buildDelegateMethod.get();
+        }
+        
+        private R internalbuild() {
             joinModel = buildJoinModel();
             selectDSL.addQueryExpression(buildModel());
             return selectDSL.build();
@@ -412,51 +436,67 @@ public JoinSpecificationStarter fullJoin(SqlTable joinTable, String tableAlias)
         }
 
         public SelectDSL<R> orderBy(SortSpecification...columns) {
+            buildDelegateMethod = selectDSL::build;
             joinModel = buildJoinModel();
             selectDSL.addQueryExpression(buildModel());
             selectDSL.setOrderByModel(OrderByModel.of(columns));
             return selectDSL;
         }
 
         public SelectDSL<R>.LimitFinisher limit(long limit) {
+            buildDelegateMethod = selectDSL::build;
             joinModel = buildJoinModel();
             selectDSL.addQueryExpression(buildModel());
             return selectDSL.limit(limit);
         }
 
         public SelectDSL<R>.OffsetFirstFinisher offset(long offset) {
+            buildDelegateMethod = selectDSL::build;
             joinModel = buildJoinModel();
             selectDSL.addQueryExpression(buildModel());
             return selectDSL.offset(offset);
         }
 
         public SelectDSL<R>.FetchFirstFinisher fetchFirst(long fetchFirstRows) {
+            buildDelegateMethod = selectDSL::build;
             joinModel = buildJoinModel();
             selectDSL.addQueryExpression(buildModel());
             return selectDSL.fetchFirst(fetchFirstRows);
         }
     }
 
     public class GroupByFinisher implements Buildable<R> {
+        public GroupByFinisher() {
+            buildDelegateMethod = this::internalBuild;
+        }
+        
         public SelectDSL<R> orderBy(SortSpecification...columns) {
+            buildDelegateMethod = selectDSL::build;
             selectDSL.setOrderByModel(OrderByModel.of(columns));
             return selectDSL;
         }
 
         @Override
         public R build() {
+            return buildDelegateMethod.get();
+        }
+        
+        private R internalBuild() {
             return selectDSL.build();
         }
 
         public SelectDSL<R>.LimitFinisher limit(long limit) {
+            buildDelegateMethod = selectDSL::build;
             return selectDSL.limit(limit);
         }
 
         public SelectDSL<R>.OffsetFirstFinisher offset(long offset) {
+            buildDelegateMethod = selectDSL::build;
             return selectDSL.offset(offset);
         }
 
         public SelectDSL<R>.FetchFirstFinisher fetchFirst(long fetchFirstRows) {
+            buildDelegateMethod = selectDSL::build;
             return selectDSL.fetchFirst(fetchFirstRows);
         }
     }

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

@@ -19,10 +19,9 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Function;
+import java.util.function.Supplier;
 
 import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.select.QueryExpressionDSL.FromGatherer;
-import org.mybatis.dynamic.sql.select.QueryExpressionDSL.FromGathererBuilder;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 import org.mybatis.dynamic.sql.util.Buildable;
 
@@ -39,52 +38,54 @@ public class SelectDSL<R> implements Buildable<R> {
     private List<QueryExpressionModel> queryExpressions = new ArrayList<>();    
     private OrderByModel orderByModel;
     private PagingModel pagingModel;
+    private Supplier<R> buildDelegateMethod;
 
     private SelectDSL(Function<SelectModel, R> adapterFunction) {
         this.adapterFunction = Objects.requireNonNull(adapterFunction);
+        buildDelegateMethod = this::internalBuild;
     }
 
-    private FromGatherer<R> queryExpressionBuilder(BasicColumn...selectList) {
-        return new FromGathererBuilder<R>()
+    private QueryExpressionDSL.FromGatherer<R> queryExpressionBuilder(BasicColumn...selectList) {
+        return new QueryExpressionDSL.FromGathererBuilder<R>()
                 .withSelectDSL(this)
                 .withSelectList(selectList)
                 .build();
     }
 
-    private FromGatherer<R> distinctQueryExpressionBuilder(BasicColumn...selectList) {
-        return new FromGathererBuilder<R>()
+    private QueryExpressionDSL.FromGatherer<R> distinctQueryExpressionBuilder(BasicColumn...selectList) {
+        return new QueryExpressionDSL.FromGathererBuilder<R>()
                 .withSelectDSL(this)
                 .withSelectList(selectList)
                 .isDistinct()
                 .build();
     }
 
-    public static FromGatherer<SelectModel> select(BasicColumn...selectList) {
+    public static QueryExpressionDSL.FromGatherer<SelectModel> select(BasicColumn...selectList) {
         return select(Function.identity(), selectList);
     }
 
-    public static <R> FromGatherer<R> select(Function<SelectModel, R> adapterFunction,
+    public static <R> QueryExpressionDSL.FromGatherer<R> select(Function<SelectModel, R> adapterFunction,
             BasicColumn...selectList) {
         SelectDSL<R> selectModelBuilder = new SelectDSL<>(adapterFunction);
         return selectModelBuilder.queryExpressionBuilder(selectList);
     }
 
-    public static FromGatherer<SelectModel> selectDistinct(BasicColumn...selectList) {
+    public static QueryExpressionDSL.FromGatherer<SelectModel> selectDistinct(BasicColumn...selectList) {
         return selectDistinct(Function.identity(), selectList);
     }
 
-    public static <R> FromGatherer<R> selectDistinct(Function<SelectModel, R> adapterFunction,
+    public static <R> QueryExpressionDSL.FromGatherer<R> selectDistinct(Function<SelectModel, R> adapterFunction,
             BasicColumn...selectList) {
         SelectDSL<R> selectModelBuilder = new SelectDSL<>(adapterFunction);
         return selectModelBuilder.distinctQueryExpressionBuilder(selectList);
     }
 
-    public static <T> FromGatherer<MyBatis3SelectModelAdapter<T>> selectWithMapper(
+    public static <T> QueryExpressionDSL.FromGatherer<MyBatis3SelectModelAdapter<T>> selectWithMapper(
             Function<SelectStatementProvider, T> mapperMethod, BasicColumn...selectList) {
         return select(selectModel -> MyBatis3SelectModelAdapter.of(selectModel, mapperMethod), selectList);
     }
 
-    public static <T> FromGatherer<MyBatis3SelectModelAdapter<T>> selectDistinctWithMapper(
+    public static <T> QueryExpressionDSL.FromGatherer<MyBatis3SelectModelAdapter<T>> selectDistinctWithMapper(
             Function<SelectStatementProvider, T> mapperMethod, BasicColumn...selectList) {
         return selectDistinct(selectModel -> MyBatis3SelectModelAdapter.of(selectModel, mapperMethod),
                 selectList);
@@ -112,6 +113,10 @@ public FetchFirstFinisher fetchFirst(long fetchFirstRows) {
 
     @Override
     public R build() {
+        return buildDelegateMethod.get();
+    }
+    
+    private R internalBuild() {
         SelectModel selectModel = SelectModel.withQueryExpressions(queryExpressions)
                 .withOrderByModel(orderByModel)
                 .withPagingModel(pagingModel)
@@ -124,6 +129,7 @@ public class LimitFinisher implements Buildable<R> {
 
         public LimitFinisher(long limit) {
             this.limit = limit;
+            buildDelegateMethod = this::internalBuild;
         }
 
         public OffsetFinisher offset(long offset) {
@@ -132,15 +138,20 @@ public OffsetFinisher offset(long offset) {
 
         @Override
         public R build() {
-            SelectDSL.this.pagingModel = new LimitAndOffsetPagingModel.Builder()
+            return buildDelegateMethod.get();
+        }
+        
+        private R internalBuild() {
+            pagingModel = new LimitAndOffsetPagingModel.Builder()
                     .withLimit(limit)
                     .build();
-            return SelectDSL.this.build();
+            return SelectDSL.this.internalBuild();
         }
     }
 
     public class OffsetFinisher implements Buildable<R> {
         public OffsetFinisher(long limit, long offset) {
+            buildDelegateMethod = this::internalBuild;
             SelectDSL.this.pagingModel = new LimitAndOffsetPagingModel.Builder()
                     .withLimit(limit)
                     .withOffset(offset)
@@ -149,7 +160,11 @@ public OffsetFinisher(long limit, long offset) {
 
         @Override
         public R build() {
-            return SelectDSL.this.build();
+            return buildDelegateMethod.get();
+        }
+        
+        private R internalBuild() {
+            return SelectDSL.this.internalBuild();
         }
     }
 
@@ -158,6 +173,7 @@ public class OffsetFirstFinisher implements Buildable<R> {
 
         public OffsetFirstFinisher(long offset) {
             this.offset = offset;
+            buildDelegateMethod = this::internalBuild;
         }
 
         public FetchFirstFinisher fetchFirst(long fetchFirstRows) {
@@ -166,10 +182,14 @@ public FetchFirstFinisher fetchFirst(long fetchFirstRows) {
 
         @Override
         public R build() {
+            return buildDelegateMethod.get();
+        }
+        
+        private R internalBuild() {
             SelectDSL.this.pagingModel = new FetchFirstPagingModel.Builder()
                     .withOffset(offset)
                     .build();
-            return SelectDSL.this.build();
+            return SelectDSL.this.internalBuild();
         }
     }
 
@@ -193,9 +213,17 @@ public RowsOnlyFinisher rowsOnly() {
     }
 
     public class RowsOnlyFinisher implements Buildable<R> {
+        public RowsOnlyFinisher() {
+            buildDelegateMethod = this::internalBuild;
+        }
+        
         @Override
         public R build() {
-            return SelectDSL.this.build();
+            return buildDelegateMethod.get();
+        }
+        
+        private R internalBuild() {
+            return SelectDSL.this.internalBuild();
         }
     }
 }