X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2Fimpl%2FAbstractPostBuilder.java;h=9e2c50a4a94f6140d3e40cd542c2a3cb1ecf5bb5;hp=342ea5cf6b87f0d5991382e0b8e20a8f15cbe484;hb=7b55e0be6a3283e43a9bbab98f82aebdd948eb33;hpb=c50bfe2d891013b8da5539acf2881da5f60da231

diff --git a/src/main/java/net/pterodactylus/sone/data/impl/AbstractPostBuilder.java b/src/main/java/net/pterodactylus/sone/data/impl/AbstractPostBuilder.java
index 342ea5c..9e2c50a 100644
--- a/src/main/java/net/pterodactylus/sone/data/impl/AbstractPostBuilder.java
+++ b/src/main/java/net/pterodactylus/sone/data/impl/AbstractPostBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Sone - AbstractPostBuilder.java - Copyright © 2013 David Roden
+ * Sone - AbstractPostBuilder.java - Copyright © 2013–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
@@ -19,8 +19,6 @@ package net.pterodactylus.sone.data.impl;
 
 import static com.google.common.base.Preconditions.checkState;
 
-import org.apache.commons.lang.StringUtils;
-
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.database.PostBuilder;
 import net.pterodactylus.sone.database.SoneProvider;
@@ -82,7 +80,7 @@ public abstract class AbstractPostBuilder implements PostBuilder {
 		this.currentTime = false;
 		this.time = post.getTime();
 		this.text = post.getText();
-		this.recipientId = (post.getRecipient() != null) ? post.getRecipient().getId() : null;
+		this.recipientId = post.getRecipientId().orNull();
 		return this;
 	}
 
@@ -163,7 +161,7 @@ public abstract class AbstractPostBuilder implements PostBuilder {
 		checkState((randomId && (id == null)) || (!randomId && (id != null)), "exactly one of random ID or custom ID must be set");
 		checkState(senderId != null, "sender must not be null");
 		checkState((currentTime && (time == 0)) || (!currentTime && (time > 0)), "one of current time or custom time must be set");
-		checkState(!StringUtils.isBlank(text), "text must not be empty");
+		checkState((text != null) && !text.trim().isEmpty(), "text must not be empty");
 		checkState((recipientId == null) || !recipientId.equals(senderId), "sender and recipient must not be the same");
 	}