🔀 Merge branch 'release/v82'

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

diff --git a/src/main/java/net/pterodactylus/sone/data/impl/AbstractReplyBuilder.java b/src/main/java/net/pterodactylus/sone/data/impl/AbstractReplyBuilder.java
index 77e484a..7e95f38 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/data/impl/AbstractReplyBuilder.java
+++ b/src/main/java/net/pterodactylus/sone/data/impl/AbstractReplyBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Sone - ReplyBuilder.java - Copyright © 2013 David Roden
+ * Sone - AbstractReplyBuilder.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
@@ -17,19 +17,15 @@
 
 package net.pterodactylus.sone.data.impl;
 
-import net.pterodactylus.sone.data.ReplyBuilder;
-import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.database.ReplyBuilder;
 
 /**
  * Abstract implementation of a {@link ReplyBuilder}.
  *
- * @param <C>
- *            The concrete implementation of the builder
  * @param <B>
  *            The interface implemented and exposed by the builder
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class AbstractReplyBuilder<C extends AbstractReplyBuilder<C, B>, B extends ReplyBuilder<B>> implements ReplyBuilder<B> {
+public class AbstractReplyBuilder<B extends ReplyBuilder<B>> implements ReplyBuilder<B> {
 
        /** Whether to use a random ID for the reply. */
        protected boolean randomId;
@@ -38,7 +34,7 @@ public class AbstractReplyBuilder<C extends AbstractReplyBuilder<C, B>, B extend
        protected String id;
 
        /** The sender of the reply. */
-       protected Sone sender;
+       protected String senderId;
 
        /** Whether to use the current time when creating the reply. */
        protected boolean currentTime;
@@ -74,8 +70,8 @@ public class AbstractReplyBuilder<C extends AbstractReplyBuilder<C, B>, B extend
         */
        @Override
        @SuppressWarnings("unchecked")
-       public B from(Sone sender) {
-               this.sender = sender;
+       public B from(String senderId) {
+               this.senderId = senderId;
                return (B) this;
        }