Skip to content

Fix maven classpath resolve failure when multiple entry is given #664

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

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

Fix maven classpath resolve failure when multiple entry is given #664

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
39 changes: 24 additions & 15 deletions shared/src/main/kotlin/org/javacs/kt/classpath/CachedClassPathResolver.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ import org.jetbrains.exposed.dao.id.EntityID
import org.jetbrains.exposed.dao.id.IntIdTable
import org.jetbrains.exposed.sql.Database
import org.jetbrains.exposed.sql.SchemaUtils
import org.jetbrains.exposed.sql.batchInsert
import org.jetbrains.exposed.sql.deleteAll
import org.jetbrains.exposed.sql.insert
import org.jetbrains.exposed.sql.transactions.transaction
import java.nio.file.Path
import java.nio.file.Paths
Expand Down Expand Up @@ -64,23 +66,28 @@ internal class CachedClassPathResolver(
)
}.toSet()
}
set(newEntries) = transaction(db) {
ClassPathCacheEntry.deleteAll()
newEntries.map {
ClassPathCacheEntryEntity.new {
compiledJar = it.compiledJar.toString()
sourceJar = it.sourceJar?.toString()
set(newEntries) {
transaction(db) {
ClassPathCacheEntry.deleteAll()
ClassPathCacheEntry.batchInsert(newEntries) {
this[ClassPathCacheEntry.compiledJar] = it.compiledJar.toString()
this[ClassPathCacheEntry.sourceJar] = it.sourceJar?.toString()
}
}
}

private var cachedBuildScriptClassPathEntries: Set<Path>
get() = transaction(db) { BuildScriptClassPathCacheEntryEntity.all().map { Paths.get(it.jar) }.toSet() }
set(newEntries) = transaction(db) {
BuildScriptClassPathCacheEntry.deleteAll()
newEntries.map { BuildScriptClassPathCacheEntryEntity.new { jar = it.toString() } }
set(newEntries) {
transaction(db) {
BuildScriptClassPathCacheEntry.deleteAll()
BuildScriptClassPathCacheEntry.batchInsert(newEntries) {
this[BuildScriptClassPathCacheEntry.jar] = it.toString()
}
}
}


private var cachedClassPathMetadata
get() = transaction(db) {
ClassPathMetadataCacheEntity.all().map {
Expand All @@ -90,12 +97,14 @@ internal class CachedClassPathResolver(
)
}.firstOrNull()
}
set(newClassPathMetadata) = transaction(db) {
ClassPathMetadataCache.deleteAll()
val newClassPathMetadataRow = newClassPathMetadata ?: ClasspathMetadata()
ClassPathMetadataCacheEntity.new {
includesSources = newClassPathMetadataRow.includesSources
buildFileVersion = newClassPathMetadataRow.buildFileVersion
set(newClassPathMetadata) {
transaction(db) {
ClassPathMetadataCache.deleteAll()
val newClassPathMetadataRow = newClassPathMetadata ?: ClasspathMetadata()
ClassPathMetadataCache.insert {
it[includesSources] = newClassPathMetadataRow.includesSources
it[buildFileVersion] = newClassPathMetadataRow.buildFileVersion
}
}
}

Expand Down