From dd3816de1da20cdac351f9c4e0bf43d9b1cda368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=9C=B0=E5=B9=B3=E7=BA=BF?= <22250530@qq.com>
Date: Fri, 12 Jun 2015 09:20:30 +0800
Subject: [PATCH]

---
 .../wentch/redkale/source/DataJDBCSource.java  | 18 +++++++++---------
 src/com/wentch/redkale/source/DataSource.java  |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/com/wentch/redkale/source/DataJDBCSource.java b/src/com/wentch/redkale/source/DataJDBCSource.java
index 0ad602a9d..b7fd7b28e 100644
--- a/src/com/wentch/redkale/source/DataJDBCSource.java
+++ b/src/com/wentch/redkale/source/DataJDBCSource.java
@@ -926,28 +926,28 @@ public final class DataJDBCSource implements DataSource {
 
     //-----------------------getMapResult-----------------------------
     @Override
-    public Map<Serializable, Number> getMapResult(Class entityClass, final String keyColumn, Reckon reckon, final String reckonColumn) {
+    public <K extends Serializable, V extends Number> Map<K, V> getMapResult(Class entityClass, final String keyColumn, Reckon reckon, final String reckonColumn) {
         return getMapResult(entityClass, keyColumn, reckon, reckonColumn, null, null);
     }
 
     @Override
-    public Map<Serializable, Number> getMapResult(Class entityClass, final String keyColumn, Reckon reckon, final String reckonColumn, FilterBean bean) {
+    public <K extends Serializable, V extends Number> Map<K, V> getMapResult(Class entityClass, final String keyColumn, Reckon reckon, final String reckonColumn, FilterBean bean) {
         return getMapResult(entityClass, keyColumn, reckon, reckonColumn, null, bean);
     }
 
     @Override
-    public Map<Serializable, Number> getMapResult(Class entityClass, final String keyColumn, Reckon reckon, final String reckonColumn, FilterNode node) {
+    public <K extends Serializable, V extends Number> Map<K, V> getMapResult(Class entityClass, final String keyColumn, Reckon reckon, final String reckonColumn, FilterNode node) {
         return getMapResult(entityClass, keyColumn, reckon, reckonColumn, node, null);
     }
 
-    private <T> Map<Serializable, Number> getMapResult(final Class entityClass, final String keyColumn, final Reckon reckon, final String reckonColumn, FilterNode node, FilterBean bean) {
+    private <K extends Serializable, V extends Number> Map<K, V> getMapResult(final Class entityClass, final String keyColumn, final Reckon reckon, final String reckonColumn, FilterNode node, FilterBean bean) {
         final Connection conn = createReadSQLConnection();
         try {
-            final EntityInfo<T> info = loadEntityInfo(entityClass);
+            final EntityInfo info = loadEntityInfo(entityClass);
             if (node == null && bean != null) node = loadFilterBeanNode(bean.getClass());
-            final EntityCache<T> cache = info.getCache();
+            final EntityCache cache = info.getCache();
             if (cache != null && cache.isFullLoaded()) {
-                Predicate<T> filter = node == null ? null : node.createFilterPredicate(info, bean);
+                Predicate filter = node == null ? null : node.createFilterPredicate(info, bean);
                 if (node == null || node.isJoinAllCached()) {
                     return cache.getMapResult(info.getAttribute(keyColumn), reckon, reckonColumn == null ? null : info.getAttribute(reckonColumn), filter);
                 }
@@ -957,10 +957,10 @@ public final class DataJDBCSource implements DataSource {
                     + " FROM " + info.getTable() + " a" + (node == null ? "" : node.createFilterSQLExpress(info, bean)) + " GROUP BY a." + sqlkey;
             if (debug.get() && info.isLoggable(Level.FINEST)) logger.finest(entityClass.getSimpleName() + " single sql=" + sql);
             final PreparedStatement prestmt = conn.prepareStatement(sql);
-            Map<Serializable, Number> rs = new LinkedHashMap<>();
+            Map<K, V> rs = new LinkedHashMap<>();
             ResultSet set = prestmt.executeQuery();
             while (set.next()) {
-                rs.put((Serializable) set.getObject(1), (Number) set.getObject(2));
+                rs.put((K) set.getObject(1), (V) set.getObject(2));
             }
             set.close();
             prestmt.close();
diff --git a/src/com/wentch/redkale/source/DataSource.java b/src/com/wentch/redkale/source/DataSource.java
index 5bf50bc60..3c2a2f882 100644
--- a/src/com/wentch/redkale/source/DataSource.java
+++ b/src/com/wentch/redkale/source/DataSource.java
@@ -108,11 +108,11 @@ public interface DataSource {
 
     public Number getNumberResult(final Class entityClass, final Reckon reckon, final String column, FilterNode node);
 
-    public Map<Serializable, Number> getMapResult(Class entityClass, final String keyColumn, Reckon reckon, final String reckonColumn);
+    public <K extends Serializable, V extends Number> Map<K, V> getMapResult(Class entityClass, final String keyColumn, Reckon reckon, final String reckonColumn);
 
-    public Map<Serializable, Number> getMapResult(Class entityClass, final String keyColumn, Reckon reckon, final String reckonColumn, FilterBean bean);
+    public <K extends Serializable, V extends Number> Map<K, V> getMapResult(Class entityClass, final String keyColumn, Reckon reckon, final String reckonColumn, FilterBean bean);
 
-    public Map<Serializable, Number> getMapResult(Class entityClass, final String keyColumn, Reckon reckon, final String reckonColumn, FilterNode node);
+    public <K extends Serializable, V extends Number> Map<K, V> getMapResult(Class entityClass, final String keyColumn, Reckon reckon, final String reckonColumn, FilterNode node);
 
     //-----------------------find----------------------------
     /**