Replace utils’ Ticker by Java’s ScheduledExecutorService.

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 5a54f76..a51247e 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -32,6 +32,8 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -82,7 +84,6 @@ import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.number.Numbers;
 import net.pterodactylus.util.service.AbstractService;
 import net.pterodactylus.util.thread.NamedThreadFactory;
-import net.pterodactylus.util.thread.Ticker;
 
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
@@ -196,7 +197,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider
        private final Map<String, TemporaryImage> temporaryImages = new HashMap<String, TemporaryImage>();
 
        /** Ticker for threads that mark own elements as known. */
-       private final Ticker localElementTicker = new Ticker();
+       private final ScheduledExecutorService localElementTicker = Executors.newScheduledThreadPool(1);
 
        /** The time the configuration was last touched. */
        private volatile long lastConfigurationUpdate;
@@ -1547,7 +1548,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider
                eventBus.post(new NewPostFoundEvent(post));
                sone.addPost(post);
                touchConfiguration();
-               localElementTicker.registerEvent(System.currentTimeMillis() + 10 * 1000, new Runnable() {
+               localElementTicker.schedule(new Runnable() {
 
                        /**
                         * {@inheritDoc}
@@ -1556,7 +1557,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider
                        public void run() {
                                markPostKnown(post);
                        }
-               }, "Mark " + post + " read.");
+               }, 10, TimeUnit.SECONDS);
                return post;
        }
 
@@ -1688,7 +1689,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider
                }
                sone.addReply(reply);
                touchConfiguration();
-               localElementTicker.registerEvent(System.currentTimeMillis() + 10 * 1000, new Runnable() {
+               localElementTicker.schedule(new Runnable() {
 
                        /**
                         * {@inheritDoc}
@@ -1697,7 +1698,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider
                        public void run() {
                                markReplyKnown(reply);
                        }
-               }, "Mark " + reply + " read.");
+               }, 10, TimeUnit.SECONDS);
                return reply;
        }
 
@@ -1940,6 +1941,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider
         */
        @Override
        public void serviceStop() {
+               localElementTicker.shutdownNow();
                synchronized (sones) {
                        for (Entry<Sone, SoneInserter> soneInserter : soneInserters.entrySet()) {
                                soneInserter.getValue().stop();

diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index 18aebed..60cda15 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -32,6 +32,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -142,7 +146,6 @@ import net.pterodactylus.util.template.TemplateContextFactory;
 import net.pterodactylus.util.template.TemplateParser;
 import net.pterodactylus.util.template.TemplateProvider;
 import net.pterodactylus.util.template.XmlFilter;
-import net.pterodactylus.util.thread.Ticker;
 import net.pterodactylus.util.web.RedirectPage;
 import net.pterodactylus.util.web.StaticPage;
 import net.pterodactylus.util.web.TemplatePage;
@@ -213,7 +216,7 @@ public class WebInterface {
        private final Map<Sone, TemplateNotification> soneInsertNotifications = new HashMap<Sone, TemplateNotification>();
 
        /** Sone locked notification ticker objects. */
-       private final Map<Sone, Object> lockedSonesTickerObjects = Collections.synchronizedMap(new HashMap<Sone, Object>());
+       private final Map<Sone, ScheduledFuture<?>> lockedSonesTickerObjects = Collections.synchronizedMap(new HashMap<Sone, ScheduledFuture<?>>());
 
        /** The “Sone locked” notification. */
        private final ListNotification<Sone> lockedSonesNotification;
@@ -230,6 +233,9 @@ public class WebInterface {
        /** The “image insert failed” notification. */
        private final ListNotification<Image> imageInsertFailedNotification;
 
+       /** Scheduled executor for time-based notifications. */
+       private final ScheduledExecutorService ticker = Executors.newScheduledThreadPool(1);
+
        /**
         * Creates a new web interface.
         *
@@ -554,17 +560,17 @@ public class WebInterface {
                final TemplateNotification startupNotification = new TemplateNotification("startup-notification", startupNotificationTemplate);
                notificationManager.addNotification(startupNotification);
 
-               Ticker.getInstance().registerEvent(System.currentTimeMillis() + (120 * 1000), new Runnable() {
+               ticker.schedule(new Runnable() {
 
                        @Override
                        public void run() {
                                startupNotification.dismiss();
                        }
-               }, "Sone Startup Notification Remover");
+               }, 2, TimeUnit.MINUTES);
 
                Template wotMissingNotificationTemplate = TemplateParser.parse(createReader("/templates/notify/wotMissingNotification.html"));
                final TemplateNotification wotMissingNotification = new TemplateNotification("wot-missing-notification", wotMissingNotificationTemplate);
-               Ticker.getInstance().registerEvent(System.currentTimeMillis() + (15 * 1000), new Runnable() {
+               ticker.scheduleAtFixedRate(new Runnable() {
 
                        @Override
                        @SuppressWarnings("synthetic-access")
@@ -574,10 +580,9 @@ public class WebInterface {
                                } else {
                                        notificationManager.addNotification(wotMissingNotification);
                                }
-                               Ticker.getInstance().registerEvent(System.currentTimeMillis() + (15 * 1000), this, "Sone WoT Connector Checker");
                        }
 
-               }, "Sone WoT Connector Checker");
+               }, 15, 15, TimeUnit.SECONDS);
        }
 
        /**
@@ -585,7 +590,7 @@ public class WebInterface {
         */
        public void stop() {
                unregisterToadlets();
-               Ticker.getInstance().stop();
+               ticker.shutdownNow();
        }
 
        //
@@ -953,7 +958,7 @@ public class WebInterface {
        @Subscribe
        public void soneLocked(SoneLockedEvent soneLockedEvent) {
                final Sone sone = soneLockedEvent.sone();
-               Object tickerObject = Ticker.getInstance().registerEvent(System.currentTimeMillis() + (5 * 60) * 1000, new Runnable() {
+               ScheduledFuture<?> tickerObject = ticker.schedule(new Runnable() {
 
                        @Override
                        @SuppressWarnings("synthetic-access")
@@ -962,7 +967,7 @@ public class WebInterface {
                                lockedSonesTickerObjects.remove(sone);
                                notificationManager.addNotification(lockedSonesNotification);
                        }
-               }, "Sone Locked Notification");
+               }, 5, TimeUnit.MINUTES);
                lockedSonesTickerObjects.put(sone, tickerObject);
        }
 
@@ -975,7 +980,7 @@ public class WebInterface {
        @Subscribe
        public void soneUnlocked(SoneUnlockedEvent soneUnlockedEvent) {
                lockedSonesNotification.remove(soneUnlockedEvent.sone());
-               Ticker.getInstance().deregisterEvent(lockedSonesTickerObjects.remove(soneUnlockedEvent.sone()));
+               lockedSonesTickerObjects.remove(soneUnlockedEvent.sone()).cancel(false);
        }
 
        /**