diff --git a/src/main/java/org/mybatis/dynamic/sql/SqlBuilder.java b/src/main/java/org/mybatis/dynamic/sql/SqlBuilder.java index 53851e2af..4ed0de186 100644 --- a/src/main/java/org/mybatis/dynamic/sql/SqlBuilder.java +++ b/src/main/java/org/mybatis/dynamic/sql/SqlBuilder.java @@ -217,7 +217,7 @@ static FromGatherer select(BasicColumn... selectList) { return SelectDSL.select(selectList); } - static FromGatherer select(Collection selectList) { + static FromGatherer select(Collection selectList) { return SelectDSL.select(selectList); } @@ -225,7 +225,7 @@ static FromGatherer selectDistinct(BasicColumn... selectList) { return SelectDSL.selectDistinct(selectList); } - static FromGatherer selectDistinct(Collection selectList) { + static FromGatherer selectDistinct(Collection selectList) { return SelectDSL.selectDistinct(selectList); } diff --git a/src/main/java/org/mybatis/dynamic/sql/common/OrderByModel.java b/src/main/java/org/mybatis/dynamic/sql/common/OrderByModel.java index d185177da..54cc8d6f2 100644 --- a/src/main/java/org/mybatis/dynamic/sql/common/OrderByModel.java +++ b/src/main/java/org/mybatis/dynamic/sql/common/OrderByModel.java @@ -29,7 +29,7 @@ public class OrderByModel { private final List columns = new ArrayList<>(); - private OrderByModel(Collection columns) { + private OrderByModel(Collection columns) { Objects.requireNonNull(columns); if (columns.isEmpty()) { throw new InvalidSqlException(Messages.getString("ERROR.12")); //$NON-NLS-1$ @@ -41,7 +41,7 @@ public Stream mapColumns(Function mapper) { return columns.stream().map(mapper); } - public static OrderByModel of(Collection columns) { + public static OrderByModel of(Collection columns) { return new OrderByModel(columns); } } diff --git a/src/main/java/org/mybatis/dynamic/sql/delete/DeleteDSL.java b/src/main/java/org/mybatis/dynamic/sql/delete/DeleteDSL.java index d0b54e8bd..e405eccc3 100644 --- a/src/main/java/org/mybatis/dynamic/sql/delete/DeleteDSL.java +++ b/src/main/java/org/mybatis/dynamic/sql/delete/DeleteDSL.java @@ -65,7 +65,7 @@ public DeleteDSL orderBy(SortSpecification... columns) { return orderBy(Arrays.asList(columns)); } - public DeleteDSL orderBy(Collection columns) { + public DeleteDSL orderBy(Collection columns) { orderByModel = OrderByModel.of(columns); return this; } @@ -123,7 +123,7 @@ public DeleteDSL orderBy(SortSpecification... columns) { return orderBy(Arrays.asList(columns)); } - public DeleteDSL orderBy(Collection columns) { + public DeleteDSL orderBy(Collection columns) { orderByModel = OrderByModel.of(columns); return DeleteDSL.this; } diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/BatchInsertDSL.java b/src/main/java/org/mybatis/dynamic/sql/insert/BatchInsertDSL.java index c192726a1..219209e79 100644 --- a/src/main/java/org/mybatis/dynamic/sql/insert/BatchInsertDSL.java +++ b/src/main/java/org/mybatis/dynamic/sql/insert/BatchInsertDSL.java @@ -126,7 +126,7 @@ public B withTable(SqlTable table) { return getThis(); } - public B withColumnMappings(Collection columnMappings) { + public B withColumnMappings(Collection columnMappings) { this.columnMappings.addAll(columnMappings); return getThis(); } diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/GeneralInsertDSL.java b/src/main/java/org/mybatis/dynamic/sql/insert/GeneralInsertDSL.java index ada907189..6619dc084 100644 --- a/src/main/java/org/mybatis/dynamic/sql/insert/GeneralInsertDSL.java +++ b/src/main/java/org/mybatis/dynamic/sql/insert/GeneralInsertDSL.java @@ -119,7 +119,7 @@ public Builder withTable(SqlTable table) { return this; } - public Builder withColumnMappings(Collection columnMappings) { + public Builder withColumnMappings(Collection columnMappings) { this.columnMappings.addAll(columnMappings); return this; } diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/GeneralInsertModel.java b/src/main/java/org/mybatis/dynamic/sql/insert/GeneralInsertModel.java index 9366cdc3e..2a504da2a 100644 --- a/src/main/java/org/mybatis/dynamic/sql/insert/GeneralInsertModel.java +++ b/src/main/java/org/mybatis/dynamic/sql/insert/GeneralInsertModel.java @@ -68,7 +68,7 @@ public Builder withTable(SqlTable table) { return this; } - public Builder withInsertMappings(List insertMappings) { + public Builder withInsertMappings(List insertMappings) { this.insertMappings.addAll(insertMappings); return this; } diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/InsertDSL.java b/src/main/java/org/mybatis/dynamic/sql/insert/InsertDSL.java index 9ffe01351..24f638424 100644 --- a/src/main/java/org/mybatis/dynamic/sql/insert/InsertDSL.java +++ b/src/main/java/org/mybatis/dynamic/sql/insert/InsertDSL.java @@ -127,7 +127,7 @@ public Builder withTable(SqlTable table) { return this; } - public Builder withColumnMappings(Collection columnMappings) { + public Builder withColumnMappings(Collection columnMappings) { this.columnMappings.addAll(columnMappings); return this; } diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/InsertModel.java b/src/main/java/org/mybatis/dynamic/sql/insert/InsertModel.java index 16fab7a6f..cb229aefa 100644 --- a/src/main/java/org/mybatis/dynamic/sql/insert/InsertModel.java +++ b/src/main/java/org/mybatis/dynamic/sql/insert/InsertModel.java @@ -83,7 +83,7 @@ public Builder withRow(T row) { return this; } - public Builder withColumnMappings(List columnMappings) { + public Builder withColumnMappings(List columnMappings) { this.columnMappings.addAll(columnMappings); return this; } diff --git a/src/main/java/org/mybatis/dynamic/sql/select/GroupByModel.java b/src/main/java/org/mybatis/dynamic/sql/select/GroupByModel.java index 2aa700804..3781f023e 100644 --- a/src/main/java/org/mybatis/dynamic/sql/select/GroupByModel.java +++ b/src/main/java/org/mybatis/dynamic/sql/select/GroupByModel.java @@ -29,7 +29,7 @@ public class GroupByModel { private final List columns = new ArrayList<>(); - private GroupByModel(Collection columns) { + private GroupByModel(Collection columns) { Objects.requireNonNull(columns); if (columns.isEmpty()) { throw new InvalidSqlException(Messages.getString("ERROR.11")); //$NON-NLS-1$ @@ -41,7 +41,7 @@ public Stream mapColumns(Function mapper) { return columns.stream().map(mapper); } - public static GroupByModel of(Collection columns) { + public static GroupByModel of(Collection columns) { return new GroupByModel(columns); } } diff --git a/src/main/java/org/mybatis/dynamic/sql/select/MultiSelectDSL.java b/src/main/java/org/mybatis/dynamic/sql/select/MultiSelectDSL.java index 3ab4bf88b..2f03fedf8 100644 --- a/src/main/java/org/mybatis/dynamic/sql/select/MultiSelectDSL.java +++ b/src/main/java/org/mybatis/dynamic/sql/select/MultiSelectDSL.java @@ -51,7 +51,7 @@ public MultiSelectDSL orderBy(SortSpecification... columns) { return orderBy(Arrays.asList(columns)); } - public MultiSelectDSL orderBy(Collection columns) { + public MultiSelectDSL orderBy(Collection columns) { orderByModel = OrderByModel.of(columns); return this; } diff --git a/src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionDSL.java b/src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionDSL.java index 15c07e2ba..422f915f2 100644 --- a/src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionDSL.java +++ b/src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionDSL.java @@ -162,7 +162,7 @@ public GroupByFinisher groupBy(BasicColumn... columns) { return groupBy(Arrays.asList(columns)); } - public GroupByFinisher groupBy(Collection columns) { + public GroupByFinisher groupBy(Collection columns) { groupByModel = GroupByModel.of(columns); return new GroupByFinisher(); } @@ -171,7 +171,7 @@ public SelectDSL orderBy(SortSpecification... columns) { return orderBy(Arrays.asList(columns)); } - public SelectDSL orderBy(Collection columns) { + public SelectDSL orderBy(Collection columns) { selectDSL.orderBy(columns); return selectDSL; } @@ -261,7 +261,7 @@ public Builder withConnector(String connector) { return this; } - public Builder withSelectList(Collection selectList) { + public Builder withSelectList(Collection selectList) { this.selectList.addAll(selectList); return this; } @@ -300,7 +300,7 @@ public SelectDSL orderBy(SortSpecification... columns) { return orderBy(Arrays.asList(columns)); } - public SelectDSL orderBy(Collection columns) { + public SelectDSL orderBy(Collection columns) { return QueryExpressionDSL.this.orderBy(columns); } @@ -308,7 +308,7 @@ public GroupByFinisher groupBy(BasicColumn... columns) { return groupBy(Arrays.asList(columns)); } - public GroupByFinisher groupBy(Collection columns) { + public GroupByFinisher groupBy(Collection columns) { return QueryExpressionDSL.this.groupBy(columns); } @@ -474,7 +474,7 @@ public GroupByFinisher groupBy(BasicColumn... columns) { return groupBy(Arrays.asList(columns)); } - public GroupByFinisher groupBy(Collection columns) { + public GroupByFinisher groupBy(Collection columns) { return QueryExpressionDSL.this.groupBy(columns); } @@ -490,7 +490,7 @@ public SelectDSL orderBy(SortSpecification... columns) { return orderBy(Arrays.asList(columns)); } - public SelectDSL orderBy(Collection columns) { + public SelectDSL orderBy(Collection columns) { return QueryExpressionDSL.this.orderBy(columns); } @@ -512,7 +512,7 @@ public SelectDSL orderBy(SortSpecification... columns) { return orderBy(Arrays.asList(columns)); } - public SelectDSL orderBy(Collection columns) { + public SelectDSL orderBy(Collection columns) { return QueryExpressionDSL.this.orderBy(columns); } @@ -600,7 +600,7 @@ public SelectDSL orderBy(SortSpecification... columns) { return orderBy(Arrays.asList(columns)); } - public SelectDSL orderBy(Collection columns) { + public SelectDSL orderBy(Collection columns) { return QueryExpressionDSL.this.orderBy(columns); } diff --git a/src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionModel.java b/src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionModel.java index 10e1e044a..f1e27d7ee 100644 --- a/src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionModel.java +++ b/src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionModel.java @@ -95,7 +95,7 @@ public Optional havingModel() { return Optional.ofNullable(havingModel); } - public static Builder withSelectList(List columnList) { + public static Builder withSelectList(List columnList) { return new Builder().withSelectList(columnList); } @@ -130,7 +130,7 @@ public Builder withSelectColumn(BasicColumn selectColumn) { return this; } - public Builder withSelectList(List selectList) { + public Builder withSelectList(List selectList) { this.selectList.addAll(selectList); return this; } diff --git a/src/main/java/org/mybatis/dynamic/sql/select/SelectDSL.java b/src/main/java/org/mybatis/dynamic/sql/select/SelectDSL.java index 7e75b27fc..08f62d1f1 100644 --- a/src/main/java/org/mybatis/dynamic/sql/select/SelectDSL.java +++ b/src/main/java/org/mybatis/dynamic/sql/select/SelectDSL.java @@ -58,7 +58,7 @@ public static QueryExpressionDSL.FromGatherer select(BasicColumn... return select(Arrays.asList(selectList)); } - public static QueryExpressionDSL.FromGatherer select(Collection selectList) { + public static QueryExpressionDSL.FromGatherer select(Collection selectList) { return select(Function.identity(), selectList); } @@ -68,7 +68,7 @@ public static QueryExpressionDSL.FromGatherer select(Function QueryExpressionDSL.FromGatherer select(Function adapterFunction, - Collection selectList) { + Collection selectList) { return new FromGatherer.Builder() .withSelectList(selectList) .withSelectDSL(new SelectDSL<>(adapterFunction)) @@ -79,7 +79,7 @@ public static QueryExpressionDSL.FromGatherer selectDistinct(BasicC return selectDistinct(Function.identity(), selectList); } - public static QueryExpressionDSL.FromGatherer selectDistinct(Collection selectList) { + public static QueryExpressionDSL.FromGatherer selectDistinct(Collection selectList) { return selectDistinct(Function.identity(), selectList); } @@ -89,7 +89,7 @@ public static QueryExpressionDSL.FromGatherer selectDistinct(Function QueryExpressionDSL.FromGatherer selectDistinct(Function adapterFunction, - Collection selectList) { + Collection selectList) { return new FromGatherer.Builder() .withSelectList(selectList) .withSelectDSL(new SelectDSL<>(adapterFunction)) @@ -101,7 +101,7 @@ void registerQueryExpression(QueryExpressionDSL queryExpression) { queryExpressions.add(queryExpression); } - void orderBy(Collection columns) { + void orderBy(Collection columns) { orderByModel = OrderByModel.of(columns); } diff --git a/src/main/java/org/mybatis/dynamic/sql/update/UpdateDSL.java b/src/main/java/org/mybatis/dynamic/sql/update/UpdateDSL.java index 524de9f87..f9a855d2a 100644 --- a/src/main/java/org/mybatis/dynamic/sql/update/UpdateDSL.java +++ b/src/main/java/org/mybatis/dynamic/sql/update/UpdateDSL.java @@ -86,7 +86,7 @@ public UpdateDSL orderBy(SortSpecification... columns) { return orderBy(Arrays.asList(columns)); } - public UpdateDSL orderBy(Collection columns) { + public UpdateDSL orderBy(Collection columns) { orderByModel = OrderByModel.of(columns); return this; } @@ -206,7 +206,7 @@ public UpdateDSL orderBy(SortSpecification... columns) { return orderBy(Arrays.asList(columns)); } - public UpdateDSL orderBy(Collection columns) { + public UpdateDSL orderBy(Collection columns) { orderByModel = OrderByModel.of(columns); return UpdateDSL.this; } diff --git a/src/main/java/org/mybatis/dynamic/sql/update/UpdateModel.java b/src/main/java/org/mybatis/dynamic/sql/update/UpdateModel.java index b676b2c12..e12db1dea 100644 --- a/src/main/java/org/mybatis/dynamic/sql/update/UpdateModel.java +++ b/src/main/java/org/mybatis/dynamic/sql/update/UpdateModel.java @@ -94,7 +94,7 @@ public static Builder withTable(SqlTable table) { public static class Builder extends CommonBuilder { private final List columnMappings = new ArrayList<>(); - public Builder withColumnMappings(List columnMappings) { + public Builder withColumnMappings(List columnMappings) { this.columnMappings.addAll(columnMappings); return this; }