From 360e631fc91611d7529056969c5face2953b802f Mon Sep 17 00:00:00 2001
From: Rsl1122 <djrapitops@hotmail.com>
Date: Sat, 16 Feb 2019 14:58:54 +0200
Subject: [PATCH] Removed PatchTask

---
 .../java/com/djrapitops/plan/db/SQLDB.java    | 15 +---
 .../djrapitops/plan/db/tasks/PatchTask.java   | 76 -------------------
 2 files changed, 3 insertions(+), 88 deletions(-)
 delete mode 100644 Plan/common/src/main/java/com/djrapitops/plan/db/tasks/PatchTask.java

diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/SQLDB.java b/Plan/common/src/main/java/com/djrapitops/plan/db/SQLDB.java
index edc1b5dcb..ddb4cc36b 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/db/SQLDB.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/db/SQLDB.java
@@ -27,7 +27,6 @@ import com.djrapitops.plan.db.access.transactions.init.CleanTransaction;
 import com.djrapitops.plan.db.access.transactions.init.CreateIndexTransaction;
 import com.djrapitops.plan.db.access.transactions.init.CreateTablesTransaction;
 import com.djrapitops.plan.db.patches.*;
-import com.djrapitops.plan.db.tasks.PatchTask;
 import com.djrapitops.plan.system.locale.Locale;
 import com.djrapitops.plan.system.settings.config.PlanConfig;
 import com.djrapitops.plan.system.settings.paths.PluginSettings;
@@ -167,23 +166,15 @@ public abstract class SQLDB extends AbstractDatabase {
     private void setupDatabase() throws DBInitException {
         try {
             executeTransaction(new CreateTablesTransaction());
+            for (Patch patch : patches()) {
+                executeTransaction(patch);
+            }
             registerIndexCreationTask();
-            registerPatchTask();
         } catch (DBOpException | IllegalArgumentException e) {
             throw new DBInitException("Failed to set-up Database", e);
         }
     }
 
-    private void registerPatchTask() {
-        Patch[] patches = patches();
-        try {
-            runnableFactory.create("Database Patch", new PatchTask(patches, locale, logger, errorHandler))
-                    .runTaskLaterAsynchronously(TimeAmount.toTicks(5L, TimeUnit.SECONDS));
-        } catch (Exception ignore) {
-            // Task failed to register because plugin is being disabled
-        }
-    }
-
     private void registerIndexCreationTask() {
         try {
             runnableFactory.create("Database Index Creation", new AbsRunnable() {
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/tasks/PatchTask.java b/Plan/common/src/main/java/com/djrapitops/plan/db/tasks/PatchTask.java
deleted file mode 100644
index eecb6fb27..000000000
--- a/Plan/common/src/main/java/com/djrapitops/plan/db/tasks/PatchTask.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *  This file is part of Player Analytics (Plan).
- *
- *  Plan is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License v3 as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Plan is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public License
- *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.djrapitops.plan.db.tasks;
-
-import com.djrapitops.plan.db.patches.Patch;
-import com.djrapitops.plan.system.locale.Locale;
-import com.djrapitops.plan.system.locale.lang.PluginLang;
-import com.djrapitops.plugin.logging.L;
-import com.djrapitops.plugin.logging.console.PluginLogger;
-import com.djrapitops.plugin.logging.error.ErrorHandler;
-import com.djrapitops.plugin.task.AbsRunnable;
-
-/**
- * Task that is in charge on patching the database when the database enables.
- *
- * @author Rsl1122
- */
-@Deprecated
-public class PatchTask extends AbsRunnable {
-
-    private final Patch[] patches;
-
-    private final Locale locale;
-    private final PluginLogger logger;
-    private final ErrorHandler errorHandler;
-
-    public PatchTask(Patch[] patches, Locale locale, PluginLogger logger, ErrorHandler errorHandler) {
-        this.patches = patches;
-        this.locale = locale;
-        this.logger = logger;
-        this.errorHandler = errorHandler;
-    }
-
-    @Override
-    public void run() {
-        try {
-            boolean applied = applyPatches();
-            logger.info(locale.getString(
-                    applied ? PluginLang.DB_APPLIED_PATCHES : PluginLang.DB_APPLIED_PATCHES_ALREADY
-            ));
-        } catch (Exception e) {
-            logger.error("----------------------------------------------------");
-            logger.error(locale.getString(PluginLang.ENABLE_FAIL_DB_PATCH));
-            logger.error("----------------------------------------------------");
-            errorHandler.log(L.CRITICAL, this.getClass(), e);
-        }
-    }
-
-    private boolean applyPatches() {
-        boolean didApply = false;
-        for (Patch patch : patches) {
-            if (!patch.hasBeenApplied()) {
-                String patchName = patch.getClass().getSimpleName();
-                logger.info(locale.getString(PluginLang.DB_APPLY_PATCH, patchName));
-                patch.apply();
-                didApply = true;
-            }
-        }
-        return didApply;
-    }
-
-}
\ No newline at end of file