Checkstyle

Author: jeffgbutler

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

@@ -28,8 +28,6 @@
 import org.mybatis.dynamic.sql.insert.InsertDSL;
 import org.mybatis.dynamic.sql.insert.InsertSelectDSL;
 import org.mybatis.dynamic.sql.insert.MultiRowInsertDSL;
-import org.mybatis.dynamic.sql.select.caseexpression.SearchedCaseDSL;
-import org.mybatis.dynamic.sql.select.caseexpression.SimpleCaseDSL;
 import org.mybatis.dynamic.sql.select.ColumnSortSpecification;
 import org.mybatis.dynamic.sql.select.CountDSL;
 import org.mybatis.dynamic.sql.select.HavingDSL;
@@ -45,6 +43,8 @@
 import org.mybatis.dynamic.sql.select.aggregate.Max;
 import org.mybatis.dynamic.sql.select.aggregate.Min;
 import org.mybatis.dynamic.sql.select.aggregate.Sum;
+import org.mybatis.dynamic.sql.select.caseexpression.SearchedCaseDSL;
+import org.mybatis.dynamic.sql.select.caseexpression.SimpleCaseDSL;
 import org.mybatis.dynamic.sql.select.function.Add;
 import org.mybatis.dynamic.sql.select.function.Concat;
 import org.mybatis.dynamic.sql.select.function.Concatenate;
@@ -427,17 +427,6 @@ static AndOrCriteriaGroup and(List<AndOrCriteriaGroup> subCriteria) {
                 .build();
     }
 
-    // case expressions
-    @SuppressWarnings("java:S100")
-    static <T> SimpleCaseDSL<T> case_(BindableColumn<T> column) {
-        return SimpleCaseDSL.simpleCase(column);
-    }
-
-    @SuppressWarnings("java:S100")
-    static SearchedCaseDSL case_() {
-        return SearchedCaseDSL.searchedCase();
-    }
-
     // join support
     static <T> JoinCriterion<T> and(BindableColumn<T> joinColumn, JoinCondition<T> joinCondition) {
         return new JoinCriterion.Builder<T>()
@@ -455,6 +444,17 @@ static <T> JoinCriterion<T> on(BindableColumn<T> joinColumn, JoinCondition<T> jo
                 .build();
     }
 
+    // case expressions
+    @SuppressWarnings("java:S100")
+    static <T> SimpleCaseDSL<T> case_(BindableColumn<T> column) {
+        return SimpleCaseDSL.simpleCase(column);
+    }
+
+    @SuppressWarnings("java:S100")
+    static SearchedCaseDSL case_() {
+        return SearchedCaseDSL.searchedCase();
+    }
+
     static <T> EqualTo<T> equalTo(BindableColumn<T> column) {
         return new EqualTo<>(column);
     }

src/main/java/org/mybatis/dynamic/sql/select/caseexpression/ConditionBasedWhenCondition.java

@@ -15,12 +15,12 @@
  */
 package org.mybatis.dynamic.sql.select.caseexpression;
 
-import org.mybatis.dynamic.sql.VisitableCondition;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
 
+import org.mybatis.dynamic.sql.VisitableCondition;
+
 public class ConditionBasedWhenCondition<T> extends SimpleCaseWhenCondition<T> {
     private final List<VisitableCondition<T>> conditions = new ArrayList<>();
 

src/main/java/org/mybatis/dynamic/sql/select/caseexpression/SimpleCaseDSL.java

@@ -78,7 +78,8 @@ public BasicColumn end() {
     public class ConditionBasedWhenFinisher {
         private final List<VisitableCondition<T>> conditions = new ArrayList<>();
 
-        private ConditionBasedWhenFinisher(VisitableCondition<T> condition, List<VisitableCondition<T>> subsequentConditions) {
+        private ConditionBasedWhenFinisher(VisitableCondition<T> condition,
+                                           List<VisitableCondition<T>> subsequentConditions) {
             conditions.add(condition);
             conditions.addAll(subsequentConditions);
         }

src/main/java/org/mybatis/dynamic/sql/select/render/SimpleCaseRenderer.java

@@ -75,6 +75,7 @@ private FragmentAndParameters renderWhen() {
     private FragmentAndParameters renderConditions(SimpleCaseWhenCondition<T> whenCondition) {
         return whenCondition.accept(whenConditionRenderer);
     }
+
     private FragmentAndParameters renderThen(SimpleCaseWhenCondition<T> whenCondition) {
         return FragmentAndParameters.fromFragment("then " + whenCondition.thenValue()); //$NON-NLS-1$
     }

src/main/java/org/mybatis/dynamic/sql/select/render/SimpleCaseWhenConditionRenderer.java

@@ -22,8 +22,8 @@
 import org.mybatis.dynamic.sql.VisitableCondition;
 import org.mybatis.dynamic.sql.render.RenderedParameterInfo;
 import org.mybatis.dynamic.sql.render.RenderingContext;
-import org.mybatis.dynamic.sql.select.caseexpression.ConditionBasedWhenCondition;
 import org.mybatis.dynamic.sql.select.caseexpression.BasicWhenCondition;
+import org.mybatis.dynamic.sql.select.caseexpression.ConditionBasedWhenCondition;
 import org.mybatis.dynamic.sql.select.caseexpression.SimpleCaseWhenConditionVisitor;
 import org.mybatis.dynamic.sql.util.FragmentAndParameters;
 import org.mybatis.dynamic.sql.util.FragmentCollector;
@@ -51,18 +51,18 @@ public FragmentAndParameters visit(ConditionBasedWhenCondition<T> whenCondition)
                 .toFragmentAndParameters(Collectors.joining(", ")); //$NON-NLS-1$
     }
 
-    private FragmentAndParameters renderCondition(VisitableCondition<T> condition) {
-        Validator.assertTrue(condition.shouldRender(renderingContext), "ERROR.39"); //$NON-NLS-1$
-        return condition.accept(conditionVisitor);
-    }
-
     @Override
     public FragmentAndParameters visit(BasicWhenCondition<T> whenCondition) {
         return whenCondition.conditions().map(this::renderBasicValue)
                 .collect(FragmentCollector.collect())
                 .toFragmentAndParameters(Collectors.joining(", ")); //$NON-NLS-1$
     }
 
+    private FragmentAndParameters renderCondition(VisitableCondition<T> condition) {
+        Validator.assertTrue(condition.shouldRender(renderingContext), "ERROR.39"); //$NON-NLS-1$
+        return condition.accept(conditionVisitor);
+    }
+
     private FragmentAndParameters renderBasicValue(T value) {
         RenderedParameterInfo rpi = renderingContext.calculateParameterInfo(column);
         return FragmentAndParameters.withFragment(rpi.renderedPlaceHolder())