refactor package

daileyet · daileyet · commit eb06707eb23a · 2015-07-29T20:39:37.000+08:00
diff --git a/src/openthinks/libs/sql/dao/impl/BaseDaoImpl.java b/src/openthinks/libs/sql/dao/impl/BaseDaoImpl.java
@@ -17,7 +17,7 @@
 import openthinks.libs.sql.dao.BaseDao;
 import openthinks.libs.sql.data.DefaultRow;
 import openthinks.libs.sql.data.Row;
-import openthinks.libs.sql.dhibernate.support.ColumnAttributeMapping;
+import openthinks.libs.sql.entity.ColumnAttributeMapping;
 import openthinks.libs.sql.entity.Entity;
 import openthinks.libs.sql.lang.Condition;
 import openthinks.libs.sql.lang.Configurator;
diff --git a/src/openthinks/libs/sql/data/AbstractRow.java b/src/openthinks/libs/sql/data/AbstractRow.java
@@ -1,7 +1,7 @@
 package openthinks.libs.sql.data;
 
 import openthinks.libs.sql.data.Row;
-import openthinks.libs.sql.dhibernate.support.ColumnAttribute;
+import openthinks.libs.sql.entity.ColumnAttribute;
 
 /**
  * 实现数据行接口的抽象行类
diff --git a/src/openthinks/libs/sql/data/DefaultRow.java b/src/openthinks/libs/sql/data/DefaultRow.java
@@ -1,6 +1,6 @@
 package openthinks.libs.sql.data;
 
-import openthinks.libs.sql.dhibernate.support.ColumnAttribute;
+import openthinks.libs.sql.entity.ColumnAttribute;
 
 /**
  * 默认实现数据行接口的抽象默认行类
diff --git a/src/openthinks/libs/sql/data/Row.java b/src/openthinks/libs/sql/data/Row.java
@@ -4,7 +4,7 @@
  */
 package openthinks.libs.sql.data;
 
-import openthinks.libs.sql.dhibernate.support.ColumnAttribute;
+import openthinks.libs.sql.entity.ColumnAttribute;
 
 /**
  * 数据表的一行实体记录接口
diff --git a/src/openthinks/libs/sql/dhibernate/support/AbstractSession.java b/src/openthinks/libs/sql/dhibernate/support/AbstractSession.java
@@ -35,6 +35,8 @@
 import openthinks.libs.sql.dhibernate.Session;
 import openthinks.libs.sql.dhibernate.support.query.Query;
 import openthinks.libs.sql.dhibernate.support.query.impl.Queryer;
+import openthinks.libs.sql.dhibernate.support.template.SQLType;
+import openthinks.libs.sql.dhibernate.support.template.Template;
 import openthinks.libs.sql.entity.Entity;
 import openthinks.libs.sql.exception.TransactionBackException;
 import openthinks.libs.sql.exception.TransactionBeginException;
diff --git a/src/openthinks/libs/sql/dhibernate/support/query/impl/AbstractQueryFilter.java b/src/openthinks/libs/sql/dhibernate/support/query/impl/AbstractQueryFilter.java
@@ -25,10 +25,10 @@
  */
 package openthinks.libs.sql.dhibernate.support.query.impl;
 
-import openthinks.libs.sql.dhibernate.support.ColumnAttribute;
-import openthinks.libs.sql.dhibernate.support.SQLDialectUtils;
 import openthinks.libs.sql.dhibernate.support.query.QueryFilter;
 import openthinks.libs.sql.dhibernate.support.query.Relativization;
+import openthinks.libs.sql.dhibernate.support.template.SQLDialectUtils;
+import openthinks.libs.sql.entity.ColumnAttribute;
 import openthinks.libs.sql.lang.reflect.ReflectEngine;
 import openthinks.libs.utilities.Checker;
 
diff --git a/src/openthinks/libs/sql/dhibernate/support/query/impl/FilterSQLTemplate.java b/src/openthinks/libs/sql/dhibernate/support/query/impl/FilterSQLTemplate.java
@@ -31,13 +31,13 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import openthinks.libs.sql.dhibernate.support.ColumnAttributeMapping;
-import openthinks.libs.sql.dhibernate.support.FilterTemplate;
-import openthinks.libs.sql.dhibernate.support.SQLType;
-import openthinks.libs.sql.dhibernate.support.StandardSQLTemplate;
 import openthinks.libs.sql.dhibernate.support.query.QueryFilter;
 import openthinks.libs.sql.dhibernate.support.query.QueryFilterConnect;
 import openthinks.libs.sql.dhibernate.support.query.Relativization;
