Transaction module restructure

Author: ZorTik

asql-api/src/main/java/me/zort/sqllib/internal/annotation/LinkedOne.java

@@ -1,5 +1,7 @@
 package me.zort.sqllib.internal.annotation;
 
+import org.jetbrains.annotations.ApiStatus;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -25,6 +27,7 @@
  *
  * @author ZorTik
  */
+@ApiStatus.Experimental
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
 public @interface LinkedOne {

asql-core/src/main/java/me/zort/sqllib/transaction/FlowResult.java

@@ -29,7 +29,7 @@ public TransactionFlow.Builder flow() {
     return new TransactionFlow.Builder(this);
   }
 
-  public TransactionFlow flow(final FlowStep[] steps, final TransactionFlow.Options options) {
+  public TransactionFlow flow(final TransactionFlow.Step[] steps, final TransactionFlow.Options options) {
     verify();
     return new TransactionFlow(this, steps, options);
   }

asql-core/src/main/java/me/zort/sqllib/transaction/FlowStep.java

@@ -1,9 +1,11 @@
 package me.zort.sqllib.transaction;
 
 import lombok.*;
+import me.zort.sqllib.SQLDatabaseConnection;
+import me.zort.sqllib.api.Query;
 import me.zort.sqllib.api.data.QueryResult;
+import me.zort.sqllib.api.data.QueryRowsResult;
 import me.zort.sqllib.internal.query.QueryNode;
-import me.zort.sqllib.transaction.step.FlowStepImpl;
 import me.zort.sqllib.util.Arrays;
 import org.jetbrains.annotations.NotNull;
 
@@ -13,32 +15,32 @@
 public class TransactionFlow {
 
   private final Transaction transaction;
-  private final FlowStep[] steps;
+  private final Step[] steps;
   private final Options options;
   private boolean executed = false;
   private int index = -1;
 
-  public FlowResult execute() {
+  public Result execute() {
     return executeNext(steps.length);
   }
 
   @SneakyThrows(SQLException.class)
-  public FlowResult executeNext(int count) {
+  public Result executeNext(int count) {
     if (executed) throw new IllegalStateException("TransactionFlow already fully executed!");
 
     QueryResult[] results = new QueryResult[steps.length];
     int maxIndex = index + count;
     int lastIndex = index;
     for (int i = 0; i <= maxIndex; i++) {
-      FlowStep.Status status = steps[i].execute(transaction.getDatabaseConnection());
-      if (status.equals(FlowStep.Status.BREAK)) {
+      Step.Status status = steps[i].execute(transaction.getDatabaseConnection());
+      if (status.equals(Step.Status.BREAK)) {
         if (options.rollbackOnFailure) {
           transaction.rollback();
           index = -1;
         }
         break;
       }
-      results[i] = status.equals(FlowStep.Status.SUCCESS) ? steps[i].getResult() : null;
+      results[i] = status.equals(Step.Status.SUCCESS) ? steps[i].getResult() : null;
       lastIndex = i;
     }
     boolean success = true;
@@ -48,9 +50,9 @@ public FlowResult executeNext(int count) {
       results[++lastIndex] = null;
     }
 
-    FlowResult result = success
-            ? new FlowResult(true)
-            : new FlowResult(false,
+    Result result = success
+            ? new Result(true)
+            : new Result(false,
             String.format("Transaction failed at step %d!", lastIndexFinal + 1));
 
     result.addAll(java.util.Arrays.asList(results));
@@ -76,7 +78,7 @@ private void close() {
   public static final class Builder {
     private final Transaction transaction;
     private final Options options;
-    private FlowStep[] steps = new FlowStep[0];
+    private Step[] steps = new Step[0];
 
     public Builder(Transaction transaction) {
       this.transaction = transaction;
@@ -88,10 +90,10 @@ public Builder(Transaction transaction) {
     }
 
     public @NotNull Builder step(final @NotNull QueryNode<?> node, boolean optional) {
-      return step(new FlowStepImpl(node, optional));
+      return step(new StepImpl(node, optional));
     }
 
-    public @NotNull Builder step(final @NotNull FlowStep step) {
+    public @NotNull Builder step(final @NotNull TransactionFlow.Step step) {
       steps = Arrays.add(steps, step);
       return this;
     }
@@ -124,4 +126,55 @@ public static final class Options {
     private boolean autoClose = true;
   }
 
+  public static final class Result extends QueryRowsResult<QueryResult> {
+    @Setter(AccessLevel.PROTECTED)
+    @Getter
+    private int brokenIndex = -1;
+
+    public Result(final boolean successful) {
+      super(successful);
+    }
+
+    public Result(final boolean successful, String rejectMessage) {
+      super(successful, rejectMessage);
+    }
+
+  }
+
+  @RequiredArgsConstructor
+  private static class StepImpl implements Step {
+    private final Query query;
+    @Getter
+    private final boolean optional;
+    @Getter
+    private QueryResult result = null;
+
+    @Override
+    public Status execute(SQLDatabaseConnection connection) {
+      if (!(query instanceof QueryNode)) throw new IllegalStateException("FlowStepImpl accepts only QueryNode!");
+
+      QueryNode<?> node = (QueryNode<?>) query;
+      node = node.getAncestor();
+      QueryResult localResult = node.generatesResultSet()
+              ? connection.query(node)
+              : connection.exec(node);
+
+      if (localResult.isSuccessful()) result = localResult;
+      return localResult.isSuccessful() ? Status.SUCCESS : (optional ? Status.CONTINUE : Status.BREAK);
+    }
+  }
+
+  public interface Step {
+
+    Status execute(SQLDatabaseConnection connection);
+
+    QueryResult getResult(); // Result if the #execute returned SUCCESS, otherwise null
+
+    boolean isOptional();
+
+    enum Status {
+      SUCCESS, BREAK, CONTINUE
+    }
+
+  }
 }

asql-core/src/main/java/me/zort/sqllib/transaction/Transaction.java

@@ -13,7 +13,7 @@
 import me.zort.sqllib.api.data.Row;
 import me.zort.sqllib.api.provider.Select;
 import me.zort.sqllib.internal.impl.DefaultSQLEndpoint;
-import me.zort.sqllib.transaction.FlowResult;
+import me.zort.sqllib.transaction.TransactionFlow;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.core.config.Configurator;
 import org.junit.jupiter.api.*;
@@ -181,7 +181,7 @@ public void test6_Pool() {
 
   @Test
   public void test6_Transactions() {
-    FlowResult result1 = connection.beginTransaction()
+    TransactionFlow.Result result1 = connection.beginTransaction()
             .flow()
             .step(connection.save(table, user1))
             .step(connection.select()