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

Minor, refactor and simplify RuntimePackagePartProvider

Browse Source 
Lazy was unnecessary because we effectively were immediately evaluating it
after creation anyway
This commit is contained in:
Alexander Udalov
2016-01-11 16:34:40 +03:00
parent 0f2befd327
commit cf7f2b762f
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/RuntimePackagePartProvider.kt
+13 -16
View File
@@ -18,28 +18,25 @@ package org.jetbrains.kotlin.load.kotlin.reflect
import org.jetbrains.kotlin.descriptors.PackagePartProvider import org.jetbrains.kotlin.descriptors.PackagePartProvider
import org.jetbrains.kotlin.load.kotlin.ModuleMapping import org.jetbrains.kotlin.load.kotlin.ModuleMapping
import java.io.InputStream
import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ConcurrentHashMap
class RuntimePackagePartProvider(val classLoader : ClassLoader) : PackagePartProvider { class RuntimePackagePartProvider(private val classLoader: ClassLoader) : PackagePartProvider {
private val module2Mapping = ConcurrentHashMap<String, ModuleMapping>()
val module2Mapping = ConcurrentHashMap<String, Lazy<ModuleMapping>>()
fun registerModule(moduleName: String) { fun registerModule(moduleName: String) {
module2Mapping.putIfAbsent(moduleName, lazy { val mapping = try {
val resourceAsStream: InputStream = classLoader.getResourceAsStream("META-INF/$moduleName.${ModuleMapping.MAPPING_FILE_EXT}") ?: return@lazy ModuleMapping.create() classLoader.getResourceAsStream("META-INF/$moduleName.${ModuleMapping.MAPPING_FILE_EXT}")?.let { stream ->
ModuleMapping.create(stream.readBytes())
try {
return@lazy ModuleMapping.create(resourceAsStream.readBytes())
} }
catch (e: Exception) { }
return@lazy ModuleMapping.create() catch (e: Exception) {
} // TODO: do not swallow this exception?
}) null
}
module2Mapping.putIfAbsent(moduleName, mapping ?: ModuleMapping.EMPTY)
} }
override fun findPackageParts(packageFqName: String): List<String> { override fun findPackageParts(packageFqName: String): List<String> {
return module2Mapping.values.map { it.value.findPackageParts(packageFqName) }.filterNotNull().flatMap { it.parts }.distinct() return module2Mapping.values.mapNotNull { it.findPackageParts(packageFqName) }.flatMap { it.parts }.distinct()
} }
} }