From 96e69950c6bca324c296d56241905a8712930721 Mon Sep 17 00:00:00 2001 From: Salmonllama Date: Sun, 6 Sep 2020 16:21:08 -0400 Subject: [PATCH] Implement Spring Boot for deployment/feature enhancement --- build.gradle | 7 +++++++ src/main/java/dev/salmonllama/fsbot/Main.java | 9 +++++++-- .../fsbot/commands/developer/TestCommand.java | 1 + 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index ac7d1e7..203ec66 100644 --- a/build.gradle +++ b/build.gradle @@ -5,9 +5,12 @@ */ plugins { + id 'org.springframework.boot' version '2.3.3.RELEASE' id 'application' } +apply plugin: 'io.spring.dependency-management' + group 'dev.salmonllama' version '2.0.1' @@ -27,6 +30,10 @@ dependencies { implementation 'com.vdurmont:emoji-java:4.0.0' implementation 'com.squareup.okhttp3:okhttp:4.4.0' + implementation 'org.springframework.boot:spring-boot-starter-actuator' + implementation 'org.springframework.boot:spring-boot-starter-web' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation group: 'junit', name: 'junit', version: '4.12' } diff --git a/src/main/java/dev/salmonllama/fsbot/Main.java b/src/main/java/dev/salmonllama/fsbot/Main.java index 544dceb..794cb29 100644 --- a/src/main/java/dev/salmonllama/fsbot/Main.java +++ b/src/main/java/dev/salmonllama/fsbot/Main.java @@ -12,15 +12,18 @@ import dev.salmonllama.fsbot.listeners.*; import org.javacord.api.DiscordApiBuilder; import dev.salmonllama.fsbot.utilities.Constants; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; // TODO: auto-switching status messages. // TODO: Add an official Logger --> logging to Discord, not console +@SpringBootApplication public class Main { - public static void main(String[] args) { String configLocation = Constants.BOT_FOLDER.concat(Constants.CONFIG_NAME); - BotConfig.initConfig(configLocation, false); // TODO: Use args to dictate newFiling. Also use args to dictate database setup. + BotConfig.initConfig(configLocation, false); + // TODO: Use args to dictate newFiling. Also use args to dictate database setup. FSDB.init(); @@ -40,5 +43,7 @@ public class Main { System.out.printf("Bot invite: %s%n", api.createBotInvite()); System.out.printf("Logged in as %s%n", api.getYourself().getDiscriminatedName()); }); + + SpringApplication.run(Main.class, args); } } diff --git a/src/main/java/dev/salmonllama/fsbot/commands/developer/TestCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/developer/TestCommand.java index 3cac897..312cf1d 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/developer/TestCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/developer/TestCommand.java @@ -5,6 +5,7 @@ package dev.salmonllama.fsbot.commands.developer; +import dev.salmonllama.fsbot.Main; import dev.salmonllama.fsbot.database.controllers.OutfitController; import dev.salmonllama.fsbot.guthix.Command; import dev.salmonllama.fsbot.guthix.CommandContext;