Skip to content

Commit d9b5a15

Browse files
committed
fix(bulk-model-sync-gradle): do not use ReplicatedModel for bulk import
ReplicatedModel is intended for real-time collaboration and not for bulk sync.
1 parent 9999be4 commit d9b5a15

File tree

1 file changed

+9
-13
lines changed

1 file changed

+9
-13
lines changed

bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ImportIntoModelServer.kt

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@ import org.gradle.api.tasks.TaskAction
3030
import org.modelix.model.ModelFacade
3131
import org.modelix.model.api.ILanguage
3232
import org.modelix.model.api.ILanguageRepository
33-
import org.modelix.model.api.getRootNode
3433
import org.modelix.model.client2.ModelClientV2PlatformSpecificBuilder
35-
import org.modelix.model.client2.getReplicatedModel
34+
import org.modelix.model.client2.runWrite
3635
import org.modelix.model.lazy.RepositoryId
3736
import org.modelix.model.sync.bulk.ModelImporter
3837
import org.modelix.model.sync.bulk.importFilesAsRootChildren
@@ -67,20 +66,17 @@ abstract class ImportIntoModelServer @Inject constructor(of: ObjectFactory) : De
6766

6867
val branchRef = ModelFacade.createBranchReference(repoId, branchName.get())
6968
val client = ModelClientV2PlatformSpecificBuilder().url(url.get()).build()
70-
val branch = runBlocking {
71-
client.init()
72-
client.getReplicatedModel(branchRef).start()
73-
}
74-
7569
val files = inputDir.listFiles()?.filter { it.extension == "json" }
7670
if (files.isNullOrEmpty()) error("no json files found")
7771

78-
branch.runWrite {
79-
val rootNode = branch.getRootNode()
80-
logger.info("Got root node: {}", rootNode)
81-
logger.info("Importing...")
82-
ModelImporter(branch.getRootNode()).importFilesAsRootChildren(*files.toTypedArray())
83-
logger.info("Import finished")
72+
runBlocking {
73+
client.init()
74+
client.runWrite(branchRef) { rootNode ->
75+
logger.info("Got root node: {}", rootNode)
76+
logger.info("Importing...")
77+
ModelImporter(rootNode).importFilesAsRootChildren(*files.toTypedArray())
78+
logger.info("Import finished")
79+
}
8480
}
8581
}
8682
}

0 commit comments

Comments
 (0)