Skip to content

Commit 0d0599a

Browse files
committed
Checkstyle updates
1 parent 92eb860 commit 0d0599a

File tree

2 files changed

+22
-14
lines changed

2 files changed

+22
-14
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
import org.mybatis.dynamic.sql.select.function.Substring;
4444
import org.mybatis.dynamic.sql.select.function.Subtract;
4545
import org.mybatis.dynamic.sql.select.function.Upper;
46-
import org.mybatis.dynamic.sql.select.join.EqualTo;
4746
import org.mybatis.dynamic.sql.select.join.AndJoinCriterion;
47+
import org.mybatis.dynamic.sql.select.join.EqualTo;
4848
import org.mybatis.dynamic.sql.select.join.JoinCondition;
4949
import org.mybatis.dynamic.sql.select.join.OnJoinCriterion;
5050
import org.mybatis.dynamic.sql.update.UpdateDSL;
@@ -192,15 +192,15 @@ static <T> SqlCriterion<T> and(BindableColumn<T> column, VisitableCondition<T> c
192192
}
193193

194194
// join support
195-
static OnJoinCriterion on(BasicColumn joinColumn, JoinCondition joinCondition) {
196-
return new OnJoinCriterion.Builder()
195+
static AndJoinCriterion and(BasicColumn joinColumn, JoinCondition joinCondition) {
196+
return new AndJoinCriterion.Builder()
197197
.withJoinColumn(joinColumn)
198198
.withJoinCondition(joinCondition)
199199
.build();
200200
}
201201

202-
static AndJoinCriterion and(BasicColumn joinColumn, JoinCondition joinCondition) {
203-
return new AndJoinCriterion.Builder()
202+
static OnJoinCriterion on(BasicColumn joinColumn, JoinCondition joinCondition) {
203+
return new OnJoinCriterion.Builder()
204204
.withJoinColumn(joinColumn)
205205
.withJoinCondition(joinCondition)
206206
.build();

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

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
import org.mybatis.dynamic.sql.select.join.JoinCondition;
3434
import org.mybatis.dynamic.sql.select.join.JoinCriterion;
3535
import org.mybatis.dynamic.sql.select.join.JoinModel;
36-
import org.mybatis.dynamic.sql.select.join.OnJoinCriterion;
3736
import org.mybatis.dynamic.sql.select.join.JoinSpecification;
3837
import org.mybatis.dynamic.sql.select.join.JoinType;
38+
import org.mybatis.dynamic.sql.select.join.OnJoinCriterion;
3939
import org.mybatis.dynamic.sql.util.Buildable;
4040
import org.mybatis.dynamic.sql.where.AbstractWhereDSL;
4141

@@ -94,12 +94,14 @@ public JoinSpecificationStarter join(SqlTable joinTable, String tableAlias) {
9494
return join(joinTable);
9595
}
9696

97-
public QueryExpressionDSL<R> join(SqlTable joinTable, OnJoinCriterion joinCriterion, AndJoinCriterion...joinCriteria) {
97+
public QueryExpressionDSL<R> join(SqlTable joinTable, OnJoinCriterion joinCriterion,
98+
AndJoinCriterion...joinCriteria) {
9899
addJoinSpecificationBuilder(joinTable, joinCriterion, JoinType.INNER, joinCriteria);
99100
return this;
100101
}
101102

102-
public QueryExpressionDSL<R> join(SqlTable joinTable, String tableAlias, OnJoinCriterion joinCriterion, AndJoinCriterion...joinCriteria) {
103+
public QueryExpressionDSL<R> join(SqlTable joinTable, String tableAlias, OnJoinCriterion joinCriterion,
104+
AndJoinCriterion...joinCriteria) {
103105
tableAliases.put(joinTable, tableAlias);
104106
return join(joinTable, joinCriterion, joinCriteria);
105107
}
@@ -113,12 +115,14 @@ public JoinSpecificationStarter leftJoin(SqlTable joinTable, String tableAlias)
113115
return leftJoin(joinTable);
114116
}
115117

116-
public QueryExpressionDSL<R> leftJoin(SqlTable joinTable, OnJoinCriterion joinCriterion, AndJoinCriterion...joinCriteria) {
118+
public QueryExpressionDSL<R> leftJoin(SqlTable joinTable, OnJoinCriterion joinCriterion,
119+
AndJoinCriterion...joinCriteria) {
117120
addJoinSpecificationBuilder(joinTable, joinCriterion, JoinType.LEFT, joinCriteria);
118121
return this;
119122
}
120123

121-
public QueryExpressionDSL<R> leftJoin(SqlTable joinTable, String tableAlias, OnJoinCriterion joinCriterion, AndJoinCriterion...joinCriteria) {
124+
public QueryExpressionDSL<R> leftJoin(SqlTable joinTable, String tableAlias, OnJoinCriterion joinCriterion,
125+
AndJoinCriterion...joinCriteria) {
122126
tableAliases.put(joinTable, tableAlias);
123127
return leftJoin(joinTable, joinCriterion, joinCriteria);
124128
}
@@ -132,12 +136,14 @@ public JoinSpecificationStarter rightJoin(SqlTable joinTable, String tableAlias)
132136
return rightJoin(joinTable);
133137
}
134138

135-
public QueryExpressionDSL<R> rightJoin(SqlTable joinTable, OnJoinCriterion joinCriterion, AndJoinCriterion...joinCriteria) {
139+
public QueryExpressionDSL<R> rightJoin(SqlTable joinTable, OnJoinCriterion joinCriterion,
140+
AndJoinCriterion...joinCriteria) {
136141
addJoinSpecificationBuilder(joinTable, joinCriterion, JoinType.RIGHT, joinCriteria);
137142
return this;
138143
}
139144

140-
public QueryExpressionDSL<R> rightJoin(SqlTable joinTable, String tableAlias, OnJoinCriterion joinCriterion, AndJoinCriterion...joinCriteria) {
145+
public QueryExpressionDSL<R> rightJoin(SqlTable joinTable, String tableAlias, OnJoinCriterion joinCriterion,
146+
AndJoinCriterion...joinCriteria) {
141147
tableAliases.put(joinTable, tableAlias);
142148
return rightJoin(joinTable, joinCriterion, joinCriteria);
143149
}
@@ -151,12 +157,14 @@ public JoinSpecificationStarter fullJoin(SqlTable joinTable, String tableAlias)
151157
return fullJoin(joinTable);
152158
}
153159

154-
public QueryExpressionDSL<R> fullJoin(SqlTable joinTable, OnJoinCriterion joinCriterion, AndJoinCriterion...joinCriteria) {
160+
public QueryExpressionDSL<R> fullJoin(SqlTable joinTable, OnJoinCriterion joinCriterion,
161+
AndJoinCriterion...joinCriteria) {
155162
addJoinSpecificationBuilder(joinTable, joinCriterion, JoinType.FULL, joinCriteria);
156163
return this;
157164
}
158165

159-
public QueryExpressionDSL<R> fullJoin(SqlTable joinTable, String tableAlias, OnJoinCriterion joinCriterion, AndJoinCriterion...joinCriteria) {
166+
public QueryExpressionDSL<R> fullJoin(SqlTable joinTable, String tableAlias, OnJoinCriterion joinCriterion,
167+
AndJoinCriterion...joinCriteria) {
160168
tableAliases.put(joinTable, tableAlias);
161169
return fullJoin(joinTable, joinCriterion, joinCriteria);
162170
}

0 commit comments

Comments
 (0)