Update exchange rates as a background job (#2)

3 files changed, 9 insertions, 39 deletions

diff --git a/README.txt b/README.txt
index f09fa57..7764cfe 100644
--- a/README.txt
+++ b/README.txt
@@ -9,6 +9,7 @@ Module data:
         
         Listeners --------------------------
         - PollListener
+        - CalculatorRateUpdaterListener
         
         Commands ---------------------------
         - CalculatorCommand
diff --git a/pom.xml b/pom.xml
index e1c64cf..7d7067d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,6 +31,7 @@
         </scm>
 
         <dependencies>
+
                 <!-- Cross-module -->
                 <dependency>
                         <groupId>zajc.libot</groupId>
@@ -47,12 +48,13 @@
                         <artifactId>chatter-bot-api</artifactId>
                         <version>2.0.1</version>
                 </dependency>
-
+                
                 <!-- Annotations -->
                 <dependency>
                         <groupId>com.github.spotbugs</groupId>
                         <artifactId>spotbugs-annotations</artifactId>
                 </dependency>
+
         </dependencies>
 
         <build>
diff --git a/src/main/java/libot/listeners/CalculatorRateUpdaterListener.java b/src/main/java/libot/listeners/CalculatorRateUpdaterListener.java
index 7dfd339..cf051ca 100644
--- a/src/main/java/libot/listeners/CalculatorRateUpdaterListener.java
+++ b/src/main/java/libot/listeners/CalculatorRateUpdaterListener.java
@@ -1,64 +1,31 @@
 package libot.listeners;
 
 import static com.github.markozajc.ef.EHandle.handle;
-import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
 import static java.util.concurrent.TimeUnit.*;
 import static org.slf4j.LoggerFactory.getLogger;
 
 import java.io.IOException;
-import java.util.concurrent.ScheduledExecutorService;
 
 import org.slf4j.Logger;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import libot.commands.CalculatorCommand;
-import net.dv8tion.jda.api.events.*;
-import net.dv8tion.jda.api.hooks.ListenerAdapter;
+import libot.core.entities.BotContext;
 
-public class CalculatorRateUpdaterListener extends ListenerAdapter {
+public class CalculatorRateUpdaterListener implements BotEventListener {
 
         private static final Logger LOG = getLogger(CalculatorRateUpdaterListener.class);
-
         private static final long UPDATE_INTERVAL = HOURS.toMillis(1);
         private static final long UPDATE_TIMEOUT = MINUTES.toMillis(5);
-        private static final ScheduledExecutorService UPDATER;
-        private static boolean updaterRunning;
-
-        static {
-                if (CalculatorCommand.ENABLED)
-                        UPDATER = newSingleThreadScheduledExecutor();
-                else
-                        UPDATER = null;
-        }
 
         @Override
-        @SuppressFBWarnings(value = "JLM_JSR166_UTILCONCURRENT_MONITORENTER", justification = "false positive")
-        public void onReady(ReadyEvent event) {
-                if (UPDATER == null)
-                        return;
-
-                synchronized (UPDATER) {
-                        if (updaterRunning)
-                                return;
-                        updaterRunning = true;
-
-                        UPDATER.scheduleAtFixedRate(handle(CalculatorRateUpdaterListener::updateRates, t -> {
+        public void onStartup(BotContext bot) {
+                if (CalculatorCommand.ENABLED) {
+                        bot.cron().scheduleAtFixedRate(handle(CalculatorRateUpdaterListener::updateRates, t -> {
                                 LOG.error("Failed to update exchange rates", t);
                         }), 0, UPDATE_INTERVAL, MILLISECONDS);
                 }
         }
 
-        @Override
-        @SuppressFBWarnings(value = "JLM_JSR166_UTILCONCURRENT_MONITORENTER", justification = "false positive")
-        public void onShutdown(ShutdownEvent event) {
-                if (UPDATER == null)
-                        return;
-
-                synchronized (UPDATER) {
-                        UPDATER.shutdown();
-                }
-        }
-
         private static void updateRates() throws IOException, InterruptedException {
                 LOG.debug("Updating exchange rates");