[v0.2.7] [U] 进一步简化操作使用逻辑

easysql-impl/src/main/java/cc/carm/lib/easysql/action/AbstractSQLAction.java

@@ -1,6 +1,8 @@
 package cc.carm.lib.easysql.action;
 
 import cc.carm.lib.easysql.api.SQLAction;
+import cc.carm.lib.easysql.api.function.SQLExceptionHandler;
+import cc.carm.lib.easysql.api.function.SQLHandler;
 import cc.carm.lib.easysql.manager.SQLManagerImpl;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -8,88 +10,78 @@ import org.jetbrains.annotations.Nullable;
 import java.sql.SQLException;
 import java.util.UUID;
 import java.util.function.BiConsumer;
-import java.util.function.Consumer;
 
 public abstract class AbstractSQLAction<T> implements SQLAction<T> {
 
-    private final @NotNull SQLManagerImpl sqlManager;
+	private final @NotNull SQLManagerImpl sqlManager;
 
-    private final @NotNull UUID uuid;
-    private final long createTime;
+	private final @NotNull UUID uuid;
+	private final long createTime;
 
-    protected @NotNull String sqlContent;
+	protected @NotNull String sqlContent;
 
-    protected @Nullable BiConsumer<SQLException, SQLAction<T>> exceptionHandler = null;
+	protected @Nullable BiConsumer<SQLException, SQLAction<T>> exceptionHandler = null;
 
-    public AbstractSQLAction(@NotNull SQLManagerImpl manager, @NotNull String sql) {
-        this(manager, sql, System.currentTimeMillis());
-    }
+	public AbstractSQLAction(@NotNull SQLManagerImpl manager, @NotNull String sql) {
+		this(manager, sql, System.currentTimeMillis());
+	}
 
-    public AbstractSQLAction(@NotNull SQLManagerImpl manager, @NotNull String sql, @NotNull UUID uuid) {
-        this(manager, sql, uuid, System.currentTimeMillis());
-    }
+	public AbstractSQLAction(@NotNull SQLManagerImpl manager, @NotNull String sql, @NotNull UUID uuid) {
+		this(manager, sql, uuid, System.currentTimeMillis());
+	}
 
-    public AbstractSQLAction(@NotNull SQLManagerImpl manager, @NotNull String sql, long createTime) {
-        this(manager, sql, UUID.randomUUID(), createTime);
-    }
+	public AbstractSQLAction(@NotNull SQLManagerImpl manager, @NotNull String sql, long createTime) {
+		this(manager, sql, UUID.randomUUID(), createTime);
+	}
 
-    public AbstractSQLAction(@NotNull SQLManagerImpl manager, @NotNull String sql,
-                             @NotNull UUID uuid, long createTime) {
-        this.sqlManager = manager;
-        this.sqlContent = sql;
-        this.uuid = uuid;
-        this.createTime = createTime;
-    }
+	public AbstractSQLAction(@NotNull SQLManagerImpl manager, @NotNull String sql,
+							 @NotNull UUID uuid, long createTime) {
+		this.sqlManager = manager;
+		this.sqlContent = sql;
+		this.uuid = uuid;
+		this.createTime = createTime;
+	}
 
 
-    @Override
-    public @NotNull UUID getActionUUID() {
-        return this.uuid;
-    }
+	@Override
+	public @NotNull UUID getActionUUID() {
+		return this.uuid;
+	}
 
-    @Override
-    public @NotNull String getShortID() {
-        return getActionUUID().toString().substring(0, 8);
-    }
+	@Override
+	public @NotNull String getShortID() {
+		return getActionUUID().toString().substring(0, 8);
+	}
 
-    @Override
-    public long getCreateTime() {
-        return this.createTime;
-    }
+	@Override
+	public long getCreateTime() {
+		return this.createTime;
+	}
 
-    @Override
-    public @NotNull String getSQLContent() {
-        return this.sqlContent.trim();
-    }
+	@Override
+	public @NotNull String getSQLContent() {
+		return this.sqlContent.trim();
+	}
 
-    @Override
-    public @NotNull SQLManagerImpl getManager() {
-        return this.sqlManager;
-    }
+	@Override
+	public @NotNull SQLManagerImpl getManager() {
+		return this.sqlManager;
+	}
 
-    protected void outputDebugMessage() {
-        getManager().debug("#" + getShortID() + " ->" + getSQLContent());
-    }
-
-    public void handleException(SQLException exception) {
-        if (this.exceptionHandler == null) {
-            defaultExceptionHandler().accept(exception, this);
-        } else {
-            this.exceptionHandler.accept(exception, this);
-        }
-    }
-
-    @Override
-    public void executeAsync(Consumer<T> success, BiConsumer<SQLException, SQLAction<T>> failure) {
-        getManager().getExecutorPool().submit(() -> {
-            try {
-                T returnedValue = execute();
-                if (success != null) success.accept(returnedValue);
-            } catch (SQLException e) {
-                (failure == null ? defaultExceptionHandler() : failure).accept(e, this);
-            }
-        });
-    }
+	protected void outputDebugMessage() {
+		getManager().debug("#" + getShortID() + " ->" + getSQLContent());
+	}
 
+	@Override
+	public void executeAsync(SQLHandler<T> success, SQLExceptionHandler failure) {
+		getManager().getExecutorPool().submit(() -> {
+			try {
+				T returnedValue = execute();
+				if (success != null) success.accept(returnedValue);
+			} catch (SQLException e) {
+				handleException(failure, e);
+			}
+		});
+	}
 
 }

