Skip to content

Commit 8fb72d4

Browse files
authored
Merge pull request #520 from hazendaz/master
[ci] Bring forwards some auto formatting
2 parents 4b73213 + b2723a6 commit 8fb72d4

File tree

80 files changed

+337
-256
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+337
-256
lines changed

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

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,11 @@ protected AbstractListValueCondition(Collection<T> values) {
4242
/**
4343
* Construct a new condition with a callback.
4444
*
45-
* @param values values
46-
* @param emptyCallback empty callback
45+
* @param values
46+
* values
47+
* @param emptyCallback
48+
* empty callback
49+
*
4750
* @deprecated in favor of the statement configuration functions
4851
*/
4952
@Deprecated
@@ -105,17 +108,21 @@ protected <R, S extends AbstractListValueCondition<R>> S mapSupport(Function<? s
105108
* Else returns a condition that will not render (this). If all values are filtered out of the value
106109
* list, then the condition will not render.
107110
*
108-
* @param predicate predicate applied to the values, if renderable
109-
* @return a new condition with filtered values if renderable, otherwise a condition
110-
* that will not render.
111+
* @param predicate
112+
* predicate applied to the values, if renderable
113+
*
114+
* @return a new condition with filtered values if renderable, otherwise a condition that will not render.
111115
*/
112116
public abstract AbstractListValueCondition<T> filter(Predicate<? super T> predicate);
113117

114118
/**
115119
* Specifies a callback function to be called if the value list is empty when rendered.
116120
*
117-
* @param callback a callback function - typically throws an exception to block the statement from executing
121+
* @param callback
122+
* a callback function - typically throws an exception to block the statement from executing
123+
*
118124
* @return this condition
125+
*
119126
* @deprecated in favor of the statement configuration functions
120127
*/
121128
@Deprecated

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public <R> R accept(ConditionVisitor<T, R> visitor) {
2525
return visitor.visit(this);
2626
}
2727

28-
protected <S extends AbstractNoValueCondition<?>> S filterSupport(BooleanSupplier booleanSupplier,
28+
protected <S extends AbstractNoValueCondition<?>> S filterSupport(BooleanSupplier booleanSupplier,
2929
Supplier<S> emptySupplier, S self) {
3030
if (shouldRender()) {
3131
return booleanSupplier.getAsBoolean() ? self : emptySupplier.get();

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
* available where an AND or an OR condition is appropriate.
2828
*
2929
* @author Jeff Butler
30+
*
3031
* @since 1.4.0
3132
*/
3233
public class AndOrCriteriaGroup {

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
* are typically not bound.
2626
*
2727
* @author Jeff Butler
28-
*
2928
*/
3029
public interface BasicColumn {
3130

@@ -39,7 +38,9 @@ public interface BasicColumn {
3938
/**
4039
* Returns a new instance of a BasicColumn with the alias set.
4140
*
42-
* @param alias the column alias to set
41+
* @param alias
42+
* the column alias to set
43+
*
4344
* @return new instance with alias set
4445
*/
4546
BasicColumn as(String alias);

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@
2626
*
2727
* @author Jeff Butler
2828
*
29-
* @param <T> - the Java type that corresponds to this column
30-
*/
29+
* @param <T>
30+
* - the Java type that corresponds to this column
31+
*/
3132
public interface BindableColumn<T> extends BasicColumn {
3233

3334
/**

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
* qualifier set in a query. If a table qualifier is required it can be set directly in the
2929
* builder for this class.
3030
*
31-
* @param <T> The Java type that corresponds to this column - not used except for compiler type checking
32-
* for conditions
31+
* @param <T>
32+
* The Java type that corresponds to this column - not used except for compiler type checking for conditions
3333
*/
3434
public class DerivedColumn<T> implements BindableColumn<T> {
3535
private final String name;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
* This class represents a criteria group with a NOT.
2020
*
2121
* @author Jeff Butler
22+
*
2223
* @since 1.4.0
2324
*/
2425
public class NotCriterion extends CriteriaGroup {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
* Defines attributes of columns that are necessary for rendering an order by expression.
2020
*
2121
* @author Jeff Butler
22-
*
2322
*/
2423
public interface SortSpecification {
2524
/**

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

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,9 @@ public interface SqlBuilder {
9797
/**
9898
* Renders as select count(distinct column) from table...
9999
*
100-
* @param column the column to count
100+
* @param column
101+
* the column to count
102+
*
101103
* @return the next step in the DSL
102104
*/
103105
static CountDSL.FromGatherer<SelectModel> countDistinctColumn(BasicColumn column) {
@@ -107,7 +109,9 @@ static CountDSL.FromGatherer<SelectModel> countDistinctColumn(BasicColumn column
107109
/**
108110
* Renders as select count(column) from table...
109111
*
110-
* @param column the column to count
112+
* @param column
113+
* the column to count
114+
*
111115
* @return the next step in the DSL
112116
*/
113117
static CountDSL.FromGatherer<SelectModel> countColumn(BasicColumn column) {
@@ -117,7 +121,9 @@ static CountDSL.FromGatherer<SelectModel> countColumn(BasicColumn column) {
117121
/**
118122
* Renders as select count(*) from table...
119123
*
120-
* @param table the table to count
124+
* @param table
125+
* the table to count
126+
*
121127
* @return the next step in the DSL
122128
*/
123129
static CountDSL<SelectModel> countFrom(SqlTable table) {
@@ -139,8 +145,11 @@ static <T> InsertDSL.IntoGatherer<T> insert(T row) {
139145
/**
140146
* Insert a Batch of records. The model object is structured to support bulk inserts with JDBC batch support.
141147
*
142-
* @param records records to insert
143-
* @param <T> the type of record to insert
148+
* @param records
149+
* records to insert
150+
* @param <T>
151+
* the type of record to insert
152+
*
144153
* @return the next step in the DSL
145154
*/
146155
@SafeVarargs
@@ -151,8 +160,11 @@ static <T> BatchInsertDSL.IntoGatherer<T> insertBatch(T... records) {
151160
/**
152161
* Insert a Batch of records. The model object is structured to support bulk inserts with JDBC batch support.
153162
*
154-
* @param records records to insert
155-
* @param <T> the type of record to insert
163+
* @param records
164+
* records to insert
165+
* @param <T>
166+
* the type of record to insert
167+
*
156168
* @return the next step in the DSL
157169
*/
158170
static <T> BatchInsertDSL.IntoGatherer<T> insertBatch(Collection<T> records) {
@@ -165,9 +177,11 @@ static <T> BatchInsertDSL.IntoGatherer<T> insertBatch(Collection<T> records) {
165177
* for large bulk inserts as it is possible to exceed the limit of parameter markers in a prepared statement.
166178
*
167179
* <p>For large bulk inserts, see {@link SqlBuilder#insertBatch(Object[])}
180+
* @param records
181+
* records to insert
182+
* @param <T>
183+
* the type of record to insert
168184
*
169-
* @param records records to insert
170-
* @param <T> the type of record to insert
171185
* @return the next step in the DSL
172186
*/
173187
@SafeVarargs
@@ -181,9 +195,11 @@ static <T> MultiRowInsertDSL.IntoGatherer<T> insertMultiple(T... records) {
181195
* for large bulk inserts as it is possible to exceed the limit of parameter markers in a prepared statement.
182196
*
183197
* <p>For large bulk inserts, see {@link SqlBuilder#insertBatch(Collection)}
198+
* @param records
199+
* records to insert
200+
* @param <T>
201+
* the type of record to insert
184202
*
185-
* @param records records to insert
186-
* @param <T> the type of record to insert
187203
* @return the next step in the DSL
188204
*/
189205
static <T> MultiRowInsertDSL.IntoGatherer<T> insertMultiple(Collection<T> records) {

src/main/java/org/mybatis/dynamic/sql/exception/DuplicateTableAliasException.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
* a second instance of the SqlTable object to use in the self-join.
2929
*
3030
* @since 1.3.1
31+
*
3132
* @author Jeff Butler
3233
*/
3334
public class DuplicateTableAliasException extends DynamicSqlException {

0 commit comments

Comments
 (0)