Skip to content

Commit 8c563b3

Browse files
hazendazhazendaz
authored
Merge pull request #2792 from hazendaz/formatting
[ci] Formatting
2 parents 55cfb7d + 1b3c414 commit 8c563b3

File tree

76 files changed

+1100
-884
lines changed

Some content is hidden

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

76 files changed

+1100
-884
lines changed

‎src/main/java/org/apache/ibatis/annotations/UpdateProvider.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,9 @@
7575

7676
/**
7777
* Specify a method for providing an SQL.
78-
*
7978
* <p>
80-
* Since 3.5.1, this attribute can omit.
81-
* If this attribute omit, the MyBatis will call a method that decide by following rules.
79+
* Since 3.5.1, this attribute can omit. If this attribute omit, the MyBatis will call a method that decide by
80+
* following rules.
8281
* <ul>
8382
* <li>
8483
* If class that specified the {@link #type()} attribute implements the

‎src/main/java/org/apache/ibatis/builder/xml/XMLStatementBuilder.java‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ public XMLStatementBuilder(Configuration configuration, MapperBuilderAssistant b
4747
this(configuration, builderAssistant, context, null);
4848
}
4949

50-
public XMLStatementBuilder(Configuration configuration, MapperBuilderAssistant builderAssistant, XNode context, String databaseId) {
50+
public XMLStatementBuilder(Configuration configuration, MapperBuilderAssistant builderAssistant, XNode context,
51+
String databaseId) {
5152
super(configuration);
5253
this.builderAssistant = builderAssistant;
5354
this.context = context;
@@ -91,11 +92,12 @@ public void parseStatementNode() {
9192
} else {
9293
keyGenerator = context.getBooleanAttribute("useGeneratedKeys",
9394
configuration.isUseGeneratedKeys() && SqlCommandType.INSERT.equals(sqlCommandType))
94-
? Jdbc3KeyGenerator.INSTANCE : NoKeyGenerator.INSTANCE;
95+
? Jdbc3KeyGenerator.INSTANCE : NoKeyGenerator.INSTANCE;
9596
}
9697

9798
SqlSource sqlSource = langDriver.createSqlSource(configuration, context, parameterTypeClass);
98-
StatementType statementType = StatementType.valueOf(context.getStringAttribute("statementType", StatementType.PREPARED.toString()));
99+
StatementType statementType = StatementType
100+
.valueOf(context.getStringAttribute("statementType", StatementType.PREPARED.toString()));
99101
Integer fetchSize = context.getIntAttribute("fetchSize");
100102
Integer timeout = context.getIntAttribute("timeout");
101103
String parameterMap = context.getStringAttribute("parameterMap");
@@ -115,9 +117,8 @@ public void parseStatementNode() {
115117
String resultSets = context.getStringAttribute("resultSets");
116118
boolean dirtySelect = context.getBooleanAttribute("affectData", Boolean.FALSE);
117119

118-
builderAssistant.addMappedStatement(id, sqlSource, statementType, sqlCommandType,
119-
fetchSize, timeout, parameterMap, parameterTypeClass, resultMap, resultTypeClass,
120-
resultSetTypeEnum, flushCache, useCache, resultOrdered,
120+
builderAssistant.addMappedStatement(id, sqlSource, statementType, sqlCommandType, fetchSize, timeout, parameterMap,
121+
parameterTypeClass, resultMap, resultTypeClass, resultSetTypeEnum, flushCache, useCache, resultOrdered,
121122
keyGenerator, keyProperty, keyColumn, databaseId, langDriver, resultSets, dirtySelect);
122123
}
123124

@@ -130,7 +131,8 @@ private void processSelectKeyNodes(String id, Class<?> parameterTypeClass, Langu
130131
removeSelectKeyNodes(selectKeyNodes);
131132
}
132133

133-
private void parseSelectKeyNodes(String parentId, List<XNode> list, Class<?> parameterTypeClass, LanguageDriver langDriver, String skRequiredDatabaseId) {
134+
private void parseSelectKeyNodes(String parentId, List<XNode> list, Class<?> parameterTypeClass,
135+
LanguageDriver langDriver, String skRequiredDatabaseId) {
134136
for (XNode nodeToHandle : list) {
135137
String id = parentId + SelectKeyGenerator.SELECT_KEY_SUFFIX;
136138
String databaseId = nodeToHandle.getStringAttribute("databaseId");
@@ -140,10 +142,12 @@ private void parseSelectKeyNodes(String parentId, List<XNode> list, Class<?> par
140142
}
141143
}
142144

143-
private void parseSelectKeyNode(String id, XNode nodeToHandle, Class<?> parameterTypeClass, LanguageDriver langDriver, String databaseId) {
145+
private void parseSelectKeyNode(String id, XNode nodeToHandle, Class<?> parameterTypeClass, LanguageDriver langDriver,
146+
String databaseId) {
144147
String resultType = nodeToHandle.getStringAttribute("resultType");
145148
Class<?> resultTypeClass = resolveClass(resultType);
146-
StatementType statementType = StatementType.valueOf(nodeToHandle.getStringAttribute("statementType", StatementType.PREPARED.toString()));
149+
StatementType statementType = StatementType
150+
.valueOf(nodeToHandle.getStringAttribute("statementType", StatementType.PREPARED.toString()));
147151
String keyProperty = nodeToHandle.getStringAttribute("keyProperty");
148152
String keyColumn = nodeToHandle.getStringAttribute("keyColumn");
149153
boolean executeBefore = "BEFORE".equals(nodeToHandle.getStringAttribute("order", "AFTER"));
@@ -162,9 +166,8 @@ private void parseSelectKeyNode(String id, XNode nodeToHandle, Class<?> paramete
162166
SqlSource sqlSource = langDriver.createSqlSource(configuration, nodeToHandle, parameterTypeClass);
163167
SqlCommandType sqlCommandType = SqlCommandType.SELECT;
164168

165-
builderAssistant.addMappedStatement(id, sqlSource, statementType, sqlCommandType,
166-
fetchSize, timeout, parameterMap, parameterTypeClass, resultMap, resultTypeClass,
167-
resultSetTypeEnum, flushCache, useCache, resultOrdered,
169+
builderAssistant.addMappedStatement(id, sqlSource, statementType, sqlCommandType, fetchSize, timeout, parameterMap,
170+
parameterTypeClass, resultMap, resultTypeClass, resultSetTypeEnum, flushCache, useCache, resultOrdered,
168171
keyGenerator, keyProperty, keyColumn, databaseId, langDriver, null, false);
169172

170173
id = builderAssistant.applyCurrentNamespace(id, false);

‎src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSource.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ public UnpooledDataSource(String driver, String url, Properties driverProperties
7575
this.driverProperties = driverProperties;
7676
}
7777

78-
public UnpooledDataSource(ClassLoader driverClassLoader, String driver, String url, String username, String password) {
78+
public UnpooledDataSource(ClassLoader driverClassLoader, String driver, String url, String username,
79+
String password) {
7980
this.driverClassLoader = driverClassLoader;
8081
this.driver = driver;
8182
this.url = url;
@@ -196,7 +197,8 @@ public Integer getDefaultNetworkTimeout() {
196197
}
197198

198199
/**
199-
* Sets the default network timeout value to wait for the database operation to complete. See {@link Connection#setNetworkTimeout(java.util.concurrent.Executor, int)}
200+
* Sets the default network timeout value to wait for the database operation to complete. See
201+
* {@link Connection#setNetworkTimeout(java.util.concurrent.Executor, int)}
200202
*
201203
* @param defaultNetworkTimeout
202204
* The time in milliseconds to wait for the database operation to complete.

‎src/main/java/org/apache/ibatis/executor/BaseExecutor.java‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -130,15 +130,17 @@ public List<BatchResult> flushStatements(boolean isRollBack) throws SQLException
130130
}
131131

132132
@Override
133-
public <E> List<E> query(MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler) throws SQLException {
133+
public <E> List<E> query(MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler)
134+
throws SQLException {
134135
BoundSql boundSql = ms.getBoundSql(parameter);
135136
CacheKey key = createCacheKey(ms, parameter, rowBounds, boundSql);
136137
return query(ms, parameter, rowBounds, resultHandler, key, boundSql);
137138
}
138139

139140
@SuppressWarnings("unchecked")
140141
@Override
141-
public <E> List<E> query(MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, CacheKey key, BoundSql boundSql) throws SQLException {
142+
public <E> List<E> query(MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler,
143+
CacheKey key, BoundSql boundSql) throws SQLException {
142144
ErrorContext.instance().resource(ms.getResource()).activity("executing a query").object(ms.getId());
143145
if (closed) {
144146
throw new ExecutorException("Executor was closed.");
@@ -179,7 +181,8 @@ public <E> Cursor<E> queryCursor(MappedStatement ms, Object parameter, RowBounds
179181
}
180182

181183
@Override
182-
public void deferLoad(MappedStatement ms, MetaObject resultObject, String property, CacheKey key, Class<?> targetType) {
184+
public void deferLoad(MappedStatement ms, MetaObject resultObject, String property, CacheKey key,
185+
Class<?> targetType) {
183186
if (closed) {
184187
throw new ExecutorException("Executor was closed.");
185188
}
@@ -271,11 +274,11 @@ public void clearLocalCache() {
271274

272275
protected abstract List<BatchResult> doFlushStatements(boolean isRollback) throws SQLException;
273276

274-
protected abstract <E> List<E> doQuery(MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql)
275-
throws SQLException;
277+
protected abstract <E> List<E> doQuery(MappedStatement ms, Object parameter, RowBounds rowBounds,
278+
ResultHandler resultHandler, BoundSql boundSql) throws SQLException;
276279

277-
protected abstract <E> Cursor<E> doQueryCursor(MappedStatement ms, Object parameter, RowBounds rowBounds, BoundSql boundSql)
278-
throws SQLException;
280+
protected abstract <E> Cursor<E> doQueryCursor(MappedStatement ms, Object parameter, RowBounds rowBounds,
281+
BoundSql boundSql) throws SQLException;
279282

280283
protected void closeStatement(Statement statement) {
281284
if (statement != null) {
@@ -304,7 +307,8 @@ protected void applyTransactionTimeout(Statement statement) throws SQLException
304307
StatementUtil.applyTransactionTimeout(statement, statement.getQueryTimeout(), transaction.getTimeout());
305308
}
306309

307-
private void handleLocallyCachedOutputParameters(MappedStatement ms, CacheKey key, Object parameter, BoundSql boundSql) {
310+
private void handleLocallyCachedOutputParameters(MappedStatement ms, CacheKey key, Object parameter,
311+
BoundSql boundSql) {
308312
if (ms.getStatementType() == StatementType.CALLABLE) {
309313
final Object cachedParameter = localOutputParameterCache.getObject(key);
310314
if (cachedParameter != null && parameter != null) {
@@ -321,7 +325,8 @@ private void handleLocallyCachedOutputParameters(MappedStatement ms, CacheKey ke
321325
}
322326
}
323327

324-
private <E> List<E> queryFromDatabase(MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, CacheKey key, BoundSql boundSql) throws SQLException {
328+
private <E> List<E> queryFromDatabase(MappedStatement ms, Object parameter, RowBounds rowBounds,
329+
ResultHandler resultHandler, CacheKey key, BoundSql boundSql) throws SQLException {
325330
List<E> list;
326331
localCache.putObject(key, EXECUTION_PLACEHOLDER);
327332
try {

‎src/main/java/org/apache/ibatis/executor/BatchExecutor.java‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ public BatchExecutor(Configuration configuration, Transaction transaction) {
5454
@Override
5555
public int doUpdate(MappedStatement ms, Object parameterObject) throws SQLException {
5656
final Configuration configuration = ms.getConfiguration();
57-
final StatementHandler handler = configuration.newStatementHandler(this, ms, parameterObject, RowBounds.DEFAULT, null, null);
57+
final StatementHandler handler = configuration.newStatementHandler(this, ms, parameterObject, RowBounds.DEFAULT,
58+
null, null);
5859
final BoundSql boundSql = handler.getBoundSql();
5960
final String sql = boundSql.getSql();
6061
final Statement stmt;
@@ -79,13 +80,14 @@ public int doUpdate(MappedStatement ms, Object parameterObject) throws SQLExcept
7980
}
8081

8182
@Override
82-
public <E> List<E> doQuery(MappedStatement ms, Object parameterObject, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql)
83-
throws SQLException {
83+
public <E> List<E> doQuery(MappedStatement ms, Object parameterObject, RowBounds rowBounds,
84+
ResultHandler resultHandler, BoundSql boundSql) throws SQLException {
8485
Statement stmt = null;
8586
try {
8687
flushStatements();
8788
Configuration configuration = ms.getConfiguration();
88-
StatementHandler handler = configuration.newStatementHandler(wrapper, ms, parameterObject, rowBounds, resultHandler, boundSql);
89+
StatementHandler handler = configuration.newStatementHandler(wrapper, ms, parameterObject, rowBounds,
90+
resultHandler, boundSql);
8991
Connection connection = getConnection(ms.getStatementLog());
9092
stmt = handler.prepare(connection, transaction.getTimeout());
9193
handler.parameterize(stmt);
@@ -96,7 +98,8 @@ public <E> List<E> doQuery(MappedStatement ms, Object parameterObject, RowBounds
9698
}
9799

98100
@Override
99-
protected <E> Cursor<E> doQueryCursor(MappedStatement ms, Object parameter, RowBounds rowBounds, BoundSql boundSql) throws SQLException {
101+
protected <E> Cursor<E> doQueryCursor(MappedStatement ms, Object parameter, RowBounds rowBounds, BoundSql boundSql)
102+
throws SQLException {
100103
flushStatements();
101104
Configuration configuration = ms.getConfiguration();
102105
StatementHandler handler = configuration.newStatementHandler(wrapper, ms, parameter, rowBounds, null, boundSql);
@@ -127,7 +130,7 @@ public List<BatchResult> doFlushStatements(boolean isRollback) throws SQLExcepti
127130
if (Jdbc3KeyGenerator.class.equals(keyGenerator.getClass())) {
128131
Jdbc3KeyGenerator jdbc3KeyGenerator = (Jdbc3KeyGenerator) keyGenerator;
129132
jdbc3KeyGenerator.processBatch(ms, stmt, parameterObjects);
130-
} else if (!NoKeyGenerator.class.equals(keyGenerator.getClass())) { //issue #141
133+
} else if (!NoKeyGenerator.class.equals(keyGenerator.getClass())) { // issue #141
131134
for (Object parameter : parameterObjects) {
132135
keyGenerator.processAfter(this, ms, stmt, parameter);
133136
}

‎src/main/java/org/apache/ibatis/executor/BatchExecutorException.java‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2022 the original author or authors.
2+
* Copyright 2009-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,10 +19,9 @@
1919
import java.util.List;
2020

2121
/**
22-
* This exception is thrown if a <code>java.sql.BatchUpdateException</code> is caught
23-
* during the execution of any nested batch. The exception contains the
24-
* java.sql.BatchUpdateException that is the root cause, as well as
25-
* the results from any prior nested batch that executed successfully.
22+
* This exception is thrown if a <code>java.sql.BatchUpdateException</code> is caught during the execution of any nested
23+
* batch. The exception contains the java.sql.BatchUpdateException that is the root cause, as well as the results from
24+
* any prior nested batch that executed successfully.
2625
*
2726
* @author Jeff Butler
2827
*/
@@ -44,10 +43,8 @@ public BatchExecutorException(String message,
4443
}
4544