easysql-impl/src/main/java/cc/carm/lib/easysql/action/PreparedSQLBatchUpdateActionImpl.java

@@ -14,7 +14,9 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
-public class PreparedSQLBatchUpdateActionImpl extends AbstractSQLAction<List<Integer>> implements PreparedSQLUpdateBatchAction {
+public class PreparedSQLBatchUpdateActionImpl
+        extends AbstractSQLAction<List<Integer>>
+        implements PreparedSQLUpdateBatchAction {
 
     int keyIndex = -1;
     List<Object[]> allParams;

easysql-impl/src/main/java/cc/carm/lib/easysql/action/PreparedSQLUpdateActionImpl.java

@@ -13,66 +13,68 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-public class PreparedSQLUpdateActionImpl extends SQLUpdateActionImpl implements PreparedSQLUpdateAction {
+public class PreparedSQLUpdateActionImpl
+		extends SQLUpdateActionImpl
+		implements PreparedSQLUpdateAction {
 
-    Object[] params;
+	Object[] params;
 
-    public PreparedSQLUpdateActionImpl(@NotNull SQLManagerImpl manager, @NotNull String sql) {
-        this(manager, sql, (Object[]) null);
-    }
+	public PreparedSQLUpdateActionImpl(@NotNull SQLManagerImpl manager, @NotNull String sql) {
+		this(manager, sql, (Object[]) null);
+	}
 
-    public PreparedSQLUpdateActionImpl(@NotNull SQLManagerImpl manager, @NotNull String sql,
-                                       @Nullable List<Object> params) {
-        this(manager, sql, params == null ? null : params.toArray());
-    }
+	public PreparedSQLUpdateActionImpl(@NotNull SQLManagerImpl manager, @NotNull String sql,
+									   @Nullable List<Object> params) {
+		this(manager, sql, params == null ? null : params.toArray());
+	}
 
-    public PreparedSQLUpdateActionImpl(@NotNull SQLManagerImpl manager, @NotNull String sql,
-                                       @Nullable Object[] params) {
-        super(manager, sql);
-        this.params = params;
-    }
+	public PreparedSQLUpdateActionImpl(@NotNull SQLManagerImpl manager, @NotNull String sql,
+									   @Nullable Object[] params) {
+		super(manager, sql);
+		this.params = params;
+	}
 
-    @Override
-    public PreparedSQLUpdateActionImpl setParams(Object[] params) {
-        this.params = params;
-        return this;
-    }
+	@Override
+	public PreparedSQLUpdateActionImpl setParams(Object[] params) {
+		this.params = params;
+		return this;
+	}
 
-    @Override
-    public PreparedSQLUpdateAction setParams(@Nullable Iterable<Object> params) {
-        if (params == null) {
-            return setParams((Object[]) null);
-        } else {
-            List<Object> paramsList = new ArrayList<>();
-            params.forEach(paramsList::add);
-            return setParams(paramsList.toArray());
-        }
-    }
+	@Override
+	public PreparedSQLUpdateAction setParams(@Nullable Iterable<Object> params) {
+		if (params == null) {
+			return setParams((Object[]) null);
+		} else {
+			List<Object> paramsList = new ArrayList<>();
+			params.forEach(paramsList::add);
+			return setParams(paramsList.toArray());
+		}
+	}
 
-    @Override
-    public @NotNull Integer execute() throws SQLException {
-        int value = -1;
+	@Override
+	public @NotNull Integer execute() throws SQLException {
+		int value = -1;
 
-        Connection connection = getManager().getConnection();
-        PreparedStatement statement = StatementUtil.createPrepareStatement(
-                connection, getSQLContent(), params, keyIndex > 0
-        );
-        outputDebugMessage();
-        if (keyIndex > 0) {
-            statement.executeUpdate();
-            ResultSet resultSet = statement.getGeneratedKeys();
-            if (resultSet != null) {
-                if (resultSet.next()) value = resultSet.getInt(keyIndex);
-                resultSet.close();
-            }
-        } else {
-            value = statement.executeUpdate();
-        }
+		Connection connection = getManager().getConnection();
+		PreparedStatement statement = StatementUtil.createPrepareStatement(
+				connection, getSQLContent(), params, keyIndex > 0
+		);
+		outputDebugMessage();
+		if (keyIndex > 0) {
+			statement.executeUpdate();
+			ResultSet resultSet = statement.getGeneratedKeys();
+			if (resultSet != null) {
+				if (resultSet.next()) value = resultSet.getInt(keyIndex);
+				resultSet.close();
+			}
+		} else {
+			value = statement.executeUpdate();
+		}
 
-        statement.close();
-        connection.close();
+		statement.close();
+		connection.close();
 
-        return value;
-    }
+		return value;
+	}
 
 }

easysql-impl/src/main/java/cc/carm/lib/easysql/action/SQLUpdateActionImpl.java

@@ -9,7 +9,9 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 
-public class SQLUpdateActionImpl extends AbstractSQLAction<Integer> implements SQLUpdateAction {
+public class SQLUpdateActionImpl
+		extends AbstractSQLAction<Integer>
+		implements SQLUpdateAction {
 
     int keyIndex = -1;
 

easysql-impl/src/main/java/cc/carm/lib/easysql/action/SQLUpdateBatchActionImpl.java

@@ -12,7 +12,9 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
-public class SQLUpdateBatchActionImpl extends AbstractSQLAction<List<Integer>> implements SQLUpdateBatchAction {
+public class SQLUpdateBatchActionImpl
+		extends AbstractSQLAction<List<Integer>>
+		implements SQLUpdateBatchAction {
 
     List<String> sqlContents = new ArrayList<>();
 

easysql-impl/src/main/java/cc/carm/lib/easysql/action/query/PreparedQueryActionImpl.java

@@ -17,51 +17,51 @@ import java.util.function.Consumer;
 
 public class PreparedQueryActionImpl extends QueryActionImpl implements PreparedQueryAction {
 
-    Consumer<PreparedStatement> handler;
-    Object[] params;
+	Consumer<PreparedStatement> handler;
+	Object[] params;
 
-    public PreparedQueryActionImpl(@NotNull SQLManagerImpl manager, @NotNull String sql) {
-        super(manager, sql);
-    }
+	public PreparedQueryActionImpl(@NotNull SQLManagerImpl manager, @NotNull String sql) {
+		super(manager, sql);
+	}
 
-    @Override
-    public PreparedQueryActionImpl setParams(@Nullable Object[] params) {
-        this.params = params;
-        return this;
-    }
+	@Override
+	public PreparedQueryActionImpl setParams(@Nullable Object[] params) {
+		this.params = params;
+		return this;
+	}
 
-    @Override
-    public PreparedQueryActionImpl setParams(@Nullable Iterable<Object> params) {
-        if (params == null) {
-            return setParams((Object[]) null);
-        } else {
-            List<Object> paramsList = new ArrayList<>();
-            params.forEach(paramsList::add);
-            return setParams(paramsList.toArray());
-        }
-    }
+	@Override
+	public PreparedQueryActionImpl setParams(@Nullable Iterable<Object> params) {
+		if (params == null) {
+			return setParams((Object[]) null);
+		} else {
+			List<Object> paramsList = new ArrayList<>();
+			params.forEach(paramsList::add);
+			return setParams(paramsList.toArray());
+		}
+	}
 
-    @Override
-    public PreparedQueryActionImpl handleStatement(@Nullable Consumer<PreparedStatement> statement) {
-        this.handler = statement;
-        return this;
-    }
+	@Override
+	public PreparedQueryActionImpl handleStatement(@Nullable Consumer<PreparedStatement> statement) {
+		this.handler = statement;
+		return this;
+	}
 
 
-    @Override
-    public @NotNull SQLQueryImpl execute() throws SQLException {
-        Connection connection = getManager().getConnection();
-        getManager().debug("#" + getShortID() + " ->" + getSQLContent());
-        PreparedStatement preparedStatement;
-        if (handler == null) {
-            preparedStatement = StatementUtil.createPrepareStatement(connection, getSQLContent(), this.params);
-        } else {
-            preparedStatement = connection.prepareStatement(getSQLContent());
-            handler.accept(preparedStatement);
-        }
+	@Override
+	public @NotNull SQLQueryImpl execute() throws SQLException {
+		Connection connection = getManager().getConnection();
+		getManager().debug("#" + getShortID() + " ->" + getSQLContent());
+		PreparedStatement preparedStatement;
+		if (handler == null) {
+			preparedStatement = StatementUtil.createPrepareStatement(connection, getSQLContent(), this.params);
+		} else {
+			preparedStatement = connection.prepareStatement(getSQLContent());
+			handler.accept(preparedStatement);
+		}
 
-        ResultSet resultSet = preparedStatement.executeQuery();
+		ResultSet resultSet = preparedStatement.executeQuery();
 
-        return new SQLQueryImpl(getManager(), this, connection, preparedStatement, resultSet);
-    }
+		return new SQLQueryImpl(getManager(), this, connection, preparedStatement, resultSet);
+	}
 }

easysql-impl/src/main/java/cc/carm/lib/easysql/action/query/QueryActionImpl.java

@@ -1,9 +1,10 @@
 package cc.carm.lib.easysql.action.query;
 
 import cc.carm.lib.easysql.action.AbstractSQLAction;
-import cc.carm.lib.easysql.api.SQLAction;
 import cc.carm.lib.easysql.api.action.query.QueryAction;
 import cc.carm.lib.easysql.api.action.query.SQLQuery;
+import cc.carm.lib.easysql.api.function.SQLExceptionHandler;
+import cc.carm.lib.easysql.api.function.SQLHandler;
 import cc.carm.lib.easysql.manager.SQLManagerImpl;
 import cc.carm.lib.easysql.query.SQLQueryImpl;
 import org.jetbrains.annotations.NotNull;
@@ -12,36 +13,34 @@ import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
 
 public class QueryActionImpl extends AbstractSQLAction<SQLQuery> implements QueryAction {
 
-    public QueryActionImpl(@NotNull SQLManagerImpl manager, @NotNull String sql) {
-        super(manager, sql);
-    }
+	public QueryActionImpl(@NotNull SQLManagerImpl manager, @NotNull String sql) {
+		super(manager, sql);
+	}
 
-    @Override
-    public @NotNull SQLQueryImpl execute() throws SQLException {
-        Connection connection = getManager().getConnection();
-        Statement statement = connection.createStatement();
+	@Override
+	public @NotNull SQLQueryImpl execute() throws SQLException {
+		Connection connection = getManager().getConnection();
+		Statement statement = connection.createStatement();
 
-        outputDebugMessage();
+		outputDebugMessage();
 
-        ResultSet resultSet = statement.executeQuery(getSQLContent());
-        SQLQueryImpl query = new SQLQueryImpl(getManager(), this, connection, statement, resultSet);
-        getManager().getActiveQuery().put(getActionUUID(), query);
+		ResultSet resultSet = statement.executeQuery(getSQLContent());
+		SQLQueryImpl query = new SQLQueryImpl(getManager(), this, connection, statement, resultSet);
+		getManager().getActiveQuery().put(getActionUUID(), query);
 
-        return query;
-    }
+		return query;
+	}
 
 
-    @Override
-    public void executeAsync(Consumer<SQLQuery> success, BiConsumer<SQLException, SQLAction<SQLQuery>> failure) {
-        try (SQLQueryImpl query = execute()) {
-            if (success != null) success.accept(query);
-        } catch (SQLException exception) {
-            (exceptionHandler == null ? defaultExceptionHandler() : exceptionHandler).accept(exception, this);
-        }
-    }
+	@Override
+	public void executeAsync(SQLHandler<SQLQuery> success, SQLExceptionHandler failure) {
+		try (SQLQueryImpl query = execute()) {
+			if (success != null) success.accept(query);
+		} catch (SQLException exception) {
+			handleException(failure, exception);
+		}
+	}
 }

easysql-impl/src/main/java/cc/carm/lib/easysql/query/SQLQueryImpl.java

@@ -11,77 +11,77 @@ import java.sql.Statement;
 
 public class SQLQueryImpl implements SQLQuery {
 
-    protected final long executeTime;
+	protected final long executeTime;
 
-    protected SQLManagerImpl sqlManager;
-    protected QueryActionImpl queryAction;
+	protected SQLManagerImpl sqlManager;
+	protected QueryActionImpl queryAction;
 
-    Connection connection;
-    Statement statement;
+	Connection connection;
+	Statement statement;
 
-    ResultSet resultSet;
+	ResultSet resultSet;
 
-    public SQLQueryImpl(
-            SQLManagerImpl sqlManager, QueryActionImpl queryAction,
-            Connection connection, Statement statement, ResultSet resultSet
-    ) {
-        this.executeTime = System.currentTimeMillis();
-        this.sqlManager = sqlManager;
-        this.queryAction = queryAction;
-        this.connection = connection;
-        this.statement = statement;
-        this.resultSet = resultSet;
-    }
+	public SQLQueryImpl(
+			SQLManagerImpl sqlManager, QueryActionImpl queryAction,
+			Connection connection, Statement statement, ResultSet resultSet
+	) {
+		this.executeTime = System.currentTimeMillis();
+		this.sqlManager = sqlManager;
+		this.queryAction = queryAction;
+		this.connection = connection;
+		this.statement = statement;
+		this.resultSet = resultSet;
+	}
 
-    @Override
-    public long getExecuteTime() {
-        return this.executeTime;
-    }
+	@Override
+	public long getExecuteTime() {
+		return this.executeTime;
+	}
 
-    @Override
-    public SQLManagerImpl getManager() {
-        return this.sqlManager;
-    }
+	@Override
+	public SQLManagerImpl getManager() {
+		return this.sqlManager;
+	}
 
-    @Override
-    public QueryActionImpl getAction() {
-        return this.queryAction;
-    }
+	@Override
+	public QueryActionImpl getAction() {
+		return this.queryAction;
+	}
 
-    @Override
-    public ResultSet getResultSet() {
-        return this.resultSet;
-    }
+	@Override
+	public ResultSet getResultSet() {
+		return this.resultSet;
+	}
 
-    @Override
-    public String getSQLContent() {
-        return getAction().getSQLContent();
-    }
+	@Override
+	public String getSQLContent() {
+		return getAction().getSQLContent();
+	}
 
-    @Override
-    public void close() {
-        try {
-            if (getResultSet() != null) getResultSet().close();
-            if (getStatement() != null) getStatement().close();
-            if (getConnection() != null) getConnection().close();
+	@Override
+	public void close() {
+		try {
+			if (getResultSet() != null) getResultSet().close();
+			if (getStatement() != null) getStatement().close();
+			if (getConnection() != null) getConnection().close();
 
-            getManager().debug("#" + getAction().getShortID() +
-                    " -> finished after " + (System.currentTimeMillis() - getExecuteTime()) + " ms."
-            );
-            getManager().getActiveQuery().remove(getAction().getActionUUID());
-        } catch (SQLException e) {
-            getAction().handleException(e);
-        }
-        this.queryAction = null;
-    }
+			getManager().debug("#" + getAction().getShortID() +
+					" -> finished after " + (System.currentTimeMillis() - getExecuteTime()) + " ms."
+			);
+			getManager().getActiveQuery().remove(getAction().getActionUUID());
+		} catch (SQLException e) {
+			getAction().handleException(getAction().defaultExceptionHandler(), e);
+		}
+		this.queryAction = null;
+	}
 
-    @Override
-    public Statement getStatement() {
-        return this.statement;
-    }
+	@Override
+	public Statement getStatement() {
+		return this.statement;
+	}
 
-    @Override
-    public Connection getConnection() {
-        return this.connection;
-    }
+	@Override
+	public Connection getConnection() {
+		return this.connection;
+	}
 }