X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FPost.java;h=95abae6fa083f6669cfee9adbfdc1ab8c29c6a3f;hp=5269fe46f15ee9dcd796639844090b80d507bc74;hb=0e8f7804ce344bdd69f5ecc7febe25a60a53561d;hpb=45803a1c678d6811f7bbf85d50c79844031be0f0

diff --git a/src/main/java/net/pterodactylus/sone/data/Post.java b/src/main/java/net/pterodactylus/sone/data/Post.java
index 5269fe4..95abae6 100644
--- a/src/main/java/net/pterodactylus/sone/data/Post.java
+++ b/src/main/java/net/pterodactylus/sone/data/Post.java
@@ -17,6 +17,8 @@
 
 package net.pterodactylus.sone.data;
 
+import static com.google.common.base.Optional.absent;
+
 import java.util.Comparator;
 
 import com.google.common.base.Optional;
@@ -28,7 +30,7 @@ import com.google.common.base.Predicate;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public interface Post {
+public interface Post extends Identified {
 
 	/** Comparator for posts, sorts descending by time. */
 	public static final Comparator<Post> TIME_COMPARATOR = new Comparator<Post>() {
@@ -45,7 +47,7 @@ public interface Post {
 
 		@Override
 		public boolean apply(Post post) {
-			return post.getTime() <= System.currentTimeMillis();
+			return (post != null) && (post.getTime() <= System.currentTimeMillis());
 		}
 
 	};
@@ -62,19 +64,19 @@ public interface Post {
 	public String getId();
 
 	/**
-	 * Returns the Sone this post belongs to.
+	 * Returns whether this post has already been loaded.
 	 *
-	 * @return The Sone of this post
+	 * @return {@code true} if this post has already been loaded, {@code
+	 * false} otherwise
 	 */
-	public Sone getSone();
+	boolean isLoaded();
 
 	/**
-	 * Returns whether this post has a recipient.
+	 * Returns the Sone this post belongs to.
 	 *
-	 * @return {@code true} if this post has a recipient, {@code false}
-	 *         otherwise
+	 * @return The Sone of this post
 	 */
-	public boolean hasRecipient();
+	public Sone getSone();
 
 	/**
 	 * Returns the ID of the recipient {@link Sone}, or
@@ -85,10 +87,7 @@ public interface Post {
 	public Optional<String> getRecipientId();
 
 	/**
-	 * Returns the recipient of this post, if any. As this method can return
-	 * {@link Optional#absent()} if the post has a recipient which has not yet
-	 * been loaded, it is recommended to use {@link #hasRecipient()} to check
-	 * for the presence of a recipient.
+	 * Returns the recipient of this post, if any.
 	 *
 	 * @return The recipient of this post, or {@link Optional#absent()} if there
 	 *         is no recipient
@@ -125,4 +124,65 @@ public interface Post {
 	 */
 	public Post setKnown(boolean known);
 
+	/**
+	 * Shell for a post that has not yet been loaded.
+	 *
+	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’
+	 *         Roden</a>
+	 */
+	public static class EmptyPost implements Post {
+
+		private final String id;
+
+		public EmptyPost(String id) {
+			this.id = id;
+		}
+
+		@Override
+		public String getId() {
+			return id;
+		}
+
+		@Override
+		public boolean isLoaded() {
+			return false;
+		}
+
+		@Override
+		public Sone getSone() {
+			return null;
+		}
+
+		@Override
+		public Optional<String> getRecipientId() {
+			return absent();
+		}
+
+		@Override
+		public Optional<Sone> getRecipient() {
+			return absent();
+		}
+
+		@Override
+		public long getTime() {
+			return 0;
+		}
+
+		@Override
+		public String getText() {
+			return null;
+		}
+
+		@Override
+		public boolean isKnown() {
+			return false;
+		}
+
+		@Override
+		public Post setKnown(boolean known) {
+			return this;
+		}
+
+	}
+
 }