X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryPost.java;h=451b6b50c04517c3ca3c21d62c12732737a6a8f2;hb=5c5bee980f9cab5792e34d1c9840f73b8b191830;hp=84f37140b7832d72727b168757f24728e2f98f13;hpb=268574fb0cd808a3a575843af256f8b98b643cb6;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/database/memory/MemoryPost.java b/src/main/java/net/pterodactylus/sone/database/memory/MemoryPost.java
index 84f3714..451b6b5 100644
--- a/src/main/java/net/pterodactylus/sone/database/memory/MemoryPost.java
+++ b/src/main/java/net/pterodactylus/sone/database/memory/MemoryPost.java
@@ -1,5 +1,5 @@
/*
- * Sone - PostImpl.java - Copyright © 2010â2013 David Roden
+ * Sone - MemoryPost.java - Copyright © 2010â2020 David Roden
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,6 +17,8 @@
package net.pterodactylus.sone.database.memory;
+import static com.google.common.base.Optional.fromNullable;
+
import java.util.UUID;
import net.pterodactylus.sone.data.Post;
@@ -28,13 +30,11 @@ import com.google.common.base.Optional;
/**
* A post is a short message that a user writes in his Sone to let other users
* know what is going on.
- *
- * @author David âBombeâ Roden
*/
class MemoryPost implements Post {
/** The post database. */
- private final MemoryPostDatabase postDatabase;
+ private final MemoryDatabase postDatabase;
/** The Sone provider. */
private final SoneProvider soneProvider;
@@ -72,7 +72,7 @@ class MemoryPost implements Post {
* @param text
* The text of the post
*/
- public MemoryPost(MemoryPostDatabase postDatabase, SoneProvider soneProvider, String id, String soneId, String recipientId, long time, String text) {
+ public MemoryPost(MemoryDatabase postDatabase, SoneProvider soneProvider, String id, String soneId, String recipientId, long time, String text) {
this.postDatabase = postDatabase;
this.soneProvider = soneProvider;
this.id = UUID.fromString(id);
@@ -94,12 +94,17 @@ class MemoryPost implements Post {
return id.toString();
}
+ @Override
+ public boolean isLoaded() {
+ return true;
+ }
+
/**
* {@inheritDoc}
*/
@Override
public Sone getSone() {
- return soneProvider.getSone(soneId).get();
+ return soneProvider.getSone(soneId);
}
/**
@@ -107,7 +112,7 @@ class MemoryPost implements Post {
*/
@Override
public Optional getRecipientId() {
- return Optional.fromNullable(recipientId);
+ return fromNullable(recipientId);
}
/**
@@ -115,7 +120,7 @@ class MemoryPost implements Post {
*/
@Override
public Optional getRecipient() {
- return soneProvider.getSone(recipientId);
+ return recipientId == null ? Optional.absent() : fromNullable(soneProvider.getSone(recipientId));
}
/**