Merge pull request #505 from fwcd/fix-source-jar-paths

Fix cached source jar paths

Author: fwcd

server/src/main/kotlin/org/javacs/kt/externalsources/ClassContentProvider.kt

@@ -35,10 +35,11 @@ class ClassContentProvider(
      * If the file is inside a source archive, the source code is returned as is.
      */
     fun contentOf(uri: KlsURI): Pair<KlsURI, String> {
+        LOG.info("Resolving {} for contents", uri)
         val resolvedUri = sourceArchiveProvider.fetchSourceArchive(uri.archivePath)?.let(uri.withSource(true)::withArchivePath) ?: uri
         val key = resolvedUri.toString()
         val (contents, extension) = cachedContents[key] ?: run {
-                LOG.info("Finding contents of {}", describeURI(resolvedUri.fileUri))
+                LOG.info("Reading contents of {}", describeURI(resolvedUri.fileUri))
                 tryReadContentOf(resolvedUri)
                     ?: tryReadContentOf(resolvedUri.withFileExtension("class"))
                     ?: tryReadContentOf(resolvedUri.withFileExtension("java"))

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()
                 }
             }
         }

shared/src/main/kotlin/org/javacs/kt/database/DatabaseService.kt

@@ -26,7 +26,7 @@ class DatabaseMetadataEntity(id: EntityID<Int>) : IntEntity(id) {
 class DatabaseService {
 
     companion object {
-        const val LATEST_VERSION = 1
+        const val LATEST_VERSION = 2
         const val DB_FILENAME = "kls_database.db"
     }