Revert to using kotlin reflection instead of java

Author: serpro69

cli-bot/src/main/kotlin/io/github/serpro69/kfaker/app/cli/Introspector.kt

@@ -1,24 +1,27 @@
 package io.github.serpro69.kfaker.app.cli
 
 import io.github.serpro69.kfaker.Faker
-import io.github.serpro69.kfaker.provider.AbstractFakeDataProvider
-import java.lang.reflect.Modifier
+import io.github.serpro69.kfaker.provider.FakeDataProvider
+import kotlin.reflect.KProperty
+import kotlin.reflect.KVisibility
+import kotlin.reflect.full.declaredMemberFunctions
+import kotlin.reflect.full.declaredMemberProperties
+import kotlin.reflect.full.isSubtypeOf
+import kotlin.reflect.full.starProjectedType
 
 /**
  * Introspects [Faker] and it's descendants.
  */
 class Introspector(private val faker: Faker) {
     // Get a list of all publicly visible providers
-    val providers = faker.javaClass.declaredMethods.filter {
-        Modifier.isPublic(it.modifiers) && it.returnType.superclass == AbstractFakeDataProvider::class.java
+    val providers: List<KProperty<*>> = faker::class.declaredMemberProperties.filter {
+        it.visibility == KVisibility.PUBLIC && it.returnType.isSubtypeOf(FakeDataProvider::class.starProjectedType)
     }
 
     // Get a list of all publicly visible functions in each provider
     val providerFunctions = providers.associateBy { provider ->
-        provider.invoke(faker)!!.javaClass.declaredMethods.filter {
-            Modifier.isPublic(it.modifiers)
-                    && !it.annotations.any { ann -> ann is Deprecated }
-                    && it.returnType == String::class.java
+        provider.getter.call(faker)!!::class.declaredMemberFunctions.filter {
+            it.visibility == KVisibility.PUBLIC && !it.annotations.any { ann -> ann is Deprecated }
         }
     }.map { it.value to it.key }.toMap()
-}
+}

cli-bot/src/main/kotlin/io/github/serpro69/kfaker/app/subcommands/List.kt

@@ -10,7 +10,8 @@ import kotlin.system.exitProcess
 
 @CommandLine.Command(
     name = "list",
-    description = ["list available providers and their functions"]
+    description = ["list available providers and their functions"],
+    mixinStandardHelpOptions = true
 )
 object List : Runnable {
 
@@ -37,9 +38,9 @@ object List : Runnable {
             introspector.providerFunctions.map { (provider, functions) ->
                 val renderedFunctions = functions.map {
                     val value = when (it.parameters.size) {
-                        1 -> it.invoke(provider.invoke(faker)).toString()
-                        2 -> it.invoke(provider.invoke(faker), "").toString()
-                        3 -> it.invoke(provider.invoke(faker), "", "").toString()
+                        1 -> it.call(provider.getter.call(faker)).toString()
+                        2 -> it.call(provider.getter.call(faker), "").toString()
+                        3 -> it.call(provider.getter.call(faker), "", "").toString()
                         else -> exitProcess(3)
                     }
 

cli-bot/src/main/kotlin/io/github/serpro69/kfaker/app/subcommands/Lookup.kt

@@ -10,7 +10,8 @@ import kotlin.system.exitProcess
 
 @CommandLine.Command(
     name = "lookup",
-    description = ["lookup functions by name"]
+    description = ["lookup functions by name"],
+    mixinStandardHelpOptions = true
 )
 object Lookup : Runnable {
 
@@ -40,9 +41,9 @@ object Lookup : Runnable {
             filteredMap.map { (provider, functions) ->
                 val renderedFunctions = functions.map {
                     val value = when (it.parameters.size) {
-                        1 -> it.invoke(provider.invoke(faker)).toString()
-                        2 -> it.invoke(provider.invoke(faker), "").toString()
-                        3 -> it.invoke(provider.invoke(faker), "", "").toString()
+                        1 -> it.call(provider.getter.call(faker)).toString()
+                        2 -> it.call(provider.getter.call(faker), "").toString()
+                        3 -> it.call(provider.getter.call(faker), "", "").toString()
                         else -> exitProcess(3)
                     }
 
@@ -68,6 +69,5 @@ object Lookup : Runnable {
 
     override fun run() {
         printMatchingFunctions()
-        println(Faker().address.city())
     }
 }