命名规范调整

mybatis-plus/src/main/java/com/baomidou/mybatisplus/MybatisAbstractSQL.java

@@ -15,13 +15,13 @@
  */
 package com.baomidou.mybatisplus;
 
+import com.baomidou.mybatisplus.toolkit.StringUtils;
+
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.baomidou.mybatisplus.toolkit.StringUtils;
-
 /**
  * <p>
  * 重定义 AbstractSQL ，实现标准TSQL的 查询条件自定义
@@ -107,20 +107,20 @@ public abstract class MybatisAbstractSQL<T> implements Serializable {
      * SQL连接器
      */
 	private static class SafeAppendable implements Serializable {
-        private final Appendable a;
+        private final Appendable appendable;
         private boolean empty = true;
 
-        public SafeAppendable(Appendable a) {
+        public SafeAppendable(Appendable appendable) {
             super();
-            this.a = a;
+            this.appendable = appendable;
         }
 
-        public SafeAppendable append(CharSequence s) {
+        public SafeAppendable append(CharSequence charSequence) {
             try {
-                if (empty && s.length() > 0) {
+                if (empty && charSequence.length() > 0) {
                     empty = false;
                 }
-                a.append(s);
+                appendable.append(charSequence);
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
@@ -222,8 +222,8 @@ public abstract class MybatisAbstractSQL<T> implements Serializable {
             return builder.toString();
         }
 
-        public String sql(Appendable a) {
-            SafeAppendable builder = new SafeAppendable(a);
+        public String sql(Appendable appendable) {
+            SafeAppendable builder = new SafeAppendable(appendable);
             return buildSQL(builder);
         }
     }

mybatis-plus/src/main/java/com/baomidou/mybatisplus/plugins/PaginationInterceptor.java

@@ -15,11 +15,13 @@
  */
 package com.baomidou.mybatisplus.plugins;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.Properties;
-
+import com.baomidou.mybatisplus.MybatisDefaultParameterHandler;
+import com.baomidou.mybatisplus.entity.CountOptimize;
+import com.baomidou.mybatisplus.plugins.pagination.DialectFactory;
+import com.baomidou.mybatisplus.plugins.pagination.Pagination;
+import com.baomidou.mybatisplus.toolkit.IOUtils;
+import com.baomidou.mybatisplus.toolkit.SqlUtils;
+import com.baomidou.mybatisplus.toolkit.StringUtils;
 import org.apache.ibatis.executor.Executor;
 import org.apache.ibatis.executor.statement.StatementHandler;
 import org.apache.ibatis.mapping.BoundSql;
@@ -35,13 +37,10 @@ import org.apache.ibatis.scripting.defaults.DefaultParameterHandler;
 import org.apache.ibatis.session.ResultHandler;
 import org.apache.ibatis.session.RowBounds;
 
-import com.baomidou.mybatisplus.MybatisDefaultParameterHandler;
-import com.baomidou.mybatisplus.entity.CountOptimize;
-import com.baomidou.mybatisplus.plugins.pagination.DialectFactory;
-import com.baomidou.mybatisplus.plugins.pagination.Pagination;
-import com.baomidou.mybatisplus.toolkit.IOUtils;
-import com.baomidou.mybatisplus.toolkit.SqlUtils;
-import com.baomidou.mybatisplus.toolkit.StringUtils;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.Properties;
 
 /**
  * <p>
@@ -146,9 +145,9 @@ public class PaginationInterceptor implements Interceptor {
 			if (rowBounds instanceof Pagination) {
 				Connection connection = null;
 				try {
-					connection = mappedStatement.getConfiguration().getEnvironment().getDataSource().getConnection();
 					Pagination page = (Pagination) rowBounds;
 					if (page.isSearchCount()) {
+						connection = mappedStatement.getConfiguration().getEnvironment().getDataSource().getConnection();
 						/*
 						 * COUNT 查询，去掉 ORDER BY 优化执行 SQL
 						 */

mybatis-plus/src/main/java/com/baomidou/mybatisplus/toolkit/SQLFormatter.java → mybatis-plus/src/main/java/com/baomidou/mybatisplus/toolkit/SqlFormatter.java

@@ -21,7 +21,7 @@ import java.util.StringTokenizer;
  * @author Gavin King
  * @author Steve Ebersole
  */
-public class SQLFormatter {
+public class SqlFormatter {
 
 	private static final Set<String> BEGIN_CLAUSES = new HashSet<String>();
 	private static final Set<String> END_CLAUSES = new HashSet<String>();

mybatis-plus/src/main/java/com/baomidou/mybatisplus/toolkit/SqlUtils.java

@@ -28,7 +28,7 @@ import com.baomidou.mybatisplus.plugins.pagination.Pagination;
  * @Date 2016-11-13
  */
 public class SqlUtils {
-	private final static SQLFormatter sqlFormatter = new SQLFormatter();
+	private final static SqlFormatter sqlFormatter = new SqlFormatter();
 	public static final String SQL_BASE_COUNT = "SELECT COUNT(1) FROM ( %s ) TOTAL";
 
 	/**

mybatis-plus/src/main/java/com/baomidou/mybatisplus/toolkit/TableInfoHelper.java

@@ -49,7 +49,6 @@ import java.util.concurrent.ConcurrentHashMap;
 public class TableInfoHelper {
 
 	private static final Log logger = LogFactory.getLog(TableInfoHelper.class);
-
 	/**
 	 * 缓存反射类表信息
 	 */