feat: add introspectors to spring auto configuration

line · Nov 12, 2023 · 581d5d3 · 581d5d3
1 parent 04cef12
commit 581d5d3
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 14 deletions.
diff --git a/...necorp/kotlinjdsl/support/spring/batch/javax/autoconfigure/KotlinJdslAutoConfiguration.kt b/...necorp/kotlinjdsl/support/spring/batch/javax/autoconfigure/KotlinJdslAutoConfiguration.kt
@@ -3,6 +3,7 @@ package com.linecorp.kotlinjdsl.support.spring.batch.javax.autoconfigure
 import com.linecorp.kotlinjdsl.render.RenderContext
 import com.linecorp.kotlinjdsl.render.jpql.JpqlRenderContext
 import com.linecorp.kotlinjdsl.render.jpql.JpqlRenderModule
+import com.linecorp.kotlinjdsl.render.jpql.introspector.JpqlIntrospector
 import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlSerializer
 import com.linecorp.kotlinjdsl.support.spring.batch.javax.item.database.orm.KotlinJdslQueryProviderFactory
 import org.springframework.boot.autoconfigure.AutoConfiguration
@@ -15,14 +16,21 @@ import org.springframework.context.annotation.Bean
 open class KotlinJdslAutoConfiguration {
     @Bean
     @ConditionalOnMissingBean
-    open fun jpqlRenderContext(serializers: List<JpqlSerializer<*>>): JpqlRenderContext {
-        val userDefinedSerializers = object : JpqlRenderModule {
+    open fun jpqlRenderContext(
+        serializers: List<JpqlSerializer<*>>,
+        introspectors: List<JpqlIntrospector>,
+    ): JpqlRenderContext {
+        val userDefinedModule = object : JpqlRenderModule {
             override fun setupModule(context: JpqlRenderModule.SetupContext) {
                 context.addAllSerializer(serializers.reversed())
+
+                introspectors.reversed().forEach {
+                    context.prependIntrospector(it)
+                }
             }
         }
 
-        return JpqlRenderContext().registerModules(userDefinedSerializers)
+        return JpqlRenderContext().registerModules(userDefinedModule)
     }
 
     @Bean

diff --git a/...com/linecorp/kotlinjdsl/support/spring/batch/autoconfigure/KotlinJdslAutoConfiguration.kt b/...com/linecorp/kotlinjdsl/support/spring/batch/autoconfigure/KotlinJdslAutoConfiguration.kt
@@ -3,6 +3,7 @@ package com.linecorp.kotlinjdsl.support.spring.batch.autoconfigure
 import com.linecorp.kotlinjdsl.render.RenderContext
 import com.linecorp.kotlinjdsl.render.jpql.JpqlRenderContext
 import com.linecorp.kotlinjdsl.render.jpql.JpqlRenderModule
+import com.linecorp.kotlinjdsl.render.jpql.introspector.JpqlIntrospector
 import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlSerializer
 import com.linecorp.kotlinjdsl.support.spring.batch.item.database.orm.KotlinJdslQueryProviderFactory
 import org.springframework.boot.autoconfigure.AutoConfiguration
@@ -15,14 +16,21 @@ import org.springframework.context.annotation.Bean
 open class KotlinJdslAutoConfiguration {
     @Bean
     @ConditionalOnMissingBean
-    open fun jpqlRenderContext(serializers: List<JpqlSerializer<*>>): JpqlRenderContext {
-        val userDefinedSerializers = object : JpqlRenderModule {
+    open fun jpqlRenderContext(
+        serializers: List<JpqlSerializer<*>>,
+        introspectors: List<JpqlIntrospector>,
+    ): JpqlRenderContext {
+        val userDefinedModule = object : JpqlRenderModule {
             override fun setupModule(context: JpqlRenderModule.SetupContext) {
                 context.addAllSerializer(serializers.reversed())
+
+                introspectors.reversed().forEach {
+                    context.prependIntrospector(it)
+                }
             }
         }
 
-        return JpqlRenderContext().registerModules(userDefinedSerializers)
+        return JpqlRenderContext().registerModules(userDefinedModule)
     }
 
     @Bean

diff --git a/...orp/kotlinjdsl/support/spring/data/jpa/javax/autoconfigure/KotlinJdslAutoConfiguration.kt b/...orp/kotlinjdsl/support/spring/data/jpa/javax/autoconfigure/KotlinJdslAutoConfiguration.kt
@@ -4,6 +4,7 @@ import com.linecorp.kotlinjdsl.SinceJdsl
 import com.linecorp.kotlinjdsl.render.RenderContext
 import com.linecorp.kotlinjdsl.render.jpql.JpqlRenderContext
 import com.linecorp.kotlinjdsl.render.jpql.JpqlRenderModule
+import com.linecorp.kotlinjdsl.render.jpql.introspector.JpqlIntrospector
 import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlSerializer
 import com.linecorp.kotlinjdsl.support.spring.data.jpa.javax.repository.KotlinJdslJpqlExecutor
 import com.linecorp.kotlinjdsl.support.spring.data.jpa.javax.repository.KotlinJdslJpqlExecutorImpl
@@ -20,15 +21,21 @@ open class KotlinJdslAutoConfiguration {
     @Bean
     @ConditionalOnMissingBean
     @SinceJdsl("3.0.0")
-    open fun jpqlRenderContext(serializers: List<JpqlSerializer<*>>): JpqlRenderContext {
-        val userDefinedSerializers = object : JpqlRenderModule {
+    open fun jpqlRenderContext(
+        serializers: List<JpqlSerializer<*>>,
+        introspectors: List<JpqlIntrospector>,
+    ): JpqlRenderContext {
+        val userDefinedModule = object : JpqlRenderModule {
             override fun setupModule(context: JpqlRenderModule.SetupContext) {
                 context.addAllSerializer(serializers.reversed())
+
+                introspectors.reversed().forEach {
+                    context.prependIntrospector(it)
+                }
             }
         }
 
-        return JpqlRenderContext()
-            .registerModules(userDefinedSerializers)
+        return JpqlRenderContext().registerModules(userDefinedModule)
     }
 
     @Bean

diff --git a/.../linecorp/kotlinjdsl/support/spring/data/jpa/autoconfigure/KotlinJdslAutoConfiguration.kt b/.../linecorp/kotlinjdsl/support/spring/data/jpa/autoconfigure/KotlinJdslAutoConfiguration.kt
@@ -4,6 +4,7 @@ import com.linecorp.kotlinjdsl.SinceJdsl
 import com.linecorp.kotlinjdsl.render.RenderContext
 import com.linecorp.kotlinjdsl.render.jpql.JpqlRenderContext
 import com.linecorp.kotlinjdsl.render.jpql.JpqlRenderModule
+import com.linecorp.kotlinjdsl.render.jpql.introspector.JpqlIntrospector
 import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlSerializer
 import com.linecorp.kotlinjdsl.support.spring.data.jpa.repository.KotlinJdslJpqlExecutor
 import com.linecorp.kotlinjdsl.support.spring.data.jpa.repository.KotlinJdslJpqlExecutorImpl
@@ -20,15 +21,21 @@ open class KotlinJdslAutoConfiguration {
     @Bean
     @ConditionalOnMissingBean
     @SinceJdsl("3.0.0")
-    open fun jpqlRenderContext(serializers: List<JpqlSerializer<*>>): JpqlRenderContext {
-        val userDefinedSerializers = object : JpqlRenderModule {
+    open fun jpqlRenderContext(
+        serializers: List<JpqlSerializer<*>>,
+        introspectors: List<JpqlIntrospector>,
+    ): JpqlRenderContext {
+        val userDefinedModule = object : JpqlRenderModule {
             override fun setupModule(context: JpqlRenderModule.SetupContext) {
                 context.addAllSerializer(serializers.reversed())
+
+                introspectors.reversed().forEach {
+                    context.prependIntrospector(it)
+                }
             }
         }
 
-        return JpqlRenderContext()
-            .registerModules(userDefinedSerializers)
+        return JpqlRenderContext().registerModules(userDefinedModule)
     }
 
     @Bean