From bad0f778690e90449f91eedae4836b3a66001276 Mon Sep 17 00:00:00 2001 From: wentch <22250530@qq.com> Date: Thu, 21 Jan 2016 14:11:38 +0800 Subject: [PATCH] --- src/org/redkale/service/DataSourceService.java | 8 ++++---- src/org/redkale/source/DataDefaultSource.java | 6 +++--- src/org/redkale/source/DataSource.java | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/org/redkale/service/DataSourceService.java b/src/org/redkale/service/DataSourceService.java index e1bde73e3..ef3fcfaf9 100644 --- a/src/org/redkale/service/DataSourceService.java +++ b/src/org/redkale/service/DataSourceService.java @@ -226,13 +226,13 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public T findByColumn(final Class clazz, final String column, final Serializable key) { - return source.findByColumn(clazz, column, key); + public T find(final Class clazz, final String column, final Serializable key) { + return source.find(clazz, column, key); } @Override - public void findByColumn(final CompletionHandler handler, final Class clazz, final String column, @DynAttachment final Serializable key) { - T rs = source.findByColumn(clazz, column, key); + public void find(final CompletionHandler handler, final Class clazz, final String column, @DynAttachment final Serializable key) { + T rs = source.find(clazz, column, key); if (handler != null) handler.completed(rs, key); } diff --git a/src/org/redkale/source/DataDefaultSource.java b/src/org/redkale/source/DataDefaultSource.java index 6db9a9d9b..9aa196e97 100644 --- a/src/org/redkale/source/DataDefaultSource.java +++ b/src/org/redkale/source/DataDefaultSource.java @@ -1191,13 +1191,13 @@ public final class DataDefaultSource implements DataSource, Function T findByColumn(final Class clazz, final String column, final Serializable key) { + public T find(final Class clazz, final String column, final Serializable key) { return find(clazz, null, FilterNode.create(column, key)); } @Override - public void findByColumn(final CompletionHandler handler, final Class clazz, final String column, final Serializable key) { - T rs = findByColumn(clazz, column, key); + public void find(final CompletionHandler handler, final Class clazz, final String column, final Serializable key) { + T rs = find(clazz, column, key); if (handler != null) handler.completed(rs, key); } diff --git a/src/org/redkale/source/DataSource.java b/src/org/redkale/source/DataSource.java index 20b0d06ef..6dc600c90 100644 --- a/src/org/redkale/source/DataSource.java +++ b/src/org/redkale/source/DataSource.java @@ -133,7 +133,7 @@ public interface DataSource { public T find(final Class clazz, final SelectColumn selects, final Serializable pk); - public T findByColumn(final Class clazz, final String column, final Serializable key); + public T find(final Class clazz, final String column, final Serializable key); public T find(final Class clazz, final FilterBean bean); @@ -154,7 +154,7 @@ public interface DataSource { public void find(final CompletionHandler handler, final Class clazz, final SelectColumn selects, final Serializable pk); - public void findByColumn(final CompletionHandler handler, final Class clazz, final String column, final Serializable key); + public void find(final CompletionHandler handler, final Class clazz, final String column, final Serializable key); public void find(final CompletionHandler handler, final Class clazz, final FilterBean bean);