Type extraction should work with Inherited Handlers for Parameterized…

… Commands (#29) * Type extraction should work with Inherited Handlers for Parameterized Type * Bump the version
Trendyol · Sep 27, 2022 · d6490ad · d6490ad
1 parent b81e31c
commit d6490ad
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 16 deletions.
diff --git a/kediatr-core/pom.xml b/kediatr-core/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.trendyol</groupId>
     <artifactId>kediatr-core</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
     <packaging>jar</packaging>
 
     <parent>

diff --git a/kediatr-core/src/main/kotlin/com/trendyol/kediatr/Registrar.kt b/kediatr-core/src/main/kotlin/com/trendyol/kediatr/Registrar.kt
@@ -1,6 +1,7 @@
 package com.trendyol.kediatr
 
 import java.lang.reflect.ParameterizedType
+import java.lang.reflect.TypeVariable
 
 @Suppress("UNCHECKED_CAST")
 abstract class Registrar {
@@ -23,15 +24,15 @@ abstract class Registrar {
 
         handler.genericInterfaces
             .filterIsInstance<ParameterizedType>()
-            .map { extractParameter<TParameter>(it) }
+            .map { extractParameter(it) }
             .forEach { registrar(it, handler) }
 
         when (handler.genericSuperclass) {
             is ParameterizedType -> {
                 val inheritedHandler = (handler.genericSuperclass as ParameterizedType).rawType as Class<*>
                 inheritedHandler.genericInterfaces
                     .filterIsInstance<ParameterizedType>()
-                    .map { extractParameter<TParameter>(handler.genericSuperclass as ParameterizedType) }
+                    .map { extractParameter(handler.genericSuperclass as ParameterizedType) }
                     .forEach { registrar(it, handler) }
             }
 
@@ -40,7 +41,7 @@ abstract class Registrar {
                 if (interfaceOrBaseClass.isAssignableFrom(inheritedHandler)) {
                     inheritedHandler.genericInterfaces
                         .filterIsInstance<ParameterizedType>()
-                        .map { extractParameter<TParameter>(it) }
+                        .map { extractParameter(it) }
                         .forEach { registrar(it, handler) }
                 }
             }
@@ -63,9 +64,10 @@ abstract class Registrar {
         registrar(handler)
     }
 
-    protected fun <T> extractParameter(genericInterface: ParameterizedType): Class<out T> =
+    protected fun extractParameter(genericInterface: ParameterizedType): Class<*> =
         when (val typeArgument = genericInterface.actualTypeArguments[0]) {
-            is ParameterizedType -> typeArgument.rawType as Class<out T>
-            else -> typeArgument as Class<out T>
+            is ParameterizedType -> typeArgument.rawType as Class<*>
+            is TypeVariable<*> -> extractParameter((genericInterface.rawType as Class<*>).genericInterfaces[0] as ParameterizedType)
+            else -> typeArgument as Class<*>
         }
 }
diff --git a/kediatr-core/src/test/kotlin/com/trendyol/CommandHandlerTest.kt b/kediatr-core/src/test/kotlin/com/trendyol/CommandHandlerTest.kt
@@ -7,8 +7,8 @@ import com.trendyol.kediatr.CommandBusBuilder
 import com.trendyol.kediatr.CommandHandler
 import com.trendyol.kediatr.HandlerNotFoundException
 import kotlinx.coroutines.runBlocking
-import org.junit.Test
 import org.junit.jupiter.api.Nested
+import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 import kotlin.test.assertNotNull

diff --git a/kediatr-core/src/test/kotlin/com/trendyol/PipelineBehaviorTest.kt b/kediatr-core/src/test/kotlin/com/trendyol/PipelineBehaviorTest.kt
@@ -3,7 +3,7 @@ package com.trendyol
 import com.trendyol.kediatr.*
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue

diff --git a/kediatr-koin-starter/pom.xml b/kediatr-koin-starter/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>com.trendyol</groupId>
     <artifactId>kediatr-koin-starter</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -195,7 +195,7 @@
         <dependency>
             <groupId>com.trendyol</groupId>
             <artifactId>kediatr-core</artifactId>
-            <version>1.0.18</version>
+            <version>1.1.2</version>
         </dependency>
         <dependency>
             <groupId>io.insert-koin</groupId>

diff --git a/kediatr-quarkus-starter/pom.xml b/kediatr-quarkus-starter/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>com.trendyol</groupId>
     <artifactId>kediatr-quarkus-starter</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
     <packaging>jar</packaging>
 
     <parent>
@@ -219,7 +219,7 @@
         <dependency>
             <groupId>com.trendyol</groupId>
             <artifactId>kediatr-core</artifactId>
-            <version>1.0.18</version>
+            <version>1.1.2</version>
         </dependency>
     </dependencies>
     <build>

diff --git a/kediatr-spring-starter/pom.xml b/kediatr-spring-starter/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.trendyol</groupId>
     <artifactId>kediatr-spring-starter</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
     <packaging>jar</packaging>
 
     <parent>
@@ -274,7 +274,7 @@
         <dependency>
             <groupId>com.trendyol</groupId>
             <artifactId>kediatr-core</artifactId>
-            <version>1.0.18</version>
+            <version>1.1.2</version>
         </dependency>
 
         <dependency>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.trendyol</groupId>
     <artifactId>kediatR</artifactId>
-    <version>1.0.5</version>
+    <version>1.1.2</version>
     <modules>
         <module>kediatr-core</module>
         <module>kediatr-spring-starter</module>