Cleanup after merges

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionDSL.java

@@ -390,15 +390,15 @@ public R build() {
     public class UnionBuilder {
         public FromGatherer<R> select(BasicColumn...selectList) {
             return new FromGathererBuilder<R>()
-                    .withConnector("union")
+                    .withConnector("union") //$NON-NLS-1$
                     .withSelectList(selectList)
                     .withSelectDSL(selectDSL)
                     .build();
         }
 
         public FromGatherer<R> selectDistinct(BasicColumn...selectList) {
             return new FromGathererBuilder<R>()
-                    .withConnector("union")
+                    .withConnector("union") //$NON-NLS-1$
                     .isDistinct()
                     .withSelectList(selectList)
                     .withSelectDSL(selectDSL)

src/main/java/org/mybatis/dynamic/sql/select/function/Add.java

@@ -42,7 +42,7 @@ public Optional<String> alias() {
     public String renderWithTableAlias(TableAliasCalculator tableAliasCalculator) {
         return columns.stream()
                 .map(column -> column.renderWithTableAlias(tableAliasCalculator))
-                .collect(Collectors.joining(" + "));
+                .collect(Collectors.joining(" + ")); //$NON-NLS-1$
     }
 
     @Override

src/main/java/org/mybatis/dynamic/sql/update/UpdateDSL.java

@@ -134,7 +134,7 @@ public UpdateDSL<R> incrementBy(T value) {
         }
 
         public UpdateDSL<R> incrementBy(Supplier<T> valueSupplier) {
-            columnsAndValues.add(ArithmeticConstantMapping.of(column, ArithmeticOperation.add, valueSupplier));
+            columnsAndValues.add(ArithmeticConstantMapping.of(column, ArithmeticOperation.ADD, valueSupplier));
             return UpdateDSL.this;
         }
 
@@ -143,7 +143,7 @@ public UpdateDSL<R> decrementBy(T value) {
         }
 
         public UpdateDSL<R> decrementBy(Supplier<T> valueSupplier) {
-            columnsAndValues.add(ArithmeticConstantMapping.of(column, ArithmeticOperation.substract, valueSupplier));
+            columnsAndValues.add(ArithmeticConstantMapping.of(column, ArithmeticOperation.SUBTRACT, valueSupplier));
             return UpdateDSL.this;
         }
 
@@ -152,7 +152,7 @@ public UpdateDSL<R> multiplyBy(T value) {
         }
 
         public UpdateDSL<R> multiplyBy(Supplier<T> valueSupplier) {
-            columnsAndValues.add(ArithmeticConstantMapping.of(column, ArithmeticOperation.multiply, valueSupplier));
+            columnsAndValues.add(ArithmeticConstantMapping.of(column, ArithmeticOperation.MULTIPLY, valueSupplier));
             return UpdateDSL.this;
         }
 
@@ -161,7 +161,7 @@ public UpdateDSL<R> divideBy(T value) {
         }
 
         public UpdateDSL<R> divideBy(Supplier<T> valueSupplier) {
-            columnsAndValues.add(ArithmeticConstantMapping.of(column, ArithmeticOperation.divide, valueSupplier));
+            columnsAndValues.add(ArithmeticConstantMapping.of(column, ArithmeticOperation.DIVIDE, valueSupplier));
             return UpdateDSL.this;
         }
     }

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

@@ -75,15 +75,21 @@ public <T> FragmentAndParameters visit(ValueMapping<T> mapping) {
                 .build();
     }
 
-    private Function<SqlColumn<?>, String> toJdbcPlaceholder(String parameterName) {
-        return column -> renderingStrategy
-                .getFormattedJdbcPlaceholder(column, "parameters", parameterName); //$NON-NLS-1$
-    }
-
     @Override
     public <S> FragmentAndParameters visit(ArithmeticConstantMapping<S> mapping) {
-        String fragment = mapping.mapColumn(SqlColumn::name) + " = " + mapping.mapColumn(SqlColumn::name) + " " + mapping.operation().getOperator() + " " + mapping.valueSupplier().get(); //$NON-NLS-1$
+        String fragment = mapping.mapColumn(SqlColumn::name)
+                + " = " //$NON-NLS-1$
+                + mapping.mapColumn(SqlColumn::name)
+                + " " //$NON-NLS-1$
+                + mapping.operation().getOperator()
+                + " " //$NON-NLS-1$
+                + mapping.valueSupplier().get();
         return FragmentAndParameters.withFragment(fragment)
                 .build();
     }
+
+    private Function<SqlColumn<?>, String> toJdbcPlaceholder(String parameterName) {
+        return column -> renderingStrategy
+                .getFormattedJdbcPlaceholder(column, "parameters", parameterName); //$NON-NLS-1$
+    }
 }

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

@@ -15,6 +15,7 @@
  */
 package org.mybatis.dynamic.sql.util;
 
+import java.util.Objects;
 import java.util.function.Supplier;
 
 import org.mybatis.dynamic.sql.SqlColumn;
@@ -25,8 +26,8 @@ public class ArithmeticConstantMapping<T> extends AbstractColumnMapping implemen
 
     private ArithmeticConstantMapping(SqlColumn<?> column, ArithmeticOperation operation, Supplier<T> valueSupplier) {
         super(column);
-        this.operation = operation;
-        this.valueSupplier = valueSupplier;
+        this.operation = Objects.requireNonNull(operation);
+        this.valueSupplier = Objects.requireNonNull(valueSupplier);
     }
 
     public Supplier<T> valueSupplier() {
@@ -37,13 +38,13 @@ public ArithmeticOperation operation() {
         return operation;
     }
 
-    public static <T> ArithmeticConstantMapping<T> of(SqlColumn<?> column, ArithmeticOperation operation, Supplier<T> valueSupplier) {
-        ArithmeticConstantMapping<T> mapping = new ArithmeticConstantMapping<>(column, operation, valueSupplier);
-        return mapping;
-    }
-
     @Override
     public <R> R accept(UpdateMappingVisitor<R> visitor) {
         return visitor.visit(this);
     }
+
+    public static <T> ArithmeticConstantMapping<T> of(SqlColumn<?> column, ArithmeticOperation operation,
+            Supplier<T> valueSupplier) {
+        return new ArithmeticConstantMapping<>(column, operation, valueSupplier);
+    }
 }

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

@@ -16,10 +16,10 @@
 package org.mybatis.dynamic.sql.util;
 
 public enum ArithmeticOperation {
-    add("+"),
-    substract("-"),
-    multiply("*"),
-    divide("/");
+    ADD("+"), //$NON-NLS-1$
+    SUBTRACT("-"), //$NON-NLS-1$
+    MULTIPLY("*"), //$NON-NLS-1$
+    DIVIDE("/"); //$NON-NLS-1$
 
     private String operator;
 

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

@@ -160,7 +160,7 @@ public Builder<T> withTableAliasCalculator(TableAliasCalculator tableAliasCalcul
 
         public Builder<T> withParameterName(String parameterName) {
             parameterPrefix = Optional.ofNullable(parameterName)
-                    .map(pn -> pn + "." + DEFAULT_PARAMETER_PREFIX)
+                    .map(pn -> pn + "." + DEFAULT_PARAMETER_PREFIX) //$NON-NLS-1$
                     .orElse(DEFAULT_PARAMETER_PREFIX);
             return this;
         }