Skip to content

Commit 4c7c2d4

Browse files
authored
Move plugin classloader to its own package (#73786) (#73850)
The plugin classloader exists in its own jar file for legacy reasons, and while it should go away in the future, it currently duplicates the package name of the rest of the plugin classes. This commit moves the classloader into its own unique package. relates #73784
1 parent b04ffa6 commit 4c7c2d4

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

libs/plugin-classloader/src/main/java/org/elasticsearch/plugins/ExtendedPluginsClassLoader.java renamed to libs/plugin-classloader/src/main/java/org/elasticsearch/plugins/loader/ExtendedPluginsClassLoader.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Side Public License, v 1.
77
*/
88

9-
package org.elasticsearch.plugins;
9+
package org.elasticsearch.plugins.loader;
1010

1111
import java.security.AccessController;
1212
import java.security.PrivilegedAction;

server/src/main/java/org/elasticsearch/plugins/PluginLoaderIndirection.java

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
package org.elasticsearch.plugins;
1010

11+
import org.elasticsearch.plugins.loader.ExtendedPluginsClassLoader;
12+
1113
import java.util.List;
1214

1315
/**

test/framework/src/main/java/org/elasticsearch/bootstrap/BootstrapForTesting.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ static Map<String, URL> getCodebases() {
179179
Map<String, URL> codebases = PolicyUtil.getCodebaseJarMap(JarHell.parseClassPath());
180180
// when testing server, the main elasticsearch code is not yet in a jar, so we need to manually add it
181181
addClassCodebase(codebases,"elasticsearch", "org.elasticsearch.plugins.PluginsService");
182-
addClassCodebase(codebases,"elasticsearch-plugin-classloader", "org.elasticsearch.plugins.ExtendedPluginsClassLoader");
182+
addClassCodebase(codebases,"elasticsearch-plugin-classloader", "org.elasticsearch.plugins.loader.ExtendedPluginsClassLoader");
183183
addClassCodebase(codebases,"elasticsearch-nio", "org.elasticsearch.nio.ChannelFactory");
184184
addClassCodebase(codebases, "elasticsearch-secure-sm", "org.elasticsearch.secure_sm.SecureSM");
185185
addClassCodebase(codebases, "elasticsearch-rest-client", "org.elasticsearch.client.RestClient");

0 commit comments

Comments
 (0)