Skip to content

Commit bf5ac7d

Browse files
jeffgbutlerjeffgbutler
committed
Optimizing
1 parent a67ef63 commit bf5ac7d

File tree

8 files changed

+29
-113
lines changed

8 files changed

+29
-113
lines changed

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package org.mybatis.dynamic.sql.delete;
1717

18-
import java.util.List;
1918
import java.util.Objects;
2019
import java.util.function.Function;
2120
import java.util.function.ToIntFunction;
@@ -52,12 +51,6 @@ public <T> DeleteWhereBuilder where(BindableColumn<T> column, VisitableCondition
5251
return whereBuilder;
5352
}
5453

55-
public <T> DeleteWhereBuilder where(BindableColumn<T> column, VisitableCondition<T> condition,
56-
List<SqlCriterion<?>> subCriteria) {
57-
whereBuilder.where(column, condition, subCriteria);
58-
return whereBuilder;
59-
}
60-
6154
@SuppressWarnings("unchecked")
6255
public DeleteWhereBuilder applyWhere(WhereApplier whereApplier) {
6356
return (DeleteWhereBuilder) whereApplier.apply(whereBuilder);

‎src/main/java/org/mybatis/dynamic/sql/select/CountDSL.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package org.mybatis.dynamic.sql.select;
1717

18-
import java.util.List;
1918
import java.util.Objects;
2019
import java.util.function.Function;
2120

@@ -58,12 +57,6 @@ public <T> CountWhereBuilder where(BindableColumn<T> column, VisitableCondition<
5857
return whereBuilder;
5958
}
6059

61-
public <T> CountWhereBuilder where(BindableColumn<T> column, VisitableCondition<T> condition,
62-
List<SqlCriterion<?>> subCriteria) {
63-
whereBuilder.where(column, condition, subCriteria);
64-
return whereBuilder;
65-
}
66-
6760
@SuppressWarnings("unchecked")
6861
public CountWhereBuilder applyWhere(WhereApplier whereApplier) {
6962
return (CountWhereBuilder) whereApplier.apply(whereBuilder);

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,6 @@ public <T> QueryExpressionWhereBuilder where(BindableColumn<T> column, Visitable
6969
return whereBuilder;
7070
}
7171

72-
public <T> QueryExpressionWhereBuilder where(BindableColumn<T> column, VisitableCondition<T> condition,
73-
List<SqlCriterion<?>> subCriteria) {
74-
whereBuilder.where(column, condition, subCriteria);
75-
return whereBuilder;
76-
}
77-
7872
@SuppressWarnings("unchecked")
7973
public QueryExpressionWhereBuilder applyWhere(WhereApplier whereApplier) {
8074
return (QueryExpressionWhereBuilder) whereApplier.apply(whereBuilder);

‎src/main/java/org/mybatis/dynamic/sql/update/UpdateDSL.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,6 @@ public <T> UpdateWhereBuilder where(BindableColumn<T> column, VisitableCondition
6969
return whereBuilder;
7070
}
7171

72-
public <T> UpdateWhereBuilder where(BindableColumn<T> column, VisitableCondition<T> condition,
73-
List<SqlCriterion<?>> subCriteria) {
74-
whereBuilder.where(column, condition, subCriteria);
75-
return whereBuilder;
76-
}
77-
7872
@SuppressWarnings("unchecked")
7973
public UpdateWhereBuilder applyWhere(WhereApplier whereApplier) {
8074
return (UpdateWhereBuilder) whereApplier.apply(whereBuilder);

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

Lines changed: 11 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -27,58 +27,42 @@ typealias CountCompleter = KotlinCountBuilder.() -> Buildable<SelectModel>
2727
class KotlinCountBuilder(private val dsl: CountDSL<SelectModel>): Buildable<SelectModel> {
2828
fun join(table: SqlTable, receiver: JoinReceiver) =
2929
apply {
30-
val collector = JoinCollector()
31-
receiver(collector)
32-
dsl.join(table, collector.onJoinCriterion, collector.andJoinCriteria)
30+
dsl.join(table, receiver)
3331
}
3432

3533
fun join(table: SqlTable, alias: String, receiver: JoinReceiver) =
3634
apply {
37-
val collector = JoinCollector()
38-
receiver(collector)
39-
dsl.join(table, alias, collector.onJoinCriterion, collector.andJoinCriteria)
35+
dsl.join(table, alias, receiver)
4036
}
4137

4238
fun fullJoin(table: SqlTable, receiver: JoinReceiver) =
4339
apply {
44-
val collector = JoinCollector()
45-
receiver(collector)
46-
dsl.fullJoin(table, collector.onJoinCriterion, collector.andJoinCriteria)
40+
dsl.fullJoin(table, receiver)
4741
}
4842

4943
fun fullJoin(table: SqlTable, alias: String, receiver: JoinReceiver) =
5044
apply {
51-
val collector = JoinCollector()
52-
receiver(collector)
53-
dsl.fullJoin(table, alias, collector.onJoinCriterion, collector.andJoinCriteria)
45+
dsl.fullJoin(table, alias, receiver)
5446
}
5547

5648
fun leftJoin(table: SqlTable, receiver: JoinReceiver) =
5749
apply {
58-
val collector = JoinCollector()
59-
receiver(collector)
60-
dsl.leftJoin(table, collector.onJoinCriterion, collector.andJoinCriteria)
50+
dsl.leftJoin(table, receiver)
6151
}
6252

6353
fun leftJoin(table: SqlTable, alias: String, receiver: JoinReceiver) =
6454
apply {
65-
val collector = JoinCollector()
66-
receiver(collector)
67-
dsl.leftJoin(table, alias, collector.onJoinCriterion, collector.andJoinCriteria)
55+
dsl.leftJoin(table, alias, receiver)
6856
}
6957

7058
fun rightJoin(table: SqlTable, receiver: JoinReceiver) =
7159
apply {
72-
val collector = JoinCollector()
73-
receiver(collector)
74-
dsl.rightJoin(table, collector.onJoinCriterion, collector.andJoinCriteria)
60+
dsl.rightJoin(table, receiver)
7561
}
7662

7763
fun rightJoin(table: SqlTable, alias: String, receiver: JoinReceiver) =
7864
apply {
79-
val collector = JoinCollector()
80-
receiver(collector)
81-
dsl.rightJoin(table, alias, collector.onJoinCriterion, collector.andJoinCriteria)
65+
dsl.rightJoin(table, alias, receiver)
8266
}
8367

8468
fun <T> where(column: BindableColumn<T>, condition: VisitableCondition<T>) =
@@ -88,9 +72,7 @@ class KotlinCountBuilder(private val dsl: CountDSL<SelectModel>): Buildable<Sele
8872

8973
fun <T> where(column: BindableColumn<T>, condition: VisitableCondition<T>, collect: CriteriaReceiver) =
9074
apply {
91-
val collector = CriteriaCollector()
92-
collect(collector)
93-
dsl.where(column, condition, collector.criteria)
75+
dsl.where().where(column, condition, collect)
9476
}
9577

9678
fun applyWhere(whereApplier: WhereApplier) =
@@ -105,9 +87,7 @@ class KotlinCountBuilder(private val dsl: CountDSL<SelectModel>): Buildable<Sele
10587

10688
fun <T> and(column: BindableColumn<T>, condition: VisitableCondition<T>, collect: CriteriaReceiver) =
10789
apply {
108-
val collector = CriteriaCollector()
109-
collect(collector)
110-
dsl.where().and(column, condition, collector.criteria)
90+
dsl.where().and(column, condition, collect)
11191
}
11292

11393
fun <T> or(column: BindableColumn<T>, condition: VisitableCondition<T>) =
@@ -117,9 +97,7 @@ class KotlinCountBuilder(private val dsl: CountDSL<SelectModel>): Buildable<Sele
11797

11898
fun <T> or(column: BindableColumn<T>, condition: VisitableCondition<T>, collect: CriteriaReceiver) =
11999
apply {
120-
val collector = CriteriaCollector()
121-
collect(collector)
122-
dsl.where().or(column, condition, collector.criteria)
100+
dsl.where().or(column, condition, collect)
123101
}
124102

125103
fun allRows() = this

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@ class KotlinDeleteBuilder(private val dsl: DeleteDSL<DeleteModel>): Buildable<De
3131

3232
fun <T> where(column: BindableColumn<T>, condition: VisitableCondition<T>, collect: CriteriaReceiver) =
3333
apply {
34-
val collector = CriteriaCollector()
35-
collect(collector)
36-
dsl.where(column, condition, collector.criteria)
34+
dsl.where().where(column, condition, collect)
3735
}
3836

3937
fun applyWhere(whereApplier: WhereApplier) =
@@ -48,9 +46,7 @@ class KotlinDeleteBuilder(private val dsl: DeleteDSL<DeleteModel>): Buildable<De
4846

4947
fun <T> and(column: BindableColumn<T>, condition: VisitableCondition<T>, collect: CriteriaReceiver) =
5048
apply {
51-
val collector = CriteriaCollector()
52-
collect(collector)
53-
dsl.where().and(column, condition, collector.criteria)
49+
dsl.where().and(column, condition, collect)
5450
}
5551

5652
fun <T> or(column: BindableColumn<T>, condition: VisitableCondition<T>) =
@@ -60,9 +56,7 @@ class KotlinDeleteBuilder(private val dsl: DeleteDSL<DeleteModel>): Buildable<De
6056

6157
fun <T> or(column: BindableColumn<T>, condition: VisitableCondition<T>, collect: CriteriaReceiver) =
6258
apply {
63-
val collector = CriteriaCollector()
64-
collect(collector)
65-
dsl.where().or(column, condition, collector.criteria)
59+
dsl.where().or(column, condition, collect)
6660
}
6761

6862
fun allRows() = this

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

Lines changed: 11 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -25,58 +25,42 @@ typealias SelectCompleter = KotlinQueryBuilder.() -> Buildable<SelectModel>
2525
class KotlinQueryBuilder(private val dsl: QueryExpressionDSL<SelectModel>): Buildable<SelectModel> {
2626
fun join(table: SqlTable, receiver: JoinReceiver) =
2727
apply {
28-
val collector = JoinCollector()
29-
receiver(collector)
30-
dsl.join(table, collector.onJoinCriterion, collector.andJoinCriteria)
28+
dsl.join(table, receiver)
3129
}
3230

3331
fun join(table: SqlTable, alias: String, receiver: JoinReceiver) =
3432
apply {
35-
val collector = JoinCollector()
36-
receiver(collector)
37-
dsl.join(table, alias, collector.onJoinCriterion, collector.andJoinCriteria)
33+
dsl.join(table, alias, receiver)
3834
}
3935

4036
fun fullJoin(table: SqlTable, receiver: JoinReceiver) =
4137
apply {
42-
val collector = JoinCollector()
43-
receiver(collector)
44-
dsl.fullJoin(table, collector.onJoinCriterion, collector.andJoinCriteria)
38+
dsl.fullJoin(table, receiver)
4539
}
4640

4741
fun fullJoin(table: SqlTable, alias: String, receiver: JoinReceiver) =
4842
apply {
49-
val collector = JoinCollector()
50-
receiver(collector)
51-
dsl.fullJoin(table, alias, collector.onJoinCriterion, collector.andJoinCriteria)
43+
dsl.fullJoin(table, alias, receiver)
5244
}
5345

5446
fun leftJoin(table: SqlTable, receiver: JoinReceiver) =
5547
apply {
56-
val collector = JoinCollector()
57-
receiver(collector)
58-
dsl.leftJoin(table, collector.onJoinCriterion, collector.andJoinCriteria)
48+
dsl.leftJoin(table, receiver)
5949
}
6050

6151
fun leftJoin(table: SqlTable, alias: String, receiver: JoinReceiver) =
6252
apply {
63-
val collector = JoinCollector()
64-
receiver(collector)
65-
dsl.leftJoin(table, alias, collector.onJoinCriterion, collector.andJoinCriteria)
53+
dsl.leftJoin(table, alias, receiver)
6654
}
6755

6856
fun rightJoin(table: SqlTable, receiver: JoinReceiver) =
6957
apply {
70-
val collector = JoinCollector()
71-
receiver(collector)
72-
dsl.rightJoin(table, collector.onJoinCriterion, collector.andJoinCriteria)
58+
dsl.rightJoin(table, receiver)
7359
}
7460

7561
fun rightJoin(table: SqlTable, alias: String, receiver: JoinReceiver) =
7662
apply {
77-
val collector = JoinCollector()
78-
receiver(collector)
79-
dsl.rightJoin(table, alias, collector.onJoinCriterion, collector.andJoinCriteria)
63+
dsl.rightJoin(table, alias, receiver)
8064
}
8165

8266
fun <T> where(column: BindableColumn<T>, condition: VisitableCondition<T>) =
@@ -86,9 +70,7 @@ class KotlinQueryBuilder(private val dsl: QueryExpressionDSL<SelectModel>): Buil
8670

8771
fun <T> where(column: BindableColumn<T>, condition: VisitableCondition<T>, collect: CriteriaReceiver) =
8872
apply {
89-
val collector = CriteriaCollector()
90-
collect(collector)
91-
dsl.where(column, condition, collector.criteria)
73+
dsl.where().where(column, condition, collect)
9274
}
9375

9476
fun applyWhere(whereApplier: WhereApplier) =
@@ -103,9 +85,7 @@ class KotlinQueryBuilder(private val dsl: QueryExpressionDSL<SelectModel>): Buil
10385

10486
fun <T> and(column: BindableColumn<T>, condition: VisitableCondition<T>, collect: CriteriaReceiver) =
10587
apply {
106-
val collector = CriteriaCollector()
107-
collect(collector)
108-
dsl.where().and(column, condition, collector.criteria)
88+
dsl.where().and(column, condition, collect)
10989
}
11090

11191
fun <T> or(column: BindableColumn<T>, condition: VisitableCondition<T>) =
@@ -115,9 +95,7 @@ class KotlinQueryBuilder(private val dsl: QueryExpressionDSL<SelectModel>): Buil
11595

11696
fun <T> or(column: BindableColumn<T>, condition: VisitableCondition<T>, collect: CriteriaReceiver) =
11797
apply {
118-
val collector = CriteriaCollector()
119-
collect(collector)
120-
dsl.where().or(column, condition, collector.criteria)
98+
dsl.where().or(column, condition, collect)
12199
}
122100

123101
fun groupBy(vararg columns: BasicColumn) =

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

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ class KotlinUpdateBuilder(private val dsl: UpdateDSL<UpdateModel>) : Buildable<U
3939

4040
fun <T> where(column: BindableColumn<T>, condition: VisitableCondition<T>, collect: CriteriaReceiver) =
4141
apply {
42-
val collector = CriteriaCollector()
43-
collect(collector)
44-
dsl.where(column, condition, collector.criteria)
42+
dsl.where().where(column, condition, collect)
4543
}
4644

4745
fun applyWhere(whereApplier: WhereApplier) =
@@ -56,9 +54,7 @@ class KotlinUpdateBuilder(private val dsl: UpdateDSL<UpdateModel>) : Buildable<U
5654

5755
fun <T> and(column: BindableColumn<T>, condition: VisitableCondition<T>, collect: CriteriaReceiver) =
5856
apply {
59-
val collector = CriteriaCollector()
60-
collect(collector)
61-
dsl.where().and(column, condition, collector.criteria)
57+
dsl.where().and(column, condition, collect)
6258
}
6359

6460
fun <T> or(column: BindableColumn<T>, condition: VisitableCondition<T>) =
@@ -68,14 +64,10 @@ class KotlinUpdateBuilder(private val dsl: UpdateDSL<UpdateModel>) : Buildable<U
6864

6965
fun <T> or(column: BindableColumn<T>, condition: VisitableCondition<T>, collect: CriteriaReceiver) =
7066
apply {
71-
val collector = CriteriaCollector()
72-
collect(collector)
73-
dsl.where().or(column, condition, collector.criteria)
67+
dsl.where().or(column, condition, collect)
7468
}
7569

76-
fun <T> set(column: SqlColumn<T>): UpdateDSL<UpdateModel>.SetClauseFinisher<T> {
77-
return dsl.set(column)
78-
}
70+
fun <T> set(column: SqlColumn<T>): UpdateDSL<UpdateModel>.SetClauseFinisher<T> = dsl.set(column)
7971

8072
override fun build(): UpdateModel = dsl.build()
8173
}

0 commit comments

Comments
 (0)