new package

RemoteSystemsTempFiles/.project

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>RemoteSystemsTempFiles</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.rse.ui.remoteSystemsTempNature</nature>
+	</natures>
+</projectDescription>

mybatis-jpa-extra-core/src/main/java/org/apache/mybatis/jpa/domain/BaseDomain.java → mybatis-jpa-extra-core/src/main/java/org/apache/mybatis/jpa/persistence/JpaBaseDomain.java

-package org.apache.mybatis.jpa.domain;
+package org.apache.mybatis.jpa.persistence;
 
 import java.io.Serializable;
 import java.util.UUID;
@@ -9,7 +9,7 @@ import java.util.UUID;
  * @author Crystal.sea
  * 
  */
-public class BaseDomain extends Pagination implements Serializable{
+public class JpaBaseDomain extends JpaPagination implements Serializable{
 	/**
 	 * 
 	 */

mybatis-jpa-extra-core/src/main/java/org/apache/mybatis/jpa/service/JpaBaseService.java → mybatis-jpa-extra-core/src/main/java/org/apache/mybatis/jpa/persistence/JpaBaseService.java

-package org.apache.mybatis.jpa.service;
+package org.apache.mybatis.jpa.persistence;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -6,9 +6,6 @@ import java.time.Duration;
 import java.util.List;
 import org.apache.log4j.Logger;
 import org.apache.mybatis.jpa.PageResultsSqlCache;
-import org.apache.mybatis.jpa.domain.BaseDomain;
-import org.apache.mybatis.jpa.domain.PageResults;
-import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
 import org.apache.mybatis.jpa.util.BeanUtil;
 import org.apache.mybatis.jpa.util.InstanceUtil;
 import org.apache.mybatis.jpa.util.WebContext;
@@ -23,7 +20,7 @@ import org.ehcache.config.builders.UserManagedCacheBuilder;
  *
  * @param <T>
  */
-public  class  JpaBaseService <T extends BaseDomain> {
+public  class  JpaBaseService <T extends JpaBaseDomain> {
 	
 	final static Logger log = Logger.getLogger(JpaBaseService.class);
 	
@@ -111,7 +108,7 @@ public  class  JpaBaseService <T extends BaseDomain> {
 	 * @param entity
 	 * @return
 	 */
-	public PageResults<T> queryPageResults(T entity) {
+	public JpaPageResults<T> queryPageResults(T entity) {
 		entity.setPageResultSelectUUID(entity.generateId());
 		entity.setStartRow(calculateStartRow(entity.getPage() ,entity.getPageResults()));
 		
@@ -127,7 +124,7 @@ public  class  JpaBaseService <T extends BaseDomain> {
 			totalCount=parseCount(getMapper().queryPageResultsCount(entity));
 		}
 		
-		return new PageResults<T>(entity.getPage(),entity.getPageResults(),totalPage,totalCount,resultslist);
+		return new JpaPageResults<T>(entity.getPage(),entity.getPageResults(),totalPage,totalCount,resultslist);
 	}
 	
 	
@@ -139,7 +136,7 @@ public  class  JpaBaseService <T extends BaseDomain> {
 	 * @return
 	 */
 	@SuppressWarnings("unchecked")
-	public PageResults<T> queryPageResults(String mapperId,T entity) {
+	public JpaPageResults<T> queryPageResults(String mapperId,T entity) {
 		entity.setPageResultSelectUUID(entity.generateId());
 		entity.setStartRow(calculateStartRow(entity.getPage() ,entity.getPageResults()));
 		
@@ -161,7 +158,7 @@ public  class  JpaBaseService <T extends BaseDomain> {
 			totalCount=parseCount(getMapper().queryPageResultsCount(entity));
 		}
 		
-		return new PageResults<T>(entity.getPage(),entity.getPageResults(),totalPage,totalCount,resultslist);
+		return new JpaPageResults<T>(entity.getPage(),entity.getPageResults(),totalPage,totalCount,resultslist);
 	}
 	
 	/**
@@ -382,7 +379,7 @@ public  class  JpaBaseService <T extends BaseDomain> {
 	 * @param totalCount
 	 * @return
 	 */
-	public Integer calculateTotalPage(BaseDomain entity,Integer totalCount){
+	public Integer calculateTotalPage(JpaBaseDomain entity,Integer totalCount){
 		return (totalCount + entity.getPageResults() - 1) / entity.getPageResults();
 	}
 	

mybatis-jpa-extra-core/src/main/java/org/apache/mybatis/jpa/domain/PageResults.java → mybatis-jpa-extra-core/src/main/java/org/apache/mybatis/jpa/persistence/JpaPageResults.java

-package org.apache.mybatis.jpa.domain;
+package org.apache.mybatis.jpa.persistence;
 
 import java.util.List;
 
@@ -17,8 +17,8 @@ import org.slf4j.LoggerFactory;
  *
  * @param <T>
  */
-public  class PageResults <T>{
-	private final Logger _logger = LoggerFactory.getLogger(PageResults.class);
+public  class JpaPageResults <T>{
+	private final Logger _logger = LoggerFactory.getLogger(JpaPageResults.class);
 	
 	private int page=0;//当前页
 	
@@ -33,7 +33,7 @@ public  class PageResults <T>{
 	/**
 	 * 
 	 */
-	public PageResults() {
+	public JpaPageResults() {
 		_logger.debug("Grid.");
 		
 	}
@@ -42,7 +42,7 @@ public  class PageResults <T>{
 	 * @param pageResults
 	 * @param recordsCount
 	 */
-	public PageResults(int currentPage,int pageResults,Long recordsCount) {
+	public JpaPageResults(int currentPage,int pageResults,Long recordsCount) {
 		pageCount(currentPage,pageResults, recordsCount);
 		_logger.debug("Grid page : "+page+" , records : "+records+" , total : "+total);
 	}
@@ -53,7 +53,7 @@ public  class PageResults <T>{
 	 * @param recordsCount
 	 * @param rows
 	 */
-	public PageResults(int currentPage,int pageResults,Long recordsCount,List<T> rows) {
+	public JpaPageResults(int currentPage,int pageResults,Long recordsCount,List<T> rows) {
 		pageCount(currentPage,pageResults, recordsCount);
 		this.rows=rows;
 	}
@@ -65,7 +65,7 @@ public  class PageResults <T>{
 	 * @param recordsCount
 	 * @param rows
 	 */
-	public PageResults(int currentPage,int pageResults,Integer recordsCount,List<T> rows) {
+	public JpaPageResults(int currentPage,int pageResults,Integer recordsCount,List<T> rows) {
 		pageCount(currentPage,pageResults, recordsCount);
 		this.rows=rows;
 	}
@@ -78,7 +78,7 @@ public  class PageResults <T>{
 	 * @param recordsCount
 	 * @param rows
 	 */
-	public PageResults(int currentPage,int pageResults,int totalPage,Long recordsCount,List<T> rows) {
+	public JpaPageResults(int currentPage,int pageResults,int totalPage,Long recordsCount,List<T> rows) {
 		pageCount(currentPage,pageResults, recordsCount);
 		this.rows=rows;
 		this.totalPage=totalPage;
@@ -92,7 +92,7 @@ public  class PageResults <T>{
 	 * @param recordsCount
 	 * @param rows
 	 */
-	public PageResults(int currentPage,int pageResults,int totalPage,Integer recordsCount,List<T> rows) {
+	public JpaPageResults(int currentPage,int pageResults,int totalPage,Integer recordsCount,List<T> rows) {
 		pageCount(currentPage,pageResults, recordsCount);
 		this.rows=rows;
 		this.totalPage=totalPage;

mybatis-jpa-extra-core/src/main/java/org/apache/mybatis/jpa/domain/Pagination.java → mybatis-jpa-extra-core/src/main/java/org/apache/mybatis/jpa/persistence/JpaPagination.java

 /**
  * 
  */
-package org.apache.mybatis.jpa.domain;
+package org.apache.mybatis.jpa.persistence;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
 
@@ -10,7 +10,7 @@ import org.codehaus.jackson.annotate.JsonIgnore;
  * @author Crystal.Sea
  *
  */
-public class Pagination {
+public class JpaPagination {
 	
 	@JsonIgnore
 	protected int rows;

mybatis-jpa-extra-core/src/main/java/org/apache/mybatis/jpa/domain/package-info.java → mybatis-jpa-extra-core/src/main/java/org/apache/mybatis/jpa/persistence/package-info.java

@@ -5,4 +5,4 @@
  * @author user
  *
  */
-package org.apache.mybatis.jpa.domain;
\ No newline at end of file
+package org.apache.mybatis.jpa.persistence;
\ No newline at end of file