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<>();