properties can be optional

Author: slisson

metamodel-generator/src/main/kotlin/org/modelix/metamodel/generator/MetaModelGenerator.kt

@@ -172,7 +172,7 @@ class MetaModelGenerator(val outputDir: Path) {
                 when (val data = feature.data) {
                     is PropertyData -> {
                         addProperty(PropertySpec.builder(feature.validName, IProperty::class)
-                            .initializer("""${GeneratedConcept<*, *>::newProperty.name}("${feature.originalName}")""")
+                            .initializer("""${GeneratedConcept<*, *>::newProperty.name}("${feature.originalName}", ${data.optional})""")
                             .build())
                     }
                     is ChildLinkData -> {

metamodel-runtime/src/commonMain/kotlin/org/modelix/metamodel/GeneratedConcept.kt

@@ -19,8 +19,8 @@ abstract class GeneratedConcept<InstanceT : ITypedNode, WrapperT : ITypedConcept
         return is_abstract
     }
 
-    fun newProperty(name: String): GeneratedProperty {
-        return GeneratedProperty(this, name).also {
+    fun newProperty(name: String, optional: Boolean = true): GeneratedProperty {
+        return GeneratedProperty(this, name, optional).also {
             propertiesMap[name] = it
         }
     }
@@ -118,7 +118,11 @@ abstract class GeneratedConcept<InstanceT : ITypedNode, WrapperT : ITypedConcept
     }
 }
 
-class GeneratedProperty(private val owner: IConcept, override val name: String) : IProperty {
+class GeneratedProperty(
+    private val owner: IConcept,
+    override val name: String,
+    override val isOptional: Boolean
+) : IProperty {
     override fun getConcept(): IConcept = owner
     override fun getUID(): String = getConcept().getUID() + "." + name
 }

model-api/src/commonMain/kotlin/org/modelix/model/api/ILink.kt

@@ -1,6 +1,5 @@
 package org.modelix.model.api
 
 interface ILink : IRole {
-    val isOptional: Boolean
     val targetConcept: IConcept
 }

model-api/src/commonMain/kotlin/org/modelix/model/api/IRole.kt

@@ -4,4 +4,5 @@ interface IRole {
     fun getConcept(): IConcept
     fun getUID(): String
     val name: String
+    val isOptional: Boolean
 }

model-api/src/commonMain/kotlin/org/modelix/model/api/SimpleProperty.kt

@@ -13,7 +13,7 @@
  */
 package org.modelix.model.api
 
-class SimpleProperty(override val name: String) : IProperty {
+class SimpleProperty(override val name: String, override val isOptional: Boolean = true) : IProperty {
     var owner: SimpleConcept? = null
 
     override fun getConcept(): IConcept = owner!!

model-api/src/commonMain/kotlin/org/modelix/model/data/MetaModelData.kt

@@ -43,7 +43,8 @@ sealed interface IConceptFeatureData {
 data class PropertyData (
     override val uid: String? = null,
     override val name: String,
-    val type: PropertyType = PropertyType.STRING
+    val type: PropertyType = PropertyType.STRING,
+    val optional: Boolean = true
 ) : IConceptFeatureData
 
 enum class PropertyType {