refactor: plugin resource loading to only load from plugin itself instead of delegating to core #4663
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
f2c-ci-robot
bot
added
release-note
f2c-ci-robot
bot
added
the
area/plugin
|
/hold wait for #4589 is merged, perhaps there is a conflict that needs to be resolved |
f2c-ci-robot
bot
added
the
do-not-merge/hold
Codecov Report
@@ Coverage Diff @@
## main #4663 +/- ##
============================================
+ Coverage 60.95% 61.05% +0.09%
Complexity 2610 2610
============================================
Files 379 379
Lines 13551 13606 +55
Branches 961 960 -1
============================================
+ Hits 8260 8307 +47
- Misses 4827 4832 +5
- Partials 464 467 +3
|
f2c-ci-robot
bot
added
needs-rebase
…tead of delegating to core
guqing
force-pushed
the
refactor/4610
branch
from
c56a07d to
f7ccb65
Compare
|
/unhold |
f2c-ci-robot
bot
removed
the
do-not-merge/hold
JohnNiang
reviewed
Sep 27, 2023
application/src/main/java/run/halo/app/plugin/PluginAutoConfiguration.java
Show resolved
Hide resolved
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: JohnNiang The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
f2c-ci-robot
bot
added
the
approved
f2c-ci-robot bot
pushed a commit
to halo-dev/plugin-s3
that referenced
this pull request
Oct 8, 2023
Halo modified the [class loading order](halo-dev/halo#4663) of plugins in 2.10.x to P (Plugin) D (Dependencies) A (Application), resulting in a LinkageError when the current plugin is actually run. ```java java.lang.LinkageError: loader constraint violation: when resolving method 'reactor.core.publisher.Flux reactor.core.publisher.Mono.thenMany(org.reactivestreams.Publisher)' the class loader org.pf4j.PluginClassLoader @5da2e534 of the current class, run/halo/s3os/S3OsAttachmentHandler, and the class loader org.springframework.boot.loader.LaunchedURLClassLoader @87aac27 for the method's defining class, reactor/core/publisher/Mono, have different Class objects for the type org/reactivestreams/Publisher used in the signature (run.halo.s3os.S3OsAttachmentHandler is in unnamed module of loader org.pf4j.PluginClassLoader @5da2e534, parent loader org.springframework.boot.loader.LaunchedURLClassLoader @87aac27; reactor.core.publisher.Mono is in unnamed module of loader org.springframework.boot.loader.LaunchedURLClassLoader @87aac27, parent loader 'app') at run.halo.s3os.S3OsAttachmentHandler.lambda$upload$28(S3OsAttachmentHandler.java:298) ~[na:na] at reactor.core.publisher.MonoUsing.subscribe(MonoUsing.java:85) ~[reactor-core-3.5.10.jar:3.5.10] at reactor.core.publisher.Mono.subscribe(Mono.java:4495) ~[reactor-core-3.5.10.jar:3.5.10] at reactor.core.publisher.MonoSubscribeOn$SubscribeOnSubscriber.run(MonoSubscribeOn.java:126) ~[reactor-core-3.5.10.jar:3.5.10] at reactor.core.scheduler.WorkerTask.call(WorkerTask.java:84) ~[reactor-core-3.5.10.jar:3.5.10] at reactor.core.scheduler.WorkerTask.call(WorkerTask.java:37) ~[reactor-core-3.5.10.jar:3.5.10] at java.base/java.util.concurrent.FutureTask.run(Unknown Source) ~[na:na] at java.base/java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(Unknown Source) ~[na:na] at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source) ~[na:na] at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source) ~[na:na] at java.base/java.lang.Thread.run(Unknown Source) ~[na:na] ``` We just remove the reactive-streams dependency that is already in Halo to resolve the problem. Fixes halo-dev/halo#4676 /kind bug ```release-note 修复在 Halo 2.10 中无法正常上传的问题 ```
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.
What type of PR is this?
/kind improvement
/area core
/area plugin
/milestone 2.10.x
What this PR does / why we need it:
重构插件类加载器以优化当插件的 resources 目录资源与 Halo 中同名时加载不到的问题
how to test it?
Which issue(s) this PR fixes:
Fixes #4610
Does this PR introduce a user-facing change?