Checkstyle

Author: jeffgbutler

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

@@ -160,6 +160,18 @@ private Optional<RenderedCriterion> calculateRenderedCriterion(FragmentAndParame
                 collectSqlFragments(initialCriterion, renderedSubCriteria), fragmentCalculator));
     }
 
+    private RenderedCriterion calculateRenderedCriterion(FragmentCollector fragmentCollector,
+                                                         Function<FragmentCollector, String> fragmentCalculator) {
+        FragmentAndParameters fragmentAndParameters = FragmentAndParameters
+                .withFragment(fragmentCalculator.apply(fragmentCollector))
+                .withParameters(fragmentCollector.parameters())
+                .build();
+
+        return new RenderedCriterion.Builder()
+                .withFragmentAndParameters(fragmentAndParameters)
+                .build();
+    }
+
     private Optional<RenderedCriterion> calculateRenderedCriterion(List<RenderedCriterion> renderedSubCriteria,
             Function<FragmentCollector, String> fragmentCalculator) {
         return collectSqlFragments(renderedSubCriteria).map(fc -> calculateRenderedCriterion(fc, fragmentCalculator));
@@ -181,8 +193,7 @@ private <T> FragmentAndParameters renderCondition(ColumnAndConditionCriterion<T>
      * and there may be subcriteria. The collector will contain the initial condition and any rendered subcriteria
      * in order.
      *
-     * @param initialCondition - may be null if there is no rendered initial condition (as can be the case of
-     *                         optional conditions like isEqualToWhenPresent)
+     * @param initialCondition - may not be null. If there is no initial condition, then use the other overload
      * @param renderedSubCriteria - a list of previously rendered sub criteria. The sub criteria will all
      *                            have connectors (either an AND or an OR)
      * @return a fragment collector whose fragments represent the final calculated list of fragments and parameters.
@@ -223,18 +234,6 @@ private Optional<FragmentCollector> collectSqlFragments(List<RenderedCriterion>
         return Optional.of(fc);
     }
 
-    private RenderedCriterion calculateRenderedCriterion(FragmentCollector fragmentCollector,
-                                                         Function<FragmentCollector, String> fragmentCalculator) {
-        FragmentAndParameters fragmentAndParameters = FragmentAndParameters
-                .withFragment(fragmentCalculator.apply(fragmentCollector))
-                .withParameters(fragmentCollector.parameters())
-                .build();
-
-        return new RenderedCriterion.Builder()
-                .withFragmentAndParameters(fragmentAndParameters)
-                .build();
-    }
-
     private String calculateFragment(FragmentCollector collector) {
         if (collector.hasMultipleFragments()) {
             return collector.fragments()