Make ETL can be gson serialize

Author: Ghost-chu

src/main/java/org/maxgamer/quickshop/database/DatabaseHelper.java

@@ -112,8 +112,8 @@ private void createExternalCacheTable(){
         String createTable = "CREATE TABLE " + plugin.getDbPrefix()
                 + "external_cache ( x  INTEGER(32) NOT NULL, y  INTEGER(32) NOT NULL, z  INTEGER(32) NOT NULL, world VARCHAR(32) NOT NULL );";
         manager.runInstantTask(new DatabaseTask(createTable));
-        createColumn("external_cache", "space", new DataType(DataTypeMapping.INT, null, ""));
-        createColumn("external_cache", "stock", new DataType(DataTypeMapping.INT, null, ""));
+        createColumn("external_cache", "space", new DataType(DataTypeMapping.INT, null));
+        createColumn("external_cache", "stock", new DataType(DataTypeMapping.INT, null));
     }
 
 

src/main/java/org/maxgamer/quickshop/economy/EconomyTransaction.java

@@ -27,6 +27,7 @@
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.event.EconomyCommitEvent;
 import org.maxgamer.quickshop.util.CalculateUtil;
+import org.maxgamer.quickshop.util.JsonUtil;
 import org.maxgamer.quickshop.util.Util;
 import org.maxgamer.quickshop.util.logging.container.EconomyTransactionLog;
 
@@ -42,6 +43,7 @@ public class EconomyTransaction {
     private final UUID to;
     private final double amount;
     @NotNull
+    @JsonUtil.Hidden
     private final EconomyCore core;
     private final double actualAmount; //
     private final double tax;
@@ -52,6 +54,7 @@ public class EconomyTransaction {
     private final World world;
     @Getter
     private final String currency;
+    @JsonUtil.Hidden
     private final QuickShop plugin = QuickShop.getInstance();
     @Getter
     private TransactionSteps steps; //For rollback
@@ -262,7 +265,7 @@ default boolean onCommit(@NotNull EconomyTransaction economyTransaction) {
          */
         default void onSuccess(@NotNull EconomyTransaction economyTransaction) {
             Util.debugLog("Transaction succeed.");
-            QuickShop.getInstance().logEvent(new EconomyTransactionLog(true,economyTransaction));
+            QuickShop.getInstance().logEvent(new EconomyTransactionLog(true,economyTransaction.getFrom(),economyTransaction.getTo(),economyTransaction.getCurrency(),economyTransaction.getTax(),economyTransaction.getTaxer().getUniqueId(),economyTransaction.getAmount(),economyTransaction.getLastError()));
         }
 
         /**
@@ -274,7 +277,7 @@ default void onSuccess(@NotNull EconomyTransaction economyTransaction) {
          */
         default void onFailed(@NotNull EconomyTransaction economyTransaction) {
             Util.debugLog("Transaction failed: " + economyTransaction.getLastError() + ".");
-            QuickShop.getInstance().logEvent(new EconomyTransactionLog(false,economyTransaction));
+            QuickShop.getInstance().logEvent(new EconomyTransactionLog(false,economyTransaction.getFrom(),economyTransaction.getTo(),economyTransaction.getCurrency(),economyTransaction.getTax(),economyTransaction.getTaxer().getUniqueId(),economyTransaction.getAmount(),economyTransaction.getLastError()));
         }
 
         /**
@@ -286,7 +289,7 @@ default void onFailed(@NotNull EconomyTransaction economyTransaction) {
          */
         default void onTaxFailed(@NotNull EconomyTransaction economyTransaction) {
             Util.debugLog("Tax Transaction failed: " + economyTransaction.getLastError() + ".");
-            QuickShop.getInstance().logEvent(new EconomyTransactionLog(false,economyTransaction));
+            QuickShop.getInstance().logEvent(new EconomyTransactionLog(false,economyTransaction.getFrom(),economyTransaction.getTo(),economyTransaction.getCurrency(),economyTransaction.getTax(),economyTransaction.getTaxer().getUniqueId(),economyTransaction.getAmount(),economyTransaction.getLastError()));
         }
 
     }

src/main/java/org/maxgamer/quickshop/util/logging/container/EconomyTransactionLog.java

@@ -3,12 +3,19 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
-import org.maxgamer.quickshop.economy.EconomyTransaction;
+
+import java.util.UUID;
 
 @AllArgsConstructor
 @Builder
 @Data
 public class EconomyTransactionLog {
     private boolean success;
-    private EconomyTransaction transaction;
+    private UUID from;
+    private UUID to;
+    private String currency;
+    private double tax;
+    private UUID taxAccount;
+    private double amount;
+    private String lastError;
 }