File tree Expand file tree Collapse file tree 2 files changed +12
-2
lines changed
main/kotlin/org/modelix/model/sync
test/kotlin/org/modelix/model/sync Expand file tree Collapse file tree 2 files changed +12
-2
lines changed Original file line number Diff line number Diff line change @@ -3,11 +3,20 @@ package org.modelix.model.sync
3
3
import org.modelix.model.api.*
4
4
import org.modelix.model.data.ModelData
5
5
import org.modelix.model.data.NodeData
6
+ import java.io.File
6
7
7
8
class ModelImporter (private val branch : IBranch ) {
8
9
9
10
private lateinit var originalIdToRef: MutableMap <String , INodeReference >
10
11
12
+ fun import (jsonFile : File ) {
13
+ require(jsonFile.exists())
14
+ require(jsonFile.extension == " json" )
15
+
16
+ val data = ModelData .fromJson(jsonFile.readText())
17
+ import(data)
18
+ }
19
+
11
20
fun import (data : ModelData ) {
12
21
originalIdToRef = mutableMapOf ()
13
22
branch.runWrite {
Original file line number Diff line number Diff line change @@ -27,7 +27,8 @@ class ModelImporterTest {
27
27
@BeforeAll
28
28
fun `load and import model` () {
29
29
model = ModelData .fromJson(File (" src/test/resources/model.json" ).readText())
30
- newModel = ModelData .fromJson(File (" src/test/resources/newmodel.json" ).readText())
30
+ val newModelFile = File (" src/test/resources/newmodel.json" )
31
+ newModel = ModelData .fromJson(newModelFile.readText())
31
32
32
33
val tree = CLTree (ObjectStoreCache (MapBaseStore ()))
33
34
branch = PBranch (tree, IdGenerator .getInstance(1 ))
@@ -36,7 +37,7 @@ class ModelImporterTest {
36
37
model.load(branch)
37
38
// println("PRE-SPEC ${model.toJson()}")
38
39
// println("PRE-LOADED ${branch.getRootNode().toJson()}")
39
- ModelImporter (branch).import(newModel )
40
+ ModelImporter (branch).import(newModelFile )
40
41
// println("POST-SPEC ${newModel.root.toJson()}")
41
42
// println("POST-LOADED ${branch.getRootNode().toJson()}")
42
43
}
You can’t perform that action at this time.
0 commit comments