fix(model-api): fixed name clash in CLVersion.getTree

Author: slisson

model-api/build.gradle.kts

@@ -15,6 +15,7 @@ description = "API to access models stored in Modelix"
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
     kotlinOptions {
         jvmTarget = "11"
+        freeCompilerArgs += listOf("-Xjvm-default=all-compatibility")
     }
 }
 

model-client/src/commonMain/kotlin/org/modelix/model/IVersion.kt

@@ -16,6 +16,6 @@ package org.modelix.model
 import org.modelix.model.api.ITree
 
 interface IVersion {
-    fun getShaHash(): String
+    fun getContentHash(): String
     fun getTree(): ITree
 }

model-client/src/commonMain/kotlin/org/modelix/model/client2/ModelClientV2.kt

@@ -115,7 +115,7 @@ class ModelClientV2(
                 takeFrom(baseUrl)
                 appendPathSegments("versions", versionHash)
                 if (baseVersion != null) {
-                    parameters["lastKnown"] = (baseVersion as CLVersion).getShaHash()
+                    parameters["lastKnown"] = (baseVersion as CLVersion).getContentHash()
                 }
             }
         }

model-client/src/commonMain/kotlin/org/modelix/model/client2/ReplicatedModel.kt

@@ -85,10 +85,10 @@ class ReplicatedModel(val client: IModelClientV2, val branchRef: BranchReference
 
     private suspend fun remoteVersionReceived(newRemoteVersion: CLVersion) {
         checkDisposed()
-        if (lastRemoteVersion.getShaHash() == newRemoteVersion.getShaHash()) return
+        if (lastRemoteVersion.getContentHash() == newRemoteVersion.getContentHash()) return
         lastRemoteVersion = newRemoteVersion
         mergeMutex.withLock {
-            if (newRemoteVersion.getShaHash() != localVersion.getShaHash()) {
+            if (newRemoteVersion.getContentHash() != localVersion.getContentHash()) {
                 otBranch.runWrite {
                     applyPendingLocalChanges()
                     localVersion = VersionMerger(newRemoteVersion.store, client.getIdGenerator())

model-client/src/commonMain/kotlin/org/modelix/model/lazy/CLVersion.kt

@@ -26,6 +26,7 @@ import org.modelix.model.operations.*
 import org.modelix.model.persistent.CPOperationsList
 import org.modelix.model.persistent.CPTree
 import org.modelix.model.persistent.CPVersion
+import kotlin.jvm.JvmName
 
 class CLVersion : IVersion {
     var store: IDeserializingKeyValueStore
@@ -106,15 +107,18 @@ class CLVersion : IVersion {
     val time: String?
         get() = data!!.time
 
+    @Deprecated("Use getContentHash()", ReplaceWith("getContentHash()"))
     val hash: String
         get() = data!!.hash
 
-    override fun getShaHash(): String = data!!.hash
+    override fun getContentHash(): String = data!!.hash
 
+    @Deprecated("Use getTree()", ReplaceWith("getTree()"))
+    @get:JvmName("getTree_()")
     val tree: CLTree
         get() = CLTree(treeHash!!.getValue(store), store)
 
-    override fun getTree(): ITree = tree
+    override fun getTree(): CLTree = tree
 
     val baseVersion: CLVersion?
         get() {