diff --git a/src/org/redkale/service/DataSourceService.java b/src/org/redkale/service/DataSourceService.java index dbd398887..9a63671e5 100644 --- a/src/org/redkale/service/DataSourceService.java +++ b/src/org/redkale/service/DataSourceService.java @@ -19,21 +19,11 @@ import org.redkale.util.*; * @author zhangjx */ @AutoLoad(false) -public class DataSourceService implements DataSource, Service, AutoCloseable { +public class DataSourceService implements DataSource, Service, AutoCloseable { @Resource(name = "$") private DataSource source; - @Override - public DataConnection createReadConnection() { - return source.createReadConnection(); - } - - @Override - public DataConnection createWriteConnection() { - return source.createWriteConnection(); - } - @Override public void insert(@DynCall(DataCallArrayAttribute.class) T... values) { source.insert(values); @@ -45,11 +35,6 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { if (handler != null) handler.completed(null, values); } - @Override - public void insert(DataConnection conn, @DynCall(DataCallArrayAttribute.class) T... values) { - source.insert(conn, values); - } - @Override public void delete(T... values) { source.delete(values); @@ -61,11 +46,6 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { if (handler != null) handler.completed(null, values); } - @Override - public void delete(DataConnection conn, T... values) { - source.delete(conn, values); - } - @Override public void delete(final Class clazz, final Serializable... ids) { source.delete(clazz, ids); @@ -77,11 +57,6 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { if (handler != null) handler.completed(null, ids); } - @Override - public void delete(DataConnection conn, Class clazz, final Serializable... ids) { - source.delete(conn, clazz, ids); - } - @Override public void delete(final Class clazz, FilterNode node) { source.delete(clazz, node); @@ -93,11 +68,6 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { if (handler != null) handler.completed(null, node); } - @Override - public void delete(DataConnection conn, Class clazz, FilterNode node) { - source.delete(conn, clazz, node); - } - @Override public void update(T... values) { source.update(values); @@ -109,11 +79,6 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { if (handler != null) handler.completed(null, values); } - @Override - public void update(DataConnection conn, T... values) { - source.update(conn, values); - } - @Override public void updateColumn(final Class clazz, final Serializable id, final String column, final Serializable value) { source.updateColumn(clazz, id, column, value); @@ -125,11 +90,6 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { if (handler != null) handler.completed(null, id); } - @Override - public void updateColumn(DataConnection conn, Class clazz, final Serializable id, final String column, final Serializable value) { - source.updateColumn(conn, clazz, id, column, value); - } - @Override public void updateColumnIncrement(final Class clazz, final Serializable id, final String column, long incvalue) { source.updateColumnIncrement(clazz, id, column, incvalue); @@ -141,11 +101,6 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { if (handler != null) handler.completed(null, id); } - @Override - public void updateColumnIncrement(DataConnection conn, Class clazz, final Serializable id, final String column, long incvalue) { - source.updateColumnIncrement(conn, clazz, id, column, incvalue); - } - @Override public void updateColumnAnd(final Class clazz, final Serializable id, final String column, long incvalue) { source.updateColumnAnd(clazz, id, column, incvalue); @@ -157,11 +112,6 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { if (handler != null) handler.completed(null, id); } - @Override - public void updateColumnAnd(DataConnection conn, Class clazz, final Serializable id, final String column, long incvalue) { - source.updateColumnAnd(conn, clazz, id, column, incvalue); - } - @Override public void updateColumnOr(final Class clazz, final Serializable id, final String column, long incvalue) { source.updateColumnOr(clazz, id, column, incvalue); @@ -173,11 +123,6 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { if (handler != null) handler.completed(null, id); } - @Override - public void updateColumnOr(DataConnection conn, Class clazz, final Serializable id, final String column, long incvalue) { - source.updateColumnOr(conn, clazz, id, column, incvalue); - } - @Override public void updateColumns(T value, final String... columns) { source.updateColumns(value, columns); @@ -189,11 +134,6 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { if (handler != null) handler.completed(null, value); } - @Override - public void updateColumns(DataConnection conn, T value, final String... columns) { - source.updateColumns(conn, value, columns); - } - @Override public Number getNumberResult(final Class entityClass, FilterFunc func, final String column) { return source.getNumberResult(entityClass, func, column); diff --git a/src/org/redkale/source/DataConnection.java b/src/org/redkale/source/DataConnection.java deleted file mode 100644 index 912fd4d0e..000000000 --- a/src/org/redkale/source/DataConnection.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ -package org.redkale.source; - -import java.sql.*; - -/** - * - * @see http://www.redkale.org - * @author zhangjx - */ -public class DataConnection { - - private final Connection conn; - - protected DataConnection(Connection connection) { - this.conn = connection; - } - - protected Connection getConnection() { - return this.conn; - } - - public boolean close() { - try { - if (conn == null || conn.isClosed()) return true; - conn.close(); - return true; - } catch (Exception e) { - //do nothing - return false; - } - } - - public boolean commit() { - try { - conn.commit(); - return true; - } catch (Exception e) { - return false; - } - } - - public boolean rollback() { - try { - conn.rollback(); - return true; - } catch (Exception e) { - //do nothing - return false; - } - } -} diff --git a/src/org/redkale/source/DataDefaultSource.java b/src/org/redkale/source/DataDefaultSource.java index 79f80b7f8..4808457bb 100644 --- a/src/org/redkale/source/DataDefaultSource.java +++ b/src/org/redkale/source/DataDefaultSource.java @@ -226,16 +226,6 @@ public final class DataDefaultSource implements DataSource, Function void execute(final DataConnection conn, String... sqls) { - execute((Connection) conn.getConnection(), sqls); - } - private void execute(final Connection conn, String... sqls) { if (sqls.length == 0) return; try { @@ -340,24 +326,9 @@ public final class DataDefaultSource implements DataSource, Function - * @param conn - * @param values - */ - @Override - public void insert(final DataConnection conn, T... values) { - if (values.length == 0) return; - final EntityInfo info = loadEntityInfo((Class) values[0].getClass()); - insert((Connection) conn.getConnection(), info, values); - } - private void insert(final Connection conn, final EntityInfo info, T... values) { if (values.length == 0) return; try { - final EntityCache cache = info.getCache(); if (!info.isVirtualEntity()) { final String sql = info.insertSQL; final PreparedStatement prestmt = info.autoGenerated @@ -481,6 +452,7 @@ public final class DataDefaultSource implements DataSource, Function cache = info.getCache(); if (cache != null) { for (final T value : values) { cache.insert(value); @@ -531,13 +503,6 @@ public final class DataDefaultSource implements DataSource, Function void delete(final DataConnection conn, T... values) { - if (values.length == 0) return; - final EntityInfo info = loadEntityInfo((Class) values[0].getClass()); - delete((Connection) conn.getConnection(), info, values); - } - private void delete(final Connection conn, final EntityInfo info, T... values) { if (values.length == 0) return; final Attribute primary = info.getPrimary(); @@ -570,11 +535,6 @@ public final class DataDefaultSource implements DataSource, Function void delete(final DataConnection conn, Class clazz, Serializable... ids) { - delete((Connection) conn.getConnection(), loadEntityInfo(clazz), ids); - } - private void delete(final Connection conn, final EntityInfo info, Serializable... keys) { if (keys.length == 0) return; try { @@ -619,11 +579,6 @@ public final class DataDefaultSource implements DataSource, Function void delete(final DataConnection conn, Class clazz, FilterNode node) { - delete((Connection) conn.getConnection(), loadEntityInfo(clazz), node); - } - private void delete(final Connection conn, final EntityInfo info, final FilterNode node) { try { if (!info.isVirtualEntity()) { @@ -686,13 +641,6 @@ public final class DataDefaultSource implements DataSource, Function void update(final DataConnection conn, T... values) { - if (values.length == 0) return; - final EntityInfo info = loadEntityInfo((Class) values[0].getClass()); - update((Connection) conn.getConnection(), info, values); - } - private void update(final Connection conn, final EntityInfo info, T... values) { try { Class clazz = info.getType(); @@ -784,11 +732,6 @@ public final class DataDefaultSource implements DataSource, Function void updateColumn(DataConnection conn, Class clazz, Serializable id, String column, Serializable value) { - updateColumn((Connection) conn.getConnection(), loadEntityInfo(clazz), id, column, value); - } - private void updateColumn(Connection conn, final EntityInfo info, Serializable id, String column, Serializable value) { try { if (!info.isVirtualEntity()) { @@ -842,11 +785,6 @@ public final class DataDefaultSource implements DataSource, Function void updateColumnIncrement(DataConnection conn, Class clazz, Serializable id, String column, long incvalue) { - updateColumnIncrement((Connection) conn.getConnection(), loadEntityInfo(clazz), id, column, incvalue); - } - private void updateColumnIncrement(Connection conn, final EntityInfo info, Serializable id, String column, long incvalue) { try { if (!info.isVirtualEntity()) { @@ -902,11 +840,6 @@ public final class DataDefaultSource implements DataSource, Function void updateColumnAnd(DataConnection conn, Class clazz, Serializable id, String column, long andvalue) { - updateColumnAnd((Connection) conn.getConnection(), loadEntityInfo(clazz), id, column, andvalue); - } - private void updateColumnAnd(Connection conn, final EntityInfo info, Serializable id, String column, long andvalue) { try { if (!info.isVirtualEntity()) { @@ -962,11 +895,6 @@ public final class DataDefaultSource implements DataSource, Function void updateColumnOr(DataConnection conn, Class clazz, Serializable id, String column, long orvalue) { - updateColumnOr((Connection) conn.getConnection(), loadEntityInfo(clazz), id, column, orvalue); - } - private void updateColumnOr(Connection conn, final EntityInfo info, Serializable id, String column, long orvalue) { try { if (!info.isVirtualEntity()) { @@ -1020,11 +948,6 @@ public final class DataDefaultSource implements DataSource, Function void updateColumns(final DataConnection conn, final T value, final String... columns) { - updateColumns((Connection) conn.getConnection(), loadEntityInfo((Class) value.getClass()), value, columns); - } - private void updateColumns(final Connection conn, final EntityInfo info, final T value, final String... columns) { if (value == null || columns.length < 1) return; try { diff --git a/src/org/redkale/source/DataSource.java b/src/org/redkale/source/DataSource.java index 067cc6fa2..41a794b57 100644 --- a/src/org/redkale/source/DataSource.java +++ b/src/org/redkale/source/DataSource.java @@ -18,20 +18,6 @@ import org.redkale.util.*; @SuppressWarnings("unchecked") public interface DataSource { - /** - * 创建读连接 - * - * @return - */ - public DataConnection createReadConnection(); - - /** - * 创建写连接 - * - * @return - */ - public DataConnection createWriteConnection(); - //----------------------insert----------------------------- /** * 新增对象, 必须是Entity对象 @@ -41,8 +27,6 @@ public interface DataSource { */ public void insert(final T... values); - public void insert(final DataConnection conn, final T... values); - //----------------------异步版--------------------------------- public void insert(final CompletionHandler handler, final T... values); @@ -55,16 +39,10 @@ public interface DataSource { */ public void delete(final T... values); - public void delete(final DataConnection conn, final T... values); - public void delete(final Class clazz, final Serializable... ids); - public void delete(final DataConnection conn, final Class clazz, final Serializable... ids); - public void delete(final Class clazz, final FilterNode node); - public void delete(final DataConnection conn, final Class clazz, final FilterNode node); - //----------------------异步版--------------------------------- public void delete(final CompletionHandler handler, final T... values); @@ -81,28 +59,16 @@ public interface DataSource { */ public void update(final T... values); - public void update(final DataConnection conn, final T... values); - public void updateColumn(final Class clazz, final Serializable id, final String column, final Serializable value); - public void updateColumn(final DataConnection conn, final Class clazz, final Serializable id, final String column, final Serializable value); - public void updateColumnIncrement(final Class clazz, final Serializable id, final String column, long incvalue); - public void updateColumnIncrement(final DataConnection conn, final Class clazz, final Serializable id, final String column, long incvalue); - public void updateColumnAnd(final Class clazz, final Serializable id, final String column, long incvalue); - public void updateColumnAnd(final DataConnection conn, final Class clazz, final Serializable id, final String column, long incvalue); - public void updateColumnOr(final Class clazz, final Serializable id, final String column, long incvalue); - public void updateColumnOr(final DataConnection conn, final Class clazz, final Serializable id, final String column, long incvalue); - public void updateColumns(final T value, final String... columns); - public void updateColumns(final DataConnection conn, final T value, final String... columns); - //----------------------异步版--------------------------------- public void update(final CompletionHandler handler, final T... values);