Skip to content

Commit

Permalink
Merge pull request #2814 from hazendaz/copyright
Browse files Browse the repository at this point in the history
[ci] Minor formatting adjustments
  • Loading branch information
hazendaz authored Feb 20, 2023
2 parents f35083d + a95a26c commit 3505cc1
Show file tree
Hide file tree
Showing 12 changed files with 77 additions and 18 deletions.
10 changes: 9 additions & 1 deletion src/main/java/org/apache/ibatis/jdbc/AbstractSQL.java
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,15 @@ public boolean isEmpty() {
private static class SQLStatement {

public enum StatementType {
DELETE, INSERT, SELECT, UPDATE

DELETE,

INSERT,

SELECT,

UPDATE

}

private enum LimitingRowsStrategy {
Expand Down
8 changes: 7 additions & 1 deletion src/main/java/org/apache/ibatis/mapping/FetchType.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,11 @@
* @author Eduardo Macarron
*/
public enum FetchType {
LAZY, EAGER, DEFAULT

LAZY,

EAGER,

DEFAULT

}
8 changes: 7 additions & 1 deletion src/main/java/org/apache/ibatis/mapping/ParameterMode.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,11 @@
* @author Clinton Begin
*/
public enum ParameterMode {
IN, OUT, INOUT

IN,

OUT,

INOUT

}
6 changes: 5 additions & 1 deletion src/main/java/org/apache/ibatis/mapping/ResultFlag.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,9 @@
* @author Clinton Begin
*/
public enum ResultFlag {
ID, CONSTRUCTOR

ID,

CONSTRUCTOR

}
14 changes: 13 additions & 1 deletion src/main/java/org/apache/ibatis/mapping/SqlCommandType.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,17 @@
* @author Clinton Begin
*/
public enum SqlCommandType {
UNKNOWN, INSERT, UPDATE, DELETE, SELECT, FLUSH

UNKNOWN,

INSERT,

UPDATE,

DELETE,

SELECT,

FLUSH

}
8 changes: 7 additions & 1 deletion src/main/java/org/apache/ibatis/mapping/StatementType.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,11 @@
* @author Clinton Begin
*/
public enum StatementType {
STATEMENT, PREPARED, CALLABLE

STATEMENT,

PREPARED,

CALLABLE

}
6 changes: 3 additions & 3 deletions src/main/java/org/apache/ibatis/plugin/Intercepts.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
* <b>How to use:</b>
*
* <pre>
* &#064;Intercepts({&#064;Signature(
* type= Executor.class,
* &#064;Intercepts({ &#064;Signature(
* type = Executor.class,
* method = "update",
* args = {MappedStatement.class ,Object.class})})
* args = { MappedStatement.class, Object.class }) })
* public class ExamplePlugin implements Interceptor {
* &#064;Override
* public Object intercept(Invocation invocation) throws Throwable {
Expand Down
8 changes: 7 additions & 1 deletion src/main/java/org/apache/ibatis/session/ExecutorType.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,11 @@
* @author Clinton Begin
*/
public enum ExecutorType {
SIMPLE, REUSE, BATCH

SIMPLE,

REUSE,

BATCH

}
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,11 @@ void shouldSuccessfullyLoadMinimalXMLConfigFile() throws Exception {
}

enum MyEnum {
ONE, TWO

ONE,

TWO

}

public static class EnumOrderTypeHandler<E extends Enum<E>> extends BaseTypeHandler<E> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
*/
package org.apache.ibatis.datasource.pooled;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;

import java.sql.Connection;
import java.sql.SQLException;
Expand All @@ -25,7 +24,8 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;

import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

class PooledDataSourceTest {

Expand Down Expand Up @@ -144,9 +144,8 @@ void forceCloseAllShouldRemoveAllActiveAndIdleConnection() throws SQLException {
}

assertEquals(dataSource.getPoolMaximumActiveConnections() - poolState.getIdleConnectionCount(),
poolState.getActiveConnectionCount());
assertEquals(dataSource.getPoolMaximumIdleConnections(),
poolState.getIdleConnectionCount());
poolState.getActiveConnectionCount());
assertEquals(dataSource.getPoolMaximumIdleConnections(), poolState.getIdleConnectionCount());

dataSource.forceCloseAll();

Expand Down
9 changes: 8 additions & 1 deletion src/test/java/org/apache/ibatis/domain/blog/Section.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,12 @@
import java.io.Serializable;

public enum Section implements Serializable {
NEWS, VIDEOS, IMAGES, PODCASTS
NEWS,

VIDEOS,

IMAGES,

PODCASTS

}
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,5 @@ void ShouldReturnRealConnection() throws Exception {
JDBCConnection realConnection = (JDBCConnection) PooledDataSource.unwrapConnection(c);
c.close();
}

}

0 comments on commit 3505cc1

Please sign in to comment.