From 097a478999188f8ed8c277c658d734dc8c4e339c Mon Sep 17 00:00:00 2001 From: Him188 Date: Fri, 16 Apr 2021 01:46:02 +0800 Subject: [PATCH] Relocates netty files to correct packages --- mirai-core/src/commonMain/kotlin/AbstractBot.kt | 2 +- mirai-core/src/commonMain/kotlin/QQAndroidBot.kt | 6 +++--- mirai-core/src/commonMain/kotlin/contact/GroupImpl.kt | 2 +- .../kotlin/network/{net => handler}/NetworkHandler.kt | 4 ++-- .../impl/netty => handler/impl}/NetworkHandlerSupport.kt | 6 +++--- .../{net => handler}/impl/netty/NettyNetworkHandler.kt | 7 ++++--- .../impl/netty/NetyNetworkHandlerFactory.kt | 6 +++--- .../kotlin/network/net/protocol/SsoController.kt | 2 +- .../network/protocol/packet/OutgoingPacketAndroid.kt | 2 +- mirai-core/src/commonTest/kotlin/network/NettyTestUnit.kt | 1 - 10 files changed, 19 insertions(+), 19 deletions(-) rename mirai-core/src/commonMain/kotlin/network/{net => handler}/NetworkHandler.kt (98%) rename mirai-core/src/commonMain/kotlin/network/{net/impl/netty => handler/impl}/NetworkHandlerSupport.kt (96%) rename mirai-core/src/commonMain/kotlin/network/{net => handler}/impl/netty/NettyNetworkHandler.kt (97%) rename mirai-core/src/commonMain/kotlin/network/{net => handler}/impl/netty/NetyNetworkHandlerFactory.kt (76%) diff --git a/mirai-core/src/commonMain/kotlin/AbstractBot.kt b/mirai-core/src/commonMain/kotlin/AbstractBot.kt index ba527bcd4..751e14885 100644 --- a/mirai-core/src/commonMain/kotlin/AbstractBot.kt +++ b/mirai-core/src/commonMain/kotlin/AbstractBot.kt @@ -27,7 +27,7 @@ import net.mamoe.mirai.event.EventPriority.MONITOR import net.mamoe.mirai.event.events.BotEvent import net.mamoe.mirai.event.events.BotOfflineEvent import net.mamoe.mirai.internal.network.DefaultServerList -import net.mamoe.mirai.internal.network.net.NetworkHandler +import net.mamoe.mirai.internal.network.handler.NetworkHandler import net.mamoe.mirai.supervisorJob import net.mamoe.mirai.utils.* import kotlin.coroutines.CoroutineContext diff --git a/mirai-core/src/commonMain/kotlin/QQAndroidBot.kt b/mirai-core/src/commonMain/kotlin/QQAndroidBot.kt index bb567aeef..00779832e 100644 --- a/mirai-core/src/commonMain/kotlin/QQAndroidBot.kt +++ b/mirai-core/src/commonMain/kotlin/QQAndroidBot.kt @@ -24,9 +24,9 @@ import net.mamoe.mirai.internal.message.ForwardMessageInternal import net.mamoe.mirai.internal.message.LongMessageInternal import net.mamoe.mirai.internal.network.* import net.mamoe.mirai.internal.network.handler.BdhSessionSyncer -import net.mamoe.mirai.internal.network.net.NetworkHandler -import net.mamoe.mirai.internal.network.net.NetworkHandlerContextImpl -import net.mamoe.mirai.internal.network.net.impl.netty.NettyNetworkHandler +import net.mamoe.mirai.internal.network.handler.NetworkHandler +import net.mamoe.mirai.internal.network.handler.NetworkHandlerContextImpl +import net.mamoe.mirai.internal.network.handler.impl.netty.NettyNetworkHandler import net.mamoe.mirai.internal.network.net.protocol.SsoContext import net.mamoe.mirai.internal.network.protocol.packet.OutgoingPacket import net.mamoe.mirai.internal.network.protocol.packet.OutgoingPacketWithRespType diff --git a/mirai-core/src/commonMain/kotlin/contact/GroupImpl.kt b/mirai-core/src/commonMain/kotlin/contact/GroupImpl.kt index 7a2c2d028..3f99e7878 100644 --- a/mirai-core/src/commonMain/kotlin/contact/GroupImpl.kt +++ b/mirai-core/src/commonMain/kotlin/contact/GroupImpl.kt @@ -23,13 +23,13 @@ import net.mamoe.mirai.internal.QQAndroidBot import net.mamoe.mirai.internal.contact.info.MemberInfoImpl import net.mamoe.mirai.internal.message.OfflineGroupImage import net.mamoe.mirai.internal.network.BdhSession +import net.mamoe.mirai.internal.network.handler.NetworkHandler import net.mamoe.mirai.internal.network.highway.ChannelKind import net.mamoe.mirai.internal.network.highway.Highway import net.mamoe.mirai.internal.network.highway.ResourceKind.GROUP_IMAGE import net.mamoe.mirai.internal.network.highway.ResourceKind.GROUP_VOICE import net.mamoe.mirai.internal.network.highway.postPtt import net.mamoe.mirai.internal.network.highway.tryServersUpload -import net.mamoe.mirai.internal.network.net.NetworkHandler import net.mamoe.mirai.internal.network.protocol.data.proto.Cmd0x388 import net.mamoe.mirai.internal.network.protocol.packet.EMPTY_BYTE_ARRAY import net.mamoe.mirai.internal.network.protocol.packet.chat.TroopEssenceMsgManager diff --git a/mirai-core/src/commonMain/kotlin/network/net/NetworkHandler.kt b/mirai-core/src/commonMain/kotlin/network/handler/NetworkHandler.kt similarity index 98% rename from mirai-core/src/commonMain/kotlin/network/net/NetworkHandler.kt rename to mirai-core/src/commonMain/kotlin/network/handler/NetworkHandler.kt index 3dd725cec..961ac4b95 100644 --- a/mirai-core/src/commonMain/kotlin/network/net/NetworkHandler.kt +++ b/mirai-core/src/commonMain/kotlin/network/handler/NetworkHandler.kt @@ -7,13 +7,13 @@ * https://github.com/mamoe/mirai/blob/master/LICENSE */ -package net.mamoe.mirai.internal.network.net +package net.mamoe.mirai.internal.network.handler import kotlinx.atomicfu.atomic import net.mamoe.mirai.Bot import net.mamoe.mirai.internal.QQAndroidBot import net.mamoe.mirai.internal.network.Packet -import net.mamoe.mirai.internal.network.net.NetworkHandler.State +import net.mamoe.mirai.internal.network.handler.NetworkHandler.State import net.mamoe.mirai.internal.network.net.protocol.SsoContext import net.mamoe.mirai.internal.network.protocol.packet.OutgoingPacket import net.mamoe.mirai.internal.network.protocol.packet.OutgoingPacketWithRespType diff --git a/mirai-core/src/commonMain/kotlin/network/net/impl/netty/NetworkHandlerSupport.kt b/mirai-core/src/commonMain/kotlin/network/handler/impl/NetworkHandlerSupport.kt similarity index 96% rename from mirai-core/src/commonMain/kotlin/network/net/impl/netty/NetworkHandlerSupport.kt rename to mirai-core/src/commonMain/kotlin/network/handler/impl/NetworkHandlerSupport.kt index af48436e6..6d1f6ce87 100644 --- a/mirai-core/src/commonMain/kotlin/network/net/impl/netty/NetworkHandlerSupport.kt +++ b/mirai-core/src/commonMain/kotlin/network/handler/impl/NetworkHandlerSupport.kt @@ -7,12 +7,12 @@ * https://github.com/mamoe/mirai/blob/master/LICENSE */ -package net.mamoe.mirai.internal.network.net.impl.netty +package net.mamoe.mirai.internal.network.handler.impl import kotlinx.coroutines.* import net.mamoe.mirai.internal.network.Packet -import net.mamoe.mirai.internal.network.net.NetworkHandler -import net.mamoe.mirai.internal.network.net.NetworkHandlerContext +import net.mamoe.mirai.internal.network.handler.NetworkHandler +import net.mamoe.mirai.internal.network.handler.NetworkHandlerContext import net.mamoe.mirai.internal.network.net.protocol.RawIncomingPacket import net.mamoe.mirai.internal.network.protocol.packet.IncomingPacket import net.mamoe.mirai.internal.network.protocol.packet.OutgoingPacket diff --git a/mirai-core/src/commonMain/kotlin/network/net/impl/netty/NettyNetworkHandler.kt b/mirai-core/src/commonMain/kotlin/network/handler/impl/netty/NettyNetworkHandler.kt similarity index 97% rename from mirai-core/src/commonMain/kotlin/network/net/impl/netty/NettyNetworkHandler.kt rename to mirai-core/src/commonMain/kotlin/network/handler/impl/netty/NettyNetworkHandler.kt index 8c0ff9abb..f60f13ae5 100644 --- a/mirai-core/src/commonMain/kotlin/network/net/impl/netty/NettyNetworkHandler.kt +++ b/mirai-core/src/commonMain/kotlin/network/handler/impl/netty/NettyNetworkHandler.kt @@ -7,7 +7,7 @@ * https://github.com/mamoe/mirai/blob/master/LICENSE */ -package net.mamoe.mirai.internal.network.net.impl.netty +package net.mamoe.mirai.internal.network.handler.impl.netty import io.netty.bootstrap.Bootstrap import io.netty.buffer.ByteBuf @@ -23,8 +23,9 @@ import kotlinx.coroutines.channels.sendBlocking import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.consumeAsFlow import kotlinx.io.core.ByteReadPacket -import net.mamoe.mirai.internal.network.net.NetworkHandler -import net.mamoe.mirai.internal.network.net.NetworkHandlerContext +import net.mamoe.mirai.internal.network.handler.NetworkHandler +import net.mamoe.mirai.internal.network.handler.NetworkHandlerContext +import net.mamoe.mirai.internal.network.handler.impl.NetworkHandlerSupport import net.mamoe.mirai.internal.network.net.protocol.PacketCodec import net.mamoe.mirai.internal.network.net.protocol.RawIncomingPacket import net.mamoe.mirai.internal.network.net.protocol.SsoController diff --git a/mirai-core/src/commonMain/kotlin/network/net/impl/netty/NetyNetworkHandlerFactory.kt b/mirai-core/src/commonMain/kotlin/network/handler/impl/netty/NetyNetworkHandlerFactory.kt similarity index 76% rename from mirai-core/src/commonMain/kotlin/network/net/impl/netty/NetyNetworkHandlerFactory.kt rename to mirai-core/src/commonMain/kotlin/network/handler/impl/netty/NetyNetworkHandlerFactory.kt index a12b77ef7..0cb2806c9 100644 --- a/mirai-core/src/commonMain/kotlin/network/net/impl/netty/NetyNetworkHandlerFactory.kt +++ b/mirai-core/src/commonMain/kotlin/network/handler/impl/netty/NetyNetworkHandlerFactory.kt @@ -7,10 +7,10 @@ * https://github.com/mamoe/mirai/blob/master/LICENSE */ -package net.mamoe.mirai.internal.network.net.impl.netty +package net.mamoe.mirai.internal.network.handler.impl.netty -import net.mamoe.mirai.internal.network.net.NetworkHandlerContext -import net.mamoe.mirai.internal.network.net.NetworkHandlerFactory +import net.mamoe.mirai.internal.network.handler.NetworkHandlerContext +import net.mamoe.mirai.internal.network.handler.NetworkHandlerFactory import java.net.SocketAddress internal object NettyNetworkHandlerFactory : NetworkHandlerFactory { diff --git a/mirai-core/src/commonMain/kotlin/network/net/protocol/SsoController.kt b/mirai-core/src/commonMain/kotlin/network/net/protocol/SsoController.kt index b894f89be..fba8c9758 100644 --- a/mirai-core/src/commonMain/kotlin/network/net/protocol/SsoController.kt +++ b/mirai-core/src/commonMain/kotlin/network/net/protocol/SsoController.kt @@ -13,7 +13,7 @@ import net.mamoe.mirai.internal.network.AccountSecrets import net.mamoe.mirai.internal.network.AccountSecretsImpl import net.mamoe.mirai.internal.network.Packet import net.mamoe.mirai.internal.network.QQAndroidClient -import net.mamoe.mirai.internal.network.net.NetworkHandler +import net.mamoe.mirai.internal.network.handler.NetworkHandler import net.mamoe.mirai.internal.network.protocol.packet.OutgoingPacketWithRespType import net.mamoe.mirai.internal.network.protocol.packet.login.WtLogin.Login.LoginPacketResponse import net.mamoe.mirai.internal.network.protocol.packet.login.WtLogin.Login.LoginPacketResponse.Captcha diff --git a/mirai-core/src/commonMain/kotlin/network/protocol/packet/OutgoingPacketAndroid.kt b/mirai-core/src/commonMain/kotlin/network/protocol/packet/OutgoingPacketAndroid.kt index 24f536342..62afd5b85 100644 --- a/mirai-core/src/commonMain/kotlin/network/protocol/packet/OutgoingPacketAndroid.kt +++ b/mirai-core/src/commonMain/kotlin/network/protocol/packet/OutgoingPacketAndroid.kt @@ -17,7 +17,7 @@ import kotlinx.io.core.writeFully import net.mamoe.mirai.internal.QQAndroidBot import net.mamoe.mirai.internal.network.Packet import net.mamoe.mirai.internal.network.QQAndroidClient -import net.mamoe.mirai.internal.network.net.NetworkHandler +import net.mamoe.mirai.internal.network.handler.NetworkHandler import net.mamoe.mirai.internal.utils.io.encryptAndWrite import net.mamoe.mirai.internal.utils.io.writeHex import net.mamoe.mirai.internal.utils.io.writeIntLVPacket diff --git a/mirai-core/src/commonTest/kotlin/network/NettyTestUnit.kt b/mirai-core/src/commonTest/kotlin/network/NettyTestUnit.kt index 3a1ec03b7..bbcc2c1f4 100644 --- a/mirai-core/src/commonTest/kotlin/network/NettyTestUnit.kt +++ b/mirai-core/src/commonTest/kotlin/network/NettyTestUnit.kt @@ -13,7 +13,6 @@ import io.netty.channel.DefaultChannelPromise import io.netty.channel.embedded.EmbeddedChannel import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import net.mamoe.mirai.internal.network.net.impl.netty.awaitKt import net.mamoe.mirai.internal.test.runBlockingUnit import org.junit.jupiter.api.AfterAll import org.junit.jupiter.api.Test