Merge pull request #2795 from hazendaz/formatting

[ci] formatting

Author: hazendaz

src/main/java/org/apache/ibatis/transaction/Transaction.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -19,37 +19,42 @@
 import java.sql.SQLException;
 
 /**
- * Wraps a database connection.
- * Handles the connection lifecycle that comprises: its creation, preparation, commit/rollback and close.
+ * Wraps a database connection. Handles the connection lifecycle that comprises: its creation, preparation,
+ * commit/rollback and close.
  *
  * @author Clinton Begin
  */
 public interface Transaction {
 
   /**
    * Retrieve inner database connection.
+   *
    * @return DataBase connection
+   *
    * @throws SQLException
    *           the SQL exception
    */
   Connection getConnection() throws SQLException;
 
   /**
    * Commit inner database connection.
+   *
    * @throws SQLException
    *           the SQL exception
    */
   void commit() throws SQLException;
 
   /**
    * Rollback inner database connection.
+   *
    * @throws SQLException
    *           the SQL exception
    */
   void rollback() throws SQLException;
 
   /**
    * Close inner database connection.
+   *
    * @throws SQLException
    *           the SQL exception
    */
@@ -59,6 +64,7 @@ public interface Transaction {
    * Get transaction timeout if set.
    *
    * @return the timeout
+   *
    * @throws SQLException
    *           the SQL exception
    */

src/main/java/org/apache/ibatis/transaction/TransactionFactory.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@ public interface TransactionFactory {
 
   /**
    * Sets transaction factory custom properties.
+   *
    * @param props
    *          the new properties
    */
@@ -40,18 +41,28 @@ default void setProperties(Properties props) {
 
   /**
    * Creates a {@link Transaction} out of an existing connection.
-   * @param conn Existing database connection
+   *
+   * @param conn
+   *          Existing database connection
+   *
    * @return Transaction
+   *
    * @since 3.1.0
    */
   Transaction newTransaction(Connection conn);
 
   /**
    * Creates a {@link Transaction} out of a datasource.
-   * @param dataSource DataSource to take the connection from
-   * @param level Desired isolation level
-   * @param autoCommit Desired autocommit
+   *
+   * @param dataSource
+   *          DataSource to take the connection from
+   * @param level
+   *          Desired isolation level
+   * @param autoCommit
+   *          Desired autocommit
+   *
    * @return Transaction
+   *
    * @since 3.1.0
    */
   Transaction newTransaction(DataSource dataSource, TransactionIsolationLevel level, boolean autoCommit);

src/main/java/org/apache/ibatis/transaction/jdbc/JdbcTransaction.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -27,10 +27,9 @@
 import org.apache.ibatis.transaction.TransactionException;
 
 /**
- * {@link Transaction} that makes use of the JDBC commit and rollback facilities directly.
- * It relies on the connection retrieved from the dataSource to manage the scope of the transaction.
- * Delays connection retrieval until getConnection() is called.
- * Ignores commit or rollback requests when autocommit is on.
+ * {@link Transaction} that makes use of the JDBC commit and rollback facilities directly. It relies on the connection
+ * retrieved from the dataSource to manage the scope of the transaction. Delays connection retrieval until
+ * getConnection() is called. Ignores commit or rollback requests when autocommit is on.
  *
  * @author Clinton Begin
  *
@@ -50,7 +49,8 @@ public JdbcTransaction(DataSource ds, TransactionIsolationLevel desiredLevel, bo
     this(ds, desiredLevel, desiredAutoCommit, false);
   }
 
-  public JdbcTransaction(DataSource ds, TransactionIsolationLevel desiredLevel, boolean desiredAutoCommit, boolean skipSetAutoCommitOnClose) {
+  public JdbcTransaction(DataSource ds, TransactionIsolationLevel desiredLevel, boolean desiredAutoCommit,
+      boolean skipSetAutoCommitOnClose) {
     dataSource = ds;
     level = desiredLevel;
     autoCommit = desiredAutoCommit;
@@ -111,9 +111,10 @@ protected void setDesiredAutoCommit(boolean desiredAutoCommit) {
     } catch (SQLException e) {
       // Only a very poorly implemented driver would fail here,
       // and there's not much we can do about that.
-      throw new TransactionException("Error configuring AutoCommit.  "
-          + "Your driver may not support getAutoCommit() or setAutoCommit(). "
-          + "Requested setting: " + desiredAutoCommit + ".  Cause: " + e, e);
+      throw new TransactionException(
+          "Error configuring AutoCommit.  " + "Your driver may not support getAutoCommit() or setAutoCommit(). "
+              + "Requested setting: " + desiredAutoCommit + ".  Cause: " + e,
+          e);
     }
   }
 
@@ -132,8 +133,7 @@ protected void resetAutoCommit() {
       }
     } catch (SQLException e) {
       if (log.isDebugEnabled()) {
-        log.debug("Error resetting autocommit to true "
-            + "before closing the connection.  Cause: " + e);
+        log.debug("Error resetting autocommit to true " + "before closing the connection.  Cause: " + e);
       }
     }
   }

src/main/java/org/apache/ibatis/transaction/managed/ManagedTransaction.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -26,10 +26,9 @@
 import org.apache.ibatis.transaction.Transaction;
 
 /**
- * {@link Transaction} that lets the container manage the full lifecycle of the transaction.
- * Delays connection retrieval until getConnection() is called.
- * Ignores all commit or rollback requests.
- * By default, it closes the connection but can be configured not to do it.
+ * {@link Transaction} that lets the container manage the full lifecycle of the transaction. Delays connection retrieval
+ * until getConnection() is called. Ignores all commit or rollback requests. By default, it closes the connection but
+ * can be configured not to do it.
  *
  * @author Clinton Begin
  *

src/main/java/org/apache/ibatis/transaction/managed/ManagedTransactionFactory.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -53,7 +53,7 @@ public Transaction newTransaction(Connection conn) {
   @Override
   public Transaction newTransaction(DataSource ds, TransactionIsolationLevel level, boolean autoCommit) {
     // Silently ignores autocommit and isolation level, as managed transactions are entirely
-    // controlled by an external manager.  It's silently ignored so that
+    // controlled by an external manager. It's silently ignored so that
     // code remains portable between managed and unmanaged configurations.
     return new ManagedTransaction(ds, level, closeConnection);
   }

src/main/java/org/apache/ibatis/type/Alias.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -23,15 +23,16 @@
 
 /**
  * The annotation that specify alias name.
- *
  * <p>
  * <b>How to use:</b>
+ *
  * <pre>
  * &#064;Alias("Email")
  * public class UserEmail {
  *   // ...
  * }
  * </pre>
+ *
  * @author Clinton Begin
  */
 @Documented

src/main/java/org/apache/ibatis/type/BaseTypeHandler.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -26,9 +26,9 @@
 /**
  * The base {@link TypeHandler} for references a generic type.
  * <p>
- * Important: Since 3.5.0, This class never call the {@link ResultSet#wasNull()} and
- * {@link CallableStatement#wasNull()} method for handling the SQL {@code NULL} value.
- * In other words, {@code null} value handling should be performed on subclass.
+ * Important: Since 3.5.0, This class never call the {@link ResultSet#wasNull()} and {@link CallableStatement#wasNull()}
+ * method for handling the SQL {@code NULL} value. In other words, {@code null} value handling should be performed on
+ * subclass.
  * </p>
  *
  * @author Clinton Begin
@@ -48,6 +48,7 @@ public abstract class BaseTypeHandler<T> extends TypeReference<T> implements Typ
    *
    * @param c
    *          the new configuration
+   *
    * @deprecated Since 3.5.0 - See https://github.com/mybatis/mybatis-3/issues/1203. This property will remove future.
    */
   @Deprecated
@@ -65,16 +66,16 @@ public void setParameter(PreparedStatement ps, int i, T parameter, JdbcType jdbc
         ps.setNull(i, jdbcType.TYPE_CODE);
       } catch (SQLException e) {
         throw new TypeException("Error setting null for parameter #" + i + " with JdbcType " + jdbcType + " . "
-              + "Try setting a different JdbcType for this parameter or a different jdbcTypeForNull configuration property. "
-              + "Cause: " + e, e);
+            + "Try setting a different JdbcType for this parameter or a different jdbcTypeForNull configuration property. "
+            + "Cause: " + e, e);
       }
     } else {
       try {
         setNonNullParameter(ps, i, parameter, jdbcType);
       } catch (Exception e) {
         throw new TypeException("Error setting non null for parameter #" + i + " with JdbcType " + jdbcType + " . "
-              + "Try setting a different JdbcType for this parameter or a different configuration property. "
-              + "Cause: " + e, e);
+            + "Try setting a different JdbcType for this parameter or a different configuration property. " + "Cause: "
+            + e, e);
       }
     }
   }