4645
/**
47-
* Returns the BatchUpdateException that caused the nested executor
48-
* to fail. That exception contains an array of row counts
49-
* that can be used to determine exactly which statement of the
50-
* executor caused the failure (or failures).
46+
* Returns the BatchUpdateException that caused the nested executor to fail. That exception contains an array of row
47+
* counts that can be used to determine exactly which statement of the executor caused the failure (or failures).
5148
*
5249
* @return the root BatchUpdateException
5350
*/
@@ -56,20 +53,17 @@ public BatchUpdateException getBatchUpdateException() {
5653
}
5754

5855
/**
59-
* Returns a list of BatchResult objects. There will be one entry
60-
* in the list for each successful sub-executor executed before the failing
61-
* executor.
56+
* Returns a list of BatchResult objects. There will be one entry in the list for each successful sub-executor
57+
* executed before the failing executor.
6258
*
63-
* @return the previously successful executor results (maybe an empty list
64-
* if no executor has executed successfully)
59+
* @return the previously successful executor results (maybe an empty list if no executor has executed successfully)
6560
*/
6661
public List<BatchResult> getSuccessfulBatchResults() {
6762
return successfulBatchResults;
6863
}
6964

7065
/**
71-
* Returns the SQL statement that caused the failure
72-
* (not the parameterArray).
66+
* Returns the SQL statement that caused the failure (not the parameterArray).
7367
*
7468
* @return the failing SQL string
7569
*/

