Skip to content

Commit 3505cc1

Browse files
authored
Merge pull request #2814 from hazendaz/copyright
[ci] Minor formatting adjustments
2 parents f35083d + a95a26c commit 3505cc1

File tree

12 files changed

+77
-18
lines changed

12 files changed

+77
-18
lines changed

src/main/java/org/apache/ibatis/jdbc/AbstractSQL.java

+9-1
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,15 @@ public boolean isEmpty() {
563563
private static class SQLStatement {
564564

565565
public enum StatementType {
566-
DELETE, INSERT, SELECT, UPDATE
566+
567+
DELETE,
568+
569+
INSERT,
570+
571+
SELECT,
572+
573+
UPDATE
574+
567575
}
568576

569577
private enum LimitingRowsStrategy {

src/main/java/org/apache/ibatis/mapping/FetchType.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,11 @@
1919
* @author Eduardo Macarron
2020
*/
2121
public enum FetchType {
22-
LAZY, EAGER, DEFAULT
22+
23+
LAZY,
24+
25+
EAGER,
26+
27+
DEFAULT
28+
2329
}

src/main/java/org/apache/ibatis/mapping/ParameterMode.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,11 @@
1919
* @author Clinton Begin
2020
*/
2121
public enum ParameterMode {
22-
IN, OUT, INOUT
22+
23+
IN,
24+
25+
OUT,
26+
27+
INOUT
28+
2329
}

src/main/java/org/apache/ibatis/mapping/ResultFlag.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,9 @@
1919
* @author Clinton Begin
2020
*/
2121
public enum ResultFlag {
22-
ID, CONSTRUCTOR
22+
23+
ID,
24+
25+
CONSTRUCTOR
26+
2327
}

src/main/java/org/apache/ibatis/mapping/SqlCommandType.java

+13-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,17 @@
1919
* @author Clinton Begin
2020
*/
2121
public enum SqlCommandType {
22-
UNKNOWN, INSERT, UPDATE, DELETE, SELECT, FLUSH
22+
23+
UNKNOWN,
24+
25+
INSERT,
26+
27+
UPDATE,
28+
29+
DELETE,
30+
31+
SELECT,
32+
33+
FLUSH
34+
2335
}

src/main/java/org/apache/ibatis/mapping/StatementType.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,11 @@
1919
* @author Clinton Begin
2020
*/
2121
public enum StatementType {
22-
STATEMENT, PREPARED, CALLABLE
22+
23+
STATEMENT,
24+
25+
PREPARED,
26+
27+
CALLABLE
28+
2329
}

src/main/java/org/apache/ibatis/plugin/Intercepts.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
* <b>How to use:</b>
2929
*
3030
* <pre>
31-
* &#064;Intercepts({&#064;Signature(
32-
* type= Executor.class,
31+
* &#064;Intercepts({ &#064;Signature(
32+
* type = Executor.class,
3333
* method = "update",
34-
* args = {MappedStatement.class ,Object.class})})
34+
* args = { MappedStatement.class, Object.class }) })
3535
* public class ExamplePlugin implements Interceptor {
3636
* &#064;Override
3737
* public Object intercept(Invocation invocation) throws Throwable {

src/main/java/org/apache/ibatis/session/ExecutorType.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,11 @@
1919
* @author Clinton Begin
2020
*/
2121
public enum ExecutorType {
22-
SIMPLE, REUSE, BATCH
22+
23+
SIMPLE,
24+
25+
REUSE,
26+
27+
BATCH
28+
2329
}

src/test/java/org/apache/ibatis/builder/XmlConfigBuilderTest.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,11 @@ void shouldSuccessfullyLoadMinimalXMLConfigFile() throws Exception {
114114
}
115115

116116
enum MyEnum {
117-
ONE, TWO
117+
118+
ONE,
119+
120+
TWO
121+
118122
}
119123

120124
public static class EnumOrderTypeHandler<E extends Enum<E>> extends BaseTypeHandler<E> {

src/test/java/org/apache/ibatis/datasource/pooled/PooledDataSourceTest.java

+5-6
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
*/
1616
package org.apache.ibatis.datasource.pooled;
1717

18-
import org.junit.jupiter.api.BeforeEach;
19-
import org.junit.jupiter.api.Test;
18+
import static org.junit.jupiter.api.Assertions.*;
2019

2120
import java.sql.Connection;
2221
import java.sql.SQLException;
@@ -25,7 +24,8 @@
2524
import java.util.concurrent.CountDownLatch;
2625
import java.util.concurrent.TimeUnit;
2726

28-
import static org.junit.jupiter.api.Assertions.*;
27+
import org.junit.jupiter.api.BeforeEach;
28+
import org.junit.jupiter.api.Test;
2929

3030
class PooledDataSourceTest {
3131

@@ -144,9 +144,8 @@ void forceCloseAllShouldRemoveAllActiveAndIdleConnection() throws SQLException {
144144
}
145145

146146
assertEquals(dataSource.getPoolMaximumActiveConnections() - poolState.getIdleConnectionCount(),
147-
poolState.getActiveConnectionCount());
148-
assertEquals(dataSource.getPoolMaximumIdleConnections(),
149-
poolState.getIdleConnectionCount());
147+
poolState.getActiveConnectionCount());
148+
assertEquals(dataSource.getPoolMaximumIdleConnections(), poolState.getIdleConnectionCount());
150149

151150
dataSource.forceCloseAll();
152151

src/test/java/org/apache/ibatis/domain/blog/Section.java

+8-1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,12 @@
1818
import java.io.Serializable;
1919

2020
public enum Section implements Serializable {
21-
NEWS, VIDEOS, IMAGES, PODCASTS
21+
NEWS,
22+
23+
VIDEOS,
24+
25+
IMAGES,
26+
27+
PODCASTS
28+
2229
}

src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,5 @@ void ShouldReturnRealConnection() throws Exception {
8585
JDBCConnection realConnection = (JDBCConnection) PooledDataSource.unwrapConnection(c);
8686
c.close();
8787
}
88+
8889
}

0 commit comments

Comments
 (0)