Skip to content
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

Allow also URLs with additional parameters #118

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

Allow also URLs with additional parameters #118

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
11 changes: 8 additions & 3 deletions kernel/src/main/scala/org/apache/toree/magic/builtin/AddJar.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,16 @@ class AddJar
* @param location The remote location (URL)
* @return The name of the remote URL, or an empty string if one does not exist
*/
def getFileFromLocation(location: String): String = {
def getFileFromLocation(location: String): String = {
val url = new URL(location)
val file = url.getFile.split("/")
if (file.length > 0) {
file.last
if ( file.last.contains('?') ) {
file.last.split('?')(0)
}
else {
file.last
}
} else {
""
}
Expand Down Expand Up @@ -104,7 +109,7 @@ class AddJar
val jarName = getFileFromLocation(jarRemoteLocation)

// Ensure the URL actually contains a jar or zip file
if (!jarName.endsWith(".jar") && !jarName.endsWith(".zip")) {
if (!jarName.contains(".jar") && !jarName.contains(".zip")) {
throw new IllegalArgumentException(
s"The jar file $jarName must end in .jar or .zip."
)
Expand Down