From 681faa415fe963f4058ca0f3acb3f7052481410a Mon Sep 17 00:00:00 2001 From: Redkale <22250530@qq.com> Date: Fri, 12 May 2017 08:09:05 +0800 Subject: [PATCH] --- src/org/redkale/source/CacheMemorySource.java | 168 ---- src/org/redkale/source/CacheSource.java | 33 - src/org/redkale/source/DataJdbcSource.java | 800 +-------------- src/org/redkale/source/DataSource.java | 952 +----------------- test/org/redkale/test/rest/HelloService.java | 10 +- .../test/rest/_DynHelloRestServlet1.java | 2 +- 6 files changed, 11 insertions(+), 1954 deletions(-) diff --git a/src/org/redkale/source/CacheMemorySource.java b/src/org/redkale/source/CacheMemorySource.java index c7ab30e07..80871d1d5 100644 --- a/src/org/redkale/source/CacheMemorySource.java +++ b/src/org/redkale/source/CacheMemorySource.java @@ -200,18 +200,6 @@ public class CacheMemorySource extends return CompletableFuture.supplyAsync(() -> exists(key), getExecutor()); } - @Override - public void existsAsync(final AsyncHandler handler, @RpcAttachment final K key) { - super.runAsync(() -> { - try { - boolean rs = exists(key); - if (handler != null) handler.completed(rs, key); - } catch (Throwable t) { - if (handler != null) handler.failed(t, key); - } - }); - } - @Override public V get(K key) { if (key == null) return null; @@ -227,18 +215,6 @@ public class CacheMemorySource extends return CompletableFuture.supplyAsync(() -> get(key), getExecutor()); } - @Override - public void getAsync(final AsyncHandler handler, @RpcAttachment final K key) { - super.runAsync(() -> { - try { - V rs = get(key); - if (handler != null) handler.completed(rs, key); - } catch (Throwable t) { - if (handler != null) handler.failed(t, key); - } - }); - } - @Override @RpcMultiRun public V getAndRefresh(K key, final int expireSeconds) { @@ -257,18 +233,6 @@ public class CacheMemorySource extends return CompletableFuture.supplyAsync(() -> getAndRefresh(key, expireSeconds), getExecutor()); } - @Override - public void getAndRefreshAsync(final AsyncHandler handler, @RpcAttachment final K key, final int expireSeconds) { - super.runAsync(() -> { - try { - V rs = getAndRefresh(key, expireSeconds); - if (handler != null) handler.completed(rs, key); - } catch (Throwable t) { - if (handler != null) handler.failed(t, key); - } - }); - } - @Override @RpcMultiRun public void refresh(K key, final int expireSeconds) { @@ -284,18 +248,6 @@ public class CacheMemorySource extends return CompletableFuture.runAsync(() -> refresh(key, expireSeconds), getExecutor()); } - @Override - public void refreshAsync(final AsyncHandler handler, @RpcAttachment final K key, final int expireSeconds) { - super.runAsync(() -> { - try { - refresh(key, expireSeconds); - if (handler != null) handler.completed(null, key); - } catch (Throwable t) { - if (handler != null) handler.failed(t, key); - } - }); - } - @Override @RpcMultiRun public void set(K key, V value) { @@ -316,18 +268,6 @@ public class CacheMemorySource extends return CompletableFuture.runAsync(() -> set(key, value), getExecutor()); } - @Override - public void setAsync(final AsyncHandler handler, @RpcAttachment final K key, final V value) { - super.runAsync(() -> { - try { - set(key, value); - if (handler != null) handler.completed(null, key); - } catch (Throwable t) { - if (handler != null) handler.failed(t, key); - } - }); - } - @Override @RpcMultiRun public void set(int expireSeconds, K key, V value) { @@ -348,18 +288,6 @@ public class CacheMemorySource extends return CompletableFuture.runAsync(() -> set(expireSeconds, key, value), getExecutor()); } - @Override - public void setAsync(final AsyncHandler handler, final int expireSeconds, @RpcAttachment final K key, final V value) { - super.runAsync(() -> { - try { - set(expireSeconds, key, value); - if (handler != null) handler.completed(null, key); - } catch (Throwable t) { - if (handler != null) handler.failed(t, key); - } - }); - } - @Override @RpcMultiRun public void setExpireSeconds(K key, int expireSeconds) { @@ -374,18 +302,6 @@ public class CacheMemorySource extends return CompletableFuture.runAsync(() -> setExpireSeconds(key, expireSeconds), getExecutor()); } - @Override - public void setExpireSecondsAsync(final AsyncHandler handler, @RpcAttachment final K key, final int expireSeconds) { - super.runAsync(() -> { - try { - setExpireSeconds(key, expireSeconds); - if (handler != null) handler.completed(null, key); - } catch (Throwable t) { - if (handler != null) handler.failed(t, key); - } - }); - } - @Override @RpcMultiRun public void remove(K key) { @@ -398,18 +314,6 @@ public class CacheMemorySource extends return CompletableFuture.runAsync(() -> remove(key), getExecutor()); } - @Override - public void removeAsync(final AsyncHandler handler, @RpcAttachment final K key) { - super.runAsync(() -> { - try { - remove(key); - if (handler != null) handler.completed(null, key); - } catch (Throwable t) { - if (handler != null) handler.failed(t, key); - } - }); - } - @Override public Collection getCollection(final K key) { return (Collection) get(key); @@ -420,18 +324,6 @@ public class CacheMemorySource extends return CompletableFuture.supplyAsync(() -> getCollection(key), getExecutor()); } - @Override - public void getCollectionAsync(final AsyncHandler, K> handler, @RpcAttachment final K key) { - super.runAsync(() -> { - try { - Collection rs = getCollection(key); - if (handler != null) handler.completed(rs, key); - } catch (Throwable t) { - if (handler != null) handler.failed(t, key); - } - }); - } - @Override public Collection getCollectionAndRefresh(final K key, final int expireSeconds) { return (Collection) getAndRefresh(key, expireSeconds); @@ -442,18 +334,6 @@ public class CacheMemorySource extends return CompletableFuture.supplyAsync(() -> getCollectionAndRefresh(key, expireSeconds), getExecutor()); } - @Override - public void getCollectionAndRefreshAsync(final AsyncHandler, K> handler, @RpcAttachment final K key, final int expireSeconds) { - super.runAsync(() -> { - try { - Collection rs = getCollectionAndRefresh(key, expireSeconds); - if (handler != null) handler.completed(rs, key); - } catch (Throwable t) { - if (handler != null) handler.failed(t, key); - } - }); - } - @Override @RpcMultiRun public void appendListItem(K key, V value) { @@ -475,18 +355,6 @@ public class CacheMemorySource extends return CompletableFuture.runAsync(() -> appendListItem(key, value), getExecutor()); } - @Override - public void appendListItemAsync(final AsyncHandler handler, @RpcAttachment final K key, final V value) { - super.runAsync(() -> { - try { - appendListItem(key, value); - if (handler != null) handler.completed(null, key); - } catch (Throwable t) { - if (handler != null) handler.failed(t, key); - } - }); - } - @Override @RpcMultiRun public void removeListItem(K key, V value) { @@ -501,18 +369,6 @@ public class CacheMemorySource extends return CompletableFuture.runAsync(() -> removeListItem(key, value), getExecutor()); } - @Override - public void removeListItemAsync(final AsyncHandler handler, @RpcAttachment final K key, final V value) { - super.runAsync(() -> { - try { - removeListItem(key, value); - if (handler != null) handler.completed(null, key); - } catch (Throwable t) { - if (handler != null) handler.failed(t, key); - } - }); - } - @Override @RpcMultiRun public void appendSetItem(K key, V value) { @@ -534,18 +390,6 @@ public class CacheMemorySource extends return CompletableFuture.runAsync(() -> appendSetItem(key, value), getExecutor()); } - @Override - public void appendSetItemAsync(final AsyncHandler handler, @RpcAttachment final K key, final V value) { - super.runAsync(() -> { - try { - appendSetItem(key, value); - if (handler != null) handler.completed(null, key); - } catch (Throwable t) { - if (handler != null) handler.failed(t, key); - } - }); - } - @Override @RpcMultiRun public void removeSetItem(K key, V value) { @@ -560,18 +404,6 @@ public class CacheMemorySource extends return CompletableFuture.runAsync(() -> removeSetItem(key, value), getExecutor()); } - @Override - public void removeSetItemAsync(final AsyncHandler handler, @RpcAttachment final K key, final V value) { - super.runAsync(() -> { - try { - removeSetItem(key, value); - if (handler != null) handler.completed(null, key); - } catch (Throwable t) { - if (handler != null) handler.failed(t, key); - } - }); - } - public static enum CacheEntryType { OBJECT, SET, LIST; } diff --git a/src/org/redkale/source/CacheSource.java b/src/org/redkale/source/CacheSource.java index 829528503..bb7200b49 100644 --- a/src/org/redkale/source/CacheSource.java +++ b/src/org/redkale/source/CacheSource.java @@ -8,7 +8,6 @@ package org.redkale.source; import java.io.*; import java.util.*; import java.util.concurrent.CompletableFuture; -import org.redkale.util.*; /** * @@ -86,36 +85,4 @@ public interface CacheSource { return CompletableFuture.completedFuture(true); } - //---------------------- AsyncHandler 异步版 --------------------------------- - public void existsAsync(final AsyncHandler handler, final K key); - - public void getAsync(final AsyncHandler handler, final K key); - - public void getAndRefreshAsync(final AsyncHandler handler, final K key, final int expireSeconds); - - public void refreshAsync(final AsyncHandler handler, final K key, final int expireSeconds); - - public void setAsync(final AsyncHandler handler, final K key, final V value); - - public void setAsync(final AsyncHandler handler, final int expireSeconds, final K key, final V value); - - public void setExpireSecondsAsync(final AsyncHandler handler, final K key, final int expireSeconds); - - public void removeAsync(final AsyncHandler handler, final K key); - - public void getCollectionAsync(final AsyncHandler, K> handler, final K key); - - public void getCollectionAndRefreshAsync(final AsyncHandler, K> handler, final K key, final int expireSeconds); - - public void appendListItemAsync(final AsyncHandler handler, final K key, final V value); - - public void removeListItemAsync(final AsyncHandler handler, final K key, final V value); - - public void appendSetItemAsync(final AsyncHandler handler, final K key, final V value); - - public void removeSetItemAsync(final AsyncHandler handler, final K key, final V value); - - 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 dea09e02f..c412948d0 100644 --- a/src/org/redkale/source/DataJdbcSource.java +++ b/src/org/redkale/source/DataJdbcSource.java @@ -150,18 +150,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.runAsync(() -> insert(values), getExecutor()); } - @Override - public void insertAsync(final AsyncHandler handler, @RpcAttachment @RpcCall(DataCallArrayAttribute.class) final T... values) { - super.runAsync(() -> { - try { - insert(values); - if (handler != null) handler.completed(null, values); - } catch (Throwable t) { - if (handler != null) handler.failed(t, values); - } - }); - } - private void insert(final Connection conn, final EntityInfo info, T... values) { if (values.length == 0) return; try { @@ -340,18 +328,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> delete(values), getExecutor()); } - @Override - public void deleteAsync(final AsyncHandler handler, @RpcAttachment final T... values) { - super.runAsync(() -> { - try { - int rs = delete(values); - if (handler != null) handler.completed(rs, values); - } catch (Throwable t) { - if (handler != null) handler.failed(t, values); - } - }); - } - private int delete(final Connection conn, final EntityInfo info, T... values) { if (values.length == 0) return -1; final Attribute primary = info.getPrimary(); @@ -382,18 +358,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> delete(clazz, ids), getExecutor()); } - @Override - public void deleteAsync(final AsyncHandler handler, final Class clazz, @RpcAttachment final Serializable... ids) { - super.runAsync(() -> { - try { - int rs = delete(clazz, ids); - if (handler != null) handler.completed(rs, ids); - } catch (Throwable t) { - if (handler != null) handler.failed(t, ids); - } - }); - } - private int delete(final Connection conn, final EntityInfo info, Serializable... keys) { if (keys.length == 0) return -1; int c = -1; @@ -447,18 +411,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> delete(clazz, node), getExecutor()); } - @Override - public void deleteAsync(final AsyncHandler handler, final Class clazz, @RpcAttachment final FilterNode node) { - super.runAsync(() -> { - try { - int rs = delete(clazz, node); - if (handler != null) handler.completed(rs, node); - } catch (Throwable t) { - if (handler != null) handler.failed(t, node); - } - }); - } - @Override public int delete(Class clazz, final Flipper flipper, FilterNode node) { final EntityInfo info = loadEntityInfo(clazz); @@ -478,18 +430,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> delete(clazz, flipper, node), getExecutor()); } - @Override - public void deleteAsync(final AsyncHandler handler, final Class clazz, final Flipper flipper, @RpcAttachment FilterNode node) { - super.runAsync(() -> { - try { - int rs = delete(clazz, flipper, node); - if (handler != null) handler.completed(rs, node); - } catch (Throwable t) { - if (handler != null) handler.failed(t, node); - } - }); - } - private int delete(final Connection conn, final EntityInfo info, final Flipper flipper, final FilterNode node) { int c = -1; try { @@ -507,7 +447,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); @@ -581,18 +521,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> update(values), getExecutor()); } - @Override - public void updateAsync(final AsyncHandler handler, @RpcAttachment final T... values) { - super.runAsync(() -> { - try { - int rs = update(values); - if (handler != null) handler.completed(rs, values); - } catch (Throwable t) { - if (handler != null) handler.failed(t, values); - } - }); - } - private int update(final Connection conn, final EntityInfo info, T... values) { try { Class clazz = info.getType(); @@ -689,18 +617,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> updateColumn(clazz, id, column, value), getExecutor()); } - @Override - public void updateColumnAsync(final AsyncHandler handler, final Class clazz, final Serializable id, final String column, final Serializable value) { - super.runAsync(() -> { - try { - int rs = updateColumn(clazz, id, column, value); - if (handler != null) handler.completed(rs, id); - } catch (Throwable t) { - if (handler != null) handler.failed(t, id); - } - }); - } - private int updateColumn(Connection conn, final EntityInfo info, Serializable id, String column, final Serializable value) { try { int c = -1; @@ -768,18 +684,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> updateColumn(clazz, column, value, node), getExecutor()); } - @Override - public void updateColumnAsync(final AsyncHandler handler, final Class clazz, final String column, final Serializable value, @RpcAttachment final FilterNode node) { - super.runAsync(() -> { - try { - int rs = updateColumn(clazz, column, value, node); - if (handler != null) handler.completed(rs, node); - } catch (Throwable t) { - if (handler != null) handler.failed(t, node); - } - }); - } - private int updateColumn(Connection conn, final EntityInfo info, String column, final Serializable value, FilterNode node) { try { int c = -1; @@ -799,7 +703,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 +716,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(); @@ -862,18 +766,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> updateColumn(clazz, id, values), getExecutor()); } - @Override - public void updateColumnAsync(final AsyncHandler handler, final Class clazz, @RpcAttachment final Serializable id, final ColumnValue... values) { - super.runAsync(() -> { - try { - int rs = updateColumn(clazz, id, values); - if (handler != null) handler.completed(rs, id); - } catch (Throwable t) { - if (handler != null) handler.failed(t, id); - } - }); - } - private int updateColumn(final Connection conn, final EntityInfo info, final Serializable id, final ColumnValue... values) { if (values == null || values.length < 1) return -1; try { @@ -960,18 +852,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> updateColumn(clazz, node, values), getExecutor()); } - @Override - public void updateColumnAsync(final AsyncHandler handler, final Class clazz, @RpcAttachment final FilterNode node, final ColumnValue... values) { - super.runAsync(() -> { - try { - int rs = updateColumn(clazz, node, values); - if (handler != null) handler.completed(rs, node); - } catch (Throwable t) { - if (handler != null) handler.failed(t, node); - } - }); - } - /** * 根据主键值更新对象的多个column对应的值, 必须是Entity Class * @@ -1002,18 +882,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> updateColumn(clazz, node, flipper, values), getExecutor()); } - @Override - public void updateColumnAsync(final AsyncHandler handler, final Class clazz, @RpcAttachment final FilterNode node, final Flipper flipper, final ColumnValue... values) { - super.runAsync(() -> { - try { - int rs = updateColumn(clazz, node, flipper, values); - if (handler != null) handler.completed(rs, node); - } catch (Throwable t) { - if (handler != null) handler.failed(t, node); - } - }); - } - private int updateColumn(final Connection conn, final EntityInfo info, final FilterNode node, final Flipper flipper, final ColumnValue... values) { if (values == null || values.length < 1) return -1; try { @@ -1053,7 +921,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); @@ -1095,18 +963,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> updateColumn(bean, columns), getExecutor()); } - @Override - public void updateColumnAsync(final AsyncHandler handler, @RpcAttachment final T bean, final String... columns) { - super.runAsync(() -> { - try { - int rs = updateColumn(bean, columns); - if (handler != null) handler.completed(rs, bean); - } catch (Throwable t) { - if (handler != null) handler.failed(t, bean); - } - }); - } - @Override public int updateColumn(final T bean, final FilterNode node, final String... columns) { return updateColumn(bean, node, SelectColumn.createIncludes(columns)); @@ -1117,18 +973,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> updateColumn(bean, node, columns), getExecutor()); } - @Override - public void updateColumnAsync(final AsyncHandler handler, final T bean, @RpcAttachment final FilterNode node, final String... columns) { - super.runAsync(() -> { - try { - int rs = updateColumn(bean, node, columns); - if (handler != null) handler.completed(rs, node); - } catch (Throwable t) { - if (handler != null) handler.failed(t, node); - } - }); - } - @Override public int updateColumn(final T bean, final SelectColumn selects) { final EntityInfo info = loadEntityInfo((Class) bean.getClass()); @@ -1148,18 +992,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> updateColumn(bean, selects), getExecutor()); } - @Override - public void updateColumnAsync(final AsyncHandler handler, @RpcAttachment final T bean, final SelectColumn selects) { - super.runAsync(() -> { - try { - int rs = updateColumn(bean, selects); - if (handler != null) handler.completed(rs, bean); - } catch (Throwable t) { - if (handler != null) handler.failed(t, bean); - } - }); - } - private int updateColumns(final Connection conn, final EntityInfo info, final T bean, final SelectColumn selects) { if (bean == null || selects == null) return -1; try { @@ -1236,18 +1068,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> updateColumn(bean, node, selects), getExecutor()); } - @Override - public void updateColumnAsync(final AsyncHandler handler, final T bean, @RpcAttachment final FilterNode node, final SelectColumn selects) { - super.runAsync(() -> { - try { - int rs = updateColumn(bean, node, selects); - if (handler != null) handler.completed(rs, node); - } catch (Throwable t) { - if (handler != null) handler.failed(t, node); - } - }); - } - private int updateColumns(final Connection conn, final EntityInfo info, final T bean, final FilterNode node, final SelectColumn selects) { if (bean == null || node == null || selects == null) return -1; try { @@ -1287,7 +1107,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) { @@ -1355,18 +1175,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> getNumberResult(entityClass, func, column), getExecutor()); } - @Override - public void getNumberResultAsync(final AsyncHandler handler, final Class entityClass, final FilterFunc func, @RpcAttachment final String column) { - super.runAsync(() -> { - try { - Number rs = getNumberResult(entityClass, func, column); - if (handler != null) handler.completed(rs, column); - } catch (Throwable t) { - if (handler != null) handler.failed(t, column); - } - }); - } - @Override public Number getNumberResult(final Class entityClass, final FilterFunc func, final String column, FilterBean bean) { return getNumberResult(entityClass, func, null, column, FilterNodeBean.createFilterNode(bean)); @@ -1377,18 +1185,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> getNumberResult(entityClass, func, column, bean), getExecutor()); } - @Override - public void getNumberResultAsync(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final String column, @RpcAttachment final B bean) { - super.runAsync(() -> { - try { - Number rs = getNumberResult(entityClass, func, column, bean); - if (handler != null) handler.completed(rs, bean); - } catch (Throwable t) { - if (handler != null) handler.failed(t, bean); - } - }); - } - @Override public Number getNumberResult(final Class entityClass, final FilterFunc func, final String column, final FilterNode node) { return getNumberResult(entityClass, func, null, column, node); @@ -1399,18 +1195,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> getNumberResult(entityClass, func, column, node), getExecutor()); } - @Override - public void getNumberResultAsync(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final String column, @RpcAttachment final FilterNode node) { - super.runAsync(() -> { - try { - Number rs = getNumberResult(entityClass, func, column, node); - if (handler != null) handler.completed(rs, node); - } catch (Throwable t) { - if (handler != null) handler.failed(t, node); - } - }); - } - @Override public Number getNumberResult(final Class entityClass, final FilterFunc func, final Number defVal, final String column) { return getNumberResult(entityClass, func, defVal, column, (FilterNode) null); @@ -1421,18 +1205,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> getNumberResult(entityClass, func, defVal, column), getExecutor()); } - @Override - public void getNumberResultAsync(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final Number defVal, @RpcAttachment final String column) { - super.runAsync(() -> { - try { - Number rs = getNumberResult(entityClass, func, defVal, column); - if (handler != null) handler.completed(rs, column); - } catch (Throwable t) { - if (handler != null) handler.failed(t, column); - } - }); - } - @Override public Number getNumberResult(final Class entityClass, final FilterFunc func, final Number defVal, final String column, FilterBean bean) { return getNumberResult(entityClass, func, defVal, column, FilterNodeBean.createFilterNode(bean)); @@ -1443,28 +1215,11 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> getNumberResult(entityClass, func, defVal, column, bean), getExecutor()); } - @Override - public void getNumberResultAsync(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final Number defVal, @RpcAttachment final String column, final FilterBean bean) { - getNumberResultAsync(handler, entityClass, func, defVal, column, FilterNodeBean.createFilterNode(bean)); - } - @Override public CompletableFuture getNumberResultAsync(final Class entityClass, final FilterFunc func, final Number defVal, final String column, final FilterNode node) { return CompletableFuture.supplyAsync(() -> getNumberResult(entityClass, func, defVal, column, node), getExecutor()); } - @Override - public void getNumberResultAsync(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final Number defVal, @RpcAttachment final String column, final FilterNode node) { - super.runAsync(() -> { - try { - Number rs = getNumberResult(entityClass, func, defVal, column, node); - if (handler != null) handler.completed(rs, column); - } catch (Throwable t) { - if (handler != null) handler.failed(t, column); - } - }); - } - @Override public Map getNumberMap(final Class entityClass, final FilterFuncColumn... columns) { return getNumberMap(entityClass, (FilterNode) null, columns); @@ -1475,18 +1230,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> getNumberMap(entityClass, columns), getExecutor()); } - @Override - public void getNumberMapAsync(final AsyncHandler, FilterFuncColumn[]> handler, final Class entityClass, @RpcAttachment final FilterFuncColumn... columns) { - super.runAsync(() -> { - try { - Map rs = getNumberMap(entityClass, columns); - if (handler != null) handler.completed(rs, columns); - } catch (Throwable t) { - if (handler != null) handler.failed(t, columns); - } - }); - } - @Override public Map getNumberMap(final Class entityClass, final FilterBean bean, final FilterFuncColumn... columns) { return getNumberMap(entityClass, FilterNodeBean.createFilterNode(bean), columns); @@ -1497,18 +1240,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> getNumberMap(entityClass, bean, columns), getExecutor()); } - @Override - public void getNumberMapAsync(final AsyncHandler, B> handler, final Class entityClass, @RpcAttachment final B bean, final FilterFuncColumn... columns) { - super.runAsync(() -> { - try { - Map rs = getNumberMap(entityClass, bean, columns); - if (handler != null) handler.completed(rs, bean); - } catch (Throwable t) { - if (handler != null) handler.failed(t, bean); - } - }); - } - @Override public Map getNumberMap(final Class entityClass, final FilterNode node, final FilterFuncColumn... columns) { if (columns == null || columns.length == 0) return new HashMap<>(); @@ -1579,18 +1310,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> getNumberMap(entityClass, node, columns), getExecutor()); } - @Override - public void getNumberMapAsync(final AsyncHandler, FilterNode> handler, final Class entityClass, @RpcAttachment final FilterNode node, final FilterFuncColumn... columns) { - super.runAsync(() -> { - try { - Map rs = getNumberMap(entityClass, node, columns); - if (handler != null) handler.completed(rs, node); - } catch (Throwable t) { - if (handler != null) handler.failed(t, node); - } - }); - } - @Override public Number getNumberResult(final Class entityClass, final FilterFunc func, final Number defVal, final String column, final FilterNode node) { final EntityInfo info = loadEntityInfo(entityClass); @@ -1639,18 +1358,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> queryColumnMap(entityClass, keyColumn, func, funcColumn), getExecutor()); } - @Override - public void queryColumnMapAsync(final AsyncHandler, String> handler, final Class entityClass, @RpcAttachment final String keyColumn, final FilterFunc func, final String funcColumn) { - super.runAsync(() -> { - try { - Map rs = queryColumnMap(entityClass, keyColumn, func, funcColumn); - if (handler != null) handler.completed(rs, keyColumn); - } catch (Throwable t) { - if (handler != null) handler.failed(t, keyColumn); - } - }); - } - @Override public Map queryColumnMap(final Class entityClass, final String keyColumn, FilterFunc func, final String funcColumn, FilterBean bean) { return queryColumnMap(entityClass, keyColumn, func, funcColumn, FilterNodeBean.createFilterNode(bean)); @@ -1661,11 +1368,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> queryColumnMap(entityClass, keyColumn, func, funcColumn, bean), getExecutor()); } - @Override - public void queryColumnMapAsync(final AsyncHandler, String> handler, final Class entityClass, @RpcAttachment final String keyColumn, final FilterFunc func, final String funcColumn, final FilterBean bean) { - queryColumnMapAsync(handler, entityClass, keyColumn, func, funcColumn, FilterNodeBean.createFilterNode(bean)); - } - @Override public Map queryColumnMap(final Class entityClass, final String keyColumn, final FilterFunc func, final String funcColumn, FilterNode node) { final EntityInfo info = loadEntityInfo(entityClass); @@ -1710,18 +1412,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> queryColumnMap(entityClass, keyColumn, func, funcColumn, node), getExecutor()); } - @Override - public void queryColumnMapAsync(final AsyncHandler, String> handler, final Class entityClass, @RpcAttachment final String keyColumn, final FilterFunc func, final String funcColumn, final FilterNode node) { - super.runAsync(() -> { - try { - Map rs = queryColumnMap(entityClass, keyColumn, func, funcColumn, node); - if (handler != null) handler.completed(rs, keyColumn); - } catch (Throwable t) { - if (handler != null) handler.failed(t, keyColumn); - } - }); - } - //-----------------------findAsync---------------------------- /** * 根据主键获取对象 @@ -1742,18 +1432,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> find(clazz, pk), getExecutor()); } - @Override - public void findAsync(final AsyncHandler handler, final Class clazz, @RpcAttachment final Serializable pk) { - super.runAsync(() -> { - try { - T rs = find(clazz, pk); - if (handler != null) handler.completed(rs, pk); - } catch (Throwable t) { - if (handler != null) handler.failed(t, pk); - } - }); - } - @Override public T find(Class clazz, final SelectColumn selects, Serializable pk) { final EntityInfo info = loadEntityInfo(clazz); @@ -1791,18 +1469,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> find(clazz, selects, pk), getExecutor()); } - @Override - public void findAsync(final AsyncHandler handler, final Class clazz, SelectColumn selects, @RpcAttachment final Serializable pk) { - super.runAsync(() -> { - try { - T rs = find(clazz, selects, pk); - if (handler != null) handler.completed(rs, pk); - } catch (Throwable t) { - if (handler != null) handler.failed(t, pk); - } - }); - } - @Override public T find(final Class clazz, final String column, final Serializable key) { return find(clazz, null, FilterNode.create(column, key)); @@ -1813,18 +1479,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> find(clazz, column, key), getExecutor()); } - @Override - public void findAsync(final AsyncHandler handler, final Class clazz, final String column, @RpcAttachment final Serializable key) { - super.runAsync(() -> { - try { - T rs = find(clazz, column, key); - if (handler != null) handler.completed(rs, key); - } catch (Throwable t) { - if (handler != null) handler.failed(t, key); - } - }); - } - @Override public T find(final Class clazz, final FilterBean bean) { return find(clazz, null, FilterNodeBean.createFilterNode(bean)); @@ -1835,18 +1489,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> find(clazz, bean), getExecutor()); } - @Override - public void findAsync(final AsyncHandler handler, final Class clazz, @RpcAttachment final B bean) { - super.runAsync(() -> { - try { - T rs = find(clazz, bean); - if (handler != null) handler.completed(rs, bean); - } catch (Throwable t) { - if (handler != null) handler.failed(t, bean); - } - }); - } - @Override public T find(final Class clazz, final FilterNode node) { return find(clazz, null, node); @@ -1857,18 +1499,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> find(clazz, node), getExecutor()); } - @Override - public void findAsync(final AsyncHandler handler, final Class clazz, @RpcAttachment final FilterNode node) { - super.runAsync(() -> { - try { - T rs = find(clazz, node); - if (handler != null) handler.completed(rs, node); - } catch (Throwable t) { - if (handler != null) handler.failed(t, node); - } - }); - } - @Override public T find(final Class clazz, final SelectColumn selects, final FilterBean bean) { return find(clazz, selects, FilterNodeBean.createFilterNode(bean)); @@ -1879,18 +1509,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> find(clazz, selects, bean), getExecutor()); } - @Override - public void findAsync(final AsyncHandler handler, final Class clazz, final SelectColumn selects, @RpcAttachment final B bean) { - super.runAsync(() -> { - try { - T rs = find(clazz, selects, bean); - if (handler != null) handler.completed(rs, bean); - } catch (Throwable t) { - if (handler != null) handler.failed(t, bean); - } - }); - } - @Override public T find(final Class clazz, final SelectColumn selects, final FilterNode node) { final EntityInfo info = loadEntityInfo(clazz); @@ -1928,18 +1546,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> find(clazz, selects, node), getExecutor()); } - @Override - public void findAsync(final AsyncHandler handler, final Class clazz, final SelectColumn selects, @RpcAttachment final FilterNode node) { - super.runAsync(() -> { - try { - T rs = find(clazz, selects, node); - if (handler != null) handler.completed(rs, node); - } catch (Throwable t) { - if (handler != null) handler.failed(t, node); - } - }); - } - @Override public Serializable findColumn(final Class clazz, final String column, final Serializable pk) { return findColumn(clazz, column, null, pk); @@ -1950,18 +1556,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> findColumn(clazz, column, pk), getExecutor()); } - @Override - public void findColumnAsync(final AsyncHandler handler, final Class clazz, final String column, @RpcAttachment final Serializable pk) { - super.runAsync(() -> { - try { - Serializable rs = findColumn(clazz, column, pk); - if (handler != null) handler.completed(rs, pk); - } catch (Throwable t) { - if (handler != null) handler.failed(t, pk); - } - }); - } - @Override public Serializable findColumn(final Class clazz, final String column, final FilterBean bean) { return findColumn(clazz, column, null, FilterNodeBean.createFilterNode(bean)); @@ -1972,18 +1566,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> findColumn(clazz, column, bean), getExecutor()); } - @Override - public void findColumnAsync(final AsyncHandler handler, final Class clazz, final String column, @RpcAttachment final B bean) { - super.runAsync(() -> { - try { - Serializable rs = findColumn(clazz, column, bean); - if (handler != null) handler.completed(rs, bean); - } catch (Throwable t) { - if (handler != null) handler.failed(t, bean); - } - }); - } - @Override public Serializable findColumn(final Class clazz, final String column, final FilterNode node) { return findColumn(clazz, column, null, node); @@ -1994,18 +1576,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> findColumn(clazz, column, node), getExecutor()); } - @Override - public void findColumnAsync(final AsyncHandler handler, final Class clazz, final String column, @RpcAttachment final FilterNode node) { - super.runAsync(() -> { - try { - Serializable rs = findColumn(clazz, column, node); - if (handler != null) handler.completed(rs, node); - } catch (Throwable t) { - if (handler != null) handler.failed(t, node); - } - }); - } - @Override public Serializable findColumn(final Class clazz, final String column, final Serializable defValue, final Serializable pk) { final EntityInfo info = loadEntityInfo(clazz); @@ -2051,18 +1621,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> findColumn(clazz, column, defValue, pk), getExecutor()); } - @Override - public void findColumnAsync(final AsyncHandler handler, final Class clazz, final String column, final Serializable defValue, @RpcAttachment final Serializable pk) { - super.runAsync(() -> { - try { - Serializable rs = findColumn(clazz, column, defValue, pk); - if (handler != null) handler.completed(rs, pk); - } catch (Throwable t) { - if (handler != null) handler.failed(t, pk); - } - }); - } - @Override public Serializable findColumn(final Class clazz, final String column, final Serializable defValue, final FilterBean bean) { return findColumn(clazz, column, defValue, FilterNodeBean.createFilterNode(bean)); @@ -2073,18 +1631,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> findColumn(clazz, column, defValue, bean), getExecutor()); } - @Override - public void findColumnAsync(final AsyncHandler handler, final Class clazz, final String column, final Serializable defValue, @RpcAttachment final B bean) { - super.runAsync(() -> { - try { - Serializable rs = findColumn(clazz, column, defValue, bean); - if (handler != null) handler.completed(rs, bean); - } catch (Throwable t) { - if (handler != null) handler.failed(t, bean); - } - }); - } - @Override public Serializable findColumn(final Class clazz, final String column, final Serializable defValue, final FilterNode node) { final EntityInfo info = loadEntityInfo(clazz); @@ -2130,18 +1676,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> findColumn(clazz, column, defValue, node), getExecutor()); } - @Override - public void findColumnAsync(final AsyncHandler handler, final Class clazz, final String column, final Serializable defValue, @RpcAttachment final FilterNode node) { - super.runAsync(() -> { - try { - Serializable rs = findColumn(clazz, column, defValue, node); - if (handler != null) handler.completed(rs, node); - } catch (Throwable t) { - if (handler != null) handler.failed(t, node); - } - }); - } - @Override public boolean exists(Class clazz, Serializable pk) { final EntityInfo info = loadEntityInfo(clazz); @@ -2181,18 +1715,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> exists(clazz, pk), getExecutor()); } - @Override - public void existsAsync(final AsyncHandler handler, final Class clazz, @RpcAttachment final Serializable pk) { - super.runAsync(() -> { - try { - boolean rs = exists(clazz, pk); - if (handler != null) handler.completed(rs, pk); - } catch (Throwable t) { - if (handler != null) handler.failed(t, pk); - } - }); - } - @Override public boolean exists(final Class clazz, final FilterBean bean) { return exists(clazz, FilterNodeBean.createFilterNode(bean)); @@ -2203,18 +1725,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> exists(clazz, bean), getExecutor()); } - @Override - public void existsAsync(final AsyncHandler handler, final Class clazz, @RpcAttachment final B bean) { - super.runAsync(() -> { - try { - boolean rs = exists(clazz, bean); - if (handler != null) handler.completed(rs, bean); - } catch (Throwable t) { - if (handler != null) handler.failed(t, bean); - } - }); - } - @Override public boolean exists(final Class clazz, final FilterNode node) { final EntityInfo info = loadEntityInfo(clazz); @@ -2254,18 +1764,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> exists(clazz, node), getExecutor()); } - @Override - public void existsAsync(final AsyncHandler handler, final Class clazz, @RpcAttachment final FilterNode node) { - super.runAsync(() -> { - try { - boolean rs = exists(clazz, node); - if (handler != null) handler.completed(rs, node); - } catch (Throwable t) { - if (handler != null) handler.failed(t, node); - } - }); - } - //-----------------------list set---------------------------- @Override public HashSet queryColumnSet(final String selectedColumn, Class clazz, String column, Serializable key) { @@ -2277,18 +1775,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> queryColumnSet(selectedColumn, clazz, column, key), getExecutor()); } - @Override - public void queryColumnSetAsync(final AsyncHandler, String> handler, final String selectedColumn, final Class clazz, @RpcAttachment final String column, final Serializable key) { - super.runAsync(() -> { - try { - HashSet rs = queryColumnSet(selectedColumn, clazz, column, key); - if (handler != null) handler.completed(rs, column); - } catch (Throwable t) { - if (handler != null) handler.failed(t, column); - } - }); - } - @Override public HashSet queryColumnSet(final String selectedColumn, final Class clazz, final FilterBean bean) { return new LinkedHashSet<>(queryColumnList(selectedColumn, clazz, bean)); @@ -2299,18 +1785,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> queryColumnSet(selectedColumn, clazz, bean), getExecutor()); } - @Override - public void queryColumnSetAsync(final AsyncHandler, B> handler, final String selectedColumn, final Class clazz, @RpcAttachment final B bean) { - super.runAsync(() -> { - try { - HashSet rs = queryColumnSet(selectedColumn, clazz, bean); - if (handler != null) handler.completed(rs, bean); - } catch (Throwable t) { - if (handler != null) handler.failed(t, bean); - } - }); - } - @Override public HashSet queryColumnSet(String selectedColumn, Class clazz, FilterNode node) { return new LinkedHashSet<>(queryColumnList(selectedColumn, clazz, node)); @@ -2321,18 +1795,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> queryColumnSet(selectedColumn, clazz, node), getExecutor()); } - @Override - public void queryColumnSetAsync(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, @RpcAttachment final FilterNode node) { - super.runAsync(() -> { - try { - HashSet rs = queryColumnSet(selectedColumn, clazz, node); - if (handler != null) handler.completed(rs, node); - } catch (Throwable t) { - if (handler != null) handler.failed(t, node); - } - }); - } - @Override public List queryColumnList(final String selectedColumn, final Class clazz, final String column, final Serializable key) { return queryColumnList(selectedColumn, clazz, FilterNode.create(column, key)); @@ -2343,18 +1805,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> queryColumnList(selectedColumn, clazz, column, key), getExecutor()); } - @Override - public void queryColumnListAsync(final AsyncHandler, Serializable> handler, final String selectedColumn, final Class clazz, final String column, @RpcAttachment final Serializable key) { - super.runAsync(() -> { - try { - List rs = queryColumnList(selectedColumn, clazz, column, key); - if (handler != null) handler.completed(rs, key); - } catch (Throwable t) { - if (handler != null) handler.failed(t, key); - } - }); - } - @Override public List queryColumnList(final String selectedColumn, final Class clazz, final FilterBean bean) { return queryColumnList(selectedColumn, clazz, FilterNodeBean.createFilterNode(bean)); @@ -2365,18 +1815,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> queryColumnList(selectedColumn, clazz, bean), getExecutor()); } - @Override - public void queryColumnListAsync(final AsyncHandler, B> handler, String selectedColumn, Class clazz, @RpcAttachment B bean) { - super.runAsync(() -> { - try { - List rs = queryColumnList(selectedColumn, clazz, bean); - if (handler != null) handler.completed(rs, bean); - } catch (Throwable t) { - if (handler != null) handler.failed(t, bean); - } - }); - } - @Override public List queryColumnList(final String selectedColumn, final Class clazz, final FilterNode node) { return (List) queryColumnSheet(false, selectedColumn, clazz, null, node).list(true); @@ -2387,18 +1825,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> queryColumnList(selectedColumn, clazz, node), getExecutor()); } - @Override - public void queryColumnListAsync(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, @RpcAttachment final FilterNode node) { - super.runAsync(() -> { - try { - List rs = queryColumnList(selectedColumn, clazz, node); - if (handler != null) handler.completed(rs, node); - } catch (Throwable t) { - if (handler != null) handler.failed(t, node); - } - }); - } - @Override public List queryColumnList(final String selectedColumn, final Class clazz, final Flipper flipper, final FilterBean bean) { return queryColumnList(selectedColumn, clazz, FilterNodeBean.createFilterNode(bean)); @@ -2409,18 +1835,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> queryColumnList(selectedColumn, clazz, flipper, bean), getExecutor()); } - @Override - public void queryColumnListAsync(final AsyncHandler, B> handler, String selectedColumn, Class clazz, Flipper flipper, @RpcAttachment B bean) { - super.runAsync(() -> { - try { - List rs = queryColumnList(selectedColumn, clazz, flipper, bean); - if (handler != null) handler.completed(rs, bean); - } catch (Throwable t) { - if (handler != null) handler.failed(t, bean); - } - }); - } - @Override public List queryColumnList(final String selectedColumn, final Class clazz, final Flipper flipper, final FilterNode node) { return (List) queryColumnSheet(false, selectedColumn, clazz, flipper, node).list(true); @@ -2431,18 +1845,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> queryColumnList(selectedColumn, clazz, flipper, node), getExecutor()); } - @Override - public void queryColumnListAsync(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, Flipper flipper, @RpcAttachment final FilterNode node) { - super.runAsync(() -> { - try { - List rs = queryColumnList(selectedColumn, clazz, flipper, node); - if (handler != null) handler.completed(rs, node); - } catch (Throwable t) { - if (handler != null) handler.failed(t, node); - } - }); - } - /** * 根据指定参数查询对象某个字段的集合 *

@@ -2465,18 +1867,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> queryColumnSheet(selectedColumn, clazz, flipper, bean), getExecutor()); } - @Override - public void queryColumnSheetAsync(final AsyncHandler, B> handler, String selectedColumn, Class clazz, Flipper flipper, @RpcAttachment B bean) { - super.runAsync(() -> { - try { - Sheet rs = queryColumnSheet(selectedColumn, clazz, flipper, bean); - if (handler != null) handler.completed(rs, bean); - } catch (Throwable t) { - if (handler != null) handler.failed(t, bean); - } - }); - } - @Override public Sheet queryColumnSheet(final String selectedColumn, final Class clazz, final Flipper flipper, final FilterNode node) { return queryColumnSheet(true, selectedColumn, clazz, flipper, node); @@ -2487,18 +1877,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> queryColumnSheet(selectedColumn, clazz, flipper, node), getExecutor()); } - @Override - public void queryColumnSheetAsync(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final Flipper flipper, @RpcAttachment final FilterNode node) { - super.runAsync(() -> { - try { - Sheet rs = queryColumnSheet(selectedColumn, clazz, flipper, node); - if (handler != null) handler.completed(rs, node); - } catch (Throwable t) { - if (handler != null) handler.failed(t, node); - } - }); - } - private Sheet queryColumnSheet(final boolean needtotal, final String selectedColumn, final Class clazz, final Flipper flipper, final FilterNode node) { Sheet sheet = querySheet(true, needtotal, clazz, SelectColumn.createIncludes(selectedColumn), flipper, node); final Sheet rs = new Sheet<>(); @@ -2534,18 +1912,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> queryList(clazz, column, key), getExecutor()); } - @Override - public void queryListAsync(final AsyncHandler, Serializable> handler, final Class clazz, final String column, @RpcAttachment final Serializable key) { - super.runAsync(() -> { - try { - List rs = queryList(clazz, column, key); - if (handler != null) handler.completed(rs, key); - } catch (Throwable t) { - if (handler != null) handler.failed(t, key); - } - }); - } - /** * 根据过滤对象FilterBean查询对象集合 * @@ -2565,18 +1931,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> queryList(clazz, bean), getExecutor()); } - @Override - public void queryListAsync(final AsyncHandler, B> handler, final Class clazz, @RpcAttachment final B bean) { - super.runAsync(() -> { - try { - List rs = queryList(clazz, bean); - if (handler != null) handler.completed(rs, bean); - } catch (Throwable t) { - if (handler != null) handler.failed(t, bean); - } - }); - } - @Override public List queryList(final Class clazz, final FilterNode node) { return queryList(clazz, (SelectColumn) null, node); @@ -2587,18 +1941,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> queryList(clazz, node), getExecutor()); } - @Override - public void queryListAsync(final AsyncHandler, FilterNode> handler, final Class clazz, @RpcAttachment final FilterNode node) { - super.runAsync(() -> { - try { - List rs = queryList(clazz, node); - if (handler != null) handler.completed(rs, node); - } catch (Throwable t) { - if (handler != null) handler.failed(t, node); - } - }); - } - /** * 根据过滤对象FilterBean查询对象集合, 对象只填充或排除SelectField指定的字段 * @@ -2619,18 +1961,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> queryList(clazz, selects, bean), getExecutor()); } - @Override - public void queryListAsync(final AsyncHandler, B> handler, final Class clazz, final SelectColumn selects, @RpcAttachment final B bean) { - super.runAsync(() -> { - try { - List rs = queryList(clazz, selects, bean); - if (handler != null) handler.completed(rs, bean); - } catch (Throwable t) { - if (handler != null) handler.failed(t, bean); - } - }); - } - @Override public List queryList(final Class clazz, final SelectColumn selects, final FilterNode node) { return queryList(clazz, selects, (Flipper) null, node); @@ -2641,18 +1971,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> queryList(clazz, selects, node), getExecutor()); } - @Override - public void queryListAsync(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, @RpcAttachment final FilterNode node) { - super.runAsync(() -> { - try { - List rs = queryList(clazz, selects, node); - if (handler != null) handler.completed(rs, node); - } catch (Throwable t) { - if (handler != null) handler.failed(t, node); - } - }); - } - @Override public List queryList(final Class clazz, final Flipper flipper, final String column, final Serializable key) { return queryList(clazz, flipper, FilterNode.create(column, key)); @@ -2663,18 +1981,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> queryList(clazz, flipper, column, key), getExecutor()); } - @Override - public void queryListAsync(final AsyncHandler, Serializable> handler, final Class clazz, final Flipper flipper, final String column, @RpcAttachment final Serializable key) { - super.runAsync(() -> { - try { - List rs = queryList(clazz, flipper, column, key); - if (handler != null) handler.completed(rs, key); - } catch (Throwable t) { - if (handler != null) handler.failed(t, key); - } - }); - } - @Override public List queryList(final Class clazz, final Flipper flipper, final FilterBean bean) { return queryList(clazz, null, flipper, bean); @@ -2685,18 +1991,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> queryList(clazz, flipper, bean), getExecutor()); } - @Override - public void queryListAsync(final AsyncHandler, B> handler, final Class clazz, final Flipper flipper, @RpcAttachment final B bean) { - super.runAsync(() -> { - try { - List rs = queryList(clazz, flipper, bean); - if (handler != null) handler.completed(rs, bean); - } catch (Throwable t) { - if (handler != null) handler.failed(t, bean); - } - }); - } - @Override public List queryList(final Class clazz, final Flipper flipper, final FilterNode node) { return queryList(clazz, null, flipper, node); @@ -2707,18 +2001,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> queryList(clazz, flipper, node), getExecutor()); } - @Override - public void queryListAsync(final AsyncHandler, FilterNode> handler, final Class clazz, final Flipper flipper, @RpcAttachment final FilterNode node) { - super.runAsync(() -> { - try { - List rs = queryList(clazz, flipper, node); - if (handler != null) handler.completed(rs, node); - } catch (Throwable t) { - if (handler != null) handler.failed(t, node); - } - }); - } - @Override public List queryList(final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterBean bean) { return querySheet(true, false, clazz, selects, flipper, FilterNodeBean.createFilterNode(bean)).list(true); @@ -2729,18 +2011,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> queryList(clazz, selects, flipper, bean), getExecutor()); } - @Override - public void queryListAsync(final AsyncHandler, B> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, @RpcAttachment final B bean) { - super.runAsync(() -> { - try { - List rs = queryList(clazz, selects, flipper, bean); - if (handler != null) handler.completed(rs, bean); - } catch (Throwable t) { - if (handler != null) handler.failed(t, bean); - } - }); - } - @Override public List queryList(final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node) { return querySheet(true, false, clazz, selects, flipper, node).list(true); @@ -2751,18 +2021,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> queryList(clazz, selects, flipper, node), getExecutor()); } - @Override - public void queryListAsync(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, @RpcAttachment final FilterNode node) { - super.runAsync(() -> { - try { - List rs = queryList(clazz, selects, flipper, node); - if (handler != null) handler.completed(rs, node); - } catch (Throwable t) { - if (handler != null) handler.failed(t, node); - } - }); - } - //-----------------------sheet---------------------------- /** * 根据过滤对象FilterBean和翻页对象Flipper查询一页的数据 @@ -2784,18 +2042,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> querySheet(clazz, flipper, bean), getExecutor()); } - @Override - public void querySheetAsync(final AsyncHandler, B> handler, final Class clazz, final Flipper flipper, @RpcAttachment final B bean) { - super.runAsync(() -> { - try { - Sheet rs = querySheet(clazz, flipper, bean); - if (handler != null) handler.completed(rs, bean); - } catch (Throwable t) { - if (handler != null) handler.failed(t, bean); - } - }); - } - @Override public Sheet querySheet(final Class clazz, final Flipper flipper, final FilterNode node) { return querySheet(clazz, null, flipper, node); @@ -2806,18 +2052,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> querySheet(clazz, flipper, node), getExecutor()); } - @Override - public void querySheetAsync(final AsyncHandler, FilterNode> handler, final Class clazz, final Flipper flipper, @RpcAttachment final FilterNode node) { - super.runAsync(() -> { - try { - Sheet rs = querySheet(clazz, flipper, node); - if (handler != null) handler.completed(rs, node); - } catch (Throwable t) { - if (handler != null) handler.failed(t, node); - } - }); - } - /** * 根据过滤对象FilterBean和翻页对象Flipper查询一页的数据, 对象只填充或排除SelectField指定的字段 * @@ -2839,18 +2073,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> querySheet(clazz, selects, flipper, bean), getExecutor()); } - @Override - public void querySheetAsync(final AsyncHandler, B> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, @RpcAttachment final B bean) { - super.runAsync(() -> { - try { - Sheet rs = querySheet(clazz, selects, flipper, bean); - if (handler != null) handler.completed(rs, bean); - } catch (Throwable t) { - if (handler != null) handler.failed(t, bean); - } - }); - } - @Override public Sheet querySheet(final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node) { return querySheet(true, true, clazz, selects, flipper, node); @@ -2861,18 +2083,6 @@ public class DataJdbcSource extends AbstractService implements DataSource, Servi return CompletableFuture.supplyAsync(() -> querySheet(clazz, selects, flipper, node), getExecutor()); } - @Override - public void querySheetAsync(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, @RpcAttachment final FilterNode node) { - super.runAsync(() -> { - try { - Sheet rs = querySheet(clazz, selects, flipper, node); - if (handler != null) handler.completed(rs, node); - } catch (Throwable t) { - if (handler != null) handler.failed(t, node); - } - }); - } - private Sheet querySheet(final boolean readcache, final boolean needtotal, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node) { final EntityInfo info = loadEntityInfo(clazz); final EntityCache cache = info.getCache(); diff --git a/src/org/redkale/source/DataSource.java b/src/org/redkale/source/DataSource.java index 79ab276cb..d10028249 100644 --- a/src/org/redkale/source/DataSource.java +++ b/src/org/redkale/source/DataSource.java @@ -15,7 +15,7 @@ import org.redkale.util.*; /** * * DataSource 为数据库或内存数据库的数据源,提供类似JPA、Hibernate的接口与功能。
- * 带AsyncHandler类型的参数接口为异步接口 + * 返回类型为CompletableFuture的接口为异步接口 * *

* 详情见: https://redkale.org @@ -44,15 +44,6 @@ public interface DataSource { */ public CompletableFuture insertAsync(final T... values); - /** - * 新增记录, 多对象必须是同一个Entity类
- * - * @param 泛型 - * @param handler 回调函数 - * @param values Entity对象 - */ - public void insertAsync(final AsyncHandler handler, final T... values); - //-------------------------deleteAsync-------------------------- /** * 删除指定主键值的记录, 多对象必须是同一个Entity类
@@ -76,18 +67,6 @@ public interface DataSource { */ public CompletableFuture deleteAsync(final T... values); - /** - * 删除指定主键值的记录, 多对象必须是同一个Entity类
- * 等价SQL: DELETE FROM {table} WHERE {primary} IN {values.id}
- * - * @param 泛型 - * @param handler 回调函数 - * @param values Entity对象 - * - * - */ - public void deleteAsync(final AsyncHandler handler, final T... values); - /** * 删除指定主键值的记录
* 等价SQL: DELETE FROM {table} WHERE {primary} IN {ids}
@@ -112,19 +91,6 @@ public interface DataSource { */ public CompletableFuture deleteAsync(final Class clazz, final Serializable... ids); - /** - * 删除指定主键值的记录
- * 等价SQL: DELETE FROM {table} WHERE {primary} IN {ids}
- * - * @param Entity泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param ids 主键值 - * - * - */ - public void deleteAsync(final AsyncHandler handler, final Class clazz, final Serializable... ids); - /** * 删除符合过滤条件的记录
* 等价SQL: DELETE FROM {table} WHERE {filter node}
@@ -149,19 +115,6 @@ public interface DataSource { */ public CompletableFuture deleteAsync(final Class clazz, final FilterNode node); - /** - * 删除符合过滤条件的记录
- * 等价SQL: DELETE FROM {table} WHERE {filter node}
- * - * @param Entity泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param node 过滤条件 - * - * - */ - public void deleteAsync(final AsyncHandler handler, final Class clazz, final FilterNode node); - /** * 删除符合过滤条件且指定最大影响条数的记录
* Flipper中offset字段将被忽略
@@ -190,21 +143,6 @@ public interface DataSource { */ public CompletableFuture deleteAsync(final Class clazz, final Flipper flipper, final FilterNode node); - /** - * 删除符合过滤条件且指定最大影响条数的记录
- * Flipper中offset字段将被忽略
- * 等价SQL: DELETE FROM {table} WHERE {filter node} ORDER BY {flipper.sort} LIMIT {flipper.limit}
- * - * @param Entity泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param flipper 翻页对象 - * @param node 过滤条件 - * - * - */ - public void deleteAsync(final AsyncHandler handler, final Class clazz, final Flipper flipper, final FilterNode node); - //------------------------updateAsync--------------------------- /** * 更新记录, 多对象必须是同一个Entity类
@@ -234,21 +172,6 @@ public interface DataSource { */ public CompletableFuture updateAsync(final T... values); - /** - * 更新记录, 多对象必须是同一个Entity类
- * 等价SQL:
- * UPDATE {table} SET column1 = value1, column2 = value2, ··· WHERE {primary} = {id1}
- * UPDATE {table} SET column1 = value1, column2 = value2, ··· WHERE {primary} = {id2}
- * ···
- * - * @param 泛型 - * @param handler 回调函数 - * @param values Entity对象 - * - * - */ - public void updateAsync(final AsyncHandler handler, final T... values); - /** * 更新单个记录的单个字段
* 注意:即使字段标记为@Column(updatable=false)也会被更新
@@ -279,22 +202,6 @@ public interface DataSource { */ public CompletableFuture updateColumnupdateColumnAsync(final Class clazz, final Serializable id, final String column, final Serializable value); - /** - * 更新单个记录的单个字段
- * 注意:即使字段标记为@Column(updatable=false)也会被更新
- * 等价SQL: UPDATE {table} SET {column} = {value} WHERE {primary} = {id}
- * - * @param Entity泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param id 主键 - * @param column 待更新的字段名 - * @param value 更新值 - * - * - */ - public void updateColumnAsync(final AsyncHandler handler, final Class clazz, final Serializable id, final String column, final Serializable value); - /** * 更新符合过滤条件记录的单个字段
* 注意:即使字段标记为@Column(updatable=false)也会被更新
@@ -325,22 +232,6 @@ public interface DataSource { */ public CompletableFuture updateColumnAsync(final Class clazz, final String column, final Serializable value, final FilterNode node); - /** - * 更新符合过滤条件记录的单个字段
- * 注意:即使字段标记为@Column(updatable=false)也会被更新
- * 等价SQL: UPDATE {table} SET {column} = {value} WHERE {filter node}
- * - * @param Entity泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param column 待更新的字段名 - * @param value 更新值 - * @param node 过滤条件 - * - * - */ - public void updateColumnAsync(final AsyncHandler handler, final Class clazz, final String column, final Serializable value, final FilterNode node); - /** * 更新指定主键值记录的部分字段
* 字段赋值操作选项见 ColumnExpress
@@ -369,21 +260,6 @@ public interface DataSource { */ public CompletableFuture updateColumnAsync(final Class clazz, final Serializable id, final ColumnValue... values); - /** - * 更新指定主键值记录的部分字段
- * 字段赋值操作选项见 ColumnExpress
- * 等价SQL: UPDATE {table} SET {column1} = {value1}, {column2} += {value2}, {column3} *= {value3}, ··· WHERE {filter node}
- * - * @param Entity泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param id 主键 - * @param values 更新字段 - * - * - */ - public void updateColumnAsync(final AsyncHandler handler, final Class clazz, final Serializable id, final ColumnValue... values); - /** * 更新符合过滤条件记录的部分字段
* 字段赋值操作选项见 ColumnExpress
@@ -414,22 +290,6 @@ public interface DataSource { */ public CompletableFuture updateColumnAsync(final Class clazz, final FilterNode node, final ColumnValue... values); - /** - * 更新符合过滤条件记录的部分字段
- * 字段赋值操作选项见 ColumnExpress
- * 注意:Entity类中标记为@Column(updatable=false)不会被更新
- * 等价SQL: UPDATE {table} SET {column1} = {value1}, {column2} += {value2}, {column3} *= {value3}, ··· WHERE {filter node}
- * - * @param Entity泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param node 过滤条件 - * @param values 更新字段 - * - * - */ - public void updateColumnAsync(final AsyncHandler handler, final Class clazz, final FilterNode node, final ColumnValue... values); - /** * 更新符合过滤条件的记录的指定字段
* Flipper中offset字段将被忽略
@@ -462,23 +322,6 @@ public interface DataSource { */ public CompletableFuture updateColumnAsync(final Class clazz, final FilterNode node, final Flipper flipper, final ColumnValue... values); - /** - * 更新符合过滤条件的记录的指定字段
- * Flipper中offset字段将被忽略
- * 注意:Entity类中标记为@Column(updatable=false)不会被更新
- * 等价SQL: UPDATE {table} SET {column1} = {value1}, {column2} += {value2}, {column3} *= {value3}, ··· WHERE {filter node} ORDER BY {flipper.sort} LIMIT {flipper.limit}
- * - * @param Entity泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param node 过滤条件 - * @param flipper 翻页对象 - * @param values 更新字段 - * - * - */ - public void updateColumnAsync(final AsyncHandler handler, final Class clazz, final FilterNode node, final Flipper flipper, final ColumnValue... values); - /** * 更新单个记录的指定字段
* 注意:Entity类中标记为@Column(updatable=false)不会被更新
@@ -505,19 +348,6 @@ public interface DataSource { */ public CompletableFuture updateColumnAsync(final T bean, final String... columns); - /** - * 更新单个记录的指定字段
- * 注意:Entity类中标记为@Column(updatable=false)不会被更新
- * 等价SQL: UPDATE {table} SET {column1} = {value1}, {column2} = {value2}, {column3} = {value3}, ··· WHERE {primary} = {bean.id}
- * - * @param Entity泛型 - * @param handler 回调函数 - * @param bean 待更新的Entity对象 - * @param columns 需更新的字段名 - * - */ - public void updateColumnAsync(final AsyncHandler handler, final T bean, final String... columns); - /** * 更新符合过滤条件记录的指定字段
* 注意:Entity类中标记为@Column(updatable=false)不会被更新
@@ -546,21 +376,6 @@ public interface DataSource { */ public CompletableFuture updateColumnAsync(final T bean, final FilterNode node, final String... columns); - /** - * 更新符合过滤条件记录的指定字段
- * 注意:Entity类中标记为@Column(updatable=false)不会被更新
- * 等价SQL: UPDATE {table} SET {column1} = {value1}, {column2} = {value2}, {column3} = {value3}, ··· WHERE {filter node}
- * - * @param Entity泛型 - * @param handler 回调函数 - * @param bean 待更新的Entity对象 - * @param node 过滤条件 - * @param columns 需更新的字段名 - * - * - */ - public void updateColumnAsync(final AsyncHandler handler, final T bean, final FilterNode node, final String... columns); - /** * 更新单个记录的指定字段
* 注意:Entity类中标记为@Column(updatable=false)不会被更新
@@ -587,20 +402,6 @@ public interface DataSource { */ public CompletableFuture updateColumnAsync(final T bean, final SelectColumn selects); - /** - * 更新单个记录的指定字段
- * 注意:Entity类中标记为@Column(updatable=false)不会被更新
- * 等价SQL: UPDATE {table} SET {column1} = {value1}, {column2} = {value2}, {column3} = {value3}, ··· WHERE {primary} = {bean.id}
- * - * @param Entity泛型 - * @param handler 回调函数 - * @param bean 待更新的Entity对象 - * @param selects 指定字段 - * - * - */ - public void updateColumnAsync(final AsyncHandler handler, final T bean, final SelectColumn selects); - /** * 更新符合过滤条件记录的指定字段
* 注意:Entity类中标记为@Column(updatable=false)不会被更新
@@ -629,21 +430,6 @@ public interface DataSource { */ public CompletableFuture updateColumnAsync(final T bean, final FilterNode node, final SelectColumn selects); - /** - * 更新符合过滤条件记录的指定字段
- * 注意:Entity类中标记为@Column(updatable=false)不会被更新
- * 等价SQL: UPDATE {table} SET {column1} = {value1}, {column2} = {value2}, {column3} = {value3}, ··· WHERE {filter node}
- * - * @param Entity泛型 - * @param handler 回调函数 - * @param bean 待更新的Entity对象 - * @param node 过滤条件 - * @param selects 指定字段 - * - * - */ - public void updateColumnAsync(final AsyncHandler handler, final T bean, final FilterNode node, final SelectColumn selects); - //############################################# 查询接口 ############################################# //-----------------------getXXXXResult----------------------------- /** @@ -672,20 +458,6 @@ public interface DataSource { */ public CompletableFuture getNumberResultAsync(final Class entityClass, final FilterFunc func, final String column); - /** - * 获取符合过滤条件记录的聚合结果, 无结果返回null
- * 等价SQL: SELECT FUNC{column} FROM {table}
- * 如 getNumberResultAsync(Record.class, FilterFunc.COUNT, null) 等价于: SELECT COUNT(*) FROM {table}
- * - * @param handler 回调函数 - * @param entityClass Entity类 - * @param func 聚合函数 - * @param column 指定字段 - * - * - */ - public void getNumberResultAsync(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final String column); - /** * 获取符合过滤条件记录的聚合结果, 无结果返回null
* 等价SQL: SELECT FUNC{column} FROM {table} WHERE {filter bean}
@@ -714,22 +486,6 @@ public interface DataSource { */ public CompletableFuture getNumberResultAsync(final Class entityClass, final FilterFunc func, final String column, final FilterBean bean); - /** - * 获取符合过滤条件记录的聚合结果, 无结果返回null
- * 等价SQL: SELECT FUNC{column} FROM {table} WHERE {filter bean}
- * 如 getNumberResultAsync(Record.class, FilterFunc.COUNT, null, (FilterBean)null) 等价于: SELECT COUNT(*) FROM {table}
- * - * @param Filter泛型 - * @param handler 回调函数 - * @param entityClass Entity类 - * @param func 聚合函数 - * @param column 指定字段 - * @param bean 过滤条件 - * - * - */ - public void getNumberResultAsync(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final String column, final B bean); - /** * 获取符合过滤条件记录的聚合结果, 无结果返回null
* 等价SQL: SELECT FUNC{column} FROM {table} WHERE {filter node}
@@ -758,21 +514,6 @@ public interface DataSource { */ public CompletableFuture getNumberResultAsync(final Class entityClass, final FilterFunc func, final String column, final FilterNode node); - /** - * 获取符合过滤条件记录的聚合结果, 无结果返回null
- * 等价SQL: SELECT FUNC{column} FROM {table} WHERE {filter node}
- * 如 getNumberResultAsync(Record.class, FilterFunc.MAX, "createtime", (FilterNode)null) 等价于: SELECT MAX(createtime) FROM {table}
- * - * @param handler 回调函数 - * @param entityClass Entity类 - * @param func 聚合函数 - * @param column 指定字段 - * @param node 过滤条件 - * - * - */ - public void getNumberResultAsync(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final String column, final FilterNode node); - /** * 获取符合过滤条件记录的聚合结果, 无结果返回默认值
* 等价SQL: SELECT FUNC{column} FROM {table}
@@ -801,20 +542,6 @@ public interface DataSource { */ public CompletableFuture getNumberResultAsync(final Class entityClass, final FilterFunc func, final Number defVal, final String column); - /** - * 获取符合过滤条件记录的聚合结果, 无结果返回默认值
- * 等价SQL: SELECT FUNC{column} FROM {table}
- * 如 getNumberResultAsync(Record.class, FilterFunc.MAX, "createtime") 等价于: SELECT MAX(createtime) FROM {table}
- * - * @param handler 回调函数 - * @param entityClass Entity类 - * @param func 聚合函数 - * @param defVal 默认值 - * @param column 指定字段 - * - */ - public void getNumberResultAsync(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final Number defVal, final String column); - /** * 获取符合过滤条件记录的聚合结果, 无结果返回默认值
* 等价SQL: SELECT FUNC{column} FROM {table} WHERE {filter bean}
@@ -845,21 +572,6 @@ public interface DataSource { */ public CompletableFuture getNumberResultAsync(final Class entityClass, final FilterFunc func, final Number defVal, final String column, final FilterBean bean); - /** - * 获取符合过滤条件记录的聚合结果, 无结果返回默认值
- * 等价SQL: SELECT FUNC{column} FROM {table} WHERE {filter bean}
- * 如 getNumberResultAsync(Record.class, FilterFunc.MAX, "createtime", (FilterNode)null) 等价于: SELECT MAX(createtime) FROM {table}
- * - * @param handler 回调函数 - * @param entityClass Entity类 - * @param func 聚合函数 - * @param defVal 默认值 - * @param column 指定字段 - * @param bean 过滤条件 - * - */ - public void getNumberResultAsync(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final Number defVal, final String column, final FilterBean bean); - /** * 获取符合过滤条件记录的聚合结果, 无结果返回默认值
* 等价SQL: SELECT FUNC{column} FROM {table} WHERE {filter node}
@@ -890,22 +602,6 @@ public interface DataSource { */ public CompletableFuture getNumberResultAsync(final Class entityClass, final FilterFunc func, final Number defVal, final String column, final FilterNode node); - /** - * 获取符合过滤条件记录的聚合结果, 无结果返回默认值
- * 等价SQL: SELECT FUNC{column} FROM {table} WHERE {filter node}
- * 如 getNumberResultAsync(Record.class, FilterFunc.MAX, "createtime", (FilterNode)null) 等价于: SELECT MAX(createtime) FROM {table}
- * - * @param handler 回调函数 - * @param entityClass Entity类 - * @param func 聚合函数 - * @param defVal 默认值 - * @param column 指定字段 - * @param node 过滤条件 - * - * - */ - public void getNumberResultAsync(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final Number defVal, final String column, final FilterNode node); - /** * 获取符合过滤条件记录的聚合结果Map
* 等价SQL: SELECT FUNC1{column1}, FUNC2{column2}, ··· FROM {table}
@@ -932,19 +628,6 @@ public interface DataSource { */ public CompletableFuture> getNumberMapAsync(final Class entityClass, final FilterFuncColumn... columns); - /** - * 获取符合过滤条件记录的聚合结果Map
- * 等价SQL: SELECT FUNC1{column1}, FUNC2{column2}, ··· FROM {table}
- * 如 getNumberMapAsync(Record.class, new FilterFuncColumn(FilterFunc.MAX, "createtime")) 等价于: SELECT MAX(createtime) FROM {table}
- * - * @param Number - * @param handler 回调函数 - * @param entityClass Entity类 - * @param columns 聚合字段 - * - */ - public void getNumberMapAsync(final AsyncHandler, FilterFuncColumn[]> handler, final Class entityClass, final FilterFuncColumn... columns); - /** * 获取符合过滤条件记录的聚合结果Map
* 等价SQL: SELECT FUNC1{column1}, FUNC2{column2}, ··· FROM {table} WHERE {filter bean}
@@ -973,21 +656,6 @@ public interface DataSource { */ public CompletableFuture> getNumberMapAsync(final Class entityClass, final FilterBean bean, final FilterFuncColumn... columns); - /** - * 获取符合过滤条件记录的聚合结果Map
- * 等价SQL: SELECT FUNC1{column1}, FUNC2{column2}, ··· FROM {table} WHERE {filter bean}
- * 如 getNumberMapAsync(Record.class, (FilterBean)null, new FilterFuncColumn(FilterFunc.MAX, "createtime")) 等价于: SELECT MAX(createtime) FROM {table}
- * - * @param Number - * @param Filter泛型 - * @param handler 回调函数 - * @param entityClass Entity类 - * @param bean 过滤条件 - * @param columns 聚合字段 - * - */ - public void getNumberMapAsync(final AsyncHandler, B> handler, final Class entityClass, final B bean, final FilterFuncColumn... columns); - /** * 获取符合过滤条件记录的聚合结果Map
* 等价SQL: SELECT FUNC1{column1}, FUNC2{column2}, ··· FROM {table} WHERE {filter node}
@@ -1016,20 +684,6 @@ public interface DataSource { */ public CompletableFuture> getNumberMapAsync(final Class entityClass, final FilterNode node, final FilterFuncColumn... columns); - /** - * 获取符合过滤条件记录的聚合结果Map
- * 等价SQL: SELECT FUNC1{column1}, FUNC2{column2}, ··· FROM {table} WHERE {filter node}
- * 如 getNumberMapAsync(Record.class, (FilterNode)null, new FilterFuncColumn(FilterFunc.MAX, "createtime")) 等价于: SELECT MAX(createtime) FROM {table}
- * - * @param Number - * @param handler 回调函数 - * @param entityClass Entity类 - * @param node 过滤条件 - * @param columns 聚合字段 - * - */ - public void getNumberMapAsync(final AsyncHandler, FilterNode> handler, final Class entityClass, final FilterNode node, final FilterFuncColumn... columns); - /** * 查询符合过滤条件记录的GROUP BY聚合结果Map
* 等价SQL: SELECT keyColumn, FUNC{funcColumn} FROM {table} GROUP BY {keyColumn}
@@ -1064,23 +718,6 @@ public interface DataSource { */ public CompletableFuture> queryColumnMapAsync(final Class entityClass, final String keyColumn, final FilterFunc func, final String funcColumn); - /** - * 查询符合过滤条件记录的GROUP BY聚合结果Map
- * 等价SQL: SELECT keyColumn, FUNC{funcColumn} FROM {table} GROUP BY {keyColumn}
- * 如 queryColumnMapAsync(Record.class, "name", FilterFunc.MAX, "createtime") 等价于: SELECT name, MAX(createtime) FROM record GROUP BY name
- * - * @param Entity泛型 - * @param Key字段的数据类型 - * @param Number - * @param handler 回调函数 - * @param entityClass Entity类 - * @param keyColumn Key字段 - * @param func 聚合函数 - * @param funcColumn 聚合字段 - * - */ - public void queryColumnMapAsync(final AsyncHandler, String> handler, final Class entityClass, final String keyColumn, final FilterFunc func, final String funcColumn); - /** * 查询符合过滤条件记录的GROUP BY聚合结果Map
* 等价SQL: SELECT keyColumn, FUNC{funcColumn} FROM {table} WHERE {filter bean} GROUP BY {keyColumn}
@@ -1117,24 +754,6 @@ public interface DataSource { */ public CompletableFuture> queryColumnMapAsync(final Class entityClass, final String keyColumn, final FilterFunc func, final String funcColumn, final FilterBean bean); - /** - * 查询符合过滤条件记录的GROUP BY聚合结果Map
- * 等价SQL: SELECT keyColumn, FUNC{funcColumn} FROM {table} WHERE {filter bean} GROUP BY {keyColumn}
- * 如 queryColumnMapAsync(Record.class, "name", FilterFunc.MAX, "createtime", (FilterBean)null) 等价于: SELECT name, MAX(createtime) FROM record GROUP BY name
- * - * @param Entity泛型 - * @param Key字段的数据类型 - * @param Number - * @param handler 回调函数 - * @param entityClass Entity类 - * @param keyColumn Key字段 - * @param func 聚合函数 - * @param funcColumn 聚合字段 - * @param bean 过滤条件 - * - */ - public void queryColumnMapAsync(final AsyncHandler, String> handler, final Class entityClass, final String keyColumn, final FilterFunc func, final String funcColumn, final FilterBean bean); - /** * 查询符合过滤条件记录的GROUP BY聚合结果Map
* 等价SQL: SELECT keyColumn, FUNC{funcColumn} FROM {table} WHERE {filter node} GROUP BY {keyColumn}
@@ -1171,24 +790,6 @@ public interface DataSource { */ public CompletableFuture> queryColumnMapAsync(final Class entityClass, final String keyColumn, final FilterFunc func, final String funcColumn, final FilterNode node); - /** - * 查询符合过滤条件记录的GROUP BY聚合结果Map
- * 等价SQL: SELECT keyColumn, FUNC{funcColumn} FROM {table} WHERE {filter node} GROUP BY {keyColumn}
- * 如 queryColumnMapAsync(Record.class, "name", FilterFunc.MAX, "createtime", (FilterNode)null) 等价于: SELECT name, MAX(createtime) FROM record GROUP BY name
- * - * @param Entity泛型 - * @param Key字段的数据类型 - * @param Number - * @param handler 回调函数 - * @param entityClass Entity类 - * @param keyColumn Key字段 - * @param func 聚合函数 - * @param funcColumn 聚合字段 - * @param node 过滤条件 - * - */ - public void queryColumnMapAsync(final AsyncHandler, String> handler, final Class entityClass, final String keyColumn, final FilterFunc func, final String funcColumn, final FilterNode node); - //-----------------------findAsync---------------------------- /** * 获取指定主键值的单个记录, 返回null表示不存在值
@@ -1214,18 +815,6 @@ public interface DataSource { */ public CompletableFuture findAsync(final Class clazz, final Serializable pk); - /** - * 获取指定主键值的单个记录, 返回null表示不存在值
- * 等价SQL: SELECT * FROM {table} WHERE {primary} = {id}
- * - * @param Entity泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param pk 主键值 - * - */ - public void findAsync(final AsyncHandler handler, final Class clazz, final Serializable pk); - /** * 获取指定主键值的单个记录, 返回null表示不存在值
* 等价SQL: SELECT {column1},{column2}, ··· FROM {table} WHERE {primary} = {id}
@@ -1252,19 +841,6 @@ public interface DataSource { */ public CompletableFuture findAsync(final Class clazz, final SelectColumn selects, final Serializable pk); - /** - * 获取指定主键值的单个记录, 返回null表示不存在值
- * 等价SQL: SELECT {column1},{column2}, ··· FROM {table} WHERE {primary} = {id}
- * - * @param Entity泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param selects 指定字段 - * @param pk 主键值 - * - */ - public void findAsync(final AsyncHandler handler, final Class clazz, final SelectColumn selects, final Serializable pk); - /** * 获取符合过滤条件单个记录, 返回null表示不存在值
* 等价SQL: SELECT * FROM {table} WHERE {column} = {key}
@@ -1291,19 +867,6 @@ public interface DataSource { */ public CompletableFuture findAsync(final Class clazz, final String column, final Serializable key); - /** - * 获取符合过滤条件单个记录, 返回null表示不存在值
- * 等价SQL: SELECT * FROM {table} WHERE {column} = {key}
- * - * @param Entity泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param column 过滤字段名 - * @param key 过滤字段值 - * - */ - public void findAsync(final AsyncHandler handler, final Class clazz, final String column, final Serializable key); - /** * 获取符合过滤条件单个记录, 返回null表示不存在值
* 等价SQL: SELECT * FROM {table} WHERE {filter bean}
@@ -1328,19 +891,6 @@ public interface DataSource { */ public CompletableFuture findAsync(final Class clazz, final FilterBean bean); - /** - * 获取符合过滤条件单个记录, 返回null表示不存在值
- * 等价SQL: SELECT * FROM {table} WHERE {filter bean}
- * - * @param Entity泛型 - * @param Filter泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param bean 过滤条件 - * - */ - public void findAsync(final AsyncHandler handler, final Class clazz, final B bean); - /** * 获取符合过滤条件单个记录, 返回null表示不存在值
* 等价SQL: SELECT * FROM {table} WHERE {filter node}
@@ -1365,18 +915,6 @@ public interface DataSource { */ public CompletableFuture findAsync(final Class clazz, final FilterNode node); - /** - * 获取符合过滤条件单个记录, 返回null表示不存在值
- * 等价SQL: SELECT * FROM {table} WHERE {filter node}
- * - * @param Entity泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param node 过滤条件 - * - */ - public void findAsync(final AsyncHandler handler, final Class clazz, final FilterNode node); - /** * 获取符合过滤条件单个记录, 返回null表示不存在值
* 等价SQL: SELECT {column1},{column2}, ··· FROM {table} WHERE {filter bean}
@@ -1403,20 +941,6 @@ public interface DataSource { */ public CompletableFuture findAsync(final Class clazz, final SelectColumn selects, final FilterBean bean); - /** - * 获取符合过滤条件单个记录, 返回null表示不存在值
- * 等价SQL: SELECT {column1},{column2}, ··· FROM {table} WHERE {filter bean}
- * - * @param Entity泛型 - * @param Filter泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param selects 指定字段 - * @param bean 过滤条件 - * - */ - public void findAsync(final AsyncHandler handler, final Class clazz, final SelectColumn selects, final B bean); - /** * 获取符合过滤条件单个记录, 返回null表示不存在值
* 等价SQL: SELECT {column1},{column2}, ··· FROM {table} WHERE {filter node}
@@ -1443,19 +967,6 @@ public interface DataSource { */ public CompletableFuture findAsync(final Class clazz, final SelectColumn selects, final FilterNode node); - /** - * 获取符合过滤条件单个记录, 返回null表示不存在值
- * 等价SQL: SELECT {column1},{column2}, ··· FROM {table} WHERE {filter node}
- * - * @param Entity泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param selects 指定字段 - * @param node 过滤条件 - * - */ - public void findAsync(final AsyncHandler handler, final Class clazz, final SelectColumn selects, final FilterNode node); - /** * 获取符合过滤条件单个记录的单个字段值, 返回null表示不存在值
* 等价SQL: SELECT {column} FROM {table} WHERE {primary} = {id}
@@ -1482,19 +993,6 @@ public interface DataSource { */ public CompletableFuture findColumnAsync(final Class clazz, final String column, final Serializable pk); - /** - * 获取符合过滤条件单个记录的单个字段值, 返回null表示不存在值
- * 等价SQL: SELECT {column} FROM {table} WHERE {primary} = {id}
- * - * @param Entity泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param column 字段名 - * @param pk 主键值 - * - */ - public void findColumnAsync(final AsyncHandler handler, final Class clazz, final String column, final Serializable pk); - /** * 获取符合过滤条件单个记录的单个字段值, 返回null表示不存在值
* 等价SQL: SELECT {column} FROM {table} WHERE {filter bean}
@@ -1521,20 +1019,6 @@ public interface DataSource { */ public CompletableFuture findColumnAsync(final Class clazz, final String column, final FilterBean bean); - /** - * 获取符合过滤条件单个记录的单个字段值, 返回null表示不存在值
- * 等价SQL: SELECT {column} FROM {table} WHERE {filter bean}
- * - * @param Entity泛型 - * @param Filter泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param column 字段名 - * @param bean 过滤条件 - * - */ - public void findColumnAsync(final AsyncHandler handler, final Class clazz, final String column, final B bean); - /** * 获取符合过滤条件单个记录的单个字段值, 返回null表示不存在值
* 等价SQL: SELECT {column} FROM {table} WHERE {filter node}
@@ -1561,19 +1045,6 @@ public interface DataSource { */ public CompletableFuture findColumnAsync(final Class clazz, final String column, final FilterNode node); - /** - * 获取符合过滤条件单个记录的单个字段值, 返回null表示不存在值
- * 等价SQL: SELECT {column} FROM {table} WHERE {filter node}
- * - * @param Entity泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param column 字段名 - * @param node 过滤条件 - * - */ - public void findColumnAsync(final AsyncHandler handler, final Class clazz, final String column, final FilterNode node); - /** * 获取符合过滤条件单个记录的单个字段值, 不存在值则返回默认值
* 等价SQL: SELECT {column} FROM {table} WHERE {primary} = {id}
@@ -1602,20 +1073,6 @@ public interface DataSource { */ public CompletableFuture findColumnAsync(final Class clazz, final String column, final Serializable defValue, final Serializable pk); - /** - * 获取符合过滤条件单个记录的单个字段值, 不存在值则返回默认值
- * 等价SQL: SELECT {column} FROM {table} WHERE {primary} = {id}
- * - * @param Entity泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param column 字段名 - * @param defValue 默认值 - * @param pk 主键值 - * - */ - public void findColumnAsync(final AsyncHandler handler, final Class clazz, final String column, final Serializable defValue, final Serializable pk); - /** * 获取符合过滤条件单个记录的单个字段值, 不存在值则返回默认值
* 等价SQL: SELECT {column} FROM {table} WHERE {filter bean}
@@ -1644,21 +1101,6 @@ public interface DataSource { */ public CompletableFuture findColumnAsync(final Class clazz, final String column, final Serializable defValue, final FilterBean bean); - /** - * 获取符合过滤条件单个记录的单个字段值, 不存在值则返回默认值
- * 等价SQL: SELECT {column} FROM {table} WHERE {filter bean}
- * - * @param Entity泛型 - * @param Filter泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param column 字段名 - * @param defValue 默认值 - * @param bean 过滤条件 - * - */ - public void findColumnAsync(final AsyncHandler handler, final Class clazz, final String column, final Serializable defValue, final B bean); - /** * 获取符合过滤条件单个记录的单个字段值, 不存在值则返回默认值
* 等价SQL: SELECT {column} FROM {table} WHERE {filter node}
@@ -1687,20 +1129,6 @@ public interface DataSource { */ public CompletableFuture findColumnAsync(final Class clazz, final String column, final Serializable defValue, final FilterNode node); - /** - * 获取符合过滤条件单个记录的单个字段值, 不存在值则返回默认值
- * 等价SQL: SELECT {column} FROM {table} WHERE {filter node}
- * - * @param Entity泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param column 字段名 - * @param defValue 默认值 - * @param node 过滤条件 - * - */ - public void findColumnAsync(final AsyncHandler handler, final Class clazz, final String column, final Serializable defValue, final FilterNode node); - /** * 判断是否存在主键值的记录
* 等价SQL: SELECT COUNT(*) FROM {table} WHERE {primary} = {id}
@@ -1725,18 +1153,6 @@ public interface DataSource { */ public CompletableFuture existsAsync(final Class clazz, final Serializable pk); - /** - * 判断是否存在主键值的记录
- * 等价SQL: SELECT COUNT(*) FROM {table} WHERE {primary} = {id}
- * - * @param Entity泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param pk 主键值 - * - */ - public void existsAsync(final AsyncHandler handler, final Class clazz, final Serializable pk); - /** * 判断是否存在符合过滤条件的记录
* 等价SQL: SELECT COUNT(*) FROM {table} WHERE {filter bean}
@@ -1761,19 +1177,6 @@ public interface DataSource { */ public CompletableFuture existsAsync(final Class clazz, final FilterBean bean); - /** - * 判断是否存在符合过滤条件的记录
- * 等价SQL: SELECT COUNT(*) FROM {table} WHERE {filter bean}
- * - * @param Entity泛型 - * @param Filter泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param bean 过滤条件 - * - */ - public void existsAsync(final AsyncHandler handler, final Class clazz, final B bean); - /** * 判断是否存在符合过滤条件的记录
* 等价SQL: SELECT COUNT(*) FROM {table} WHERE {filter node}
@@ -1798,18 +1201,6 @@ public interface DataSource { */ public CompletableFuture existsAsync(final Class clazz, final FilterNode node); - /** - * 判断是否存在符合过滤条件的记录
- * 等价SQL: SELECT COUNT(*) FROM {table} WHERE {filter node}
- * - * @param Entity泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param node 过滤条件 - * - */ - public void existsAsync(final AsyncHandler handler, final Class clazz, final FilterNode node); - //-----------------------list set---------------------------- /** * 查询符合过滤条件记录的某个字段Set集合
@@ -1841,21 +1232,6 @@ public interface DataSource { */ public CompletableFuture> queryColumnSetAsync(final String selectedColumn, final Class clazz, final String column, final Serializable key); - /** - * 查询符合过滤条件记录的某个字段Set集合
- * 等价SQL: SELECT {selectedColumn} FROM {table} WHERE {column} = {key}
- * - * @param Entity泛型 - * @param 字段类型 - * @param handler 回调函数 - * @param selectedColumn 指定字段 - * @param clazz Entity类 - * @param column 过滤字段名 - * @param key 过滤字段值 - * - */ - public void queryColumnSetAsync(final AsyncHandler, String> handler, final String selectedColumn, final Class clazz, final String column, final Serializable key); - /** * 查询符合过滤条件记录的某个字段Set集合
* 等价SQL: SELECT {selectedColumn} FROM {table} WHERE {filter bean}
@@ -1884,21 +1260,6 @@ public interface DataSource { */ public CompletableFuture> queryColumnSetAsync(final String selectedColumn, final Class clazz, final FilterBean bean); - /** - * 查询符合过滤条件记录的某个字段Set集合
- * 等价SQL: SELECT {selectedColumn} FROM {table} WHERE {filter bean}
- * - * @param Entity泛型 - * @param 字段类型 - * @param Filter泛型 - * @param handler 回调函数 - * @param selectedColumn 指定字段 - * @param clazz Entity类 - * @param bean 过滤条件 - * - */ - public void queryColumnSetAsync(final AsyncHandler, B> handler, final String selectedColumn, final Class clazz, final B bean); - /** * 查询符合过滤条件记录的某个字段Set集合
* 等价SQL: SELECT {selectedColumn} FROM {table} WHERE {filter node}
@@ -1927,20 +1288,6 @@ public interface DataSource { */ public CompletableFuture> queryColumnSetAsync(final String selectedColumn, final Class clazz, final FilterNode node); - /** - * 查询符合过滤条件记录的某个字段Set集合
- * 等价SQL: SELECT {selectedColumn} FROM {table} WHERE {filter node}
- * - * @param Entity泛型 - * @param 字段类型 - * @param handler 回调函数 - * @param selectedColumn 指定字段 - * @param clazz Entity类 - * @param node 过滤条件 - * - */ - public void queryColumnSetAsync(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final FilterNode node); - /** * 查询符合过滤条件记录的某个字段List集合
* 等价SQL: SELECT {selectedColumn} FROM {table} WHERE {column} = {key}
@@ -1971,21 +1318,6 @@ public interface DataSource { */ public CompletableFuture> queryColumnListAsync(final String selectedColumn, final Class clazz, final String column, final Serializable key); - /** - * 查询符合过滤条件记录的某个字段List集合
- * 等价SQL: SELECT {selectedColumn} FROM {table} WHERE {column} = {key}
- * - * @param Entity泛型 - * @param 字段类型 - * @param handler 回调函数 - * @param selectedColumn 指定字段 - * @param clazz Entity类 - * @param column 过滤字段名 - * @param key 过滤字段值 - * - */ - public void queryColumnListAsync(final AsyncHandler, Serializable> handler, final String selectedColumn, final Class clazz, final String column, final Serializable key); - /** * 查询符合过滤条件记录的某个字段List集合
* 等价SQL: SELECT {selectedColumn} FROM {table} WHERE {filter bean}
@@ -2014,21 +1346,6 @@ public interface DataSource { */ public CompletableFuture> queryColumnListAsync(final String selectedColumn, final Class clazz, final FilterBean bean); - /** - * 查询符合过滤条件记录的某个字段List集合
- * 等价SQL: SELECT {selectedColumn} FROM {table} WHERE {filter bean}
- * - * @param Entity泛型 - * @param 字段类型 - * @param Filter泛型 - * @param handler 回调函数 - * @param selectedColumn 指定字段 - * @param clazz Entity类 - * @param bean 过滤条件 - * - */ - public void queryColumnListAsync(final AsyncHandler, B> handler, final String selectedColumn, final Class clazz, final B bean); - /** * 查询符合过滤条件记录的某个字段List集合
* 等价SQL: SELECT {selectedColumn} FROM {table} WHERE {filter node}
@@ -2057,20 +1374,6 @@ public interface DataSource { */ public CompletableFuture> queryColumnListAsync(final String selectedColumn, final Class clazz, final FilterNode node); - /** - * 查询符合过滤条件记录的某个字段List集合
- * 等价SQL: SELECT {selectedColumn} FROM {table} WHERE {filter node}
- * - * @param Entity泛型 - * @param 字段类型 - * @param handler 回调函数 - * @param selectedColumn 指定字段 - * @param clazz Entity类 - * @param node 过滤条件 - * - */ - public void queryColumnListAsync(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final FilterNode node); - /** * 查询符合过滤条件记录的某个字段List集合
* 等价SQL: SELECT {selectedColumn} FROM {table} WHERE {filter bean} ORDER BY {flipper.sort} LIMIT {flipper.limit}
@@ -2101,22 +1404,6 @@ public interface DataSource { */ public CompletableFuture> queryColumnListAsync(final String selectedColumn, final Class clazz, final Flipper flipper, final FilterBean bean); - /** - * 查询符合过滤条件记录的某个字段List集合
- * 等价SQL: SELECT {selectedColumn} FROM {table} WHERE {filter bean} ORDER BY {flipper.sort} LIMIT {flipper.limit}
- * - * @param Entity泛型 - * @param 字段类型 - * @param Filter泛型 - * @param handler 回调函数 - * @param selectedColumn 指定字段 - * @param clazz Entity类 - * @param flipper 翻页对象 - * @param bean 过滤条件 - * - */ - public void queryColumnListAsync(final AsyncHandler, B> handler, final String selectedColumn, final Class clazz, final Flipper flipper, final B bean); - /** * 查询符合过滤条件记录的某个字段List集合
* 等价SQL: SELECT {selectedColumn} FROM {table} WHERE {filter node} ORDER BY {flipper.sort} LIMIT {flipper.limit}
@@ -2147,21 +1434,6 @@ public interface DataSource { */ public CompletableFuture> queryColumnListAsync(final String selectedColumn, final Class clazz, final Flipper flipper, final FilterNode node); - /** - * 查询符合过滤条件记录的某个字段List集合
- * 等价SQL: SELECT {selectedColumn} FROM {table} WHERE {filter node} ORDER BY {flipper.sort} LIMIT {flipper.limit}
- * - * @param Entity泛型 - * @param 字段类型 - * @param handler 回调函数 - * @param selectedColumn 指定字段 - * @param clazz Entity类 - * @param flipper 翻页对象 - * @param node 过滤条件 - * - */ - public void queryColumnListAsync(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final Flipper flipper, final FilterNode node); - /** * 查询符合过滤条件记录的某个字段Sheet集合
* 等价SQL: SELECT {selectedColumn} FROM {table} WHERE {filter node} ORDER BY {flipper.sort} LIMIT {flipper.limit}
@@ -2192,22 +1464,6 @@ public interface DataSource { */ public CompletableFuture> queryColumnSheetAsync(final String selectedColumn, final Class clazz, final Flipper flipper, final FilterBean bean); - /** - * 查询符合过滤条件记录的某个字段Sheet集合
- * 等价SQL: SELECT {selectedColumn} FROM {table} WHERE {filter node} ORDER BY {flipper.sort} LIMIT {flipper.limit}
- * - * @param Entity泛型 - * @param 字段类型 - * @param Filter泛型 - * @param handler 回调函数 - * @param selectedColumn 指定字段 - * @param clazz Entity类 - * @param flipper 翻页对象 - * @param bean 过滤条件 - * - */ - public void queryColumnSheetAsync(final AsyncHandler, B> handler, final String selectedColumn, final Class clazz, final Flipper flipper, final B bean); - /** * 查询符合过滤条件记录的某个字段Sheet集合
* 等价SQL: SELECT {selectedColumn} FROM {table} WHERE {filter bean} ORDER BY {flipper.sort} LIMIT {flipper.limit}
@@ -2238,21 +1494,6 @@ public interface DataSource { */ public CompletableFuture> queryColumnSheetAsync(final String selectedColumn, final Class clazz, final Flipper flipper, final FilterNode node); - /** - * 查询符合过滤条件记录的某个字段Sheet集合
- * 等价SQL: SELECT {selectedColumn} FROM {table} WHERE {filter bean} ORDER BY {flipper.sort} LIMIT {flipper.limit}
- * - * @param Entity泛型 - * @param 字段类型 - * @param handler 回调函数 - * @param selectedColumn 指定字段 - * @param clazz Entity类 - * @param flipper 翻页对象 - * @param node 过滤条件 - * - */ - public void queryColumnSheetAsync(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final Flipper flipper, final FilterNode node); - /** * 查询符合过滤条件记录的List集合
* 等价SQL: SELECT * FROM {table} WHERE {column} = {key} ORDER BY {flipper.sort} LIMIT {flipper.limit}
@@ -2279,19 +1520,6 @@ public interface DataSource { */ public CompletableFuture> queryListAsync(final Class clazz, final String column, final Serializable key); - /** - * 查询符合过滤条件记录的List集合
- * 等价SQL: SELECT * FROM {table} WHERE {column} = {key} ORDER BY {flipper.sort} LIMIT {flipper.limit}
- * - * @param Entity泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param column 过滤字段名 - * @param key 过滤字段值 - * - */ - public void queryListAsync(final AsyncHandler, Serializable> handler, final Class clazz, final String column, final Serializable key); - /** * 查询符合过滤条件记录的List集合
* 等价SQL: SELECT * FROM {table} WHERE {filter bean}
@@ -2316,19 +1544,6 @@ public interface DataSource { */ public CompletableFuture> queryListAsync(final Class clazz, final FilterBean bean); - /** - * 查询符合过滤条件记录的List集合
- * 等价SQL: SELECT * FROM {table} WHERE {filter bean}
- * - * @param Entity泛型 - * @param Filter泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param bean 过滤条件 - * - */ - public void queryListAsync(final AsyncHandler, B> handler, final Class clazz, final B bean); - /** * 查询符合过滤条件记录的List集合
* 等价SQL: SELECT * FROM {table} WHERE {filter node}
@@ -2353,18 +1568,6 @@ public interface DataSource { */ public CompletableFuture> queryListAsync(final Class clazz, final FilterNode node); - /** - * 查询符合过滤条件记录的List集合
- * 等价SQL: SELECT * FROM {table} WHERE {filter node}
- * - * @param Entity泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param node 过滤条件 - * - */ - public void queryListAsync(final AsyncHandler, FilterNode> handler, final Class clazz, final FilterNode node); - /** * 查询符合过滤条件记录的List集合
* 等价SQL: SELECT {column1},{column2}, ··· FROM {table} WHERE {filter bean}
@@ -2391,20 +1594,6 @@ public interface DataSource { */ public CompletableFuture> queryListAsync(final Class clazz, final SelectColumn selects, final FilterBean bean); - /** - * 查询符合过滤条件记录的List集合
- * 等价SQL: SELECT {column1},{column2}, ··· FROM {table} WHERE {filter bean}
- * - * @param Entity泛型 - * @param Filter泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param selects 指定字段 - * @param bean 过滤条件 - * - */ - public void queryListAsync(final AsyncHandler, B> handler, final Class clazz, final SelectColumn selects, final B bean); - /** * 查询符合过滤条件记录的List集合
* 等价SQL: SELECT {column1},{column2}, ··· FROM {table} WHERE {filter node}
@@ -2431,19 +1620,6 @@ public interface DataSource { */ public CompletableFuture> queryListAsync(final Class clazz, final SelectColumn selects, final FilterNode node); - /** - * 查询符合过滤条件记录的List集合
- * 等价SQL: SELECT {column1},{column2}, ··· FROM {table} WHERE {filter node}
- * - * @param Entity泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param selects 指定字段 - * @param node 过滤条件 - * - */ - public void queryListAsync(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final FilterNode node); - /** * 查询符合过滤条件记录的List集合
* 等价SQL: SELECT * FROM {table} WHERE {column} = {key} ORDER BY {flipper.sort} LIMIT {flipper.limit}
@@ -2472,20 +1648,6 @@ public interface DataSource { */ public CompletableFuture> queryListAsync(final Class clazz, final Flipper flipper, final String column, final Serializable key); - /** - * 查询符合过滤条件记录的List集合
- * 等价SQL: SELECT * FROM {table} WHERE {column} = {key} ORDER BY {flipper.sort} LIMIT {flipper.limit}
- * - * @param Entity泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param flipper 翻页对象 - * @param column 过滤字段名 - * @param key 过滤字段值 - * - */ - public void queryListAsync(final AsyncHandler, Serializable> handler, final Class clazz, final Flipper flipper, final String column, final Serializable key); - /** * 查询符合过滤条件记录的List集合
* 等价SQL: SELECT * FROM {table} WHERE {filter bean} ORDER BY {flipper.sort} LIMIT {flipper.limit}
@@ -2512,20 +1674,6 @@ public interface DataSource { */ public CompletableFuture> queryListAsync(final Class clazz, final Flipper flipper, final FilterBean bean); - /** - * 查询符合过滤条件记录的List集合
- * 等价SQL: SELECT * FROM {table} WHERE {filter bean} ORDER BY {flipper.sort} LIMIT {flipper.limit}
- * - * @param Entity泛型 - * @param Filter泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param flipper 翻页对象 - * @param bean 过滤条件 - * - */ - public void queryListAsync(final AsyncHandler, B> handler, final Class clazz, final Flipper flipper, final B bean); - /** * 查询符合过滤条件记录的List集合
* 等价SQL: SELECT * FROM {table} WHERE {filter node} ORDER BY {flipper.sort} LIMIT {flipper.limit}
@@ -2554,19 +1702,6 @@ public interface DataSource { */ public CompletableFuture> queryListAsync(final Class clazz, final Flipper flipper, final FilterNode node); - /** - * 查询符合过滤条件记录的List集合
- * 等价SQL: SELECT * FROM {table} WHERE {filter node} ORDER BY {flipper.sort} LIMIT {flipper.limit}
- * - * @param Entity泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param flipper 翻页对象 - * @param node 过滤条件 - * - */ - public void queryListAsync(final AsyncHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterNode node); - /** * 查询符合过滤条件记录的List集合
* 等价SQL: SELECT {column1},{column2}, ··· FROM {table} WHERE {filter bean} ORDER BY {flipper.sort} LIMIT {flipper.limit}
@@ -2595,21 +1730,6 @@ public interface DataSource { */ public CompletableFuture> queryListAsync(final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterBean bean); - /** - * 查询符合过滤条件记录的List集合
- * 等价SQL: SELECT {column1},{column2}, ··· FROM {table} WHERE {filter bean} ORDER BY {flipper.sort} LIMIT {flipper.limit}
- * - * @param Entity泛型 - * @param Filter泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param selects 指定字段 - * @param flipper 翻页对象 - * @param bean 过滤条件 - * - */ - public void queryListAsync(final AsyncHandler, B> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final B bean); - /** * 查询符合过滤条件记录的List集合
* 等价SQL: SELECT {column1},{column2}, ··· FROM {table} WHERE {filter node} ORDER BY {flipper.sort} LIMIT {flipper.limit}
@@ -2638,20 +1758,6 @@ public interface DataSource { */ public CompletableFuture> queryListAsync(final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node); - /** - * 查询符合过滤条件记录的List集合
- * 等价SQL: SELECT {column1},{column2}, ··· FROM {table} WHERE {filter node} ORDER BY {flipper.sort} LIMIT {flipper.limit}
- * - * @param Entity泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param selects 指定字段 - * @param flipper 翻页对象 - * @param node 过滤条件 - * - */ - public void queryListAsync(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node); - //-----------------------sheet---------------------------- /** * 查询符合过滤条件记录的Sheet集合
@@ -2679,20 +1785,6 @@ public interface DataSource { */ public CompletableFuture> querySheetAsync(final Class clazz, final Flipper flipper, final FilterBean bean); - /** - * 查询符合过滤条件记录的Sheet集合
- * 等价SQL: SELECT * FROM {table} WHERE {filter bean} ORDER BY {flipper.sort} LIMIT {flipper.limit}
- * - * @param Entity泛型 - * @param Filter泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param flipper 翻页对象 - * @param bean 过滤条件 - * - */ - public void querySheetAsync(final AsyncHandler, B> handler, final Class clazz, final Flipper flipper, final B bean); - /** * 查询符合过滤条件记录的Sheet集合
* 等价SQL: SELECT * FROM {table} WHERE {filter node} ORDER BY {flipper.sort} LIMIT {flipper.limit}
@@ -2719,19 +1811,6 @@ public interface DataSource { */ public CompletableFuture> querySheetAsync(final Class clazz, final Flipper flipper, final FilterNode node); - /** - * 查询符合过滤条件记录的Sheet集合
- * 等价SQL: SELECT * FROM {table} WHERE {filter node} ORDER BY {flipper.sort} LIMIT {flipper.limit}
- * - * @param Entity泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param flipper 翻页对象 - * @param node 过滤条件 - * - */ - public void querySheetAsync(final AsyncHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterNode node); - /** * 查询符合过滤条件记录的Sheet集合
* 等价SQL: SELECT {column1},{column2}, ··· FROM {table} WHERE {filter bean} ORDER BY {flipper.sort} LIMIT {flipper.limit}
@@ -2760,21 +1839,6 @@ public interface DataSource { */ public CompletableFuture> querySheetAsync(final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterBean bean); - /** - * 查询符合过滤条件记录的Sheet集合
- * 等价SQL: SELECT {column1},{column2}, ··· FROM {table} WHERE {filter bean} ORDER BY {flipper.sort} LIMIT {flipper.limit}
- * - * @param Entity泛型 - * @param Filter泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param selects 指定字段 - * @param flipper 翻页对象 - * @param bean 过滤条件 - * - */ - public void querySheetAsync(final AsyncHandler, B> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final B bean); - /** * 查询符合过滤条件记录的Sheet集合
* 等价SQL: SELECT {column1},{column2}, ··· FROM {table} WHERE {filter node} ORDER BY {flipper.sort} LIMIT {flipper.limit}
@@ -2803,20 +1867,6 @@ public interface DataSource { */ public CompletableFuture> querySheetAsync(final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node); - /** - * 查询符合过滤条件记录的Sheet集合
- * 等价SQL: SELECT {column1},{column2}, ··· FROM {table} WHERE {filter node} ORDER BY {flipper.sort} LIMIT {flipper.limit}
- * - * @param Entity泛型 - * @param handler 回调函数 - * @param clazz Entity类 - * @param selects 指定字段 - * @param flipper 翻页对象 - * @param node 过滤条件 - * - */ - public void querySheetAsync(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node); - //-----------------------direct---------------------------- /** * 直接本地执行SQL语句进行查询,远程模式不可用
diff --git a/test/org/redkale/test/rest/HelloService.java b/test/org/redkale/test/rest/HelloService.java index c0d944f86..de80d82fb 100644 --- a/test/org/redkale/test/rest/HelloService.java +++ b/test/org/redkale/test/rest/HelloService.java @@ -1,6 +1,7 @@ package org.redkale.test.rest; import java.util.*; +import java.util.concurrent.CompletableFuture; import javax.annotation.Resource; import org.redkale.net.http.*; @@ -77,7 +78,7 @@ public class HelloService implements Service { if (source != null) return source.queryList(HelloEntity.class, bean); return new ArrayList<>(); } - + //查询单个 @RestMapping(name = "find") public HelloEntity findHello(@RestParam(name = "#") int id) { //通过 /pipes/hello/find/1234、/pipes/hello/jsfind/1234 查询对象 @@ -86,10 +87,7 @@ public class HelloService implements Service { //异步查询单个 @RestMapping(name = "asyncfind") - public void findHello(AsyncHandler handler, @RestParam(name = "#") int id) { //通过 /pipes/hello/find/1234、/pipes/hello/jsfind/1234 查询对象 - if (source != null) source.findAsync(handler, HelloEntity.class, id); - HelloEntity rs = new HelloEntity(); - rs.setHelloname("Hello名称"); - if (handler != null) handler.completed(rs, null); + public CompletableFuture asyncFindHello(@RestParam(name = "#") int id) { //通过 /pipes/hello/find/1234、/pipes/hello/jsfind/1234 查询对象 + return source.findAsync(HelloEntity.class, id); } } diff --git a/test/org/redkale/test/rest/_DynHelloRestServlet1.java b/test/org/redkale/test/rest/_DynHelloRestServlet1.java index 08275dba4..3cb4be660 100644 --- a/test/org/redkale/test/rest/_DynHelloRestServlet1.java +++ b/test/org/redkale/test/rest/_DynHelloRestServlet1.java @@ -133,6 +133,6 @@ public class _DynHelloRestServlet1 extends SimpleRestServlet { public void asyncfind(HttpRequest req, HttpResponse resp) throws IOException { HelloService service = _servicemap == null ? _service : _servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, "")); int id = Integer.parseInt(req.getRequstURILastPath()); - service.findHello(resp.createAsyncHandler(), id); + resp.finishJson(service.asyncFindHello(id)); } }