Skip to content

Commit 1757473

Browse files
jeffgbutlerjeffgbutler
committed
Simplify
1 parent d538557 commit 1757473

File tree

2 files changed

+33
-102
lines changed

2 files changed

+33
-102
lines changed

‎src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/mybatis3/ProviderBuilderFunctions.kt‎

Lines changed: 17 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -17,81 +17,41 @@ package org.mybatis.dynamic.sql.util.kotlin.mybatis3
1717

1818
import org.mybatis.dynamic.sql.SqlBuilder
1919
import org.mybatis.dynamic.sql.SqlTable
20-
import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider
2120
import org.mybatis.dynamic.sql.insert.GeneralInsertDSL
2221
import org.mybatis.dynamic.sql.insert.InsertDSL
2322
import org.mybatis.dynamic.sql.insert.MultiRowInsertDSL
24-
import org.mybatis.dynamic.sql.insert.render.GeneralInsertStatementProvider
25-
import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider
26-
import org.mybatis.dynamic.sql.insert.render.MultiRowInsertStatementProvider
2723
import org.mybatis.dynamic.sql.render.RenderingStrategies
2824
import org.mybatis.dynamic.sql.select.CountDSL
2925
import org.mybatis.dynamic.sql.select.QueryExpressionDSL
3026
import org.mybatis.dynamic.sql.select.SelectModel
31-
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider
32-
import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider
3327
import org.mybatis.dynamic.sql.util.kotlin.*
3428

35-
fun countFrom(table: SqlTable, completer: CountCompleter): SelectStatementProvider {
36-
val builder = KotlinCountBuilder(SqlBuilder.countFrom(table))
37-
completer(builder)
38-
return builder.build().render(RenderingStrategies.MYBATIS3)
39-
}
29+
fun countFrom(table: SqlTable, completer: CountCompleter) =
30+
completer(KotlinCountBuilder(SqlBuilder.countFrom(table))).build().render(RenderingStrategies.MYBATIS3)
4031

41-
fun deleteFrom(table: SqlTable, completer: DeleteCompleter): DeleteStatementProvider {
42-
val builder = KotlinDeleteBuilder(SqlBuilder.deleteFrom(table))
43-
completer(builder)
44-
return builder.build().render(RenderingStrategies.MYBATIS3)
45-
}
32+
fun deleteFrom(table: SqlTable, completer: DeleteCompleter) =
33+
completer(KotlinDeleteBuilder(SqlBuilder.deleteFrom(table))).build().render(RenderingStrategies.MYBATIS3)
4634

47-
fun <T> InsertDSL.IntoGatherer<T>.into(table: SqlTable, completer: InsertCompleter<T>): InsertStatementProvider<T> =
35+
fun <T> InsertDSL.IntoGatherer<T>.into(table: SqlTable, completer: InsertCompleter<T>) =
4836
completer(into(table)).build().render(RenderingStrategies.MYBATIS3)
4937

50-
fun <T> MultiRowInsertDSL.IntoGatherer<T>.into(
51-
table: SqlTable,
52-
completer: MultiRowInsertCompleter<T>
53-
): MultiRowInsertStatementProvider<T> =
38+
fun <T> MultiRowInsertDSL.IntoGatherer<T>.into(table: SqlTable, completer: MultiRowInsertCompleter<T>) =
5439
completer(into(table)).build().render(RenderingStrategies.MYBATIS3)
5540

56-
fun CountDSL.FromGatherer<SelectModel>.from(
57-
table: SqlTable,
58-
completer: CountCompleter
59-
): SelectStatementProvider {
60-
val builder = KotlinCountBuilder(from(table))
61-
completer(builder)
62-
return builder.build().render(RenderingStrategies.MYBATIS3)
63-
}
41+
fun CountDSL.FromGatherer<SelectModel>.from(table: SqlTable, completer: CountCompleter) =
42+
completer(KotlinCountBuilder(from(table))).build().render(RenderingStrategies.MYBATIS3)
6443

