From 50e7462b6b9eed116e4599ed2d0651ff1245a9f9 Mon Sep 17 00:00:00 2001 From: Karlatemp Date: Tue, 24 May 2022 17:00:30 +0800 Subject: [PATCH] Rename Access to Classpath --- .../src/PluginResolveSelfDependenciesOverConsoleOnes.kt | 2 +- .../integration-test/testers/service-loader/src/PMain.kt | 2 +- .../mirai-console/compatibility-validation/jvm/api/jvm.api | 4 ++-- .../src/internal/plugin/JvmPluginClassLoader.kt | 6 +++--- .../mirai-console/src/plugin/jvm/AbstractJvmPlugin.kt | 6 +++--- ...JvmPluginClassLoaderAccess.kt => JvmPluginClasspath.kt} | 7 +++---- 6 files changed, 13 insertions(+), 14 deletions(-) rename mirai-console/backend/mirai-console/src/plugin/jvm/{JvmPluginClassLoaderAccess.kt => JvmPluginClasspath.kt} (93%) diff --git a/mirai-console/backend/integration-test/testers/plugin-resolve-self-dependencies-over-console-ones/src/PluginResolveSelfDependenciesOverConsoleOnes.kt b/mirai-console/backend/integration-test/testers/plugin-resolve-self-dependencies-over-console-ones/src/PluginResolveSelfDependenciesOverConsoleOnes.kt index 97a11129f..3c48e5bc1 100644 --- a/mirai-console/backend/integration-test/testers/plugin-resolve-self-dependencies-over-console-ones/src/PluginResolveSelfDependenciesOverConsoleOnes.kt +++ b/mirai-console/backend/integration-test/testers/plugin-resolve-self-dependencies-over-console-ones/src/PluginResolveSelfDependenciesOverConsoleOnes.kt @@ -29,6 +29,6 @@ public class PluginResolveSelfDependenciesOverConsoleOnes : }.toString() } val hcC = Class.forName("io.ktor.client.HttpClient") - assertClassSame(hcC, jvmPluginClassLoaderAccess.pluginIndependentLibrariesClassLoader.loadClass(hcC.name)) + assertClassSame(hcC, jvmPluginClasspath.pluginIndependentLibrariesClassLoader.loadClass(hcC.name)) } } \ No newline at end of file diff --git a/mirai-console/backend/integration-test/testers/service-loader/src/PMain.kt b/mirai-console/backend/integration-test/testers/service-loader/src/PMain.kt index 83a0a839a..7e76e8ddd 100644 --- a/mirai-console/backend/integration-test/testers/service-loader/src/PMain.kt +++ b/mirai-console/backend/integration-test/testers/service-loader/src/PMain.kt @@ -20,7 +20,7 @@ import kotlin.test.assertEquals internal object PMain : KotlinPlugin(JvmPluginDescription("net.mamoe.console.itest.serviceloader", "0.0.0")) { init { - val access = jvmPluginClassLoaderAccess + val access = jvmPluginClasspath val sharedCL = access.pluginSharedLibrariesClassLoader access.addToPath(sharedCL, File("modules/module-service-loader-typedef-0.0.0.jar")) access.addToPath(sharedCL, File("modules/module-service-loader-impl-0.0.0.jar")) diff --git a/mirai-console/backend/mirai-console/compatibility-validation/jvm/api/jvm.api b/mirai-console/backend/mirai-console/compatibility-validation/jvm/api/jvm.api index 52e3c25be..33632a48f 100644 --- a/mirai-console/backend/mirai-console/compatibility-validation/jvm/api/jvm.api +++ b/mirai-console/backend/mirai-console/compatibility-validation/jvm/api/jvm.api @@ -2157,7 +2157,7 @@ public abstract class net/mamoe/mirai/console/plugin/jvm/AbstractJvmPlugin : net public synthetic fun (Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public fun getAutoSaveIntervalMillis ()Lkotlin/ranges/LongRange; public final fun getDataHolderName ()Ljava/lang/String; - protected final fun getJvmPluginClassLoaderAccess ()Lnet/mamoe/mirai/console/plugin/jvm/JvmPluginClassLoaderAccess; + protected final fun getJvmPluginClasspath ()Lnet/mamoe/mirai/console/plugin/jvm/JvmPluginClasspath; public final fun getLoader ()Lnet/mamoe/mirai/console/plugin/jvm/JvmPluginLoader; public synthetic fun getLoader ()Lnet/mamoe/mirai/console/plugin/loader/PluginLoader; public final fun permissionId (Ljava/lang/String;)Lnet/mamoe/mirai/console/permission/PermissionId; @@ -2214,7 +2214,7 @@ public final class net/mamoe/mirai/console/plugin/jvm/JvmPlugin$Companion { public final synthetic fun onLoad (Lnet/mamoe/mirai/console/plugin/jvm/JvmPlugin;Lnet/mamoe/mirai/console/extension/PluginComponentStorage;)V } -public abstract interface class net/mamoe/mirai/console/plugin/jvm/JvmPluginClassLoaderAccess { +public abstract interface class net/mamoe/mirai/console/plugin/jvm/JvmPluginClasspath { public abstract fun addToPath (Ljava/lang/ClassLoader;Ljava/io/File;)V public abstract fun downloadAndAddToPath (Ljava/lang/ClassLoader;Ljava/util/Collection;)V public abstract fun getPluginClassLoader ()Ljava/lang/ClassLoader; diff --git a/mirai-console/backend/mirai-console/src/internal/plugin/JvmPluginClassLoader.kt b/mirai-console/backend/mirai-console/src/internal/plugin/JvmPluginClassLoader.kt index 5b589c7d4..bb9a08327 100644 --- a/mirai-console/backend/mirai-console/src/internal/plugin/JvmPluginClassLoader.kt +++ b/mirai-console/backend/mirai-console/src/internal/plugin/JvmPluginClassLoader.kt @@ -12,7 +12,7 @@ package net.mamoe.mirai.console.internal.plugin import net.mamoe.mirai.console.MiraiConsole import net.mamoe.mirai.console.plugin.jvm.ExportManager -import net.mamoe.mirai.console.plugin.jvm.JvmPluginClassLoaderAccess +import net.mamoe.mirai.console.plugin.jvm.JvmPluginClasspath import net.mamoe.mirai.utils.* import org.eclipse.aether.artifact.Artifact import org.eclipse.aether.graph.DependencyFilter @@ -181,7 +181,7 @@ internal class DynLibClassLoader : URLClassLoader { @Suppress("JoinDeclarationAndAssignment") internal class JvmPluginClassLoaderN : URLClassLoader { - val openaccess: JvmPluginClassLoaderAccess = OpenAccess() + val openaccess: JvmPluginClasspath = OpenAccess() val file: File val ctx: JvmPluginsLoadingCtx val sharedLibrariesLogger: DynLibClassLoader @@ -446,7 +446,7 @@ internal class JvmPluginClassLoaderN : URLClassLoader { return "JvmPluginClassLoader{${file.name}}" } - inner class OpenAccess : JvmPluginClassLoaderAccess { + inner class OpenAccess : JvmPluginClasspath { override val pluginFile: File get() = this@JvmPluginClassLoaderN.file diff --git a/mirai-console/backend/mirai-console/src/plugin/jvm/AbstractJvmPlugin.kt b/mirai-console/backend/mirai-console/src/plugin/jvm/AbstractJvmPlugin.kt index 988916170..cc2680e20 100644 --- a/mirai-console/backend/mirai-console/src/plugin/jvm/AbstractJvmPlugin.kt +++ b/mirai-console/backend/mirai-console/src/plugin/jvm/AbstractJvmPlugin.kt @@ -80,18 +80,18 @@ public abstract class AbstractJvmPlugin @JvmOverloads constructor( public override val autoSaveIntervalMillis: LongRange = 30.secondsToMillis..10.minutesToMillis /** - * 获取 [JvmPluginClassLoaderAccess] + * 获取 [JvmPluginClasspath] * * 注: 仅插件通过 console 内置插件加载器加载时可用 * * @since 2.12 */ - protected val jvmPluginClassLoaderAccess: JvmPluginClassLoaderAccess by lazy { + protected val jvmPluginClasspath: JvmPluginClasspath by lazy { val classLoader = this@AbstractJvmPlugin.javaClass.classLoader if (classLoader is JvmPluginClassLoaderN) { return@lazy classLoader.openaccess } - error("jvmPluginClassLoaderAccess not available for $classLoader") + error("jvmPluginClasspath not available for $classLoader") } } diff --git a/mirai-console/backend/mirai-console/src/plugin/jvm/JvmPluginClassLoaderAccess.kt b/mirai-console/backend/mirai-console/src/plugin/jvm/JvmPluginClasspath.kt similarity index 93% rename from mirai-console/backend/mirai-console/src/plugin/jvm/JvmPluginClassLoaderAccess.kt rename to mirai-console/backend/mirai-console/src/plugin/jvm/JvmPluginClasspath.kt index 0700be924..3ac7ad859 100644 --- a/mirai-console/backend/mirai-console/src/plugin/jvm/JvmPluginClassLoaderAccess.kt +++ b/mirai-console/backend/mirai-console/src/plugin/jvm/JvmPluginClasspath.kt @@ -10,15 +10,14 @@ package net.mamoe.mirai.console.plugin.jvm import java.io.File -import java.io.IOException /** - * 动态注册类搜索路径 + * [JvmPlugin] 的类路径 * * @since 2.12 - * @see AbstractJvmPlugin.jvmPluginClassLoaderAccess + * @see AbstractJvmPlugin.jvmPluginClasspath */ -public interface JvmPluginClassLoaderAccess { +public interface JvmPluginClasspath { public val pluginFile: File /**