GH-97 Support Kotlin properties (Resolve #97)

* Add KPropertyMember.

* Add AnnotationResolver.

* Fix typo.

* Rename methods to resolve conversation.

* Mega fix B)

* Format code.

* Simplify code changes.

* Fix typo.

Author: Rollczi

cdn-kt/pom.xml

@@ -44,6 +44,11 @@
             <artifactId>kotlin-stdlib-jdk8</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-reflect</artifactId>
+            <version>${kotlin.version}</version>
+        </dependency>
 
         <!-- Tests -->
         <dependency>

cdn-kt/src/main/kotlin/net/dzikoysk/cdn/KCdn.kt

@@ -22,9 +22,9 @@ import kotlin.reflect.KClass
 
 class KCdn(private val cdn: Cdn) {
 
-    fun parse(source: String): KConfiguration = KConfiguration(cdn.load(source))
+    fun parse(source: String): KConfiguration = KConfiguration(cdn.load { source } )
 
-    fun <T : Any> parse(scheme: KClass<T>, source: String): T = cdn.load(source, scheme.java)
+    fun <T : Any> parse(scheme: KClass<T>, source: String): T = cdn.load( { source } , scheme.java)
 
     inline fun <reified T : Any> parseAs(source: String): T = this.parse(T::class, source)
 

cdn-kt/src/main/kotlin/net/dzikoysk/cdn/KCdnSettingsExtension.kt

@@ -0,0 +1,8 @@
+package net.dzikoysk.cdn
+
+import net.dzikoysk.cdn.annotation.KotlinMemberResolver
+
+fun CdnSettings.registerKotlinModule() : CdnSettings {
+    this.withAnnotationResolver(KotlinMemberResolver())
+    return this
+}

cdn-kt/src/main/kotlin/net/dzikoysk/cdn/annotation/KFunctionMember.kt

@@ -0,0 +1,50 @@
+package net.dzikoysk.cdn.annotation
+
+import panda.std.stream.PandaStream
+import java.lang.reflect.AnnotatedType
+import kotlin.reflect.KFunction
+import kotlin.reflect.jvm.*
+
+class KFunctionMember(
+    private val instance: Any,
+    private val getter: KFunction<*>,
+    private val setter: KFunction<*>,
+    private val propertyName: String
+) : AnnotatedMember {
+
+    override fun setValue(value: Any?) {
+        setter.call(instance, value)
+    }
+
+    override fun getValue(): Any? {
+        return getter.call(instance)
+    }
+
+    override fun isAnnotationPresent(annotation: Class<out Annotation>?): Boolean {
+        return getter.annotations
+            .map { it.javaClass }
+            .contains(annotation)
+    }
+
+    override fun <A : Annotation?> getAnnotationsByType(annotation: Class<A>?): MutableList<A>? {
+        return PandaStream.of(getter.annotations)
+            .`is`(annotation)
+            .toList()
+    }
+
+    override fun <A : Annotation?> getAnnotation(annotation: Class<A>?): A? {
+        return PandaStream.of(getter.annotations)
+            .`is`(annotation)
+            .head()
+            .orNull
+    }
+
+    override fun getAnnotatedType(): AnnotatedType? = getter.javaMethod?.annotatedReturnType
+
+    override fun getType(): Class<*>? = getter.javaMethod?.returnType
+
+    override fun getName(): String = propertyName
+
+    override fun getInstance(): Any = instance
+
+}

cdn-kt/src/main/kotlin/net/dzikoysk/cdn/annotation/KPropertyMember.kt

@@ -0,0 +1,48 @@
+package net.dzikoysk.cdn.annotation
+
+import panda.std.stream.PandaStream
+import java.lang.reflect.AnnotatedType
+import kotlin.reflect.KMutableProperty
+import kotlin.reflect.jvm.javaField
+import kotlin.reflect.jvm.javaGetter
+
+class KPropertyMember(private val instance: Any, private val  property: KMutableProperty<*>) : AnnotatedMember {
+
+    override fun setValue(value: Any?) {
+        property.setter.call(instance, value)
+    }
+
+    override fun getValue(): Any? {
+        return property.getter.call(instance)
+    }
+
+    override fun isAnnotationPresent(annotation: Class<out Annotation>?): Boolean {
+        return property.annotations
+            .map { it.javaClass }
+            .contains(annotation)
+    }
+
+    override fun <A : Annotation?> getAnnotationsByType(annotation: Class<A>?): MutableList<A>? {
+        return PandaStream.of(property.javaField?.annotations)
+            .flatMap { it.toList() }
+            .`is`(annotation)
+            .toList()
+    }
+
+    override fun <A : Annotation?> getAnnotation(annotation: Class<A>?): A? {
+        return PandaStream.of(property.javaField?.annotations)
+            .flatMap { it.toList() }
+            .`is`(annotation)
+            .head()
+            .orNull
+    }
+
+    override fun getAnnotatedType(): AnnotatedType? = property.javaGetter?.annotatedReturnType
+
+    override fun getType(): Class<*>? = property.javaField?.type
+
+    override fun getName(): String = property.name
+
+    override fun getInstance(): Any = instance
+
+}

cdn-kt/src/main/kotlin/net/dzikoysk/cdn/annotation/KotlinMemberResolver.kt

@@ -0,0 +1,38 @@
+package net.dzikoysk.cdn.annotation
+
+import panda.utilities.StringUtils
+import java.lang.reflect.Field
+import kotlin.reflect.KMutableProperty
+import kotlin.reflect.full.functions
+import kotlin.reflect.full.memberProperties
+
+class KotlinMemberResolver : MemberResolver {
+
+    override fun fromField(instance: Any, field: Field): AnnotatedMember {
+        return FieldMember(instance, field)
+    }
+
+    override fun fromProperty(instance: Any, propertyName: String) : AnnotatedMember {
+        val find = instance::class.memberProperties.find { it.name == propertyName }
+
+        if (find !is KMutableProperty<*>) {
+            val getter = instance::class.functions.find { it.name == "get" + StringUtils.capitalize(propertyName) }
+            val setter = instance::class.functions.find { it.name == "set" + StringUtils.capitalize(propertyName) }
+
+            if (getter == null || setter == null) {
+                throw NoSuchMethodException()
+            }
+
+            return KFunctionMember(instance, getter, setter, propertyName)
+        }
+
+        return KPropertyMember(instance, find)
+    }
+
+    override fun getProperties(instance: Any): List<AnnotatedMember> {
+        return instance::class.memberProperties
+            .filterIsInstance<KMutableProperty<*>>()
+            .map { KPropertyMember(instance, it) }
+    }
+
+}

cdn-kt/src/test/kotlin/net/dzikoysk/cdn/kt/KotlinConfiguration.kt

@@ -20,7 +20,7 @@ import net.dzikoysk.cdn.entity.Description
 
 class KotlinConfiguration {
 
-    @get:Description("# Description")
+    @Description("# Description")
     var key = "value"
 
 }

cdn-kt/src/test/kotlin/net/dzikoysk/cdn/kt/KotlinReaderTest.kt

@@ -17,20 +17,24 @@
 package net.dzikoysk.cdn.kt
 
 import net.dzikoysk.cdn.CdnFactory
+import net.dzikoysk.cdn.registerKotlinModule
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
 class KotlinReaderTest {
 
     @Test
     fun `should load configuration in kotlin`() {
-        val configuration = CdnFactory.createStandard().load("key: custom", KotlinConfiguration::class.java)
-        assertEquals("custom", configuration.key)
+        val configuration = CdnFactory.createStandard().settings
+            .registerKotlinModule()
+            .build()
+            .load( { "key: custom" }, KotlinConfiguration::class.java)
 
+        assertEquals("custom", configuration.key)
         assertEquals("""
         # Description
         key: custom
-        """.trimIndent(), CdnFactory.createStandard().render(configuration))
+        """.trimIndent(), CdnFactory.createStandard().settings.registerKotlinModule().build().render(configuration))
     }
 
 }

cdn/src/main/java/net/dzikoysk/cdn/CdnDeserializer.java

@@ -16,16 +16,16 @@
 
 package net.dzikoysk.cdn;
 
+import net.dzikoysk.cdn.annotation.AnnotatedMember;
 import net.dzikoysk.cdn.entity.Contextual;
 import net.dzikoysk.cdn.entity.DeserializationHandler;
 import net.dzikoysk.cdn.model.Element;
 import net.dzikoysk.cdn.model.Section;
 import net.dzikoysk.cdn.serialization.Deserializer;
-import net.dzikoysk.cdn.shared.AnnotatedMember;
-import net.dzikoysk.cdn.shared.AnnotatedMember.FieldMember;
-import net.dzikoysk.cdn.shared.AnnotatedMember.MethodMember;
 import panda.std.Option;
 import panda.utilities.ObjectUtils;
+import panda.utilities.StringUtils;
+
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
@@ -57,35 +57,16 @@ private Object deserializeToSection(Section source, Object instance) throws Refl
             deserializeField(source, instance, field);
         }
 
-        for (Method method : instance.getClass().getMethods()) {
-            deserializeMethod(source, instance, method);
+        for (AnnotatedMember annotatedMember : settings.getAnnotationResolver().getProperties(instance)) {
+            deserializeMember(source, annotatedMember);
         }
 
         return instance;
     }
 
     private void deserializeField(Section source, Object instance, Field field) throws ReflectiveOperationException {
         if (!CdnUtils.isIgnored(field)) {
-            deserializeMember(source, new FieldMember(instance, field));
-        }
-    }
-
-    private void deserializeMethod(Section source, Object instance, Method setter) throws ReflectiveOperationException {
-        try {
-            if (!setter.getName().startsWith("set")) {
-                return;
-            }
-
-            Method getter = instance.getClass().getMethod("get" + setter.getName().substring(3));
-
-            if (CdnUtils.isIgnored(getter)) {
-                return;
-            }
-
-            deserializeMember(source, new MethodMember(instance, setter, getter));
-        }
-        catch (NoSuchMethodException ignored) {
-            // cannot set this property, ignore
+            deserializeMember(source, settings.getAnnotationResolver().fromField(instance, field));
         }
     }
 

cdn/src/main/java/net/dzikoysk/cdn/CdnSerializer.java

@@ -21,14 +21,14 @@
 import net.dzikoysk.cdn.model.Configuration;
 import net.dzikoysk.cdn.model.Section;
 import net.dzikoysk.cdn.serialization.Serializer;
-import net.dzikoysk.cdn.shared.AnnotatedMember;
-import net.dzikoysk.cdn.shared.AnnotatedMember.FieldMember;
-import net.dzikoysk.cdn.shared.AnnotatedMember.MethodMember;
+import net.dzikoysk.cdn.annotation.AnnotatedMember;
+import panda.std.stream.PandaStream;
+import panda.utilities.StringUtils;
+
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 
 public final class CdnSerializer {
 
@@ -54,42 +54,24 @@ public <S extends Section> S serialize(Object entity, S output) throws Reflectiv
             serializeField(entity, field, output);
         }
 
-        for (Method method : template.getMethods()) {
-            serializeMethod(entity, method, output);
+        for (AnnotatedMember annotatedMember : settings.getAnnotationResolver().getProperties(entity)) {
+            serializeMember(annotatedMember, output);
         }
 
         return output;
     }
 
     private void serializeField(Object entity, Field field, Section output) throws ReflectiveOperationException {
         if (!CdnUtils.isIgnored(field)) {
-            serializeMember(new FieldMember(entity, field), output);
-        }
-    }
-
-    private void serializeMethod(Object entity, Method getter, Section output) throws ReflectiveOperationException {
-        if (CdnUtils.isIgnored(getter)) {
-            return;
-        }
-
-        try {
-            if (!getter.getName().startsWith("get")) {
-                return;
-            }
-
-            Method setter = entity.getClass().getMethod("set" + getter.getName().substring(3), getter.getReturnType());
-            serializeMember(new MethodMember(entity, setter, getter), output);
-        }
-        catch (NoSuchMethodException ignored) {
-            // cannot set this property, ignore
+            serializeMember(settings.getAnnotationResolver().fromField(entity, field), output);
         }
     }
 
     private void serializeMember(AnnotatedMember member, Section output) throws ReflectiveOperationException {
         Object propertyValue = member.getValue();
-        List<String> description = Arrays.stream(member.getAnnotationsByType(Description.class))
-                .flatMap(annotation -> Arrays.stream(annotation.value()))
-                .collect(Collectors.toList());
+        List<String> description = PandaStream.of(member.getAnnotationsByType(Description.class))
+                .flatMap(annotation -> Arrays.asList(annotation.value()))
+                .toList();
 
         if (member.isAnnotationPresent(Contextual.class)) {
             Section section = new Section(description, CdnConstants.OBJECT_SEPARATOR, member.getName());