Skip to content

Commit b5c2f58

Browse files
committed
Checkstyle Issues
1 parent 610ced8 commit b5c2f58

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

src/main/java/org/mybatis/dynamic/sql/where/AbstractWhereDSL.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
import java.util.List;
2121

2222
import org.jetbrains.annotations.NotNull;
23+
import org.mybatis.dynamic.sql.AndOrCriteriaGroup;
2324
import org.mybatis.dynamic.sql.BindableColumn;
2425
import org.mybatis.dynamic.sql.ColumnAndConditionCriterion;
2526
import org.mybatis.dynamic.sql.CriteriaGroup;
26-
import org.mybatis.dynamic.sql.AndOrCriteriaGroup;
2727
import org.mybatis.dynamic.sql.ExistsCriterion;
2828
import org.mybatis.dynamic.sql.ExistsPredicate;
2929
import org.mybatis.dynamic.sql.SqlCriterion;

src/main/java/org/mybatis/dynamic/sql/where/AbstractWhereSupport.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import java.util.List;
2020
import java.util.function.Consumer;
2121

22+
import org.mybatis.dynamic.sql.AndOrCriteriaGroup;
2223
import org.mybatis.dynamic.sql.BindableColumn;
2324
import org.mybatis.dynamic.sql.CriteriaGroup;
24-
import org.mybatis.dynamic.sql.AndOrCriteriaGroup;
2525
import org.mybatis.dynamic.sql.ExistsPredicate;
2626
import org.mybatis.dynamic.sql.VisitableCondition;
2727

@@ -41,7 +41,8 @@ public <T> W where(BindableColumn<T> column, VisitableCondition<T> condition, An
4141
return where(column, condition, Arrays.asList(subCriteria));
4242
}
4343

44-
public <T> W where(BindableColumn<T> column, VisitableCondition<T> condition, List<AndOrCriteriaGroup> subCriteria) {
44+
public <T> W where(BindableColumn<T> column, VisitableCondition<T> condition,
45+
List<AndOrCriteriaGroup> subCriteria) {
4546
return apply(w -> w.where(column, condition, subCriteria));
4647
}
4748

src/main/java/org/mybatis/dynamic/sql/where/render/CriterionRenderer.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@ public Optional<RenderedCriterion> visit(CriteriaGroup criterion) {
109109
Optional<RenderedCriterion> initialCriterion = criterion.initialCriterion().accept(this);
110110

111111
List<RenderedCriterion> renderedSubCriteria = renderSubCriteria(criterion.subCriteria());
112-
return calculateFinalFragment(initialCriterion.map(RenderedCriterion::fragmentAndParameters).orElse(null), renderedSubCriteria);
112+
return calculateFinalFragment(initialCriterion.map(RenderedCriterion::fragmentAndParameters)
113+
.orElse(null), renderedSubCriteria);
113114
}
114115

115116
List<RenderedCriterion> renderSubCriteria(List<AndOrCriteriaGroup> subCriteria) {
@@ -126,7 +127,8 @@ private Optional<RenderedCriterion> renderCriteriaGroupWithConnector(AndOrCriter
126127
.map(Optional::get)
127128
.collect(Collectors.toList());
128129

129-
return calculateFinalFragment(initialCriterion.map(RenderedCriterion::fragmentAndParameters).orElse(null), someList).map(rc -> rc.withConnector(criterion.connector()));
130+
return calculateFinalFragment(initialCriterion.map(RenderedCriterion::fragmentAndParameters)
131+
.orElse(null), someList).map(rc -> rc.withConnector(criterion.connector()));
130132
}
131133

132134
private <T> FragmentAndParameters renderCondition(ColumnAndConditionCriterion<T> criterion) {
@@ -163,8 +165,8 @@ private Optional<RenderedCriterion> calculateFinalFragment(FragmentAndParameters
163165
* @param renderedSubCriteria - a list of previously rendered sub criteria. The sub criteria will all
164166
* have connectors (either an AND or an OR)
165167
* @return a fragment collector whose fragments represent the final calculated list of fragments and parameters.
166-
* The fragment collector can be used to calculate the single composed fragment - either as a where clause, or
167-
* a valid rendered sub criteria in the case of a recursive call.
168+
* The fragment collector can be used to calculate the single composed fragment - either as a where clause, or
169+
* a valid rendered sub criteria in the case of a recursive call.
168170
*/
169171
Optional<FragmentCollector> collectSqlFragments(FragmentAndParameters initialCondition,
170172
List<RenderedCriterion> renderedSubCriteria) {

0 commit comments

Comments
 (0)