diff --git a/src/org/redkale/net/sncp/SncpClient.java b/src/org/redkale/net/sncp/SncpClient.java index 125007fb3..4c168d179 100644 --- a/src/org/redkale/net/sncp/SncpClient.java +++ b/src/org/redkale/net/sncp/SncpClient.java @@ -43,10 +43,6 @@ public final class SncpClient { protected final Attribute[] paramAttrs; // 为null表示无DynCall处理,index=0固定为null, 其他为参数标记的DynCall回调方法 - protected final int handlerFuncParamIndex; - - protected final int handlerAttachParamIndex; - protected final int addressTargetParamIndex; protected final int addressSourceParamIndex; @@ -64,24 +60,16 @@ public final class SncpClient { Annotation[][] anns = method.getParameterAnnotations(); int targetAddrIndex = -1; int sourceAddrIndex = -1; - int handlerAttachIndex = -1; - int handlerFuncIndex = -1; + boolean hasattr = false; Attribute[] atts = new Attribute[paramTypes.length + 1]; if (anns.length > 0) { Class[] params = method.getParameterTypes(); - for (int i = 0; i < params.length; i++) { - if (CompletionHandler.class.isAssignableFrom(params[i])) { - handlerFuncIndex = i; - break; - } - } + for (int i = 0; i < anns.length; i++) { if (anns[i].length > 0) { for (Annotation ann : anns[i]) { - if (ann.annotationType() == DynAttachment.class) { - handlerAttachIndex = i; - } else if (ann.annotationType() == DynTargetAddress.class && SocketAddress.class.isAssignableFrom(params[i])) { + if (ann.annotationType() == DynTargetAddress.class && SocketAddress.class.isAssignableFrom(params[i])) { targetAddrIndex = i; } else if (ann.annotationType() == DynSourceAddress.class && SocketAddress.class.isAssignableFrom(params[i])) { sourceAddrIndex = i; @@ -103,10 +91,7 @@ public final class SncpClient { } this.addressTargetParamIndex = targetAddrIndex; this.addressSourceParamIndex = sourceAddrIndex; - this.handlerFuncParamIndex = handlerFuncIndex; - this.handlerAttachParamIndex = handlerAttachIndex; this.paramAttrs = hasattr ? atts : null; - if (this.handlerFuncParamIndex >= 0 && method.getReturnType() != void.class) throw new RuntimeException(method + " has CompletionHandler type parameter but return type is not void"); } @Override @@ -220,9 +205,8 @@ public final class SncpClient { public void remoteSameGroup(final BsonConvert bsonConvert, final JsonConvert jsonConvert, Transport transport, final int index, final Object... params) { final SncpAction action = actions[index]; - if (action.handlerFuncParamIndex >= 0) params[action.handlerFuncParamIndex] = null; //不能让远程调用handler,因为之前本地方法已经调用过了 for (InetSocketAddress addr : transport.getRemoteAddresses()) { - remote0(null, bsonConvert, jsonConvert, transport, addr, action, params); + remote0(bsonConvert, jsonConvert, transport, addr, action, params); } } @@ -239,9 +223,8 @@ public final class SncpClient { public void remoteDiffGroup(final BsonConvert bsonConvert, final JsonConvert jsonConvert, Transport[] transports, final int index, final Object... params) { if (transports == null || transports.length < 1) return; final SncpAction action = actions[index]; - if (action.handlerFuncParamIndex >= 0) params[action.handlerFuncParamIndex] = null; //不能让远程调用handler,因为之前本地方法已经调用过了 for (Transport transport : transports) { - remote0(null, bsonConvert, jsonConvert, transport, null, action, params); + remote0(bsonConvert, jsonConvert, transport, null, action, params); } } @@ -259,10 +242,8 @@ public final class SncpClient { //只给远程模式调用的 public T remote(final BsonConvert bsonConvert, final JsonConvert jsonConvert, Transport transport, final int index, final Object... params) { final SncpAction action = actions[index]; - final CompletionHandler handlerFunc = action.handlerFuncParamIndex >= 0 ? (CompletionHandler) params[action.handlerFuncParamIndex] : null; - if (action.handlerFuncParamIndex >= 0) params[action.handlerFuncParamIndex] = null; - SncpFuture future = remote0(handlerFunc, bsonConvert, jsonConvert, transport, null, action, params); - if (handlerFunc != null) return null; + SncpFuture future = remote0(bsonConvert, jsonConvert, transport, null, action, params); + final BsonReader reader = bsonConvert.pollBsonReader(); try { reader.setBytes(future.get(5, TimeUnit.SECONDS)); @@ -284,22 +265,22 @@ public final class SncpClient { if (transports == null || transports.length < 1) return; remote(bsonConvert, jsonConvert, transports[0], index, params); for (int i = 1; i < transports.length; i++) { - remote0(null, bsonConvert, jsonConvert, transports[i], null, actions[index], params); + remote0(bsonConvert, jsonConvert, transports[i], null, actions[index], params); } } - private SncpFuture remote0(final CompletionHandler handler, final BsonConvert bsonConvert, final JsonConvert jsonConvert, final Transport transport, final SocketAddress addr0, final SncpAction action, final Object... params) { + private SncpFuture remote0(final BsonConvert bsonConvert, final JsonConvert jsonConvert, final Transport transport, final SocketAddress addr0, final SncpAction action, final Object... params) { if ("rest".equalsIgnoreCase(transport.getKind())) { - return remoteRest0(handler, jsonConvert, transport, addr0, action, params); + return remoteRest0(jsonConvert, transport, addr0, action, params); } - return remoteSncp0(handler, bsonConvert, transport, addr0, action, params); + return remoteSncp0(bsonConvert, transport, addr0, action, params); } - private SncpFuture remoteRest0(final CompletionHandler handler, final JsonConvert jsonConvert, final Transport transport, final SocketAddress addr0, final SncpAction action, final Object... params) { + private SncpFuture remoteRest0(final JsonConvert jsonConvert, final Transport transport, final SocketAddress addr0, final SncpAction action, final Object... params) { return null; } - private SncpFuture remoteSncp0(final CompletionHandler handler, final BsonConvert bsonConvert, final Transport transport, final SocketAddress addr0, final SncpAction action, final Object... params) { + private SncpFuture remoteSncp0(final BsonConvert bsonConvert, final Transport transport, final SocketAddress addr0, final SncpAction action, final Object... params) { Type[] myparamtypes = action.paramTypes; if (action.addressSourceParamIndex >= 0) params[action.addressSourceParamIndex] = this.clientAddress; final BsonWriter writer = bsonConvert.pollBsonWriter(transport.getBufferSupplier()); // 将head写入 @@ -402,24 +383,6 @@ public final class SncpClient { future.set(this.body); transport.offerBuffer(buffer); transport.offerConnection(false, conn); - if (handler != null) { - final Object handlerAttach = action.handlerAttachParamIndex >= 0 ? params[action.handlerAttachParamIndex] : null; - final BsonReader reader = bsonConvert.pollBsonReader(); - try { - reader.setBytes(this.body); - int i; - while ((i = (reader.readByte() & 0xff)) != 0) { - final Attribute attr = action.paramAttrs[i]; - attr.set(params[i - 1], bsonConvert.convertFrom(attr.type(), reader)); - } - Object rs = bsonConvert.convertFrom(action.resultTypes, reader); - handler.completed(rs, handlerAttach); - } catch (Exception e) { - handler.failed(e, handlerAttach); - } finally { - bsonConvert.offerBsonReader(reader); - } - } } @Override @@ -428,10 +391,6 @@ public final class SncpClient { future.set(new RuntimeException(action.method + " sncp remote exec failed")); transport.offerBuffer(buffer); transport.offerConnection(true, conn); - if (handler != null) { - final Object handlerAttach = action.handlerAttachParamIndex >= 0 ? params[action.handlerAttachParamIndex] : null; - handler.failed(exc, handlerAttach); - } } }); } diff --git a/src/org/redkale/service/CacheSourceService.java b/src/org/redkale/service/CacheSourceService.java index bc7b043e7..b2fdd26b6 100644 --- a/src/org/redkale/service/CacheSourceService.java +++ b/src/org/redkale/service/CacheSourceService.java @@ -8,7 +8,6 @@ package org.redkale.service; import java.beans.*; import java.io.*; import java.lang.reflect.*; -import java.nio.channels.*; import java.util.*; import java.util.concurrent.*; import java.util.function.*; @@ -26,6 +25,7 @@ import org.redkale.util.*; * @param value类型 *

* 详情见: http://redkale.org + * * @author zhangjx */ @AutoLoad(false) @@ -191,11 +191,6 @@ public class CacheSourceService implem return !entry.isExpired(); } - @Override - public void exists(final CompletionHandler handler, @DynAttachment final K key) { - if (handler != null) handler.completed(exists(key), key); - } - @Override public V get(K key) { if (key == null) return null; @@ -206,11 +201,6 @@ public class CacheSourceService implem return (V) entry.getValue(); } - @Override - public void get(final CompletionHandler handler, @DynAttachment final K key) { - if (handler != null) handler.completed(get(key), key); - } - @Override @MultiRun public V getAndRefresh(K key, final int expireSeconds) { @@ -224,12 +214,6 @@ public class CacheSourceService implem return (V) entry.getValue(); } - @Override - public void getAndRefresh(final CompletionHandler handler, @DynAttachment final K key, final int expireSeconds) { - V rs = getAndRefresh(key, expireSeconds); - if (handler != null) handler.completed(rs, key); - } - @Override @MultiRun public void refresh(K key, final int expireSeconds) { @@ -240,12 +224,6 @@ public class CacheSourceService implem entry.expireSeconds = expireSeconds; } - @Override - public void refresh(final CompletionHandler handler, final K key, final int expireSeconds) { - refresh(key, expireSeconds); - if (handler != null) handler.completed(null, key); - } - @Override @MultiRun public void set(K key, V value) { @@ -261,12 +239,6 @@ public class CacheSourceService implem } } - @Override - public void set(final CompletionHandler handler, @DynAttachment final K key, final V value) { - set(key, value); - if (handler != null) handler.completed(null, key); - } - @Override @MultiRun public void set(int expireSeconds, K key, V value) { @@ -282,12 +254,6 @@ public class CacheSourceService implem } } - @Override - public void set(final CompletionHandler handler, final int expireSeconds, @DynAttachment final K key, final V value) { - set(expireSeconds, key, value); - if (handler != null) handler.completed(null, key); - } - @Override @MultiRun public void setExpireSeconds(K key, int expireSeconds) { @@ -297,12 +263,6 @@ public class CacheSourceService implem entry.expireSeconds = expireSeconds; } - @Override - public void setExpireSeconds(final CompletionHandler handler, @DynAttachment final K key, final int expireSeconds) { - setExpireSeconds(key, expireSeconds); - if (handler != null) handler.completed(null, key); - } - @Override @MultiRun public void remove(K key) { @@ -310,32 +270,16 @@ public class CacheSourceService implem container.remove(key); } - @Override - public void remove(final CompletionHandler handler, @DynAttachment final K key) { - remove(key); - if (handler != null) handler.completed(null, key); - } - @Override public Collection getCollection(final K key) { return (Collection) get(key); } - @Override - public void getCollection(final CompletionHandler, K> handler, @DynAttachment final K key) { - if (handler != null) handler.completed(getCollection(key), key); - } - @Override public Collection getCollectionAndRefresh(final K key, final int expireSeconds) { return (Collection) getAndRefresh(key, expireSeconds); } - @Override - public void getCollectionAndRefresh(final CompletionHandler, K> handler, @DynAttachment final K key, final int expireSeconds) { - if (handler != null) handler.completed(getCollectionAndRefresh(key, expireSeconds), key); - } - @Override @MultiRun public void appendListItem(K key, V value) { @@ -352,12 +296,6 @@ public class CacheSourceService implem } } - @Override - public void appendListItem(final CompletionHandler handler, @DynAttachment final K key, final V value) { - appendListItem(key, value); - if (handler != null) handler.completed(null, key); - } - @Override @MultiRun public void removeListItem(K key, V value) { @@ -367,12 +305,6 @@ public class CacheSourceService implem ((Collection) entry.getValue()).remove(value); } - @Override - public void removeListItem(final CompletionHandler handler, @DynAttachment final K key, final V value) { - removeListItem(key, value); - if (handler != null) handler.completed(null, key); - } - @Override @MultiRun public void appendSetItem(K key, V value) { @@ -389,12 +321,6 @@ public class CacheSourceService implem } } - @Override - public void appendSetItem(final CompletionHandler handler, @DynAttachment final K key, final V value) { - appendSetItem(key, value); - if (handler != null) handler.completed(null, key); - } - @Override @MultiRun public void removeSetItem(K key, V value) { @@ -404,12 +330,6 @@ public class CacheSourceService implem ((Set) entry.getValue()).remove(value); } - @Override - public void removeSetItem(final CompletionHandler handler, @DynAttachment final K key, final V value) { - removeSetItem(key, value); - if (handler != null) handler.completed(null, key); - } - public static enum CacheEntryType { OBJECT, SET, LIST; } diff --git a/src/org/redkale/service/DataSourceService.java b/src/org/redkale/service/DataSourceService.java index a2e2ced28..b63d6da6d 100644 --- a/src/org/redkale/service/DataSourceService.java +++ b/src/org/redkale/service/DataSourceService.java @@ -6,7 +6,6 @@ package org.redkale.service; import java.io.*; -import java.nio.channels.*; import java.sql.*; import java.util.*; import java.util.function.*; @@ -34,537 +33,251 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { source.insert(values); } - @Override - public void insert(final CompletionHandler handler, @DynAttachment @DynCall(DataCallArrayAttribute.class) final T... values) { - source.insert(values); - if (handler != null) handler.completed(null, values); - } - @Override public void delete(T... values) { source.delete(values); } - @Override - public void delete(final CompletionHandler handler, @DynAttachment final T... values) { - source.delete(values); - if (handler != null) handler.completed(null, values); - } - @Override public void delete(final Class clazz, final Serializable... ids) { source.delete(clazz, ids); } - @Override - public void delete(final CompletionHandler handler, final Class clazz, @DynAttachment final Serializable... ids) { - source.delete(clazz, ids); - if (handler != null) handler.completed(null, ids); - } - @Override public void delete(final Class clazz, FilterNode node) { source.delete(clazz, node); } - @Override - public void delete(final CompletionHandler handler, final Class clazz, @DynAttachment final FilterNode node) { - source.delete(clazz, node); - if (handler != null) handler.completed(null, node); - } - @Override public void update(T... values) { source.update(values); } - @Override - public void update(final CompletionHandler handler, @DynAttachment final T... values) { - source.update(values); - if (handler != null) handler.completed(null, values); - } - @Override public void updateColumn(final Class clazz, final Serializable id, final String column, final Serializable value) { source.updateColumn(clazz, id, column, value); } - @Override - public void updateColumn(final CompletionHandler handler, final Class clazz, @DynAttachment final Serializable id, final String column, final Serializable value) { - source.updateColumn(clazz, id, column, value); - if (handler != null) handler.completed(null, id); - } - @Override public void updateColumn(final Class clazz, final String column, final Serializable value, final FilterNode node) { source.updateColumn(clazz, column, value, node); } - @Override - public void updateColumn(final CompletionHandler handler, final Class clazz, final String column, final Serializable value, @DynAttachment final FilterNode node) { - source.updateColumn(clazz, column, value, node); - if (handler != null) handler.completed(null, node); - } - @Override public void updateColumnIncrement(final Class clazz, final Serializable id, final String column, long incvalue) { source.updateColumnIncrement(clazz, id, column, incvalue); } - @Override - public void updateColumnIncrement(final CompletionHandler handler, final Class clazz, @DynAttachment final Serializable id, final String column, long incvalue) { - source.updateColumnIncrement(clazz, id, column, incvalue); - if (handler != null) handler.completed(null, id); - } - @Override public void updateColumnAnd(final Class clazz, final Serializable id, final String column, long incvalue) { source.updateColumnAnd(clazz, id, column, incvalue); } - @Override - public void updateColumnAnd(final CompletionHandler handler, final Class clazz, @DynAttachment final Serializable id, final String column, long incvalue) { - source.updateColumnAnd(clazz, id, column, incvalue); - if (handler != null) handler.completed(null, id); - } - @Override public void updateColumnOr(final Class clazz, final Serializable id, final String column, long incvalue) { source.updateColumnOr(clazz, id, column, incvalue); } - @Override - public void updateColumnOr(final CompletionHandler handler, final Class clazz, @DynAttachment final Serializable id, final String column, long incvalue) { - source.updateColumnOr(clazz, id, column, incvalue); - if (handler != null) handler.completed(null, id); - } - @Override public void updateColumns(T bean, final String... columns) { source.updateColumns(bean, columns); } - @Override - public void updateColumns(final CompletionHandler handler, @DynAttachment final T bean, final String... columns) { - source.updateColumns(bean, columns); - if (handler != null) handler.completed(null, bean); - } - @Override public void updateColumns(T bean, final FilterNode node, final String... columns) { source.updateColumns(bean, node, columns); } - @Override - public void updateColumns(final CompletionHandler handler, final T bean, @DynAttachment final FilterNode node, final String... columns) { - source.updateColumns(bean, node, columns); - if (handler != null) handler.completed(null, node); - } - @Override public Number getNumberResult(final Class entityClass, FilterFunc func, final String column) { return source.getNumberResult(entityClass, func, column); } - @Override - public void getNumberResult(final CompletionHandler handler, final Class entityClass, final FilterFunc func, @DynAttachment final String column) { - Number rs = source.getNumberResult(entityClass, func, column); - if (handler != null) handler.completed(rs, column); - } - @Override public final Number getNumberResult(final Class entityClass, FilterFunc func, final String column, FilterBean bean) { return getNumberResult(entityClass, func, column, FilterNodeBean.createFilterNode(bean)); } - @Override - public final void getNumberResult(final CompletionHandler handler, final Class entityClass, final FilterFunc func, final String column, final FilterBean bean) { - getNumberResult(handler, entityClass, func, column, FilterNodeBean.createFilterNode(bean)); - } - @Override public Number getNumberResult(final Class entityClass, FilterFunc func, final String column, FilterNode node) { return source.getNumberResult(entityClass, func, column, node); } - @Override - public void getNumberResult(final CompletionHandler handler, final Class entityClass, final FilterFunc func, final String column, @DynAttachment final FilterNode node) { - Number rs = source.getNumberResult(entityClass, func, column, node); - if (handler != null) handler.completed(rs, node); - } - @Override public Map queryColumnMap(final Class entityClass, final String keyColumn, FilterFunc func, final String funcColumn) { return source.queryColumnMap(entityClass, keyColumn, func, funcColumn); } - @Override - public void queryColumnMap(final CompletionHandler, String> handler, final Class entityClass, final String keyColumn, final FilterFunc func, @DynAttachment final String funcColumn) { - Map map = source.queryColumnMap(entityClass, keyColumn, func, funcColumn); - if (handler != null) handler.completed(map, funcColumn); - } - @Override public final Map queryColumnMap(final Class entityClass, final String keyColumn, FilterFunc func, final String funcColumn, FilterBean bean) { return queryColumnMap(entityClass, keyColumn, func, funcColumn, FilterNodeBean.createFilterNode(bean)); } - @Override - public final void queryColumnMap(final CompletionHandler, FilterNode> handler, final Class entityClass, final String keyColumn, final FilterFunc func, final String funcColumn, final FilterBean bean) { - queryColumnMap(handler, entityClass, keyColumn, func, funcColumn, FilterNodeBean.createFilterNode(bean)); - } - @Override public Map queryColumnMap(final Class entityClass, final String keyColumn, FilterFunc func, final String funcColumn, FilterNode node) { return source.queryColumnMap(entityClass, keyColumn, func, funcColumn, node); } - @Override - public void queryColumnMap(final CompletionHandler, FilterNode> handler, final Class entityClass, final String keyColumn, final FilterFunc func, final String funcColumn, @DynAttachment final FilterNode node) { - Map map = source.queryColumnMap(entityClass, keyColumn, func, funcColumn, node); - if (handler != null) handler.completed(map, node); - } - @Override public T find(final Class clazz, final Serializable pk) { return source.find(clazz, pk); } - @Override - public void find(final CompletionHandler handler, final Class clazz, @DynAttachment final Serializable pk) { - T rs = source.find(clazz, pk); - if (handler != null) handler.completed(rs, pk); - } - @Override public T find(final Class clazz, SelectColumn selects, final Serializable pk) { return source.find(clazz, selects, pk); } - @Override - public void find(final CompletionHandler handler, final Class clazz, final SelectColumn selects, @DynAttachment final Serializable pk) { - T rs = source.find(clazz, selects, pk); - if (handler != null) handler.completed(rs, pk); - } - @Override public T find(final Class clazz, final String column, final Serializable key) { return source.find(clazz, column, key); } - @Override - public void find(final CompletionHandler handler, final Class clazz, final String column, @DynAttachment final Serializable key) { - T rs = source.find(clazz, column, key); - if (handler != null) handler.completed(rs, key); - } - @Override public final T find(final Class clazz, FilterBean bean) { return find(clazz, FilterNodeBean.createFilterNode(bean)); } - @Override - public final void find(final CompletionHandler handler, final Class clazz, final FilterBean bean) { - find(handler, clazz, FilterNodeBean.createFilterNode(bean)); - } - @Override public T find(final Class clazz, FilterNode node) { return source.find(clazz, node); } - @Override - public void find(final CompletionHandler handler, final Class clazz, @DynAttachment final FilterNode node) { - T rs = source.find(clazz, node); - if (handler != null) handler.completed(rs, node); - } - @Override public final T find(final Class clazz, final SelectColumn selects, FilterBean bean) { return find(clazz, selects, FilterNodeBean.createFilterNode(bean)); } - @Override - public final void find(final CompletionHandler handler, final Class clazz, final SelectColumn selects, final FilterBean bean) { - find(handler, clazz, selects, FilterNodeBean.createFilterNode(bean)); - } - @Override public T find(final Class clazz, final SelectColumn selects, final FilterNode node) { return source.find(clazz, selects, node); } - @Override - public void find(final CompletionHandler handler, final Class clazz, final SelectColumn selects, @DynAttachment final FilterNode node) { - T rs = source.find(clazz, selects, node); - if (handler != null) handler.completed(rs, node); - } - @Override public boolean exists(final Class clazz, final Serializable pk) { return source.exists(clazz, pk); } - @Override - public void exists(final CompletionHandler handler, final Class clazz, @DynAttachment final Serializable pk) { - boolean rs = source.exists(clazz, pk); - if (handler != null) handler.completed(rs, pk); - } - @Override public final boolean exists(final Class clazz, FilterBean bean) { return exists(clazz, FilterNodeBean.createFilterNode(bean)); } - @Override - public final void exists(final CompletionHandler handler, final Class clazz, final FilterBean bean) { - exists(handler, clazz, FilterNodeBean.createFilterNode(bean)); - } - @Override public boolean exists(final Class clazz, FilterNode node) { return source.exists(clazz, node); } - @Override - public void exists(final CompletionHandler handler, final Class clazz, @DynAttachment final FilterNode node) { - boolean rs = source.exists(clazz, node); - if (handler != null) handler.completed(rs, node); - } - @Override public HashSet queryColumnSet(String selectedColumn, Class clazz, final String column, final Serializable key) { return source.queryColumnSet(selectedColumn, clazz, column, key); } - @Override - public void queryColumnSet(final CompletionHandler, Serializable> handler, final String selectedColumn, final Class clazz, final String column, @DynAttachment final Serializable key) { - HashSet rs = source.queryColumnSet(selectedColumn, clazz, column, key); - if (handler != null) handler.completed(rs, key); - } - @Override public final HashSet queryColumnSet(String selectedColumn, Class clazz, FilterBean bean) { return queryColumnSet(selectedColumn, clazz, FilterNodeBean.createFilterNode(bean)); } - @Override - public final void queryColumnSet(final CompletionHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final FilterBean bean) { - queryColumnSet(handler, selectedColumn, clazz, FilterNodeBean.createFilterNode(bean)); - } - @Override public HashSet queryColumnSet(String selectedColumn, Class clazz, FilterNode node) { return source.queryColumnSet(selectedColumn, clazz, node); } - @Override - public void queryColumnSet(final CompletionHandler, FilterNode> handler, final String selectedColumn, final Class clazz, @DynAttachment final FilterNode node) { - HashSet rs = source.queryColumnSet(selectedColumn, clazz, node); - if (handler != null) handler.completed(rs, node); - } - @Override public List queryColumnList(String selectedColumn, Class clazz, final String column, final Serializable key) { return source.queryColumnList(selectedColumn, clazz, column, key); } - @Override - public void queryColumnList(final CompletionHandler, Serializable> handler, final String selectedColumn, final Class clazz, final String column, @DynAttachment final Serializable key) { - List rs = source.queryColumnList(selectedColumn, clazz, column, key); - if (handler != null) handler.completed(rs, key); - } - @Override public final List queryColumnList(String selectedColumn, Class clazz, FilterBean bean) { return queryColumnList(selectedColumn, clazz, FilterNodeBean.createFilterNode(bean)); } - @Override - public final void queryColumnList(final CompletionHandler, FilterNode> handler, final String selectedColumn, final Class clazz, @DynAttachment final FilterBean bean) { - queryColumnList(handler, selectedColumn, clazz, FilterNodeBean.createFilterNode(bean)); - } - @Override public List queryColumnList(String selectedColumn, Class clazz, FilterNode node) { return source.queryColumnList(selectedColumn, clazz, node); } - @Override - public void queryColumnList(final CompletionHandler, FilterNode> handler, final String selectedColumn, final Class clazz, @DynAttachment final FilterNode node) { - List rs = source.queryColumnList(selectedColumn, clazz, node); - if (handler != null) handler.completed(rs, node); - } - @Override public final Sheet queryColumnSheet(String selectedColumn, Class clazz, Flipper flipper, FilterBean bean) { return queryColumnSheet(selectedColumn, clazz, flipper, FilterNodeBean.createFilterNode(bean)); } - @Override - public final void queryColumnSheet(final CompletionHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final Flipper flipper, final FilterBean bean) { - queryColumnSheet(handler, selectedColumn, clazz, flipper, FilterNodeBean.createFilterNode(bean)); - } - @Override public Sheet queryColumnSheet(String selectedColumn, Class clazz, Flipper flipper, FilterNode node) { return source.queryColumnSheet(selectedColumn, clazz, flipper, node); } - @Override - public void queryColumnSheet(final CompletionHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final Flipper flipper, @DynAttachment final FilterNode node) { - Sheet rs = source.queryColumnSheet(selectedColumn, clazz, flipper, node); - if (handler != null) handler.completed(rs, node); - } - @Override public List queryList(final Class clazz, final String column, final Serializable key) { return source.queryList(clazz, column, key); } - @Override - public void queryList(final CompletionHandler, Serializable> handler, final Class clazz, final String column, @DynAttachment final Serializable key) { - List rs = source.queryList(clazz, column, key); - if (handler != null) handler.completed(rs, key); - } - @Override public final List queryList(final Class clazz, final FilterBean bean) { return queryList(clazz, FilterNodeBean.createFilterNode(bean)); } - @Override - public final void queryList(final CompletionHandler, FilterNode> handler, final Class clazz, final FilterBean bean) { - queryList(handler, clazz, FilterNodeBean.createFilterNode(bean)); - } - @Override public List queryList(final Class clazz, final FilterNode node) { return source.queryList(clazz, node); } - @Override - public void queryList(final CompletionHandler, FilterNode> handler, final Class clazz, @DynAttachment final FilterNode node) { - List rs = source.queryList(clazz, node); - if (handler != null) handler.completed(rs, node); - } - @Override public final List queryList(final Class clazz, final SelectColumn selects, final FilterBean bean) { return queryList(clazz, FilterNodeBean.createFilterNode(bean)); } - @Override - public final void queryList(final CompletionHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final FilterBean bean) { - queryList(handler, clazz, selects, FilterNodeBean.createFilterNode(bean)); - } - @Override public List queryList(final Class clazz, final SelectColumn selects, final FilterNode node) { return source.queryList(clazz, selects, node); } - @Override - public void queryList(final CompletionHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, @DynAttachment final FilterNode node) { - List rs = source.queryList(clazz, selects, node); - if (handler != null) handler.completed(rs, node); - } - @Override public List queryList(final Class clazz, final Flipper flipper, final String column, final Serializable key) { return source.queryList(clazz, flipper, column, key); } - @Override - public void queryList(final CompletionHandler, Serializable> handler, final Class clazz, final Flipper flipper, final String column, @DynAttachment final Serializable key) { - List rs = source.queryList(clazz, flipper, column, key); - if (handler != null) handler.completed(rs, key); - } - @Override public final List queryList(final Class clazz, final Flipper flipper, final FilterBean bean) { return queryList(clazz, flipper, FilterNodeBean.createFilterNode(bean)); } - @Override - public final void queryList(final CompletionHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterBean bean) { - queryList(handler, clazz, flipper, FilterNodeBean.createFilterNode(bean)); - } - @Override public List queryList(final Class clazz, final Flipper flipper, final FilterNode node) { return source.queryList(clazz, flipper, node); } - @Override - public void queryList(final CompletionHandler, FilterNode> handler, final Class clazz, final Flipper flipper, @DynAttachment final FilterNode node) { - List rs = source.queryList(clazz, flipper, node); - if (handler != null) handler.completed(rs, node); - } - @Override public final List queryList(final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterBean bean) { return queryList(clazz, selects, flipper, FilterNodeBean.createFilterNode(bean)); } - @Override - public final void queryList(final CompletionHandler, FilterNode> handler, final Class clazz, SelectColumn selects, final Flipper flipper, final FilterBean bean) { - queryList(handler, clazz, selects, flipper, FilterNodeBean.createFilterNode(bean)); - } - @Override public List queryList(final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node) { return source.queryList(clazz, selects, flipper, node); } - @Override - public void queryList(final CompletionHandler, FilterNode> handler, final Class clazz, SelectColumn selects, final Flipper flipper, @DynAttachment final FilterNode node) { - List rs = source.queryList(clazz, selects, flipper, node); - if (handler != null) handler.completed(rs, node); - } - @Override public final Sheet querySheet(final Class clazz, final Flipper flipper, final FilterBean bean) { return querySheet(clazz, flipper, FilterNodeBean.createFilterNode(bean)); } - @Override - public final void querySheet(final CompletionHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterBean bean) { - querySheet(handler, clazz, flipper, FilterNodeBean.createFilterNode(bean)); - } - @Override public Sheet querySheet(final Class clazz, final Flipper flipper, final FilterNode node) { return source.querySheet(clazz, flipper, node); } - @Override - public void querySheet(final CompletionHandler, FilterNode> handler, final Class clazz, final Flipper flipper, @DynAttachment final FilterNode node) { - Sheet rs = source.querySheet(clazz, flipper, node); - if (handler != null) handler.completed(rs, node); - } - @Override public final Sheet querySheet(final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterBean bean) { return querySheet(clazz, selects, flipper, FilterNodeBean.createFilterNode(bean)); } - @Override - public final void querySheet(final CompletionHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterBean bean) { - querySheet(handler, clazz, selects, flipper, FilterNodeBean.createFilterNode(bean)); - } - @Override public Sheet querySheet(final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node) { return source.querySheet(clazz, selects, flipper, node); } - @Override - public void querySheet(final CompletionHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, @DynAttachment final FilterNode node) { - Sheet rs = source.querySheet(clazz, selects, flipper, node); - if (handler != null) handler.completed(rs, node); - } - @Override public void close() throws Exception { source.getClass().getMethod("close").invoke(source); diff --git a/src/org/redkale/service/DynAttachment.java b/src/org/redkale/service/DynAttachment.java deleted file mode 100644 index 95de5b611..000000000 --- a/src/org/redkale/service/DynAttachment.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ -package org.redkale.service; - -import java.lang.annotation.*; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -/** - * SNCP协议中用于CompletionHandler回调函数中的attach字段。 - * - * - *

详情见: http://redkale.org - * @author zhangjx - */ -@Inherited -@Documented -@Target({PARAMETER}) -@Retention(RUNTIME) -public @interface DynAttachment { - -} diff --git a/src/org/redkale/source/CacheSource.java b/src/org/redkale/source/CacheSource.java index f12201826..9305dcb5e 100644 --- a/src/org/redkale/source/CacheSource.java +++ b/src/org/redkale/source/CacheSource.java @@ -6,7 +6,6 @@ package org.redkale.source; import java.io.*; -import java.nio.channels.*; import java.util.*; /** @@ -15,6 +14,7 @@ import java.util.*; * @param value的类型 *

* 详情见: http://redkale.org + * * @author zhangjx */ public interface CacheSource { @@ -51,36 +51,4 @@ public interface CacheSource { public void removeSetItem(final K key, final V value); - //----------------------异步版--------------------------------- - public void exists(final CompletionHandler handler, final K key); - - public void get(final CompletionHandler handler, final K key); - - public void getAndRefresh(final CompletionHandler handler, final K key, final int expireSeconds); - - public void refresh(final CompletionHandler handler, final K key, final int expireSeconds); - - public void set(final CompletionHandler handler, final K key, final V value); - - public void set(final CompletionHandler handler, final int expireSeconds, final K key, final V value); - - public void setExpireSeconds(final CompletionHandler handler, final K key, final int expireSeconds); - - public void remove(final CompletionHandler handler, final K key); - - public void getCollection(final CompletionHandler, K> handler, final K key); - - public void getCollectionAndRefresh(final CompletionHandler, K> handler, final K key, final int expireSeconds); - - public void appendListItem(final CompletionHandler handler, final K key, final V value); - - public void removeListItem(final CompletionHandler handler, final K key, final V value); - - public void appendSetItem(final CompletionHandler handler, final K key, final V value); - - public void removeSetItem(final CompletionHandler handler, final K key, final V value); - - default void isOpen(final CompletionHandler handler) { - if (handler != null) handler.completed(Boolean.TRUE, null); - } } diff --git a/src/org/redkale/source/DataDefaultSource.java b/src/org/redkale/source/DataDefaultSource.java index 39881dca7..92a977cb7 100644 --- a/src/org/redkale/source/DataDefaultSource.java +++ b/src/org/redkale/source/DataDefaultSource.java @@ -8,7 +8,6 @@ package org.redkale.source; import java.io.*; import java.lang.reflect.Method; import java.net.URL; -import java.nio.channels.CompletionHandler; import java.sql.*; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; @@ -326,12 +325,6 @@ public final class DataDefaultSource implements DataSource, Function void insert(final CompletionHandler handler, final T... values) { - insert(values); - if (handler != null) handler.completed(null, values); - } - private void insert(final Connection conn, final EntityInfo info, T... values) { if (values.length == 0) return; try { @@ -485,12 +478,6 @@ public final class DataDefaultSource implements DataSource, Function void delete(final CompletionHandler handler, final T... values) { - delete(values); - if (handler != null) handler.completed(null, values); - } - private void delete(final Connection conn, final EntityInfo info, T... values) { if (values.length == 0) return; final Attribute primary = info.getPrimary(); @@ -517,12 +504,6 @@ public final class DataDefaultSource implements DataSource, Function void delete(final CompletionHandler handler, final Class clazz, final Serializable... ids) { - delete(clazz, ids); - if (handler != null) handler.completed(null, ids); - } - private void delete(final Connection conn, final EntityInfo info, Serializable... keys) { if (keys.length == 0) return; try { @@ -567,12 +548,6 @@ public final class DataDefaultSource implements DataSource, Function void delete(final CompletionHandler handler, final Class clazz, final FilterNode node) { - delete(clazz, node); - if (handler != null) handler.completed(null, node); - } - private void delete(final Connection conn, final EntityInfo info, final FilterNode node) { try { if (!info.isVirtualEntity()) { @@ -629,12 +604,6 @@ public final class DataDefaultSource implements DataSource, Function void update(final CompletionHandler handler, final T... values) { - update(values); - if (handler != null) handler.completed(null, values); - } - private void update(final Connection conn, final EntityInfo info, T... values) { try { Class clazz = info.getType(); @@ -720,12 +689,6 @@ public final class DataDefaultSource implements DataSource, Function void updateColumn(final CompletionHandler handler, final Class clazz, final Serializable id, final String column, final Serializable value) { - updateColumn(clazz, id, column, value); - if (handler != null) handler.completed(null, id); - } - private void updateColumn(Connection conn, final EntityInfo info, Serializable id, String column, Serializable value) { try { if (!info.isVirtualEntity()) { @@ -773,12 +736,6 @@ public final class DataDefaultSource implements DataSource, Function void updateColumn(final CompletionHandler handler, final Class clazz, final String column, final Serializable value, FilterNode node) { - updateColumn(clazz, column, value, node); - if (handler != null) handler.completed(null, node); - } - private void updateColumn(Connection conn, final EntityInfo info, String column, Serializable value, FilterNode node) { try { if (!info.isVirtualEntity()) { @@ -831,12 +788,6 @@ public final class DataDefaultSource implements DataSource, Function void updateColumnIncrement(final CompletionHandler handler, final Class clazz, final Serializable id, final String column, long incvalue) { - updateColumnIncrement(clazz, id, column, incvalue); - if (handler != null) handler.completed(null, id); - } - private void updateColumnIncrement(Connection conn, final EntityInfo info, Serializable id, String column, long incvalue) { try { if (!info.isVirtualEntity()) { @@ -887,12 +838,6 @@ public final class DataDefaultSource implements DataSource, Function void updateColumnAnd(final CompletionHandler handler, final Class clazz, final Serializable id, final String column, long incvalue) { - updateColumnAnd(clazz, id, column, incvalue); - if (handler != null) handler.completed(null, id); - } - private void updateColumnAnd(Connection conn, final EntityInfo info, Serializable id, String column, long andvalue) { try { if (!info.isVirtualEntity()) { @@ -943,12 +888,6 @@ public final class DataDefaultSource implements DataSource, Function void updateColumnOr(final CompletionHandler handler, final Class clazz, final Serializable id, final String column, long incvalue) { - updateColumnOr(clazz, id, column, incvalue); - if (handler != null) handler.completed(null, id); - } - private void updateColumnOr(Connection conn, final EntityInfo info, Serializable id, String column, long orvalue) { try { if (!info.isVirtualEntity()) { @@ -996,12 +935,6 @@ public final class DataDefaultSource implements DataSource, Function void updateColumns(final CompletionHandler handler, final T bean, final String... columns) { - updateColumns(bean, columns); - if (handler != null) handler.completed(null, bean); - } - private void updateColumns(final Connection conn, final EntityInfo info, final T bean, final String... columns) { if (bean == null || columns.length < 1) return; try { @@ -1060,12 +993,6 @@ public final class DataDefaultSource implements DataSource, Function void updateColumns(final CompletionHandler handler, final T bean, final FilterNode node, final String... columns) { - updateColumns(bean, node, columns); - if (handler != null) handler.completed(null, node); - } - private void updateColumns(final Connection conn, final EntityInfo info, final T bean, final FilterNode node, final String... columns) { if (bean == null || node == null || columns.length < 1) return; try { @@ -1134,22 +1061,11 @@ public final class DataDefaultSource implements DataSource, Function handler, final Class entityClass, final FilterFunc func, final String column) { - Number rs = getNumberResult(entityClass, func, column); - if (handler != null) handler.completed(rs, column); - } - @Override public Number getNumberResult(final Class entityClass, final FilterFunc func, final String column, FilterBean bean) { return getNumberResult(entityClass, func, column, FilterNodeBean.createFilterNode(bean)); } - @Override - public void getNumberResult(final CompletionHandler handler, final Class entityClass, final FilterFunc func, final String column, final FilterBean bean) { - getNumberResult(handler, entityClass, func, column, FilterNodeBean.createFilterNode(bean)); - } - @Override public Number getNumberResult(final Class entityClass, final FilterFunc func, final String column, final FilterNode node) { final Connection conn = createReadSQLConnection(); @@ -1183,34 +1099,17 @@ public final class DataDefaultSource implements DataSource, Function handler, final Class entityClass, final FilterFunc func, final String column, final FilterNode node) { - Number rs = getNumberResult(entityClass, func, column, node); - if (handler != null) handler.completed(rs, node); - } - //-----------------------queryColumnMap----------------------------- @Override public Map queryColumnMap(final Class entityClass, final String keyColumn, FilterFunc func, final String funcColumn) { return queryColumnMap(entityClass, keyColumn, func, funcColumn, (FilterNode) null); } - @Override - public void queryColumnMap(final CompletionHandler, String> handler, final Class entityClass, final String keyColumn, final FilterFunc func, final String funcColumn) { - Map map = queryColumnMap(entityClass, keyColumn, func, funcColumn); - if (handler != null) handler.completed(map, funcColumn); - } - @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)); } - @Override - public void queryColumnMap(final CompletionHandler, FilterNode> handler, final Class entityClass, final String keyColumn, final FilterFunc func, final String funcColumn, final FilterBean bean) { - queryColumnMap(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 Connection conn = createReadSQLConnection(); @@ -1247,12 +1146,6 @@ public final class DataDefaultSource implements DataSource, Function void queryColumnMap(final CompletionHandler, FilterNode> handler, final Class entityClass, final String keyColumn, final FilterFunc func, final String funcColumn, final FilterNode node) { - Map map = queryColumnMap(entityClass, keyColumn, func, funcColumn, node); - if (handler != null) handler.completed(map, node); - } - //-----------------------find---------------------------- /** * 根据主键获取对象 @@ -1268,12 +1161,6 @@ public final class DataDefaultSource implements DataSource, Function void find(final CompletionHandler handler, final Class clazz, final Serializable pk) { - T rs = find(clazz, pk); - if (handler != null) handler.completed(rs, pk); - } - @Override public T find(Class clazz, final SelectColumn selects, Serializable pk) { final EntityInfo info = loadEntityInfo(clazz); @@ -1301,58 +1188,26 @@ public final class DataDefaultSource implements DataSource, Function void find(final CompletionHandler handler, final Class clazz, final SelectColumn selects, final Serializable pk) { - T rs = find(clazz, selects, pk); - if (handler != null) handler.completed(rs, pk); - } - @Override public T find(final Class clazz, final String column, final Serializable key) { return find(clazz, null, FilterNode.create(column, key)); } - @Override - public void find(final CompletionHandler handler, final Class clazz, final String column, final Serializable key) { - T rs = find(clazz, column, key); - if (handler != null) handler.completed(rs, key); - } - @Override public T find(final Class clazz, final FilterBean bean) { return find(clazz, null, FilterNodeBean.createFilterNode(bean)); } - @Override - public void find(final CompletionHandler handler, final Class clazz, final FilterBean bean) { - FilterNode node = FilterNodeBean.createFilterNode(bean); - T rs = find(clazz, node); - if (handler != null) handler.completed(rs, node); - } - @Override public T find(final Class clazz, final FilterNode node) { return find(clazz, null, node); } - @Override - public void find(final CompletionHandler handler, final Class clazz, final FilterNode node) { - T rs = find(clazz, node); - if (handler != null) handler.completed(rs, node); - } - @Override public T find(final Class clazz, final SelectColumn selects, final FilterBean bean) { return find(clazz, selects, FilterNodeBean.createFilterNode(bean)); } - @Override - public void find(final CompletionHandler handler, final Class clazz, final SelectColumn selects, final FilterBean bean) { - FilterNode node = FilterNodeBean.createFilterNode(bean); - T rs = find(clazz, selects, node); - if (handler != null) handler.completed(rs, node); - } - @Override public T find(final Class clazz, final SelectColumn selects, final FilterNode node) { final EntityInfo info = loadEntityInfo(clazz); @@ -1380,12 +1235,6 @@ public final class DataDefaultSource implements DataSource, Function void find(final CompletionHandler handler, final Class clazz, final SelectColumn selects, final FilterNode node) { - T rs = find(clazz, selects, node); - if (handler != null) handler.completed(rs, node); - } - @Override public boolean exists(Class clazz, Serializable pk) { final EntityInfo info = loadEntityInfo(clazz); @@ -1412,24 +1261,11 @@ public final class DataDefaultSource implements DataSource, Function void exists(final CompletionHandler handler, final Class clazz, final Serializable pk) { - boolean rs = exists(clazz, pk); - if (handler != null) handler.completed(rs, pk); - } - @Override public boolean exists(final Class clazz, final FilterBean bean) { return exists(clazz, FilterNodeBean.createFilterNode(bean)); } - @Override - public void exists(final CompletionHandler handler, final Class clazz, final FilterBean bean) { - FilterNode node = FilterNodeBean.createFilterNode(bean); - boolean rs = exists(clazz, node); - if (handler != null) handler.completed(rs, node); - } - @Override public boolean exists(final Class clazz, final FilterNode node) { final EntityInfo info = loadEntityInfo(clazz); @@ -1456,81 +1292,37 @@ public final class DataDefaultSource implements DataSource, Function void exists(final CompletionHandler handler, final Class clazz, final FilterNode node) { - boolean rs = exists(clazz, node); - if (handler != null) handler.completed(rs, node); - } - //-----------------------list set---------------------------- @Override public HashSet queryColumnSet(String selectedColumn, Class clazz, String column, Serializable key) { return queryColumnSet(selectedColumn, clazz, FilterNode.create(column, key)); } - @Override - public void queryColumnSet(final CompletionHandler, Serializable> handler, final String selectedColumn, final Class clazz, final String column, final Serializable key) { - HashSet rs = queryColumnSet(selectedColumn, clazz, column, key); - if (handler != null) handler.completed(rs, key); - } - @Override public HashSet queryColumnSet(final String selectedColumn, final Class clazz, final FilterBean bean) { return new LinkedHashSet<>(queryColumnList(selectedColumn, clazz, bean)); } - @Override - public void queryColumnSet(final CompletionHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final FilterBean bean) { - FilterNode node = FilterNodeBean.createFilterNode(bean); - HashSet rs = queryColumnSet(selectedColumn, clazz, node); - if (handler != null) handler.completed(rs, node); - } - @Override public HashSet queryColumnSet(String selectedColumn, Class clazz, FilterNode node) { return new LinkedHashSet<>(queryColumnList(selectedColumn, clazz, node)); } - @Override - public void queryColumnSet(final CompletionHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final FilterNode node) { - HashSet rs = queryColumnSet(selectedColumn, clazz, node); - if (handler != null) handler.completed(rs, 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)); } - @Override - public void queryColumnList(final CompletionHandler, Serializable> handler, final String selectedColumn, final Class clazz, final String column, final Serializable key) { - List rs = queryColumnList(selectedColumn, clazz, column, key); - if (handler != null) handler.completed(rs, key); - } - @Override public List queryColumnList(final String selectedColumn, final Class clazz, final FilterBean bean) { return (List) queryColumnSheet(selectedColumn, clazz, null, bean).list(true); } - @Override - public void queryColumnList(final CompletionHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final FilterBean bean) { - final FilterNode node = FilterNodeBean.createFilterNode(bean); - List rs = queryColumnList(selectedColumn, clazz, node); - if (handler != null) handler.completed(rs, node); - } - @Override public List queryColumnList(final String selectedColumn, final Class clazz, final FilterNode node) { return (List) queryColumnSheet(selectedColumn, clazz, null, node).list(true); } - @Override - public void queryColumnList(final CompletionHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final FilterNode node) { - List rs = queryColumnList(selectedColumn, clazz, node); - if (handler != null) handler.completed(rs, node); - } - /** * 根据指定参数查询对象某个字段的集合 *

@@ -1548,13 +1340,6 @@ public final class DataDefaultSource implements DataSource, Function void queryColumnSheet(final CompletionHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final Flipper flipper, final FilterBean bean) { - final FilterNode node = FilterNodeBean.createFilterNode(bean); - Sheet rs = queryColumnSheet(selectedColumn, clazz, flipper, node); - if (handler != null) handler.completed(rs, node); - } - @Override public Sheet queryColumnSheet(final String selectedColumn, final Class clazz, final Flipper flipper, final FilterNode node) { Sheet sheet = querySheet(true, true, clazz, SelectColumn.createIncludes(selectedColumn), flipper, node); @@ -1571,12 +1356,6 @@ public final class DataDefaultSource implements DataSource, Function void queryColumnSheet(final CompletionHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final Flipper flipper, final FilterNode node) { - Sheet rs = queryColumnSheet(selectedColumn, clazz, flipper, node); - if (handler != null) handler.completed(rs, node); - } - private Map formatMap(final Class clazz, final Collection list) { Map map = new LinkedHashMap<>(); if (list == null || list.isEmpty()) return map; @@ -1602,12 +1381,6 @@ public final class DataDefaultSource implements DataSource, Function void queryList(final CompletionHandler, Serializable> handler, final Class clazz, final String column, final Serializable key) { - List rs = queryList(clazz, column, key); - if (handler != null) handler.completed(rs, key); - } - /** * 根据过滤对象FilterBean查询对象集合 * @@ -1622,24 +1395,11 @@ public final class DataDefaultSource implements DataSource, Function void queryList(final CompletionHandler, FilterNode> handler, final Class clazz, final FilterBean bean) { - FilterNode node = FilterNodeBean.createFilterNode(bean); - List rs = queryList(clazz, node); - if (handler != null) handler.completed(rs, node); - } - @Override public List queryList(final Class clazz, final FilterNode node) { return queryList(clazz, (SelectColumn) null, node); } - @Override - public void queryList(final CompletionHandler, FilterNode> handler, final Class clazz, final FilterNode node) { - List rs = queryList(clazz, node); - if (handler != null) handler.completed(rs, node); - } - /** * 根据过滤对象FilterBean查询对象集合, 对象只填充或排除SelectField指定的字段 * @@ -1655,81 +1415,36 @@ public final class DataDefaultSource implements DataSource, Function void queryList(final CompletionHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final FilterBean bean) { - FilterNode node = FilterNodeBean.createFilterNode(bean); - List rs = queryList(clazz, selects, node); - if (handler != null) handler.completed(rs, node); - } - @Override public List queryList(final Class clazz, final SelectColumn selects, final FilterNode node) { return queryList(clazz, selects, (Flipper) null, node); } - @Override - public void queryList(final CompletionHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final FilterNode node) { - List rs = queryList(clazz, selects, node); - if (handler != null) handler.completed(rs, 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)); } - @Override - public void queryList(final CompletionHandler, Serializable> handler, final Class clazz, final Flipper flipper, final String column, final Serializable key) { - List rs = queryList(clazz, flipper, column, key); - if (handler != null) handler.completed(rs, key); - } - @Override public List queryList(final Class clazz, final Flipper flipper, final FilterBean bean) { return queryList(clazz, null, flipper, bean); } - @Override - public void queryList(final CompletionHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterBean bean) { - FilterNode node = FilterNodeBean.createFilterNode(bean); - List rs = queryList(clazz, flipper, node); - if (handler != null) handler.completed(rs, node); - } - @Override public List queryList(final Class clazz, final Flipper flipper, final FilterNode node) { return queryList(clazz, null, flipper, node); } - @Override - public void queryList(final CompletionHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterNode node) { - List rs = queryList(clazz, flipper, node); - if (handler != null) handler.completed(rs, 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); } - @Override - public void queryList(final CompletionHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterBean bean) { - FilterNode node = FilterNodeBean.createFilterNode(bean); - List rs = queryList(clazz, selects, flipper, node); - if (handler != null) handler.completed(rs, node); - } - @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); } - @Override - public void queryList(final CompletionHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node) { - List rs = queryList(clazz, selects, flipper, node); - if (handler != null) handler.completed(rs, node); - } - //-----------------------sheet---------------------------- /** * 根据过滤对象FilterBean和翻页对象Flipper查询一页的数据 @@ -1746,24 +1461,11 @@ public final class DataDefaultSource implements DataSource, Function void querySheet(final CompletionHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterBean bean) { - FilterNode node = FilterNodeBean.createFilterNode(bean); - Sheet rs = querySheet(clazz, flipper, node); - if (handler != null) handler.completed(rs, node); - } - @Override public Sheet querySheet(final Class clazz, final Flipper flipper, final FilterNode node) { return querySheet(clazz, null, flipper, node); } - @Override - public void querySheet(final CompletionHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterNode node) { - Sheet rs = querySheet(clazz, flipper, node); - if (handler != null) handler.completed(rs, node); - } - /** * 根据过滤对象FilterBean和翻页对象Flipper查询一页的数据, 对象只填充或排除SelectField指定的字段 * @@ -1780,24 +1482,11 @@ public final class DataDefaultSource implements DataSource, Function void querySheet(final CompletionHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterBean bean) { - FilterNode node = FilterNodeBean.createFilterNode(bean); - Sheet rs = querySheet(clazz, selects, flipper, node); - if (handler != null) handler.completed(rs, node); - } - @Override public Sheet querySheet(final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node) { return querySheet(true, true, clazz, selects, flipper, node); } - @Override - public void querySheet(final CompletionHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node) { - Sheet rs = querySheet(clazz, selects, flipper, node); - if (handler != null) handler.completed(rs, 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 9717cf9d1..cfad0019c 100644 --- a/src/org/redkale/source/DataSource.java +++ b/src/org/redkale/source/DataSource.java @@ -6,14 +6,13 @@ package org.redkale.source; import java.io.Serializable; -import java.nio.channels.CompletionHandler; import java.sql.ResultSet; import java.util.*; import java.util.function.Consumer; import org.redkale.util.*; /** - * + * * DataSource 为数据库或内存数据库的数据源,提供类似JPA、Hibernate的接口与功能。 * *

@@ -33,9 +32,6 @@ public interface DataSource { */ public void insert(final T... values); - //----------------------异步版--------------------------------- - public void insert(final CompletionHandler handler, final T... values); - //-------------------------delete-------------------------- /** * 删除对象, 必须是Entity对象 @@ -57,13 +53,6 @@ public interface DataSource { public void delete(final Class clazz, final FilterNode node); - //----------------------异步版--------------------------------- - public void delete(final CompletionHandler handler, final T... values); - - public void delete(final CompletionHandler handler, final Class clazz, final Serializable... ids); - - public void delete(final CompletionHandler handler, final Class clazz, final FilterNode node); - //------------------------update--------------------------- /** * 更新对象, 必须是Entity对象 @@ -87,23 +76,6 @@ public interface DataSource { public void updateColumns(final T bean, final FilterNode node, final String... columns); - //----------------------异步版--------------------------------- - public void update(final CompletionHandler handler, final T... values); - - public void updateColumn(final CompletionHandler handler, final Class clazz, final Serializable id, final String column, final Serializable value); - - public void updateColumn(final CompletionHandler handler, final Class clazz, final String column, final Serializable value, final FilterNode node); - - public void updateColumnIncrement(final CompletionHandler handler, final Class clazz, final Serializable id, final String column, long incvalue); - - public void updateColumnAnd(final CompletionHandler handler, final Class clazz, final Serializable id, final String column, long incvalue); - - public void updateColumnOr(final CompletionHandler handler, final Class clazz, final Serializable id, final String column, long incvalue); - - public void updateColumns(final CompletionHandler handler, final T bean, final String... columns); - - public void updateColumns(final CompletionHandler handler, final T bean, final FilterNode node, final String... columns); - //############################################# 查询接口 ############################################# //-----------------------getXXXXResult----------------------------- public Number getNumberResult(final Class entityClass, final FilterFunc func, final String column); @@ -118,19 +90,6 @@ public interface DataSource { public Map queryColumnMap(final Class entityClass, final String keyColumn, final FilterFunc func, final String funcColumn, final FilterNode node); - //----------------------异步版--------------------------------- - public void getNumberResult(final CompletionHandler handler, final Class entityClass, final FilterFunc func, final String column); - - public void getNumberResult(final CompletionHandler handler, final Class entityClass, final FilterFunc func, final String column, final FilterBean bean); - - public void getNumberResult(final CompletionHandler handler, final Class entityClass, final FilterFunc func, final String column, final FilterNode node); - - public void queryColumnMap(final CompletionHandler, String> handler, final Class entityClass, final String keyColumn, final FilterFunc func, final String funcColumn); - - public void queryColumnMap(final CompletionHandler, FilterNode> handler, final Class entityClass, final String keyColumn, final FilterFunc func, final String funcColumn, final FilterBean bean); - - public void queryColumnMap(final CompletionHandler, FilterNode> handler, final Class entityClass, final String keyColumn, final FilterFunc func, final String funcColumn, final FilterNode node); - //-----------------------find---------------------------- /** * 根据主键获取对象 @@ -161,27 +120,6 @@ public interface DataSource { public boolean exists(final Class clazz, final FilterNode node); - //----------------------异步版--------------------------------- - public void find(final CompletionHandler handler, final Class clazz, final Serializable pk); - - public void find(final CompletionHandler handler, final Class clazz, final SelectColumn selects, final Serializable pk); - - public void find(final CompletionHandler handler, final Class clazz, final String column, final Serializable key); - - public void find(final CompletionHandler handler, final Class clazz, final FilterBean bean); - - public void find(final CompletionHandler handler, final Class clazz, final FilterNode node); - - public void find(final CompletionHandler handler, final Class clazz, final SelectColumn selects, final FilterBean bean); - - public void find(final CompletionHandler handler, final Class clazz, final SelectColumn selects, final FilterNode node); - - public void exists(final CompletionHandler handler, final Class clazz, final Serializable pk); - - public void exists(final CompletionHandler handler, final Class clazz, final FilterBean bean); - - public void exists(final CompletionHandler handler, final Class clazz, final FilterNode node); - //-----------------------list set---------------------------- /** * 根据指定字段值查询对象某个字段的集合 @@ -207,19 +145,6 @@ public interface DataSource { public List queryColumnList(final String selectedColumn, final Class clazz, final FilterNode node); - //----------------------异步版--------------------------------- - public void queryColumnSet(final CompletionHandler, Serializable> handler, final String selectedColumn, final Class clazz, final String column, final Serializable key); - - public void queryColumnSet(final CompletionHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final FilterBean bean); - - public void queryColumnSet(final CompletionHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final FilterNode node); - - public void queryColumnList(final CompletionHandler, Serializable> handler, final String selectedColumn, final Class clazz, final String column, final Serializable key); - - public void queryColumnList(final CompletionHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final FilterBean bean); - - public void queryColumnList(final CompletionHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final FilterNode node); - /** * 根据指定参数查询对象某个字段的集合 * @@ -236,11 +161,6 @@ public interface DataSource { public Sheet queryColumnSheet(final String selectedColumn, final Class clazz, final Flipper flipper, final FilterNode node); - //----------------------异步版--------------------------------- - public void queryColumnSheet(final CompletionHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final Flipper flipper, final FilterBean bean); - - public void queryColumnSheet(final CompletionHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final Flipper flipper, final FilterNode node); - /** * 根据指定字段值查询对象集合 * @@ -271,27 +191,6 @@ public interface DataSource { public List queryList(final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node); - //----------------------异步版--------------------------------- - public void queryList(final CompletionHandler, Serializable> handler, final Class clazz, final String column, final Serializable key); - - public void queryList(final CompletionHandler, FilterNode> handler, final Class clazz, final FilterBean bean); - - public void queryList(final CompletionHandler, FilterNode> handler, final Class clazz, final FilterNode node); - - public void queryList(final CompletionHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final FilterBean bean); - - public void queryList(final CompletionHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final FilterNode node); - - public void queryList(final CompletionHandler, Serializable> handler, final Class clazz, final Flipper flipper, final String column, final Serializable key); - - public void queryList(final CompletionHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterBean bean); - - public void queryList(final CompletionHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterNode node); - - public void queryList(final CompletionHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterBean bean); - - public void queryList(final CompletionHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node); - //-----------------------sheet---------------------------- /** * 根据指定参数查询对象某个对象的集合页 @@ -311,15 +210,6 @@ public interface DataSource { public Sheet querySheet(final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node); - //----------------------异步版--------------------------------- - public void querySheet(final CompletionHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterBean bean); - - public void querySheet(final CompletionHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterNode node); - - public void querySheet(final CompletionHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterBean bean); - - public void querySheet(final CompletionHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node); - //-----------------------direct---------------------------- /** * 直接本地执行SQL语句进行查询,远程模式不可用