diff --git a/beehive-jdbc-mapper/src/main/java/com/moparisthebest/jdbc/CachingQueryMapper.java b/beehive-jdbc-mapper/src/main/java/com/moparisthebest/jdbc/CachingQueryMapper.java index 6aa893e..ffb5c52 100644 --- a/beehive-jdbc-mapper/src/main/java/com/moparisthebest/jdbc/CachingQueryMapper.java +++ b/beehive-jdbc-mapper/src/main/java/com/moparisthebest/jdbc/CachingQueryMapper.java @@ -157,11 +157,6 @@ public class CachingQueryMapper extends QueryMapper { return super.toCollection(getPreparedStatement(sql), list, componentType, bindObjects); } - @Override - public , K, E> T toMap(String sql, final Class returnType, Class mapKeyType, Class componentType, final Object... bindObjects) throws SQLException { - return super.toMap(getPreparedStatement(sql), returnType, mapKeyType, componentType, bindObjects); - } - @Override public , K, E> T toMap(String sql, T map, Class mapKeyType, Class componentType, final Object... bindObjects) throws SQLException { return super.toMap(getPreparedStatement(sql), map, mapKeyType, componentType, bindObjects); diff --git a/beehive-jdbc-mapper/src/main/java/com/moparisthebest/jdbc/ListQueryMapper.java b/beehive-jdbc-mapper/src/main/java/com/moparisthebest/jdbc/ListQueryMapper.java index cab30bb..af1ca34 100644 --- a/beehive-jdbc-mapper/src/main/java/com/moparisthebest/jdbc/ListQueryMapper.java +++ b/beehive-jdbc-mapper/src/main/java/com/moparisthebest/jdbc/ListQueryMapper.java @@ -280,16 +280,6 @@ public class ListQueryMapper extends QueryMapper { return delegate.toCollection(prepareSql(sql, bindObjects), list, componentType, bindObjects); } - @Override - public , K, E> T toMap(PreparedStatement ps, final Class returnType, Class mapKeyType, Class componentType, final Object... bindObjects) throws SQLException { - return delegate.toMap(ps, returnType, mapKeyType, componentType, bindObjects); - } - - @Override - public , K, E> T toMap(String sql, final Class returnType, Class mapKeyType, Class componentType, final Object... bindObjects) throws SQLException { - return delegate.toMap(prepareSql(sql, bindObjects), returnType, mapKeyType, componentType, bindObjects); - } - @Override public , K, E> T toMap(PreparedStatement ps, T map, Class mapKeyType, Class componentType, final Object... bindObjects) throws SQLException { return delegate.toMap(ps, map, mapKeyType, componentType, bindObjects); diff --git a/beehive-jdbc-mapper/src/main/java/com/moparisthebest/jdbc/NullQueryMapper.java b/beehive-jdbc-mapper/src/main/java/com/moparisthebest/jdbc/NullQueryMapper.java index 786fd5f..a910fb0 100644 --- a/beehive-jdbc-mapper/src/main/java/com/moparisthebest/jdbc/NullQueryMapper.java +++ b/beehive-jdbc-mapper/src/main/java/com/moparisthebest/jdbc/NullQueryMapper.java @@ -337,26 +337,6 @@ public class NullQueryMapper extends QueryMapper { return null; } - @Override - public , K, E> T toMap(PreparedStatement query, final Class returnType, Class mapKeyType, Class componentType, final Object... bindObjects) { - try { - return delegate.toMap(query, returnType, mapKeyType, componentType, bindObjects); - } catch (Throwable e) { - if (verbose) e.printStackTrace(); - } - return null; - } - - @Override - public , K, E> T toMap(String query, final Class returnType, Class mapKeyType, Class componentType, final Object... bindObjects) { - try { - return delegate.toMap(query, returnType, mapKeyType, componentType, bindObjects); - } catch (Throwable e) { - if (verbose) e.printStackTrace(); - } - return null; - } - @Override public , K, E> T toMap(PreparedStatement query, T map, Class mapKeyType, Class componentType, final Object... bindObjects) { try { diff --git a/beehive-jdbc-mapper/src/main/java/com/moparisthebest/jdbc/QueryMapper.java b/beehive-jdbc-mapper/src/main/java/com/moparisthebest/jdbc/QueryMapper.java index 0fdfbc6..19f330f 100644 --- a/beehive-jdbc-mapper/src/main/java/com/moparisthebest/jdbc/QueryMapper.java +++ b/beehive-jdbc-mapper/src/main/java/com/moparisthebest/jdbc/QueryMapper.java @@ -420,20 +420,6 @@ public class QueryMapper implements Closeable { } } - public , K, E> T toMap(PreparedStatement ps, final Class returnType, Class mapKeyType, Class componentType, final Object... bindObjects) throws SQLException { - return cm.toMap(bindExecute(ps, bindObjects), returnType, mapKeyType, componentType); - } - - public , K, E> T toMap(String sql, final Class returnType, Class mapKeyType, Class componentType, final Object... bindObjects) throws SQLException { - PreparedStatement ps = null; - try { - ps = conn.prepareStatement(sql); - return this.toMap(ps, returnType, mapKeyType, componentType, bindObjects); - } finally { - tryClose(ps); - } - } - public , K, E> T toMap(PreparedStatement ps, T map, Class mapKeyType, Class componentType, final Object... bindObjects) throws SQLException { return cm.toMap(bindExecute(ps, bindObjects), map, mapKeyType, componentType); } diff --git a/beehive-jdbc-mapper/src/main/java/com/moparisthebest/jdbc/ResultSetMapper.java b/beehive-jdbc-mapper/src/main/java/com/moparisthebest/jdbc/ResultSetMapper.java index 2c55022..45c3ec1 100644 --- a/beehive-jdbc-mapper/src/main/java/com/moparisthebest/jdbc/ResultSetMapper.java +++ b/beehive-jdbc-mapper/src/main/java/com/moparisthebest/jdbc/ResultSetMapper.java @@ -447,10 +447,6 @@ public class ResultSetMapper { return privToCollection(rs, list, componentType, arrayMaxLength, cal, null); } - public , K, E> T toMap(ResultSet rs, final Class returnType, Class mapKeyType, Class componentType, int arrayMaxLength, Calendar cal) { - return privToMap(rs, returnType, mapKeyType, componentType, arrayMaxLength, cal, null); - } - public , K, E> T toMap(ResultSet rs, T map, Class mapKeyType, Class componentType, int arrayMaxLength, Calendar cal) { return privToMap(rs, map, mapKeyType, componentType, arrayMaxLength, cal, null); } @@ -645,18 +641,6 @@ public class ResultSetMapper { return this.toCollection(rs, list, componentType, arrayMaxLength, cal); } - public , K, E> T toMap(ResultSet rs, final Class returnType, Class mapKeyType, Class componentType) { - return this.toMap(rs, returnType, mapKeyType, componentType, arrayMaxLength, cal); - } - - public , K, E> T toMap(ResultSet rs, final Class returnType, Class mapKeyType, Class componentType, int arrayMaxLength) { - return this.toMap(rs, returnType, mapKeyType, componentType, arrayMaxLength, cal); - } - - public , K, E> T toMap(ResultSet rs, final Class returnType, Class mapKeyType, Class componentType, Calendar cal) { - return this.toMap(rs, returnType, mapKeyType, componentType, arrayMaxLength, cal); - } - public , K, E> T toMap(ResultSet rs, T map, Class mapKeyType, Class componentType) { return this.toMap(rs, map, mapKeyType, componentType, arrayMaxLength, cal); }