Author: cbegin Date: Fri Oct 27 09:40:55 2006 New Revision: 468449 URL: http://svn.apache.org/viewvc?view=rev&rev=468449 Log: Deprecated PaginatedList features. Removed some spike tests for super auto Mapper etc.
Removed: ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/BindingTest.java ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/mapper/ ibatis/trunk/java/mapper/mapper2/test/testdomain/DocumentMapper.java Modified: ibatis/trunk/java/mapper/mapper2/build/version.properties ibatis/trunk/java/mapper/mapper2/doc/release.txt ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/util/PaginatedArrayList.java ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/util/PaginatedList.java ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/client/SqlMapExecutor.java ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapClientImpl.java ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapExecutorDelegate.java ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapSessionImpl.java ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/statement/PaginatedDataList.java Modified: ibatis/trunk/java/mapper/mapper2/build/version.properties URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/build/version.properties?view=diff&rev=468449&r1=468448&r2=468449 ============================================================================== --- ibatis/trunk/java/mapper/mapper2/build/version.properties (original) +++ ibatis/trunk/java/mapper/mapper2/build/version.properties Fri Oct 27 09:40:55 2006 @@ -1,5 +1,5 @@ #Build version info -#Fri Oct 27 09:50:36 MDT 2006 +#Fri Oct 27 10:30:41 MDT 2006 version=2.2.1 -buildDate=2006/10/27 09\:50 -buildNum=652 +buildDate=2006/10/27 10\:30 +buildNum=656 Modified: ibatis/trunk/java/mapper/mapper2/doc/release.txt URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/doc/release.txt?view=diff&rev=468449&r1=468448&r2=468449 ============================================================================== --- ibatis/trunk/java/mapper/mapper2/doc/release.txt (original) +++ ibatis/trunk/java/mapper/mapper2/doc/release.txt Fri Oct 27 09:40:55 2006 @@ -4,6 +4,7 @@ ------------------------------ 2.2.1 - ??? ------------------------------ + o DEPRECATED All PaginatedList related features due to misuse, minimal applicability and inflexibility o DEPRECATED DAO Framework -- Removed from primary distribution, available as a separate download o Removed DAO framework from Subversion source tree (tagged before removal) o Changed deployment file naming convention, dropped "DBL" and lowercased all Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/util/PaginatedArrayList.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/util/PaginatedArrayList.java?view=diff&rev=468449&r1=468448&r2=468449 ============================================================================== --- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/util/PaginatedArrayList.java (original) +++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/util/PaginatedArrayList.java Fri Oct 27 09:40:55 2006 @@ -19,6 +19,7 @@ /** * Implementation of PaginatedList backed by an ArrayList + * @deprecated All paginated list features have been deprecated */ public class PaginatedArrayList implements PaginatedList { Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/util/PaginatedList.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/util/PaginatedList.java?view=diff&rev=468449&r1=468448&r2=468449 ============================================================================== --- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/util/PaginatedList.java (original) +++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/util/PaginatedList.java Fri Oct 27 09:40:55 2006 @@ -19,6 +19,7 @@ /** * Interface for lists that support paging + * @deprecated All paginated list features have been deprecated */ public interface PaginatedList extends List { Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/client/SqlMapExecutor.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/client/SqlMapExecutor.java?view=diff&rev=468449&r1=468448&r2=468449 ============================================================================== --- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/client/SqlMapExecutor.java (original) +++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/client/SqlMapExecutor.java Fri Oct 27 09:40:55 2006 @@ -270,6 +270,7 @@ * @param pageSize The maximum number of result objects each page can hold. * @return A PaginatedList of result objects. * @throws java.sql.SQLException If an error occurs. + * @deprecated All paginated list features have been deprecated */ PaginatedList queryForPaginatedList(String id, Object parameterObject, int pageSize) throws SQLException; @@ -283,6 +284,7 @@ * @param pageSize The maximum number of result objects each page can hold. * @return A PaginatedList of result objects. * @throws java.sql.SQLException If an error occurs. + * @deprecated All paginated list features have been deprecated */ PaginatedList queryForPaginatedList(String id, int pageSize) throws SQLException; Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapClientImpl.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapClientImpl.java?view=diff&rev=468449&r1=468448&r2=468449 ============================================================================== --- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapClientImpl.java (original) +++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapClientImpl.java Fri Oct 27 09:40:55 2006 @@ -25,7 +25,6 @@ import com.ibatis.sqlmap.engine.execution.SqlExecutor; import com.ibatis.sqlmap.engine.mapping.result.ResultObjectFactory; import com.ibatis.sqlmap.engine.mapping.statement.MappedStatement; -import com.ibatis.sqlmap.engine.binding.MapperProxy; import javax.sql.DataSource; import java.sql.Connection; @@ -108,10 +107,16 @@ return getLocalSqlMapSession().queryForList(id, skip, max); } + /** + * @deprecated All paginated list features have been deprecated + */ public PaginatedList queryForPaginatedList(String id, Object paramObject, int pageSize) throws SQLException { return getLocalSqlMapSession().queryForPaginatedList(id, paramObject, pageSize); } + /** + * @deprecated All paginated list features have been deprecated + */ public PaginatedList queryForPaginatedList(String id, int pageSize) throws SQLException { return getLocalSqlMapSession().queryForPaginatedList(id, pageSize); } @@ -246,10 +251,6 @@ public void flushDataCache(String cacheId) { delegate.flushDataCache(cacheId); - } - - public Object getMapper(Class c) { - return MapperProxy.newMapperProxy(this, c); } protected SqlMapSessionImpl getLocalSqlMapSession() { Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapExecutorDelegate.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapExecutorDelegate.java?view=diff&rev=468449&r1=468448&r2=468449 ============================================================================== --- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapExecutorDelegate.java (original) +++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapExecutorDelegate.java Fri Oct 27 09:40:55 2006 @@ -666,6 +666,7 @@ * @param pageSize - the page size * @return - the data list * @throws SQLException - if the query fails + * @deprecated All paginated list features have been deprecated */ public PaginatedList queryForPaginatedList(SessionScope session, String id, Object paramObject, int pageSize) throws SQLException { return new PaginatedDataList(session.getSqlMapExecutor(), id, paramObject, pageSize); Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapSessionImpl.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapSessionImpl.java?view=diff&rev=468449&r1=468448&r2=468449 ============================================================================== --- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapSessionImpl.java (original) +++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapSessionImpl.java Fri Oct 27 09:40:55 2006 @@ -130,10 +130,16 @@ return queryForList(id, null, skip, max); } + /** + * @deprecated All paginated list features have been deprecated + */ public PaginatedList queryForPaginatedList(String id, Object paramObject, int pageSize) throws SQLException { return delegate.queryForPaginatedList(session, id, paramObject, pageSize); } + /** + * @deprecated All paginated list features have been deprecated + */ public PaginatedList queryForPaginatedList(String id, int pageSize) throws SQLException { return queryForPaginatedList(id, null, pageSize); } Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/statement/PaginatedDataList.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/statement/PaginatedDataList.java?view=diff&rev=468449&r1=468448&r2=468449 ============================================================================== --- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/statement/PaginatedDataList.java (original) +++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/statement/PaginatedDataList.java Fri Oct 27 09:40:55 2006 @@ -22,7 +22,9 @@ import java.sql.SQLException; import java.util.*; - +/** + * @deprecated All paginated list features have been deprecated + */ public class PaginatedDataList implements PaginatedList { private SqlMapExecutor sqlMapExecutor;