65-
fun QueryExpressionDSL.FromGatherer<SelectModel>.from(
66-
table: SqlTable,
67-
completer: SelectCompleter
68-
): SelectStatementProvider {
69-
val builder = KotlinQueryBuilder(from(table))
70-
completer(builder)
71-
return builder.build().render(RenderingStrategies.MYBATIS3)
72-
}
44+
fun QueryExpressionDSL.FromGatherer<SelectModel>.from(table: SqlTable, completer: SelectCompleter) =
45+
completer(KotlinQueryBuilder(from(table))).build().render(RenderingStrategies.MYBATIS3)
7346

74-
fun QueryExpressionDSL.FromGatherer<SelectModel>.from(
75-
table: SqlTable,
76-
alias: String,
77-
completer: SelectCompleter
78-
): SelectStatementProvider {
79-
val builder = KotlinQueryBuilder(from(table, alias))
80-
completer(builder)
81-
return builder.build().render(RenderingStrategies.MYBATIS3)
82-
}
47+
fun QueryExpressionDSL.FromGatherer<SelectModel>.from(table: SqlTable, alias: String, completer: SelectCompleter) =
48+
completer(KotlinQueryBuilder(from(table, alias))).build().render(RenderingStrategies.MYBATIS3)
8349

84-
fun select(start: QueryExpressionDSL<SelectModel>, completer: SelectCompleter): SelectStatementProvider {
85-
val builder = KotlinQueryBuilder(start)
86-
completer(builder)
87-
return builder.build().render(RenderingStrategies.MYBATIS3)
88-
}
50+
fun select(start: QueryExpressionDSL<SelectModel>, completer: SelectCompleter) =
51+
completer(KotlinQueryBuilder(start)).build().render(RenderingStrategies.MYBATIS3)
8952

90-
fun update(table: SqlTable, completer: UpdateCompleter): UpdateStatementProvider {
91-
val builder = KotlinUpdateBuilder(SqlBuilder.update(table))
92-
completer(builder)
93-
return builder.build().render(RenderingStrategies.MYBATIS3)
94-
}
53+
fun update(table: SqlTable, completer: UpdateCompleter) =
54+
completer(KotlinUpdateBuilder(SqlBuilder.update(table))).build().render(RenderingStrategies.MYBATIS3)
9555

96-
fun insertInto(table: SqlTable, completer: GeneralInsertCompleter): GeneralInsertStatementProvider =
56+
fun insertInto(table: SqlTable, completer: GeneralInsertCompleter) =
9757
completer(GeneralInsertDSL.insertInto(table)).build().render(RenderingStrategies.MYBATIS3)

‎src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/spring/ProviderBuilderFunctions.kt‎

Lines changed: 16 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ package org.mybatis.dynamic.sql.util.kotlin.spring
1717

1818
import org.mybatis.dynamic.sql.SqlBuilder
1919
import org.mybatis.dynamic.sql.SqlTable
20-
import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider
2120
import org.mybatis.dynamic.sql.insert.GeneralInsertDSL
2221
import org.mybatis.dynamic.sql.insert.InsertDSL
2322
import org.mybatis.dynamic.sql.insert.render.GeneralInsertStatementProvider
@@ -26,58 +25,30 @@ import org.mybatis.dynamic.sql.render.RenderingStrategies
2625
import org.mybatis.dynamic.sql.select.CountDSL
2726
import org.mybatis.dynamic.sql.select.QueryExpressionDSL
2827
import org.mybatis.dynamic.sql.select.SelectModel
29-
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider
30-
import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider
3128
import org.mybatis.dynamic.sql.util.kotlin.*
3229

