generate boolean and int properties to kotlin

Author: slisson

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

@@ -236,12 +236,23 @@ class MetaModelGenerator(val outputDir: Path) {
             for (feature in concept.directFeaturesAndConflicts()) {
                 when (val data = feature.data) {
                     is PropertyData -> {
-                        val optionalString = String::class.asTypeName().copy(nullable = true)
-                        addProperty(PropertySpec.builder(feature.validName, optionalString)
+                        val accessorClass = when (data.type) {
+                            PropertyType.STRING -> StringPropertyAccessor::class
+                            PropertyType.BOOLEAN -> BooleanPropertyAccessor::class
+                            PropertyType.INT -> IntPropertyAccessor::class
+                        }
+                        addProperty(PropertySpec.builder(feature.validName, data.type.asKotlinType())
                             .addModifiers(KModifier.OVERRIDE)
                             .mutable(true)
-                            .delegate("""${PropertyAccessor::class.qualifiedName}(unwrap(), "${feature.originalName}")""")
+                            .delegate("""${accessorClass.qualifiedName}(unwrap(), "${feature.originalName}")""")
                             .build())
+                        if (data.type != PropertyType.STRING) {
+                            addProperty(PropertySpec.builder("_raw_" + feature.validName, PropertyType.STRING.asKotlinType())
+                                .addModifiers(KModifier.OVERRIDE)
+                                .mutable(true)
+                                .delegate("""${StringPropertyAccessor::class.qualifiedName}(unwrap(), "${feature.originalName}")""")
+                                .build())
+                        }
                     }
                     is ChildLinkData -> {
                         // TODO resolve link.type and ensure it exists
@@ -276,10 +287,14 @@ class MetaModelGenerator(val outputDir: Path) {
             for (feature in concept.directFeatures()) {
                 when (val data = feature.data) {
                     is PropertyData -> {
-                        val optionalString = String::class.asTypeName().copy(nullable = true)
-                        addProperty(PropertySpec.builder(feature.validName, optionalString)
+                        addProperty(PropertySpec.builder(feature.validName, data.type.asKotlinType())
                             .mutable(true)
                             .build())
+                        if (data.type != PropertyType.STRING) {
+                            addProperty(PropertySpec.builder("_raw_" + feature.validName, PropertyType.STRING.asKotlinType())
+                                .mutable(true)
+                                .build())
+                        }
                     }
                     is ChildLinkData -> {
                         // TODO resolve link.type and ensure it exists
@@ -301,6 +316,13 @@ class MetaModelGenerator(val outputDir: Path) {
     }
 }
 
+fun PropertyType.asKotlinType(): TypeName {
+    return when (this) {
+        PropertyType.STRING -> String::class.asTypeName().copy(nullable = true)
+        PropertyType.BOOLEAN -> Boolean::class.asTypeName()
+        PropertyType.INT -> Int::class.asTypeName()
+    }
+}
 fun ConceptRef.conceptWrapperImplType() = ClassName(languageName, conceptName.conceptWrapperImplName())
 fun ConceptRef.conceptWrapperInterfaceType() = ClassName(languageName, conceptName.conceptWrapperInterfaceName())
 fun ConceptRef.nodeWrapperImplType() = ClassName(languageName, conceptName.nodeWrapperImplName())

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

@@ -3,12 +3,30 @@ package org.modelix.metamodel
 import org.modelix.model.api.INode
 import kotlin.reflect.KProperty
 
-class PropertyAccessor(val node: INode, val role: String) {
-    operator fun getValue(thisRef: Any, property: KProperty<*>): String? {
-        return node.getPropertyValue(role)
+abstract class PropertyAccessor<ValueT>(val node: INode, val role: String) {
+    operator fun getValue(thisRef: Any, property: KProperty<*>): ValueT {
+        return convertRead(node.getPropertyValue(role))
     }
 
-    operator fun setValue(thisRef: Any, property: KProperty<*>, value: String?) {
-        node.setPropertyValue(role, value)
+    operator fun setValue(thisRef: Any, property: KProperty<*>, value: ValueT) {
+        node.setPropertyValue(role, convertWrite(value))
     }
+
+    abstract fun convertRead(value: String?): ValueT
+    abstract fun convertWrite(value: ValueT): String?
+}
+
+class StringPropertyAccessor(node: INode, role: String) : PropertyAccessor<String?>(node, role) {
+    override fun convertRead(value: String?): String? = value
+    override fun convertWrite(value: String?): String? = value
+}
+
+class BooleanPropertyAccessor(node: INode, role: String) : PropertyAccessor<Boolean>(node, role) {
+    override fun convertRead(value: String?): Boolean = value == "true"
+    override fun convertWrite(value: Boolean): String? = if (value) "true" else "false"
+}
+
+class IntPropertyAccessor(node: INode, role: String) : PropertyAccessor<Int>(node, role) {
+    override fun convertRead(value: String?): Int = value?.toInt() ?: 0
+    override fun convertWrite(value: Int): String? = value.toString()
 }