Skip to content

Commit a996e83

Browse files
committed
fix(model-sync-lib): fixed warning, made exceptions more descriptive
1 parent 0314c3d commit a996e83

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

model-sync-lib/src/commonMain/kotlin/org/modelix/model/sync/ModelImporter.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class ModelImporter(private val root: INode) {
5151

5252
expectedNodes.forEachIndexed { index, expected ->
5353
val nodeAtIndex = node.getChildren(role).toList().getOrNull(index)
54-
val expectedId = expected.originalId() ?: TODO()
54+
val expectedId = checkNotNull(expected.originalId()) { "Specified node '$expected' has no id" }
5555
val expectedConcept = expected.concept?.let { s -> ConceptReference(s) }
5656
val childNode = if (nodeAtIndex?.originalId() != expectedId) {
5757
val existingNode = originalIdToExisting[expectedId]
@@ -68,7 +68,7 @@ class ModelImporter(private val root: INode) {
6868
} else {
6969
nodeAtIndex
7070
}
71-
if (childNode.getConceptReference() != expectedConcept) TODO()
71+
check(childNode.getConceptReference() == expectedConcept) { "Unexpected concept change" }
7272

7373
syncNode(childNode, expected)
7474
}
@@ -108,13 +108,13 @@ class ModelImporter(private val root: INode) {
108108
val expectedTarget = originalIdToExisting[expectedTargetId]
109109
if (expectedTarget == null) {
110110
postponedReferences += {
111-
val expectedTarget = originalIdToExisting[expectedTargetId]
112-
if (expectedTarget == null) {
111+
val expectedRefTarget = originalIdToExisting[expectedTargetId]
112+
if (expectedRefTarget == null) {
113113
// The target node is not part of the model. Assuming it exists in some other model we can
114114
// store the reference and try to resolve it dynamically on access.
115115
node.setReferenceTarget(it.key, SerializedNodeReference(expectedTargetId))
116116
} else {
117-
node.setReferenceTarget(it.key, expectedTarget)
117+
node.setReferenceTarget(it.key, expectedRefTarget)
118118
}
119119
}
120120
} else {

0 commit comments

Comments
 (0)