@@ -84,7 +85,8 @@ public T getResult(ResultSet rs, String columnName) throws SQLException {
     try {
       return getNullableResult(rs, columnName);
     } catch (Exception e) {
-      throw new ResultMapException("Error attempting to get column '" + columnName + "' from result set.  Cause: " + e, e);
+      throw new ResultMapException("Error attempting to get column '" + columnName + "' from result set.  Cause: " + e,
+          e);
     }
   }
 
@@ -93,7 +95,8 @@ public T getResult(ResultSet rs, int columnIndex) throws SQLException {
     try {
       return getNullableResult(rs, columnIndex);
     } catch (Exception e) {
-      throw new ResultMapException("Error attempting to get column #" + columnIndex + " from result set.  Cause: " + e, e);
+      throw new ResultMapException("Error attempting to get column #" + columnIndex + " from result set.  Cause: " + e,
+          e);
     }
   }
 
@@ -102,11 +105,13 @@ public T getResult(CallableStatement cs, int columnIndex) throws SQLException {
     try {
       return getNullableResult(cs, columnIndex);
     } catch (Exception e) {
-      throw new ResultMapException("Error attempting to get column #" + columnIndex + " from callable statement.  Cause: " + e, e);
+      throw new ResultMapException(
+          "Error attempting to get column #" + columnIndex + " from callable statement.  Cause: " + e, e);
     }
   }
 
