瀏覽代碼

去掉未使用变量

= 8 年之前
父節點
當前提交
1251862e0f

+ 10 - 25
mybatis-plus/src/main/java/com/baomidou/mybatisplus/plugins/CachePaginationInterceptor.java

@@ -15,16 +15,11 @@
  */
 package com.baomidou.mybatisplus.plugins;
 
-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.PluginUtils;
-import com.baomidou.mybatisplus.toolkit.SqlUtils;
-import com.baomidou.mybatisplus.toolkit.StringUtils;
+import java.sql.Connection;
+import java.util.Properties;
+
 import org.apache.ibatis.executor.Executor;
 import org.apache.ibatis.executor.statement.StatementHandler;
-import org.apache.ibatis.logging.Log;
-import org.apache.ibatis.logging.LogFactory;
 import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.plugin.Interceptor;
@@ -37,8 +32,12 @@ import org.apache.ibatis.reflection.SystemMetaObject;
 import org.apache.ibatis.session.ResultHandler;
 import org.apache.ibatis.session.RowBounds;
 
-import java.sql.Connection;
-import java.util.Properties;
+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.PluginUtils;
+import com.baomidou.mybatisplus.toolkit.SqlUtils;
+import com.baomidou.mybatisplus.toolkit.StringUtils;
 
 /**
  * <p>
@@ -53,11 +52,6 @@ import java.util.Properties;
 				ResultHandler.class }),
 		@Signature(type = StatementHandler.class, method = "prepare", args = { Connection.class, Integer.class }) })
 public class CachePaginationInterceptor extends PaginationInterceptor implements Interceptor {
-
-	private static final Log logger = LogFactory.getLog(CachePaginationInterceptor.class);
-
-	/* 溢出总页数,设置第一页 */
-	private boolean overflowCurrent = false;
 	/* Count优化方式 */
 	private String optimizeType = "default";
 	/* 方言类型 */
@@ -111,7 +105,6 @@ public class CachePaginationInterceptor extends PaginationInterceptor implements
 
 			BoundSql boundSql = mappedStatement.getBoundSql(parameterObject);
 			String originalSql = (String) boundSql.getSql();
-
 			if (rowBounds instanceof Pagination) {
 				Pagination page = (Pagination) rowBounds;
 				if (page.isSearchCount()) {
@@ -125,7 +118,6 @@ public class CachePaginationInterceptor extends PaginationInterceptor implements
 			}
 		}
 		return invocation.proceed();
-
 	}
 
 	public Object plugin(Object target) {
@@ -153,15 +145,8 @@ public class CachePaginationInterceptor extends PaginationInterceptor implements
 		this.dialectType = dialectType;
 	}
 
-	public void setDialectClazz(String dialectClazz) {
-		this.dialectClazz = dialectClazz;
-	}
-
-	public void setOverflowCurrent(boolean overflowCurrent) {
-		this.overflowCurrent = overflowCurrent;
-	}
-
 	public void setOptimizeType(String optimizeType) {
 		this.optimizeType = optimizeType;
 	}
+
 }

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

@@ -15,14 +15,11 @@
  */
 package com.baomidou.mybatisplus.plugins;
 
-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.PluginUtils;
-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;
+
 import org.apache.ibatis.executor.statement.StatementHandler;
 import org.apache.ibatis.logging.Log;
 import org.apache.ibatis.logging.LogFactory;
@@ -36,13 +33,16 @@ import org.apache.ibatis.plugin.Signature;
 import org.apache.ibatis.reflection.MetaObject;
 import org.apache.ibatis.reflection.SystemMetaObject;
 import org.apache.ibatis.scripting.defaults.DefaultParameterHandler;
-import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.session.RowBounds;
 
-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.PluginUtils;
+import com.baomidou.mybatisplus.toolkit.SqlUtils;
+import com.baomidou.mybatisplus.toolkit.StringUtils;
 
 /**
  * <p>
@@ -71,7 +71,6 @@ public class PaginationInterceptor implements Interceptor {
 	 * {@link org.apache.ibatis.session.RowBounds}
 	 */
 	public Object intercept(Invocation invocation) throws Throwable {
-
 		Object target = invocation.getTarget();
 		if (target instanceof StatementHandler) {
 			StatementHandler statementHandler = (StatementHandler) PluginUtils.realTarget(invocation.getTarget());
@@ -109,14 +108,13 @@ public class PaginationInterceptor implements Interceptor {
 			}
 
 			/*
-			 * <p> 禁用内存分页 </p> <p> 内存分页会查询所有结果出来处理(这个很吓人的),如果结果变化频繁这个数据还会不准。
-			 * </p>
+			 * <p> 禁用内存分页 </p>
+			 * <p> 内存分页会查询所有结果出来处理(这个很吓人的),如果结果变化频繁这个数据还会不准。</p>
 			 */
 			metaStatementHandler.setValue("delegate.boundSql.sql", originalSql);
 			metaStatementHandler.setValue("delegate.rowBounds.offset", RowBounds.NO_ROW_OFFSET);
 			metaStatementHandler.setValue("delegate.rowBounds.limit", RowBounds.NO_ROW_LIMIT);
 		}
-
 		return invocation.proceed();
 	}
 
@@ -131,7 +129,6 @@ public class PaginationInterceptor implements Interceptor {
 	protected void count(String sql, MappedStatement mappedStatement, BoundSql boundSql, Pagination page) {
 		PreparedStatement statement = null;
 		ResultSet resultSet = null;
-		Configuration configuration = mappedStatement.getConfiguration();
 		try {
 			Connection connection = mappedStatement.getConfiguration().getEnvironment().getDataSource().getConnection();
 			statement = connection.prepareStatement(sql);
@@ -192,4 +189,5 @@ public class PaginationInterceptor implements Interceptor {
 	public void setOptimizeType(String optimizeType) {
 		this.optimizeType = optimizeType;
 	}
+
 }