Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

AbstractExternalResource #1637

Merged
merged 7 commits into from
Nov 10, 2021
Merged

AbstractExternalResource #1637

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
92c0ed6
AbstractExternalResource
Karlatemp Oct 31, 2021
ede98ae
typo
Karlatemp Oct 31, 2021
53cc5d4
make `ResourceCleanCallback` `fun interface`
Karlatemp Nov 1, 2021
ed54cd1
custom display name
Karlatemp Nov 1, 2021
2d38d06
update logic
Karlatemp Nov 1, 2021
78951fe
Update docs
Karlatemp Nov 3, 2021
5bf1bca
Update ExternalResource.kt
Karlatemp Nov 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions binary-compatibility-validator/android/api/binary-compatibility-validator-android.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5574,6 +5574,9 @@ public final class net/mamoe/mirai/network/WrongPasswordException : net/mamoe/mi

public abstract class net/mamoe/mirai/utils/AbstractExternalResource : net/mamoe/mirai/utils/ExternalResource {
public fun <init> ()V
public fun <init> (Ljava/lang/String;)V
public fun <init> (Ljava/lang/String;Lnet/mamoe/mirai/utils/AbstractExternalResource$ResourceCleanCallback;)V
public synthetic fun <init> (Ljava/lang/String;Lnet/mamoe/mirai/utils/AbstractExternalResource$ResourceCleanCallback;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public fun <init> (Lnet/mamoe/mirai/utils/AbstractExternalResource$ResourceCleanCallback;)V
public synthetic fun <init> (Lnet/mamoe/mirai/utils/AbstractExternalResource$ResourceCleanCallback;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun close ()V
Expand Down
3 changes: 3 additions & 0 deletions binary-compatibility-validator/api/binary-compatibility-validator.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5574,6 +5574,9 @@ public final class net/mamoe/mirai/network/WrongPasswordException : net/mamoe/mi

public abstract class net/mamoe/mirai/utils/AbstractExternalResource : net/mamoe/mirai/utils/ExternalResource {
public fun <init> ()V
public fun <init> (Ljava/lang/String;)V
public fun <init> (Ljava/lang/String;Lnet/mamoe/mirai/utils/AbstractExternalResource$ResourceCleanCallback;)V
public synthetic fun <init> (Ljava/lang/String;Lnet/mamoe/mirai/utils/AbstractExternalResource$ResourceCleanCallback;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public fun <init> (Lnet/mamoe/mirai/utils/AbstractExternalResource$ResourceCleanCallback;)V
public synthetic fun <init> (Lnet/mamoe/mirai/utils/AbstractExternalResource$ResourceCleanCallback;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun close ()V
Expand Down
7 changes: 6 additions & 1 deletion mirai-core-api/src/commonMain/kotlin/utils/ExternalResource.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,9 +588,14 @@ public abstract class AbstractExternalResource
@JvmOverloads
@Throws(Throwable::class)
public constructor(
displayName: String? = null,
cleanup: ResourceCleanCallback? = null,
) : ExternalResource {

public constructor(
cleanup: ResourceCleanCallback? = null,
): this(null, cleanup)

public fun interface ResourceCleanCallback {
Him188 marked this conversation as resolved.
Show resolved Hide resolved
@Throws(IOException::class)
public fun cleanup()
Expand Down Expand Up @@ -634,7 +639,7 @@ public constructor(
override fun toString(): String = resourceName
}

private val holder = UsrCustomResHolder(cleanup, buildString {
private val holder = UsrCustomResHolder(cleanup, displayName ?: buildString {
append("ExternalResourceHolder<")
append(this@AbstractExternalResource.javaClass.name)
append('@')
Expand Down