修复JvmPlugin无法通过自己的classLoader以getResource的方法获取全局依赖的class文件 #2536
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…of global dependencies), fix mamoe#2535
Karlatemp
reviewed
Feb 27, 2023
mirai-console/backend/mirai-console/src/internal/plugin/AllDependenciesClassesHolder.kt
Outdated
Show resolved
Hide resolved
mirai-console/backend/mirai-console/src/internal/plugin/JvmPluginClassLoader.kt
Outdated
Show resolved
Hide resolved
|
添加测试单元 |
我阅读集成单元测试的测试报告以及源码后发现在 assertNull(javaClass.getResource("/net/mamoe/mirai/console/MiraiConsole.class"))
assertNull(javaClass.getResource("/net/mamoe/mirai/Bot.class"))正是这两句断言导致我的集成测试失败，但是看起来似乎最初这里是不希望 |
|
已经不太记得当时为啥添加这个限制了，你可以在 jvmpluginclasspath 添加个方法启动搜索 |
Karlatemp
reviewed
Mar 4, 2023
mirai-console/backend/mirai-console/src/internal/plugin/JvmPluginClassLoader.kt
Show resolved
Hide resolved
mirai-console/backend/mirai-console/src/plugin/jvm/JvmPluginClasspath.kt
Outdated
Show resolved
Hide resolved
mirai-console/backend/mirai-console/src/plugin/jvm/JvmPluginClasspath.kt
Outdated
Show resolved
Hide resolved
…e and standardize its KDoc
Karlatemp
reviewed
Mar 4, 2023
...sole/backend/integration-test/testers/service-loader/service-loader-2dep-plugin/src/PMain.kt
Outdated
Show resolved
Hide resolved
mirai-console/backend/mirai-console/src/plugin/jvm/JvmPluginClasspath.kt
Outdated
Show resolved
Hide resolved
Karlatemp
approved these changes
Mar 5, 2023
...sole/backend/integration-test/testers/service-loader/service-loader-2dep-plugin/src/PMain.kt
Outdated
Show resolved
Hide resolved
|
话说我应该Update branch吗，还是就这样一直放着就好（小声 |
|
GitHub 没说有冲突就不用更新 |
|
@Karlatemp merge? |
ok |
StageGuard
pushed a commit
to StageGuard/mirai
that referenced
this pull request
Apr 14, 2023
* [console] Fixed classLoaders of JvmPlugin cannot getResource(classes of global dependencies), fix mamoe#2535 * [core/utils/jvm] new fun: addAll(Enumeration) * [console] modify DynLibClassLoader.tryFastOrStrictResolveResource to tryFastOrStrictResolveResources * [console] remove allClassesAsResources field * [console] add var to control whether class files of mirai dependencies could be load as resources * [console/integration-test] modify loader test * [console] dump new apis * [console] rename JvmPluginClasspath.openMiraiDependenciesClassResource and standardize its KDoc * [console] modify the KDoc of JvmPluginClasspath.shouldResolveConsoleSystemResource * [console/integration-test] improve resources loading test cases * [console/integration-test] modify assert to assertTrue
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fix #2535
原本JvmPlugin的classLoader可以正确地加载到全局依赖的Class对象，但无法通过getResource方法获取到其class文件。