Code Polishing

Author: jeffgbutler

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

@@ -43,23 +43,12 @@ private CriterionRenderer(Builder<T> builder) {
     }
 
     public Optional<RenderedCriterion> render() {
-        FragmentAndParameters initialCondition = null;
-        if (sqlCriterion.condition().shouldRender()) {
-            initialCondition = renderCondition();
-        }
-
-        List<RenderedCriterion> subCriteria = sqlCriterion.mapSubCriteria(this::renderSubCriterion)
-                .filter(Optional::isPresent)
-                .map(Optional::get)
-                .collect(Collectors.toList());
-
         RenderedCriterion rc;
-        if (initialCondition == null) {
-            rc = renderWithoutInitialCondition(subCriteria);
+        if (sqlCriterion.condition().shouldRender()) {
+            rc = renderWithInitialCondition(renderCondition(), renderSubCriteria());
         } else {
-            rc = renderWithInitialCondition(initialCondition, subCriteria);
+            rc = renderWithoutInitialCondition(renderSubCriteria());
         }
-
         return Optional.ofNullable(rc);
     }
 
@@ -73,6 +62,13 @@ private FragmentAndParameters renderCondition() {
         return sqlCriterion.condition().accept(visitor);
     }
 
+    private List<RenderedCriterion> renderSubCriteria() {
+        return sqlCriterion.mapSubCriteria(this::renderSubCriterion)
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .collect(Collectors.toList());
+    }
+
     private <S> Optional<RenderedCriterion> renderSubCriterion(SqlCriterion<S> subCriterion) {
         return CriterionRenderer.withCriterion(subCriterion)
                 .withSequence(sequence)
@@ -94,19 +90,14 @@ private RenderedCriterion renderWithoutInitialCondition(List<RenderedCriterion>
     private RenderedCriterion renderWithInitialCondition(FragmentAndParameters initialCondition,
             List<RenderedCriterion> subCriteria) {
         if (subCriteria.isEmpty()) {
-            return fromFragmentAndParameters(initialCondition);
+            return calculateRenderedCriterion(initialCondition);
         }
 
         return calculateRenderedCriterion(initialCondition, subCriteria);
     }
 
-    private RenderedCriterion fromFragmentAndParameters(FragmentAndParameters fragmentAndParameters) {
-        RenderedCriterion.Builder builder = new RenderedCriterion.Builder()
-                .withFragmentAndParameters(fragmentAndParameters);
-
-        sqlCriterion.connector().ifPresent(builder::withConnector);
-
-        return builder.build();
+    private RenderedCriterion calculateRenderedCriterion(FragmentAndParameters initialCondition) {
+        return fromFragmentAndParameters(initialCondition);
     }
 
     private RenderedCriterion calculateRenderedCriterion(List<RenderedCriterion> subCriteria) {
@@ -118,8 +109,7 @@ private RenderedCriterion calculateRenderedCriterion(FragmentAndParameters initi
         FragmentCollector fc = subCriteria.stream()
                 .map(RenderedCriterion::fragmentAndParametersWithConnector)
                 .collect(FragmentCollector.collect(initialCondition));
-        String fragment = calculateFragment(fc);
-        return fromFragmentAndParameters(FragmentAndParameters.withFragment(fragment)
+        return fromFragmentAndParameters(FragmentAndParameters.withFragment(calculateFragment(fc))
                 .withParameters(fc.parameters())
                 .build());
     }
@@ -133,6 +123,15 @@ private String calculateFragment(FragmentCollector collector) {
         }
     }
 
+    private RenderedCriterion fromFragmentAndParameters(FragmentAndParameters fragmentAndParameters) {
+        RenderedCriterion.Builder builder = new RenderedCriterion.Builder()
+                .withFragmentAndParameters(fragmentAndParameters);
+
+        sqlCriterion.connector().ifPresent(builder::withConnector);
+
+        return builder.build();
+    }
+
     public static <T> Builder<T> withCriterion(SqlCriterion<T> sqlCriterion) {
         return new Builder<T>().withCriterion(sqlCriterion);
     }