Naming consistency

jeffgbutler · jeffgbutler · commit 9750b55d8041 · 2018-01-19T09:36:05.000-05:00
diff --git a/src/main/java/org/mybatis/dynamic/sql/update/UpdateDSL.java b/src/main/java/org/mybatis/dynamic/sql/update/UpdateDSL.java
@@ -42,7 +42,7 @@
 public class UpdateDSL<R> {
 
     private Function<UpdateModel, R> adapterFunction;
-    private List<UpdateMapping> columnsAndValues = new ArrayList<>();
+    private List<UpdateMapping> columnMappings = new ArrayList<>();
     private SqlTable table;
     
     private UpdateDSL(SqlTable table, Function<UpdateModel, R> adapterFunction) {
@@ -71,7 +71,7 @@ public <T> UpdateWhereBuilder where(BindableColumn<T> column, VisitableCondition
      */
     public R build() {
         UpdateModel updateModel = UpdateModel.withTable(table)
-                .withColumnValues(columnsAndValues)
+                .withColumnMappings(columnMappings)
                 .build();
         return adapterFunction.apply(updateModel);
     }
@@ -98,17 +98,17 @@ public SetClauseFinisher(SqlColumn<T> column) {
         }
         
         public UpdateDSL<R> equalToNull() {
-            columnsAndValues.add(NullMapping.of(column));
+            columnMappings.add(NullMapping.of(column));
             return UpdateDSL.this;
         }
 
         public UpdateDSL<R> equalToConstant(String constant) {
-            columnsAndValues.add(ConstantMapping.of(column, constant));
+            columnMappings.add(ConstantMapping.of(column, constant));
             return UpdateDSL.this;
         }
         
         public UpdateDSL<R> equalToStringConstant(String constant) {
-            columnsAndValues.add(StringConstantMapping.of(column, constant));
+            columnMappings.add(StringConstantMapping.of(column, constant));
             return UpdateDSL.this;
         }
         
@@ -117,12 +117,12 @@ public UpdateDSL<R> equalTo(T value) {
         }
 
         public UpdateDSL<R> equalTo(Supplier<T> valueSupplier) {
-            columnsAndValues.add(ValueMapping.of(column, valueSupplier));
+            columnMappings.add(ValueMapping.of(column, valueSupplier));
             return UpdateDSL.this;
         }
 
         public UpdateDSL<R> equalTo(Buildable<SelectModel> buildable) {
-            columnsAndValues.add(SelectMapping.of(column, buildable));
+            columnMappings.add(SelectMapping.of(column, buildable));
             return UpdateDSL.this;
         }
 
@@ -132,7 +132,7 @@ public UpdateDSL<R> equalToWhenPresent(T value) {
 
         public UpdateDSL<R> equalToWhenPresent(Supplier<T> valueSupplier) {
             if (valueSupplier.get() != null) {
-                columnsAndValues.add(ValueMapping.of(column, valueSupplier));
+                columnMappings.add(ValueMapping.of(column, valueSupplier));
             }
             return UpdateDSL.this;
         }
@@ -142,7 +142,7 @@ public UpdateDSL<R> incrementBy(T value) {
         }
         
         public UpdateDSL<R> incrementBy(Supplier<T> valueSupplier) {
-            columnsAndValues.add(ArithmeticConstantMapping.of(column, ArithmeticOperation.ADD, valueSupplier));
+            columnMappings.add(ArithmeticConstantMapping.of(column, ArithmeticOperation.ADD, valueSupplier));
             return UpdateDSL.this;
         }
         
@@ -151,7 +151,7 @@ public UpdateDSL<R> decrementBy(T value) {
         }
         
         public UpdateDSL<R> decrementBy(Supplier<T> valueSupplier) {
-            columnsAndValues.add(ArithmeticConstantMapping.of(column, ArithmeticOperation.SUBTRACT, valueSupplier));
+            columnMappings.add(ArithmeticConstantMapping.of(column, ArithmeticOperation.SUBTRACT, valueSupplier));
             return UpdateDSL.this;
         }
         
@@ -160,7 +160,7 @@ public UpdateDSL<R> multiplyBy(T value) {
         }
         
         public UpdateDSL<R> multiplyBy(Supplier<T> valueSupplier) {
-            columnsAndValues.add(ArithmeticConstantMapping.of(column, ArithmeticOperation.MULTIPLY, valueSupplier));
+            columnMappings.add(ArithmeticConstantMapping.of(column, ArithmeticOperation.MULTIPLY, valueSupplier));
             return UpdateDSL.this;
         }
         
@@ -169,7 +169,7 @@ public UpdateDSL<R> divideBy(T value) {
         }
         
         public UpdateDSL<R> divideBy(Supplier<T> valueSupplier) {
-            columnsAndValues.add(ArithmeticConstantMapping.of(column, ArithmeticOperation.DIVIDE, valueSupplier));
+            columnMappings.add(ArithmeticConstantMapping.of(column, ArithmeticOperation.DIVIDE, valueSupplier));
             return UpdateDSL.this;
         }
     }
@@ -187,7 +187,7 @@ public <T> UpdateWhereBuilder(BindableColumn<T> column, VisitableCondition<T> co
         
         public R build() {
             UpdateModel updateModel = UpdateModel.withTable(table)
-                    .withColumnValues(columnsAndValues)
+                    .withColumnMappings(columnMappings)
                     .withWhereModel(buildWhereModel())
                     .build();
             return adapterFunction.apply(updateModel);
diff --git a/src/main/java/org/mybatis/dynamic/sql/update/UpdateModel.java b/src/main/java/org/mybatis/dynamic/sql/update/UpdateModel.java
@@ -32,12 +32,12 @@
 public class UpdateModel {
     private SqlTable table;
     private WhereModel whereModel;
-    private List<UpdateMapping> columnValues;
+    private List<UpdateMapping> columnMappings;
     
     private UpdateModel(Builder builder) {
         table = Objects.requireNonNull(builder.table);
         whereModel = builder.whereModel;
-        columnValues = Objects.requireNonNull(builder.columnValues);
+        columnMappings = Objects.requireNonNull(builder.columnMappings);
     }
     
     public SqlTable table() {
@@ -48,8 +48,8 @@ public Optional<WhereModel> whereModel() {
         return Optional.ofNullable(whereModel);
     }
     
-    public <R> Stream<R> mapColumnValues(Function<UpdateMapping, R> mapper) {
-        return columnValues.stream().map(mapper);
+    public <R> Stream<R> mapColumnMappings(Function<UpdateMapping, R> mapper) {
+        return columnMappings.stream().map(mapper);
     }
     
     public UpdateStatementProvider render(RenderingStrategy renderingStrategy) {
@@ -66,15 +66,15 @@ public static Builder withTable(SqlTable table) {
     public static class Builder {
         private SqlTable table;
         private WhereModel whereModel;
-        private List<UpdateMapping> columnValues = new ArrayList<>();
+        private List<UpdateMapping> columnMappings = new ArrayList<>();
         
         public Builder withTable(SqlTable table) {
             this.table = table;
             return this;
         }
         
-        public Builder withColumnValues(List<UpdateMapping> columnValues) {
-            this.columnValues.addAll(columnValues);
+        public Builder withColumnMappings(List<UpdateMapping> columnMappings) {
+            this.columnMappings.addAll(columnMappings);
             return this;
         }
         
diff --git a/src/main/java/org/mybatis/dynamic/sql/update/render/UpdateRenderer.java b/src/main/java/org/mybatis/dynamic/sql/update/render/UpdateRenderer.java
@@ -43,7 +43,7 @@ private UpdateRenderer(Builder builder) {
     public UpdateStatementProvider render() {
         SetPhraseVisitor visitor = new SetPhraseVisitor(sequence, renderingStrategy);
 
-        FragmentCollector fc = updateModel.mapColumnValues(toFragmentAndParameters(visitor))
+        FragmentCollector fc = updateModel.mapColumnMappings(toFragmentAndParameters(visitor))
                 .collect(FragmentCollector.collect());
         
         return UpdateStatementProvider.withTableName(updateModel.table().name())

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`public class UpdateDSL<R> {`
`43`	`43`
`44`	`44`	`private Function<UpdateModel, R> adapterFunction;`
`45`		`- private List<UpdateMapping> columnsAndValues = new ArrayList<>();`
	`45`	`+ private List<UpdateMapping> columnMappings = new ArrayList<>();`
`46`	`46`	`private SqlTable table;`
`47`	`47`
`48`	`48`	`private UpdateDSL(SqlTable table, Function<UpdateModel, R> adapterFunction) {`
`@@ -71,7 +71,7 @@ public <T> UpdateWhereBuilder where(BindableColumn<T> column, VisitableCondition`
`71`	`71`	`*/`
`72`	`72`	`public R build() {`
`73`	`73`	`UpdateModel updateModel = UpdateModel.withTable(table)`
`74`		`- .withColumnValues(columnsAndValues)`
	`74`	`+ .withColumnMappings(columnMappings)`
`75`	`75`	`.build();`
`76`	`76`	`return adapterFunction.apply(updateModel);`
`77`	`77`	`}`
`@@ -98,17 +98,17 @@ public SetClauseFinisher(SqlColumn<T> column) {`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`public UpdateDSL<R> equalToNull() {`
`101`		`- columnsAndValues.add(NullMapping.of(column));`
	`101`	`+ columnMappings.add(NullMapping.of(column));`
`102`	`102`	`return UpdateDSL.this;`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`public UpdateDSL<R> equalToConstant(String constant) {`
`106`		`- columnsAndValues.add(ConstantMapping.of(column, constant));`
	`106`	`+ columnMappings.add(ConstantMapping.of(column, constant));`
`107`	`107`	`return UpdateDSL.this;`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`public UpdateDSL<R> equalToStringConstant(String constant) {`
`111`		`- columnsAndValues.add(StringConstantMapping.of(column, constant));`
	`111`	`+ columnMappings.add(StringConstantMapping.of(column, constant));`
`112`	`112`	`return UpdateDSL.this;`
`113`	`113`	`}`
`114`	`114`
`@@ -117,12 +117,12 @@ public UpdateDSL<R> equalTo(T value) {`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`public UpdateDSL<R> equalTo(Supplier<T> valueSupplier) {`
`120`		`- columnsAndValues.add(ValueMapping.of(column, valueSupplier));`
	`120`	`+ columnMappings.add(ValueMapping.of(column, valueSupplier));`
`121`	`121`	`return UpdateDSL.this;`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`public UpdateDSL<R> equalTo(Buildable<SelectModel> buildable) {`
`125`		`- columnsAndValues.add(SelectMapping.of(column, buildable));`
	`125`	`+ columnMappings.add(SelectMapping.of(column, buildable));`
`126`	`126`	`return UpdateDSL.this;`
`127`	`127`	`}`
`128`	`128`
`@@ -132,7 +132,7 @@ public UpdateDSL<R> equalToWhenPresent(T value) {`
`132`	`132`
`133`	`133`	`public UpdateDSL<R> equalToWhenPresent(Supplier<T> valueSupplier) {`
`134`	`134`	`if (valueSupplier.get() != null) {`
`135`		`- columnsAndValues.add(ValueMapping.of(column, valueSupplier));`
	`135`	`+ columnMappings.add(ValueMapping.of(column, valueSupplier));`
`136`	`136`	`}`
`137`	`137`	`return UpdateDSL.this;`
`138`	`138`	`}`
`@@ -142,7 +142,7 @@ public UpdateDSL<R> incrementBy(T value) {`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`public UpdateDSL<R> incrementBy(Supplier<T> valueSupplier) {`
`145`		`- columnsAndValues.add(ArithmeticConstantMapping.of(column, ArithmeticOperation.ADD, valueSupplier));`
	`145`	`+ columnMappings.add(ArithmeticConstantMapping.of(column, ArithmeticOperation.ADD, valueSupplier));`
`146`	`146`	`return UpdateDSL.this;`
`147`	`147`	`}`
`148`	`148`
`@@ -151,7 +151,7 @@ public UpdateDSL<R> decrementBy(T value) {`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`public UpdateDSL<R> decrementBy(Supplier<T> valueSupplier) {`
`154`		`- columnsAndValues.add(ArithmeticConstantMapping.of(column, ArithmeticOperation.SUBTRACT, valueSupplier));`
	`154`	`+ columnMappings.add(ArithmeticConstantMapping.of(column, ArithmeticOperation.SUBTRACT, valueSupplier));`
`155`	`155`	`return UpdateDSL.this;`
`156`	`156`	`}`
`157`	`157`
`@@ -160,7 +160,7 @@ public UpdateDSL<R> multiplyBy(T value) {`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`public UpdateDSL<R> multiplyBy(Supplier<T> valueSupplier) {`
`163`		`- columnsAndValues.add(ArithmeticConstantMapping.of(column, ArithmeticOperation.MULTIPLY, valueSupplier));`
	`163`	`+ columnMappings.add(ArithmeticConstantMapping.of(column, ArithmeticOperation.MULTIPLY, valueSupplier));`
`164`	`164`	`return UpdateDSL.this;`
`165`	`165`	`}`
`166`	`166`
`@@ -169,7 +169,7 @@ public UpdateDSL<R> divideBy(T value) {`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`public UpdateDSL<R> divideBy(Supplier<T> valueSupplier) {`
`172`		`- columnsAndValues.add(ArithmeticConstantMapping.of(column, ArithmeticOperation.DIVIDE, valueSupplier));`
	`172`	`+ columnMappings.add(ArithmeticConstantMapping.of(column, ArithmeticOperation.DIVIDE, valueSupplier));`
`173`	`173`	`return UpdateDSL.this;`
`174`	`174`	`}`
`175`	`175`	`}`
`@@ -187,7 +187,7 @@ public <T> UpdateWhereBuilder(BindableColumn<T> column, VisitableCondition<T> co`
`187`	`187`
`188`	`188`	`public R build() {`
`189`	`189`	`UpdateModel updateModel = UpdateModel.withTable(table)`
`190`		`- .withColumnValues(columnsAndValues)`
	`190`	`+ .withColumnMappings(columnMappings)`
`191`	`191`	`.withWhereModel(buildWhereModel())`
`192`	`192`	`.build();`
`193`	`193`	`return adapterFunction.apply(updateModel);`