+import openthinks.libs.sql.dhibernate.support.template.FilterTemplate;
+import openthinks.libs.sql.dhibernate.support.template.SQLType;
+import openthinks.libs.sql.dhibernate.support.template.StandardSQLTemplate;
+import openthinks.libs.sql.entity.ColumnAttributeMapping;
 import openthinks.libs.sql.exception.IllegalQueryFilterException;
 
 /**
diff --git a/src/openthinks/libs/sql/dhibernate/support/query/impl/Queryer.java b/src/openthinks/libs/sql/dhibernate/support/query/impl/Queryer.java
@@ -28,9 +28,9 @@
 import java.util.List;
 
 import openthinks.libs.sql.dhibernate.Session;
-import openthinks.libs.sql.dhibernate.support.FilterTemplate;
 import openthinks.libs.sql.dhibernate.support.query.Query;
 import openthinks.libs.sql.dhibernate.support.query.QueryFilter;
+import openthinks.libs.sql.dhibernate.support.template.FilterTemplate;
 import openthinks.libs.sql.lang.reflect.ReflectEngine;
 import openthinks.libs.utilities.Converter;
 
diff --git a/src/openthinks/libs/sql/dhibernate/support/template/FilterTemplate.java b/src/openthinks/libs/sql/dhibernate/support/template/FilterTemplate.java
@@ -17,13 +17,13 @@
  * under the License. 
  * 
  * @Title: FilterTemplate.java 
- * @Package openthinks.libs.sql.dhibernate.support 
+ * @Package openthinks.libs.sql.dhibernate.support.template
  * @Description: TODO
  * @author minjdai 
  * @date 2013-12-2
  * @version V1.0 
  */
-package openthinks.libs.sql.dhibernate.support;
+package openthinks.libs.sql.dhibernate.support.template;
 
 import openthinks.libs.sql.dhibernate.support.query.QueryFilter;
 
diff --git a/src/openthinks/libs/sql/dhibernate/support/template/SQLDialectUtils.java b/src/openthinks/libs/sql/dhibernate/support/template/SQLDialectUtils.java
@@ -17,13 +17,13 @@
  * under the License. 
  * 
  * @Title: SQLDialectUtils.java 
- * @Package openthinks.libs.sql.dhibernate.support 
+ * @Package openthinks.libs.sql.dhibernate.support.template
  * @Description: TODO
  * @author minjdai 
  * @date 2013-12-2
  * @version V1.0 
  */
-package openthinks.libs.sql.dhibernate.support;
+package openthinks.libs.sql.dhibernate.support.template;
 
 import openthinks.libs.sql.lang.Configurator;
 import openthinks.libs.sql.lang.ConfiguratorFactory;
diff --git a/src/openthinks/libs/sql/dhibernate/support/template/SQLType.java b/src/openthinks/libs/sql/dhibernate/support/template/SQLType.java
@@ -17,13 +17,13 @@
  * under the License. 
  * 
  * @Title: SQLType.java 
- * @Package openthinks.libs.sql.dhibernate.support 
+ * @Package openthinks.libs.sql.dhibernate.support.template
  * @Description: TODO
  * @author dailey 
  * @date 2012-11-8
  * @version V1.0 
  */
-package openthinks.libs.sql.dhibernate.support;
+package openthinks.libs.sql.dhibernate.support.template;
 
 /**
  * generate SQL type
diff --git a/src/openthinks/libs/sql/dhibernate/support/template/StandardSQLTemplate.java b/src/openthinks/libs/sql/dhibernate/support/template/StandardSQLTemplate.java
@@ -17,20 +17,23 @@
  * under the License. 
  * 
  * @Title: StandardSQLTemplate.java 
- * @Package openthinks.libs.sql.dhibernate.support
+ * @Package openthinks.libs.sql.dhibernate.support.template
  * @Description: TODO
  * @author dailey 
  * @date 2012-11-8
  * @version V1.0 
  */
-package openthinks.libs.sql.dhibernate.support;
+package openthinks.libs.sql.dhibernate.support.template;
 
-import static openthinks.libs.sql.dhibernate.support.SQLDialectUtils.wrapColumnName;
-import static openthinks.libs.sql.dhibernate.support.SQLDialectUtils.wrapColumnValue;
+import static openthinks.libs.sql.dhibernate.support.template.SQLDialectUtils.wrapColumnName;
+import static openthinks.libs.sql.dhibernate.support.template.SQLDialectUtils.wrapColumnValue;
 
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Field;
 
