Move remaining fun references to property references

Author: daplf

shared/src/main/kotlin/org/javacs/kt/classpath/CachedClassPathResolver.kt

@@ -39,22 +39,22 @@ internal class CachedClassPathResolver(private val wrapped: ClassPathResolver, p
         return newClasspath
     }
 
-    override fun getCurrentBuildFileVersion(): Long = wrapped.getCurrentBuildFileVersion()
+    override val currentBuildFileVersion: Long get() = wrapped.currentBuildFileVersion
 
     private fun updateClasspathCache(newClasspathCache: ClasspathCache) {
         storage?.setObject("cachedClasspath", newClasspathCache)
-        storage?.setObject("cachedBuildFileVersion", getCurrentBuildFileVersion())
+        storage?.setObject("cachedBuildFileVersion", currentBuildFileVersion)
         cachedClassPath = newClasspathCache
     }
 
     private fun updateBuildScriptClasspathCache(newClasspath: Set<Path>) {
         storage?.setObject("cachedBuildScriptClassPath", newClasspath, SetOfPathsAsStringSerializer)
-        storage?.setObject("cachedBuildFileVersion", getCurrentBuildFileVersion())
+        storage?.setObject("cachedBuildFileVersion", currentBuildFileVersion)
         cachedBuildScriptClassPath = newClasspath
     }
 
     private fun dependenciesChanged(): Boolean {
-        return storage?.getObject<Long>("cachedBuildFileVersion") ?: 0 < wrapped.getCurrentBuildFileVersion()
+        return storage?.getObject<Long>("cachedBuildFileVersion") ?: 0 < wrapped.currentBuildFileVersion
     }
 }
 

shared/src/main/kotlin/org/javacs/kt/classpath/ClassPathResolver.kt

@@ -66,7 +66,7 @@ internal class UnionClassPathResolver(val lhs: ClassPathResolver, val rhs: Class
     override val buildScriptClasspath get() = lhs.buildScriptClasspath + rhs.buildScriptClasspath
     override val buildScriptClasspathOrEmpty get() = lhs.buildScriptClasspathOrEmpty + rhs.buildScriptClasspathOrEmpty
     override val classpathWithSources get() = lhs.classpathWithSources + rhs.classpathWithSources
-    override fun getCurrentBuildFileVersion(): Long = max(lhs.getCurrentBuildFileVersion(), rhs.getCurrentBuildFileVersion())
+    override val currentBuildFileVersion: Long get() = max(lhs.currentBuildFileVersion, rhs.currentBuildFileVersion)
 }
 
 internal class FirstNonEmptyClassPathResolver(val lhs: ClassPathResolver, val rhs: ClassPathResolver) : ClassPathResolver {
@@ -76,5 +76,5 @@ internal class FirstNonEmptyClassPathResolver(val lhs: ClassPathResolver, val rh
     override val buildScriptClasspath get() = lhs.buildScriptClasspath.takeIf { it.isNotEmpty() } ?: rhs.buildScriptClasspath
     override val buildScriptClasspathOrEmpty get() = lhs.buildScriptClasspathOrEmpty.takeIf { it.isNotEmpty() } ?: rhs.buildScriptClasspathOrEmpty
     override val classpathWithSources get() = lhs.classpathWithSources.takeIf { it.isNotEmpty() } ?: rhs.classpathWithSources
-    override fun getCurrentBuildFileVersion(): Long = max(lhs.getCurrentBuildFileVersion(), rhs.getCurrentBuildFileVersion())
+    override val currentBuildFileVersion: Long get() = max(lhs.currentBuildFileVersion, rhs.currentBuildFileVersion)
 }

shared/src/main/kotlin/org/javacs/kt/classpath/GradleClassPathResolver.kt

@@ -34,7 +34,7 @@ internal class GradleClassPathResolver(private val path: Path, private val inclu
         }
     }
 
-    override fun getCurrentBuildFileVersion(): Long = path.toFile().lastModified()
+    override val currentBuildFileVersion: Long get() = path.toFile().lastModified()
 
     companion object {
         /** Create a Gradle resolver if a file is a pom. */

shared/src/main/kotlin/org/javacs/kt/classpath/MavenClassPathResolver.kt

@@ -53,7 +53,7 @@ internal class MavenClassPathResolver private constructor(private val pom: Path)
         }.toSet()
     }
 
-    override fun getCurrentBuildFileVersion(): Long = pom.toFile().lastModified()
+    override val currentBuildFileVersion: Long get() = pom.toFile().lastModified()
 
     companion object {
         /** Create a maven resolver if a file is a pom. */

shared/src/main/kotlin/org/javacs/kt/classpath/WithStdlibResolver.kt

@@ -10,7 +10,7 @@ internal class WithStdlibResolver(private val wrapped: ClassPathResolver) : Clas
     override val buildScriptClasspath: Set<Path> get() = wrapWithStdlib(wrapped.buildScriptClasspath)
     override val buildScriptClasspathOrEmpty: Set<Path> get() = wrapWithStdlib(wrapped.buildScriptClasspathOrEmpty)
     override val classpathWithSources: Set<ClassPathEntry> get() = wrapWithStdlibEntries(wrapped.classpathWithSources)
-    override fun getCurrentBuildFileVersion(): Long = wrapped.getCurrentBuildFileVersion()
+    override val currentBuildFileVersion: Long get() = wrapped.currentBuildFileVersion
 }
 
 private fun wrapWithStdlibEntries(paths: Set<ClassPathEntry>): Set<ClassPathEntry> {