‎src/main/java/org/apache/ibatis/executor/CachingExecutor.java‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2022 the original author or authors.
2+
* Copyright 2009-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -83,15 +83,16 @@ public <E> Cursor<E> queryCursor(MappedStatement ms, Object parameter, RowBounds
8383
}
8484

8585
@Override
86-
public <E> List<E> query(MappedStatement ms, Object parameterObject, RowBounds rowBounds, ResultHandler resultHandler) throws SQLException {
86+
public <E> List<E> query(MappedStatement ms, Object parameterObject, RowBounds rowBounds, ResultHandler resultHandler)
87+
throws SQLException {
8788
BoundSql boundSql = ms.getBoundSql(parameterObject);
8889
CacheKey key = createCacheKey(ms, parameterObject, rowBounds, boundSql);
8990
return query(ms, parameterObject, rowBounds, resultHandler, key, boundSql);
9091
}
9192

9293
@Override
93-
public <E> List<E> query(MappedStatement ms, Object parameterObject, RowBounds rowBounds, ResultHandler resultHandler, CacheKey key, BoundSql boundSql)
94-
throws SQLException {
94+
public <E> List<E> query(MappedStatement ms, Object parameterObject, RowBounds rowBounds, ResultHandler resultHandler,
95+
CacheKey key, BoundSql boundSql) throws SQLException {
9596
Cache cache = ms.getCache();
9697
if (cache != null) {
9798
flushCacheIfRequired(ms);
@@ -135,7 +136,9 @@ private void ensureNoOutParams(MappedStatement ms, BoundSql boundSql) {
135136
if (ms.getStatementType() == StatementType.CALLABLE) {
136137
for (ParameterMapping parameterMapping : boundSql.getParameterMappings()) {
137138
if (parameterMapping.getMode() != ParameterMode.IN) {
138-
throw new ExecutorException("Caching stored procedures with OUT params is not supported. Please configure useCache=false in " + ms.getId() + " statement.");
139+
throw new ExecutorException(
140+
"Caching stored procedures with OUT params is not supported. Please configure useCache=false in "
141+
+ ms.getId() + " statement.");
139142
}
140143
}
141144
}
@@ -152,7 +155,8 @@ public boolean isCached(MappedStatement ms, CacheKey key) {
152155
}
153156

154157
@Override
155-
public void deferLoad(MappedStatement ms, MetaObject resultObject, String property, CacheKey key, Class<?> targetType) {
158+
public void deferLoad(MappedStatement ms, MetaObject resultObject, String property, CacheKey key,
159+
Class<?> targetType) {
156160
delegate.deferLoad(ms, resultObject, property, key, targetType);
157161
}
158162

‎src/main/java/org/apache/ibatis/executor/Executor.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2022 the original author or authors.
2+
* Copyright 2009-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -36,9 +36,11 @@ public interface Executor {
3636

3737
int update(MappedStatement ms, Object parameter) throws SQLException;
3838

39-
<E> List<E> query(MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, CacheKey cacheKey, BoundSql boundSql) throws SQLException;
39+
<E> List<E> query(MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler,
40+
CacheKey cacheKey, BoundSql boundSql) throws SQLException;
4041

41-
<E> List<E> query(MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler) throws SQLException;
42+
<E> List<E> query(MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler)
43+
throws SQLException;
4244

4345
<E> Cursor<E> queryCursor(MappedStatement ms, Object parameter, RowBounds rowBounds) throws SQLException;
4446

0 commit comments

Comments
 (0)