+import openthinks.libs.sql.entity.ColumnAttribute;
+import openthinks.libs.sql.entity.ColumnAttributeMapping;
+import openthinks.libs.sql.entity.key.IDType;
 import openthinks.libs.sql.entity.key.IdGenerator;
 import openthinks.libs.sql.lang.reflect.ReflectEngine;
 import openthinks.libs.utilities.Checker;
diff --git a/src/openthinks/libs/sql/dhibernate/support/template/Template.java b/src/openthinks/libs/sql/dhibernate/support/template/Template.java
@@ -17,13 +17,13 @@
  * under the License. 
  * 
  * @Title: Template.java 
- * @Package openthinks.libs.sql.dhibernate.support
+ * @Package openthinks.libs.sql.dhibernate.support.template
  * @Description: TODO
  * @author dailey 
  * @date 2012-11-8
  * @version V1.0 
  */
-package openthinks.libs.sql.dhibernate.support;
+package openthinks.libs.sql.dhibernate.support.template;
 
 /**
  * 
diff --git a/src/openthinks/libs/sql/entity/ColumnAttribute.java b/src/openthinks/libs/sql/entity/ColumnAttribute.java
@@ -17,13 +17,15 @@
  * under the License. 
  * 
  * @Title: ColumnAttribute.java 
- * @Package openthinks.libs.sql.dhibernate.support 
+ * @Package openthinks.libs.sql.entity
  * @Description: TODO
  * @author dailey 
  * @date 2012-11-9
  * @version V1.0 
  */
-package openthinks.libs.sql.dhibernate.support;
+package openthinks.libs.sql.entity;
+
+import openthinks.libs.sql.entity.key.IDType;
 
 /**
  * The information which holds the attribute name and column name in entity and table
diff --git a/src/openthinks/libs/sql/entity/ColumnAttributeMapping.java b/src/openthinks/libs/sql/entity/ColumnAttributeMapping.java
@@ -17,13 +17,13 @@
  * under the License. 
  * 
  * @Title: ColumnAttributeMapping.java 
- * @Package openthinks.libs.sql.dhibernate.support 
+ * @Package openthinks.libs.sql.entity 
  * @Description: TODO
  * @author dailey 
  * @date 2012-11-9
  * @version V1.0 
  */
-package openthinks.libs.sql.dhibernate.support;
+package openthinks.libs.sql.entity;
 
 import java.util.HashSet;
 import java.util.Iterator;
diff --git a/src/openthinks/libs/sql/entity/Entity.java b/src/openthinks/libs/sql/entity/Entity.java
@@ -8,9 +8,7 @@
 import java.util.Map;
 
 import openthinks.libs.sql.data.AbstractRow;
-import openthinks.libs.sql.dhibernate.support.ColumnAttribute;
-import openthinks.libs.sql.dhibernate.support.ColumnAttributeMapping;
-import openthinks.libs.sql.dhibernate.support.IDType;
+import openthinks.libs.sql.entity.key.IDType;
 import openthinks.libs.sql.exception.EntityReflectException;
 import openthinks.libs.utilities.Converter;
 
diff --git a/src/openthinks/libs/sql/entity/jpa/EntityReflectHandler.java b/src/openthinks/libs/sql/entity/jpa/EntityReflectHandler.java
@@ -27,8 +27,8 @@
 
 import java.lang.reflect.Field;
 
-import openthinks.libs.sql.dhibernate.support.ColumnAttribute;
-import openthinks.libs.sql.dhibernate.support.ColumnAttributeMapping;
+import openthinks.libs.sql.entity.ColumnAttribute;
+import openthinks.libs.sql.entity.ColumnAttributeMapping;
 import openthinks.libs.sql.entity.Entity;
 
 import org.apache.log4j.Logger;
diff --git a/src/openthinks/libs/sql/entity/jpa/IReflectHandler.java b/src/openthinks/libs/sql/entity/jpa/IReflectHandler.java
@@ -25,7 +25,7 @@
  */
 package openthinks.libs.sql.entity.jpa;
 
