Merge pull request #560 from modelix/fix/overwrite-metaproperties

mhuster23 · web-flow · commit 3241c5c07214 · 2024-03-06T16:53:02.000+01:00
fix(bulk-model-sync-gradle): allow meta properties to overwrite existing values
diff --git a/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ImportIntoModelServer.kt b/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ImportIntoModelServer.kt
@@ -99,10 +99,7 @@ abstract class ImportIntoModelServer @Inject constructor(of: ObjectFactory) : De
 
                     logger.info("Setting meta properties...")
                     for ((key, value) in metaProperties.get()) {
-                        val property = IProperty.fromName(key)
-                        if (rootNode.getPropertyValue(property) == null) {
-                            rootNode.setPropertyValue(property, value)
-                        }
+                        rootNode.setPropertyValue(IProperty.fromName(key), value)
                     }
                 }
                 logger.info("Sending diff to server...")

Original file line number	Diff line number	Diff line change
`@@ -99,10 +99,7 @@ abstract class ImportIntoModelServer @Inject constructor(of: ObjectFactory) : De`
`99`	`99`
`100`	`100`	`logger.info("Setting meta properties...")`
`101`	`101`	`for ((key, value) in metaProperties.get()) {`
`102`		`- val property = IProperty.fromName(key)`
`103`		`- if (rootNode.getPropertyValue(property) == null) {`
`104`		`- rootNode.setPropertyValue(property, value)`
`105`		`- }`
	`102`	`+ rootNode.setPropertyValue(IProperty.fromName(key), value)`
`106`	`103`	`}`
`107`	`104`	`}`
`108`	`105`	`logger.info("Sending diff to server...")`