X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2Fimpl%2FPostReplyBuilderImpl.java;h=7235bc913ecb5403aae39a6724429af3480b5a88;hp=18ce2005f321fcb4da587ca219fdf423c6fc4e0a;hb=7b55e0be6a3283e43a9bbab98f82aebdd948eb33;hpb=8503021c00d63885288c507d9930fefabd5d7678

diff --git a/src/main/java/net/pterodactylus/sone/data/impl/PostReplyBuilderImpl.java b/src/main/java/net/pterodactylus/sone/data/impl/PostReplyBuilderImpl.java
index 18ce200..7235bc9 100644
--- a/src/main/java/net/pterodactylus/sone/data/impl/PostReplyBuilderImpl.java
+++ b/src/main/java/net/pterodactylus/sone/data/impl/PostReplyBuilderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Sone - PostReplyBuilderImpl.java - Copyright © 2013 David Roden
+ * Sone - PostReplyBuilderImpl.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
@@ -21,11 +21,10 @@ import static com.google.common.base.Preconditions.checkState;
 
 import java.util.UUID;
 
-import net.pterodactylus.sone.core.PostProvider;
 import net.pterodactylus.sone.data.PostReply;
-import net.pterodactylus.sone.data.PostReplyBuilder;
-
-import org.apache.commons.lang.StringUtils;
+import net.pterodactylus.sone.database.PostProvider;
+import net.pterodactylus.sone.database.PostReplyBuilder;
+import net.pterodactylus.sone.database.SoneProvider;
 
 /**
  * {@link PostReplyBuilder} implementation that creates {@link PostReplyImpl}
@@ -33,21 +32,24 @@ import org.apache.commons.lang.StringUtils;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class PostReplyBuilderImpl extends AbstractReplyBuilder<PostReplyBuilder> implements PostReplyBuilder {
+public class PostReplyBuilderImpl extends AbstractPostReplyBuilder {
 
-	/** The post builder. */
-	private final PostProvider postProvider;
+	/** The Sone provider. */
+	private final SoneProvider soneProvider;
 
-	/** The ID of the post the created reply refers to. */
-	private String postId;
+	/** The post provider. */
+	private final PostProvider postProvider;
 
 	/**
 	 * Creates a new post reply builder.
 	 *
+	 * @param soneProvider
+	 *            The Sone provider
 	 * @param postProvider
 	 *            The post provider
 	 */
-	public PostReplyBuilderImpl(PostProvider postProvider) {
+	public PostReplyBuilderImpl(SoneProvider soneProvider, PostProvider postProvider) {
+		this.soneProvider = soneProvider;
 		this.postProvider = postProvider;
 	}
 
@@ -55,28 +57,15 @@ public class PostReplyBuilderImpl extends AbstractReplyBuilder<PostReplyBuilder>
 	 * {@inheritDoc}
 	 */
 	@Override
-	public PostReplyBuilder to(String postId) {
-		this.postId = postId;
-		return this;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
 	public PostReply build() {
 		checkState((randomId && (id == null)) || (!randomId && (id != null)), "either random ID nor custom ID must be set");
-		checkState(sender != null, "sender must not be null");
+		checkState(senderId != null, "sender must not be null");
 		checkState((currentTime && (time == 0)) || (!currentTime && (time >= 0)), "either 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(postId != null, "post must not be null");
 
 		/* create new post reply. */
-		PostReplyImpl postReplyImpl = new PostReplyImpl(postProvider, randomId ? UUID.randomUUID().toString() : id);
-		postReplyImpl.setSone(sender);
-		postReplyImpl.setPost(postId);
-		postReplyImpl.setTime(currentTime ? System.currentTimeMillis() : time);
-		postReplyImpl.setText(text);
-		return postReplyImpl;
+		return new PostReplyImpl(soneProvider, postProvider, randomId ? UUID.randomUUID().toString() : id, senderId, currentTime ? System.currentTimeMillis() : time, text, postId);
 	}
+
 }