Kotlin Updates per Detekt

jeffgbutler · jeffgbutler · commit 0252054df2bc · 2020-07-28T15:18:15.000-04:00
diff --git a/detekt-config.yml b/detekt-config.yml
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/GroupByModel.java b/src/main/java/org/mybatis/dynamic/sql/select/GroupByModel.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2018 the original author or authors.
+ *    Copyright 2016-2020 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.
@@ -16,7 +16,7 @@
 package org.mybatis.dynamic.sql.select;
 
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Stream;
@@ -26,15 +26,15 @@
 public class GroupByModel {
     private List<BasicColumn> columns = new ArrayList<>();
     
-    private GroupByModel(List<BasicColumn> columns) {
+    private GroupByModel(Collection<BasicColumn> columns) {
         this.columns.addAll(columns);
     }
     
     public <R> Stream<R> mapColumns(Function<BasicColumn, R> mapper) {
         return columns.stream().map(mapper);
     }
     
-    public static GroupByModel of(BasicColumn...columns) {
-        return new GroupByModel(Arrays.asList(columns));
+    public static GroupByModel of(Collection<BasicColumn> columns) {
+        return new GroupByModel(columns);
     }
 }
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/OrderByModel.java b/src/main/java/org/mybatis/dynamic/sql/select/OrderByModel.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2020 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.
@@ -16,7 +16,7 @@
 package org.mybatis.dynamic.sql.select;
 
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Stream;
@@ -26,15 +26,15 @@
 public class OrderByModel {
     private List<SortSpecification> columns = new ArrayList<>();
     
-    private OrderByModel(List<SortSpecification> columns) {
+    private OrderByModel(Collection<SortSpecification> columns) {
         this.columns.addAll(columns);
     }
     
     public <R> Stream<R> mapColumns(Function<SortSpecification, R> mapper) {
         return columns.stream().map(mapper);
     }
     
-    public static OrderByModel of(SortSpecification...columns) {
-        return new OrderByModel(Arrays.asList(columns));
+    public static OrderByModel of(Collection<SortSpecification> columns) {
+        return new OrderByModel(columns);
     }
 }
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionDSL.java b/src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionDSL.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2019 the original author or authors.
+ *    Copyright 2016-2020 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.
@@ -115,11 +115,19 @@ public JoinSpecificationStarter fullJoin(SqlTable joinTable, String tableAlias)
     }
 
     public GroupByFinisher groupBy(BasicColumn...columns) {
+        return groupBy(Arrays.asList(columns));
+    }
+    
+    public GroupByFinisher groupBy(Collection<BasicColumn> columns) {
         groupByModel = GroupByModel.of(columns);
         return new GroupByFinisher();
     }
     
     public SelectDSL<R> orderBy(SortSpecification...columns) {
+        return orderBy(Arrays.asList(columns));
+    }
+
+    public SelectDSL<R> orderBy(Collection<SortSpecification> columns) {
         selectDSL.orderBy(columns);
         return selectDSL;
     }
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/SelectDSL.java b/src/main/java/org/mybatis/dynamic/sql/select/SelectDSL.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2019 the original author or authors.
+ *    Copyright 2016-2020 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.
@@ -138,7 +138,7 @@ QueryExpressionDSL<R> newQueryExpression(FromGatherer<R> fromGatherer, String ta
         return queryExpression;
     }
     
-    void orderBy(SortSpecification...columns) {
+    void orderBy(Collection<SortSpecification> columns) {
         orderByModel = OrderByModel.of(columns);
     }
     
diff --git a/src/main/java/org/mybatis/dynamic/sql/where/AbstractWhereDSL.java b/src/main/java/org/mybatis/dynamic/sql/where/AbstractWhereDSL.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2019 the original author or authors.
+ *    Copyright 2016-2020 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.
diff --git a/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/AbstractQueryExpressionDSLExtensions.kt b/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/AbstractQueryExpressionDSLExtensions.kt
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2019 the original author or authors.
+ *    Copyright 2016-2020 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.
diff --git a/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/AbstractWhereDSLExtensions.kt b/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/AbstractWhereDSLExtensions.kt
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2019 the original author or authors.
+ *    Copyright 2016-2020 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.
diff --git a/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/CriteriaCollector.kt b/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/CriteriaCollector.kt
@@ -27,13 +27,19 @@ class CriteriaCollector {
 
     fun <T> and(column: BindableColumn<T>, condition: VisitableCondition<T>) =
         apply {
-            criteria.add(SqlCriterion.withColumn(column)
-                .withCondition(condition)
-                .withConnector("and")
-                .build())
+            criteria.add(
+                SqlCriterion.withColumn(column)
+                    .withCondition(condition)
+                    .withConnector("and")
+                    .build()
+            )
         }
 
-    fun <T> and(column: BindableColumn<T>, condition: VisitableCondition<T>, collect: CriteriaCollector.() -> CriteriaCollector) =
+    fun <T> and(
+        column: BindableColumn<T>,
+        condition: VisitableCondition<T>,
+        collect: CriteriaCollector.() -> CriteriaCollector
+    ) =
         apply {
             val collector = CriteriaCollector()
             collect(collector)
@@ -47,13 +53,19 @@ class CriteriaCollector {
 
     fun <T> or(column: BindableColumn<T>, condition: VisitableCondition<T>) =
         apply {
-            criteria.add(SqlCriterion.withColumn(column)
-                .withCondition(condition)
-                .withConnector("or")
-                .build())
+            criteria.add(
+                SqlCriterion.withColumn(column)
+                    .withCondition(condition)
+                    .withConnector("or")
+                    .build()
+            )
         }
 
-    fun <T> or(column: BindableColumn<T>, condition: VisitableCondition<T>, collect: CriteriaCollector.() -> CriteriaCollector) =
+    fun <T> or(
+        column: BindableColumn<T>,
+        condition: VisitableCondition<T>,
+        collect: CriteriaCollector.() -> CriteriaCollector
+    ) =
         apply {
             val collector = CriteriaCollector()
             collect(collector)
diff --git a/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/FromGathererExtensions.kt b/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/FromGathererExtensions.kt
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2019 the original author or authors.
+ *    Copyright 2016-2020 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.
@@ -26,5 +26,9 @@ typealias QueryExpressionEnhancer = QueryExpressionDSL<SelectModel>.() -> QueryE
 fun QueryExpressionDSL.FromGatherer<SelectModel>.from(table: SqlTable, enhancer: QueryExpressionEnhancer) =
     enhancer(from(table))
 
-fun QueryExpressionDSL.FromGatherer<SelectModel>.from(table: SqlTable, alias: String, enhancer: QueryExpressionEnhancer) =
+fun QueryExpressionDSL.FromGatherer<SelectModel>.from(
+    table: SqlTable,
+    alias: String,
+    enhancer: QueryExpressionEnhancer
+) =
     enhancer(from(table, alias))
diff --git a/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinBaseBuilders.kt b/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinBaseBuilders.kt
@@ -22,7 +22,8 @@ import org.mybatis.dynamic.sql.select.AbstractQueryExpressionDSL
 import org.mybatis.dynamic.sql.select.SelectModel
 import org.mybatis.dynamic.sql.where.AbstractWhereDSL
 
-@DslMarker annotation class MyBatisDslMarker
+@DslMarker
+annotation class MyBatisDslMarker
 
 @MyBatisDslMarker
 abstract class KotlinBaseBuilder<W : AbstractWhereDSL<W>, B : KotlinBaseBuilder<W, B>> {
@@ -69,9 +70,9 @@ abstract class KotlinBaseBuilder<W : AbstractWhereDSL<W>, B : KotlinBaseBuilder<
     protected abstract fun getWhere(): W
 }
 
-abstract class KotlinBaseJoiningBuilder<T : AbstractQueryExpressionDSL<T, SelectModel>, W : AbstractWhereDSL<W>, B : KotlinBaseJoiningBuilder<T, W, B>>(
-    private val dsl: AbstractQueryExpressionDSL<T, SelectModel>
-) : KotlinBaseBuilder<W, B>() {
+abstract class KotlinBaseJoiningBuilder<T : AbstractQueryExpressionDSL<T, SelectModel>, W : AbstractWhereDSL<W>,
+        B : KotlinBaseJoiningBuilder<T, W, B>>
+    (private val dsl: AbstractQueryExpressionDSL<T, SelectModel>) : KotlinBaseBuilder<W, B>() {
 
     fun join(table: SqlTable, receiver: JoinReceiver): B =
         applySelf {
diff --git a/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinCountBuilder.kt b/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinCountBuilder.kt
@@ -22,11 +22,12 @@ import org.mybatis.dynamic.sql.util.Buildable
 typealias CountCompleter = KotlinCountBuilder.() -> Buildable<SelectModel>
 
 class KotlinCountBuilder(private val dsl: CountDSL<SelectModel>) :
-    KotlinBaseJoiningBuilder<CountDSL<SelectModel>, CountDSL<SelectModel>.CountWhereBuilder, KotlinCountBuilder>(dsl), Buildable<SelectModel> {
+    KotlinBaseJoiningBuilder<CountDSL<SelectModel>, CountDSL<SelectModel>.CountWhereBuilder, KotlinCountBuilder>(dsl),
+    Buildable<SelectModel> {
 
     fun allRows() = this
 
-    override fun  build(): SelectModel = dsl.build()
+    override fun build(): SelectModel = dsl.build()
 
     override fun getWhere(): CountDSL<SelectModel>.CountWhereBuilder = dsl.where()
 
diff --git a/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinQueryBuilder.kt b/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinQueryBuilder.kt
@@ -15,7 +15,8 @@
  */
 package org.mybatis.dynamic.sql.util.kotlin
 
-import org.mybatis.dynamic.sql.*
+import org.mybatis.dynamic.sql.BasicColumn
+import org.mybatis.dynamic.sql.SortSpecification
 import org.mybatis.dynamic.sql.select.QueryExpressionDSL
 import org.mybatis.dynamic.sql.select.SelectDSL
 import org.mybatis.dynamic.sql.select.SelectModel
@@ -24,27 +25,29 @@ import org.mybatis.dynamic.sql.util.Buildable
 typealias SelectCompleter = KotlinQueryBuilder.() -> Buildable<SelectModel>
 
 class KotlinQueryBuilder(private val dsl: QueryExpressionDSL<SelectModel>) :
-    KotlinBaseJoiningBuilder<QueryExpressionDSL<SelectModel>, QueryExpressionDSL<SelectModel>.QueryExpressionWhereBuilder, KotlinQueryBuilder>(dsl), Buildable<SelectModel> {
+    KotlinBaseJoiningBuilder<QueryExpressionDSL<SelectModel>,
+            QueryExpressionDSL<SelectModel>.QueryExpressionWhereBuilder,
+            KotlinQueryBuilder>(dsl), Buildable<SelectModel> {
 
     fun groupBy(vararg columns: BasicColumn) =
-            apply {
-                dsl.groupBy(*columns)
-            }
+        apply {
+            dsl.groupBy(columns.toList())
+        }
 
     fun orderBy(vararg columns: SortSpecification) =
-            apply {
-                dsl.orderBy(*columns)
-            }
+        apply {
+            dsl.orderBy(columns.toList())
+        }
 
     fun limit(limit: Long) =
-            apply {
-                dsl.limit(limit)
-            }
+        apply {
+            dsl.limit(limit)
+        }
 
     fun offset(offset: Long) =
-            apply {
-                dsl.offset(offset)
-            }
+        apply {
+            dsl.offset(offset)
+        }
 
     fun fetchFirst(fetchFirstRows: Long): SelectDSL<SelectModel>.FetchFirstFinisher = dsl.fetchFirst(fetchFirstRows)
 
diff --git a/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinUnionBuilders.kt b/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinUnionBuilders.kt
@@ -44,7 +44,8 @@ class KotlinUnionFromGatherer(private val fromGatherer: QueryExpressionDSL.FromG
 }
 
 class KotlinUnionQueryBuilder(private val unionDsl: QueryExpressionDSL<SelectModel>) :
-    KotlinBaseJoiningBuilder<QueryExpressionDSL<SelectModel>, QueryExpressionDSL<SelectModel>.QueryExpressionWhereBuilder,
+    KotlinBaseJoiningBuilder<QueryExpressionDSL<SelectModel>,
+            QueryExpressionDSL<SelectModel>.QueryExpressionWhereBuilder,
             KotlinUnionQueryBuilder>(unionDsl) {
     fun allRows() = this
 
diff --git a/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinUpdateBuilder.kt b/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinUpdateBuilder.kt
@@ -16,7 +16,12 @@
 package org.mybatis.dynamic.sql.util.kotlin
 
 import org.mybatis.dynamic.sql.SqlColumn
-import org.mybatis.dynamic.sql.insert.*
+import org.mybatis.dynamic.sql.insert.GeneralInsertDSL
+import org.mybatis.dynamic.sql.insert.GeneralInsertModel
+import org.mybatis.dynamic.sql.insert.InsertDSL
+import org.mybatis.dynamic.sql.insert.InsertModel
+import org.mybatis.dynamic.sql.insert.MultiRowInsertDSL
+import org.mybatis.dynamic.sql.insert.MultiRowInsertModel
 import org.mybatis.dynamic.sql.update.UpdateDSL
 import org.mybatis.dynamic.sql.update.UpdateModel
 import org.mybatis.dynamic.sql.util.Buildable
diff --git a/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/mybatis3/MapperSupportFunctions.kt b/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/mybatis3/MapperSupportFunctions.kt
@@ -26,12 +26,23 @@ import org.mybatis.dynamic.sql.select.QueryExpressionDSL
 import org.mybatis.dynamic.sql.select.SelectModel
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider
 import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider
-import org.mybatis.dynamic.sql.util.kotlin.*
+import org.mybatis.dynamic.sql.util.kotlin.CountCompleter
+import org.mybatis.dynamic.sql.util.kotlin.DeleteCompleter
+import org.mybatis.dynamic.sql.util.kotlin.GeneralInsertCompleter
+import org.mybatis.dynamic.sql.util.kotlin.InsertCompleter
+import org.mybatis.dynamic.sql.util.kotlin.MultiRowInsertCompleter
+import org.mybatis.dynamic.sql.util.kotlin.SelectCompleter
+import org.mybatis.dynamic.sql.util.kotlin.UpdateCompleter
 
 fun count(mapper: (SelectStatementProvider) -> Long, column: BasicColumn, table: SqlTable, completer: CountCompleter) =
     mapper(SqlBuilder.countColumn(column).from(table, completer))
 
-fun countDistinct(mapper: (SelectStatementProvider) -> Long, column: BasicColumn, table: SqlTable, completer: CountCompleter) =
+fun countDistinct(
+    mapper: (SelectStatementProvider) -> Long,
+    column: BasicColumn,
+    table: SqlTable,
+    completer: CountCompleter
+) =
     mapper(SqlBuilder.countDistinctColumn(column).from(table, completer))
 
 fun countFrom(mapper: (SelectStatementProvider) -> Long, table: SqlTable, completer: CountCompleter) =
diff --git a/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/mybatis3/ProviderBuilderFunctions.kt b/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/mybatis3/ProviderBuilderFunctions.kt
@@ -24,7 +24,17 @@ import org.mybatis.dynamic.sql.render.RenderingStrategies
 import org.mybatis.dynamic.sql.select.CountDSL
 import org.mybatis.dynamic.sql.select.QueryExpressionDSL
 import org.mybatis.dynamic.sql.select.SelectModel
-import org.mybatis.dynamic.sql.util.kotlin.*
+import org.mybatis.dynamic.sql.util.kotlin.CountCompleter
+import org.mybatis.dynamic.sql.util.kotlin.DeleteCompleter
+import org.mybatis.dynamic.sql.util.kotlin.GeneralInsertCompleter
+import org.mybatis.dynamic.sql.util.kotlin.InsertCompleter
+import org.mybatis.dynamic.sql.util.kotlin.KotlinCountBuilder
+import org.mybatis.dynamic.sql.util.kotlin.KotlinDeleteBuilder
+import org.mybatis.dynamic.sql.util.kotlin.KotlinQueryBuilder
+import org.mybatis.dynamic.sql.util.kotlin.KotlinUpdateBuilder
+import org.mybatis.dynamic.sql.util.kotlin.MultiRowInsertCompleter
+import org.mybatis.dynamic.sql.util.kotlin.SelectCompleter
+import org.mybatis.dynamic.sql.util.kotlin.UpdateCompleter
 
 fun countFrom(table: SqlTable, completer: CountCompleter) =
     completer(KotlinCountBuilder(SqlBuilder.countFrom(table))).build().render(RenderingStrategies.MYBATIS3)
diff --git a/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/spring/NamedParameterJdbcTemplateExtensions.kt b/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/spring/NamedParameterJdbcTemplateExtensions.kt
@@ -24,7 +24,12 @@ import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider
 import org.mybatis.dynamic.sql.select.CountDSL
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider
 import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider
-import org.mybatis.dynamic.sql.util.kotlin.*
+import org.mybatis.dynamic.sql.util.kotlin.CountCompleter
+import org.mybatis.dynamic.sql.util.kotlin.DeleteCompleter
+import org.mybatis.dynamic.sql.util.kotlin.GeneralInsertCompleter
+import org.mybatis.dynamic.sql.util.kotlin.InsertCompleter
+import org.mybatis.dynamic.sql.util.kotlin.SelectCompleter
+import org.mybatis.dynamic.sql.util.kotlin.UpdateCompleter
 import org.springframework.jdbc.core.namedparam.BeanPropertySqlParameterSource
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate
 import java.sql.ResultSet
diff --git a/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/spring/ProviderBuilderFunctions.kt b/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/spring/ProviderBuilderFunctions.kt
@@ -19,13 +19,20 @@ import org.mybatis.dynamic.sql.SqlBuilder
 import org.mybatis.dynamic.sql.SqlTable
 import org.mybatis.dynamic.sql.insert.GeneralInsertDSL
 import org.mybatis.dynamic.sql.insert.InsertDSL
-import org.mybatis.dynamic.sql.insert.render.GeneralInsertStatementProvider
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider
 import org.mybatis.dynamic.sql.render.RenderingStrategies
 import org.mybatis.dynamic.sql.select.CountDSL
 import org.mybatis.dynamic.sql.select.QueryExpressionDSL
 import org.mybatis.dynamic.sql.select.SelectModel
-import org.mybatis.dynamic.sql.util.kotlin.*
+import org.mybatis.dynamic.sql.util.kotlin.CountCompleter
+import org.mybatis.dynamic.sql.util.kotlin.DeleteCompleter
+import org.mybatis.dynamic.sql.util.kotlin.GeneralInsertCompleter
+import org.mybatis.dynamic.sql.util.kotlin.InsertCompleter
+import org.mybatis.dynamic.sql.util.kotlin.KotlinCountBuilder
+import org.mybatis.dynamic.sql.util.kotlin.KotlinDeleteBuilder
+import org.mybatis.dynamic.sql.util.kotlin.KotlinQueryBuilder
+import org.mybatis.dynamic.sql.util.kotlin.KotlinUpdateBuilder
+import org.mybatis.dynamic.sql.util.kotlin.SelectCompleter
+import org.mybatis.dynamic.sql.util.kotlin.UpdateCompleter
 
 fun countFrom(table: SqlTable, completer: CountCompleter) =
     completer(KotlinCountBuilder(SqlBuilder.countFrom(table))).build()

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/**`
`2`		`- * Copyright 2016-2018 the original author or authors.`
	`2`	`+ * Copyright 2016-2020 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -16,7 +16,7 @@`
`16`	`16`	`package org.mybatis.dynamic.sql.select;`
`17`	`17`
`18`	`18`	`import java.util.ArrayList;`
`19`		`-import java.util.Arrays;`
	`19`	`+import java.util.Collection;`
`20`	`20`	`import java.util.List;`
`21`	`21`	`import java.util.function.Function;`
`22`	`22`	`import java.util.stream.Stream;`
`@@ -26,15 +26,15 @@`
`26`	`26`	`public class GroupByModel {`
`27`	`27`	`private List<BasicColumn> columns = new ArrayList<>();`
`28`	`28`
`29`		`- private GroupByModel(List<BasicColumn> columns) {`
	`29`	`+ private GroupByModel(Collection<BasicColumn> columns) {`
`30`	`30`	`this.columns.addAll(columns);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public <R> Stream<R> mapColumns(Function<BasicColumn, R> mapper) {`
`34`	`34`	`return columns.stream().map(mapper);`
`35`	`35`	`}`
`36`	`36`
`37`		`- public static GroupByModel of(BasicColumn...columns) {`
`38`		`- return new GroupByModel(Arrays.asList(columns));`
	`37`	`+ public static GroupByModel of(Collection<BasicColumn> columns) {`
	`38`	`+ return new GroupByModel(columns);`
`39`	`39`	`}`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/**`
`2`		`- * Copyright 2016-2017 the original author or authors.`
	`2`	`+ * Copyright 2016-2020 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -16,7 +16,7 @@`
`16`	`16`	`package org.mybatis.dynamic.sql.select;`
`17`	`17`
`18`	`18`	`import java.util.ArrayList;`
`19`		`-import java.util.Arrays;`
	`19`	`+import java.util.Collection;`
`20`	`20`	`import java.util.List;`
`21`	`21`	`import java.util.function.Function;`
`22`	`22`	`import java.util.stream.Stream;`
`@@ -26,15 +26,15 @@`
`26`	`26`	`public class OrderByModel {`
`27`	`27`	`private List<SortSpecification> columns = new ArrayList<>();`
`28`	`28`
`29`		`- private OrderByModel(List<SortSpecification> columns) {`
	`29`	`+ private OrderByModel(Collection<SortSpecification> columns) {`
`30`	`30`	`this.columns.addAll(columns);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public <R> Stream<R> mapColumns(Function<SortSpecification, R> mapper) {`
`34`	`34`	`return columns.stream().map(mapper);`
`35`	`35`	`}`
`36`	`36`
`37`		`- public static OrderByModel of(SortSpecification...columns) {`
`38`		`- return new OrderByModel(Arrays.asList(columns));`
	`37`	`+ public static OrderByModel of(Collection<SortSpecification> columns) {`
	`38`	`+ return new OrderByModel(columns);`
`39`	`39`	`}`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/**`
`2`		`- * Copyright 2016-2019 the original author or authors.`
	`2`	`+ * Copyright 2016-2020 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -115,11 +115,19 @@ public JoinSpecificationStarter fullJoin(SqlTable joinTable, String tableAlias)`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`public GroupByFinisher groupBy(BasicColumn...columns) {`
	`118`	`+ return groupBy(Arrays.asList(columns));`
	`119`	`+ }`
	`120`	`+`
	`121`	`+ public GroupByFinisher groupBy(Collection<BasicColumn> columns) {`
`118`	`122`	`groupByModel = GroupByModel.of(columns);`
`119`	`123`	`return new GroupByFinisher();`
`120`	`124`	`}`
`121`	`125`
`122`	`126`	`public SelectDSL<R> orderBy(SortSpecification...columns) {`
	`127`	`+ return orderBy(Arrays.asList(columns));`
	`128`	`+ }`
	`129`	`+`
	`130`	`+ public SelectDSL<R> orderBy(Collection<SortSpecification> columns) {`
`123`	`131`	`selectDSL.orderBy(columns);`
`124`	`132`	`return selectDSL;`
`125`	`133`	`}`