lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Service异步接口的返回类型强制约束为void，且必须存在对应的同步方法

Browse Source
This commit is contained in:
Redkale
2017-03-20 16:15:07 +08:00
parent 4fec27498c
commit b364dd5811
13 changed files with 338 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/redkale/convert/bson/BsonWriter.java
View File

@@ -236,11 +236,11 @@ public class BsonWriter extends Writer {
return;
}
char[] chars = Utility.charArray(value);
if (chars.length > 255) throw new ConvertException("'" + value + "' has very long length");
if (chars.length > 255) throw new ConvertException("'" + value + "' have very long length");
byte[] bytes = new byte[chars.length + 1];
bytes[0] = (byte) chars.length;
for (int i = 0; i < chars.length; i++) {
if (chars[i] > Byte.MAX_VALUE) throw new ConvertException("'" + value + "' has double-word");
if (chars[i] > Byte.MAX_VALUE) throw new ConvertException("'" + value + "' have double-word");
bytes[i + 1] = (byte) chars[i];
}
writeTo(bytes);

2
src/org/redkale/net/Transport.java
View File

@@ -165,7 +165,7 @@ public final class Transport {
public AsyncConnection pollConnection(SocketAddress addr) {
if (addr == null && remoteAddres.length == 1) addr = remoteAddres[0];
final boolean rand = addr == null;
if (rand && remoteAddres.length < 1) throw new RuntimeException("Transport (" + this.name + ") has no remoteAddress list");
if (rand && remoteAddres.length < 1) throw new RuntimeException("Transport (" + this.name + ") have no remoteAddress list");
try {
if (tcp) {
AsynchronousSocketChannel channel = null;

2
src/org/redkale/net/http/HttpBaseServlet.java
View File

@@ -363,7 +363,7 @@ public abstract class HttpBaseServlet extends HttpServlet {
final String[] methods = mapping == null ? action.methods() : mapping.methods();
if (nameset.containsKey(name)) {
if (nameset.get(name) != clz) continue;
throw new RuntimeException(this.getClass().getSimpleName() + " has two same " + WebMapping.class.getSimpleName() + "(" + name + ")");
throw new RuntimeException(this.getClass().getSimpleName() + " have two same " + WebMapping.class.getSimpleName() + "(" + name + ")");
}
nameset.put(name, clz);
map.put(name, new Entry(typeIgnore, serviceid, actionid, name, methods, method, createHttpServlet(method)));

2
src/org/redkale/net/http/Rest.java
View File

@@ -112,7 +112,7 @@ public final class Rest {
final String defmodulename = getWebModuleName(serviceType);
for (char ch : defmodulename.toCharArray()) {
if (!((ch >= '0' && ch <= '9') || ch == '$' || ch == '_' || (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'))) { //不能含特殊字符
throw new RuntimeException(serviceType.getName() + " has illeal " + RestService.class.getSimpleName() + ".value, only 0-9 a-z A-Z _ $");
throw new RuntimeException(serviceType.getName() + " have illeal " + RestService.class.getSimpleName() + ".value, only 0-9 a-z A-Z _ $");
}
}

54
src/org/redkale/net/sncp/SncpClient.java
View File

@@ -51,8 +51,10 @@ public final class SncpClient {
protected final int addressSourceParamIndex;
public SncpAction(Method method, DLong actionid) {
this.actionid = actionid;
protected final SncpAction syncAction; //异步方法对应的同步方法Action， 只有方法包含AsyncHandler参数时，本字段才有值
public SncpAction(final Class clazz, Method method, DLong actionid) {
this.actionid = actionid == null ? Sncp.hash(method) : actionid;
Type rt = method.getGenericReturnType();
if (rt instanceof TypeVariable) {
TypeVariable tv = (TypeVariable) rt;
@@ -72,6 +74,9 @@ public final class SncpClient {
Class<?>[] params = method.getParameterTypes();
for (int i = 0; i < params.length; i++) {
if (AsyncHandler.class.isAssignableFrom(params[i])) {
if (handlerFuncIndex >= 0) {
throw new RuntimeException(method + " have more than one AsyncHandler type parameter");
}
handlerFuncIndex = i;
break;
}
@@ -80,6 +85,9 @@ public final class SncpClient {
if (anns[i].length > 0) {
for (Annotation ann : anns[i]) {
if (ann.annotationType() == RpcAttachment.class) {
if (handlerAttachIndex >= 0) {
throw new RuntimeException(method + " have more than one @RpcAttachment parameter");
}
handlerAttachIndex = i;
} else if (ann.annotationType() == RpcTargetAddress.class && SocketAddress.class.isAssignableFrom(params[i])) {
targetAddrIndex = i;
@@ -106,14 +114,25 @@ public final class SncpClient {
this.handlerFuncParamIndex = handlerFuncIndex;
this.handlerAttachParamIndex = handlerAttachIndex;
this.paramAttrs = hasattr ? atts : null;
if (handlerFuncIndex > 0) {
Type handlerFuncType = this.paramTypes[handlerFuncIndex];
if (handlerFuncType instanceof ParameterizedType) {
ParameterizedType handlerpt = (ParameterizedType) handlerFuncType;
//后续可以添加验证， AsyncHandler的第一个泛型必须与方法返回值类型相同， 第二个泛型必须与@RpcAttachment的参数类型相同
//需要考虑AsyncHandler的子类形态， 有可能0、1、2、。。。多个泛型
if (this.handlerFuncParamIndex >= 0 && method.getReturnType() != void.class) {
throw new RuntimeException(method + " have AsyncHandler type parameter but return type is not void");
}
if (this.handlerFuncParamIndex >= 0) {
List<Class> syncparams = new ArrayList<>();
for (Class p : method.getParameterTypes()) {
if (!AsyncHandler.class.isAssignableFrom(p)) {
syncparams.add(p);
}
}
this.paramTypes[handlerFuncIndex] = AsyncHandler.class;
Method syncMethod = null;
try {
syncMethod = clazz.getMethod(method.getName(), syncparams.toArray(new Class[syncparams.size()]));
} catch (NoSuchMethodException e) {
throw new RuntimeException("Async menthod (" + method + ") have no sync menthod ");
}
this.syncAction = new SncpAction(clazz, syncMethod, Sncp.hash(syncMethod));
} else {
this.syncAction = null;
}
}
@@ -161,7 +180,7 @@ public final class SncpClient {
final List<SncpAction> methodens = new ArrayList<>();
//------------------------------------------------------------------------------
for (java.lang.reflect.Method method : parseMethod(serviceClass)) {
methodens.add(new SncpAction(method, Sncp.hash(method)));
methodens.add(new SncpAction(serviceClass, method, Sncp.hash(method)));
}
this.actions = methodens.toArray(new SncpAction[methodens.size()]);
this.addrBytes = clientAddress == null ? new byte[4] : clientAddress.getAddress().getAddress();
@@ -172,7 +191,7 @@ public final class SncpClient {
final List<SncpAction> actions = new ArrayList<>();
//------------------------------------------------------------------------------
for (java.lang.reflect.Method method : parseMethod(serviceClass)) {
actions.add(new SncpAction(method, Sncp.hash(method)));
actions.add(new SncpAction(serviceClass, method, Sncp.hash(method)));
}
return actions;
}
@@ -296,7 +315,7 @@ public final class SncpClient {
final Attribute attr = action.paramAttrs[i];
attr.set(params[i - 1], bsonConvert.convertFrom(attr.type(), reader));
}
return bsonConvert.convertFrom(action.resultTypes, reader);
return bsonConvert.convertFrom(action.syncAction == null ? action.resultTypes : action.syncAction.resultTypes, reader);
} catch (InterruptedException | ExecutionException | TimeoutException e) {
logger.log(Level.SEVERE, actions[index].method + " sncp (params: " + jsonConvert.convertTo(params) + ") remote error", e);
throw new RuntimeException(actions[index].method + " sncp remote error", e);
@@ -331,11 +350,13 @@ public final class SncpClient {
final BsonWriter writer = bsonConvert.pollBsonWriter(transport.getBufferSupplier()); // 将head写入
writer.writeTo(DEFAULT_HEADER);
for (int i = 0; i < params.length; i++) {
bsonConvert.convertTo(writer, myparamtypes[i], params[i]);
if (action.handlerFuncParamIndex != i) { //AsyncHandler参数不能传递
bsonConvert.convertTo(writer, myparamtypes[i], params[i]);
}
}
final int reqBodyLength = writer.count() - HEADER_SIZE; //body总长度
final long seqid = System.nanoTime();
final DLong actionid = action.actionid;
final DLong actionid = action.syncAction == null ? action.actionid : action.syncAction.actionid;
final SocketAddress addr = addr0 == null ? (action.addressTargetParamIndex >= 0 ? (SocketAddress) params[action.addressTargetParamIndex] : null) : addr0;
final AsyncConnection conn = transport.pollConnection(addr);
if (conn == null || !conn.isOpen()) {
@@ -438,7 +459,7 @@ public final class SncpClient {
final Attribute attr = action.paramAttrs[i];
attr.set(params[i - 1], bsonConvert.convertFrom(attr.type(), reader));
}
Object rs = bsonConvert.convertFrom(action.resultTypes, reader);
Object rs = bsonConvert.convertFrom(action.syncAction == null ? action.resultTypes : action.syncAction.resultTypes, reader);
handler.completed(rs, handlerAttach);
} catch (Exception e) {
handler.failed(e, handlerAttach);
@@ -481,7 +502,8 @@ public final class SncpClient {
int version = buffer.getInt();
if (version != this.serviceversion) throw new RuntimeException("sncp(" + action.method + ") response.serviceversion = " + serviceversion + ", but request.serviceversion =" + version);
DLong raction = DLong.read(buffer);
if (!action.actionid.equals(raction)) throw new RuntimeException("sncp(" + action.method + ") response.actionid = " + action.actionid + ", but request.actionid =(" + raction + ")");
DLong actid = action.syncAction == null ? action.actionid : action.syncAction.actionid;
if (!actid.equals(raction)) throw new RuntimeException("sncp(" + action.method + ") response.actionid = " + action.actionid + ", but request.actionid =(" + raction + ")");
buffer.getInt(); //地址
buffer.getChar(); //端口
}

15
src/org/redkale/service/CacheSourceService.java
View File

@@ -192,10 +192,9 @@ public class CacheSourceService<K extends Serializable, V extends Object> implem
}
@Override
public boolean exists(final AsyncHandler<Boolean, K> handler, @RpcAttachment final K key) {
public void exists(final AsyncHandler<Boolean, K> handler, @RpcAttachment final K key) {
boolean rs = exists(key);
if (handler != null) handler.completed(rs, key);
return rs;
}
@Override
@@ -209,10 +208,9 @@ public class CacheSourceService<K extends Serializable, V extends Object> implem
}
@Override
public V get(final AsyncHandler<V, K> handler, @RpcAttachment final K key) {
public void get(final AsyncHandler<V, K> handler, @RpcAttachment final K key) {
V rs = get(key);
if (handler != null) handler.completed(rs, key);
return rs;
}
@Override
@@ -229,10 +227,9 @@ public class CacheSourceService<K extends Serializable, V extends Object> implem
}
@Override
public V getAndRefresh(final AsyncHandler<V, K> handler, @RpcAttachment final K key, final int expireSeconds) {
public void getAndRefresh(final AsyncHandler<V, K> handler, @RpcAttachment final K key, final int expireSeconds) {
V rs = getAndRefresh(key, expireSeconds);
if (handler != null) handler.completed(rs, key);
return rs;
}
@Override
@@ -327,10 +324,9 @@ public class CacheSourceService<K extends Serializable, V extends Object> implem
}
@Override
public Collection<V> getCollection(final AsyncHandler<Collection<V>, K> handler, @RpcAttachment final K key) {
public void getCollection(final AsyncHandler<Collection<V>, K> handler, @RpcAttachment final K key) {
Collection<V> rs = getCollection(key);
if (handler != null) handler.completed(rs, key);
return rs;
}
@Override
@@ -339,10 +335,9 @@ public class CacheSourceService<K extends Serializable, V extends Object> implem
}
@Override
public Collection<V> getCollectionAndRefresh(final AsyncHandler<Collection<V>, K> handler, @RpcAttachment final K key, final int expireSeconds) {
public void getCollectionAndRefresh(final AsyncHandler<Collection<V>, K> handler, @RpcAttachment final K key, final int expireSeconds) {
Collection<V> rs = getCollectionAndRefresh(key, expireSeconds);
if (handler != null) handler.completed(rs, key);
return rs;
}
@Override

264
src/org/redkale/service/DataSourceService.java
View File

@@ -44,8 +44,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> int delete(final AsyncHandler<Integer, T[]> handler, @RpcAttachment final T... values) {
return source.delete(handler, values);
public <T> void delete(final AsyncHandler<Integer, T[]> handler, @RpcAttachment final T... values) {
source.delete(handler, values);
}
@Override
@@ -54,8 +54,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> int delete(final AsyncHandler<Integer, Serializable[]> handler, final Class<T> clazz, @RpcAttachment final Serializable... ids) {
return source.delete(handler, clazz, ids);
public <T> void delete(final AsyncHandler<Integer, Serializable[]> handler, final Class<T> clazz, @RpcAttachment final Serializable... ids) {
source.delete(handler, clazz, ids);
}
@Override
@@ -64,8 +64,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> int delete(final AsyncHandler<Integer, FilterNode> handler, final Class<T> clazz, @RpcAttachment final FilterNode node) {
return source.delete(handler, clazz, node);
public <T> void delete(final AsyncHandler<Integer, FilterNode> handler, final Class<T> clazz, @RpcAttachment final FilterNode node) {
source.delete(handler, clazz, node);
}
@Override
@@ -74,8 +74,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> int delete(final AsyncHandler<Integer, FilterNode> handler, final Class<T> clazz, final Flipper flipper, @RpcAttachment FilterNode node) {
return source.delete(handler, clazz, flipper, node);
public <T> void delete(final AsyncHandler<Integer, FilterNode> handler, final Class<T> clazz, final Flipper flipper, @RpcAttachment FilterNode node) {
source.delete(handler, clazz, flipper, node);
}
@Override
@@ -84,8 +84,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> int update(final AsyncHandler<Integer, T[]> handler, @RpcAttachment final T... values) {
return source.update(handler, values);
public <T> void update(final AsyncHandler<Integer, T[]> handler, @RpcAttachment final T... values) {
source.update(handler, values);
}
@Override
@@ -94,8 +94,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> int updateColumn(final AsyncHandler<Integer, Serializable> handler, final Class<T> clazz, @RpcAttachment final Serializable id, final String column, final Serializable value) {
return source.updateColumn(handler, clazz, id, column, value);
public <T> void updateColumn(final AsyncHandler<Integer, Serializable> handler, final Class<T> clazz, @RpcAttachment final Serializable id, final String column, final Serializable value) {
source.updateColumn(handler, clazz, id, column, value);
}
@Override
@@ -104,8 +104,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> int updateColumn(final AsyncHandler<Integer, FilterNode> handler, final Class<T> clazz, final String column, final Serializable value, @RpcAttachment final FilterNode node) {
return source.updateColumn(handler, clazz, column, value, node);
public <T> void updateColumn(final AsyncHandler<Integer, FilterNode> handler, final Class<T> clazz, final String column, final Serializable value, @RpcAttachment final FilterNode node) {
source.updateColumn(handler, clazz, column, value, node);
}
@Override
@@ -114,8 +114,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> int updateColumn(final AsyncHandler<Integer, Serializable> handler, final Class<T> clazz, @RpcAttachment final Serializable id, final ColumnValue... values) {
return source.updateColumn(handler, clazz, id, values);
public <T> void updateColumn(final AsyncHandler<Integer, Serializable> handler, final Class<T> clazz, @RpcAttachment final Serializable id, final ColumnValue... values) {
source.updateColumn(handler, clazz, id, values);
}
@Override
@@ -124,8 +124,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> int updateColumn(final AsyncHandler<Integer, FilterNode> handler, final Class<T> clazz, @RpcAttachment final FilterNode node, final ColumnValue... values) {
return source.updateColumn(handler, clazz, node, values);
public <T> void updateColumn(final AsyncHandler<Integer, FilterNode> handler, final Class<T> clazz, @RpcAttachment final FilterNode node, final ColumnValue... values) {
source.updateColumn(handler, clazz, node, values);
}
@Override
@@ -134,8 +134,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> int updateColumn(final AsyncHandler<Integer, FilterNode> handler, final Class<T> clazz, @RpcAttachment final FilterNode node, final Flipper flipper, final ColumnValue... values) {
return source.updateColumn(handler, clazz, node, flipper, values);
public <T> void updateColumn(final AsyncHandler<Integer, FilterNode> handler, final Class<T> clazz, @RpcAttachment final FilterNode node, final Flipper flipper, final ColumnValue... values) {
source.updateColumn(handler, clazz, node, flipper, values);
}
@Override
@@ -144,8 +144,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> int updateColumn(final AsyncHandler<Integer, T> handler, @RpcAttachment final T bean, final String... columns) {
return source.updateColumn(handler, bean, columns);
public <T> void updateColumn(final AsyncHandler<Integer, T> handler, @RpcAttachment final T bean, final String... columns) {
source.updateColumn(handler, bean, columns);
}
@Override
@@ -154,8 +154,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> int updateColumn(final AsyncHandler<Integer, FilterNode> handler, final T bean, @RpcAttachment final FilterNode node, final String... columns) {
return source.updateColumn(handler, bean, node, columns);
public <T> void updateColumn(final AsyncHandler<Integer, FilterNode> handler, final T bean, @RpcAttachment final FilterNode node, final String... columns) {
source.updateColumn(handler, bean, node, columns);
}
@Override
@@ -164,8 +164,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> int updateColumn(final AsyncHandler<Integer, T> handler, @RpcAttachment final T bean, final SelectColumn selects) {
return source.updateColumn(handler, bean, selects);
public <T> void updateColumn(final AsyncHandler<Integer, T> handler, @RpcAttachment final T bean, final SelectColumn selects) {
source.updateColumn(handler, bean, selects);
}
@Override
@@ -174,8 +174,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> int updateColumn(final AsyncHandler<Integer, FilterNode> handler, final T bean, @RpcAttachment final FilterNode node, final SelectColumn selects) {
return source.updateColumn(handler, bean, node, selects);
public <T> void updateColumn(final AsyncHandler<Integer, FilterNode> handler, final T bean, @RpcAttachment final FilterNode node, final SelectColumn selects) {
source.updateColumn(handler, bean, node, selects);
}
@Override
@@ -184,8 +184,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public Number getNumberResult(final AsyncHandler<Number, String> handler, final Class entityClass, final FilterFunc func, @RpcAttachment final String column) {
return source.getNumberResult(handler, entityClass, func, column);
public void getNumberResult(final AsyncHandler<Number, String> handler, final Class entityClass, final FilterFunc func, @RpcAttachment final String column) {
source.getNumberResult(handler, entityClass, func, column);
}
@Override
@@ -194,8 +194,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <B extends FilterBean> Number getNumberResult(final AsyncHandler<Number, B> handler, final Class entityClass, final FilterFunc func, final String column, @RpcAttachment final B bean) {
return source.getNumberResult(handler, entityClass, func, column, bean);
public <B extends FilterBean> void getNumberResult(final AsyncHandler<Number, B> handler, final Class entityClass, final FilterFunc func, final String column, @RpcAttachment final B bean) {
source.getNumberResult(handler, entityClass, func, column, bean);
}
@Override
@@ -204,8 +204,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public Number getNumberResult(final AsyncHandler<Number, FilterNode> handler, final Class entityClass, final FilterFunc func, final String column, @RpcAttachment final FilterNode node) {
return source.getNumberResult(handler, entityClass, func, column, node);
public void getNumberResult(final AsyncHandler<Number, FilterNode> handler, final Class entityClass, final FilterFunc func, final String column, @RpcAttachment final FilterNode node) {
source.getNumberResult(handler, entityClass, func, column, node);
}
@Override
@@ -214,8 +214,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public Number getNumberResult(final AsyncHandler<Number, String> handler, final Class entityClass, final FilterFunc func, final Number defVal, @RpcAttachment final String column) {
return source.getNumberResult(handler, entityClass, func, defVal, column);
public void getNumberResult(final AsyncHandler<Number, String> handler, final Class entityClass, final FilterFunc func, final Number defVal, @RpcAttachment final String column) {
source.getNumberResult(handler, entityClass, func, defVal, column);
}
@Override
@@ -224,8 +224,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public Number getNumberResult(final AsyncHandler<Number, String> handler, final Class entityClass, final FilterFunc func, final Number defVal, @RpcAttachment final String column, final FilterBean bean) {
return source.getNumberResult(handler, entityClass, func, defVal, column, bean);
public void getNumberResult(final AsyncHandler<Number, String> handler, final Class entityClass, final FilterFunc func, final Number defVal, @RpcAttachment final String column, final FilterBean bean) {
source.getNumberResult(handler, entityClass, func, defVal, column, bean);
}
@Override
@@ -234,8 +234,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public Number getNumberResult(final AsyncHandler<Number, String> handler, final Class entityClass, final FilterFunc func, final Number defVal, @RpcAttachment final String column, final FilterNode node) {
return source.getNumberResult(handler, entityClass, func, defVal, column, node);
public void getNumberResult(final AsyncHandler<Number, String> handler, final Class entityClass, final FilterFunc func, final Number defVal, @RpcAttachment final String column, final FilterNode node) {
source.getNumberResult(handler, entityClass, func, defVal, column, node);
}
@Override
@@ -244,8 +244,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <N extends Number> Map<String, N> getNumberMap(final AsyncHandler<Map<String, N>, FilterFuncColumn[]> handler, final Class entityClass, @RpcAttachment final FilterFuncColumn... columns) {
return source.getNumberMap(handler, entityClass, columns);
public <N extends Number> void getNumberMap(final AsyncHandler<Map<String, N>, FilterFuncColumn[]> handler, final Class entityClass, @RpcAttachment final FilterFuncColumn... columns) {
source.getNumberMap(handler, entityClass, columns);
}
@Override
@@ -254,8 +254,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <N extends Number, B extends FilterBean> Map<String, N> getNumberMap(final AsyncHandler<Map<String, N>, B> handler, final Class entityClass, @RpcAttachment final B bean, final FilterFuncColumn... columns) {
return source.getNumberMap(handler, entityClass, bean, columns);
public <N extends Number, B extends FilterBean> void getNumberMap(final AsyncHandler<Map<String, N>, B> handler, final Class entityClass, @RpcAttachment final B bean, final FilterFuncColumn... columns) {
source.getNumberMap(handler, entityClass, bean, columns);
}
@Override
@@ -264,8 +264,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <N extends Number> Map<String, N> getNumberMap(final AsyncHandler<Map<String, N>, FilterNode> handler, final Class entityClass, @RpcAttachment final FilterNode node, final FilterFuncColumn... columns) {
return source.getNumberMap(handler, entityClass, node, columns);
public <N extends Number> void getNumberMap(final AsyncHandler<Map<String, N>, FilterNode> handler, final Class entityClass, @RpcAttachment final FilterNode node, final FilterFuncColumn... columns) {
source.getNumberMap(handler, entityClass, node, columns);
}
@Override
@@ -274,8 +274,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T, K extends Serializable, N extends Number> Map<K, N> queryColumnMap(final AsyncHandler<Map<K, N>, String> handler, final Class<T> entityClass, @RpcAttachment final String keyColumn, final FilterFunc func, final String funcColumn) {
return source.queryColumnMap(handler, entityClass, keyColumn, func, funcColumn);
public <T, K extends Serializable, N extends Number> void queryColumnMap(final AsyncHandler<Map<K, N>, String> handler, final Class<T> entityClass, @RpcAttachment final String keyColumn, final FilterFunc func, final String funcColumn) {
source.queryColumnMap(handler, entityClass, keyColumn, func, funcColumn);
}
@Override
@@ -284,8 +284,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T, K extends Serializable, N extends Number> Map<K, N> queryColumnMap(final AsyncHandler<Map<K, N>, String> handler, final Class<T> entityClass, @RpcAttachment final String keyColumn, final FilterFunc func, final String funcColumn, final FilterBean bean) {
return source.queryColumnMap(handler, entityClass, keyColumn, func, funcColumn, bean);
public <T, K extends Serializable, N extends Number> void queryColumnMap(final AsyncHandler<Map<K, N>, String> handler, final Class<T> entityClass, @RpcAttachment final String keyColumn, final FilterFunc func, final String funcColumn, final FilterBean bean) {
source.queryColumnMap(handler, entityClass, keyColumn, func, funcColumn, bean);
}
@Override
@@ -294,8 +294,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T, K extends Serializable, N extends Number> Map<K, N> queryColumnMap(final AsyncHandler<Map<K, N>, String> handler, final Class<T> entityClass, @RpcAttachment final String keyColumn, final FilterFunc func, final String funcColumn, final FilterNode node) {
return source.queryColumnMap(handler, entityClass, keyColumn, func, funcColumn, node);
public <T, K extends Serializable, N extends Number> void queryColumnMap(final AsyncHandler<Map<K, N>, String> handler, final Class<T> entityClass, @RpcAttachment final String keyColumn, final FilterFunc func, final String funcColumn, final FilterNode node) {
source.queryColumnMap(handler, entityClass, keyColumn, func, funcColumn, node);
}
@Override
@@ -304,8 +304,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> T find(final AsyncHandler<T, Serializable> handler, final Class<T> clazz, @RpcAttachment final Serializable pk) {
return source.find(handler, clazz, pk);
public <T> void find(final AsyncHandler<T, Serializable> handler, final Class<T> clazz, @RpcAttachment final Serializable pk) {
source.find(handler, clazz, pk);
}
@Override
@@ -314,8 +314,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> T find(final AsyncHandler<T, Serializable> handler, final Class<T> clazz, SelectColumn selects, @RpcAttachment final Serializable pk) {
return source.find(handler, clazz, selects, pk);
public <T> void find(final AsyncHandler<T, Serializable> handler, final Class<T> clazz, SelectColumn selects, @RpcAttachment final Serializable pk) {
source.find(handler, clazz, selects, pk);
}
@Override
@@ -324,8 +324,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> T find(final AsyncHandler<T, Serializable> handler, final Class<T> clazz, final String column, @RpcAttachment final Serializable key) {
return source.find(handler, clazz, column, key);
public <T> void find(final AsyncHandler<T, Serializable> handler, final Class<T> clazz, final String column, @RpcAttachment final Serializable key) {
source.find(handler, clazz, column, key);
}
@Override
@@ -334,8 +334,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T, B extends FilterBean> T find(final AsyncHandler<T, B> handler, final Class<T> clazz, @RpcAttachment final B bean) {
return source.find(handler, clazz, bean);
public <T, B extends FilterBean> void find(final AsyncHandler<T, B> handler, final Class<T> clazz, @RpcAttachment final B bean) {
source.find(handler, clazz, bean);
}
@Override
@@ -344,8 +344,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> T find(final AsyncHandler<T, FilterNode> handler, final Class<T> clazz, @RpcAttachment final FilterNode node) {
return source.find(handler, clazz, node);
public <T> void find(final AsyncHandler<T, FilterNode> handler, final Class<T> clazz, @RpcAttachment final FilterNode node) {
source.find(handler, clazz, node);
}
@Override
@@ -354,8 +354,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T, B extends FilterBean> T find(final AsyncHandler<T, B> handler, final Class<T> clazz, final SelectColumn selects, @RpcAttachment final B bean) {
return source.find(handler, clazz, selects, bean);
public <T, B extends FilterBean> void find(final AsyncHandler<T, B> handler, final Class<T> clazz, final SelectColumn selects, @RpcAttachment final B bean) {
source.find(handler, clazz, selects, bean);
}
@Override
@@ -364,8 +364,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> T find(final AsyncHandler<T, FilterNode> handler, final Class<T> clazz, final SelectColumn selects, @RpcAttachment final FilterNode node) {
return source.find(handler, clazz, selects, node);
public <T> void find(final AsyncHandler<T, FilterNode> handler, final Class<T> clazz, final SelectColumn selects, @RpcAttachment final FilterNode node) {
source.find(handler, clazz, selects, node);
}
@Override
@@ -374,8 +374,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> Serializable findColumn(final AsyncHandler<Serializable, Serializable> handler, final Class<T> clazz, final String column, @RpcAttachment final Serializable pk) {
return source.findColumn(handler, clazz, column, pk);
public <T> void findColumn(final AsyncHandler<Serializable, Serializable> handler, final Class<T> clazz, final String column, @RpcAttachment final Serializable pk) {
source.findColumn(handler, clazz, column, pk);
}
@Override
@@ -384,8 +384,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T, B extends FilterBean> Serializable findColumn(final AsyncHandler<Serializable, B> handler, final Class<T> clazz, final String column, @RpcAttachment final B bean) {
return source.findColumn(handler, clazz, column, bean);
public <T, B extends FilterBean> void findColumn(final AsyncHandler<Serializable, B> handler, final Class<T> clazz, final String column, @RpcAttachment final B bean) {
source.findColumn(handler, clazz, column, bean);
}
@Override
@@ -394,8 +394,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> Serializable findColumn(final AsyncHandler<Serializable, FilterNode> handler, final Class<T> clazz, final String column, @RpcAttachment final FilterNode node) {
return source.findColumn(handler, clazz, column, node);
public <T> void findColumn(final AsyncHandler<Serializable, FilterNode> handler, final Class<T> clazz, final String column, @RpcAttachment final FilterNode node) {
source.findColumn(handler, clazz, column, node);
}
@Override
@@ -404,8 +404,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> Serializable findColumn(final AsyncHandler<Serializable, Serializable> handler, final Class<T> clazz, final String column, final Serializable defValue, @RpcAttachment final Serializable pk) {
return source.findColumn(handler, clazz, column, defValue, pk);
public <T> void findColumn(final AsyncHandler<Serializable, Serializable> handler, final Class<T> clazz, final String column, final Serializable defValue, @RpcAttachment final Serializable pk) {
source.findColumn(handler, clazz, column, defValue, pk);
}
@Override
@@ -414,8 +414,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T, B extends FilterBean> Serializable findColumn(final AsyncHandler<Serializable, B> handler, final Class<T> clazz, final String column, final Serializable defValue, @RpcAttachment final B bean) {
return source.findColumn(handler, clazz, column, defValue, bean);
public <T, B extends FilterBean> void findColumn(final AsyncHandler<Serializable, B> handler, final Class<T> clazz, final String column, final Serializable defValue, @RpcAttachment final B bean) {
source.findColumn(handler, clazz, column, defValue, bean);
}
@Override
@@ -424,8 +424,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> Serializable findColumn(final AsyncHandler<Serializable, FilterNode> handler, final Class<T> clazz, final String column, final Serializable defValue, @RpcAttachment final FilterNode node) {
return source.findColumn(handler, clazz, column, defValue, node);
public <T> void findColumn(final AsyncHandler<Serializable, FilterNode> handler, final Class<T> clazz, final String column, final Serializable defValue, @RpcAttachment final FilterNode node) {
source.findColumn(handler, clazz, column, defValue, node);
}
@Override
@@ -434,8 +434,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> boolean exists(final AsyncHandler<Boolean, Serializable> handler, final Class<T> clazz, @RpcAttachment final Serializable pk) {
return source.exists(handler, clazz, pk);
public <T> void exists(final AsyncHandler<Boolean, Serializable> handler, final Class<T> clazz, @RpcAttachment final Serializable pk) {
source.exists(handler, clazz, pk);
}
@Override
@@ -444,8 +444,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T, B extends FilterBean> boolean exists(final AsyncHandler<Boolean, B> handler, final Class<T> clazz, @RpcAttachment final B bean) {
return source.exists(handler, clazz, bean);
public <T, B extends FilterBean> void exists(final AsyncHandler<Boolean, B> handler, final Class<T> clazz, @RpcAttachment final B bean) {
source.exists(handler, clazz, bean);
}
@Override
@@ -454,8 +454,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> boolean exists(final AsyncHandler<Boolean, FilterNode> handler, final Class<T> clazz, @RpcAttachment final FilterNode node) {
return source.exists(handler, clazz, node);
public <T> void exists(final AsyncHandler<Boolean, FilterNode> handler, final Class<T> clazz, @RpcAttachment final FilterNode node) {
source.exists(handler, clazz, node);
}
@Override
@@ -464,8 +464,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T, V extends Serializable> HashSet<V> queryColumnSet(final AsyncHandler<HashSet<V>, String> handler, final String selectedColumn, final Class<T> clazz, @RpcAttachment final String column, final Serializable key) {
return source.queryColumnSet(handler, selectedColumn, clazz, column, key);
public <T, V extends Serializable> void queryColumnSet(final AsyncHandler<HashSet<V>, String> handler, final String selectedColumn, final Class<T> clazz, @RpcAttachment final String column, final Serializable key) {
source.queryColumnSet(handler, selectedColumn, clazz, column, key);
}
@@ -475,8 +475,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T, V extends Serializable, B extends FilterBean> HashSet<V> queryColumnSet(final AsyncHandler<HashSet<V>, B> handler, final String selectedColumn, final Class<T> clazz, @RpcAttachment final B bean) {
return source.queryColumnSet(handler, selectedColumn, clazz, bean);
public <T, V extends Serializable, B extends FilterBean> void queryColumnSet(final AsyncHandler<HashSet<V>, B> handler, final String selectedColumn, final Class<T> clazz, @RpcAttachment final B bean) {
source.queryColumnSet(handler, selectedColumn, clazz, bean);
}
@Override
@@ -485,8 +485,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T, V extends Serializable> HashSet<V> queryColumnSet(final AsyncHandler<HashSet<V>, FilterNode> handler, final String selectedColumn, final Class<T> clazz, @RpcAttachment final FilterNode node) {
return source.queryColumnSet(handler, selectedColumn, clazz, node);
public <T, V extends Serializable> void queryColumnSet(final AsyncHandler<HashSet<V>, FilterNode> handler, final String selectedColumn, final Class<T> clazz, @RpcAttachment final FilterNode node) {
source.queryColumnSet(handler, selectedColumn, clazz, node);
}
@Override
@@ -495,8 +495,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T, V extends Serializable> List<V> queryColumnList(final AsyncHandler<List<V>, Serializable> handler, final String selectedColumn, final Class<T> clazz, final String column, @RpcAttachment final Serializable key) {
return source.queryColumnList(handler, selectedColumn, clazz, column, key);
public <T, V extends Serializable> void queryColumnList(final AsyncHandler<List<V>, Serializable> handler, final String selectedColumn, final Class<T> clazz, final String column, @RpcAttachment final Serializable key) {
source.queryColumnList(handler, selectedColumn, clazz, column, key);
}
@Override
@@ -505,8 +505,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T, V extends Serializable, B extends FilterBean> List<V> queryColumnList(final AsyncHandler<List<V>, B> handler, String selectedColumn, Class<T> clazz, @RpcAttachment final B bean) {
return source.queryColumnList(handler, selectedColumn, clazz, bean);
public <T, V extends Serializable, B extends FilterBean> void queryColumnList(final AsyncHandler<List<V>, B> handler, String selectedColumn, Class<T> clazz, @RpcAttachment final B bean) {
source.queryColumnList(handler, selectedColumn, clazz, bean);
}
@Override
@@ -515,8 +515,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T, V extends Serializable> List<V> queryColumnList(final AsyncHandler<List<V>, FilterNode> handler, final String selectedColumn, final Class<T> clazz, @RpcAttachment final FilterNode node) {
return source.queryColumnList(handler, selectedColumn, clazz, node);
public <T, V extends Serializable> void queryColumnList(final AsyncHandler<List<V>, FilterNode> handler, final String selectedColumn, final Class<T> clazz, @RpcAttachment final FilterNode node) {
source.queryColumnList(handler, selectedColumn, clazz, node);
}
@Override
@@ -525,8 +525,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T, V extends Serializable, B extends FilterBean> List<V> queryColumnList(final AsyncHandler<List<V>, B> handler, String selectedColumn, Class<T> clazz, Flipper flipper, @RpcAttachment final B bean) {
return source.queryColumnList(handler, selectedColumn, clazz, flipper, bean);
public <T, V extends Serializable, B extends FilterBean> void queryColumnList(final AsyncHandler<List<V>, B> handler, String selectedColumn, Class<T> clazz, Flipper flipper, @RpcAttachment final B bean) {
source.queryColumnList(handler, selectedColumn, clazz, flipper, bean);
}
@@ -536,8 +536,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T, V extends Serializable> List<V> queryColumnList(final AsyncHandler<List<V>, FilterNode> handler, final String selectedColumn, final Class<T> clazz, Flipper flipper, @RpcAttachment final FilterNode node) {
return source.queryColumnList(handler, selectedColumn, clazz, flipper, node);
public <T, V extends Serializable> void queryColumnList(final AsyncHandler<List<V>, FilterNode> handler, final String selectedColumn, final Class<T> clazz, Flipper flipper, @RpcAttachment final FilterNode node) {
source.queryColumnList(handler, selectedColumn, clazz, flipper, node);
}
@Override
@@ -546,8 +546,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T, V extends Serializable, B extends FilterBean> Sheet<V> queryColumnSheet(final AsyncHandler<Sheet<V>, B> handler, String selectedColumn, Class<T> clazz, Flipper flipper, @RpcAttachment B bean) {
return source.queryColumnSheet(handler, selectedColumn, clazz, flipper, bean);
public <T, V extends Serializable, B extends FilterBean> void queryColumnSheet(final AsyncHandler<Sheet<V>, B> handler, String selectedColumn, Class<T> clazz, Flipper flipper, @RpcAttachment B bean) {
source.queryColumnSheet(handler, selectedColumn, clazz, flipper, bean);
}
@Override
@@ -556,8 +556,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T, V extends Serializable> Sheet<V> queryColumnSheet(final AsyncHandler<Sheet<V>, FilterNode> handler, final String selectedColumn, final Class<T> clazz, final Flipper flipper, @RpcAttachment final FilterNode node) {
return source.queryColumnSheet(handler, selectedColumn, clazz, flipper, node);
public <T, V extends Serializable> void queryColumnSheet(final AsyncHandler<Sheet<V>, FilterNode> handler, final String selectedColumn, final Class<T> clazz, final Flipper flipper, @RpcAttachment final FilterNode node) {
source.queryColumnSheet(handler, selectedColumn, clazz, flipper, node);
}
@Override
@@ -566,8 +566,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> List<T> queryList(final AsyncHandler<List<T>, Serializable> handler, final Class<T> clazz, final String column, @RpcAttachment final Serializable key) {
return source.queryList(handler, clazz, column, key);
public <T> void queryList(final AsyncHandler<List<T>, Serializable> handler, final Class<T> clazz, final String column, @RpcAttachment final Serializable key) {
source.queryList(handler, clazz, column, key);
}
@Override
@@ -576,8 +576,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T, B extends FilterBean> List<T> queryList(final AsyncHandler<List<T>, B> handler, final Class<T> clazz, @RpcAttachment final B bean) {
return source.queryList(handler, clazz, bean);
public <T, B extends FilterBean> void queryList(final AsyncHandler<List<T>, B> handler, final Class<T> clazz, @RpcAttachment final B bean) {
source.queryList(handler, clazz, bean);
}
@Override
@@ -586,8 +586,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> List<T> queryList(final AsyncHandler<List<T>, FilterNode> handler, final Class<T> clazz, @RpcAttachment final FilterNode node) {
return source.queryList(handler, clazz, node);
public <T> void queryList(final AsyncHandler<List<T>, FilterNode> handler, final Class<T> clazz, @RpcAttachment final FilterNode node) {
source.queryList(handler, clazz, node);
}
@Override
@@ -596,8 +596,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T, B extends FilterBean> List<T> queryList(final AsyncHandler<List<T>, B> handler, final Class<T> clazz, final SelectColumn selects, @RpcAttachment final B bean) {
return source.queryList(handler, clazz, selects, bean);
public <T, B extends FilterBean> void queryList(final AsyncHandler<List<T>, B> handler, final Class<T> clazz, final SelectColumn selects, @RpcAttachment final B bean) {
source.queryList(handler, clazz, selects, bean);
}
@Override
@@ -606,8 +606,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> List<T> queryList(final AsyncHandler<List<T>, FilterNode> handler, final Class<T> clazz, final SelectColumn selects, @RpcAttachment final FilterNode node) {
return source.queryList(handler, clazz, selects, node);
public <T> void queryList(final AsyncHandler<List<T>, FilterNode> handler, final Class<T> clazz, final SelectColumn selects, @RpcAttachment final FilterNode node) {
source.queryList(handler, clazz, selects, node);
}
@Override
@@ -616,8 +616,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> List<T> queryList(final AsyncHandler<List<T>, Serializable> handler, final Class<T> clazz, final Flipper flipper, final String column, @RpcAttachment final Serializable key) {
return source.queryList(handler, clazz, flipper, column, key);
public <T> void queryList(final AsyncHandler<List<T>, Serializable> handler, final Class<T> clazz, final Flipper flipper, final String column, @RpcAttachment final Serializable key) {
source.queryList(handler, clazz, flipper, column, key);
}
@Override
@@ -626,8 +626,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T, B extends FilterBean> List<T> queryList(final AsyncHandler<List<T>, B> handler, final Class<T> clazz, final Flipper flipper, @RpcAttachment final B bean) {
return source.queryList(handler, clazz, flipper, bean);
public <T, B extends FilterBean> void queryList(final AsyncHandler<List<T>, B> handler, final Class<T> clazz, final Flipper flipper, @RpcAttachment final B bean) {
source.queryList(handler, clazz, flipper, bean);
}
@Override
@@ -636,8 +636,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> List<T> queryList(final AsyncHandler<List<T>, FilterNode> handler, final Class<T> clazz, final Flipper flipper, @RpcAttachment final FilterNode node) {
return source.queryList(handler, clazz, flipper, node);
public <T> void queryList(final AsyncHandler<List<T>, FilterNode> handler, final Class<T> clazz, final Flipper flipper, @RpcAttachment final FilterNode node) {
source.queryList(handler, clazz, flipper, node);
}
@Override
@@ -646,8 +646,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T, B extends FilterBean> List<T> queryList(final AsyncHandler<List<T>, B> handler, final Class<T> clazz, final SelectColumn selects, final Flipper flipper, @RpcAttachment final B bean) {
return source.queryList(handler, clazz, selects, flipper, bean);
public <T, B extends FilterBean> void queryList(final AsyncHandler<List<T>, B> handler, final Class<T> clazz, final SelectColumn selects, final Flipper flipper, @RpcAttachment final B bean) {
source.queryList(handler, clazz, selects, flipper, bean);
}
@@ -657,8 +657,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> List<T> queryList(final AsyncHandler<List<T>, FilterNode> handler, final Class<T> clazz, final SelectColumn selects, final Flipper flipper, @RpcAttachment final FilterNode node) {
return source.queryList(handler, clazz, selects, flipper, node);
public <T> void queryList(final AsyncHandler<List<T>, FilterNode> handler, final Class<T> clazz, final SelectColumn selects, final Flipper flipper, @RpcAttachment final FilterNode node) {
source.queryList(handler, clazz, selects, flipper, node);
}
@Override
@@ -667,8 +667,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T, B extends FilterBean> Sheet<T> querySheet(final AsyncHandler<Sheet<T>, B> handler, final Class<T> clazz, final Flipper flipper, @RpcAttachment final B bean) {
return source.querySheet(handler, clazz, flipper, bean);
public <T, B extends FilterBean> void querySheet(final AsyncHandler<Sheet<T>, B> handler, final Class<T> clazz, final Flipper flipper, @RpcAttachment final B bean) {
source.querySheet(handler, clazz, flipper, bean);
}
@Override
@@ -677,8 +677,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> Sheet<T> querySheet(final AsyncHandler<Sheet<T>, FilterNode> handler, final Class<T> clazz, final Flipper flipper, @RpcAttachment final FilterNode node) {
return source.querySheet(handler, clazz, flipper, node);
public <T> void querySheet(final AsyncHandler<Sheet<T>, FilterNode> handler, final Class<T> clazz, final Flipper flipper, @RpcAttachment final FilterNode node) {
source.querySheet(handler, clazz, flipper, node);
}
@Override
@@ -687,8 +687,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T, B extends FilterBean> Sheet<T> querySheet(final AsyncHandler<Sheet<T>, B> handler, final Class<T> clazz, final SelectColumn selects, final Flipper flipper, @RpcAttachment final B bean) {
return source.querySheet(handler, clazz, selects, flipper, bean);
public <T, B extends FilterBean> void querySheet(final AsyncHandler<Sheet<T>, B> handler, final Class<T> clazz, final SelectColumn selects, final Flipper flipper, @RpcAttachment final B bean) {
source.querySheet(handler, clazz, selects, flipper, bean);
}
@Override
@@ -697,8 +697,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
}
@Override
public <T> Sheet<T> querySheet(final AsyncHandler<Sheet<T>, FilterNode> handler, final Class<T> clazz, final SelectColumn selects, final Flipper flipper, @RpcAttachment final FilterNode node) {
return source.querySheet(handler, clazz, selects, flipper, node);
public <T> void querySheet(final AsyncHandler<Sheet<T>, FilterNode> handler, final Class<T> clazz, final SelectColumn selects, final Flipper flipper, @RpcAttachment final FilterNode node) {
source.querySheet(handler, clazz, selects, flipper, node);
}
@Override

13
src/org/redkale/service/Service.java
View File

@@ -20,6 +20,19 @@ import org.redkale.util.*;
* </pre></blockquote>
*
* <p>
* <blockquote><pre>
* 异步方法：
* Service编写异步方法：
* 1、异步方法有且仅有一个类型为AsyncHandler的参数，方法返回类型必须是void。
* 2、必须存在对应的同步方法，同步的方法名与异步方法必须相同，方法的参数列表必须与异步方法除AsyncHandler参数的参数列表相同。
* 例如:
* public int insertRecord(String name, Record record);
*
* public void insertRecord(AsyncHandler&#60;Integer, Record&#62; handler, String name, &#64;RpcAttachment Record record);
*
* </pre></blockquote>
*
* <p>
* 详情见: https://redkale.org
*
* @author zhangjx

13
src/org/redkale/source/CacheSource.java
View File

@@ -53,11 +53,11 @@ public interface CacheSource<K extends Serializable, V extends Object> {
public void removeSetItem(final K key, final V value);
//----------------------异步版---------------------------------
public boolean exists(final AsyncHandler<Boolean, K> handler, final K key);
public void exists(final AsyncHandler<Boolean, K> handler, final K key);
public V get(final AsyncHandler<V, K> handler, final K key);
public void get(final AsyncHandler<V, K> handler, final K key);
public V getAndRefresh(final AsyncHandler<V, K> handler, final K key, final int expireSeconds);
public void getAndRefresh(final AsyncHandler<V, K> handler, final K key, final int expireSeconds);
public void refresh(final AsyncHandler<Void, K> handler, final K key, final int expireSeconds);
@@ -69,9 +69,9 @@ public interface CacheSource<K extends Serializable, V extends Object> {
public void remove(final AsyncHandler<Void, K> handler, final K key);
public Collection<V> getCollection(final AsyncHandler<Collection<V>, K> handler, final K key);
public void getCollection(final AsyncHandler<Collection<V>, K> handler, final K key);
public Collection<V> getCollectionAndRefresh(final AsyncHandler<Collection<V>, K> handler, final K key, final int expireSeconds);
public void getCollectionAndRefresh(final AsyncHandler<Collection<V>, K> handler, final K key, final int expireSeconds);
public void appendListItem(final AsyncHandler<Void, K> handler, final K key, final V value);
@@ -81,8 +81,7 @@ public interface CacheSource<K extends Serializable, V extends Object> {
public void removeSetItem(final AsyncHandler<Void, K> handler, final K key, final V value);
default boolean isOpen(final AsyncHandler<Boolean, Void> handler) {
default void isOpen(final AsyncHandler<Boolean, Void> handler) {
if (handler != null) handler.completed(Boolean.TRUE, null);
return true;
}
}

200
src/org/redkale/source/DataJdbcSource.java
View File

@@ -323,10 +323,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> int delete(final AsyncHandler<Integer, T[]> handler, final T... values) {
public <T> void delete(final AsyncHandler<Integer, T[]> handler, final T... values) {
int rs = delete(values);
if (handler != null) handler.completed(rs, values);
return rs;
}
private <T> int delete(final Connection conn, final EntityInfo<T> info, T... values) {
@@ -355,10 +354,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> int delete(final AsyncHandler<Integer, Serializable[]> handler, final Class<T> clazz, final Serializable... ids) {
public <T> void delete(final AsyncHandler<Integer, Serializable[]> handler, final Class<T> clazz, final Serializable... ids) {
int rs = delete(clazz, ids);
if (handler != null) handler.completed(rs, ids);
return rs;
}
private <T> int delete(final Connection conn, final EntityInfo<T> info, Serializable... keys) {
@@ -410,10 +408,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> int delete(final AsyncHandler<Integer, FilterNode> handler, final Class<T> clazz, final FilterNode node) {
public <T> void delete(final AsyncHandler<Integer, FilterNode> handler, final Class<T> clazz, final FilterNode node) {
int rs = delete(clazz, node);
if (handler != null) handler.completed(rs, node);
return rs;
}
@Override
@@ -431,10 +428,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> int delete(final AsyncHandler<Integer, FilterNode> handler, final Class<T> clazz, final Flipper flipper, FilterNode node) {
public <T> void delete(final AsyncHandler<Integer, FilterNode> handler, final Class<T> clazz, final Flipper flipper, FilterNode node) {
int rs = delete(clazz, flipper, node);
if (handler != null) handler.completed(rs, node);
return rs;
}
private <T> int delete(final Connection conn, final EntityInfo<T> info, final Flipper flipper, final FilterNode node) {
@@ -524,10 +520,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> int update(final AsyncHandler<Integer, T[]> handler, final T... values) {
public <T> void update(final AsyncHandler<Integer, T[]> handler, final T... values) {
int rs = update(values);
if (handler != null) handler.completed(rs, values);
return rs;
}
private <T> int update(final Connection conn, final EntityInfo<T> info, T... values) {
@@ -622,10 +617,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> int updateColumn(final AsyncHandler<Integer, Serializable> handler, final Class<T> clazz, final Serializable id, final String column, final Serializable value) {
public <T> void updateColumn(final AsyncHandler<Integer, Serializable> handler, final Class<T> clazz, final Serializable id, final String column, final Serializable value) {
int rs = updateColumn(clazz, id, column, value);
if (handler != null) handler.completed(rs, id);
return rs;
}
private <T> int updateColumn(Connection conn, final EntityInfo<T> info, Serializable id, String column, final Serializable value) {
@@ -691,10 +685,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> int updateColumn(final AsyncHandler<Integer, FilterNode> handler, final Class<T> clazz, final String column, final Serializable value, final FilterNode node) {
public <T> void updateColumn(final AsyncHandler<Integer, FilterNode> handler, final Class<T> clazz, final String column, final Serializable value, final FilterNode node) {
int rs = updateColumn(clazz, column, value, node);
if (handler != null) handler.completed(rs, node);
return rs;
}
private <T> int updateColumn(Connection conn, final EntityInfo<T> info, String column, final Serializable value, FilterNode node) {
@@ -775,10 +768,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> int updateColumn(final AsyncHandler<Integer, Serializable> handler, final Class<T> clazz, final Serializable id, final ColumnValue... values) {
public <T> void updateColumn(final AsyncHandler<Integer, Serializable> handler, final Class<T> clazz, final Serializable id, final ColumnValue... values) {
int rs = updateColumn(clazz, id, values);
if (handler != null) handler.completed(rs, id);
return rs;
}
private <T> int updateColumn(final Connection conn, final EntityInfo<T> info, final Serializable id, final ColumnValue... values) {
@@ -863,10 +855,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> int updateColumn(final AsyncHandler<Integer, FilterNode> handler, final Class<T> clazz, final FilterNode node, final ColumnValue... values) {
public <T> void updateColumn(final AsyncHandler<Integer, FilterNode> handler, final Class<T> clazz, final FilterNode node, final ColumnValue... values) {
int rs = updateColumn(clazz, node, values);
if (handler != null) handler.completed(rs, node);
return rs;
}
/**
@@ -895,10 +886,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> int updateColumn(final AsyncHandler<Integer, FilterNode> handler, final Class<T> clazz, final FilterNode node, final Flipper flipper, final ColumnValue... values) {
public <T> void updateColumn(final AsyncHandler<Integer, FilterNode> handler, final Class<T> clazz, final FilterNode node, final Flipper flipper, final ColumnValue... values) {
int rs = updateColumn(clazz, node, flipper, values);
if (handler != null) handler.completed(rs, node);
return rs;
}
private <T> int updateColumn(final Connection conn, final EntityInfo<T> info, final FilterNode node, final Flipper flipper, final ColumnValue... values) {
@@ -978,10 +968,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> int updateColumn(final AsyncHandler<Integer, T> handler, final T bean, final String... columns) {
public <T> void updateColumn(final AsyncHandler<Integer, T> handler, final T bean, final String... columns) {
int rs = updateColumn(bean, columns);
if (handler != null) handler.completed(rs, bean);
return rs;
}
@Override
@@ -999,10 +988,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> int updateColumn(final AsyncHandler<Integer, T> handler, final T bean, final SelectColumn selects) {
public <T> void updateColumn(final AsyncHandler<Integer, T> handler, final T bean, final SelectColumn selects) {
int rs = updateColumn(bean, selects);
if (handler != null) handler.completed(rs, bean);
return rs;
}
private <T> int updateColumns(final Connection conn, final EntityInfo<T> info, final T bean, final SelectColumn selects) {
@@ -1068,10 +1056,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> int updateColumn(final AsyncHandler<Integer, FilterNode> handler, final T bean, final FilterNode node, final String... columns) {
public <T> void updateColumn(final AsyncHandler<Integer, FilterNode> handler, final T bean, final FilterNode node, final String... columns) {
int rs = updateColumn(bean, node, columns);
if (handler != null) handler.completed(rs, node);
return rs;
}
@Override
@@ -1089,10 +1076,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> int updateColumn(final AsyncHandler<Integer, FilterNode> handler, final T bean, final FilterNode node, final SelectColumn selects) {
public <T> void updateColumn(final AsyncHandler<Integer, FilterNode> handler, final T bean, final FilterNode node, final SelectColumn selects) {
int rs = updateColumn(bean, node, selects);
if (handler != null) handler.completed(rs, node);
return rs;
}
private <T> int updateColumns(final Connection conn, final EntityInfo<T> info, final T bean, final FilterNode node, final SelectColumn selects) {
@@ -1198,10 +1184,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public Number getNumberResult(final AsyncHandler<Number, String> handler, final Class entityClass, final FilterFunc func, final String column) {
public void getNumberResult(final AsyncHandler<Number, String> handler, final Class entityClass, final FilterFunc func, final String column) {
Number rs = getNumberResult(entityClass, func, column);
if (handler != null) handler.completed(rs, column);
return rs;
}
@Override
@@ -1210,10 +1195,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <B extends FilterBean> Number getNumberResult(final AsyncHandler<Number, B> handler, final Class entityClass, final FilterFunc func, final String column, final B bean) {
public <B extends FilterBean> void getNumberResult(final AsyncHandler<Number, B> handler, final Class entityClass, final FilterFunc func, final String column, final B bean) {
Number rs = getNumberResult(entityClass, func, column, bean);
if (handler != null) handler.completed(rs, bean);
return rs;
}
@Override
@@ -1222,10 +1206,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public Number getNumberResult(final AsyncHandler<Number, FilterNode> handler, final Class entityClass, final FilterFunc func, final String column, final FilterNode node) {
public void getNumberResult(final AsyncHandler<Number, FilterNode> 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);
return rs;
}
@Override
@@ -1234,10 +1217,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public Number getNumberResult(final AsyncHandler<Number, String> handler, final Class entityClass, final FilterFunc func, final Number defVal, final String column) {
public void getNumberResult(final AsyncHandler<Number, String> handler, final Class entityClass, final FilterFunc func, final Number defVal, final String column) {
Number rs = getNumberResult(entityClass, func, defVal, column);
if (handler != null) handler.completed(rs, column);
return rs;
}
@Override
@@ -1246,8 +1228,8 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public Number getNumberResult(final AsyncHandler<Number, String> handler, final Class entityClass, final FilterFunc func, final Number defVal, final String column, final FilterBean bean) {
return getNumberResult(handler, entityClass, func, defVal, column, FilterNodeBean.createFilterNode(bean));
public void getNumberResult(final AsyncHandler<Number, String> handler, final Class entityClass, final FilterFunc func, final Number defVal, final String column, final FilterBean bean) {
getNumberResult(handler, entityClass, func, defVal, column, FilterNodeBean.createFilterNode(bean));
}
@Override
@@ -1256,10 +1238,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <N extends Number> Map<String, N> getNumberMap(final AsyncHandler<Map<String, N>, FilterFuncColumn[]> handler, final Class entityClass, final FilterFuncColumn... columns) {
public <N extends Number> void getNumberMap(final AsyncHandler<Map<String, N>, FilterFuncColumn[]> handler, final Class entityClass, final FilterFuncColumn... columns) {
Map<String, N> rs = getNumberMap(entityClass, columns);
if (handler != null) handler.completed(rs, columns);
return rs;
}
@Override
@@ -1268,10 +1249,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <N extends Number, B extends FilterBean> Map<String, N> getNumberMap(final AsyncHandler<Map<String, N>, B> handler, final Class entityClass, final B bean, final FilterFuncColumn... columns) {
public <N extends Number, B extends FilterBean> void getNumberMap(final AsyncHandler<Map<String, N>, B> handler, final Class entityClass, final B bean, final FilterFuncColumn... columns) {
Map<String, N> rs = getNumberMap(entityClass, bean, columns);
if (handler != null) handler.completed(rs, bean);
return rs;
}
@Override
@@ -1339,10 +1319,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <N extends Number> Map<String, N> getNumberMap(final AsyncHandler<Map<String, N>, FilterNode> handler, final Class entityClass, final FilterNode node, final FilterFuncColumn... columns) {
public <N extends Number> void getNumberMap(final AsyncHandler<Map<String, N>, FilterNode> handler, final Class entityClass, final FilterNode node, final FilterFuncColumn... columns) {
Map<String, N> rs = getNumberMap(entityClass, node, columns);
if (handler != null) handler.completed(rs, node);
return rs;
}
@Override
@@ -1382,10 +1361,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public Number getNumberResult(final AsyncHandler<Number, String> handler, final Class entityClass, final FilterFunc func, final Number defVal, final String column, final FilterNode node) {
public void getNumberResult(final AsyncHandler<Number, String> handler, final Class entityClass, final FilterFunc func, final Number defVal, final String column, final FilterNode node) {
Number rs = getNumberResult(entityClass, func, defVal, column, node);
if (handler != null) handler.completed(rs, column);
return rs;
}
//-----------------------queryColumnMap-----------------------------
@@ -1395,10 +1373,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T, K extends Serializable, N extends Number> Map<K, N> queryColumnMap(final AsyncHandler<Map<K, N>, String> handler, final Class<T> entityClass, final String keyColumn, final FilterFunc func, final String funcColumn) {
public <T, K extends Serializable, N extends Number> void queryColumnMap(final AsyncHandler<Map<K, N>, String> handler, final Class<T> entityClass, final String keyColumn, final FilterFunc func, final String funcColumn) {
Map<K, N> rs = queryColumnMap(entityClass, keyColumn, func, funcColumn);
if (handler != null) handler.completed(rs, keyColumn);
return rs;
}
@Override
@@ -1407,8 +1384,8 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T, K extends Serializable, N extends Number> Map<K, N> queryColumnMap(final AsyncHandler<Map<K, N>, String> handler, final Class<T> entityClass, final String keyColumn, final FilterFunc func, final String funcColumn, final FilterBean bean) {
return queryColumnMap(handler, entityClass, keyColumn, func, funcColumn, FilterNodeBean.createFilterNode(bean));
public <T, K extends Serializable, N extends Number> void queryColumnMap(final AsyncHandler<Map<K, N>, String> handler, final Class<T> entityClass, final String keyColumn, final FilterFunc func, final String funcColumn, final FilterBean bean) {
queryColumnMap(handler, entityClass, keyColumn, func, funcColumn, FilterNodeBean.createFilterNode(bean));
}
@Override
@@ -1450,10 +1427,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T, K extends Serializable, N extends Number> Map<K, N> queryColumnMap(final AsyncHandler<Map<K, N>, String> handler, final Class<T> entityClass, final String keyColumn, final FilterFunc func, final String funcColumn, final FilterNode node) {
public <T, K extends Serializable, N extends Number> void queryColumnMap(final AsyncHandler<Map<K, N>, String> handler, final Class<T> entityClass, final String keyColumn, final FilterFunc func, final String funcColumn, final FilterNode node) {
Map<K, N> rs = queryColumnMap(entityClass, keyColumn, func, funcColumn, node);
if (handler != null) handler.completed(rs, keyColumn);
return rs;
}
//-----------------------find----------------------------
@@ -1472,10 +1448,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> T find(final AsyncHandler<T, Serializable> handler, final Class<T> clazz, final Serializable pk) {
public <T> void find(final AsyncHandler<T, Serializable> handler, final Class<T> clazz, final Serializable pk) {
T rs = find(clazz, pk);
if (handler != null) handler.completed(rs, pk);
return rs;
}
@Override
@@ -1511,10 +1486,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> T find(final AsyncHandler<T, Serializable> handler, final Class<T> clazz, SelectColumn selects, final Serializable pk) {
public <T> void find(final AsyncHandler<T, Serializable> handler, final Class<T> clazz, SelectColumn selects, final Serializable pk) {
T rs = find(clazz, selects, pk);
if (handler != null) handler.completed(rs, pk);
return rs;
}
@Override
@@ -1523,10 +1497,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> T find(final AsyncHandler<T, Serializable> handler, final Class<T> clazz, final String column, final Serializable key) {
public <T> void find(final AsyncHandler<T, Serializable> handler, final Class<T> clazz, final String column, final Serializable key) {
T rs = find(clazz, column, key);
if (handler != null) handler.completed(rs, key);
return rs;
}
@Override
@@ -1535,10 +1508,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T, B extends FilterBean> T find(final AsyncHandler<T, B> handler, final Class<T> clazz, final B bean) {
public <T, B extends FilterBean> void find(final AsyncHandler<T, B> handler, final Class<T> clazz, final B bean) {
T rs = find(clazz, bean);
if (handler != null) handler.completed(rs, bean);
return rs;
}
@Override
@@ -1547,10 +1519,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> T find(final AsyncHandler<T, FilterNode> handler, final Class<T> clazz, final FilterNode node) {
public <T> void find(final AsyncHandler<T, FilterNode> handler, final Class<T> clazz, final FilterNode node) {
T rs = find(clazz, node);
if (handler != null) handler.completed(rs, node);
return rs;
}
@Override
@@ -1559,10 +1530,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T, B extends FilterBean> T find(final AsyncHandler<T, B> handler, final Class<T> clazz, final SelectColumn selects, final B bean) {
public <T, B extends FilterBean> void find(final AsyncHandler<T, B> handler, final Class<T> clazz, final SelectColumn selects, final B bean) {
T rs = find(clazz, selects, bean);
if (handler != null) handler.completed(rs, bean);
return rs;
}
@Override
@@ -1598,10 +1568,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> T find(final AsyncHandler<T, FilterNode> handler, final Class<T> clazz, final SelectColumn selects, final FilterNode node) {
public <T> void find(final AsyncHandler<T, FilterNode> handler, final Class<T> clazz, final SelectColumn selects, final FilterNode node) {
T rs = find(clazz, selects, node);
if (handler != null) handler.completed(rs, node);
return rs;
}
@Override
@@ -1610,10 +1579,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> Serializable findColumn(final AsyncHandler<Serializable, Serializable> handler, final Class<T> clazz, final String column, final Serializable pk) {
public <T> void findColumn(final AsyncHandler<Serializable, Serializable> handler, final Class<T> clazz, final String column, final Serializable pk) {
Serializable rs = findColumn(clazz, column, pk);
if (handler != null) handler.completed(rs, pk);
return rs;
}
@Override
@@ -1622,10 +1590,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T, B extends FilterBean> Serializable findColumn(final AsyncHandler<Serializable, B> handler, final Class<T> clazz, final String column, final B bean) {
public <T, B extends FilterBean> void findColumn(final AsyncHandler<Serializable, B> handler, final Class<T> clazz, final String column, final B bean) {
Serializable rs = findColumn(clazz, column, bean);
if (handler != null) handler.completed(rs, bean);
return rs;
}
@Override
@@ -1634,10 +1601,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> Serializable findColumn(final AsyncHandler<Serializable, FilterNode> handler, final Class<T> clazz, final String column, final FilterNode node) {
public <T> void findColumn(final AsyncHandler<Serializable, FilterNode> handler, final Class<T> clazz, final String column, final FilterNode node) {
Serializable rs = findColumn(clazz, column, node);
if (handler != null) handler.completed(rs, node);
return rs;
}
@Override
@@ -1681,10 +1647,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> Serializable findColumn(final AsyncHandler<Serializable, Serializable> handler, final Class<T> clazz, final String column, final Serializable defValue, final Serializable pk) {
public <T> void findColumn(final AsyncHandler<Serializable, Serializable> handler, final Class<T> clazz, final String column, final Serializable defValue, final Serializable pk) {
Serializable rs = findColumn(clazz, column, defValue, pk);
if (handler != null) handler.completed(rs, pk);
return rs;
}
@Override
@@ -1693,10 +1658,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T, B extends FilterBean> Serializable findColumn(final AsyncHandler<Serializable, B> handler, final Class<T> clazz, final String column, final Serializable defValue, final B bean) {
public <T, B extends FilterBean> void findColumn(final AsyncHandler<Serializable, B> handler, final Class<T> clazz, final String column, final Serializable defValue, final B bean) {
Serializable rs = findColumn(clazz, column, defValue, bean);
if (handler != null) handler.completed(rs, bean);
return rs;
}
@Override
@@ -1740,10 +1704,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> Serializable findColumn(final AsyncHandler<Serializable, FilterNode> handler, final Class<T> clazz, final String column, final Serializable defValue, final FilterNode node) {
public <T> void findColumn(final AsyncHandler<Serializable, FilterNode> handler, final Class<T> clazz, final String column, final Serializable defValue, final FilterNode node) {
Serializable rs = findColumn(clazz, column, defValue, node);
if (handler != null) handler.completed(rs, node);
return rs;
}
@Override
@@ -1781,10 +1744,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> boolean exists(final AsyncHandler<Boolean, Serializable> handler, final Class<T> clazz, final Serializable pk) {
public <T> void exists(final AsyncHandler<Boolean, Serializable> handler, final Class<T> clazz, final Serializable pk) {
boolean rs = exists(clazz, pk);
if (handler != null) handler.completed(rs, pk);
return rs;
}
@Override
@@ -1793,10 +1755,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T, B extends FilterBean> boolean exists(final AsyncHandler<Boolean, B> handler, final Class<T> clazz, final B bean) {
public <T, B extends FilterBean> void exists(final AsyncHandler<Boolean, B> handler, final Class<T> clazz, final B bean) {
boolean rs = exists(clazz, bean);
if (handler != null) handler.completed(rs, bean);
return rs;
}
@Override
@@ -1834,10 +1795,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> boolean exists(final AsyncHandler<Boolean, FilterNode> handler, final Class<T> clazz, final FilterNode node) {
public <T> void exists(final AsyncHandler<Boolean, FilterNode> handler, final Class<T> clazz, final FilterNode node) {
boolean rs = exists(clazz, node);
if (handler != null) handler.completed(rs, node);
return rs;
}
//-----------------------list set----------------------------
@@ -1847,10 +1807,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T, V extends Serializable> HashSet<V> queryColumnSet(final AsyncHandler<HashSet<V>, String> handler, final String selectedColumn, final Class<T> clazz, final String column, final Serializable key) {
public <T, V extends Serializable> void queryColumnSet(final AsyncHandler<HashSet<V>, String> handler, final String selectedColumn, final Class<T> clazz, final String column, final Serializable key) {
HashSet<V> rs = queryColumnSet(selectedColumn, clazz, column, key);
if (handler != null) handler.completed(rs, column);
return rs;
}
@Override
@@ -1859,10 +1818,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T, V extends Serializable, B extends FilterBean> HashSet<V> queryColumnSet(final AsyncHandler<HashSet<V>, B> handler, final String selectedColumn, final Class<T> clazz, final B bean) {
public <T, V extends Serializable, B extends FilterBean> void queryColumnSet(final AsyncHandler<HashSet<V>, B> handler, final String selectedColumn, final Class<T> clazz, final B bean) {
HashSet<V> rs = queryColumnSet(selectedColumn, clazz, bean);
if (handler != null) handler.completed(rs, bean);
return rs;
}
@Override
@@ -1871,10 +1829,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T, V extends Serializable> HashSet<V> queryColumnSet(final AsyncHandler<HashSet<V>, FilterNode> handler, final String selectedColumn, final Class<T> clazz, final FilterNode node) {
public <T, V extends Serializable> void queryColumnSet(final AsyncHandler<HashSet<V>, FilterNode> handler, final String selectedColumn, final Class<T> clazz, final FilterNode node) {
HashSet<V> rs = queryColumnSet(selectedColumn, clazz, node);
if (handler != null) handler.completed(rs, node);
return rs;
}
@Override
@@ -1883,10 +1840,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T, V extends Serializable> List<V> queryColumnList(final AsyncHandler<List<V>, Serializable> handler, final String selectedColumn, final Class<T> clazz, final String column, final Serializable key) {
public <T, V extends Serializable> void queryColumnList(final AsyncHandler<List<V>, Serializable> handler, final String selectedColumn, final Class<T> clazz, final String column, final Serializable key) {
List<V> rs = queryColumnList(selectedColumn, clazz, column, key);
if (handler != null) handler.completed(rs, key);
return rs;
}
@Override
@@ -1895,10 +1851,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T, V extends Serializable, B extends FilterBean> List<V> queryColumnList(final AsyncHandler<List<V>, B> handler, String selectedColumn, Class<T> clazz, B bean) {
public <T, V extends Serializable, B extends FilterBean> void queryColumnList(final AsyncHandler<List<V>, B> handler, String selectedColumn, Class<T> clazz, B bean) {
List<V> rs = queryColumnList(selectedColumn, clazz, bean);
if (handler != null) handler.completed(rs, bean);
return rs;
}
@Override
@@ -1907,10 +1862,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T, V extends Serializable> List<V> queryColumnList(final AsyncHandler<List<V>, FilterNode> handler, final String selectedColumn, final Class<T> clazz, final FilterNode node) {
public <T, V extends Serializable> void queryColumnList(final AsyncHandler<List<V>, FilterNode> handler, final String selectedColumn, final Class<T> clazz, final FilterNode node) {
List<V> rs = queryColumnList(selectedColumn, clazz, node);
if (handler != null) handler.completed(rs, node);
return rs;
}
@Override
@@ -1919,10 +1873,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T, V extends Serializable, B extends FilterBean> List<V> queryColumnList(final AsyncHandler<List<V>, B> handler, String selectedColumn, Class<T> clazz, Flipper flipper, B bean) {
public <T, V extends Serializable, B extends FilterBean> void queryColumnList(final AsyncHandler<List<V>, B> handler, String selectedColumn, Class<T> clazz, Flipper flipper, B bean) {
List<V> rs = queryColumnList(selectedColumn, clazz, flipper, bean);
if (handler != null) handler.completed(rs, bean);
return rs;
}
@Override
@@ -1931,10 +1884,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T, V extends Serializable> List<V> queryColumnList(final AsyncHandler<List<V>, FilterNode> handler, final String selectedColumn, final Class<T> clazz, Flipper flipper, final FilterNode node) {
public <T, V extends Serializable> void queryColumnList(final AsyncHandler<List<V>, FilterNode> handler, final String selectedColumn, final Class<T> clazz, Flipper flipper, final FilterNode node) {
List<V> rs = queryColumnList(selectedColumn, clazz, flipper, node);
if (handler != null) handler.completed(rs, node);
return rs;
}
/**
@@ -1955,10 +1907,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T, V extends Serializable, B extends FilterBean> Sheet<V> queryColumnSheet(final AsyncHandler<Sheet<V>, B> handler, String selectedColumn, Class<T> clazz, Flipper flipper, B bean) {
public <T, V extends Serializable, B extends FilterBean> void queryColumnSheet(final AsyncHandler<Sheet<V>, B> handler, String selectedColumn, Class<T> clazz, Flipper flipper, B bean) {
Sheet<V> rs = queryColumnSheet(selectedColumn, clazz, flipper, bean);
if (handler != null) handler.completed(rs, bean);
return rs;
}
@Override
@@ -1967,10 +1918,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T, V extends Serializable> Sheet<V> queryColumnSheet(final AsyncHandler<Sheet<V>, FilterNode> handler, final String selectedColumn, final Class<T> clazz, final Flipper flipper, final FilterNode node) {
public <T, V extends Serializable> void queryColumnSheet(final AsyncHandler<Sheet<V>, FilterNode> handler, final String selectedColumn, final Class<T> clazz, final Flipper flipper, final FilterNode node) {
Sheet<V> rs = queryColumnSheet(selectedColumn, clazz, flipper, node);
if (handler != null) handler.completed(rs, node);
return rs;
}
private <T, V extends Serializable> Sheet<V> queryColumnSheet(final boolean needtotal, final String selectedColumn, final Class<T> clazz, final Flipper flipper, final FilterNode node) {
@@ -2004,10 +1954,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> List<T> queryList(final AsyncHandler<List<T>, Serializable> handler, final Class<T> clazz, final String column, final Serializable key) {
public <T> void queryList(final AsyncHandler<List<T>, Serializable> handler, final Class<T> clazz, final String column, final Serializable key) {
List<T> rs = queryList(clazz, column, key);
if (handler != null) handler.completed(rs, key);
return rs;
}
/**
@@ -2025,10 +1974,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T, B extends FilterBean> List<T> queryList(final AsyncHandler<List<T>, B> handler, final Class<T> clazz, final B bean) {
public <T, B extends FilterBean> void queryList(final AsyncHandler<List<T>, B> handler, final Class<T> clazz, final B bean) {
List<T> rs = queryList(clazz, bean);
if (handler != null) handler.completed(rs, bean);
return rs;
}
@Override
@@ -2037,10 +1985,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> List<T> queryList(final AsyncHandler<List<T>, FilterNode> handler, final Class<T> clazz, final FilterNode node) {
public <T> void queryList(final AsyncHandler<List<T>, FilterNode> handler, final Class<T> clazz, final FilterNode node) {
List<T> rs = queryList(clazz, node);
if (handler != null) handler.completed(rs, node);
return rs;
}
/**
@@ -2059,10 +2006,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T, B extends FilterBean> List<T> queryList(final AsyncHandler<List<T>, B> handler, final Class<T> clazz, final SelectColumn selects, final B bean) {
public <T, B extends FilterBean> void queryList(final AsyncHandler<List<T>, B> handler, final Class<T> clazz, final SelectColumn selects, final B bean) {
List<T> rs = queryList(clazz, selects, bean);
if (handler != null) handler.completed(rs, bean);
return rs;
}
@Override
@@ -2071,10 +2017,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> List<T> queryList(final AsyncHandler<List<T>, FilterNode> handler, final Class<T> clazz, final SelectColumn selects, final FilterNode node) {
public <T> void queryList(final AsyncHandler<List<T>, FilterNode> handler, final Class<T> clazz, final SelectColumn selects, final FilterNode node) {
List<T> rs = queryList(clazz, selects, node);
if (handler != null) handler.completed(rs, node);
return rs;
}
@Override
@@ -2083,10 +2028,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> List<T> queryList(final AsyncHandler<List<T>, Serializable> handler, final Class<T> clazz, final Flipper flipper, final String column, final Serializable key) {
public <T> void queryList(final AsyncHandler<List<T>, Serializable> handler, final Class<T> clazz, final Flipper flipper, final String column, final Serializable key) {
List<T> rs = queryList(clazz, flipper, column, key);
if (handler != null) handler.completed(rs, key);
return rs;
}
@Override
@@ -2095,10 +2039,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T, B extends FilterBean> List<T> queryList(final AsyncHandler<List<T>, B> handler, final Class<T> clazz, final Flipper flipper, final B bean) {
public <T, B extends FilterBean> void queryList(final AsyncHandler<List<T>, B> handler, final Class<T> clazz, final Flipper flipper, final B bean) {
List<T> rs = queryList(clazz, flipper, bean);
if (handler != null) handler.completed(rs, bean);
return rs;
}
@Override
@@ -2107,10 +2050,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> List<T> queryList(final AsyncHandler<List<T>, FilterNode> handler, final Class<T> clazz, final Flipper flipper, final FilterNode node) {
public <T> void queryList(final AsyncHandler<List<T>, FilterNode> handler, final Class<T> clazz, final Flipper flipper, final FilterNode node) {
List<T> rs = queryList(clazz, flipper, node);
if (handler != null) handler.completed(rs, node);
return rs;
}
@Override
@@ -2119,10 +2061,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T, B extends FilterBean> List<T> queryList(final AsyncHandler<List<T>, B> handler, final Class<T> clazz, final SelectColumn selects, final Flipper flipper, final B bean) {
public <T, B extends FilterBean> void queryList(final AsyncHandler<List<T>, B> handler, final Class<T> clazz, final SelectColumn selects, final Flipper flipper, final B bean) {
List<T> rs = queryList(clazz, selects, flipper, bean);
if (handler != null) handler.completed(rs, bean);
return rs;
}
@Override
@@ -2131,10 +2072,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> List<T> queryList(final AsyncHandler<List<T>, FilterNode> handler, final Class<T> clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node) {
public <T> void queryList(final AsyncHandler<List<T>, FilterNode> handler, final Class<T> clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node) {
List<T> rs = queryList(clazz, selects, flipper, node);
if (handler != null) handler.completed(rs, node);
return rs;
}
//-----------------------sheet----------------------------
@@ -2154,10 +2094,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T, B extends FilterBean> Sheet<T> querySheet(final AsyncHandler<Sheet<T>, B> handler, final Class<T> clazz, final Flipper flipper, final B bean) {
public <T, B extends FilterBean> void querySheet(final AsyncHandler<Sheet<T>, B> handler, final Class<T> clazz, final Flipper flipper, final B bean) {
Sheet<T> rs = querySheet(clazz, flipper, bean);
if (handler != null) handler.completed(rs, bean);
return rs;
}
@Override
@@ -2166,10 +2105,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> Sheet<T> querySheet(final AsyncHandler<Sheet<T>, FilterNode> handler, final Class<T> clazz, final Flipper flipper, final FilterNode node) {
public <T> void querySheet(final AsyncHandler<Sheet<T>, FilterNode> handler, final Class<T> clazz, final Flipper flipper, final FilterNode node) {
Sheet<T> rs = querySheet(clazz, flipper, node);
if (handler != null) handler.completed(rs, node);
return rs;
}
/**
@@ -2189,10 +2127,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T, B extends FilterBean> Sheet<T> querySheet(final AsyncHandler<Sheet<T>, B> handler, final Class<T> clazz, final SelectColumn selects, final Flipper flipper, final B bean) {
public <T, B extends FilterBean> void querySheet(final AsyncHandler<Sheet<T>, B> handler, final Class<T> clazz, final SelectColumn selects, final Flipper flipper, final B bean) {
Sheet<T> rs = querySheet(clazz, selects, flipper, bean);
if (handler != null) handler.completed(rs, bean);
return rs;
}
@Override
@@ -2201,10 +2138,9 @@ public final class DataJdbcSource implements DataSource, DataCacheListener, Func
}
@Override
public <T> Sheet<T> querySheet(final AsyncHandler<Sheet<T>, FilterNode> handler, final Class<T> clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node) {
public <T> void querySheet(final AsyncHandler<Sheet<T>, FilterNode> handler, final Class<T> clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node) {
Sheet<T> rs = querySheet(clazz, selects, flipper, node);
if (handler != null) handler.completed(rs, node);
return rs;
}
private <T> Sheet<T> querySheet(final boolean readcache, final boolean needtotal, final Class<T> clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node) {

198
src/org/redkale/source/DataSource.java
View File

@@ -62,10 +62,9 @@ public interface DataSource {
* @param handler 回调函数
* @param values Entity对象
*
* @return 影响的记录条数
*
*/
public <T> int delete(final AsyncHandler<Integer, T[]> handler, final T... values);
public <T> void delete(final AsyncHandler<Integer, T[]> handler, final T... values);
/**
* 删除指定主键值的记录 <br>
@@ -88,10 +87,9 @@ public interface DataSource {
* @param clazz Entity类
* @param ids 主键值
*
* @return 影响的记录条数
*
*/
public <T> int delete(final AsyncHandler<Integer, Serializable[]> handler, final Class<T> clazz, final Serializable... ids);
public <T> void delete(final AsyncHandler<Integer, Serializable[]> handler, final Class<T> clazz, final Serializable... ids);
/**
* 删除符合过滤条件的记录 <br>
@@ -114,10 +112,9 @@ public interface DataSource {
* @param clazz Entity类
* @param node 过滤条件
*
* @return 影响的记录条数
*
*/
public <T> int delete(final AsyncHandler<Integer, FilterNode> handler, final Class<T> clazz, final FilterNode node);
public <T> void delete(final AsyncHandler<Integer, FilterNode> handler, final Class<T> clazz, final FilterNode node);
/**
* 删除符合过滤条件且指定最大影响条数的记录 <br>
@@ -144,10 +141,9 @@ public interface DataSource {
* @param flipper 翻页对象
* @param node 过滤条件
*
* @return 影响的记录条数
*
*/
public <T> int delete(final AsyncHandler<Integer, FilterNode> handler, final Class<T> clazz, final Flipper flipper, final FilterNode node);
public <T> void delete(final AsyncHandler<Integer, FilterNode> handler, final Class<T> clazz, final Flipper flipper, final FilterNode node);
//------------------------update---------------------------
/**
@@ -175,10 +171,9 @@ public interface DataSource {
* @param handler 回调函数
* @param values Entity对象
*
* @return 影响的记录条数
*
*/
public <T> int update(final AsyncHandler<Integer, T[]> handler, final T... values);
public <T> void update(final AsyncHandler<Integer, T[]> handler, final T... values);
/**
* 更新单个记录的单个字段 <br>
@@ -207,10 +202,9 @@ public interface DataSource {
* @param column 待更新的字段名
* @param value 更新值
*
* @return 影响的记录条数
*
*/
public <T> int updateColumn(final AsyncHandler<Integer, Serializable> handler, final Class<T> clazz, final Serializable id, final String column, final Serializable value);
public <T> void updateColumn(final AsyncHandler<Integer, Serializable> handler, final Class<T> clazz, final Serializable id, final String column, final Serializable value);
/**
* 更新符合过滤条件记录的单个字段 <br>
@@ -239,10 +233,9 @@ public interface DataSource {
* @param value 更新值
* @param node 过滤条件
*
* @return 影响的记录条数
*
*/
public <T> int updateColumn(final AsyncHandler<Integer, FilterNode> handler, final Class<T> clazz, final String column, final Serializable value, final FilterNode node);
public <T> void updateColumn(final AsyncHandler<Integer, FilterNode> handler, final Class<T> clazz, final String column, final Serializable value, final FilterNode node);
/**
* 更新指定主键值记录的部分字段 <br>
@@ -269,10 +262,9 @@ public interface DataSource {
* @param id 主键
* @param values 更新字段
*
* @return 影响的记录条数
*
*/
public <T> int updateColumn(final AsyncHandler<Integer, Serializable> handler, final Class<T> clazz, final Serializable id, final ColumnValue... values);
public <T> void updateColumn(final AsyncHandler<Integer, Serializable> handler, final Class<T> clazz, final Serializable id, final ColumnValue... values);
/**
* 更新符合过滤条件记录的部分字段 <br>
@@ -301,10 +293,9 @@ public interface DataSource {
* @param node 过滤条件
* @param values 更新字段
*
* @return 影响的记录条数
*
*/
public <T> int updateColumn(final AsyncHandler<Integer, FilterNode> handler, final Class<T> clazz, final FilterNode node, final ColumnValue... values);
public <T> void updateColumn(final AsyncHandler<Integer, FilterNode> handler, final Class<T> clazz, final FilterNode node, final ColumnValue... values);
/**
* 更新符合过滤条件的记录的指定字段 <br>
@@ -335,10 +326,9 @@ public interface DataSource {
* @param flipper 翻页对象
* @param values 更新字段
*
* @return 影响的记录条数
*
*/
public <T> int updateColumn(final AsyncHandler<Integer, FilterNode> handler, final Class<T> clazz, final FilterNode node, final Flipper flipper, final ColumnValue... values);
public <T> void updateColumn(final AsyncHandler<Integer, FilterNode> handler, final Class<T> clazz, final FilterNode node, final Flipper flipper, final ColumnValue... values);
/**
* 更新单个记录的指定字段 <br>
@@ -363,9 +353,8 @@ public interface DataSource {
* @param bean 待更新的Entity对象
* @param columns 需更新的字段名
*
* @return 影响的记录条数
*/
public <T> int updateColumn(final AsyncHandler<Integer, T> handler, final T bean, final String... columns);
public <T> void updateColumn(final AsyncHandler<Integer, T> handler, final T bean, final String... columns);
/**
* 更新符合过滤条件记录的指定字段 <br>
@@ -392,10 +381,9 @@ public interface DataSource {
* @param node 过滤条件
* @param columns 需更新的字段名
*
* @return 影响的记录条数
*
*/
public <T> int updateColumn(final AsyncHandler<Integer, FilterNode> handler, final T bean, final FilterNode node, final String... columns);
public <T> void updateColumn(final AsyncHandler<Integer, FilterNode> handler, final T bean, final FilterNode node, final String... columns);
/**
* 更新单个记录的指定字段 <br>
@@ -420,10 +408,9 @@ public interface DataSource {
* @param bean 待更新的Entity对象
* @param selects 指定字段
*
* @return 影响的记录条数
*
*/
public <T> int updateColumn(final AsyncHandler<Integer, T> handler, final T bean, final SelectColumn selects);
public <T> void updateColumn(final AsyncHandler<Integer, T> handler, final T bean, final SelectColumn selects);
/**
* 更新符合过滤条件记录的指定字段 <br>
@@ -450,10 +437,9 @@ public interface DataSource {
* @param node 过滤条件
* @param selects 指定字段
*
* @return 影响的记录条数
*
*/
public <T> int updateColumn(final AsyncHandler<Integer, FilterNode> handler, final T bean, final FilterNode node, final SelectColumn selects);
public <T> void updateColumn(final AsyncHandler<Integer, FilterNode> handler, final T bean, final FilterNode node, final SelectColumn selects);
//############################################# 查询接口 #############################################
//-----------------------getXXXXResult-----------------------------
@@ -480,10 +466,9 @@ public interface DataSource {
* @param func 聚合函数
* @param column 指定字段
*
* @return 聚合结果
*
*/
public Number getNumberResult(final AsyncHandler<Number, String> handler, final Class entityClass, final FilterFunc func, final String column);
public void getNumberResult(final AsyncHandler<Number, String> handler, final Class entityClass, final FilterFunc func, final String column);
/**
* 获取符合过滤条件记录的聚合结果, 无结果返回null <br>
@@ -511,10 +496,9 @@ public interface DataSource {
* @param column 指定字段
* @param bean 过滤条件
*
* @return 聚合结果
*
*/
public <B extends FilterBean> Number getNumberResult(final AsyncHandler<Number, B> handler, final Class entityClass, final FilterFunc func, final String column, final B bean);
public <B extends FilterBean> void getNumberResult(final AsyncHandler<Number, B> handler, final Class entityClass, final FilterFunc func, final String column, final B bean);
/**
* 获取符合过滤条件记录的聚合结果, 无结果返回null <br>
@@ -541,10 +525,9 @@ public interface DataSource {
* @param column 指定字段
* @param node 过滤条件
*
* @return 聚合结果
*
*/
public Number getNumberResult(final AsyncHandler<Number, FilterNode> handler, final Class entityClass, final FilterFunc func, final String column, final FilterNode node);
public void getNumberResult(final AsyncHandler<Number, FilterNode> handler, final Class entityClass, final FilterFunc func, final String column, final FilterNode node);
/**
* 获取符合过滤条件记录的聚合结果, 无结果返回默认值 <br>
@@ -571,9 +554,8 @@ public interface DataSource {
* @param defVal 默认值
* @param column 指定字段
*
* @return 聚合结果
*/
public Number getNumberResult(final AsyncHandler<Number, String> handler, final Class entityClass, final FilterFunc func, final Number defVal, final String column);
public void getNumberResult(final AsyncHandler<Number, String> handler, final Class entityClass, final FilterFunc func, final Number defVal, final String column);
/**
* 获取符合过滤条件记录的聚合结果, 无结果返回默认值 <br>
@@ -602,9 +584,8 @@ public interface DataSource {
* @param column 指定字段
* @param bean 过滤条件
*
* @return 聚合结果
*/
public Number getNumberResult(final AsyncHandler<Number, String> handler, final Class entityClass, final FilterFunc func, final Number defVal, final String column, final FilterBean bean);
public void getNumberResult(final AsyncHandler<Number, String> handler, final Class entityClass, final FilterFunc func, final Number defVal, final String column, final FilterBean bean);
/**
* 获取符合过滤条件记录的聚合结果, 无结果返回默认值 <br>
@@ -633,10 +614,9 @@ public interface DataSource {
* @param column 指定字段
* @param node 过滤条件
*
* @return 聚合结果
*
*/
public Number getNumberResult(final AsyncHandler<Number, String> handler, final Class entityClass, final FilterFunc func, final Number defVal, final String column, final FilterNode node);
public void getNumberResult(final AsyncHandler<Number, String> handler, final Class entityClass, final FilterFunc func, final Number defVal, final String column, final FilterNode node);
/**
* 获取符合过滤条件记录的聚合结果Map <br>
@@ -661,9 +641,8 @@ public interface DataSource {
* @param entityClass Entity类
* @param columns 聚合字段
*
* @return 聚合结果Map
*/
public <N extends Number> Map<String, N> getNumberMap(final AsyncHandler<Map<String, N>, FilterFuncColumn[]> handler, final Class entityClass, final FilterFuncColumn... columns);
public <N extends Number> void getNumberMap(final AsyncHandler<Map<String, N>, FilterFuncColumn[]> handler, final Class entityClass, final FilterFuncColumn... columns);
/**
* 获取符合过滤条件记录的聚合结果Map <br>
@@ -691,9 +670,8 @@ public interface DataSource {
* @param bean 过滤条件
* @param columns 聚合字段
*
* @return 聚合结果Map
*/
public <N extends Number, B extends FilterBean> Map<String, N> getNumberMap(final AsyncHandler<Map<String, N>, B> handler, final Class entityClass, final B bean, final FilterFuncColumn... columns);
public <N extends Number, B extends FilterBean> void getNumberMap(final AsyncHandler<Map<String, N>, B> handler, final Class entityClass, final B bean, final FilterFuncColumn... columns);
/**
* 获取符合过滤条件记录的聚合结果Map <br>
@@ -720,9 +698,8 @@ public interface DataSource {
* @param node 过滤条件
* @param columns 聚合字段
*
* @return 聚合结果Map
*/
public <N extends Number> Map<String, N> getNumberMap(final AsyncHandler<Map<String, N>, FilterNode> handler, final Class entityClass, final FilterNode node, final FilterFuncColumn... columns);
public <N extends Number> void getNumberMap(final AsyncHandler<Map<String, N>, FilterNode> handler, final Class entityClass, final FilterNode node, final FilterFuncColumn... columns);
/**
* 查询符合过滤条件记录的GROUP BY聚合结果Map <br>
@@ -755,9 +732,8 @@ public interface DataSource {
* @param func 聚合函数
* @param funcColumn 聚合字段
*
* @return 聚合结果Map
*/
public <T, K extends Serializable, N extends Number> Map<K, N> queryColumnMap(final AsyncHandler<Map<K, N>, String> handler, final Class<T> entityClass, final String keyColumn, final FilterFunc func, final String funcColumn);
public <T, K extends Serializable, N extends Number> void queryColumnMap(final AsyncHandler<Map<K, N>, String> handler, final Class<T> entityClass, final String keyColumn, final FilterFunc func, final String funcColumn);
/**
* 查询符合过滤条件记录的GROUP BY聚合结果Map <br>
@@ -792,9 +768,8 @@ public interface DataSource {
* @param funcColumn 聚合字段
* @param bean 过滤条件
*
* @return 聚合结果Map
*/
public <T, K extends Serializable, N extends Number> Map<K, N> queryColumnMap(final AsyncHandler<Map<K, N>, String> handler, final Class<T> entityClass, final String keyColumn, final FilterFunc func, final String funcColumn, final FilterBean bean);
public <T, K extends Serializable, N extends Number> void queryColumnMap(final AsyncHandler<Map<K, N>, String> handler, final Class<T> entityClass, final String keyColumn, final FilterFunc func, final String funcColumn, final FilterBean bean);
/**
* 查询符合过滤条件记录的GROUP BY聚合结果Map <br>
@@ -829,9 +804,8 @@ public interface DataSource {
* @param funcColumn 聚合字段
* @param node 过滤条件
*
* @return 聚合结果Map
*/
public <T, K extends Serializable, N extends Number> Map<K, N> queryColumnMap(final AsyncHandler<Map<K, N>, String> handler, final Class<T> entityClass, final String keyColumn, final FilterFunc func, final String funcColumn, final FilterNode node);
public <T, K extends Serializable, N extends Number> void queryColumnMap(final AsyncHandler<Map<K, N>, String> handler, final Class<T> entityClass, final String keyColumn, final FilterFunc func, final String funcColumn, final FilterNode node);
//-----------------------find----------------------------
/**
@@ -855,9 +829,8 @@ public interface DataSource {
* @param clazz Entity类
* @param pk 主键值
*
* @return Entity对象
*/
public <T> T find(final AsyncHandler<T, Serializable> handler, final Class<T> clazz, final Serializable pk);
public <T> void find(final AsyncHandler<T, Serializable> handler, final Class<T> clazz, final Serializable pk);
/**
* 获取指定主键值的单个记录, 返回null表示不存在值 <br>
@@ -882,9 +855,8 @@ public interface DataSource {
* @param selects 指定字段
* @param pk 主键值
*
* @return Entity对象
*/
public <T> T find(final AsyncHandler<T, Serializable> handler, final Class<T> clazz, final SelectColumn selects, final Serializable pk);
public <T> void find(final AsyncHandler<T, Serializable> handler, final Class<T> clazz, final SelectColumn selects, final Serializable pk);
/**
* 获取符合过滤条件单个记录, 返回null表示不存在值 <br>
@@ -909,9 +881,8 @@ public interface DataSource {
* @param column 过滤字段名
* @param key 过滤字段值
*
* @return Entity对象
*/
public <T> T find(final AsyncHandler<T, Serializable> handler, final Class<T> clazz, final String column, final Serializable key);
public <T> void find(final AsyncHandler<T, Serializable> handler, final Class<T> clazz, final String column, final Serializable key);
/**
* 获取符合过滤条件单个记录, 返回null表示不存在值 <br>
@@ -935,9 +906,8 @@ public interface DataSource {
* @param clazz Entity类
* @param bean 过滤条件
*
* @return Entity对象
*/
public <T, B extends FilterBean> T find(final AsyncHandler<T, B> handler, final Class<T> clazz, final B bean);
public <T, B extends FilterBean> void find(final AsyncHandler<T, B> handler, final Class<T> clazz, final B bean);
/**
* 获取符合过滤条件单个记录, 返回null表示不存在值 <br>
@@ -960,9 +930,8 @@ public interface DataSource {
* @param clazz Entity类
* @param node 过滤条件
*
* @return Entity对象
*/
public <T> T find(final AsyncHandler<T, FilterNode> handler, final Class<T> clazz, final FilterNode node);
public <T> void find(final AsyncHandler<T, FilterNode> handler, final Class<T> clazz, final FilterNode node);
/**
* 获取符合过滤条件单个记录, 返回null表示不存在值 <br>
@@ -988,9 +957,8 @@ public interface DataSource {
* @param selects 指定字段
* @param bean 过滤条件
*
* @return Entity对象
*/
public <T, B extends FilterBean> T find(final AsyncHandler<T, B> handler, final Class<T> clazz, final SelectColumn selects, final B bean);
public <T, B extends FilterBean> void find(final AsyncHandler<T, B> handler, final Class<T> clazz, final SelectColumn selects, final B bean);
/**
* 获取符合过滤条件单个记录, 返回null表示不存在值 <br>
@@ -1015,9 +983,8 @@ public interface DataSource {
* @param selects 指定字段
* @param node 过滤条件
*
* @return Entity对象
*/
public <T> T find(final AsyncHandler<T, FilterNode> handler, final Class<T> clazz, final SelectColumn selects, final FilterNode node);
public <T> void find(final AsyncHandler<T, FilterNode> handler, final Class<T> clazz, final SelectColumn selects, final FilterNode node);
/**
* 获取符合过滤条件单个记录的单个字段值, 返回null表示不存在值 <br>
@@ -1042,9 +1009,8 @@ public interface DataSource {
* @param column 字段名
* @param pk 主键值
*
* @return 字段值
*/
public <T> Serializable findColumn(final AsyncHandler<Serializable, Serializable> handler, final Class<T> clazz, final String column, final Serializable pk);
public <T> void findColumn(final AsyncHandler<Serializable, Serializable> handler, final Class<T> clazz, final String column, final Serializable pk);
/**
* 获取符合过滤条件单个记录的单个字段值, 返回null表示不存在值 <br>
@@ -1070,9 +1036,8 @@ public interface DataSource {
* @param column 字段名
* @param bean 过滤条件
*
* @return 字段值
*/
public <T, B extends FilterBean> Serializable findColumn(final AsyncHandler<Serializable, B> handler, final Class<T> clazz, final String column, final B bean);
public <T, B extends FilterBean> void findColumn(final AsyncHandler<Serializable, B> handler, final Class<T> clazz, final String column, final B bean);
/**
* 获取符合过滤条件单个记录的单个字段值, 返回null表示不存在值 <br>
@@ -1097,9 +1062,8 @@ public interface DataSource {
* @param column 字段名
* @param node 过滤条件
*
* @return 字段值
*/
public <T> Serializable findColumn(final AsyncHandler<Serializable, FilterNode> handler, final Class<T> clazz, final String column, final FilterNode node);
public <T> void findColumn(final AsyncHandler<Serializable, FilterNode> handler, final Class<T> clazz, final String column, final FilterNode node);
/**
* 获取符合过滤条件单个记录的单个字段值, 不存在值则返回默认值 <br>
@@ -1126,9 +1090,8 @@ public interface DataSource {
* @param defValue 默认值
* @param pk 主键值
*
* @return 字段值
*/
public <T> Serializable findColumn(final AsyncHandler<Serializable, Serializable> handler, final Class<T> clazz, final String column, final Serializable defValue, final Serializable pk);
public <T> void findColumn(final AsyncHandler<Serializable, Serializable> handler, final Class<T> clazz, final String column, final Serializable defValue, final Serializable pk);
/**
* 获取符合过滤条件单个记录的单个字段值, 不存在值则返回默认值 <br>
@@ -1156,9 +1119,8 @@ public interface DataSource {
* @param defValue 默认值
* @param bean 过滤条件
*
* @return 字段值
*/
public <T, B extends FilterBean> Serializable findColumn(final AsyncHandler<Serializable, B> handler, final Class<T> clazz, final String column, final Serializable defValue, final B bean);
public <T, B extends FilterBean> void findColumn(final AsyncHandler<Serializable, B> handler, final Class<T> clazz, final String column, final Serializable defValue, final B bean);
/**
* 获取符合过滤条件单个记录的单个字段值, 不存在值则返回默认值 <br>
@@ -1185,9 +1147,8 @@ public interface DataSource {
* @param defValue 默认值
* @param node 过滤条件
*
* @return 字段值
*/
public <T> Serializable findColumn(final AsyncHandler<Serializable, FilterNode> handler, final Class<T> clazz, final String column, final Serializable defValue, final FilterNode node);
public <T> void findColumn(final AsyncHandler<Serializable, FilterNode> handler, final Class<T> clazz, final String column, final Serializable defValue, final FilterNode node);
/**
* 判断是否存在主键值的记录 <br>
@@ -1210,9 +1171,8 @@ public interface DataSource {
* @param clazz Entity类
* @param pk 主键值
*
* @return 是否存在
*/
public <T> boolean exists(final AsyncHandler<Boolean, Serializable> handler, final Class<T> clazz, final Serializable pk);
public <T> void exists(final AsyncHandler<Boolean, Serializable> handler, final Class<T> clazz, final Serializable pk);
/**
* 判断是否存在符合过滤条件的记录 <br>
@@ -1236,9 +1196,8 @@ public interface DataSource {
* @param clazz Entity类
* @param bean 过滤条件
*
* @return 是否存在
*/
public <T, B extends FilterBean> boolean exists(final AsyncHandler<Boolean, B> handler, final Class<T> clazz, final B bean);
public <T, B extends FilterBean> void exists(final AsyncHandler<Boolean, B> handler, final Class<T> clazz, final B bean);
/**
* 判断是否存在符合过滤条件的记录 <br>
@@ -1261,9 +1220,8 @@ public interface DataSource {
* @param clazz Entity类
* @param node 过滤条件
*
* @return 是否存在
*/
public <T> boolean exists(final AsyncHandler<Boolean, FilterNode> handler, final Class<T> clazz, final FilterNode node);
public <T> void exists(final AsyncHandler<Boolean, FilterNode> handler, final Class<T> clazz, final FilterNode node);
//-----------------------list set----------------------------
/**
@@ -1293,9 +1251,8 @@ public interface DataSource {
* @param column 过滤字段名
* @param key 过滤字段值
*
* @return 字段值的集合
*/
public <T, V extends Serializable> HashSet<V> queryColumnSet(final AsyncHandler<HashSet<V>, String> handler, final String selectedColumn, final Class<T> clazz, final String column, final Serializable key);
public <T, V extends Serializable> void queryColumnSet(final AsyncHandler<HashSet<V>, String> handler, final String selectedColumn, final Class<T> clazz, final String column, final Serializable key);
/**
* 查询符合过滤条件记录的某个字段Set集合 <br>
@@ -1323,9 +1280,8 @@ public interface DataSource {
* @param clazz Entity类
* @param bean 过滤条件
*
* @return 字段值的集合
*/
public <T, V extends Serializable, B extends FilterBean> HashSet<V> queryColumnSet(final AsyncHandler<HashSet<V>, B> handler, final String selectedColumn, final Class<T> clazz, final B bean);
public <T, V extends Serializable, B extends FilterBean> void queryColumnSet(final AsyncHandler<HashSet<V>, B> handler, final String selectedColumn, final Class<T> clazz, final B bean);
/**
* 查询符合过滤条件记录的某个字段Set集合 <br>
@@ -1352,9 +1308,8 @@ public interface DataSource {
* @param clazz Entity类
* @param node 过滤条件
*
* @return 字段值的集合
*/
public <T, V extends Serializable> HashSet<V> queryColumnSet(final AsyncHandler<HashSet<V>, FilterNode> handler, final String selectedColumn, final Class<T> clazz, final FilterNode node);
public <T, V extends Serializable> void queryColumnSet(final AsyncHandler<HashSet<V>, FilterNode> handler, final String selectedColumn, final Class<T> clazz, final FilterNode node);
/**
* 查询符合过滤条件记录的某个字段List集合 <br>
@@ -1383,9 +1338,8 @@ public interface DataSource {
* @param column 过滤字段名
* @param key 过滤字段值
*
* @return 字段值的集合
*/
public <T, V extends Serializable> List<V> queryColumnList(final AsyncHandler<List<V>, Serializable> handler, final String selectedColumn, final Class<T> clazz, final String column, final Serializable key);
public <T, V extends Serializable> void queryColumnList(final AsyncHandler<List<V>, Serializable> handler, final String selectedColumn, final Class<T> clazz, final String column, final Serializable key);
/**
* 查询符合过滤条件记录的某个字段List集合 <br>
@@ -1413,9 +1367,8 @@ public interface DataSource {
* @param clazz Entity类
* @param bean 过滤条件
*
* @return 字段值的集合
*/
public <T, V extends Serializable, B extends FilterBean> List<V> queryColumnList(final AsyncHandler<List<V>, B> handler, final String selectedColumn, final Class<T> clazz, final B bean);
public <T, V extends Serializable, B extends FilterBean> void queryColumnList(final AsyncHandler<List<V>, B> handler, final String selectedColumn, final Class<T> clazz, final B bean);
/**
* 查询符合过滤条件记录的某个字段List集合 <br>
@@ -1442,9 +1395,8 @@ public interface DataSource {
* @param clazz Entity类
* @param node 过滤条件
*
* @return 字段值的集合
*/
public <T, V extends Serializable> List<V> queryColumnList(final AsyncHandler<List<V>, FilterNode> handler, final String selectedColumn, final Class<T> clazz, final FilterNode node);
public <T, V extends Serializable> void queryColumnList(final AsyncHandler<List<V>, FilterNode> handler, final String selectedColumn, final Class<T> clazz, final FilterNode node);
/**
* 查询符合过滤条件记录的某个字段List集合 <br>
@@ -1474,9 +1426,8 @@ public interface DataSource {
* @param flipper 翻页对象
* @param bean 过滤条件
*
* @return 字段值的集合
*/
public <T, V extends Serializable, B extends FilterBean> List<V> queryColumnList(final AsyncHandler<List<V>, B> handler, final String selectedColumn, final Class<T> clazz, final Flipper flipper, final B bean);
public <T, V extends Serializable, B extends FilterBean> void queryColumnList(final AsyncHandler<List<V>, B> handler, final String selectedColumn, final Class<T> clazz, final Flipper flipper, final B bean);
/**
* 查询符合过滤条件记录的某个字段List集合 <br>
@@ -1505,9 +1456,8 @@ public interface DataSource {
* @param flipper 翻页对象
* @param node 过滤条件
*
* @return 字段值的集合
*/
public <T, V extends Serializable> List<V> queryColumnList(final AsyncHandler<List<V>, FilterNode> handler, final String selectedColumn, final Class<T> clazz, final Flipper flipper, final FilterNode node);
public <T, V extends Serializable> void queryColumnList(final AsyncHandler<List<V>, FilterNode> handler, final String selectedColumn, final Class<T> clazz, final Flipper flipper, final FilterNode node);
/**
* 查询符合过滤条件记录的某个字段Sheet集合 <br>
@@ -1537,9 +1487,8 @@ public interface DataSource {
* @param flipper 翻页对象
* @param bean 过滤条件
*
* @return 字段值的集合
*/
public <T, V extends Serializable, B extends FilterBean> Sheet<V> queryColumnSheet(final AsyncHandler<Sheet<V>, B> handler, final String selectedColumn, final Class<T> clazz, final Flipper flipper, final B bean);
public <T, V extends Serializable, B extends FilterBean> void queryColumnSheet(final AsyncHandler<Sheet<V>, B> handler, final String selectedColumn, final Class<T> clazz, final Flipper flipper, final B bean);
/**
* 查询符合过滤条件记录的某个字段Sheet集合 <br>
@@ -1568,9 +1517,8 @@ public interface DataSource {
* @param flipper 翻页对象
* @param node 过滤条件
*
* @return 字段值的集合
*/
public <T, V extends Serializable> Sheet<V> queryColumnSheet(final AsyncHandler<Sheet<V>, FilterNode> handler, final String selectedColumn, final Class<T> clazz, final Flipper flipper, final FilterNode node);
public <T, V extends Serializable> void queryColumnSheet(final AsyncHandler<Sheet<V>, FilterNode> handler, final String selectedColumn, final Class<T> clazz, final Flipper flipper, final FilterNode node);
/**
* 查询符合过滤条件记录的List集合 <br>
@@ -1595,9 +1543,8 @@ public interface DataSource {
* @param column 过滤字段名
* @param key 过滤字段值
*
* @return Entity的集合
*/
public <T> List<T> queryList(final AsyncHandler<List<T>, Serializable> handler, final Class<T> clazz, final String column, final Serializable key);
public <T> void queryList(final AsyncHandler<List<T>, Serializable> handler, final Class<T> clazz, final String column, final Serializable key);
/**
* 查询符合过滤条件记录的List集合 <br>
@@ -1621,9 +1568,8 @@ public interface DataSource {
* @param clazz Entity类
* @param bean 过滤条件
*
* @return Entity的集合
*/
public <T, B extends FilterBean> List<T> queryList(final AsyncHandler<List<T>, B> handler, final Class<T> clazz, final B bean);
public <T, B extends FilterBean> void queryList(final AsyncHandler<List<T>, B> handler, final Class<T> clazz, final B bean);
/**
* 查询符合过滤条件记录的List集合 <br>
@@ -1646,9 +1592,8 @@ public interface DataSource {
* @param clazz Entity类
* @param node 过滤条件
*
* @return Entity的集合
*/
public <T> List<T> queryList(final AsyncHandler<List<T>, FilterNode> handler, final Class<T> clazz, final FilterNode node);
public <T> void queryList(final AsyncHandler<List<T>, FilterNode> handler, final Class<T> clazz, final FilterNode node);
/**
* 查询符合过滤条件记录的List集合 <br>
@@ -1674,9 +1619,8 @@ public interface DataSource {
* @param selects 指定字段
* @param bean 过滤条件
*
* @return Entity的集合
*/
public <T, B extends FilterBean> List<T> queryList(final AsyncHandler<List<T>, B> handler, final Class<T> clazz, final SelectColumn selects, final B bean);
public <T, B extends FilterBean> void queryList(final AsyncHandler<List<T>, B> handler, final Class<T> clazz, final SelectColumn selects, final B bean);
/**
* 查询符合过滤条件记录的List集合 <br>
@@ -1701,9 +1645,8 @@ public interface DataSource {
* @param selects 指定字段
* @param node 过滤条件
*
* @return Entity的集合
*/
public <T> List<T> queryList(final AsyncHandler<List<T>, FilterNode> handler, final Class<T> clazz, final SelectColumn selects, final FilterNode node);
public <T> void queryList(final AsyncHandler<List<T>, FilterNode> handler, final Class<T> clazz, final SelectColumn selects, final FilterNode node);
/**
* 查询符合过滤条件记录的List集合 <br>
@@ -1730,9 +1673,8 @@ public interface DataSource {
* @param column 过滤字段名
* @param key 过滤字段值
*
* @return Entity的集合
*/
public <T> List<T> queryList(final AsyncHandler<List<T>, Serializable> handler, final Class<T> clazz, final Flipper flipper, final String column, final Serializable key);
public <T> void queryList(final AsyncHandler<List<T>, Serializable> handler, final Class<T> clazz, final Flipper flipper, final String column, final Serializable key);
/**
* 查询符合过滤条件记录的List集合 <br>
@@ -1758,9 +1700,8 @@ public interface DataSource {
* @param flipper 翻页对象
* @param bean 过滤条件
*
* @return Entity的集合
*/
public <T, B extends FilterBean> List<T> queryList(final AsyncHandler<List<T>, B> handler, final Class<T> clazz, final Flipper flipper, final B bean);
public <T, B extends FilterBean> void queryList(final AsyncHandler<List<T>, B> handler, final Class<T> clazz, final Flipper flipper, final B bean);
/**
* 查询符合过滤条件记录的List集合 <br>
@@ -1787,9 +1728,8 @@ public interface DataSource {
* @param flipper 翻页对象
* @param node 过滤条件
*
* @return Entity的集合
*/
public <T> List<T> queryList(final AsyncHandler<List<T>, FilterNode> handler, final Class<T> clazz, final Flipper flipper, final FilterNode node);
public <T> void queryList(final AsyncHandler<List<T>, FilterNode> handler, final Class<T> clazz, final Flipper flipper, final FilterNode node);
/**
* 查询符合过滤条件记录的List集合 <br>
@@ -1817,9 +1757,8 @@ public interface DataSource {
* @param flipper 翻页对象
* @param bean 过滤条件
*
* @return Entity的集合
*/
public <T, B extends FilterBean> List<T> queryList(final AsyncHandler<List<T>, B> handler, final Class<T> clazz, final SelectColumn selects, final Flipper flipper, final B bean);
public <T, B extends FilterBean> void queryList(final AsyncHandler<List<T>, B> handler, final Class<T> clazz, final SelectColumn selects, final Flipper flipper, final B bean);
/**
* 查询符合过滤条件记录的List集合 <br>
@@ -1846,9 +1785,8 @@ public interface DataSource {
* @param flipper 翻页对象
* @param node 过滤条件
*
* @return Entity的集合
*/
public <T> List<T> queryList(final AsyncHandler<List<T>, FilterNode> handler, final Class<T> clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node);
public <T> void queryList(final AsyncHandler<List<T>, FilterNode> handler, final Class<T> clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node);
//-----------------------sheet----------------------------
/**
@@ -1875,9 +1813,8 @@ public interface DataSource {
* @param flipper 翻页对象
* @param bean 过滤条件
*
* @return Entity的集合
*/
public <T, B extends FilterBean> Sheet<T> querySheet(final AsyncHandler<Sheet<T>, B> handler, final Class<T> clazz, final Flipper flipper, final B bean);
public <T, B extends FilterBean> void querySheet(final AsyncHandler<Sheet<T>, B> handler, final Class<T> clazz, final Flipper flipper, final B bean);
/**
* 查询符合过滤条件记录的Sheet集合 <br>
@@ -1902,9 +1839,8 @@ public interface DataSource {
* @param flipper 翻页对象
* @param node 过滤条件
*
* @return Entity的集合
*/
public <T> Sheet<T> querySheet(final AsyncHandler<Sheet<T>, FilterNode> handler, final Class<T> clazz, final Flipper flipper, final FilterNode node);
public <T> void querySheet(final AsyncHandler<Sheet<T>, FilterNode> handler, final Class<T> clazz, final Flipper flipper, final FilterNode node);
/**
* 查询符合过滤条件记录的Sheet集合 <br>
@@ -1932,9 +1868,8 @@ public interface DataSource {
* @param flipper 翻页对象
* @param bean 过滤条件
*
* @return Entity的集合
*/
public <T, B extends FilterBean> Sheet<T> querySheet(final AsyncHandler<Sheet<T>, B> handler, final Class<T> clazz, final SelectColumn selects, final Flipper flipper, final B bean);
public <T, B extends FilterBean> void querySheet(final AsyncHandler<Sheet<T>, B> handler, final Class<T> clazz, final SelectColumn selects, final Flipper flipper, final B bean);
/**
* 查询符合过滤条件记录的Sheet集合 <br>
@@ -1961,9 +1896,8 @@ public interface DataSource {
* @param flipper 翻页对象
* @param node 过滤条件
*
* @return Entity的集合
*/
public <T> Sheet<T> querySheet(final AsyncHandler<Sheet<T>, FilterNode> handler, final Class<T> clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node);
public <T> void querySheet(final AsyncHandler<Sheet<T>, FilterNode> handler, final Class<T> clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node);
//-----------------------direct----------------------------
/**

5
test/org/redkale/test/rest/HelloService.java
View File

@@ -75,7 +75,7 @@ public class HelloService implements Service {
public List<HelloEntity> queryHello(HelloBean bean, @RestParam(name = "map") Map<String, String> map) { //通过 /pipes/hello/list?bean={...} 查询List列表
System.out.println("map参数: " + map);
if (source != null) return source.queryList(HelloEntity.class, bean);
return null;
return new ArrayList<>();
}
//查询单个
@@ -86,11 +86,10 @@ public class HelloService implements Service {
//异步查询单个
@RestMapping(name = "asyncfind")
public HelloEntity findHello(AsyncHandler handler, @RestParam(name = "#") int id) { //通过 /pipes/hello/find/1234、/pipes/hello/jsfind/1234 查询对象
public void findHello(AsyncHandler handler, @RestParam(name = "#") int id) { //通过 /pipes/hello/find/1234、/pipes/hello/jsfind/1234 查询对象
if (source != null) source.find(handler, HelloEntity.class, id);
HelloEntity rs = new HelloEntity();
rs.setHelloname("Hello名称");
if (handler != null) handler.completed(rs, null);
return null;
}
}

6
test/org/redkale/test/rest/_DynHelloRestServlet1.java
View File

@@ -40,10 +40,10 @@ public class _DynHelloRestServlet1 extends SimpleRestServlet {
System.out.println(Utility.postHttpContent(url, headers, null));
url = "http://127.0.0.1:" + port + "/pipes/hello/asyncfind/1234";
System.out.println(Utility.postHttpContent(url, headers, null));
System.out.println("异步查找: " + Utility.postHttpContent(url, headers, null));
url = "http://127.0.0.1:" + port + "/pipes/hello/listmap?map={'a':5}";
System.out.println(Utility.postHttpContent(url, headers, null));
System.out.println("listmap: " + Utility.postHttpContent(url, headers, null));
}