diff --git a/mirai-core-utils/src/commonMain/kotlin/debug/StructureToStringTransformer.kt b/mirai-core-utils/src/commonMain/kotlin/StructureToStringTransformer.kt similarity index 96% rename from mirai-core-utils/src/commonMain/kotlin/debug/StructureToStringTransformer.kt rename to mirai-core-utils/src/commonMain/kotlin/StructureToStringTransformer.kt index 7a78e4c2d..b0fb01278 100644 --- a/mirai-core-utils/src/commonMain/kotlin/debug/StructureToStringTransformer.kt +++ b/mirai-core-utils/src/commonMain/kotlin/StructureToStringTransformer.kt @@ -9,9 +9,8 @@ @file:JvmName("StructureToStringTransformerKt_common") -package net.mamoe.mirai.utils.debug +package net.mamoe.mirai.utils -import net.mamoe.mirai.utils.loadService import kotlin.jvm.JvmName public interface StructureToStringTransformer { diff --git a/mirai-core-utils/src/jvmBaseMain/kotlin/debug/StructureToStringTransformer.kt b/mirai-core-utils/src/jvmBaseMain/kotlin/StructureToStringTransformer.kt similarity index 93% rename from mirai-core-utils/src/jvmBaseMain/kotlin/debug/StructureToStringTransformer.kt rename to mirai-core-utils/src/jvmBaseMain/kotlin/StructureToStringTransformer.kt index 5314652de..20c19801e 100644 --- a/mirai-core-utils/src/jvmBaseMain/kotlin/debug/StructureToStringTransformer.kt +++ b/mirai-core-utils/src/jvmBaseMain/kotlin/StructureToStringTransformer.kt @@ -7,7 +7,7 @@ * https://github.com/mamoe/mirai/blob/dev/LICENSE */ -package net.mamoe.mirai.utils.debug +package net.mamoe.mirai.utils internal actual fun getPlatformDefaultStructureToStringTransformer(): StructureToStringTransformer? { return StructureToStringTransformerLegacy() diff --git a/mirai-core-utils/src/jvmBaseMain/kotlin/debug/StructureToStringTransformerLegacy.kt b/mirai-core-utils/src/jvmBaseMain/kotlin/StructureToStringTransformerLegacy.kt similarity index 99% rename from mirai-core-utils/src/jvmBaseMain/kotlin/debug/StructureToStringTransformerLegacy.kt rename to mirai-core-utils/src/jvmBaseMain/kotlin/StructureToStringTransformerLegacy.kt index 2c4f29892..19fc1f37c 100644 --- a/mirai-core-utils/src/jvmBaseMain/kotlin/debug/StructureToStringTransformerLegacy.kt +++ b/mirai-core-utils/src/jvmBaseMain/kotlin/StructureToStringTransformerLegacy.kt @@ -7,10 +7,9 @@ * https://github.com/mamoe/mirai/blob/dev/LICENSE */ -package net.mamoe.mirai.utils.debug +package net.mamoe.mirai.utils import kotlinx.serialization.Transient -import net.mamoe.mirai.utils.toUHexString import java.lang.reflect.Modifier import kotlin.reflect.KClass import kotlin.reflect.KProperty diff --git a/mirai-core-utils/src/nativeMain/kotlin/debug/StructureToStringTransformer.kt b/mirai-core-utils/src/nativeMain/kotlin/StructureToStringTransformer.kt similarity index 93% rename from mirai-core-utils/src/nativeMain/kotlin/debug/StructureToStringTransformer.kt rename to mirai-core-utils/src/nativeMain/kotlin/StructureToStringTransformer.kt index 3ac98750a..b1bb3d47f 100644 --- a/mirai-core-utils/src/nativeMain/kotlin/debug/StructureToStringTransformer.kt +++ b/mirai-core-utils/src/nativeMain/kotlin/StructureToStringTransformer.kt @@ -7,7 +7,7 @@ * https://github.com/mamoe/mirai/blob/dev/LICENSE */ -package net.mamoe.mirai.utils.debug +package net.mamoe.mirai.utils internal actual fun getPlatformDefaultStructureToStringTransformer(): StructureToStringTransformer? { return null diff --git a/mirai-core/src/commonMain/kotlin/contact/AbstractUser.kt b/mirai-core/src/commonMain/kotlin/contact/AbstractUser.kt index 7f9738260..20e400f4d 100644 --- a/mirai-core/src/commonMain/kotlin/contact/AbstractUser.kt +++ b/mirai-core/src/commonMain/kotlin/contact/AbstractUser.kt @@ -40,7 +40,6 @@ import net.mamoe.mirai.internal.utils.C2CPkgMsgParsingCache import net.mamoe.mirai.message.MessageReceipt import net.mamoe.mirai.message.data.* import net.mamoe.mirai.utils.* -import net.mamoe.mirai.utils.debug.structureToString import kotlin.contracts.contract import kotlin.coroutines.CoroutineContext diff --git a/mirai-core/src/commonMain/kotlin/message/image/OnlineImage.kt b/mirai-core/src/commonMain/kotlin/message/image/OnlineImage.kt index a4f5b4aec..79f6d9e48 100644 --- a/mirai-core/src/commonMain/kotlin/message/image/OnlineImage.kt +++ b/mirai-core/src/commonMain/kotlin/message/image/OnlineImage.kt @@ -19,9 +19,9 @@ import net.mamoe.mirai.internal.network.protocol.data.proto.NotOnlineImageExtPb import net.mamoe.mirai.internal.utils.io.serialization.loadAs import net.mamoe.mirai.message.data.Image import net.mamoe.mirai.message.data.ImageType -import net.mamoe.mirai.utils.debug.structureToString import net.mamoe.mirai.utils.generateImageId import net.mamoe.mirai.utils.generateImageIdFromResourceId +import net.mamoe.mirai.utils.structureToString internal sealed interface OnlineImage : Image, ConstOriginUrlAware { override val originUrl: String diff --git a/mirai-core/src/commonMain/kotlin/message/protocol/MessageProtocolFacade.kt b/mirai-core/src/commonMain/kotlin/message/protocol/MessageProtocolFacade.kt index 83c595ff5..fa4f7a10f 100644 --- a/mirai-core/src/commonMain/kotlin/message/protocol/MessageProtocolFacade.kt +++ b/mirai-core/src/commonMain/kotlin/message/protocol/MessageProtocolFacade.kt @@ -45,7 +45,6 @@ import net.mamoe.mirai.message.data.* import net.mamoe.mirai.message.data.visitor.RecursiveMessageVisitor import net.mamoe.mirai.message.data.visitor.accept import net.mamoe.mirai.utils.* -import net.mamoe.mirai.utils.debug.structureToString import kotlin.reflect.KClass internal interface MessageProtocolFacade { diff --git a/mirai-core/src/commonMain/kotlin/message/protocol/decode/MessageDecoderPipeline.kt b/mirai-core/src/commonMain/kotlin/message/protocol/decode/MessageDecoderPipeline.kt index ff41217c0..ef0a27c4d 100644 --- a/mirai-core/src/commonMain/kotlin/message/protocol/decode/MessageDecoderPipeline.kt +++ b/mirai-core/src/commonMain/kotlin/message/protocol/decode/MessageDecoderPipeline.kt @@ -17,7 +17,6 @@ import net.mamoe.mirai.internal.pipeline.* import net.mamoe.mirai.message.data.Message import net.mamoe.mirai.message.data.MessageSourceKind import net.mamoe.mirai.utils.* -import net.mamoe.mirai.utils.debug.structureToStringAndDesensitizeIfAvailable import kotlin.coroutines.RestrictsSuspension internal interface MessageDecoderPipeline : diff --git a/mirai-core/src/commonMain/kotlin/message/source/incomingSourceImpl.kt b/mirai-core/src/commonMain/kotlin/message/source/incomingSourceImpl.kt index f1adac462..9fce3f595 100644 --- a/mirai-core/src/commonMain/kotlin/message/source/incomingSourceImpl.kt +++ b/mirai-core/src/commonMain/kotlin/message/source/incomingSourceImpl.kt @@ -37,9 +37,9 @@ import net.mamoe.mirai.message.data.MessageSourceKind import net.mamoe.mirai.message.data.OnlineMessageSource import net.mamoe.mirai.message.data.visitor.MessageVisitor import net.mamoe.mirai.utils.EMPTY_BYTE_ARRAY -import net.mamoe.mirai.utils.debug.structureToString import net.mamoe.mirai.utils.encodeBase64 import net.mamoe.mirai.utils.mapToIntArray +import net.mamoe.mirai.utils.structureToString @Suppress("SERIALIZER_TYPE_INCOMPATIBLE") @Serializable(OnlineMessageSourceFromFriendImpl.Serializer::class) diff --git a/mirai-core/src/commonMain/kotlin/network/notice/UnconsumedNoticesAlerter.kt b/mirai-core/src/commonMain/kotlin/network/notice/UnconsumedNoticesAlerter.kt index 7b7dd0da6..f70554acf 100644 --- a/mirai-core/src/commonMain/kotlin/network/notice/UnconsumedNoticesAlerter.kt +++ b/mirai-core/src/commonMain/kotlin/network/notice/UnconsumedNoticesAlerter.kt @@ -21,7 +21,6 @@ import net.mamoe.mirai.internal.network.protocol.data.proto.OnlinePushTrans import net.mamoe.mirai.internal.network.protocol.data.proto.Structmsg import net.mamoe.mirai.internal.network.protocol.packet.chat.NewContact import net.mamoe.mirai.utils.* -import net.mamoe.mirai.utils.debug.structureToString internal class UnconsumedNoticesAlerter( logger: MiraiLogger, diff --git a/mirai-core/src/commonMain/kotlin/network/notice/group/GroupNotificationProcessor.kt b/mirai-core/src/commonMain/kotlin/network/notice/group/GroupNotificationProcessor.kt index c5086b0ed..6538cbafd 100644 --- a/mirai-core/src/commonMain/kotlin/network/notice/group/GroupNotificationProcessor.kt +++ b/mirai-core/src/commonMain/kotlin/network/notice/group/GroupNotificationProcessor.kt @@ -30,7 +30,6 @@ import net.mamoe.mirai.internal.network.protocol.data.proto.TroopTips0x857 import net.mamoe.mirai.internal.utils.io.serialization.loadAs import net.mamoe.mirai.internal.utils.parseToMessageDataList import net.mamoe.mirai.utils.* -import net.mamoe.mirai.utils.debug.structureToString import kotlin.jvm.JvmName internal class GroupNotificationProcessor( diff --git a/mirai-core/src/commonMain/kotlin/network/notice/group/GroupOrMemberListNoticeProcessor.kt b/mirai-core/src/commonMain/kotlin/network/notice/group/GroupOrMemberListNoticeProcessor.kt index baac8fb97..fcfa95422 100644 --- a/mirai-core/src/commonMain/kotlin/network/notice/group/GroupOrMemberListNoticeProcessor.kt +++ b/mirai-core/src/commonMain/kotlin/network/notice/group/GroupOrMemberListNoticeProcessor.kt @@ -36,8 +36,8 @@ import net.mamoe.mirai.internal.utils.parseToMessageDataList import net.mamoe.mirai.internal.utils.toMemberInfo import net.mamoe.mirai.utils.MiraiLogger import net.mamoe.mirai.utils.context -import net.mamoe.mirai.utils.debug.structureToString import net.mamoe.mirai.utils.read +import net.mamoe.mirai.utils.structureToString /** diff --git a/mirai-core/src/commonMain/kotlin/network/notice/priv/FriendNoticeProcessor.kt b/mirai-core/src/commonMain/kotlin/network/notice/priv/FriendNoticeProcessor.kt index a222a65c0..574f762b6 100644 --- a/mirai-core/src/commonMain/kotlin/network/notice/priv/FriendNoticeProcessor.kt +++ b/mirai-core/src/commonMain/kotlin/network/notice/priv/FriendNoticeProcessor.kt @@ -36,7 +36,6 @@ import net.mamoe.mirai.internal.network.protocol.packet.list.FriendList.GetFrien import net.mamoe.mirai.internal.utils.io.ProtoBuf import net.mamoe.mirai.internal.utils.io.serialization.loadAs import net.mamoe.mirai.utils.* -import net.mamoe.mirai.utils.debug.structureToString /** * All [FriendEvent] except [FriendMessageEvent] diff --git a/mirai-core/src/commonMain/kotlin/network/notice/priv/OtherClientNoticeProcessor.kt b/mirai-core/src/commonMain/kotlin/network/notice/priv/OtherClientNoticeProcessor.kt index d89425f9d..ea822fca2 100644 --- a/mirai-core/src/commonMain/kotlin/network/notice/priv/OtherClientNoticeProcessor.kt +++ b/mirai-core/src/commonMain/kotlin/network/notice/priv/OtherClientNoticeProcessor.kt @@ -35,7 +35,7 @@ import net.mamoe.mirai.internal.utils.io.serialization.loadAs import net.mamoe.mirai.message.data.PlainText import net.mamoe.mirai.message.data.buildMessageChain import net.mamoe.mirai.utils.context -import net.mamoe.mirai.utils.debug.structureToString +import net.mamoe.mirai.utils.structureToString /** * @see OtherClientOnlineEvent diff --git a/mirai-core/src/commonMain/kotlin/network/protocol/data/proto/Msg.kt b/mirai-core/src/commonMain/kotlin/network/protocol/data/proto/Msg.kt index 4f06eef1f..5a047cf22 100644 --- a/mirai-core/src/commonMain/kotlin/network/protocol/data/proto/Msg.kt +++ b/mirai-core/src/commonMain/kotlin/network/protocol/data/proto/Msg.kt @@ -19,9 +19,9 @@ import net.mamoe.mirai.internal.utils.io.NestedStructureDesensitizer import net.mamoe.mirai.internal.utils.io.ProtoBuf import net.mamoe.mirai.internal.utils.io.serialization.loadAs import net.mamoe.mirai.utils.EMPTY_BYTE_ARRAY -import net.mamoe.mirai.utils.debug.structureToStringIfAvailable import net.mamoe.mirai.utils.inflate import net.mamoe.mirai.utils.isSameType +import net.mamoe.mirai.utils.structureToStringIfAvailable import kotlin.jvm.JvmField @Serializable diff --git a/mirai-core/src/commonMain/kotlin/network/protocol/packet/chat/MultiMsg.kt b/mirai-core/src/commonMain/kotlin/network/protocol/packet/chat/MultiMsg.kt index 054ce0d45..b093d7ee1 100644 --- a/mirai-core/src/commonMain/kotlin/network/protocol/packet/chat/MultiMsg.kt +++ b/mirai-core/src/commonMain/kotlin/network/protocol/packet/chat/MultiMsg.kt @@ -22,8 +22,8 @@ import net.mamoe.mirai.internal.network.protocol.packet.OutgoingPacketFactory import net.mamoe.mirai.internal.network.protocol.packet.buildOutgoingUniPacket import net.mamoe.mirai.internal.utils.io.serialization.readProtoBuf import net.mamoe.mirai.internal.utils.io.serialization.writeProtoBuf -import net.mamoe.mirai.utils.debug.structureToString import net.mamoe.mirai.utils.md5 +import net.mamoe.mirai.utils.structureToString internal class MessageValidationData( val data: ByteArray, diff --git a/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/StatSvc.kt b/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/StatSvc.kt index 74dabb2e5..ae1de858a 100644 --- a/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/StatSvc.kt +++ b/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/StatSvc.kt @@ -43,7 +43,6 @@ import net.mamoe.mirai.internal.network.protocol.packet.* import net.mamoe.mirai.internal.utils.NetworkType import net.mamoe.mirai.internal.utils.io.serialization.* import net.mamoe.mirai.utils.* -import net.mamoe.mirai.utils.debug.structureToString @Suppress("EnumEntryName", "unused") internal enum class RegPushReason { diff --git a/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/WtLogin.kt b/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/WtLogin.kt index cce5e4707..dd51b5e7a 100644 --- a/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/WtLogin.kt +++ b/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/WtLogin.kt @@ -25,7 +25,7 @@ import net.mamoe.mirai.internal.network.protocol.packet.login.wtlogin.orEmpty import net.mamoe.mirai.internal.utils.crypto.TEA import net.mamoe.mirai.internal.utils.printStructure import net.mamoe.mirai.utils.* -import net.mamoe.mirai.utils.debug.structureToString +import net.mamoe.mirai.utils.structureToString internal class WtLogin { /** diff --git a/mirai-core/src/commonMain/kotlin/pipeline/ProcessorPipeline.kt b/mirai-core/src/commonMain/kotlin/pipeline/ProcessorPipeline.kt index 13c0e7125..65a77d6c2 100644 --- a/mirai-core/src/commonMain/kotlin/pipeline/ProcessorPipeline.kt +++ b/mirai-core/src/commonMain/kotlin/pipeline/ProcessorPipeline.kt @@ -14,7 +14,7 @@ import net.mamoe.mirai.internal.message.contextualBugReportException import net.mamoe.mirai.internal.message.protocol.outgoing.OutgoingMessagePipelineContext import net.mamoe.mirai.internal.network.components.NoticeProcessor import net.mamoe.mirai.utils.* -import net.mamoe.mirai.utils.debug.structureToStringAndDesensitizeIfAvailable +import net.mamoe.mirai.utils.structureToStringAndDesensitizeIfAvailable import kotlin.jvm.JvmInline internal interface Processor, D> : PipelineConsumptionMarker { diff --git a/mirai-core/src/commonMain/kotlin/utils/printStructure.kt b/mirai-core/src/commonMain/kotlin/utils/printStructure.kt index ea895b7e7..f77b0eaad 100644 --- a/mirai-core/src/commonMain/kotlin/utils/printStructure.kt +++ b/mirai-core/src/commonMain/kotlin/utils/printStructure.kt @@ -13,8 +13,8 @@ package net.mamoe.mirai.internal.utils import net.mamoe.mirai.utils.MiraiLogger import net.mamoe.mirai.utils.debug -import net.mamoe.mirai.utils.debug.StructureToStringTransformer -import net.mamoe.mirai.utils.debug.structureToString +import net.mamoe.mirai.utils.StructureToStringTransformer +import net.mamoe.mirai.utils.structureToString private val SoutvLogger: MiraiLogger by lazy { diff --git a/mirai-core/src/commonTest/kotlin/message/data/ForwardRefineTest.kt b/mirai-core/src/commonTest/kotlin/message/data/ForwardRefineTest.kt index e7d4788d9..3a0349ac6 100644 --- a/mirai-core/src/commonTest/kotlin/message/data/ForwardRefineTest.kt +++ b/mirai-core/src/commonTest/kotlin/message/data/ForwardRefineTest.kt @@ -16,7 +16,7 @@ import net.mamoe.mirai.internal.message.DeepMessageRefiner.refineDeep import net.mamoe.mirai.internal.message.SimpleRefineContext import net.mamoe.mirai.internal.test.runBlockingUnit import net.mamoe.mirai.message.data.* -import net.mamoe.mirai.utils.debug.structureToString +import net.mamoe.mirai.utils.structureToString import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/mirai-core/src/commonTest/kotlin/message/data/MessageSerializationTest.kt b/mirai-core/src/commonTest/kotlin/message/data/MessageSerializationTest.kt index 7ff80cadd..0f3a50a10 100644 --- a/mirai-core/src/commonTest/kotlin/message/data/MessageSerializationTest.kt +++ b/mirai-core/src/commonTest/kotlin/message/data/MessageSerializationTest.kt @@ -20,7 +20,7 @@ import net.mamoe.mirai.internal.test.AbstractTest import net.mamoe.mirai.message.MessageSerializers import net.mamoe.mirai.message.data.* import net.mamoe.mirai.utils.cast -import net.mamoe.mirai.utils.debug.structureToString +import net.mamoe.mirai.utils.structureToString import net.mamoe.mirai.utils.mapToByteArray import kotlin.test.* diff --git a/mirai-core/src/commonTest/kotlin/message/protocol/impl/EqualityAsserter.kt b/mirai-core/src/commonTest/kotlin/message/protocol/impl/EqualityAsserter.kt index 5cd94a92a..fecf6de35 100644 --- a/mirai-core/src/commonTest/kotlin/message/protocol/impl/EqualityAsserter.kt +++ b/mirai-core/src/commonTest/kotlin/message/protocol/impl/EqualityAsserter.kt @@ -16,7 +16,7 @@ import net.mamoe.mirai.message.MessageSerializers import net.mamoe.mirai.message.data.MessageChain.Companion.serializeToJsonString import net.mamoe.mirai.message.data.SingleMessage import net.mamoe.mirai.message.data.messageChainOf -import net.mamoe.mirai.utils.debug.structureToStringIfAvailable +import net.mamoe.mirai.utils.structureToStringIfAvailable import kotlin.test.assertNotNull import kotlin.test.asserter diff --git a/mirai-core/src/jvmBaseTest/kotlin/utils/StructureToStringTransformerNew.kt b/mirai-core/src/jvmBaseTest/kotlin/utils/StructureToStringTransformerNew.kt index 7a131a165..baf4dcf52 100644 --- a/mirai-core/src/jvmBaseTest/kotlin/utils/StructureToStringTransformerNew.kt +++ b/mirai-core/src/jvmBaseTest/kotlin/utils/StructureToStringTransformerNew.kt @@ -17,8 +17,8 @@ import net.mamoe.mirai.internal.testFramework.codegen.visitors.OptimizeByteArray import net.mamoe.mirai.internal.testFramework.codegen.visitors.renderToString import net.mamoe.mirai.internal.testFramework.desensitizer.DesensitizationVisitor import net.mamoe.mirai.internal.testFramework.desensitizer.Desensitizer -import net.mamoe.mirai.utils.debug.StructureToStringTransformer -import net.mamoe.mirai.utils.debug.StructureToStringTransformerLegacy +import net.mamoe.mirai.utils.StructureToStringTransformer +import net.mamoe.mirai.utils.StructureToStringTransformerLegacy internal class StructureToStringTransformerNew : StructureToStringTransformer { private val legacy = StructureToStringTransformerLegacy() diff --git a/mirai-core/src/jvmBaseTest/kotlin/utils/test/StructureToStringTransformerNewTest.kt b/mirai-core/src/jvmBaseTest/kotlin/utils/test/StructureToStringTransformerNewTest.kt index 9e238aa03..bd97fbdec 100644 --- a/mirai-core/src/jvmBaseTest/kotlin/utils/test/StructureToStringTransformerNewTest.kt +++ b/mirai-core/src/jvmBaseTest/kotlin/utils/test/StructureToStringTransformerNewTest.kt @@ -11,8 +11,8 @@ package net.mamoe.mirai.internal.utils.test import net.mamoe.mirai.internal.test.AbstractTest import net.mamoe.mirai.internal.utils.StructureToStringTransformerNew -import net.mamoe.mirai.utils.debug.StructureToStringTransformer -import net.mamoe.mirai.utils.debug.structureToString +import net.mamoe.mirai.utils.StructureToStringTransformer +import net.mamoe.mirai.utils.structureToString import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertIs diff --git a/mirai-core/src/jvmBaseTest/resources/META-INF/services/net.mamoe.mirai.utils.debug.StructureToStringTransformer b/mirai-core/src/jvmBaseTest/resources/META-INF/services/net.mamoe.mirai.utils.StructureToStringTransformer similarity index 100% rename from mirai-core/src/jvmBaseTest/resources/META-INF/services/net.mamoe.mirai.utils.debug.StructureToStringTransformer rename to mirai-core/src/jvmBaseTest/resources/META-INF/services/net.mamoe.mirai.utils.StructureToStringTransformer