X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=1ebdcc879b7f2d395e4552c948ad7ea9a092aaec;hb=14b1aa4bf4b88e80f9cce4ec14d0950727df4a5f;hp=9713ddcbc0b47814e6593f8db002e333cc00f580;hpb=03946e6554d5a59f54058fbf89b407ef327344ca;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 9713ddc..1ebdcc8 100644
--- 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;
@@ -521,24 +522,12 @@ public class Core extends AbstractService implements SoneProvider, PostProvider
 	}
 
 	/**
-	 * Returns the post with the given ID, optionally creating a new post.
-	 *
-	 * @param postId
-	 *            The ID of the post to get
-	 * @param create
-	 *            {@code true} it create a new post if no post with the given ID
-	 *            exists, {@code false} to return {@code null}
-	 * @return The post, or {@code null} if there is no such post
+	 * {@inheritDoc}
 	 */
 	@Override
-	public Post getPost(String postId, boolean create) {
+	public Post getPost(String postId) {
 		synchronized (posts) {
-			Post post = posts.get(postId);
-			if ((post == null) && create) {
-				post = new PostImpl(postId);
-				posts.put(postId, post);
-			}
-			return post;
+			return posts.get(postId);
 		}
 	}
 
@@ -676,7 +665,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider
 		Set<Post> posts = new HashSet<Post>();
 		synchronized (bookmarkedPosts) {
 			for (String bookmarkedPostId : bookmarkedPosts) {
-				Post post = getPost(bookmarkedPostId, false);
+				Post post = getPost(bookmarkedPostId);
 				if (post != null) {
 					posts.add(post);
 				}
@@ -1547,7 +1536,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 +1545,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider
 			public void run() {
 				markPostKnown(post);
 			}
-		}, "Mark " + post + " read.");
+		}, 10, TimeUnit.SECONDS);
 		return post;
 	}
 
@@ -1688,7 +1677,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 +1686,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider
 			public void run() {
 				markReplyKnown(reply);
 			}
-		}, "Mark " + reply + " read.");
+		}, 10, TimeUnit.SECONDS);
 		return reply;
 	}
 
@@ -1940,6 +1929,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();
@@ -2197,8 +2187,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider
 		}));
 		options.addIntegerOption("PostsPerPage", new DefaultOption<Integer>(10, new IntegerRangePredicate(1, Integer.MAX_VALUE)));
 		options.addIntegerOption("ImagesPerPage", new DefaultOption<Integer>(9, new IntegerRangePredicate(1, Integer.MAX_VALUE)));
-		options.addIntegerOption("CharactersPerPost", new DefaultOption<Integer>(400, Predicates.or(new IntegerRangePredicate(50, Integer.MAX_VALUE), Predicates.equalTo(-1))));
-		options.addIntegerOption("PostCutOffLength", new DefaultOption<Integer>(200, Predicates.or(new IntegerRangePredicate(50, Integer.MAX_VALUE), Predicates.equalTo(-1))));
+		options.addIntegerOption("CharactersPerPost", new DefaultOption<Integer>(400, Predicates.<Integer> or(new IntegerRangePredicate(50, Integer.MAX_VALUE), Predicates.equalTo(-1))));
+		options.addIntegerOption("PostCutOffLength", new DefaultOption<Integer>(200, Predicates.<Integer> or(new IntegerRangePredicate(50, Integer.MAX_VALUE), Predicates.equalTo(-1))));
 		options.addBooleanOption("RequireFullAccess", new DefaultOption<Boolean>(false));
 		options.addIntegerOption("PositiveTrust", new DefaultOption<Integer>(75, new IntegerRangePredicate(0, 100)));
 		options.addIntegerOption("NegativeTrust", new DefaultOption<Integer>(-25, new IntegerRangePredicate(-100, 100)));