X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=inline;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryPost.java;h=75eae49342a48c3fd92849bec072548cf6af87cf;hb=242da074894d2ffcbb1a61f16ed881db9bc51ff0;hp=3a2b7c4ab81cb561c7994b3c2f2d7c27f79309c1;hpb=c8897b270214c5e3c1e0c5cd4db9ac1821bfbde0;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 3a2b7c4..75eae49 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 - MemoryPost.java - Copyright © 2010â2013 David Roden
+ * Sone - MemoryPost.java - Copyright © 2010â2016 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,19 +17,22 @@
package net.pterodactylus.sone.database.memory;
+import static com.google.common.base.Optional.fromNullable;
+
import java.util.UUID;
+import javax.annotation.Nullable;
+
import net.pterodactylus.sone.data.Post;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.database.SoneProvider;
+import com.google.common.base.Function;
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 {
@@ -104,7 +107,7 @@ class MemoryPost implements Post {
*/
@Override
public Sone getSone() {
- return soneProvider.getSone(soneId).get();
+ return soneProvider.getSone(soneId);
}
/**
@@ -112,7 +115,7 @@ class MemoryPost implements Post {
*/
@Override
public Optional getRecipientId() {
- return Optional.fromNullable(recipientId);
+ return fromNullable(recipientId);
}
/**
@@ -120,7 +123,13 @@ class MemoryPost implements Post {
*/
@Override
public Optional getRecipient() {
- return soneProvider.getSone(recipientId);
+ return Optional.fromNullable(recipientId).transform(new Function() {
+ @Nullable
+ @Override
+ public Sone apply(String input) {
+ return soneProvider.getSone(input);
+ }
+ });
}
/**