Checkstyle updates

Author: jeffgbutler

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

@@ -310,8 +310,8 @@ static <T> Concatenate<T> concatenate(BindableColumn<T> firstColumn, BasicColumn
         return Concatenate.concatenate(firstColumn, secondColumn, subsequentColumns);
     }
 
-    static <T> OperatorFunction<T> applyOperator(String operator, BindableColumn<T> firstColumn, BasicColumn secondColumn,
-            BasicColumn... subsequentColumns) {
+    static <T> OperatorFunction<T> applyOperator(String operator, BindableColumn<T> firstColumn,
+            BasicColumn secondColumn, BasicColumn... subsequentColumns) {
         return OperatorFunction.of(operator, firstColumn, secondColumn, subsequentColumns);
     }
 

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

@@ -36,7 +36,8 @@ private BatchInsertRenderer(Builder<T> builder) {
 
     public BatchInsert<T> render() {
         MultiRowValuePhraseVisitor visitor = new MultiRowValuePhraseVisitor(renderingStrategy, "record"); //$NON-NLS-1$)
-        List<FieldAndValue> fieldsAndValues = model.mapColumnMappings(MultiRowRenderingUtilities.toFieldAndValue(visitor))
+        List<FieldAndValue> fieldsAndValues = model
+                .mapColumnMappings(MultiRowRenderingUtilities.toFieldAndValue(visitor))
                 .collect(Collectors.toList());
 
         return BatchInsert.withRecords(model.records())

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

@@ -36,8 +36,10 @@ private MultiRowInsertRenderer(Builder<T> builder) {
     }
 
     public MultiRowInsertStatementProvider<T> render() {
-        MultiRowValuePhraseVisitor visitor = new MultiRowValuePhraseVisitor(renderingStrategy, "records[%s]"); //$NON-NLS-1$
-        List<FieldAndValue> fieldsAndValues = model.mapColumnMappings(MultiRowRenderingUtilities.toFieldAndValue(visitor))
+        MultiRowValuePhraseVisitor visitor =
+                new MultiRowValuePhraseVisitor(renderingStrategy, "records[%s]"); //$NON-NLS-1$
+        List<FieldAndValue> fieldsAndValues = model
+                .mapColumnMappings(MultiRowRenderingUtilities.toFieldAndValue(visitor))
                 .collect(Collectors.toList());
 
         return new DefaultMultiRowInsertStatementProvider.Builder<T>().withRecords(model.records())

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

@@ -29,7 +29,8 @@ public static Function<AbstractColumnMapping, FieldAndValue> toFieldAndValue(Mul
         return insertMapping -> MultiRowRenderingUtilities.toFieldAndValue(visitor, insertMapping);
     }
 
-    public static FieldAndValue toFieldAndValue(MultiRowValuePhraseVisitor visitor, AbstractColumnMapping insertMapping) {
+    public static FieldAndValue toFieldAndValue(MultiRowValuePhraseVisitor visitor,
+            AbstractColumnMapping insertMapping) {
         return insertMapping.accept(visitor);
     }
 

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

@@ -122,7 +122,7 @@ public FromGatherer(Function<SelectModel, R> adapterFunction, BasicColumn column
         }
 
         public CountDSL<R> from(SqlTable table) {
-            return new CountDSL<> (column, table, adapterFunction);
+            return new CountDSL<>(column, table, adapterFunction);
         }
     }
 

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

@@ -22,6 +22,8 @@
 import org.mybatis.dynamic.sql.BindableColumn;
 
 /**
+ * Represents a database function.
+ * 
  * @deprecated in favor of {@link AbstractUniTypeFunction}
  * 
  * @author Jeff Butler

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

@@ -27,6 +27,8 @@
 import org.mybatis.dynamic.sql.render.TableAliasCalculator;
 
 /**
+ * Represents a function with multiple numeric columns.
+ * 
  * @deprecated in favor of {@link OperatorFunction}.
  * 
  * @author Jeff Butler

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

@@ -80,24 +80,6 @@ public <T> Optional<FragmentAndParameters> visit(ValueWhenPresentMapping<T> mapp
         return mapping.value().flatMap(v -> buildFragment(mapping, v));
     }
 
-    private <T> Optional<FragmentAndParameters> buildFragment(AbstractColumnMapping mapping, T value) {
-        String mapKey = RenderingStrategy.formatParameterMapKey(sequence);
-
-        String jdbcPlaceholder = mapping.mapColumn(toJdbcPlaceholder(mapKey));
-        String setPhrase = mapping.mapColumn(SqlColumn::name)
-                + " = "  //$NON-NLS-1$
-                + jdbcPlaceholder;
-        
-        return FragmentAndParameters.withFragment(setPhrase)
-                .withParameter(mapKey, value)
-                .buildOptional();
-    }
-    
-    private Function<SqlColumn<?>, String> toJdbcPlaceholder(String parameterName) {
-        return column -> column.renderingStrategy().orElse(renderingStrategy)
-                .getFormattedJdbcPlaceholder(column, RenderingStrategy.DEFAULT_PARAMETER_PREFIX, parameterName);
-    }
-
     @Override
     public Optional<FragmentAndParameters> visit(SelectMapping mapping) {
         SelectStatementProvider selectStatement = SelectRenderer.withSelectModel(mapping.selectModel())
@@ -125,4 +107,22 @@ public Optional<FragmentAndParameters> visit(ColumnToColumnMapping mapping) {
         return FragmentAndParameters.withFragment(setPhrase)
                 .buildOptional();
     }
+
+    private <T> Optional<FragmentAndParameters> buildFragment(AbstractColumnMapping mapping, T value) {
+        String mapKey = RenderingStrategy.formatParameterMapKey(sequence);
+
+        String jdbcPlaceholder = mapping.mapColumn(toJdbcPlaceholder(mapKey));
+        String setPhrase = mapping.mapColumn(SqlColumn::name)
+                + " = "  //$NON-NLS-1$
+                + jdbcPlaceholder;
+        
+        return FragmentAndParameters.withFragment(setPhrase)
+                .withParameter(mapKey, value)
+                .buildOptional();
+    }
+    
+    private Function<SqlColumn<?>, String> toJdbcPlaceholder(String parameterName) {
+        return column -> column.renderingStrategy().orElse(renderingStrategy)
+                .getFormattedJdbcPlaceholder(column, RenderingStrategy.DEFAULT_PARAMETER_PREFIX, parameterName);
+    }
 }

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

@@ -60,7 +60,8 @@ public UpdateStatementProvider render() {
 
     private UpdateStatementProvider renderWithWhereClause(List<Optional<FragmentAndParameters>> fragmentsAndParameters,
             WhereClauseProvider whereClause) {
-        return DefaultUpdateStatementProvider.withUpdateStatement(calculateUpdateStatement(fragmentsAndParameters, whereClause))
+        return DefaultUpdateStatementProvider
+                .withUpdateStatement(calculateUpdateStatement(fragmentsAndParameters, whereClause))
                 .withParameters(calculateParameters(fragmentsAndParameters))
                 .withParameters(whereClause.getParameters())
                 .build();
@@ -78,7 +79,8 @@ private String calculateUpdateStatement(List<Optional<FragmentAndParameters>> fr
                 + spaceBefore(calculateSetPhrase(fragmentsAndParameters));
     }
 
-    private UpdateStatementProvider renderWithoutWhereClause(List<Optional<FragmentAndParameters>> fragmentsAndParameters) {
+    private UpdateStatementProvider renderWithoutWhereClause(
+            List<Optional<FragmentAndParameters>> fragmentsAndParameters) {
         return DefaultUpdateStatementProvider.withUpdateStatement(calculateUpdateStatement(fragmentsAndParameters))
                 .withParameters(calculateParameters(fragmentsAndParameters))
                 .build();
@@ -109,7 +111,8 @@ private Optional<WhereClauseProvider> renderWhereClause(WhereModel whereModel) {
                 .render();
     }
 
-    private Function<AbstractColumnMapping, Optional<FragmentAndParameters>> toFragmentAndParameters(SetPhraseVisitor visitor) {
+    private Function<AbstractColumnMapping, Optional<FragmentAndParameters>> toFragmentAndParameters(
+            SetPhraseVisitor visitor) {
         return updateMapping -> toFragmentAndParameters(visitor, updateMapping);
     }
 

src/main/java/org/mybatis/dynamic/sql/util/mybatis3/MyBatis3Utils.java

@@ -66,7 +66,8 @@ public static long countDistinct(ToLongFunction<SelectStatementProvider> mapper,
         return mapper.applyAsLong(countDistinct(column, table, completer));
     }
 
-    public static SelectStatementProvider countDistinct(BasicColumn column, SqlTable table, CountDSLCompleter completer) {
+    public static SelectStatementProvider countDistinct(BasicColumn column, SqlTable table,
+            CountDSLCompleter completer) {
         return countFrom(SqlBuilder.countDistinctColumn(column).from(table), completer);
     }