Add better factory methods for all the builders

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/SqlBuilder.java

@@ -118,45 +118,40 @@ static <T> WhereDSL where(BindableColumn<T> column, VisitableCondition<T> condit
 
     // where condition connectors
     static <T> SqlCriterion<T> or(BindableColumn<T> column, VisitableCondition<T> condition) {
-        return new SqlCriterion.Builder<T>()
+        return SqlCriterion.withColumn(column)
                 .withConnector("or") //$NON-NLS-1$
-                .withColumn(column)
                 .withCondition(condition)
                 .build();
     }
 
     static <T> SqlCriterion<T> or(BindableColumn<T> column, VisitableCondition<T> condition,
             SqlCriterion<?>...subCriteria) {
-        return new SqlCriterion.Builder<T>()
+        return SqlCriterion.withColumn(column)
                 .withConnector("or") //$NON-NLS-1$
-                .withColumn(column)
                 .withCondition(condition)
                 .withSubCriteria(Arrays.asList(subCriteria))
                 .build();
     }
 
     static <T> SqlCriterion<T> and(BindableColumn<T> column, VisitableCondition<T> condition) {
-        return new SqlCriterion.Builder<T>()
+        return SqlCriterion.withColumn(column)
                 .withConnector("and") //$NON-NLS-1$
-                .withColumn(column)
                 .withCondition(condition)
                 .build();
     }
 
     static <T> SqlCriterion<T> and(BindableColumn<T> column, VisitableCondition<T> condition,
             SqlCriterion<?>...subCriteria) {
-        return new SqlCriterion.Builder<T>()
+        return SqlCriterion.withColumn(column)
                 .withConnector("and") //$NON-NLS-1$
-                .withColumn(column)
                 .withCondition(condition)
                 .withSubCriteria(Arrays.asList(subCriteria))
                 .build();
     }
 
     // join support
     static JoinCriterion and(BasicColumn joinColumn, JoinCondition joinCondition) {
-        return new JoinCriterion.Builder()
-                .withJoinColumn(joinColumn)
+        return JoinCriterion.withJoinColumn(joinColumn)
                 .withJoinCondition(joinCondition)
                 .withConnector("and") //$NON-NLS-1$
                 .build();

src/main/java/org/mybatis/dynamic/sql/SqlColumn.java

@@ -100,6 +100,10 @@ private String applyTableAlias(String tableAlias) {
         return tableAlias + "." + name(); //$NON-NLS-1$
     }
 
+    public static Builder withName(String name) {
+        return new Builder().withName(name);
+    }
+    
     public static class Builder {
         private SqlTable table;
         private String name;

src/main/java/org/mybatis/dynamic/sql/SqlCriterion.java

@@ -55,6 +55,10 @@ public boolean hasSubCriteria() {
     public <R> Stream<R> mapSubCriteria(Function<SqlCriterion<?>, R> mapper) {
         return subCriteria.stream().map(mapper);
     }
+    
+    public static <T> Builder<T> withColumn(BindableColumn<T> column) {
+        return new Builder<T>().withColumn(column);
+    }
 
     public static class Builder<T> {
         private String connector;

src/main/java/org/mybatis/dynamic/sql/SqlTable.java

@@ -31,16 +31,14 @@ public String name() {
     }
 
     public <T> SqlColumn<T> column(String name, JDBCType jdbcType) {
-        return new SqlColumn.Builder()
-                .withName(name)
+        return SqlColumn.withName(name)
                 .withJdbcType(jdbcType)
                 .withTable(this)
                 .build();
     }
 
     public <T> SqlColumn<T> column(String name, JDBCType jdbcType, String typeHandler) {
-        return new SqlColumn.Builder()
-                .withName(name)
+        return SqlColumn.withName(name)
                 .withJdbcType(jdbcType)
                 .withTypeHandler(typeHandler)
                 .withTable(this)

src/main/java/org/mybatis/dynamic/sql/delete/DeleteDSL.java

@@ -51,9 +51,7 @@ public <T> DeleteWhereBuilder where(BindableColumn<T> column, VisitableCondition
      * @return the model class
      */
     public R build() {
-        DeleteModel deleteModel = new DeleteModel.Builder()
-                .withTable(table)
-                .build();
+        DeleteModel deleteModel = DeleteModel.withTable(table).build();
         return adapterFunction.apply(deleteModel);
     }
 
@@ -82,8 +80,7 @@ private <T> DeleteWhereBuilder(BindableColumn<T> column, VisitableCondition<T> c
         }
 
         public R build() {
-            DeleteModel deleteModel = new DeleteModel.Builder()
-                    .withTable(table)
+            DeleteModel deleteModel = DeleteModel.withTable(table)
                     .withWhereModel(buildWhereModel())
                     .build();
             return adapterFunction.apply(deleteModel);

src/main/java/org/mybatis/dynamic/sql/delete/DeleteModel.java

@@ -42,13 +42,16 @@ public Optional<WhereModel> whereModel() {
     }
 
     public DeleteStatement render(RenderingStrategy renderingStrategy) {
-        return new DeleteRenderer.Builder()
-                .withDeleteModel(this)
+        return DeleteRenderer.withDeleteModel(this)
                 .withRenderingStrategy(renderingStrategy)
                 .build()
                 .render();
     }
 
+    public static Builder withTable(SqlTable table) {
+        return new Builder().withTable(table);
+    }
+    
     public static class Builder {
         private SqlTable table;
         private WhereModel whereModel;

src/main/java/org/mybatis/dynamic/sql/delete/render/DeleteRenderer.java

@@ -32,8 +32,7 @@ private DeleteRenderer(Builder builder) {
     }
 
     public DeleteStatement render() {
-        return new DeleteStatement.Builder()
-                .withTableName(deleteModel.table().name())
+        return DeleteStatement.withTableName(deleteModel.table().name())
                 .withWhereClause(deleteModel.whereModel().map(this::renderWhereModel))
                 .build();
     }
@@ -42,6 +41,10 @@ private WhereClauseAndParameters renderWhereModel(WhereModel whereModel) {
         return whereModel.render(renderingStrategy);
     }
 
+    public static Builder withDeleteModel(DeleteModel deleteModel) {
+        return new Builder().withDeleteModel(deleteModel);
+    }
+    
     public static class Builder {
         private DeleteModel deleteModel;
         private RenderingStrategy renderingStrategy;

src/main/java/org/mybatis/dynamic/sql/delete/render/DeleteStatement.java

@@ -44,6 +44,10 @@ public String getDeleteStatement() {
                 + spaceBefore(whereClauseAndParameters.map(WhereClauseAndParameters::whereClause));
     }
 
+    public static Builder withTableName(String tableName) {
+        return new Builder().withTableName(tableName);
+    }
+    
     public static class Builder {
         private String tableName;
         private Optional<WhereClauseAndParameters> whereClauseAndParameters = Optional.empty();

src/main/java/org/mybatis/dynamic/sql/insert/BatchInsertDSL.java

@@ -43,9 +43,8 @@ public <F> BatchColumnMappingFinisher<F> map(SqlColumn<F> column) {
     }
 
     public BatchInsertModel<T> build() {
-        return new BatchInsertModel.Builder<T>()
+        return BatchInsertModel.withRecords(records)
                 .withTable(table)
-                .withRecords(records)
                 .withColumnMappings(columnMappings)
                 .build();
     }

src/main/java/org/mybatis/dynamic/sql/insert/BatchInsertModel.java

@@ -52,13 +52,16 @@ public SqlTable table() {
     }
 
     public BatchInsert<T> render(RenderingStrategy renderingStrategy) {
-        return new BatchInsertRenderer.Builder<T>()
-                .withBatchInsertModel(this)
+        return BatchInsertRenderer.withBatchInsertModel(this)
                 .withRenderingStrategy(renderingStrategy)
                 .build()
                 .render();
     }
 
+    public static <T> Builder<T> withRecords(List<T> records) {
+        return new Builder<T>().withRecords(records);
+    }
+    
     public static class Builder<T> {
         private SqlTable table;
         private List<T> records = new ArrayList<>();

src/main/java/org/mybatis/dynamic/sql/insert/InsertDSL.java

@@ -43,9 +43,8 @@ public <F> ColumnMappingFinisher<F> map(SqlColumn<F> column) {
     }
 
     public InsertModel<T> build() {
-        return new InsertModel.Builder<T>()
+        return InsertModel.withRecord(record)
                 .withTable(table)
-                .withRecord(record)
                 .withColumnMappings(columnMappings)
                 .build();
     }

src/main/java/org/mybatis/dynamic/sql/insert/InsertModel.java

@@ -51,13 +51,16 @@ public SqlTable table() {
     }
 
     public InsertStatement<T> render(RenderingStrategy renderingStrategy) {
-        return new InsertRenderer.Builder<T>()
-                .withInsertModel(this)
+        return InsertRenderer.withInsertModel(this)
                 .withRenderingStrategy(renderingStrategy)
                 .build()
                 .render();
     }
 
+    public static <T> Builder<T> withRecord(T record) {
+        return new Builder<T>().withRecord(record);
+    }
+    
     public static class Builder<T> {
         private SqlTable table;
         private T record;

src/main/java/org/mybatis/dynamic/sql/insert/InsertSelectDSL.java

@@ -43,8 +43,7 @@ private InsertSelectDSL(SqlTable table, SelectModel selectModel) {
     }
 
     public InsertSelectModel build() {
-        return new InsertSelectModel.Builder()
-                .withTable(table)
+        return InsertSelectModel.withTable(table)
                 .withColumnList(columnList)
                 .withSelectModel(selectModel)
                 .build();

src/main/java/org/mybatis/dynamic/sql/insert/InsertSelectModel.java

@@ -48,13 +48,16 @@ public Optional<InsertColumnListModel> columnList() {
     }
 
     public InsertSelectStatement render(RenderingStrategy renderingStrategy) {
-        return new InsertSelectRenderer.Builder()
-                .withInsertSelectModel(this)
+        return InsertSelectRenderer.withInsertSelectModel(this)
                 .withRenderingStrategy(renderingStrategy)
                 .build()
                 .render();
     }
 
+    public static Builder withTable(SqlTable table) {
+        return new Builder().withTable(table);
+    }
+    
     public static class Builder {
         private SqlTable table;
         private Optional<InsertColumnListModel> columnList = Optional.empty();

src/main/java/org/mybatis/dynamic/sql/insert/render/BatchInsert.java

@@ -48,11 +48,10 @@ public List<InsertStatement<T>> insertStatements() {
     }
 
     private InsertStatement<T> toInsertStatement(T record) {
-        return new InsertStatement.Builder<T>()
+        return InsertStatement.withRecord(record)
                 .withTableName(tableName)
                 .withColumnsPhrase(columnsPhrase)
                 .withValuesPhrase(valuesPhrase)
-                .withRecord(record)
                 .build();
     }
 
@@ -68,6 +67,10 @@ public String getInsertStatementSQL() {
                 + spaceBefore(valuesPhrase);
     }
 
+    public static <T> Builder<T> withRecords(List<T> records) {
+        return new Builder<T>().withRecords(records);
+    }
+    
     public static class Builder<T> {
         private String tableName;
         private String columnsPhrase;

src/main/java/org/mybatis/dynamic/sql/insert/render/BatchInsertRenderer.java

@@ -36,11 +36,10 @@ public BatchInsert<T> render() {
         ValuePhraseVisitor visitor = new ValuePhraseVisitor(renderingStrategy);
         FieldAndValueCollector<T> collector = model.mapColumnMappings(toFieldAndValue(visitor))
                 .collect(FieldAndValueCollector.collect());
-        return new BatchInsert.Builder<T>()
+        return BatchInsert.withRecords(model.records())
                 .withTableName(model.table().name())
                 .withColumnsPhrase(collector.columnsPhrase())
                 .withValuesPhrase(collector.valuesPhrase())
-                .withRecords(model.records())
                 .build();
     }
 
@@ -52,6 +51,10 @@ private FieldAndValue toFieldAndValue(ValuePhraseVisitor visitor, InsertMapping
         return insertMapping.accept(visitor);
     }
 
+    public static <T> Builder<T> withBatchInsertModel(BatchInsertModel<T> model) {
+        return new Builder<T>().withBatchInsertModel(model);
+    }
+    
     public static class Builder<T> {
         private BatchInsertModel<T> model;
         private RenderingStrategy renderingStrategy;

src/main/java/org/mybatis/dynamic/sql/insert/render/FieldAndValue.java

@@ -34,6 +34,10 @@ public String valuePhrase() {
         return valuePhrase;
     }
 
+    public static Builder withFieldName(String fieldName) {
+        return new Builder().withFieldName(fieldName);
+    }
+    
     public static class Builder {
         private String fieldName;
         private String valuePhrase;

src/main/java/org/mybatis/dynamic/sql/insert/render/InsertRenderer.java

@@ -36,11 +36,10 @@ public InsertStatement<T> render() {
         ValuePhraseVisitor visitor = new ValuePhraseVisitor(renderingStrategy);
         FieldAndValueCollector<T> collector = model.mapColumnMappings(toFieldAndValue(visitor))
                 .collect(FieldAndValueCollector.collect());
-        return new InsertStatement.Builder<T>()
+        return InsertStatement.withRecord(model.record())
                 .withTableName(model.table().name())
                 .withColumnsPhrase(collector.columnsPhrase())
                 .withValuesPhrase(collector.valuesPhrase())
-                .withRecord(model.record())
                 .build();
     }
 
@@ -52,6 +51,10 @@ private FieldAndValue toFieldAndValue(ValuePhraseVisitor visitor, InsertMapping
         return insertMapping.accept(visitor);
     }
 
+    public static <T> Builder<T> withInsertModel(InsertModel<T> model) {
+        return new Builder<T>().withInsertModel(model);
+    }
+    
     public static class Builder<T> {
         private InsertModel<T> model;
         private RenderingStrategy renderingStrategy;

src/main/java/org/mybatis/dynamic/sql/insert/render/InsertSelectRenderer.java

@@ -38,8 +38,7 @@ private InsertSelectRenderer(Builder builder) {
     public InsertSelectStatement render() {
         SelectStatement selectStatement = model.selectModel().render(renderingStrategy);
 
-        return new InsertSelectStatement.Builder()
-                .withTableName(model.table().name())
+        return InsertSelectStatement.withTableName(model.table().name())
                 .withColumnsPhrase(calculateColumnsPhrase())
                 .withSelectStatement(selectStatement.getSelectStatement())
                 .withParameters(selectStatement.getParameters())
@@ -56,6 +55,10 @@ private String calculateColumnsPhrase(InsertColumnListModel columnList) {
                 .collect(Collectors.joining(", ", "(", ")")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
+    public static Builder withInsertSelectModel(InsertSelectModel model) {
+        return new Builder().withInsertSelectModel(model);
+    }
+    
     public static class Builder {
         private InsertSelectModel model;
         private RenderingStrategy renderingStrategy;

src/main/java/org/mybatis/dynamic/sql/insert/render/InsertSelectStatement.java

@@ -46,6 +46,10 @@ public Map<String, Object> getParameters() {
         return parameters;
     }
 
+    public static Builder withTableName(String tableName) {
+        return new Builder().withTableName(tableName);
+    }
+    
     public static class Builder {
         private String tableName;
         private Optional<String> columnsPhrase;

src/main/java/org/mybatis/dynamic/sql/insert/render/InsertStatement.java

@@ -43,6 +43,10 @@ public String getInsertStatement() {
                 + spaceBefore(valuesPhrase);
     }
 
+    public static <T> Builder<T> withRecord(T record) {
+        return new Builder<T>().withRecord(record);
+    }
+    
     public static class Builder<T> {
         private String tableName;
         private String columnsPhrase;