File tree Expand file tree Collapse file tree 3 files changed +12
-1
lines changed
bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks
commonMain/kotlin/org/modelix/model/sync/bulk
jvmMain/kotlin/org/modelix/model/sync/bulk Expand file tree Collapse file tree 3 files changed +12
-1
lines changed Original file line number Diff line number Diff line change @@ -74,7 +74,7 @@ abstract class ImportIntoModelServer @Inject constructor(of: ObjectFactory) : De
74
74
client.runWrite(branchRef) { rootNode ->
75
75
logger.info(" Got root node: {}" , rootNode)
76
76
logger.info(" Importing..." )
77
- ModelImporter (rootNode).importFilesAsRootChildren(* files.toTypedArray() )
77
+ ModelImporter (rootNode).importFilesAsRootChildren(files)
78
78
logger.info(" Import finished" )
79
79
}
80
80
}
Original file line number Diff line number Diff line change @@ -21,6 +21,11 @@ import org.modelix.model.api.BuiltinLanguages
21
21
import org.modelix.model.data.ModelData
22
22
import org.modelix.model.data.NodeData
23
23
24
+ fun mergeModelData (models : Collection <ModelData >): ModelData {
25
+ return ModelData (root = NodeData (children = models.map { it.root }))
26
+ }
27
+
28
+ @Deprecated(" use collection parameter for better performance" )
24
29
fun mergeModelData (vararg models : ModelData ): ModelData {
25
30
return ModelData (root = NodeData (children = models.map { it.root }))
26
31
}
Original file line number Diff line number Diff line change @@ -35,6 +35,12 @@ fun ModelImporter.import(jsonFile: File) {
35
35
import(data)
36
36
}
37
37
38
+ fun ModelImporter.importFilesAsRootChildren (files : Collection <File >) {
39
+ val models = files.map { ModelData .fromJson(it.readText()) }
40
+ import(mergeModelData(models))
41
+ }
42
+
43
+ @Deprecated(" use collection parameter for better performance" )
38
44
fun ModelImporter.importFilesAsRootChildren (vararg files : File ) {
39
45
val models = files.map { ModelData .fromJson(it.readText()) }
40
46
import(mergeModelData(* models.toTypedArray()))
You can’t perform that action at this time.
0 commit comments