Skip to content

Feature: Cache ClassLoader for pluginDir #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
infeo wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Feature: Cache ClassLoader for pluginDir #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/cryptomator/integrations/common/ClassLoaderFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class ClassLoaderFactory {

/**
* Attempts to find {@code .jar} files in the path specified in {@value #PLUGIN_DIR_KEY} system property.
* A new class loader instance is returned that loads classes from the given classes.
* A new class loader instance is returned that loads classes from the given directory.
*
* @return A new URLClassLoader that is aware of all {@code .jar} files in the plugin dir
*/
Expand Down
12 changes: 10 additions & 2 deletions src/main/java/org/cryptomator/integrations/common/IntegrationsLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,14 @@ public class IntegrationsLoader {
private IntegrationsLoader() {
}

private static class PluginClassLoaderHolder {
private static final ClassLoader CLASS_LOADER = ClassLoaderFactory.forPluginDir();
}

private static ClassLoader getClassLoader() {
return PluginClassLoaderHolder.CLASS_LOADER;
}

/**
* Loads the best suited service provider, i.e. the one with the highest priority that is supported.
* <p>
Expand All @@ -44,7 +52,7 @@ public static <T> Optional<T> load(Class<T> clazz) {
* @param <T> Type of the service
*/
public static <T> Optional<T> loadSpecific(Class<T> clazz, String implementationClassName) {
return ServiceLoader.load(clazz, ClassLoaderFactory.forPluginDir()).stream()
return ServiceLoader.load(clazz, getClassLoader()).stream()
.filter(provider -> provider.type().getName().equals(implementationClassName))
.map(ServiceLoader.Provider::get)
.findAny();
Expand All @@ -61,7 +69,7 @@ public static <T> Optional<T> loadSpecific(Class<T> clazz, String implementation
* @return An ordered stream of all suited service providers
*/
public static <T> Stream<T> loadAll(Class<T> clazz) {
return loadAll(ServiceLoader.load(clazz, ClassLoaderFactory.forPluginDir()), clazz);
return loadAll(ServiceLoader.load(clazz, getClassLoader()), clazz);
}

/**
Expand Down
Loading