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=ca927b2215cad8c344aa379c5ebe3b597dd7197f;hp=3a56dc99850de79a3b4710c9a25ab1595f19aa4f;hb=438378deab1514f0f608d975ef65f5b7aea44ccb;hpb=6f019de1d4d9742981d851ac3c9097cca8bff58e 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 3a56dc9..ca927b2 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–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 @@ -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; @@ -28,8 +26,6 @@ import net.pterodactylus.sone.database.SoneProvider; /** * Abstract {@link PostBuilder} implementation. It stores the state of the new * post and performs validation, you only need to implement {@link #build()}. - * - * @author David ‘Bombe’ Roden */ public abstract class AbstractPostBuilder implements PostBuilder { @@ -163,7 +159,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"); }