-
Notifications
You must be signed in to change notification settings - Fork 382
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.
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
jarek/7015: overwrite java classes #7125
Merged
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next
Next commit
#7015: enable to overwrite java classes
- Loading branch information
commit 7ab92f38c1ade3148febec4b29a76ed1d12385e8
There are no files selected for viewing
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
107 changes: 107 additions & 0 deletions
107
kernel/java/src/main/java/com/twosigma/beakerx/javash/JavaBeakerxUrlClassLoader.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,107 @@ | ||
/* | ||
* Copyright 2018 TWO SIGMA OPEN SOURCE, LLC | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package com.twosigma.beakerx.javash; | ||
|
||
import com.twosigma.beakerx.jvm.classloader.BeakerxUrlClassLoader; | ||
import com.twosigma.beakerx.kernel.PathToJar; | ||
|
||
import java.net.URL; | ||
import java.net.URLClassLoader; | ||
import java.util.List; | ||
import java.util.stream.Collectors; | ||
|
||
import static java.util.Collections.singletonList; | ||
|
||
public class JavaBeakerxUrlClassLoader extends URLClassLoader { | ||
|
||
private BeakerxUrlClassLoader beakerxUrlClassLoader; | ||
private JavaInternalUrlClassLoader javaURLClassLoader; | ||
|
||
public JavaBeakerxUrlClassLoader(ClassLoader systemClassLoader, PathToJar pathToJar) { | ||
super(new URL[0]); | ||
beakerxUrlClassLoader = new BeakerxUrlClassLoader(this.getURLs(), systemClassLoader); | ||
javaURLClassLoader = new JavaInternalUrlClassLoader(beakerxUrlClassLoader, new URL[0]); | ||
javaURLClassLoader.addJar(pathToJar); | ||
} | ||
|
||
public void addJar(PathToJar pathToJar) { | ||
javaURLClassLoader.addJar(pathToJar); | ||
} | ||
|
||
public void addInitJar(PathToJar pathToJar) { | ||
beakerxUrlClassLoader.addJar(pathToJar); | ||
} | ||
|
||
public void addInitPathToJars(List<PathToJar> paths) { | ||
for (PathToJar dir : paths) { | ||
addInitJar(dir); | ||
} | ||
} | ||
|
||
public Class<?> loadClass(String name) throws ClassNotFoundException { | ||
Class<?> aClass = null; | ||
try { | ||
aClass = javaURLClassLoader.loadClass(name); | ||
} catch (Exception e) { | ||
} | ||
if (aClass != null) { | ||
return aClass; | ||
} | ||
return beakerxUrlClassLoader.loadClass(name); | ||
} | ||
|
||
public void resetClassloader() { | ||
javaURLClassLoader = new JavaInternalUrlClassLoader(beakerxUrlClassLoader, javaURLClassLoader.getURLs()); | ||
} | ||
|
||
|
||
public JavaInternalUrlClassLoader getJavaURLClassLoader() { | ||
return javaURLClassLoader; | ||
} | ||
|
||
static class JavaInternalUrlClassLoader extends BeakerxUrlClassLoader { | ||
|
||
private static final List<String> excludedClasses = singletonList("slf4j"); | ||
|
||
private BeakerxUrlClassLoader external; | ||
|
||
public JavaInternalUrlClassLoader(BeakerxUrlClassLoader external, URL[] urls) { | ||
super(urls, null); | ||
this.external = external; | ||
} | ||
|
||
public Class<?> loadClass(String name) throws ClassNotFoundException { | ||
if (isNotInExcludedClasses(name)) { | ||
Class<?> aClass = null; | ||
try { | ||
aClass = super.loadClass(name); | ||
} catch (Exception e) { | ||
} | ||
if (aClass != null) { | ||
return aClass; | ||
} | ||
} | ||
return external.loadClass(name); | ||
} | ||
|
||
private boolean isNotInExcludedClasses(String name) { | ||
return excludedClasses.stream() | ||
.filter(name::contains) | ||
.collect(Collectors.toList()) | ||
.isEmpty(); | ||
} | ||
} | ||
} |
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
{ | ||
"cells": [ | ||
{ | ||
"cell_type": "code", | ||
"execution_count": null, | ||
"metadata": {}, | ||
"outputs": [], | ||
"source": [ | ||
"package hello;\n", | ||
"public class Main {\n", | ||
" public static void main(String args[]){\n", | ||
" System.out.println(\"Hello\");\n", | ||
" }\n", | ||
"}" | ||
] | ||
}, | ||
{ | ||
"cell_type": "code", | ||
"execution_count": null, | ||
"metadata": {}, | ||
"outputs": [], | ||
"source": [ | ||
"package hello;\n", | ||
"Main.main(null);" | ||
] | ||
}, | ||
{ | ||
"cell_type": "code", | ||
"execution_count": null, | ||
"metadata": {}, | ||
"outputs": [], | ||
"source": [ | ||
"package hello;\n", | ||
"public class Main {\n", | ||
" public static void main(String args[]){\n", | ||
" System.out.println(\"Hello world\");\n", | ||
" }\n", | ||
"}" | ||
] | ||
}, | ||
{ | ||
"cell_type": "code", | ||
"execution_count": null, | ||
"metadata": {}, | ||
"outputs": [], | ||
"source": [ | ||
"package hello;\n", | ||
"Main.main(null);" | ||
] | ||
}, | ||
{ | ||
"cell_type": "code", | ||
"execution_count": null, | ||
"metadata": {}, | ||
"outputs": [], | ||
"source": [] | ||
} | ||
], | ||
"metadata": { | ||
"kernelspec": { | ||
"display_name": "Java", | ||
"language": "java", | ||
"name": "java" | ||
}, | ||
"language_info": { | ||
"codemirror_mode": "text/x-java", | ||
"file_extension": ".java", | ||
"mimetype": "", | ||
"name": "Java", | ||
"nbconverter_exporter": "", | ||
"version": "1.8.0_121" | ||
} | ||
}, | ||
"nbformat": 4, | ||
"nbformat_minor": 2 | ||
} |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Beakerx => BeakerX