[#115] Refactor BatchResult & BatchReturningResult

core/src/main/java/io/github/zero88/jooqx/BatchResult.java

@@ -12,6 +12,10 @@
  */
 public interface BatchResult {
 
+    static BatchResult create(int total, int successes) {
+        return new BatchResultImpl(total, successes);
+    }
+
     int getTotal();
 
     int getSuccesses();

core/src/main/java/io/github/zero88/jooqx/BatchResultImpl.java

@@ -0,0 +1,19 @@
+package io.github.zero88.jooqx;
+
+class BatchResultImpl implements BatchResult {
+
+    private final int total;
+    private final int successes;
+
+    BatchResultImpl(int total, int successes) {
+        this.total     = total;
+        this.successes = successes;
+    }
+
+    @Override
+    public int getTotal() { return total; }
+
+    @Override
+    public int getSuccesses() { return successes; }
+
+}

core/src/main/java/io/github/zero88/jooqx/BatchReturningResult.java

@@ -1,6 +1,8 @@
 package io.github.zero88.jooqx;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -12,6 +14,10 @@
  */
 public interface BatchReturningResult<R> extends BatchResult {
 
+    static <R> BatchReturningResult<R> create(int total, List<R> results) {
+        return new BatchReturningResultImpl<>(total, Optional.ofNullable(results).orElseGet(ArrayList::new));
+    }
+
     @NotNull
     List<R> getRecords();
 

core/src/main/java/io/github/zero88/jooqx/BatchReturningResultImpl.java

@@ -0,0 +1,21 @@
+package io.github.zero88.jooqx;
+
+import java.util.List;
+
+import org.jetbrains.annotations.NotNull;
+
+final class BatchReturningResultImpl<R> extends BatchResultImpl implements BatchReturningResult<R> {
+
+    @NotNull
+    private final List<R> records;
+
+    BatchReturningResultImpl(int total, @NotNull List<R> rs) {
+        super(total, rs.size());
+        this.records = rs;
+    }
+
+    @NotNull
+    @Override
+    public List<R> getRecords() { return records; }
+
+}

core/src/main/java/io/github/zero88/jooqx/JooqxSQLImpl.java

@@ -22,7 +22,6 @@
 import org.jooq.conf.Settings;
 import org.jooq.impl.DSL;
 
-import io.github.zero88.jooqx.MiscImpl.BatchResultImpl;
 import io.github.zero88.jooqx.SQLImpl.SQLEI;
 import io.github.zero88.jooqx.SQLImpl.SQLExecutorBuilderImpl;
 import io.github.zero88.jooqx.SQLImpl.SQLPQ;
@@ -275,7 +274,7 @@ public Future<BatchResult> batch(@NotNull Query query, @NotNull BindBatchValues
             return sqlClient().preparedQuery(preparedQuery().sql(dsl().configuration(), query))
                               .executeBatch(preparedQuery().bindValues(query, bindBatchValues, typeMapperRegistry()))
                               .map(r -> new ReactiveSQLBC().batchResultSize(r))
-                              .map(s -> BatchResultImpl.create(bindBatchValues.size(), s))
+                              .map(s -> BatchResult.create(bindBatchValues.size(), s))
                               .otherwise(errorConverter()::reThrowError);
         }
 
@@ -286,7 +285,7 @@ public <T, R> Future<BatchReturningResult<R>> batchResult(@NotNull Query query,
             return sqlClient().preparedQuery(preparedQuery().sql(dsl().configuration(), query))
                               .executeBatch(preparedQuery().bindValues(query, bindBatchValues, typeMapperRegistry()))
                               .map(rs -> new ReactiveSQLBC().collect(rs, adapter, dsl(), typeMapperRegistry()))
-                              .map(rs -> BatchResultImpl.create(bindBatchValues.size(), rs))
+                              .map(rs -> BatchReturningResult.create(bindBatchValues.size(), rs))
                               .otherwise(errorConverter()::reThrowError);
         }
 

core/src/main/java/io/github/zero88/jooqx/JsonRecord.java

@@ -19,7 +19,7 @@ public interface JsonRecord<R extends TableRecord<R>> extends TableRecord<R> {
     JsonObject toJson();
 
     static <R extends TableRecord<R>> JsonRecord<R> create(@NotNull TableLike<R> table) {
-        return new MiscImpl.JsonRecordImpl<>(table.asTable());
+        return new JsonRecordImpl<>(table.asTable());
     }
 
 }

core/src/main/java/io/github/zero88/jooqx/JsonRecordImpl.java

@@ -0,0 +1,23 @@
+package io.github.zero88.jooqx;
+
+import java.util.Arrays;
+
+import org.jooq.Table;
+import org.jooq.TableRecord;
+import org.jooq.impl.CustomRecord;
+
+import io.vertx.core.json.JsonObject;
+
+final class JsonRecordImpl<R extends TableRecord<R>> extends CustomRecord<R> implements JsonRecord<R> {
+
+    JsonRecordImpl(Table<R> table) {
+        super(table);
+    }
+
+    public JsonObject toJson() {
+        final JsonObject json = new JsonObject();
+        Arrays.stream(this.fields()).forEach(f -> json.put(f.getName(), f.get(this)));
+        return json;
+    }
+
+}

core/src/main/java/io/github/zero88/jooqx/LegacySQLImpl.java

@@ -20,7 +20,6 @@
 import org.jooq.Routine;
 import org.jooq.impl.DSL;
 
-import io.github.zero88.jooqx.MiscImpl.BatchResultImpl;
 import io.github.zero88.jooqx.SQLImpl.SQLEI;
 import io.github.zero88.jooqx.SQLImpl.SQLExecutorBuilderImpl;
 import io.github.zero88.jooqx.SQLImpl.SQLPQ;
@@ -148,7 +147,7 @@ public final Future<BatchResult> batch(@NotNull Query query, @NotNull BindBatchV
                                                                              typeMapperRegistry()), promise));
             return promise.future()
                           .map(r -> resultCollector().batchResultSize(r))
-                          .map(s -> BatchResultImpl.create(bindBatchValues.size(), s))
+                          .map(s -> BatchResult.create(bindBatchValues.size(), s))
                           .otherwise(errorConverter()::reThrowError);
         }