Fix storage of source jar paths in the database

fwcd · fwcd · commit 40ae4d1507b1 · 2023-10-04T11:28:45.000+01:00
diff --git a/shared/src/main/kotlin/org/javacs/kt/classpath/CachedClassPathResolver.kt b/shared/src/main/kotlin/org/javacs/kt/classpath/CachedClassPathResolver.kt
@@ -60,7 +60,7 @@ internal class CachedClassPathResolver(
             ClassPathCacheEntryEntity.all().map {
                 ClassPathEntry(
                     compiledJar = Paths.get(it.compiledJar),
-                    sourceJar = if (it.sourceJar != null) Paths.get(it.sourceJar) else null
+                    sourceJar = it.sourceJar?.let(Paths::get)
                 )
             }.toSet()
         }
@@ -69,7 +69,7 @@ internal class CachedClassPathResolver(
             newEntries.map {
                 ClassPathCacheEntryEntity.new {
                     compiledJar = it.compiledJar.toString()
-                    sourceJar = it.sourceJar.toString()
+                    sourceJar = it.sourceJar?.toString()
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ internal class CachedClassPathResolver(`
`60`	`60`	`ClassPathCacheEntryEntity.all().map {`
`61`	`61`	`ClassPathEntry(`
`62`	`62`	`compiledJar = Paths.get(it.compiledJar),`
`63`		`- sourceJar = if (it.sourceJar != null) Paths.get(it.sourceJar) else null`
	`63`	`+ sourceJar = it.sourceJar?.let(Paths::get)`
`64`	`64`	`)`
`65`	`65`	`}.toSet()`
`66`	`66`	`}`
`@@ -69,7 +69,7 @@ internal class CachedClassPathResolver(`
`69`	`69`	`newEntries.map {`
`70`	`70`	`ClassPathCacheEntryEntity.new {`
`71`	`71`	`compiledJar = it.compiledJar.toString()`
`72`		`- sourceJar = it.sourceJar.toString()`
	`72`	`+ sourceJar = it.sourceJar?.toString()`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`	`}`