Simplification

Author: jeffgbutler

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

@@ -38,15 +38,12 @@ public SearchedCaseRenderer(SearchedCaseModel searchedCaseModel, RenderingContex
     }
 
     public FragmentAndParameters render() {
-        FragmentAndParameters caseFragment = renderCase();
-        FragmentAndParameters whenFragment = renderWhenConditions();
-        Optional<FragmentAndParameters> elseFragment = renderElse();
-        FragmentAndParameters endFragment = renderEnd();
-
-        return elseFragment.map(ef -> Stream.of(caseFragment, whenFragment, ef, endFragment))
-                .orElseGet(() -> Stream.of(caseFragment, whenFragment, endFragment))
-                .collect(FragmentCollector.collect())
-                .toFragmentAndParameters(Collectors.joining(" ")); //$NON-NLS-1$
+        FragmentCollector fc = new FragmentCollector();
+        fc.add(renderCase());
+        fc.add(renderWhenConditions());
+        renderElse().ifPresent(fc::add);
+        fc.add(renderEnd());
+        return fc.toFragmentAndParameters(Collectors.joining(" ")); //$NON-NLS-1$
     }
 
     private FragmentAndParameters renderCase() {

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

@@ -39,15 +39,12 @@ public SimpleCaseRenderer(SimpleCaseModel<T> simpleCaseModel, RenderingContext r
     }
 
     public FragmentAndParameters render() {
-        FragmentAndParameters caseFragment = renderCase();
-        FragmentAndParameters whenFragment = renderWhenConditions();
-        Optional<FragmentAndParameters> elseFragment = renderElse();
-        FragmentAndParameters endFragment = renderEnd();
-
-        return elseFragment.map(ef -> Stream.of(caseFragment, whenFragment, ef, endFragment))
-                .orElseGet(() -> Stream.of(caseFragment, whenFragment, endFragment))
-                .collect(FragmentCollector.collect())
-                .toFragmentAndParameters(Collectors.joining(" ")); //$NON-NLS-1$
+        FragmentCollector fc = new FragmentCollector();
+        fc.add(renderCase());
+        fc.add(renderWhenConditions());
+        renderElse().ifPresent(fc::add);
+        fc.add(renderEnd());
+        return fc.toFragmentAndParameters(Collectors.joining(" ")); //$NON-NLS-1$
     }
 
     private FragmentAndParameters renderCase() {