Merge branch 'main' into develop

line · Jun 10, 2024 · 3f6326b · 3f6326b
2 parents 3bdf3ba + f40c6e6
commit 3f6326b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/...rt/spring/data/jpa/javax/autoconfigure/KotlinJdslJpaRepositoryFactoryBeanPostProcessor.kt b/...rt/spring/data/jpa/javax/autoconfigure/KotlinJdslJpaRepositoryFactoryBeanPostProcessor.kt
@@ -16,10 +16,15 @@ open class KotlinJdslJpaRepositoryFactoryBeanPostProcessor : BeanPostProcessor {
     lateinit var kotlinJdslJpqlExecutor: KotlinJdslJpqlExecutor
 
     override fun postProcessBeforeInitialization(bean: Any, beanName: String): Any? {
-        if (bean is JpaRepositoryFactoryBean<*, *, *>) {
+        if (bean is JpaRepositoryFactoryBean<*, *, *> && bean.hasJdsl()) {
             bean.setCustomImplementation(kotlinJdslJpqlExecutor)
         }
 
         return super.postProcessAfterInitialization(bean, beanName)
     }
+
+    private fun JpaRepositoryFactoryBean<*, *, *>.hasJdsl(): Boolean {
+        return this.objectType.interfaces
+            .any { it == KotlinJdslJpqlExecutor::class.java }
+    }
 }
diff --git a/.../support/spring/data/jpa/autoconfigure/KotlinJdslJpaRepositoryFactoryBeanPostProcessor.kt b/.../support/spring/data/jpa/autoconfigure/KotlinJdslJpaRepositoryFactoryBeanPostProcessor.kt
@@ -16,10 +16,15 @@ open class KotlinJdslJpaRepositoryFactoryBeanPostProcessor : BeanPostProcessor {
     lateinit var kotlinJdslJpqlExecutor: KotlinJdslJpqlExecutor
 
     override fun postProcessBeforeInitialization(bean: Any, beanName: String): Any? {
-        if (bean is JpaRepositoryFactoryBean<*, *, *>) {
+        if (bean is JpaRepositoryFactoryBean<*, *, *> && bean.hasJdsl()) {
             bean.setCustomImplementation(kotlinJdslJpqlExecutor)
         }
 
         return super.postProcessAfterInitialization(bean, beanName)
     }
+
+    private fun JpaRepositoryFactoryBean<*, *, *>.hasJdsl(): Boolean {
+        return this.objectType.interfaces
+            .any { it == KotlinJdslJpqlExecutor::class.java }
+    }
 }