n/a

Author: daileyet

src/openthinks/libs/sql/dao/impl/BaseDaoImpl.java

@@ -14,8 +14,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.log4j.Logger;
-
 import openthinks.libs.sql.dao.BaseDao;
 import openthinks.libs.sql.data.DefaultRow;
 import openthinks.libs.sql.data.Row;
@@ -27,6 +25,8 @@
 import openthinks.libs.sql.lang.reflect.ReflectEngine;
 import openthinks.libs.utilities.Checker;
 
+import org.apache.log4j.Logger;
+
 /**
  * BaseDao接口默认实现类
  * 
@@ -54,8 +54,7 @@ public BaseDaoImpl() {
 					setLogger(logger);
 			}
 			if (configurator == null) {
-				Configurator config = ConfiguratorFactory
-						.getDefaultInstance(this.getClass());
+				Configurator config = ConfiguratorFactory.getDefaultInstance(this.getClass());
 				if (config != null)
 					setConfigurator(config);
 			}
@@ -111,10 +110,8 @@ public void setConfigurator(Configurator configurator) {
 		this.configurator = configurator;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see sql.dao.BaseDao#isUsePool()
+	/**
+	 * {@inheritDoc}
 	 */
 	@Override
 	public boolean isUsePool() {
@@ -159,8 +156,7 @@ public ResultSet executeQuery(String sql, String[] params) {
 	 */
 	@Override
 	public ResultSet executeQuery(Condition condition) {
-		return condition == null ? null : executeQuery(Condition
-				.getFullSql(condition));
+		return condition == null ? null : executeQuery(Condition.getFullSql(condition));
 	}
 
 	/**
@@ -198,8 +194,7 @@ public Object executeScalar(String sql, String[] params) {
 	 */
 	@Override
 	public Object executeScalar(Condition condition) {
-		return condition == null ? null : executeScalar(Condition
-				.getFullSql(condition));
+		return condition == null ? null : executeScalar(Condition.getFullSql(condition));
 	}
 
 	/**
@@ -251,8 +246,8 @@ public int executeSql(Condition condition) {
 	@Override
 	public Connection getConn() throws ClassNotFoundException, SQLException {
 		Class.forName(configurator.getDriver());
-		Connection conn = DriverManager.getConnection(configurator.getUrl(),
-				configurator.getUserName(), configurator.getUserPwd());
+		Connection conn = DriverManager.getConnection(configurator.getUrl(), configurator.getUserName(),
+				configurator.getUserPwd());
 		return conn;
 	}
 
@@ -277,8 +272,7 @@ public List<Row> list(String sql, String[] params) {
 					for (int i = 1; i <= count; i++) {
 						values[i - 1] = rs.getObject(rsmd.getColumnName(i));
 					}
-					Row row = new DefaultRow(columnAttributeMapping.toArray(),
-							values);// 创建一行记录
+					Row row = new DefaultRow(columnAttributeMapping.toArray(), values);// 创建一行记录
 					list.add(row);
 				}
 			} catch (SQLException ex) {
@@ -309,6 +303,7 @@ public List<Row> list(Condition condition) {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Deprecated
 	@Override
 	public <T extends Entity> List<T> listEntity(Class<T> clz, String sql) {
 		return listEntity(clz, sql, null);
@@ -317,26 +312,23 @@ public <T extends Entity> List<T> listEntity(Class<T> clz, String sql) {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Deprecated
 	@Override
-	public <T extends Entity> List<T> listEntity(Class<T> clz, String sql,
-			String[] params) {
+	public <T extends Entity> List<T> listEntity(Class<T> clz, String sql, String[] params) {
 		return list(clz, sql, params);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
+	@Deprecated
 	@Override
-	public <T extends Entity> List<T> listEntity(Class<T> clz,
-			Condition condition) {
-		return condition == null ? Collections.<T> emptyList() : listEntity(
-				clz, Condition.getFullSql(condition));
+	public <T extends Entity> List<T> listEntity(Class<T> clz, Condition condition) {
+		return condition == null ? Collections.<T> emptyList() : listEntity(clz, Condition.getFullSql(condition));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see sql.dao.BaseDao#list(java.lang.Class)
+	/**
+	 * {@inheritDoc}
 	 */
 	@Override
 	public <T> List<T> list(Class<T> clz) {
@@ -375,8 +367,7 @@ public <T> List<T> list(Class<T> clz, String sql, String[] params) {
 						try {
 							String columnName = rsmd.getColumnName(i);
 							Object columnValue = rs.getObject(columnName);
-							ReflectEngine.propertyReflect(entity, columnName,
-									columnValue);
+							ReflectEngine.propertyReflect(entity, columnName, columnValue);
 						} catch (Exception e) {
 							logger.warn(e);
 							continue;
@@ -400,8 +391,7 @@ public <T> List<T> list(Class<T> clz, String sql, String[] params) {
 	 */
 	@Override
 	public <T> List<T> list(Class<T> clz, Condition condition) {
-		return condition == null ? Collections.<T> emptyList() : list(clz,
-				Condition.getFullSql(condition));
+		return condition == null ? Collections.<T> emptyList() : list(clz, Condition.getFullSql(condition));
 	}
 
 	/**
@@ -445,7 +435,7 @@ public void closeConnection(Connection conn) {
 				logger.error(e);
 			}
 		}
-		if(conn != null && isUsePool() ){
+		if (conn != null && isUsePool()) {
 			//TODO put it back to pool
 		}
 	}

src/openthinks/libs/sql/dhibernate/support/AbstractSession.java

@@ -81,9 +81,6 @@ protected void setAutoClose(Boolean autoClose) {
 	 */
 	public abstract BaseDao getBaseDao();
 
-	/**
-	 * @return Boolean if is autoClose
-	 */
 	@Override
 	public Boolean isAutoClose() {
 		return autoClose;