Remove createPost(*) methods from Core.

[Sone.git] / src / main / java / net / pterodactylus / sone / data / impl / AbstractPostBuilder.java

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..65dd1bd 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/data/impl/AbstractPostBuilder.java
+++ b/src/main/java/net/pterodactylus/sone/data/impl/AbstractPostBuilder.java
@@ -17,13 +17,16 @@
 
 package net.pterodactylus.sone.data.impl;
 
+import static com.google.common.base.Optional.absent;
+import static com.google.common.base.Preconditions.checkNotNull;
 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.Database;
 import net.pterodactylus.sone.database.PostBuilder;
-import net.pterodactylus.sone.database.SoneProvider;
+
+import com.google.common.base.Optional;
+import org.apache.commons.lang.StringUtils;
 
 /**
  * Abstract {@link PostBuilder} implementation. It stores the state of the new
@@ -33,8 +36,8 @@ import net.pterodactylus.sone.database.SoneProvider;
  */
 public abstract class AbstractPostBuilder implements PostBuilder {
 
-       /** The Sone provider for the created posts. */
-       protected final SoneProvider soneProvider;
+       protected final Database database;
+       protected final String senderId;
 
        /** Wether to create a post with a random ID. */
        protected boolean randomId;
@@ -42,9 +45,6 @@ public abstract class AbstractPostBuilder implements PostBuilder {
        /** The ID of the post. */
        protected String id;
 
-       /** The sender of the post. */
-       protected String senderId;
-
        /** Whether to use the current time when creating the post. */
        protected boolean currentTime;
 
@@ -55,16 +55,11 @@ public abstract class AbstractPostBuilder implements PostBuilder {
        protected String text;
 
        /** The (optional) recipient of the post. */
-       protected String recipientId;
+       protected Optional<String> recipientId = absent();
 
-       /**
-        * Creates a new abstract post builder.
-        *
-        * @param soneProvider
-        *            The Sone provider
-        */
-       public AbstractPostBuilder(SoneProvider soneProvider) {
-               this.soneProvider = soneProvider;
+       protected AbstractPostBuilder(Database database, String soneId) {
+               this.database = checkNotNull(database, "database must not be null");
+               this.senderId = checkNotNull(soneId, "sender ID must not be null");
        }
 
        //
@@ -75,21 +70,6 @@ public abstract class AbstractPostBuilder implements PostBuilder {
         * {@inheritDoc}
         */
        @Override
-       public PostBuilder copyPost(Post post) {
-               this.randomId = false;
-               this.id = post.getId();
-               this.senderId = post.getSone().getId();
-               this.currentTime = false;
-               this.time = post.getTime();
-               this.text = post.getText();
-               this.recipientId = post.getRecipientId().orNull();
-               return this;
-       }
-
-       /**
-        * {@inheritDoc}
-        */
-       @Override
        public PostBuilder randomId() {
                randomId = true;
                return this;
@@ -108,15 +88,6 @@ public abstract class AbstractPostBuilder implements PostBuilder {
         * {@inheritDoc}
         */
        @Override
-       public PostBuilder from(String senderId) {
-               this.senderId = senderId;
-               return this;
-       }
-
-       /**
-        * {@inheritDoc}
-        */
-       @Override
        public PostBuilder currentTime() {
                currentTime = true;
                return this;
@@ -144,7 +115,7 @@ public abstract class AbstractPostBuilder implements PostBuilder {
         * {@inheritDoc}
         */
        @Override
-       public PostBuilder to(String recipientId) {
+       public PostBuilder to(Optional<String> recipientId) {
                this.recipientId = recipientId;
                return this;
        }
@@ -161,10 +132,9 @@ public abstract class AbstractPostBuilder implements PostBuilder {
         */
        protected void validate() throws IllegalStateException {
                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((recipientId == null) || !recipientId.equals(senderId), "sender and recipient must not be the same");
+               checkState(!recipientId.isPresent() || !senderId.equals(recipientId.get()), "sender and recipient must not be the same");
        }
 
 }