Represent also derived Properties using PropertyDescription

Author: ftomassetti

core/src/main/kotlin/com/strumenta/kolasu/model/Model.kt

@@ -215,7 +215,6 @@ val <T : Any> Class<T>.nodeProperties: Collection<KProperty1<T, *>>
 val <T : Any> KClass<T>.nodeProperties: Collection<KProperty1<T, *>>
     get() = memberProperties.asSequence()
         .filter { it.visibility == KVisibility.PUBLIC }
-        .filter { it.findAnnotation<Derived>() == null }
         .filter { it.findAnnotation<Internal>() == null }
         .filter { it.findAnnotation<Link>() == null }
         .toList()

core/src/main/kotlin/com/strumenta/kolasu/model/Reflection.kt

@@ -9,6 +9,7 @@ import kotlin.reflect.KClassifier
 import kotlin.reflect.KProperty1
 import kotlin.reflect.KType
 import kotlin.reflect.KTypeProjection
+import kotlin.reflect.full.findAnnotation
 import kotlin.reflect.full.isSubclassOf
 import kotlin.reflect.full.withNullability
 
@@ -51,7 +52,8 @@ data class PropertyDescription(
     val provideNodes: Boolean,
     val multiplicity: Multiplicity,
     val value: Any?,
-    val propertyType: PropertyType
+    val propertyType: PropertyType,
+    val derived: Boolean
 ) {
 
     fun valueToString(): String {
@@ -119,7 +121,8 @@ data class PropertyDescription(
                     property.isReference() -> PropertyType.REFERENCE
                     provideNodes -> PropertyType.CONTAINMENT
                     else -> PropertyType.ATTRIBUTE
-                }
+                },
+                derived = property.findAnnotation<Derived>() != null
             )
         }
     }

core/src/test/kotlin/com/strumenta/kolasu/model/PropertyDescriptionTest.kt

@@ -25,7 +25,8 @@ class PropertyDescriptionTest {
                 false,
                 Multiplicity.SINGULAR,
                 "gino",
-                PropertyType.ATTRIBUTE
+                PropertyType.ATTRIBUTE,
+                derived = false
             ),
             list[0]
         )
@@ -45,7 +46,8 @@ class PropertyDescriptionTest {
                 false,
                 Multiplicity.MANY,
                 listOf("gino", "pino"),
-                PropertyType.ATTRIBUTE
+                PropertyType.ATTRIBUTE,
+                derived = false
             ),
             list[0]
         )
@@ -65,7 +67,8 @@ class PropertyDescriptionTest {
                 true,
                 Multiplicity.SINGULAR,
                 Foo1("gino"),
-                PropertyType.CONTAINMENT
+                PropertyType.CONTAINMENT,
+                derived = false
             ),
             list[0]
         )
@@ -85,7 +88,8 @@ class PropertyDescriptionTest {
                 true,
                 Multiplicity.MANY,
                 listOf(Foo1("gino")),
-                PropertyType.CONTAINMENT
+                PropertyType.CONTAINMENT,
+                derived = false
             ),
             list[0]
         )
@@ -105,7 +109,8 @@ class PropertyDescriptionTest {
                 true,
                 Multiplicity.MANY,
                 emptyList<Foo1>(),
-                PropertyType.CONTAINMENT
+                PropertyType.CONTAINMENT,
+                derived = false
             ),
             list[0]
         )
@@ -125,7 +130,8 @@ class PropertyDescriptionTest {
                 true,
                 Multiplicity.MANY,
                 null,
-                PropertyType.CONTAINMENT
+                PropertyType.CONTAINMENT,
+                derived = false
             ),
             list[0]
         )

core/src/test/kotlin/com/strumenta/kolasu/serialization/JsonGenerationTest.kt

@@ -338,28 +338,32 @@ class JsonGenerationTest {
                     false,
                     Multiplicity.SINGULAR,
                     123,
-                    PropertyType.ATTRIBUTE
+                    PropertyType.ATTRIBUTE,
+                    derived = false
                 ),
                 PropertyDescription(
                     "someListAttr",
                     false,
                     Multiplicity.MANY,
                     listOf("a", "b"),
-                    PropertyType.ATTRIBUTE
+                    PropertyType.ATTRIBUTE,
+                    derived = false
                 ),
                 PropertyDescription(
                     "someChild",
                     true,
                     Multiplicity.SINGULAR,
                     BaseNode(456),
-                    PropertyType.CONTAINMENT
+                    PropertyType.CONTAINMENT,
+                    derived = false
                 ),
                 PropertyDescription(
                     "someChildren",
                     true,
                     Multiplicity.MANY,
                     listOf(BaseNode(78), BaseNode(90)),
-                    PropertyType.CONTAINMENT
+                    PropertyType.CONTAINMENT,
+                    derived = false
                 )
             )
         )

javalib/src/test/java/com/strumenta/kolasu/javalib/CompilationUnit.java

@@ -20,7 +20,7 @@ public List<B> getBs() {
         @Override
         @Internal
         public List<PropertyDescription> getProperties() {
-            return Arrays.asList(new PropertyDescription("bs", true, Multiplicity.MANY, getBs(), PropertyType.CONTAINMENT));
+            return Arrays.asList(new PropertyDescription("bs", true, Multiplicity.MANY, getBs(), PropertyType.CONTAINMENT, false));
         }
     }
 
@@ -38,6 +38,6 @@ public List<A> getAs() {
     @Override
     @Internal
     public List<PropertyDescription> getProperties() {
-        return Arrays.asList(new PropertyDescription("as", true, Multiplicity.MANY, getAs(), PropertyType.CONTAINMENT));
+        return Arrays.asList(new PropertyDescription("as", true, Multiplicity.MANY, getAs(), PropertyType.CONTAINMENT, false));
     }
 }