refactor: plugin classloader config

halo-dev · Sep 27, 2023 · a815db0 · a815db0
1 parent f7ccb65
commit a815db0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 58 deletions.
diff --git a/application/src/main/java/run/halo/app/plugin/DefaultPluginClassLoader.java b/application/src/main/java/run/halo/app/plugin/DefaultPluginClassLoader.java
diff --git a/application/src/main/java/run/halo/app/plugin/PluginAutoConfiguration.java b/application/src/main/java/run/halo/app/plugin/PluginAutoConfiguration.java
@@ -16,7 +16,6 @@
 import org.pf4j.DevelopmentPluginLoader;
 import org.pf4j.JarPluginLoader;
 import org.pf4j.JarPluginRepository;
-import org.pf4j.PluginClassLoader;
 import org.pf4j.PluginDescriptor;
 import org.pf4j.PluginLoader;
 import org.pf4j.PluginManager;
@@ -110,17 +109,7 @@ protected PluginLoader createPluginLoader() {
                     } else {
                         return new CompoundPluginLoader()
                             .add(createDevelopmentPluginLoader(this), this::isDevelopment)
-                            .add(new JarPluginLoader(this) {
-                                @Override
-                                public ClassLoader loadPlugin(Path pluginPath,
-                                    PluginDescriptor pluginDescriptor) {
-                                    PluginClassLoader pluginClassLoader =
-                                        new DefaultPluginClassLoader(pluginManager,
-                                            pluginDescriptor, getClass().getClassLoader());
-                                    pluginClassLoader.addFile(pluginPath.toFile());
-                                    return pluginClassLoader;
-                                }
-                            });
+                            .add(new JarPluginLoader(this));
                     }
                 }
 
@@ -155,12 +144,6 @@ protected PluginRepository createPluginRepository() {
 
     DevelopmentPluginLoader createDevelopmentPluginLoader(PluginManager pluginManager) {
         return new DevelopmentPluginLoader(pluginManager) {
-            @Override
-            protected PluginClassLoader createPluginClassLoader(Path pluginPath,
-                PluginDescriptor pluginDescriptor) {
-                return new DefaultPluginClassLoader(pluginManager,
-                    pluginDescriptor, getClass().getClassLoader());
-            }
 
             @Override
             public ClassLoader loadPlugin(Path pluginPath,