X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FReply.java;h=cf50a5cb0df9ac2fd72f359ad7f10b22d4aa5655;hb=3c93a3f01e3cab17bda2b97354ffee23929cb26a;hp=cb7ac949fa8d119ddcf70a66c257532cd0046ab6;hpb=dc07688d67850c90b7adda025a41d42b62d15f9e;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/data/Reply.java b/src/main/java/net/pterodactylus/sone/data/Reply.java
index cb7ac94..cf50a5c 100644
--- a/src/main/java/net/pterodactylus/sone/data/Reply.java
+++ b/src/main/java/net/pterodactylus/sone/data/Reply.java
@@ -20,6 +20,7 @@ package net.pterodactylus.sone.data;
import java.util.Comparator;
import com.google.common.base.Predicate;
+import com.google.common.primitives.Longs;
/**
* Defines methods common for all replies.
@@ -28,32 +29,22 @@ import com.google.common.base.Predicate;
* The type of the reply
* @author David âBombeâ Roden
*/
-public interface Reply> {
+public interface Reply> extends Identified {
/** Comparator that sorts replies ascending by time. */
- public static final Comparator super Reply>> TIME_COMPARATOR = new Comparator>() {
-
- /**
- * {@inheritDoc}
- */
+ Comparator super Reply>> TIME_COMPARATOR = new Comparator>() {
@Override
public int compare(Reply> leftReply, Reply> rightReply) {
- return (int) Math.max(Integer.MIN_VALUE, Math.min(Integer.MAX_VALUE, leftReply.getTime() - rightReply.getTime()));
+ return Longs.compare(leftReply.getTime(), rightReply.getTime());
}
-
};
/** Filter for replies with timestamps from the future. */
- public static final Predicate> FUTURE_REPLY_FILTER = new Predicate>() {
-
- /**
- * {@inheritDoc}
- */
+ Predicate> FUTURE_REPLY_FILTER = new Predicate>() {
@Override
public boolean apply(Reply> reply) {
- return reply.getTime() <= System.currentTimeMillis();
+ return (reply != null) && (reply.getTime() <= System.currentTimeMillis());
}
-
};
/**
@@ -61,70 +52,44 @@ public interface Reply> {
*
* @return The ID of the reply
*/
- public String getId();
+ String getId();
+ String getInternalId();
/**
* Returns the Sone that posted this reply.
*
* @return The Sone that posted this reply
*/
- public Sone getSone();
-
- /**
- * Sets the Sone that posted this reply.
- *
- * @param sone
- * The Sone that posted this reply
- * @return This reply
- */
- public T setSone(Sone sone);
+ Sone getSone();
/**
* Returns the time of the reply.
*
* @return The time of the reply (in milliseconds since Jan 1, 1970 UTC)
*/
- public long getTime();
-
- /**
- * Sets the time of the reply.
- *
- * @param time
- * The time of the reply (in milliseconds since Jan 1, 1970 UTC)
- * @return This reply
- */
- public T setTime(long time);
+ long getTime();
/**
* Returns the text of the reply.
*
* @return The text of the reply
*/
- public String getText();
-
- /**
- * Sets the text of the reply.
- *
- * @param text
- * The text of the reply
- * @return This reply
- */
- public T setText(String text);
+ String getText();
/**
* Returns whether this reply is known.
*
* @return {@code true} if this reply is known, {@code false} otherwise
*/
- public boolean isKnown();
+ boolean isKnown();
/**
* Sets whether this reply is known.
*
* @param known
- * {@code true} if this reply is known, {@code false} otherwise
+ * {@code true} if this reply is known, {@code false} otherwise
* @return This reply
*/
- public T setKnown(boolean known);
+ T setKnown(boolean known);
-}
\ No newline at end of file
+}