JpaPage JpaPageResultsSqlCache

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/JpaService.java

@@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit;
 
 import org.dromara.mybatis.jpa.entity.JpaEntity;
 import org.dromara.mybatis.jpa.entity.JpaPageResults;
-import org.dromara.mybatis.jpa.entity.PageResultsSqlCache;
+import org.dromara.mybatis.jpa.entity.JpaPageResultsSqlCache;
 import org.dromara.mybatis.jpa.query.Query;
 import org.dromara.mybatis.jpa.spring.MybatisJpaContext;
 import org.dromara.mybatis.jpa.util.BeanUtil;
@@ -50,7 +50,7 @@ public  class  JpaService <T extends JpaEntity> {
 	
 	@JsonIgnore
 	//定义全局缓存
-	public static final Cache<String, PageResultsSqlCache> pageResultsBoundSqlCache = 
+	public static final Cache<String, JpaPageResultsSqlCache> pageResultsBoundSqlCache = 
 							Caffeine.newBuilder()
 								.expireAfterWrite(300, TimeUnit.SECONDS)
 								.build();

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/dialect/DB2Dialect.java

@@ -20,7 +20,7 @@ package org.dromara.mybatis.jpa.dialect;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.dromara.mybatis.jpa.entity.JpaPagination;
+import org.dromara.mybatis.jpa.entity.JpaPage;
 
 public class DB2Dialect extends Dialect {
 
@@ -35,9 +35,9 @@ public class DB2Dialect extends Dialect {
 	}
 	
 	@Override
-	public String getLimitString(String sql,  JpaPagination pagination) {
-		if ( pagination.getPageSize() == 0 ) {
-			return sql + " fetch first " + pagination.getStartRow() + " rows only";
+	public String getLimitString(String sql,  JpaPage page) {
+		if ( page.getPageSize() == 0 ) {
+			return sql + " fetch first " + page.getStartRow() + " rows only";
 		}
 		
 		StringBuilder pagingSelectSql = new StringBuilder( sql.length() + 200 )
@@ -46,20 +46,20 @@ public class DB2Dialect extends Dialect {
 				)
 				.append( sql )  //nest the main query in an outer select
 				.append(" fetch first ")
-				.append(pagination.getPageSize())
+				.append(page.getPageSize())
 				.append(" rows only ) as inner2_ ) as inner1_ where rownumber_ > " )
-				.append(pagination.getStartRow())
+				.append(page.getStartRow())
 				.append(" order by rownumber_");
 		
 		return pagingSelectSql.toString();
 	}
 	
 	@Override
-	public String getPreparedStatementLimitString(String sql,  JpaPagination pagination) {
+	public String getPreparedStatementLimitString(String sql,  JpaPage page) {
 		//LIMIT #{pageResults}  OFFSET #{startRow}
-		if(pagination.getPageSize()>0&&pagination.getStartRow()>0){
+		if(page.getPageSize()>0&&page.getStartRow()>0){
 			return sql +  " limit ? , ?";
-		}else if(pagination.getPageSize()>0){
+		}else if(page.getPageSize()>0){
 			return sql +  " limit  ? ";
 		}else{
 			return sql +  " limit ?";
@@ -68,14 +68,14 @@ public class DB2Dialect extends Dialect {
 	
 	
 	@Override
-	public void setLimitParamters(PreparedStatement preparedStatement,int parameterSize,JpaPagination pagination) {
+	public void setLimitParamters(PreparedStatement preparedStatement,int parameterSize,JpaPage page) {
 		
 		try {
-			if(pagination.getPageSize()>0&&pagination.getStartRow()>0){
-				preparedStatement.setInt(++parameterSize, pagination.getPageSize());
-				preparedStatement.setInt(++parameterSize, pagination.getPageSize());
-			}else if(pagination.getPageSize()>0){
-				preparedStatement.setInt(++parameterSize, pagination.getPageSize());
+			if(page.getPageSize()>0&&page.getStartRow()>0){
+				preparedStatement.setInt(++parameterSize, page.getPageSize());
+				preparedStatement.setInt(++parameterSize, page.getPageSize());
+			}else if(page.getPageSize()>0){
+				preparedStatement.setInt(++parameterSize, page.getPageSize());
 			}else{
 				preparedStatement.setInt(++parameterSize, 1000);
 			}

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/dialect/DerbyDialect.java

@@ -20,7 +20,7 @@ package org.dromara.mybatis.jpa.dialect;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.dromara.mybatis.jpa.entity.JpaPagination;
+import org.dromara.mybatis.jpa.entity.JpaPage;
 
 public class DerbyDialect extends Dialect {
 
@@ -35,26 +35,26 @@ public class DerbyDialect extends Dialect {
 	}
 	
 	@Override
-	public String getLimitString(String sql,  JpaPagination pagination) {
+	public String getLimitString(String sql,  JpaPage page) {
 		StringBuilder pagingSelectSql = new StringBuilder(sql.length() + 50);
 
 		pagingSelectSql.append( sql );
 		
-		if ( pagination.getStartRow() == 0 ) {
+		if ( page.getStartRow() == 0 ) {
 			pagingSelectSql.append( " fetch first " );
 		}
 		else {
-			pagingSelectSql.append( " offset " ).append( pagination.getStartRow() ).append( " rows fetch next " );
+			pagingSelectSql.append( " offset " ).append( page.getStartRow() ).append( " rows fetch next " );
 		}
 
-		pagingSelectSql.append( pagination.getPageSize() ).append( " rows only" );
+		pagingSelectSql.append( page.getPageSize() ).append( " rows only" );
 		
 		
 		return pagingSelectSql.toString();
 	}
 	
 	@Override
-	public String getPreparedStatementLimitString(String sql,  JpaPagination pagination) {
+	public String getPreparedStatementLimitString(String sql,  JpaPage pagination) {
 		//LIMIT #{pageResults}  OFFSET #{startRow}
 		if(pagination.getPageSize()>0&&pagination.getStartRow()>0){
 			return sql +  " limit ? , ?";
@@ -67,14 +67,14 @@ public class DerbyDialect extends Dialect {
 	
 	
 	@Override
-	public void setLimitParamters(PreparedStatement preparedStatement,int parameterSize,JpaPagination pagination) {
+	public void setLimitParamters(PreparedStatement preparedStatement,int parameterSize,JpaPage page) {
 		
 		try {
-			if(pagination.getPageSize()>0&&pagination.getStartRow()>0){
-				preparedStatement.setInt(++parameterSize, pagination.getPageSize());
-				preparedStatement.setInt(++parameterSize, pagination.getPageSize());
-			}else if(pagination.getPageSize()>0){
-				preparedStatement.setInt(++parameterSize, pagination.getPageSize());
+			if(page.getPageSize()>0&&page.getStartRow()>0){
+				preparedStatement.setInt(++parameterSize, page.getPageSize());
+				preparedStatement.setInt(++parameterSize, page.getPageSize());
+			}else if(page.getPageSize()>0){
+				preparedStatement.setInt(++parameterSize, page.getPageSize());
 			}else{
 				preparedStatement.setInt(++parameterSize, 1000);
 			}

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/dialect/Dialect.java

@@ -21,7 +21,7 @@ package org.dromara.mybatis.jpa.dialect;
 import java.sql.PreparedStatement;
 import java.util.HashMap;
 
-import org.dromara.mybatis.jpa.entity.JpaPagination;
+import org.dromara.mybatis.jpa.entity.JpaPage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -77,19 +77,19 @@ public abstract class Dialect {
 	 * @return The modified query statement with the limit applied.
 	 */
 
-	public String getLimitString(String query, JpaPagination pagination) {
+	public String getLimitString(String query, JpaPage page) {
 		throw new UnsupportedOperationException( "Paged queries not supported by " + getClass().getName());
 	}
 	
 	
 	
 	
-	public String getPreparedStatementLimitString(String query, JpaPagination pagination) {
+	public String getPreparedStatementLimitString(String query, JpaPage page) {
 		throw new UnsupportedOperationException( "Paged queries not supported by " + getClass().getName());
 	}
 	
 	
-	public void setLimitParamters(PreparedStatement preparedStatement,int parameterSize,JpaPagination pagination) {
+	public void setLimitParamters(PreparedStatement preparedStatement,int parameterSize,JpaPage pagination) {
 		throw new UnsupportedOperationException( "Paged queries not supported by " + getClass().getName());
 	}
 	

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/dialect/HighgoDialect.java

@@ -20,7 +20,7 @@ package org.dromara.mybatis.jpa.dialect;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.dromara.mybatis.jpa.entity.JpaPagination;
+import org.dromara.mybatis.jpa.entity.JpaPage;
 
 public class HighgoDialect extends Dialect {
 
@@ -35,19 +35,19 @@ public class HighgoDialect extends Dialect {
 	}
 	
 	@Override
-	public String getLimitString(String sql,  JpaPagination pagination) {
+	public String getLimitString(String sql,  JpaPage page) {
 		//LIMIT #{pageResults}  OFFSET #{startRow}
-		if(pagination.getPageSize()>0&&pagination.getStartRow()>0){
-			return sql +  " limit " + pagination.getPageSize()+" offset  "+pagination.getStartRow() ;
-		}else if(pagination.getPageSize()>0){
-			return sql +  " limit " + pagination.getPageSize();
+		if(page.getPageSize()>0&&page.getStartRow()>0){
+			return sql +  " limit " + page.getPageSize()+" offset  "+page.getStartRow() ;
+		}else if(page.getPageSize()>0){
+			return sql +  " limit " + page.getPageSize();
 		}else{
 			return sql +  " limit 1000";
 		}
 	}
 	
 	@Override
-	public String getPreparedStatementLimitString(String sql,  JpaPagination pagination) {
+	public String getPreparedStatementLimitString(String sql,  JpaPage pagination) {
 		//LIMIT #{pageResults}  OFFSET #{startRow}
 		if(pagination.getPageSize()>0&&pagination.getStartRow()>0){
 			return sql +  " limit ? , ?";
@@ -60,14 +60,14 @@ public class HighgoDialect extends Dialect {
 	
 	
 	@Override
-	public void setLimitParamters(PreparedStatement preparedStatement,int parameterSize,JpaPagination pagination) {
+	public void setLimitParamters(PreparedStatement preparedStatement,int parameterSize,JpaPage page) {
 		
 		try {
-			if(pagination.getPageSize()>0&&pagination.getStartRow()>0){
-				preparedStatement.setInt(++parameterSize, pagination.getPageSize());
-				preparedStatement.setInt(++parameterSize, pagination.getPageSize());
-			}else if(pagination.getPageSize()>0){
-				preparedStatement.setInt(++parameterSize, pagination.getPageSize());
+			if(page.getPageSize()>0&&page.getStartRow()>0){
+				preparedStatement.setInt(++parameterSize, page.getPageSize());
+				preparedStatement.setInt(++parameterSize, page.getPageSize());
+			}else if(page.getPageSize()>0){
+				preparedStatement.setInt(++parameterSize, page.getPageSize());
 			}else{
 				preparedStatement.setInt(++parameterSize, 1000);
 			}

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/dialect/MySQLDialect.java

@@ -20,7 +20,7 @@ package org.dromara.mybatis.jpa.dialect;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.dromara.mybatis.jpa.entity.JpaPagination;
+import org.dromara.mybatis.jpa.entity.JpaPage;
 
 public class MySQLDialect extends Dialect {
 
@@ -41,20 +41,20 @@ public class MySQLDialect extends Dialect {
 	}
 	
 	@Override
-	public String getLimitString(String sql,  JpaPagination pagination) {
+	public String getLimitString(String sql,  JpaPage page) {
 		//LIMIT #{pageResults}  OFFSET #{startRow}
-		pagination.calculate();
-		if(pagination.getPageSize()>0&&pagination.getStartRow()>0){
-			return sql +  " limit "+pagination.getStartRow()+" , " +pagination.getPageSize();
-		}else if(pagination.getPageSize()>0){
-			return sql +  " limit  "+pagination.getPageSize();
+		page.calculate();
+		if(page.getPageSize()>0&&page.getStartRow()>0){
+			return sql +  " limit "+page.getStartRow()+" , " +page.getPageSize();
+		}else if(page.getPageSize()>0){
+			return sql +  " limit  "+page.getPageSize();
 		}else{
-			return sql +  " limit "+pagination.getPageSize();
+			return sql +  " limit "+page.getPageSize();
 		}
 	}
 	
 	@Override
-	public String getPreparedStatementLimitString(String sql,  JpaPagination pagination) {
+	public String getPreparedStatementLimitString(String sql,  JpaPage pagination) {
 		//LIMIT #{pageResults}  OFFSET #{startRow}
 		if(pagination.getPageSize()>0&&pagination.getStartRow()>0){
 			return sql +  " limit ? , ?";
@@ -66,14 +66,14 @@ public class MySQLDialect extends Dialect {
 	}
 	
 	@Override
-	public void setLimitParamters(PreparedStatement preparedStatement,int parameterSize,JpaPagination pagination) {
+	public void setLimitParamters(PreparedStatement preparedStatement,int parameterSize,JpaPage page) {
 		
 		try {
-			if(pagination.getPageSize()>0&&pagination.getStartRow()>0){
-				preparedStatement.setInt(++parameterSize, pagination.getPageSize());
-				preparedStatement.setInt(++parameterSize, pagination.getPageSize());
-			}else if(pagination.getPageSize()>0){
-				preparedStatement.setInt(++parameterSize, pagination.getPageSize());
+			if(page.getPageSize()>0&&page.getStartRow()>0){
+				preparedStatement.setInt(++parameterSize, page.getPageSize());
+				preparedStatement.setInt(++parameterSize, page.getPageSize());
+			}else if(page.getPageSize()>0){
+				preparedStatement.setInt(++parameterSize, page.getPageSize());
 			}else{
 				preparedStatement.setInt(++parameterSize, 1000);
 			}

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/dialect/OracleDialect.java

@@ -20,7 +20,7 @@ package org.dromara.mybatis.jpa.dialect;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.dromara.mybatis.jpa.entity.JpaPagination;
+import org.dromara.mybatis.jpa.entity.JpaPage;
 
 public class OracleDialect extends Dialect {
 
@@ -35,9 +35,9 @@ public class OracleDialect extends Dialect {
 	}
 	
 	@Override
-	public String getLimitString(String sql,  JpaPagination pagination) {
-		if ( pagination.getPageSize() == 0 ) {
-			return sql + " fetch first " + pagination.getStartRow() + " rows only";
+	public String getLimitString(String sql,  JpaPage page) {
+		if ( page.getPageSize() == 0 ) {
+			return sql + " fetch first " + page.getStartRow() + " rows only";
 		}
 		StringBuilder pagingSelect = new StringBuilder( sql.length() + 200 )
 				.append(
@@ -45,15 +45,15 @@ public class OracleDialect extends Dialect {
 				)
 				.append( sql )  //nest the main query in an outer select
 				.append( ")  inner_table_ )  where rownumber_ > " )
-				.append( pagination.getStartRow() )
+				.append( page.getStartRow() )
 				.append(" and rownumber_ <=")
-				.append( pagination.getEndRow() )
+				.append( page.getEndRow() )
 				.append( " order by rownumber_" );
 		return pagingSelect.toString();
 	}
 	
 	@Override
-	public String getPreparedStatementLimitString(String sql,  JpaPagination pagination) {
+	public String getPreparedStatementLimitString(String sql,  JpaPage pagination) {
 		//LIMIT #{pageResults}  OFFSET #{startRow}
 		if(pagination.getPageSize()>0&&pagination.getStartRow()>0){
 			return sql +  " limit ? , ?";
@@ -65,14 +65,14 @@ public class OracleDialect extends Dialect {
 	}
 	
 	@Override
-	public void setLimitParamters(PreparedStatement preparedStatement,int parameterSize,JpaPagination pagination) {
+	public void setLimitParamters(PreparedStatement preparedStatement,int parameterSize,JpaPage page) {
 		
 		try {
-			if(pagination.getPageSize()>0&&pagination.getStartRow()>0){
-				preparedStatement.setInt(++parameterSize, pagination.getPageSize());
-				preparedStatement.setInt(++parameterSize, pagination.getPageSize());
-			}else if(pagination.getPageSize()>0){
-				preparedStatement.setInt(++parameterSize, pagination.getPageSize());
+			if(page.getPageSize()>0&&page.getStartRow()>0){
+				preparedStatement.setInt(++parameterSize, page.getPageSize());
+				preparedStatement.setInt(++parameterSize, page.getPageSize());
+			}else if(page.getPageSize()>0){
+				preparedStatement.setInt(++parameterSize, page.getPageSize());
 			}else{
 				preparedStatement.setInt(++parameterSize, 1000);
 			}

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/dialect/PostgreSQLDialect.java

@@ -20,7 +20,7 @@ package org.dromara.mybatis.jpa.dialect;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.dromara.mybatis.jpa.entity.JpaPagination;
+import org.dromara.mybatis.jpa.entity.JpaPage;
 
 public class PostgreSQLDialect extends Dialect {
 
@@ -35,19 +35,19 @@ public class PostgreSQLDialect extends Dialect {
 	}
 	
 	@Override
-	public String getLimitString(String sql,  JpaPagination pagination) {
+	public String getLimitString(String sql,  JpaPage page) {
 		//LIMIT #{pageResults}  OFFSET #{startRow}
-		if(pagination.getPageSize()>0&&pagination.getStartRow()>0){
-			return sql +  " limit " + pagination.getPageSize() +" offset  " + pagination.getStartRow() ;
-		}else if(pagination.getPageSize() > 0){
-			return sql +  " limit " + pagination.getPageSize();
+		if(page.getPageSize()>0&&page.getStartRow()>0){
+			return sql +  " limit " + page.getPageSize() +" offset  " + page.getStartRow() ;
+		}else if(page.getPageSize() > 0){
+			return sql +  " limit " + page.getPageSize();
 		}else{
 			return sql +  " limit 1000";
 		}
 	}
 	
 	@Override
-	public String getPreparedStatementLimitString(String sql,  JpaPagination pagination) {
+	public String getPreparedStatementLimitString(String sql,  JpaPage pagination) {
 		//LIMIT #{pageResults}  OFFSET #{startRow}
 		if(pagination.getPageSize()>0&&pagination.getStartRow()>0){
 			return sql +  " limit ? offset ?";
@@ -59,14 +59,14 @@ public class PostgreSQLDialect extends Dialect {
 	}
 	
 	@Override
-	public void setLimitParamters(PreparedStatement preparedStatement,int parameterSize,JpaPagination pagination) {
+	public void setLimitParamters(PreparedStatement preparedStatement,int parameterSize,JpaPage page) {
 		
 		try {
-			if(pagination.getPageSize()>0&&pagination.getStartRow()>0){
-				preparedStatement.setInt(++parameterSize, pagination.getPageSize());
-				preparedStatement.setInt(++parameterSize, pagination.getPageSize());
-			}else if(pagination.getPageSize()>0){
-				preparedStatement.setInt(++parameterSize, pagination.getPageSize());
+			if(page.getPageSize()>0&&page.getStartRow()>0){
+				preparedStatement.setInt(++parameterSize, page.getPageSize());
+				preparedStatement.setInt(++parameterSize, page.getPageSize());
+			}else if(page.getPageSize()>0){
+				preparedStatement.setInt(++parameterSize, page.getPageSize());
 			}else{
 				preparedStatement.setInt(++parameterSize, 1000);
 			}

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/dialect/SQLServerDialect.java

@@ -21,7 +21,7 @@ package org.dromara.mybatis.jpa.dialect;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.dromara.mybatis.jpa.entity.JpaPagination;
+import org.dromara.mybatis.jpa.entity.JpaPage;
 
 public class SQLServerDialect extends Dialect {
 
@@ -35,15 +35,15 @@ public class SQLServerDialect extends Dialect {
 	}
 	
 	@Override
-	public String getLimitString(String sql,  JpaPagination pagination) {
+	public String getLimitString(String sql,  JpaPage page) {
 		StringBuilder pagingSelectSql = new StringBuilder( "" );
-		if(pagination.getPageSize()>0){
+		if(page.getPageSize()>0){
 			
-			pagingSelectSql.append("select top "+pagination.getPageSize()+" * from ( ");
+			pagingSelectSql.append("select top "+page.getPageSize()+" * from ( ");
 			pagingSelectSql.append("select row_number() over() as rownumber,mybatis_query_temp_table.* from ( ");
 			pagingSelectSql.append("mybatis_query_temp_table ) mybatis_query_temp_page ");
-			if(pagination.getStartRow()>0){
-				pagingSelectSql.append("where  rownumber > "+pagination.getStartRow());
+			if(page.getStartRow()>0){
+				pagingSelectSql.append("where  rownumber > "+page.getStartRow());
 			}
 		}else{
 			return sql;
@@ -52,7 +52,7 @@ public class SQLServerDialect extends Dialect {
 	}
 	
 	@Override
-	public String getPreparedStatementLimitString(String sql,  JpaPagination pagination) {
+	public String getPreparedStatementLimitString(String sql,  JpaPage pagination) {
 		//LIMIT #{pageResults}  OFFSET #{startRow}
 		if(pagination.getPageSize()>0&&pagination.getStartRow()>0){
 			return sql +  " limit ? , ?";
@@ -64,14 +64,14 @@ public class SQLServerDialect extends Dialect {
 	}
 	
 	@Override
-	public void setLimitParamters(PreparedStatement preparedStatement,int parameterSize,JpaPagination pagination) {
+	public void setLimitParamters(PreparedStatement preparedStatement,int parameterSize,JpaPage page) {
 		
 		try {
-			if(pagination.getPageSize()>0&&pagination.getStartRow()>0){
-				preparedStatement.setInt(++parameterSize, pagination.getPageSize());
-				preparedStatement.setInt(++parameterSize, pagination.getPageSize());
-			}else if(pagination.getPageSize()>0){
-				preparedStatement.setInt(++parameterSize, pagination.getPageSize());
+			if(page.getPageSize()>0&&page.getStartRow()>0){
+				preparedStatement.setInt(++parameterSize, page.getPageSize());
+				preparedStatement.setInt(++parameterSize, page.getPageSize());
+			}else if(page.getPageSize()>0){
+				preparedStatement.setInt(++parameterSize, page.getPageSize());
 			}else{
 				preparedStatement.setInt(++parameterSize, 1000);
 			}

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/entity/JpaEntity.java

@@ -30,7 +30,7 @@ import org.dromara.mybatis.jpa.metadata.MapperMetadata;
  * @author Crystal.sea
  * 
  */
-public class JpaEntity extends JpaPagination implements Serializable{
+public class JpaEntity extends JpaPage implements Serializable{
 
 	private static final long serialVersionUID = -6984977786868857466L;
 

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/entity/JpaPagination.java → mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/entity/JpaPage.java

@@ -29,7 +29,7 @@ import jakarta.persistence.Transient;
  * @author Crystal.Sea
  *
  */
-public class JpaPagination {
+public class JpaPage {
 	
 	public static final int MAX_RESULTS = 10000;
 	

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/entity/PageResultsSqlCache.java → mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/entity/JpaPageResultsSqlCache.java

@@ -19,14 +19,14 @@ package org.dromara.mybatis.jpa.entity;
 
 import org.apache.ibatis.mapping.BoundSql;
 
-public class PageResultsSqlCache {
+public class JpaPageResultsSqlCache {
 	
 	String sql;
 	
 	BoundSql boundSql;
 	
 	
-	public PageResultsSqlCache(String sql, BoundSql boundSql) {
+	public JpaPageResultsSqlCache(String sql, BoundSql boundSql) {
 		super();
 		this.sql = sql;
 		this.boundSql = boundSql;

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/interceptor/StatementHandlerInterceptor.java

@@ -32,8 +32,8 @@ import org.apache.ibatis.plugin.Signature;
 import org.apache.ibatis.reflection.MetaObject;
 import org.apache.ibatis.reflection.SystemMetaObject;
 import org.dromara.mybatis.jpa.JpaService;
-import org.dromara.mybatis.jpa.entity.JpaPagination;
-import org.dromara.mybatis.jpa.entity.PageResultsSqlCache;
+import org.dromara.mybatis.jpa.entity.JpaPage;
+import org.dromara.mybatis.jpa.entity.JpaPageResultsSqlCache;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -70,20 +70,20 @@ public class StatementHandlerInterceptor extends AbstractStatementHandlerInterce
 			String sql = boundSql.getSql();
 			logger.trace("parameter object  ==> {}" , parameterObject);
 			//判断是否select语句及需要分页支持
-			if ((parameterObject instanceof JpaPagination)
+			if ((parameterObject instanceof JpaPage)
 					&& (sql.toLowerCase().trim().startsWith("select")) ) {
-				JpaPagination pagination=(JpaPagination)parameterObject;
+				JpaPage page=(JpaPage)parameterObject;
 				//分页标识
-				if(pagination.isPageable()){
+				if(page.isPageable()){
 					logger.trace("prepare  boundSql  ==> {}" , removeBreakingWhitespace(sql));
 					if(statement instanceof SimpleStatementHandler){
-						sql = dialect.getLimitString(sql, pagination);
+						sql = dialect.getLimitString(sql, page);
 					}else if(statement instanceof PreparedStatementHandler){
 						JpaService.pageResultsBoundSqlCache.put(
-								pagination.getPageResultSelectUUID(), 
-								new PageResultsSqlCache(sql,boundSql)
+								page.getPageResultSelectUUID(), 
+								new JpaPageResultsSqlCache(sql,boundSql)
 								);
-						sql = dialect.getLimitString(sql, pagination);
+						sql = dialect.getLimitString(sql, page);
 					}
 					logger.trace("prepare dialect boundSql : {}" , removeBreakingWhitespace(sql));
 					metaObject.setValue("boundSql.sql", sql);

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/provider/PageResultsCountProvider.java

@@ -24,8 +24,8 @@ import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.ParameterMapping;
 import org.dromara.mybatis.jpa.JpaService;
 import org.dromara.mybatis.jpa.entity.JpaEntity;
-import org.dromara.mybatis.jpa.entity.JpaPagination;
-import org.dromara.mybatis.jpa.entity.PageResultsSqlCache;
+import org.dromara.mybatis.jpa.entity.JpaPage;
+import org.dromara.mybatis.jpa.entity.JpaPageResultsSqlCache;
 import org.dromara.mybatis.jpa.metadata.SqlSyntaxConstants;
 import org.dromara.mybatis.jpa.util.StringUtils;
 import org.slf4j.Logger;
@@ -44,10 +44,10 @@ public class PageResultsCountProvider <T extends JpaEntity>{
 	 * @return executePageResultsCount sql String
 	 */
 	public String executePageResultsCount(T entity) {
-		JpaPagination pagination=(JpaPagination)entity;
+		JpaPage page=(JpaPage)entity;
 		//获取缓存数据
-		PageResultsSqlCache pageResultsSqlCache = 
-				JpaService.pageResultsBoundSqlCache.getIfPresent(pagination.getPageResultSelectUUID());
+		JpaPageResultsSqlCache pageResultsSqlCache = 
+				JpaService.pageResultsBoundSqlCache.getIfPresent(page.getPageResultSelectUUID());
 		//多个空格 tab 替换成1个空格
 		String selectSql = StringUtils.lineBreak2Blank(pageResultsSqlCache.getSql());
 		
@@ -90,7 +90,7 @@ public class PageResultsCountProvider <T extends JpaEntity>{
 			}
 		}
 		//删除缓存
-		JpaService.pageResultsBoundSqlCache.invalidate(pagination.getPageResultSelectUUID());
+		JpaService.pageResultsBoundSqlCache.invalidate(page.getPageResultSelectUUID());
 		logger.trace("Count SQL : \n{}" , sql);
 		return sql.toString();
 	}