-import openthinks.libs.sql.dhibernate.support.ColumnAttributeMapping;
+import openthinks.libs.sql.entity.ColumnAttributeMapping;
 
 /**
  * The interface to handle different entity object
diff --git a/src/openthinks/libs/sql/entity/jpa/JPAReflectHandler.java b/src/openthinks/libs/sql/entity/jpa/JPAReflectHandler.java
@@ -37,9 +37,9 @@
 import javax.persistence.Id;
 import javax.persistence.Table;
 
-import openthinks.libs.sql.dhibernate.support.ColumnAttribute;
-import openthinks.libs.sql.dhibernate.support.ColumnAttributeMapping;
-import openthinks.libs.sql.dhibernate.support.IDType;
+import openthinks.libs.sql.entity.ColumnAttribute;
+import openthinks.libs.sql.entity.ColumnAttributeMapping;
+import openthinks.libs.sql.entity.key.IDType;
 import openthinks.libs.sql.lang.reflect.ReflectEntity;
 import openthinks.libs.utilities.Converter;
 
diff --git a/src/openthinks/libs/sql/entity/key/IDType.java b/src/openthinks/libs/sql/entity/key/IDType.java
@@ -17,13 +17,13 @@
  * under the License. 
  * 
  * @Title: IDType.java 
- * @Package openthinks.libs.sql.dhibernate.support 
+ * @Package openthinks.libs.sql.entity.key
  * @Description: TODO
  * @author dailey 
  * @date 2012-11-9
  * @version V1.0 
  */
-package openthinks.libs.sql.dhibernate.support;
+package openthinks.libs.sql.entity.key;
 
 /**
  * The generate strategy of primary key value for database table
diff --git a/src/openthinks/libs/sql/lang/DateFormatUtils.java b/src/openthinks/libs/sql/lang/DateFormatUtils.java
@@ -1,4 +1,4 @@
-package openthinks.libs.sql.entity.key;
+package openthinks.libs.sql.lang;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
diff --git a/src/openthinks/libs/sql/lang/reflect/ReflectEngine.java b/src/openthinks/libs/sql/lang/reflect/ReflectEngine.java
@@ -29,12 +29,12 @@
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
-import openthinks.libs.sql.dhibernate.support.ColumnAttributeMapping;
-import openthinks.libs.sql.dhibernate.support.FilterTemplate;
-import openthinks.libs.sql.dhibernate.support.StandardSQLTemplate;
-import openthinks.libs.sql.dhibernate.support.Template;
 import openthinks.libs.sql.dhibernate.support.query.QueryFilter;
 import openthinks.libs.sql.dhibernate.support.query.impl.FilterSQLTemplate;
+import openthinks.libs.sql.dhibernate.support.template.FilterTemplate;
+import openthinks.libs.sql.dhibernate.support.template.StandardSQLTemplate;
+import openthinks.libs.sql.dhibernate.support.template.Template;
+import openthinks.libs.sql.entity.ColumnAttributeMapping;
 import openthinks.libs.sql.entity.Entity;
 import openthinks.libs.sql.entity.jpa.EntityReflectHandler;
 import openthinks.libs.sql.entity.jpa.IReflectHandler;
@@ -155,7 +155,7 @@ public static <T> ColumnAttributeMapping parseEntityClass(Class<T> entityClass)
 	}
 
 	/**
-	 * create template for standard sql by entity class<BR>
+	 * create template for standard SQL by entity class<BR>
 	 * 1. JPA annotation on param entityClass<BR>
 	 * 2. subclass from {@link Entity}
 	 * 
@@ -170,7 +170,14 @@ public static <T> Template createSQLTemplate(Class<T> entityClass) {
 		return template;
 	}
 
-	//TODO
+	/**
+	 * create template for standard query SQL by entity class<BR>
+	 * 1. JPA annotation on param entityClass<BR>
+	 * 2. subclass from {@link Entity}
+	 * @param entityClass  Class<T>
+	 * @param filter	QueryFilter
+	 * @return FilterTemplate
+	 */
 	public static <T> FilterTemplate createSQLTemplate(Class<T> entityClass, QueryFilter filter) {
 		FilterTemplate template = null;
 		ColumnAttributeMapping columnAttributeMapping = parseEntityClass(entityClass);
diff --git a/test/openthinks/libs/sql/FilterSqlTemplateTest.java b/test/openthinks/libs/sql/FilterSqlTemplateTest.java
@@ -1,11 +1,11 @@
 package openthinks.libs.sql;
 
-import openthinks.libs.sql.dhibernate.support.FilterTemplate;
 import openthinks.libs.sql.dhibernate.support.query.QueryFilter;
 import openthinks.libs.sql.dhibernate.support.query.Relativization;
 import openthinks.libs.sql.dhibernate.support.query.impl.EqualsFilter;
 import openthinks.libs.sql.dhibernate.support.query.impl.OrFilterConnect;
 import openthinks.libs.sql.dhibernate.support.query.impl.QueryFilterGroup;
+import openthinks.libs.sql.dhibernate.support.template.FilterTemplate;
 import openthinks.libs.sql.lang.reflect.ReflectEngine;
 
 import org.junit.Assert;
