From 12e62c8aeeb9e839f336b8234867bf28db2547f7 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Wed, 19 Feb 2020 10:28:10 +0800
Subject: [PATCH] Deprecate BlockingBot.dispose
---
.../main/java/net/mamoe/mirai/japt/BlockingBot.java | 10 +++++++++-
.../net/mamoe/mirai/japt/internal/BlockingBotImpl.kt | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/mirai-japt/src/main/java/net/mamoe/mirai/japt/BlockingBot.java b/mirai-japt/src/main/java/net/mamoe/mirai/japt/BlockingBot.java
index fb55493a6..6b2e17197 100644
--- a/mirai-japt/src/main/java/net/mamoe/mirai/japt/BlockingBot.java
+++ b/mirai-japt/src/main/java/net/mamoe/mirai/japt/BlockingBot.java
@@ -184,5 +184,13 @@ public interface BlockingBot {
/**
* 关闭这个 [Bot], 停止一切相关活动. 不可重新登录.
*/
- void dispose(@Nullable Throwable throwable);
+ void close(@Nullable Throwable throwable);
+
+ /**
+ * @deprecated 使用 {@link #close(Throwable)}
+ */
+ @Deprecated
+ default void dispose(@Nullable Throwable throwable) {
+ close(throwable);
+ }
}
diff --git a/mirai-japt/src/main/kotlin/net/mamoe/mirai/japt/internal/BlockingBotImpl.kt b/mirai-japt/src/main/kotlin/net/mamoe/mirai/japt/internal/BlockingBotImpl.kt
index 0fbc212b4..d589fed7c 100644
--- a/mirai-japt/src/main/kotlin/net/mamoe/mirai/japt/internal/BlockingBotImpl.kt
+++ b/mirai-japt/src/main/kotlin/net/mamoe/mirai/japt/internal/BlockingBotImpl.kt
@@ -65,5 +65,5 @@ internal class BlockingBotImpl(private val bot: Bot) : BlockingBot {
override fun addFriend(id: Long, message: String?, remark: String?): AddFriendResult = runBlocking { bot.addFriend(id, message, remark) }
override fun approveFriendAddRequest(id: Long, remark: String?) = runBlocking { bot.approveFriendAddRequest(id, remark) }
- override fun dispose(throwable: Throwable?) = bot.close(throwable)
+ override fun close(throwable: Throwable?) = bot.close(throwable)
}
\ No newline at end of file