Mappings don't need to be generic

That was a too big solution for a small problem

Author: jeffgbutler

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

@@ -29,15 +29,15 @@
 public abstract class AbstractMultiRowInsertModel<T> {
     private SqlTable table;
     private List<T> records;
-    private List<AbstractColumnMapping<?>> 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<AbstractColumnMapping<?>, 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<AbstractColumnMapping<?>> 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<AbstractColumnMapping<?>> columnMappings) {
+        public S withColumnMappings(List<AbstractColumnMapping> columnMappings) {
             this.columnMappings.addAll(columnMappings);
             return getThis();
         }

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

@@ -33,7 +33,7 @@ public class BatchInsertDSL<T> implements Buildable<BatchInsertModel<T>> {
 
     private Collection<T> records;
     private SqlTable table;
-    private List<AbstractColumnMapping<?>> 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

@@ -31,7 +31,7 @@
 import org.mybatis.dynamic.sql.util.ValueWhenPresentMapping;
 
 public class GeneralInsertDSL implements Buildable<GeneralInsertModel> {
-    private List<AbstractColumnMapping<?>> 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

@@ -31,14 +31,14 @@
 public class GeneralInsertModel {
 
     private SqlTable table;
-    private List<AbstractColumnMapping<?>> insertMappings;
+    private List<AbstractColumnMapping> insertMappings;
 
     private GeneralInsertModel(Builder builder) {
         table = Objects.requireNonNull(builder.table);
         insertMappings = builder.insertMappings;
     }
 
-    public <R> Stream<R> mapColumnMappings(Function<AbstractColumnMapping<?>, R> mapper) {
+    public <R> Stream<R> mapColumnMappings(Function<AbstractColumnMapping, R> mapper) {
         return insertMappings.stream().map(mapper);
     }
 
@@ -56,14 +56,14 @@ public GeneralInsertStatementProvider render(RenderingStrategy renderingStrategy
 
     public static class Builder {
         private SqlTable table;
-        private List<AbstractColumnMapping<?>> insertMappings = new ArrayList<>();
+        private List<AbstractColumnMapping> insertMappings = new ArrayList<>();
 
         public Builder withTable(SqlTable table) {
             this.table = table;
             return this;
         }
 
-        public Builder withInsertMappings(List<AbstractColumnMapping<?>> insertMappings) {
+        public Builder withInsertMappings(List<AbstractColumnMapping> insertMappings) {
             this.insertMappings.addAll(insertMappings);
             return this;
         }

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

@@ -33,7 +33,7 @@ public class InsertDSL<T> implements Buildable<InsertModel<T>> {
 
     private T record;
     private SqlTable table;
-    private List<AbstractColumnMapping<?>> 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

@@ -31,15 +31,15 @@
 public class InsertModel<T> {
     private SqlTable table;
     private T record;
-    private List<AbstractColumnMapping<?>> 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<AbstractColumnMapping<?>, R> mapper) {
+    public <R> Stream<R> mapColumnMappings(Function<AbstractColumnMapping, R> mapper) {
         return columnMappings.stream().map(mapper);
     }
 
@@ -66,7 +66,7 @@ public static <T> Builder<T> withRecord(T record) {
     public static class Builder<T> {
         private SqlTable table;
         private T record;
-        private List<AbstractColumnMapping<?>> columnMappings = new ArrayList<>();
+        private List<AbstractColumnMapping> columnMappings = new ArrayList<>();
 
         public Builder<T> withTable(SqlTable table) {
             this.table = table;
@@ -78,7 +78,7 @@ public Builder<T> withRecord(T record) {
             return this;
         }
 
-        public Builder<T> withColumnMappings(List<AbstractColumnMapping<?>> columnMappings) {
+        public Builder<T> withColumnMappings(List<AbstractColumnMapping> columnMappings) {
             this.columnMappings.addAll(columnMappings);
             return this;
         }

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

@@ -33,7 +33,7 @@ public class MultiRowInsertDSL<T> implements Buildable<MultiRowInsertModel<T>> {
 
     private Collection<T> records;
     private SqlTable table;
-    private List<AbstractColumnMapping<?>> 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/AbstractMultiRowValuePhraseVisitor.java

@@ -36,28 +36,28 @@ public AbstractMultiRowValuePhraseVisitor(RenderingStrategy renderingStrategy, S
     }
 
     @Override
-    public <T> FieldAndValue visit(NullMapping<T> mapping) {
+    public FieldAndValue visit(NullMapping mapping) {
         return FieldAndValue.withFieldName(mapping.mapColumn(SqlColumn::name))
                 .withValuePhrase("null") //$NON-NLS-1$
                 .build();
     }
 
     @Override
-    public <T> FieldAndValue visit(ConstantMapping<T> mapping) {
+    public FieldAndValue visit(ConstantMapping mapping) {
         return FieldAndValue.withFieldName(mapping.mapColumn(SqlColumn::name))
                 .withValuePhrase(mapping.constant())
                 .build();
     }
 
     @Override
-    public <T> FieldAndValue visit(StringConstantMapping<T> mapping) {
+    public FieldAndValue visit(StringConstantMapping mapping) {
         return FieldAndValue.withFieldName(mapping.mapColumn(SqlColumn::name))
                 .withValuePhrase("'" + mapping.constant() + "'") //$NON-NLS-1$ //$NON-NLS-2$
                 .build();
     }
 
     @Override
-    public <T> FieldAndValue visit(PropertyMapping<T> mapping) {
+    public FieldAndValue visit(PropertyMapping mapping) {
         return FieldAndValue.withFieldName(mapping.mapColumn(SqlColumn::name))
                 .withValuePhrase(mapping.mapColumn(toJdbcPlaceholder(mapping.property())))
                 .build();

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

@@ -56,13 +56,13 @@ private String calculateInsertStatement(List<Optional<FieldAndValueAndParameters
                 + spaceBefore(calculateValuesPhrase(fieldsAndValues));
     }
 
-    private Function<AbstractColumnMapping<?>, Optional<FieldAndValueAndParameters>> toFieldAndValue(
+    private Function<AbstractColumnMapping, Optional<FieldAndValueAndParameters>> toFieldAndValue(
             GeneralInsertValuePhraseVisitor visitor) {
         return insertMapping -> toFieldAndValue(visitor, insertMapping);
     }
 
-    private <T> Optional<FieldAndValueAndParameters> toFieldAndValue(GeneralInsertValuePhraseVisitor visitor,
-            AbstractColumnMapping<T> insertMapping) {
+    private Optional<FieldAndValueAndParameters> toFieldAndValue(GeneralInsertValuePhraseVisitor visitor,
+            AbstractColumnMapping insertMapping) {
         return insertMapping.accept(visitor);
     }
 

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

@@ -39,21 +39,21 @@ public GeneralInsertValuePhraseVisitor(RenderingStrategy renderingStrategy) {
     }
 
     @Override
-    public <T> Optional<FieldAndValueAndParameters> visit(NullMapping<T> mapping) {
+    public Optional<FieldAndValueAndParameters> visit(NullMapping mapping) {
         return FieldAndValueAndParameters.withFieldName(mapping.mapColumn(SqlColumn::name))
                 .withValuePhrase("null") //$NON-NLS-1$
                 .buildOptional();
     }
 
     @Override
-    public <T> Optional<FieldAndValueAndParameters> visit(ConstantMapping<T> mapping) {
+    public Optional<FieldAndValueAndParameters> visit(ConstantMapping mapping) {
         return FieldAndValueAndParameters.withFieldName(mapping.mapColumn(SqlColumn::name))
                 .withValuePhrase(mapping.constant())
                 .buildOptional();
     }
 
     @Override
-    public <T> Optional<FieldAndValueAndParameters> visit(StringConstantMapping<T> mapping) {
+    public Optional<FieldAndValueAndParameters> visit(StringConstantMapping mapping) {
         return FieldAndValueAndParameters.withFieldName(mapping.mapColumn(SqlColumn::name))
                 .withValuePhrase("'" + mapping.constant() + "'") //$NON-NLS-1$ //$NON-NLS-2$
                 .buildOptional();
@@ -69,12 +69,12 @@ public <T> Optional<FieldAndValueAndParameters> visit(ValueWhenPresentMapping<T>
         return mapping.value().flatMap(v -> buildValueFragment(mapping, v));
     }
 
-    private <T> Optional<FieldAndValueAndParameters> buildValueFragment(AbstractColumnMapping<T> mapping,
+    private Optional<FieldAndValueAndParameters> buildValueFragment(AbstractColumnMapping mapping,
             Object value) {
         return buildFragment(mapping, value);
     }
 
-    private <T> Optional<FieldAndValueAndParameters> buildFragment(AbstractColumnMapping<T> mapping, Object value) {
+    private Optional<FieldAndValueAndParameters> buildFragment(AbstractColumnMapping mapping, Object value) {
         String mapKey = RenderingStrategy.formatParameterMapKey(sequence);
 
         String jdbcPlaceholder = mapping.mapColumn(toJdbcPlaceholder(mapKey));