azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add dependency classloader to the evaluation classloader:

Browse Source 
allows to use dependencies from classloader in the scenario with
evaluation in the isolated environment
This commit is contained in:
Ilya Chernikov
2019-09-11 16:07:05 +02:00
parent 61d517fb31
commit 5426071102
3 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/scripting/jvm/src/kotlin/script/experimental/jvm/impl/KJvmCompiledModule.kt
+1 -1
View File
@@ -28,7 +28,7 @@ class KJvmCompiledModuleFromClassLoader(val moduleClassLoader: ClassLoader) : KJ
else DualClassLoader(moduleClassLoader, baseClassLoader)
}
private class DualClassLoader(fallbackLoader: ClassLoader, parentLoader: ClassLoader?) :
internal class DualClassLoader(fallbackLoader: ClassLoader, parentLoader: ClassLoader?) :
ClassLoader(singleClassLoader(fallbackLoader, parentLoader) ?: parentLoader) {
private class Wrapper(parent: ClassLoader) : ClassLoader(parent) {
libraries/scripting/jvm/src/kotlin/script/experimental/jvm/impl/KJvmCompiledScript.kt
+13 -15
View File
@@ -141,23 +141,21 @@ fun getConfigurationWithClassloader(
private fun CompiledScript<*>.makeClassLoaderFromDependencies(baseClassLoader: ClassLoader?): ClassLoader? {
val processedScripts = mutableSetOf<CompiledScript<*>>()
fun seq(res: Sequence<CompiledScript<*>>, script: CompiledScript<*>): Sequence<CompiledScript<*>> {
if (processedScripts.contains(script)) return res
processedScripts.add(script)
return script.otherScripts.asSequence().fold(res + script, ::seq)
}
fun recursiveScriptsSeq(res: Sequence<CompiledScript<*>>, script: CompiledScript<*>): Sequence<CompiledScript<*>> =
if (processedScripts.add(script)) script.otherScripts.asSequence().fold(res + script, ::recursiveScriptsSeq)
else res
val dependencies = seq(emptySequence(), this).flatMap { script ->
val dependenciesWithConfigurations = recursiveScriptsSeq(emptySequence(), this).flatMap { script ->
script.compilationConfiguration[ScriptCompilationConfiguration.dependencies]
?.asSequence()
?.flatMap { dep ->
(dep as? JvmDependency)?.classpath?.asSequence()?.map { it.toURI().toURL() } ?: emptySequence()
}
?: emptySequence()
}.distinct().toList()
// TODO: previous dependencies and classloaders should be taken into account here
return if (dependencies.isEmpty()) baseClassLoader
else URLClassLoader(dependencies.toTypedArray(), baseClassLoader)
?.asSequence()?.map { script.compilationConfiguration to it } ?: emptySequence()
}
return dependenciesWithConfigurations.fold(baseClassLoader) { parentClassLoader, (compilationConfiguration, scriptDependency) ->
when (scriptDependency) {
is JvmDependency -> URLClassLoader(scriptDependency.classpath.map { it.toURI().toURL() }.toTypedArray(), parentClassLoader)
is JvmDependencyFromClassLoader -> DualClassLoader(scriptDependency.getClassLoader(compilationConfiguration), baseClassLoader)
else -> baseClassLoader
}
}
}
const val KOTLIN_SCRIPT_METADATA_PATH = "META-INF/kotlin/script"