Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
Mirai
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
Mirai
Commits
186fa5d8
Commit
186fa5d8
authored
Jan 12, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix build
parent
62a21c3a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
2 deletions
+15
-2
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/utils/cryptor/contentToString.kt
...n/kotlin/net/mamoe/mirai/utils/cryptor/contentToString.kt
+14
-1
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/cryptor/contentToString.kt
...n/kotlin/net/mamoe/mirai/utils/cryptor/contentToString.kt
+1
-1
No files found.
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/utils/cryptor/contentToString.kt
View file @
186fa5d8
package
net.mamoe.mirai.utils.cryptor
package
net.mamoe.mirai.utils.cryptor
import
java.lang.reflect.Field
import
kotlin.reflect.full.allSuperclasses
actual
fun
Any
.
contentToStringReflectively
(
prefix
:
String
):
String
{
actual
fun
Any
.
contentToStringReflectively
(
prefix
:
String
):
String
{
val
newPrefix
=
prefix
+
ProtoMap
.
indent
val
newPrefix
=
prefix
+
ProtoMap
.
indent
return
(
this
::
class
.
simpleName
?:
"<UnnamedClass>"
)
+
"#"
+
this
::
class
.
hashCode
()
+
" {\n"
+
return
(
this
::
class
.
simpleName
?:
"<UnnamedClass>"
)
+
"#"
+
this
::
class
.
hashCode
()
+
" {\n"
+
this
::
class
.
java
.
fields
.
toMutableSet
().
apply
{
addAll
(
this
::
class
.
java
.
declaredFields
)
}.
asSequence
().
filterNot
{
it
.
name
.
contains
(
"$"
)
||
it
.
name
==
"Companion"
||
it
.
isSynthetic
}
this
.
allFieldsFromSuperClassesMatching
{
it
.
name
.
startsWith
(
"net.mamoe.mirai"
)
}
.
distinctBy
{
it
.
name
}
.
filterNot
{
it
.
name
.
contains
(
"$"
)
||
it
.
name
==
"Companion"
||
it
.
isSynthetic
||
it
.
name
==
"serialVersionUID"
}
.
joinToStringPrefixed
(
.
joinToStringPrefixed
(
prefix
=
newPrefix
prefix
=
newPrefix
)
{
)
{
...
@@ -15,4 +20,12 @@ actual fun Any.contentToStringReflectively(prefix: String): String {
...
@@ -15,4 +20,12 @@ actual fun Any.contentToStringReflectively(prefix: String): String {
else
value
.
contentToString
(
newPrefix
)
else
value
.
contentToString
(
newPrefix
)
}.
getOrElse
{
"<!>"
}
}.
getOrElse
{
"<!>"
}
}
+
"\n$prefix}"
}
+
"\n$prefix}"
}
internal
fun
Any
.
allFieldsFromSuperClassesMatching
(
classFilter
:
(
Class
<
out
Any
>)
->
Boolean
):
Sequence
<
Field
>
{
return
(
this
::
class
.
java
.
takeIf
(
classFilter
)
?.
declaredFields
?.
asSequence
()
?:
sequenceOf
<
Field
>())
+
this
::
class
.
allSuperclasses
.
asSequence
()
.
map
{
it
.
java
}
.
filter
(
classFilter
)
.
flatMap
{
it
.
declaredFields
.
asSequence
()
}
}
}
\ No newline at end of file
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/cryptor/contentToString.kt
View file @
186fa5d8
...
@@ -7,7 +7,7 @@ import kotlin.reflect.full.allSuperclasses
...
@@ -7,7 +7,7 @@ import kotlin.reflect.full.allSuperclasses
actual
fun
Any
.
contentToStringReflectively
(
prefix
:
String
):
String
{
actual
fun
Any
.
contentToStringReflectively
(
prefix
:
String
):
String
{
val
newPrefix
=
prefix
+
ProtoMap
.
indent
val
newPrefix
=
prefix
+
ProtoMap
.
indent
return
(
this
::
class
.
simpleName
?:
"<UnnamedClass>"
)
+
"#"
+
this
::
class
.
hashCode
()
+
" {\n"
+
return
(
this
::
class
.
simpleName
?:
"<UnnamedClass>"
)
+
"#"
+
this
::
class
.
hashCode
()
+
" {\n"
+
this
.
allFieldsFromSuperClassesMatching
{
it
.
packageN
ame
.
startsWith
(
"net.mamoe.mirai"
)
}
this
.
allFieldsFromSuperClassesMatching
{
it
.
n
ame
.
startsWith
(
"net.mamoe.mirai"
)
}
.
distinctBy
{
it
.
name
}
.
distinctBy
{
it
.
name
}
.
filterNot
{
it
.
name
.
contains
(
"$"
)
||
it
.
name
==
"Companion"
||
it
.
isSynthetic
||
it
.
name
==
"serialVersionUID"
}
.
filterNot
{
it
.
name
.
contains
(
"$"
)
||
it
.
name
==
"Companion"
||
it
.
isSynthetic
||
it
.
name
==
"serialVersionUID"
}
.
joinToStringPrefixed
(
.
joinToStringPrefixed
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment