Skip to content

Commit 7bd9624

Browse files
committed
extension loading API cleanup
1 parent 6712159 commit 7bd9624

2 files changed

Lines changed: 6 additions & 11 deletions

File tree

jjava-jupyter/src/main/java/org/dflib/jjava/jupyter/kernel/BaseKernel.java

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import org.dflib.jjava.jupyter.messages.request.KernelInfoRequest;
4040
import org.dflib.jjava.jupyter.messages.request.ShutdownRequest;
4141

42-
import java.io.IOException;
4342
import java.io.InputStream;
4443
import java.io.PrintStream;
4544
import java.io.PrintWriter;
@@ -590,7 +589,7 @@ protected ClassLoader getClassLoader() {
590589
* using the kernel's default ClassLoader.
591590
*/
592591
protected void installDefaultExtensions() {
593-
installExtensionsFromClassLoader(getClassLoader());
592+
installExtensions(getClassLoader());
594593
}
595594

596595
/**
@@ -600,22 +599,18 @@ protected void installDefaultExtensions() {
600599
*
601600
* @param classpath one or more filesystem paths separated by {@link java.io.File#pathSeparator}.
602601
*/
603-
protected void installExtensionsFromClasspath(String classpath) {
602+
protected void installExtensions(String classpath) {
604603

605604
URL[] urls = PathsHandler.split(classpath)
606605
.stream()
607606
.map(BaseKernel::pathToURL)
608607
.toArray(URL[]::new);
609608

610-
ClassLoader parentClassLoader = getClassLoader();
611-
try (URLClassLoader classLoader = new URLClassLoader(urls, parentClassLoader)) {
612-
installExtensionsFromClassLoader(classLoader);
613-
} catch (IOException e) {
614-
throw new RuntimeException(e);
615-
}
609+
URLClassLoader classLoader = new URLClassLoader(urls, getClassLoader());
610+
installExtensions(classLoader);
616611
}
617612

618-
protected void installExtensionsFromClassLoader(ClassLoader classLoader) {
613+
protected void installExtensions(ClassLoader classLoader) {
619614
ServiceLoader.load(Extension.class, classLoader).stream()
620615
.map(ServiceLoader.Provider::get)
621616
.forEach(this::installExtension);

jjava-kernel/src/main/java/org/dflib/jjava/kernel/JavaKernel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public void addToClasspath(String classpath) {
110110
String classpathResolved = PathsHandler.joinPaths(PathsHandler.splitAndResolveGlobs(classpath));
111111
jShell.addToClasspath(classpathResolved);
112112
if (extensionsEnabled) {
113-
installExtensionsFromClasspath(classpathResolved);
113+
installExtensions(classpathResolved);
114114
}
115115
}
116116

0 commit comments

Comments
 (0)