Move select rendering fully into the select renderer

Author: jeffgbutler

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

@@ -15,27 +15,18 @@
  */
 package org.mybatis.dynamic.sql.select.render;
 
-import static org.mybatis.dynamic.sql.util.StringUtilities.spaceBefore;
-
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 
 public class DefaultSelectStatementProvider implements SelectStatementProvider {
-    private String queryExpression;
+    private String selectStatement;
     private Map<String, Object> parameters;
-    private Optional<String> orderByClause;
-    private Optional<String> limitClause;
-    private Optional<String> offsetClause;
 
     private DefaultSelectStatementProvider(Builder builder) {
-        queryExpression = Objects.requireNonNull(builder.queryExpression);
-        orderByClause = Objects.requireNonNull(builder.orderByClause);
+        selectStatement = Objects.requireNonNull(builder.selectStatement);
         parameters = Collections.unmodifiableMap(Objects.requireNonNull(builder.parameters));
-        limitClause = Objects.requireNonNull(builder.limitClause);
-        offsetClause = Objects.requireNonNull(builder.offsetClause);
     }
 
     @Override
@@ -45,27 +36,19 @@ public Map<String, Object> getParameters() {
 
     @Override
     public String getSelectStatement() {
-        return queryExpression + spaceBefore(orderByClause) + spaceBefore(limitClause) + spaceBefore(offsetClause);
+        return selectStatement;
     }
 
-    public static Builder withQueryExpression(String queryExpression) {
-        return new Builder().withQueryExpression(queryExpression);
+    public static Builder withSelectStatement(String selectStatement) {
+        return new Builder().withSelectStatement(selectStatement);
     }
 
     public static class Builder {
-        private String queryExpression;
-        private Optional<String> orderByClause = Optional.empty();
+        private String selectStatement;
         private Map<String, Object> parameters = new HashMap<>();
-        private Optional<String> limitClause = Optional.empty();
-        private Optional<String> offsetClause = Optional.empty();
 
-        public Builder withQueryExpression(String queryExpression) {
-            this.queryExpression = queryExpression;
-            return this;
-        }
-        
-        public Builder withOrderByClause(Optional<String> orderByClause) {
-            this.orderByClause = orderByClause;
+        public Builder withSelectStatement(String selectStatement) {
+            this.selectStatement = selectStatement;
             return this;
         }
 
@@ -74,16 +57,6 @@ public Builder withParameters(Map<String, Object> parameters) {
             return this;
         }
 
-        public Builder withLimitClause(Optional<String> limitClause) {
-            this.limitClause = limitClause;
-            return this;
-        }
-        
-        public Builder withOffsetClause(Optional<String> offsetClause) {
-            this.offsetClause = offsetClause;
-            return this;
-        }
-        
         public DefaultSelectStatementProvider build() {
             return new DefaultSelectStatementProvider(this);
         }

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

@@ -15,6 +15,8 @@
  */
 package org.mybatis.dynamic.sql.select.render;
 
+import static org.mybatis.dynamic.sql.util.StringUtilities.spaceBefore;
+
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
@@ -46,14 +48,14 @@ public SelectStatementProvider render() {
                 .collect(QueryExpressionCollector.collect());
 
         Map<String, Object> parameters = collector.parameters();
-        Optional<String> limitClause = selectModel.limit().map(l -> renderLimit(parameters, l));
-        Optional<String> offsetClause = selectModel.offset().map(o -> renderOffset(parameters, o));
 
-        return DefaultSelectStatementProvider.withQueryExpression(collector.queryExpression())
+        String selectStatement = collector.queryExpression()
+                + spaceBefore(renderOrderBy())
+                + spaceBefore(renderLimit(parameters))
+                + spaceBefore(renderOffset(parameters));
+        
+        return DefaultSelectStatementProvider.withSelectStatement(selectStatement)
                 .withParameters(parameters)
-                .withOrderByClause(selectModel.orderByModel().map(this::renderOrderBy))
-                .withLimitClause(limitClause)
-                .withOffsetClause(offsetClause)
                 .build();
     }
 
@@ -65,26 +67,39 @@ private QueryExpression renderQueryExpression(QueryExpressionModel queryExpressi
                 .render();
     }
 
+    private Optional<String> renderOrderBy() {
+        return selectModel.orderByModel()
+                .map(this::renderOrderBy);
+    }
+    
     private String renderOrderBy(OrderByModel orderByModel) {
-        return orderByModel.mapColumns(this::orderByPhrase)
+        return orderByModel.mapColumns(this::calculateOrderByPhrase)
                 .collect(CustomCollectors.joining(", ", "order by ", "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
-    private String orderByPhrase(SortSpecification column) {
+    private String calculateOrderByPhrase(SortSpecification column) {
         String phrase = column.aliasOrName();
         if (column.isDescending()) {
             phrase = phrase + " DESC"; //$NON-NLS-1$
         }
         return phrase;
     }
 
+    private Optional<String> renderLimit(Map<String, Object> parameters) {
+        return selectModel.limit().map(l -> renderLimit(parameters, l));
+    }
+    
     private String renderLimit(Map<String, Object> parameters, Long limit) {
         String placeholder = renderingStrategy.getFormattedJdbcPlaceholder(RenderingStrategy.DEFAULT_PARAMETER_PREFIX,
                 LIMIT_PARAMETER); 
         parameters.put(LIMIT_PARAMETER, limit);
         return "limit " + placeholder; //$NON-NLS-1$
     }
 
+    private Optional<String> renderOffset(Map<String, Object> parameters) {
+        return selectModel.offset().map(o -> renderOffset(parameters, o));
+    }
+    
     private String renderOffset(Map<String, Object> parameters, Long offset) {
         String placeholder = renderingStrategy.getFormattedJdbcPlaceholder(RenderingStrategy.DEFAULT_PARAMETER_PREFIX,
                 OFFSET_PARAMETER);