Use Fragment Mapping where it makes sense

Author: jeffgbutler

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

@@ -139,12 +139,8 @@ private FragmentAndParameters calculateColumnList() {
     private FragmentAndParameters renderColumnAndAlias(BasicColumn selectListItem) {
         FragmentAndParameters renderedColumn = selectListItem.render(renderingContext);
 
-        String nameAndTableAlias = selectListItem.alias().map(a -> renderedColumn.fragment() + " as " + a) //$NON-NLS-1$
-                .orElse(renderedColumn.fragment());
-
-        return FragmentAndParameters.withFragment(nameAndTableAlias)
-                .withParameters(renderedColumn.parameters())
-                .build();
+        return selectListItem.alias().map(a -> renderedColumn.mapFragment(f -> f + " as " + a)) //$NON-NLS-1$
+                .orElse(renderedColumn);
     }
 
     private FragmentAndParameters renderTableExpression(TableExpression table) {

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

@@ -109,12 +109,8 @@ public FragmentAndParameters visit(AbstractSubselectCondition<T> condition) {
 
     @Override
     public FragmentAndParameters visit(AbstractColumnComparisonCondition<T> condition) {
-        FragmentAndParameters renderedRightColumn = condition.rightColumn().render(renderingContext);
-        String finalFragment = condition.operator()
-                + spaceBefore(renderedRightColumn.fragment());
-        return FragmentAndParameters.withFragment(finalFragment)
-                .withParameters(renderedRightColumn.parameters())
-                .build();
+        return condition.rightColumn().render(renderingContext)
+                .mapFragment(f -> condition.operator() + spaceBefore(f));
     }
 
     private Object convertValue(T value) {

src/test/java/examples/animal/data/Length.java

@@ -36,11 +36,8 @@ public Optional<JDBCType> jdbcType() {
 
     @Override
     public FragmentAndParameters render(RenderingContext renderingContext) {
-        FragmentAndParameters renderedColumn = column.render(renderingContext);
-
-        return FragmentAndParameters.withFragment("length(" + renderedColumn.fragment() + ")") //$NON-NLS-1$ //$NON-NLS-2$
-                .withParameters(renderedColumn.parameters())
-                .build();
+        return column.render(renderingContext)
+                .mapFragment(f -> "length(" + f + ")"); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     @Override

src/test/java/examples/type_conversion/ToBase64.java

@@ -37,11 +37,8 @@ public Optional<JDBCType> jdbcType() {
 
     @Override
     public FragmentAndParameters render(RenderingContext renderingContext) {
-        FragmentAndParameters renderedColumn = column.render(renderingContext);
-
-        return FragmentAndParameters.withFragment("TO_BASE64(" + renderedColumn.fragment() + ")") //$NON-NLS-1$ //$NON-NLS-2$
-                .withParameters(renderedColumn.parameters())
-                .build();
+        return column.render(renderingContext)
+                .mapFragment(f -> "TO_BASE64(" + f + ")"); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     @Override