X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=e885bb5e0a281620a7c347f98e5bec6c3836d002;hb=d8c3ac6bf0ee859cfe5abfe8aaf4bff8a5e91c4e;hp=34083837bf30bffd220958f577284e2bf1d055d0;hpb=a90c83da842c28f0e045d8a09dd3480643cd87f1;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 3408383..e885bb5 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -73,7 +73,7 @@ import freenet.keys.FreenetURI;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class Core extends AbstractService implements IdentityListener, UpdateListener, SoneProvider, PostProvider, SoneInsertListener, ImageInsertListener {
+public class Core extends AbstractService implements IdentityListener, UpdateListener, SoneProvider, PostProvider, SoneInsertListener, ImageInsertListener, PostReplyProvider {
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(Core.class);
@@ -608,30 +608,10 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	}
 
 	/**
-	 * Returns the reply with the given ID. If there is no reply with the given
-	 * ID yet, a new one is created.
-	 *
-	 * @param replyId
-	 *            The ID of the reply to get
-	 * @return The reply
-	 */
-	public PostReply getReply(String replyId) {
-		return getReply(replyId, true);
-	}
-
-	/**
-	 * Returns the reply with the given ID. If there is no reply with the given
-	 * ID yet, a new one is created, unless {@code create} is false in which
-	 * case {@code null} is returned.
-	 *
-	 * @param replyId
-	 *            The ID of the reply to get
-	 * @param create
-	 *            {@code true} to always return a {@link Reply}, {@code false}
-	 *            to return {@code null} if no reply can be found
-	 * @return The reply, or {@code null} if there is no such reply
+	 * {@inheritDoc}
 	 */
-	public PostReply getReply(String replyId, boolean create) {
+	@Override
+	public PostReply getPostReply(String replyId, boolean create) {
 		synchronized (replies) {
 			PostReply reply = replies.get(replyId);
 			if (create && (reply == null)) {
@@ -1382,7 +1362,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 				logger.log(Level.WARNING, "Invalid reply found, aborting load!");
 				return;
 			}
-			replies.add(getReply(replyId).setSone(sone).setPost(getPost(postId)).setTime(replyTime).setText(replyText));
+			replies.add(getPostReply(replyId, true).setSone(sone).setPost(getPost(postId)).setTime(replyTime).setText(replyText));
 		}
 
 		/* load post likes. */
@@ -1580,6 +1560,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	 * @return The created post
 	 */
 	public Post createPost(Sone sone, Sone recipient, long time, String text) {
+		Validation.begin().isNotNull("Text", text).check().isGreater("Text Length", text.length(), 0).check();
 		if (!isLocalSone(sone)) {
 			logger.log(Level.FINE, String.format("Tried to create post for non-local Sone: %s", sone));
 			return null;
@@ -1720,6 +1701,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	 * @return The created reply
 	 */
 	public PostReply createReply(Sone sone, Post post, long time, String text) {
+		Validation.begin().isNotNull("Text", text).check().isGreater("Text Length", text.trim().length(), 0).check();
 		if (!isLocalSone(sone)) {
 			logger.log(Level.FINE, String.format("Tried to create reply for non-local Sone: %s", sone));
 			return null;