-  public abstract void setNonNullParameter(PreparedStatement ps, int i, T parameter, JdbcType jdbcType) throws SQLException;
+  public abstract void setNonNullParameter(PreparedStatement ps, int i, T parameter, JdbcType jdbcType)
+      throws SQLException;
 
   /**
    * Gets the nullable result.
@@ -115,7 +120,9 @@ public T getResult(CallableStatement cs, int columnIndex) throws SQLException {
    *          the rs
    * @param columnName
    *          Column name, when configuration <code>useColumnLabel</code> is <code>false</code>
+   *
    * @return the nullable result
+   *
    * @throws SQLException
    *           the SQL exception
    */

src/main/java/org/apache/ibatis/type/BigDecimalTypeHandler.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -33,20 +33,17 @@ public void setNonNullParameter(PreparedStatement ps, int i, BigDecimal paramete
   }
 
   @Override
-  public BigDecimal getNullableResult(ResultSet rs, String columnName)
-      throws SQLException {
+  public BigDecimal getNullableResult(ResultSet rs, String columnName) throws SQLException {
     return rs.getBigDecimal(columnName);
   }
 
   @Override
-  public BigDecimal getNullableResult(ResultSet rs, int columnIndex)
-      throws SQLException {
+  public BigDecimal getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
     return rs.getBigDecimal(columnIndex);
   }
 
   @Override
-  public BigDecimal getNullableResult(CallableStatement cs, int columnIndex)
-      throws SQLException {
+  public BigDecimal getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
     return cs.getBigDecimal(columnIndex);
   }
 }

src/main/java/org/apache/ibatis/type/BigIntegerTypeHandler.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -28,7 +28,8 @@
 public class BigIntegerTypeHandler extends BaseTypeHandler<BigInteger> {
 
   @Override
-  public void setNonNullParameter(PreparedStatement ps, int i, BigInteger parameter, JdbcType jdbcType) throws SQLException {
+  public void setNonNullParameter(PreparedStatement ps, int i, BigInteger parameter, JdbcType jdbcType)
+      throws SQLException {
     ps.setBigDecimal(i, new BigDecimal(parameter));
   }