diff --git a/src/org/redkale/source/CacheSource.java b/src/org/redkale/source/CacheSource.java index 9b747af09..829528503 100644 --- a/src/org/redkale/source/CacheSource.java +++ b/src/org/redkale/source/CacheSource.java @@ -87,49 +87,34 @@ public interface CacheSource { } //---------------------- AsyncHandler 异步版 --------------------------------- - @Deprecated public void existsAsync(final AsyncHandler handler, final K key); - @Deprecated public void getAsync(final AsyncHandler handler, final K key); - @Deprecated public void getAndRefreshAsync(final AsyncHandler handler, final K key, final int expireSeconds); - @Deprecated public void refreshAsync(final AsyncHandler handler, final K key, final int expireSeconds); - @Deprecated public void setAsync(final AsyncHandler handler, final K key, final V value); - @Deprecated public void setAsync(final AsyncHandler handler, final int expireSeconds, final K key, final V value); - @Deprecated public void setExpireSecondsAsync(final AsyncHandler handler, final K key, final int expireSeconds); - @Deprecated public void removeAsync(final AsyncHandler handler, final K key); - @Deprecated public void getCollectionAsync(final AsyncHandler, K> handler, final K key); - @Deprecated public void getCollectionAndRefreshAsync(final AsyncHandler, K> handler, final K key, final int expireSeconds); - @Deprecated public void appendListItemAsync(final AsyncHandler handler, final K key, final V value); - @Deprecated public void removeListItemAsync(final AsyncHandler handler, final K key, final V value); - @Deprecated public void appendSetItemAsync(final AsyncHandler handler, final K key, final V value); - @Deprecated public void removeSetItemAsync(final AsyncHandler handler, final K key, final V value); - @Deprecated default void isOpenAsync(final AsyncHandler handler) { if (handler != null) handler.completed(Boolean.TRUE, null); } diff --git a/src/org/redkale/source/DataJdbcSource.java b/src/org/redkale/source/DataJdbcSource.java index 0a3d3bab7..dea09e02f 100644 --- a/src/org/redkale/source/DataJdbcSource.java +++ b/src/org/redkale/source/DataJdbcSource.java @@ -507,7 +507,7 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi } String sql = "DELETE " + (this.readPool.isMysql() ? "a" : "") + " FROM " + info.getTable(node) + " a" + (join1 == null ? "" : (", " + join1)) + ((where == null || where.length() == 0) ? (join2 == null ? "" : (" WHERE " + join2)) - : (" WHERE " + where + (join2 == null ? "" : (" AND " + join2)))) + info.createSQLOrderby(flipper) + : (" WHERE " + where + (join2 == null ? "" : (" AND " + join2)))) + info.createSQLOrderby(flipper) + ((flipper == null || flipper.getLimit() < 1) ? "" : (" LIMIT " + flipper.getLimit())); if (debug.get() && info.isLoggable(Level.FINEST)) logger.finest(info.getType().getSimpleName() + " delete sql=" + sql); conn.setReadOnly(false); @@ -799,7 +799,7 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi String sql = "UPDATE " + info.getTable(node) + " a " + (join1 == null ? "" : (", " + join1)) + " SET " + info.getSQLColumn("a", column) + " = ?" + ((where == null || where.length() == 0) ? (join2 == null ? "" : (" WHERE " + join2)) - : (" WHERE " + where + (join2 == null ? "" : (" AND " + join2)))); + : (" WHERE " + where + (join2 == null ? "" : (" AND " + join2)))); if (debug.get() && info.isLoggable(Level.FINEST)) logger.finest(info.getType().getSimpleName() + " update sql=" + sql); conn.setReadOnly(false); Blob blob = conn.createBlob(); @@ -812,7 +812,7 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi String sql = "UPDATE " + info.getTable(node) + " a " + (join1 == null ? "" : (", " + join1)) + " SET " + info.getSQLColumn("a", column) + " = " + info.formatToString(value) + ((where == null || where.length() == 0) ? (join2 == null ? "" : (" WHERE " + join2)) - : (" WHERE " + where + (join2 == null ? "" : (" AND " + join2)))); + : (" WHERE " + where + (join2 == null ? "" : (" AND " + join2)))); if (debug.get() && info.isLoggable(Level.FINEST)) logger.finest(info.getType().getSimpleName() + " update sql=" + sql); conn.setReadOnly(false); final Statement stmt = conn.createStatement(); @@ -1053,7 +1053,7 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi } String sql = "UPDATE " + info.getTable(node) + " a " + (join1 == null ? "" : (", " + join1)) + " SET " + setsql + ((where == null || where.length() == 0) ? (join2 == null ? "" : (" WHERE " + join2)) - : (" WHERE " + where + (join2 == null ? "" : (" AND " + join2)))); + : (" WHERE " + where + (join2 == null ? "" : (" AND " + join2)))); //注:LIMIT 仅支持MySQL 且在多表关联式会异常, 该BUG尚未解决 sql += info.createSQLOrderby(flipper) + ((flipper == null || flipper.getLimit() < 1) ? "" : (" LIMIT " + flipper.getLimit())); if (debug.get() && info.isLoggable(Level.FINEST)) logger.finest(info.getType().getSimpleName() + " update sql=" + sql); @@ -1287,7 +1287,7 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi } String sql = "UPDATE " + info.getTable(node) + " a " + (join1 == null ? "" : (", " + join1)) + " SET " + setsql + ((where == null || where.length() == 0) ? (join2 == null ? "" : (" WHERE " + join2)) - : (" WHERE " + where + (join2 == null ? "" : (" AND " + join2)))); + : (" WHERE " + where + (join2 == null ? "" : (" AND " + join2)))); if (debug.get() && info.isLoggable(Level.FINEST)) logger.finest(info.getType().getSimpleName() + " update sql=" + sql); conn.setReadOnly(false); if (blobs != null) { diff --git a/src/org/redkale/source/DataSource.java b/src/org/redkale/source/DataSource.java index efca6eecf..79ab276cb 100644 --- a/src/org/redkale/source/DataSource.java +++ b/src/org/redkale/source/DataSource.java @@ -51,7 +51,6 @@ public interface DataSource { * @param handler 回调函数 * @param values Entity对象 */ - @Deprecated public void insertAsync(final AsyncHandler handler, final T... values); //-------------------------deleteAsync-------------------------- @@ -87,7 +86,6 @@ public interface DataSource { * * */ - @Deprecated public void deleteAsync(final AsyncHandler handler, final T... values); /** @@ -125,7 +123,6 @@ public interface DataSource { * * */ - @Deprecated public void deleteAsync(final AsyncHandler handler, final Class clazz, final Serializable... ids); /** @@ -163,7 +160,6 @@ public interface DataSource { * * */ - @Deprecated public void deleteAsync(final AsyncHandler handler, final Class clazz, final FilterNode node); /** @@ -207,7 +203,6 @@ public interface DataSource { * * */ - @Deprecated public void deleteAsync(final AsyncHandler handler, final Class clazz, final Flipper flipper, final FilterNode node); //------------------------updateAsync--------------------------- @@ -252,7 +247,6 @@ public interface DataSource { * * */ - @Deprecated public void updateAsync(final AsyncHandler handler, final T... values); /** @@ -299,7 +293,6 @@ public interface DataSource { * * */ - @Deprecated public void updateColumnAsync(final AsyncHandler handler, final Class clazz, final Serializable id, final String column, final Serializable value); /** @@ -346,7 +339,6 @@ public interface DataSource { * * */ - @Deprecated public void updateColumnAsync(final AsyncHandler handler, final Class clazz, final String column, final Serializable value, final FilterNode node); /** @@ -390,7 +382,6 @@ public interface DataSource { * * */ - @Deprecated public void updateColumnAsync(final AsyncHandler handler, final Class clazz, final Serializable id, final ColumnValue... values); /** @@ -437,7 +428,6 @@ public interface DataSource { * * */ - @Deprecated public void updateColumnAsync(final AsyncHandler handler, final Class clazz, final FilterNode node, final ColumnValue... values); /** @@ -487,7 +477,6 @@ public interface DataSource { * * */ - @Deprecated public void updateColumnAsync(final AsyncHandler handler, final Class clazz, final FilterNode node, final Flipper flipper, final ColumnValue... values); /** @@ -527,7 +516,6 @@ public interface DataSource { * @param columns 需更新的字段名 * */ - @Deprecated public void updateColumnAsync(final AsyncHandler handler, final T bean, final String... columns); /** @@ -571,7 +559,6 @@ public interface DataSource { * * */ - @Deprecated public void updateColumnAsync(final AsyncHandler handler, final T bean, final FilterNode node, final String... columns); /** @@ -612,7 +599,6 @@ public interface DataSource { * * */ - @Deprecated public void updateColumnAsync(final AsyncHandler handler, final T bean, final SelectColumn selects); /** @@ -656,7 +642,6 @@ public interface DataSource { * * */ - @Deprecated public void updateColumnAsync(final AsyncHandler handler, final T bean, final FilterNode node, final SelectColumn selects); //############################################# 查询接口 ############################################# @@ -699,7 +684,6 @@ public interface DataSource { * * */ - @Deprecated public void getNumberResultAsync(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final String column); /** @@ -744,7 +728,6 @@ public interface DataSource { * * */ - @Deprecated public void getNumberResultAsync(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final String column, final B bean); /** @@ -788,7 +771,6 @@ public interface DataSource { * * */ - @Deprecated public void getNumberResultAsync(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final String column, final FilterNode node); /** @@ -831,7 +813,6 @@ public interface DataSource { * @param column 指定字段 * */ - @Deprecated public void getNumberResultAsync(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final Number defVal, final String column); /** @@ -877,7 +858,6 @@ public interface DataSource { * @param bean 过滤条件 * */ - @Deprecated public void getNumberResultAsync(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final Number defVal, final String column, final FilterBean bean); /** @@ -924,7 +904,6 @@ public interface DataSource { * * */ - @Deprecated public void getNumberResultAsync(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final Number defVal, final String column, final FilterNode node); /** @@ -964,7 +943,6 @@ public interface DataSource { * @param columns 聚合字段 * */ - @Deprecated public void getNumberMapAsync(final AsyncHandler, FilterFuncColumn[]> handler, final Class entityClass, final FilterFuncColumn... columns); /** @@ -1008,7 +986,6 @@ public interface DataSource { * @param columns 聚合字段 * */ - @Deprecated public void getNumberMapAsync(final AsyncHandler, B> handler, final Class entityClass, final B bean, final FilterFuncColumn... columns); /** @@ -1051,7 +1028,6 @@ public interface DataSource { * @param columns 聚合字段 * */ - @Deprecated public void getNumberMapAsync(final AsyncHandler, FilterNode> handler, final Class entityClass, final FilterNode node, final FilterFuncColumn... columns); /** @@ -1103,7 +1079,6 @@ public interface DataSource { * @param funcColumn 聚合字段 * */ - @Deprecated public void queryColumnMapAsync(final AsyncHandler, String> handler, final Class entityClass, final String keyColumn, final FilterFunc func, final String funcColumn); /** @@ -1158,7 +1133,6 @@ public interface DataSource { * @param bean 过滤条件 * */ - @Deprecated public void queryColumnMapAsync(final AsyncHandler, String> handler, final Class entityClass, final String keyColumn, final FilterFunc func, final String funcColumn, final FilterBean bean); /** @@ -1213,7 +1187,6 @@ public interface DataSource { * @param node 过滤条件 * */ - @Deprecated public void queryColumnMapAsync(final AsyncHandler, String> handler, final Class entityClass, final String keyColumn, final FilterFunc func, final String funcColumn, final FilterNode node); //-----------------------findAsync---------------------------- @@ -1251,7 +1224,6 @@ public interface DataSource { * @param pk 主键值 * */ - @Deprecated public void findAsync(final AsyncHandler handler, final Class clazz, final Serializable pk); /** @@ -1291,7 +1263,6 @@ public interface DataSource { * @param pk 主键值 * */ - @Deprecated public void findAsync(final AsyncHandler handler, final Class clazz, final SelectColumn selects, final Serializable pk); /** @@ -1331,7 +1302,6 @@ public interface DataSource { * @param key 过滤字段值 * */ - @Deprecated public void findAsync(final AsyncHandler handler, final Class clazz, final String column, final Serializable key); /** @@ -1369,7 +1339,6 @@ public interface DataSource { * @param bean 过滤条件 * */ - @Deprecated public void findAsync(final AsyncHandler handler, final Class clazz, final B bean); /** @@ -1406,7 +1375,6 @@ public interface DataSource { * @param node 过滤条件 * */ - @Deprecated public void findAsync(final AsyncHandler handler, final Class clazz, final FilterNode node); /** @@ -1447,7 +1415,6 @@ public interface DataSource { * @param bean 过滤条件 * */ - @Deprecated public void findAsync(final AsyncHandler handler, final Class clazz, final SelectColumn selects, final B bean); /** @@ -1487,7 +1454,6 @@ public interface DataSource { * @param node 过滤条件 * */ - @Deprecated public void findAsync(final AsyncHandler handler, final Class clazz, final SelectColumn selects, final FilterNode node); /** @@ -1527,7 +1493,6 @@ public interface DataSource { * @param pk 主键值 * */ - @Deprecated public void findColumnAsync(final AsyncHandler handler, final Class clazz, final String column, final Serializable pk); /** @@ -1568,7 +1533,6 @@ public interface DataSource { * @param bean 过滤条件 * */ - @Deprecated public void findColumnAsync(final AsyncHandler handler, final Class clazz, final String column, final B bean); /** @@ -1608,7 +1572,6 @@ public interface DataSource { * @param node 过滤条件 * */ - @Deprecated public void findColumnAsync(final AsyncHandler handler, final Class clazz, final String column, final FilterNode node); /** @@ -1651,7 +1614,6 @@ public interface DataSource { * @param pk 主键值 * */ - @Deprecated public void findColumnAsync(final AsyncHandler handler, final Class clazz, final String column, final Serializable defValue, final Serializable pk); /** @@ -1695,7 +1657,6 @@ public interface DataSource { * @param bean 过滤条件 * */ - @Deprecated public void findColumnAsync(final AsyncHandler handler, final Class clazz, final String column, final Serializable defValue, final B bean); /** @@ -1738,7 +1699,6 @@ public interface DataSource { * @param node 过滤条件 * */ - @Deprecated public void findColumnAsync(final AsyncHandler handler, final Class clazz, final String column, final Serializable defValue, final FilterNode node); /** @@ -1775,7 +1735,6 @@ public interface DataSource { * @param pk 主键值 * */ - @Deprecated public void existsAsync(final AsyncHandler handler, final Class clazz, final Serializable pk); /** @@ -1813,7 +1772,6 @@ public interface DataSource { * @param bean 过滤条件 * */ - @Deprecated public void existsAsync(final AsyncHandler handler, final Class clazz, final B bean); /** @@ -1850,7 +1808,6 @@ public interface DataSource { * @param node 过滤条件 * */ - @Deprecated public void existsAsync(final AsyncHandler handler, final Class clazz, final FilterNode node); //-----------------------list set---------------------------- @@ -1897,7 +1854,6 @@ public interface DataSource { * @param key 过滤字段值 * */ - @Deprecated public void queryColumnSetAsync(final AsyncHandler, String> handler, final String selectedColumn, final Class clazz, final String column, final Serializable key); /** @@ -1941,7 +1897,6 @@ public interface DataSource { * @param bean 过滤条件 * */ - @Deprecated public void queryColumnSetAsync(final AsyncHandler, B> handler, final String selectedColumn, final Class clazz, final B bean); /** @@ -1984,7 +1939,6 @@ public interface DataSource { * @param node 过滤条件 * */ - @Deprecated public void queryColumnSetAsync(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final FilterNode node); /** @@ -2030,7 +1984,6 @@ public interface DataSource { * @param key 过滤字段值 * */ - @Deprecated public void queryColumnListAsync(final AsyncHandler, Serializable> handler, final String selectedColumn, final Class clazz, final String column, final Serializable key); /** @@ -2074,7 +2027,6 @@ public interface DataSource { * @param bean 过滤条件 * */ - @Deprecated public void queryColumnListAsync(final AsyncHandler, B> handler, final String selectedColumn, final Class clazz, final B bean); /** @@ -2117,7 +2069,6 @@ public interface DataSource { * @param node 过滤条件 * */ - @Deprecated public void queryColumnListAsync(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final FilterNode node); /** @@ -2164,7 +2115,6 @@ public interface DataSource { * @param bean 过滤条件 * */ - @Deprecated public void queryColumnListAsync(final AsyncHandler, B> handler, final String selectedColumn, final Class clazz, final Flipper flipper, final B bean); /** @@ -2210,7 +2160,6 @@ public interface DataSource { * @param node 过滤条件 * */ - @Deprecated public void queryColumnListAsync(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final Flipper flipper, final FilterNode node); /** @@ -2257,7 +2206,6 @@ public interface DataSource { * @param bean 过滤条件 * */ - @Deprecated public void queryColumnSheetAsync(final AsyncHandler, B> handler, final String selectedColumn, final Class clazz, final Flipper flipper, final B bean); /** @@ -2303,7 +2251,6 @@ public interface DataSource { * @param node 过滤条件 * */ - @Deprecated public void queryColumnSheetAsync(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final Flipper flipper, final FilterNode node); /** @@ -2343,7 +2290,6 @@ public interface DataSource { * @param key 过滤字段值 * */ - @Deprecated public void queryListAsync(final AsyncHandler, Serializable> handler, final Class clazz, final String column, final Serializable key); /** @@ -2381,7 +2327,6 @@ public interface DataSource { * @param bean 过滤条件 * */ - @Deprecated public void queryListAsync(final AsyncHandler, B> handler, final Class clazz, final B bean); /** @@ -2418,7 +2363,6 @@ public interface DataSource { * @param node 过滤条件 * */ - @Deprecated public void queryListAsync(final AsyncHandler, FilterNode> handler, final Class clazz, final FilterNode node); /** @@ -2459,7 +2403,6 @@ public interface DataSource { * @param bean 过滤条件 * */ - @Deprecated public void queryListAsync(final AsyncHandler, B> handler, final Class clazz, final SelectColumn selects, final B bean); /** @@ -2499,7 +2442,6 @@ public interface DataSource { * @param node 过滤条件 * */ - @Deprecated public void queryListAsync(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final FilterNode node); /** @@ -2542,7 +2484,6 @@ public interface DataSource { * @param key 过滤字段值 * */ - @Deprecated public void queryListAsync(final AsyncHandler, Serializable> handler, final Class clazz, final Flipper flipper, final String column, final Serializable key); /** @@ -2583,7 +2524,6 @@ public interface DataSource { * @param bean 过滤条件 * */ - @Deprecated public void queryListAsync(final AsyncHandler, B> handler, final Class clazz, final Flipper flipper, final B bean); /** @@ -2625,7 +2565,6 @@ public interface DataSource { * @param node 过滤条件 * */ - @Deprecated public void queryListAsync(final AsyncHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterNode node); /** @@ -2669,7 +2608,6 @@ public interface DataSource { * @param bean 过滤条件 * */ - @Deprecated public void queryListAsync(final AsyncHandler, B> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final B bean); /** @@ -2712,7 +2650,6 @@ public interface DataSource { * @param node 过滤条件 * */ - @Deprecated public void queryListAsync(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node); //-----------------------sheet---------------------------- @@ -2754,7 +2691,6 @@ public interface DataSource { * @param bean 过滤条件 * */ - @Deprecated public void querySheetAsync(final AsyncHandler, B> handler, final Class clazz, final Flipper flipper, final B bean); /** @@ -2794,7 +2730,6 @@ public interface DataSource { * @param node 过滤条件 * */ - @Deprecated public void querySheetAsync(final AsyncHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterNode node); /** @@ -2838,7 +2773,6 @@ public interface DataSource { * @param bean 过滤条件 * */ - @Deprecated public void querySheetAsync(final AsyncHandler, B> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final B bean); /** @@ -2881,7 +2815,6 @@ public interface DataSource { * @param node 过滤条件 * */ - @Deprecated public void querySheetAsync(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node); //-----------------------direct----------------------------