Simplify the hierarchy for column mappings.

We now have a single visitor interface with default methods where
appropriate.

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/insert/AbstractMultiRowInsertModel.java

@@ -24,20 +24,20 @@
 import java.util.stream.Stream;
 
 import org.mybatis.dynamic.sql.SqlTable;
-import org.mybatis.dynamic.sql.util.InsertMapping;
+import org.mybatis.dynamic.sql.util.AbstractColumnMapping;
 
 public abstract class AbstractMultiRowInsertModel<T> {
     private SqlTable table;
     private List<T> records;
-    private List<InsertMapping> columnMappings;
+    private List<AbstractColumnMapping> columnMappings;
 
     protected AbstractMultiRowInsertModel(AbstractBuilder<T, ?> builder) {
         table = Objects.requireNonNull(builder.table);
         records = Collections.unmodifiableList(Objects.requireNonNull(builder.records));
         columnMappings = Objects.requireNonNull(builder.columnMappings);
     }
 
-    public <R> Stream<R> mapColumnMappings(Function<InsertMapping, R> mapper) {
+    public <R> Stream<R> mapColumnMappings(Function<AbstractColumnMapping, R> mapper) {
         return columnMappings.stream().map(mapper);
     }
 
@@ -56,7 +56,7 @@ public int recordCount() {
     public abstract static class AbstractBuilder<T, S extends AbstractBuilder<T, S>> {
         private SqlTable table;
         private List<T> records = new ArrayList<>();
-        private List<InsertMapping> columnMappings = new ArrayList<>();
+        private List<AbstractColumnMapping> columnMappings = new ArrayList<>();
 
         public S withTable(SqlTable table) {
             this.table = table;
@@ -68,7 +68,7 @@ public S withRecords(Collection<T> records) {
             return getThis();
         }
 
-        public S withColumnMappings(List<InsertMapping> columnMappings) {
+        public S withColumnMappings(List<AbstractColumnMapping> columnMappings) {
             this.columnMappings.addAll(columnMappings);
             return getThis();
         }

src/main/java/org/mybatis/dynamic/sql/insert/BatchInsertDSL.java

@@ -22,8 +22,8 @@
 
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
+import org.mybatis.dynamic.sql.util.AbstractColumnMapping;
 import org.mybatis.dynamic.sql.util.ConstantMapping;
-import org.mybatis.dynamic.sql.util.InsertMapping;
 import org.mybatis.dynamic.sql.util.NullMapping;
 import org.mybatis.dynamic.sql.util.PropertyMapping;
 import org.mybatis.dynamic.sql.util.StringConstantMapping;
@@ -32,7 +32,7 @@ public class BatchInsertDSL<T> {
 
     private Collection<T> records;
     private SqlTable table;
-    private List<InsertMapping> columnMappings = new ArrayList<>();
+    private List<AbstractColumnMapping> columnMappings = new ArrayList<>();
 
     private BatchInsertDSL(Collection<T> records, SqlTable table) {
         this.records = records;

src/main/java/org/mybatis/dynamic/sql/insert/GeneralInsertDSL.java

@@ -23,16 +23,16 @@
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 import org.mybatis.dynamic.sql.select.SelectModel;
+import org.mybatis.dynamic.sql.util.AbstractColumnMapping;
 import org.mybatis.dynamic.sql.util.Buildable;
 import org.mybatis.dynamic.sql.util.ConstantMapping;
-import org.mybatis.dynamic.sql.util.GeneralInsertMapping;
 import org.mybatis.dynamic.sql.util.NullMapping;
 import org.mybatis.dynamic.sql.util.SelectMapping;
 import org.mybatis.dynamic.sql.util.StringConstantMapping;
 import org.mybatis.dynamic.sql.util.ValueMapping;
 
 public class GeneralInsertDSL {
-    private List<GeneralInsertMapping> insertMappings = new ArrayList<>();
+    private List<AbstractColumnMapping> insertMappings = new ArrayList<>();
     private SqlTable table;
 
     private GeneralInsertDSL(SqlTable table) {

src/main/java/org/mybatis/dynamic/sql/insert/GeneralInsertModel.java

@@ -25,19 +25,19 @@
 import org.mybatis.dynamic.sql.insert.render.GeneralInsertRenderer;
 import org.mybatis.dynamic.sql.insert.render.GeneralInsertStatementProvider;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
-import org.mybatis.dynamic.sql.util.GeneralInsertMapping;
+import org.mybatis.dynamic.sql.util.AbstractColumnMapping;
 
 public class GeneralInsertModel {
 
     private SqlTable table;
-    private List<GeneralInsertMapping> insertMappings;
+    private List<AbstractColumnMapping> insertMappings;
 
     private GeneralInsertModel(Builder builder) {
         table = Objects.requireNonNull(builder.table);
         insertMappings = builder.insertMappings;
     }
 
-    public <R> Stream<R> mapColumnMappings(Function<GeneralInsertMapping, R> mapper) {
+    public <R> Stream<R> mapColumnMappings(Function<AbstractColumnMapping, R> mapper) {
         return insertMappings.stream().map(mapper);
     }
 
@@ -54,14 +54,14 @@ public GeneralInsertStatementProvider render(RenderingStrategy renderingStrategy
 
     public static class Builder {
         private SqlTable table;
-        private List<GeneralInsertMapping> insertMappings = new ArrayList<>();
+        private List<AbstractColumnMapping> insertMappings = new ArrayList<>();
 
         public Builder withTable(SqlTable table) {
             this.table = table;
             return this;
         }
 
-        public Builder withInsertMappings(List<GeneralInsertMapping> insertMappings) {
+        public Builder withInsertMappings(List<AbstractColumnMapping> insertMappings) {
             this.insertMappings.addAll(insertMappings);
             return this;
         }

src/main/java/org/mybatis/dynamic/sql/insert/InsertDSL.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@
 
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
+import org.mybatis.dynamic.sql.util.AbstractColumnMapping;
 import org.mybatis.dynamic.sql.util.ConstantMapping;
-import org.mybatis.dynamic.sql.util.InsertMapping;
 import org.mybatis.dynamic.sql.util.NullMapping;
 import org.mybatis.dynamic.sql.util.PropertyMapping;
 import org.mybatis.dynamic.sql.util.StringConstantMapping;
@@ -31,7 +31,7 @@ public class InsertDSL<T> {
 
     private T record;
     private SqlTable table;
-    private List<InsertMapping> columnMappings = new ArrayList<>();
+    private List<AbstractColumnMapping> columnMappings = new ArrayList<>();
 
     private InsertDSL(T record, SqlTable table) {
         this.record = record;

src/main/java/org/mybatis/dynamic/sql/insert/InsertModel.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -25,20 +25,20 @@
 import org.mybatis.dynamic.sql.insert.render.InsertRenderer;
 import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
-import org.mybatis.dynamic.sql.util.InsertMapping;
+import org.mybatis.dynamic.sql.util.AbstractColumnMapping;
 
 public class InsertModel<T> {
     private SqlTable table;
     private T record;
-    private List<InsertMapping> columnMappings;
+    private List<AbstractColumnMapping> columnMappings;
 
     private InsertModel(Builder<T> builder) {
         table = Objects.requireNonNull(builder.table);
         record = Objects.requireNonNull(builder.record);
         columnMappings = Objects.requireNonNull(builder.columnMappings);
     }
 
-    public <R> Stream<R> mapColumnMappings(Function<InsertMapping, R> mapper) {
+    public <R> Stream<R> mapColumnMappings(Function<AbstractColumnMapping, R> mapper) {
         return columnMappings.stream().map(mapper);
     }
 
@@ -64,7 +64,7 @@ public static <T> Builder<T> withRecord(T record) {
     public static class Builder<T> {
         private SqlTable table;
         private T record;
-        private List<InsertMapping> columnMappings = new ArrayList<>();
+        private List<AbstractColumnMapping> columnMappings = new ArrayList<>();
 
         public Builder<T> withTable(SqlTable table) {
             this.table = table;
@@ -76,7 +76,7 @@ public Builder<T> withRecord(T record) {
             return this;
         }
 
-        public Builder<T> withColumnMappings(List<InsertMapping> columnMappings) {
+        public Builder<T> withColumnMappings(List<AbstractColumnMapping> columnMappings) {
             this.columnMappings.addAll(columnMappings);
             return this;
         }

src/main/java/org/mybatis/dynamic/sql/insert/MultiRowInsertDSL.java

@@ -22,8 +22,8 @@
 
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
+import org.mybatis.dynamic.sql.util.AbstractColumnMapping;
 import org.mybatis.dynamic.sql.util.ConstantMapping;
-import org.mybatis.dynamic.sql.util.InsertMapping;
 import org.mybatis.dynamic.sql.util.NullMapping;
 import org.mybatis.dynamic.sql.util.PropertyMapping;
 import org.mybatis.dynamic.sql.util.StringConstantMapping;
@@ -32,7 +32,7 @@ public class MultiRowInsertDSL<T> {
 
     private Collection<T> records;
     private SqlTable table;
-    private List<InsertMapping> columnMappings = new ArrayList<>();
+    private List<AbstractColumnMapping> columnMappings = new ArrayList<>();
 
     private MultiRowInsertDSL(Collection<T> records, SqlTable table) {
         this.records = records;

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

@@ -22,7 +22,7 @@
 
 import org.mybatis.dynamic.sql.insert.GeneralInsertModel;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
-import org.mybatis.dynamic.sql.util.GeneralInsertMapping;
+import org.mybatis.dynamic.sql.util.AbstractColumnMapping;
 
 public class GeneralInsertRenderer {
 
@@ -51,11 +51,11 @@ private String calculateInsertStatement(FieldAndValueAndParametersCollector coll
                 + spaceBefore(collector.valuesPhrase());
     }
 
-    private Function<GeneralInsertMapping, FieldAndValueAndParameters> toFieldAndValue(GeneralInsertValuePhraseVisitor visitor) {
+    private Function<AbstractColumnMapping, FieldAndValueAndParameters> toFieldAndValue(GeneralInsertValuePhraseVisitor visitor) {
         return insertMapping -> toFieldAndValue(visitor, insertMapping);
     }
 
-    private FieldAndValueAndParameters toFieldAndValue(GeneralInsertValuePhraseVisitor visitor, GeneralInsertMapping insertMapping) {
+    private FieldAndValueAndParameters toFieldAndValue(GeneralInsertValuePhraseVisitor visitor, AbstractColumnMapping insertMapping) {
         return insertMapping.accept(visitor);
     }
 

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

@@ -22,14 +22,14 @@
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.select.render.SelectRenderer;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
+import org.mybatis.dynamic.sql.util.ColumnMappingVisitor;
 import org.mybatis.dynamic.sql.util.ConstantMapping;
-import org.mybatis.dynamic.sql.util.GeneralInsertMappingVisitor;
 import org.mybatis.dynamic.sql.util.NullMapping;
 import org.mybatis.dynamic.sql.util.SelectMapping;
 import org.mybatis.dynamic.sql.util.StringConstantMapping;
 import org.mybatis.dynamic.sql.util.ValueMapping;
 
-public class GeneralInsertValuePhraseVisitor implements GeneralInsertMappingVisitor<FieldAndValueAndParameters> {
+public class GeneralInsertValuePhraseVisitor implements ColumnMappingVisitor<FieldAndValueAndParameters> {
 
     protected RenderingStrategy renderingStrategy;
     private AtomicInteger sequence = new AtomicInteger(1);

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

@@ -22,7 +22,7 @@
 
 import org.mybatis.dynamic.sql.insert.InsertModel;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
-import org.mybatis.dynamic.sql.util.InsertMapping;
+import org.mybatis.dynamic.sql.util.AbstractColumnMapping;
 
 public class InsertRenderer<T> {
 
@@ -51,11 +51,11 @@ private String calculateInsertStatement(FieldAndValueCollector collector) {
                 + spaceBefore(collector.valuesPhrase());
     }
 
-    private Function<InsertMapping, FieldAndValue> toFieldAndValue(ValuePhraseVisitor visitor) {
+    private Function<AbstractColumnMapping, FieldAndValue> toFieldAndValue(ValuePhraseVisitor visitor) {
         return insertMapping -> toFieldAndValue(visitor, insertMapping);
     }
 
-    private FieldAndValue toFieldAndValue(ValuePhraseVisitor visitor, InsertMapping insertMapping) {
+    private FieldAndValue toFieldAndValue(ValuePhraseVisitor visitor, AbstractColumnMapping insertMapping) {
         return insertMapping.accept(visitor);
     }