33-
fun deleteFrom(table: SqlTable, completer: DeleteCompleter): DeleteStatementProvider {
34-
val builder = KotlinDeleteBuilder(SqlBuilder.deleteFrom(table))
35-
completer(builder)
36-
return builder.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER)
37-
}
30+
fun countFrom(table: SqlTable, completer: CountCompleter) =
31+
completer(KotlinCountBuilder(SqlBuilder.countFrom(table))).build()
32+
.render(RenderingStrategies.SPRING_NAMED_PARAMETER)
3833

39-
fun countFrom(table: SqlTable, completer: CountCompleter): SelectStatementProvider {
40-
val builder = KotlinCountBuilder(SqlBuilder.countFrom(table))
41-
completer(builder)
42-
return builder.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER)
43-
}
34+
fun deleteFrom(table: SqlTable, completer: DeleteCompleter) =
35+
completer(KotlinDeleteBuilder(SqlBuilder.deleteFrom(table))).build()
36+
.render(RenderingStrategies.SPRING_NAMED_PARAMETER)
4437

45-
fun <T> InsertDSL.IntoGatherer<T>.into(table: SqlTable, completer: InsertCompleter<T>): InsertStatementProvider<T> =
38+
fun <T> InsertDSL.IntoGatherer<T>.into(table: SqlTable, completer: InsertCompleter<T>) =
4639
completer(into(table)).build().render(RenderingStrategies.SPRING_NAMED_PARAMETER)
4740

48-
fun CountDSL.FromGatherer<SelectModel>.from(
49-
table: SqlTable,
50-
completer: CountCompleter
51-
): SelectStatementProvider {
52-
val builder = KotlinCountBuilder(from(table))
53-
completer(builder)
54-
return builder.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER)
55-
}
41+
fun CountDSL.FromGatherer<SelectModel>.from(table: SqlTable, completer: CountCompleter) =
42+
completer(KotlinCountBuilder(from(table))).build().render(RenderingStrategies.SPRING_NAMED_PARAMETER)
5643

57-
fun QueryExpressionDSL.FromGatherer<SelectModel>.from(
58-
table: SqlTable,
59-
completer: SelectCompleter
60-
): SelectStatementProvider {
61-
val builder = KotlinQueryBuilder(from(table))
62-
completer(builder)
63-
return builder.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER)
64-
}
44+
fun QueryExpressionDSL.FromGatherer<SelectModel>.from(table: SqlTable, completer: SelectCompleter) =
45+
completer(KotlinQueryBuilder(from(table))).build().render(RenderingStrategies.SPRING_NAMED_PARAMETER)
6546

66-
fun QueryExpressionDSL.FromGatherer<SelectModel>.from(
67-
table: SqlTable,
68-
alias: String,
69-
completer: SelectCompleter
70-
): SelectStatementProvider {
71-
val builder = KotlinQueryBuilder(from(table, alias))
72-
completer(builder)
73-
return builder.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER)
74-
}
47+
fun QueryExpressionDSL.FromGatherer<SelectModel>.from(table: SqlTable, alias: String, completer: SelectCompleter) =
48+
completer(KotlinQueryBuilder(from(table, alias))).build().render(RenderingStrategies.SPRING_NAMED_PARAMETER)
7549

76-
fun update(table: SqlTable, completer: UpdateCompleter): UpdateStatementProvider {
77-
val builder = KotlinUpdateBuilder(SqlBuilder.update(table))
78-
completer(builder)
79-
return builder.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER)
80-
}
50+
fun update(table: SqlTable, completer: UpdateCompleter) =
51+
completer(KotlinUpdateBuilder(SqlBuilder.update(table))).build().render(RenderingStrategies.SPRING_NAMED_PARAMETER)
8152

82-
fun insertInto(table: SqlTable, completer: GeneralInsertCompleter): GeneralInsertStatementProvider =
53+
fun insertInto(table: SqlTable, completer: GeneralInsertCompleter) =
8354
completer(GeneralInsertDSL.insertInto(table)).build().render(RenderingStrategies.SPRING_NAMED_PARAMETER)

0 commit comments

Comments
 (0)