Move Map function to SQLColumn where it belongs

Author: jeffgbutler

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

@@ -18,6 +18,7 @@
 import java.sql.JDBCType;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.function.Function;
 
 import org.jetbrains.annotations.NotNull;
 import org.mybatis.dynamic.sql.render.RenderingContext;
@@ -173,6 +174,10 @@ public <S> SqlColumn<S> withJavaType(Class<S> javaType) {
         return b.withJavaType(javaType).build();
     }
 
+    public <R> R map(Function<SqlColumn<?>, R> mapper) {
+        return mapper.apply(this);
+    }
+
     /**
      * This method helps us tell a bit of fiction to the Java compiler. Java, for better or worse,
      * does not carry generic type information through chained methods. We want to enable method

src/main/java/org/mybatis/dynamic/sql/insert/render/GeneralInsertValuePhraseVisitor.java

@@ -85,7 +85,7 @@ private Optional<FieldAndValueAndParameters> buildNullFragment(AbstractColumnMap
     }
 
     private Optional<FieldAndValueAndParameters> buildFragment(AbstractColumnMapping mapping, Object value) {
-        RenderedParameterInfo parameterInfo = mapping.mapColumn(renderingContext::calculateParameterInfo);
+        RenderedParameterInfo parameterInfo = mapping.column().map(renderingContext::calculateParameterInfo);
 
         return FieldAndValueAndParameters.withFieldName(mapping.columnName())
                 .withValuePhrase(parameterInfo.renderedPlaceHolder())

src/main/java/org/mybatis/dynamic/sql/insert/render/MultiRowValuePhraseVisitor.java

@@ -58,14 +58,14 @@ public FieldAndValueAndParameters visit(StringConstantMapping mapping) {
     @Override
     public FieldAndValueAndParameters visit(PropertyMapping mapping) {
         return FieldAndValueAndParameters.withFieldName(mapping.columnName())
-                .withValuePhrase(mapping.mapColumn(c -> calculateJdbcPlaceholder(c, mapping.property())))
+                .withValuePhrase(mapping.column().map(c -> calculateJdbcPlaceholder(c, mapping.property())))
                 .build();
     }
 
     @Override
     public FieldAndValueAndParameters visit(RowMapping mapping) {
         return FieldAndValueAndParameters.withFieldName(mapping.columnName())
-                .withValuePhrase(mapping.mapColumn(this::calculateJdbcPlaceholder))
+                .withValuePhrase(mapping.column().map(this::calculateJdbcPlaceholder))
                 .build();
     }
 

src/main/java/org/mybatis/dynamic/sql/insert/render/ValuePhraseVisitor.java

@@ -60,7 +60,7 @@ public Optional<FieldAndValueAndParameters> visit(StringConstantMapping mapping)
     @Override
     public Optional<FieldAndValueAndParameters> visit(PropertyMapping mapping) {
         return FieldAndValueAndParameters.withFieldName(mapping.columnName())
-                .withValuePhrase(mapping.mapColumn(c -> calculateJdbcPlaceholder(c, mapping.property())))
+                .withValuePhrase(mapping.column().map(c -> calculateJdbcPlaceholder(c, mapping.property())))
                 .buildOptional();
     }
 
@@ -76,7 +76,7 @@ public Optional<FieldAndValueAndParameters> visit(PropertyWhenPresentMapping map
     @Override
     public Optional<FieldAndValueAndParameters> visit(RowMapping mapping) {
         return FieldAndValueAndParameters.withFieldName(mapping.columnName())
-                .withValuePhrase(mapping.mapColumn(this::calculateJdbcPlaceholder))
+                .withValuePhrase(mapping.column().map(this::calculateJdbcPlaceholder))
                 .buildOptional();
     }
 

src/main/java/org/mybatis/dynamic/sql/update/render/SetPhraseVisitor.java

@@ -49,15 +49,15 @@ public Optional<FragmentAndParameters> visit(NullMapping mapping) {
 
     @Override
     public Optional<FragmentAndParameters> visit(ConstantMapping mapping) {
-        String fragment = mapping.mapColumn(renderingContext::aliasedColumnName)
+        String fragment = mapping.column().map(renderingContext::aliasedColumnName)
                 + " = " + mapping.constant(); //$NON-NLS-1$
         return FragmentAndParameters.withFragment(fragment)
                 .buildOptional();
     }
 
     @Override
     public Optional<FragmentAndParameters> visit(StringConstantMapping mapping) {
-        String fragment = mapping.mapColumn(renderingContext::aliasedColumnName)
+        String fragment = mapping.column().map(renderingContext::aliasedColumnName)
                 + " = " //$NON-NLS-1$
                 + StringUtilities.formatConstantForSQL(mapping.constant());
 
@@ -85,7 +85,7 @@ public <T> Optional<FragmentAndParameters> visit(ValueWhenPresentMapping<T> mapp
     @Override
     public Optional<FragmentAndParameters> visit(SelectMapping mapping) {
         SelectStatementProvider selectStatement = mapping.selectModel().render(renderingContext);
-        String fragment = mapping.mapColumn(renderingContext::aliasedColumnName)
+        String fragment = mapping.column().map(renderingContext::aliasedColumnName)
                 + " = (" //$NON-NLS-1$
                 + selectStatement.getSelectStatement()
                 + ")"; //$NON-NLS-1$
@@ -99,7 +99,7 @@ public Optional<FragmentAndParameters> visit(SelectMapping mapping) {
     public Optional<FragmentAndParameters> visit(ColumnToColumnMapping mapping) {
         FragmentAndParameters renderedColumn = mapping.rightColumn().render(renderingContext);
 
-        String setPhrase = mapping.mapColumn(renderingContext::aliasedColumnName)
+        String setPhrase = mapping.column().map(renderingContext::aliasedColumnName)
                 + " = "  //$NON-NLS-1$
                 + renderedColumn.fragment();
 
@@ -109,8 +109,8 @@ public Optional<FragmentAndParameters> visit(ColumnToColumnMapping mapping) {
     }
 
     private <T> Optional<FragmentAndParameters> buildValueFragment(AbstractColumnMapping mapping, T value) {
-        RenderedParameterInfo parameterInfo = mapping.mapColumn(renderingContext::calculateParameterInfo);
-        String setPhrase = mapping.mapColumn(renderingContext::aliasedColumnName)
+        RenderedParameterInfo parameterInfo = mapping.column().map(renderingContext::calculateParameterInfo);
+        String setPhrase = mapping.column().map(renderingContext::aliasedColumnName)
                 + " = "  //$NON-NLS-1$
                 + parameterInfo.renderedPlaceHolder();
 
@@ -121,7 +121,7 @@ private <T> Optional<FragmentAndParameters> buildValueFragment(AbstractColumnMap
 
     private Optional<FragmentAndParameters> buildNullFragment(AbstractColumnMapping mapping) {
         return FragmentAndParameters
-                .withFragment(mapping.mapColumn(renderingContext::aliasedColumnName) + " = null") //$NON-NLS-1$
+                .withFragment(mapping.column().map(renderingContext::aliasedColumnName) + " = null") //$NON-NLS-1$
                 .buildOptional();
     }
 }

src/main/java/org/mybatis/dynamic/sql/util/AbstractColumnMapping.java

@@ -16,7 +16,6 @@
 package org.mybatis.dynamic.sql.util;
 
 import java.util.Objects;
-import java.util.function.Function;
 
 import org.mybatis.dynamic.sql.SqlColumn;
 
@@ -31,8 +30,8 @@ public String columnName() {
         return column.name();
     }
 
-    public <R> R mapColumn(Function<SqlColumn<?>, R> mapper) {
-        return mapper.apply(column);
+    public SqlColumn<?> column() {
+        return column;
     }
 
     public abstract <R> R accept(ColumnMappingVisitor<R> visitor);