From 3735006798c3a8634680eac4731654be981a633b Mon Sep 17 00:00:00 2001 From: "jonghyon.s" Date: Sat, 4 May 2024 23:24:26 +0900 Subject: [PATCH 1/4] chore: release 3.4.1 --- build.gradle.kts | 2 +- docs/en/README.md | 2 +- docs/en/jpql-with-kotlin-jdsl/README.md | 12 ++++++------ docs/ko/README.md | 2 +- docs/ko/jpql-with-kotlin-jdsl/README.md | 12 ++++++------ 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 06166343a..f52e2ab58 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -25,7 +25,7 @@ allprojects { apply(plugin = "signing") group = "com.linecorp.kotlin-jdsl" - version = "3.4.0" + version = "3.4.1" repositories { mavenCentral() diff --git a/docs/en/README.md b/docs/en/README.md index d72d24099..77333d721 100644 --- a/docs/en/README.md +++ b/docs/en/README.md @@ -1,5 +1,5 @@ --- -description: 'Latest stable version: 3.4.0' +description: 'Latest stable version: 3.4.1' --- # Kotlin JDSL diff --git a/docs/en/jpql-with-kotlin-jdsl/README.md b/docs/en/jpql-with-kotlin-jdsl/README.md index 9a1415133..e67472a1b 100644 --- a/docs/en/jpql-with-kotlin-jdsl/README.md +++ b/docs/en/jpql-with-kotlin-jdsl/README.md @@ -99,8 +99,8 @@ The following dependencies are the minimum requirement for all Kotlin JDSL appli ```kotlin dependencies { - implementation("com.linecorp.kotlin-jdsl:jpql-dsl:3.4.0") - implementation("com.linecorp.kotlin-jdsl:jpql-render:3.4.0") + implementation("com.linecorp.kotlin-jdsl:jpql-dsl:3.4.1") + implementation("com.linecorp.kotlin-jdsl:jpql-render:3.4.1") } ``` @@ -110,8 +110,8 @@ dependencies { ```groovy dependencies { - implementation 'com.linecorp.kotlin-jdsl:jpql-dsl:3.4.0' - implementation 'com.linecorp.kotlin-jdsl:jpql-render:3.4.0' + implementation 'com.linecorp.kotlin-jdsl:jpql-dsl:3.4.1' + implementation 'com.linecorp.kotlin-jdsl:jpql-render:3.4.1' } ``` @@ -125,12 +125,12 @@ dependencies { com.linecorp.kotlin-jdsl jpql-dsl - 3.4.0 + 3.4.1 com.linecorp.kotlin-jdsl jpql-render - 3.4.0 + 3.4.1 ``` diff --git a/docs/ko/README.md b/docs/ko/README.md index 881842588..6f69b6269 100644 --- a/docs/ko/README.md +++ b/docs/ko/README.md @@ -1,5 +1,5 @@ --- -description: 'Latest stable version: 3.4.0' +description: 'Latest stable version: 3.4.1' --- # Kotlin JDSL diff --git a/docs/ko/jpql-with-kotlin-jdsl/README.md b/docs/ko/jpql-with-kotlin-jdsl/README.md index 753b28e1c..583cdf149 100644 --- a/docs/ko/jpql-with-kotlin-jdsl/README.md +++ b/docs/ko/jpql-with-kotlin-jdsl/README.md @@ -100,8 +100,8 @@ Kotlin JDSL을 실행시키기 위해서는 다음 dependency들이 필수로 ```kotlin dependencies { - implementation("com.linecorp.kotlin-jdsl:jpql-dsl:3.4.0") - implementation("com.linecorp.kotlin-jdsl:jpql-render:3.4.0") + implementation("com.linecorp.kotlin-jdsl:jpql-dsl:3.4.1") + implementation("com.linecorp.kotlin-jdsl:jpql-render:3.4.1") } ``` @@ -111,8 +111,8 @@ dependencies { ```groovy dependencies { - implementation 'com.linecorp.kotlin-jdsl:jpql-dsl:3.4.0' - implementation 'com.linecorp.kotlin-jdsl:jpql-render:3.4.0' + implementation 'com.linecorp.kotlin-jdsl:jpql-dsl:3.4.1' + implementation 'com.linecorp.kotlin-jdsl:jpql-render:3.4.1' } ``` @@ -126,12 +126,12 @@ dependencies { com.linecorp.kotlin-jdsl jpql-dsl - 3.4.0 + 3.4.1 com.linecorp.kotlin-jdsl jpql-render - 3.4.0 + 3.4.1 ``` From b5dadd364abdb95728fab929a0da64800da2f7f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=84=B1=EC=A4=80=ED=98=81?= Date: Mon, 10 Jun 2024 15:45:16 +0900 Subject: [PATCH 2/4] fix: Support other custom repository --- .../KotlinJdslJpaRepositoryFactoryBeanPostProcessor.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/support/spring-data-jpa/src/main/kotlin/com/linecorp/kotlinjdsl/support/spring/data/jpa/autoconfigure/KotlinJdslJpaRepositoryFactoryBeanPostProcessor.kt b/support/spring-data-jpa/src/main/kotlin/com/linecorp/kotlinjdsl/support/spring/data/jpa/autoconfigure/KotlinJdslJpaRepositoryFactoryBeanPostProcessor.kt index d6ea66cc9..bfd424194 100644 --- a/support/spring-data-jpa/src/main/kotlin/com/linecorp/kotlinjdsl/support/spring/data/jpa/autoconfigure/KotlinJdslJpaRepositoryFactoryBeanPostProcessor.kt +++ b/support/spring-data-jpa/src/main/kotlin/com/linecorp/kotlinjdsl/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 } + } } From 53467745b621399ea904a2c2999b176459fdf11f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=84=B1=EC=A4=80=ED=98=81?= Date: Mon, 10 Jun 2024 17:44:49 +0900 Subject: [PATCH 3/4] fix: Support other custom repository for javax --- .../KotlinJdslJpaRepositoryFactoryBeanPostProcessor.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/support/spring-data-jpa-javax/src/main/kotlin/com/linecorp/kotlinjdsl/support/spring/data/jpa/javax/autoconfigure/KotlinJdslJpaRepositoryFactoryBeanPostProcessor.kt b/support/spring-data-jpa-javax/src/main/kotlin/com/linecorp/kotlinjdsl/support/spring/data/jpa/javax/autoconfigure/KotlinJdslJpaRepositoryFactoryBeanPostProcessor.kt index 98041697f..9d5d72a70 100644 --- a/support/spring-data-jpa-javax/src/main/kotlin/com/linecorp/kotlinjdsl/support/spring/data/jpa/javax/autoconfigure/KotlinJdslJpaRepositoryFactoryBeanPostProcessor.kt +++ b/support/spring-data-jpa-javax/src/main/kotlin/com/linecorp/kotlinjdsl/support/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 } + } } From f40c6e6ce1afa910a7079f985d78e9a58a11dace Mon Sep 17 00:00:00 2001 From: "jonghyon.s" Date: Mon, 10 Jun 2024 23:00:18 +0900 Subject: [PATCH 4/4] chore: release 3.4.2 --- build.gradle.kts | 2 +- docs/en/README.md | 2 +- docs/en/jpql-with-kotlin-jdsl/README.md | 12 ++++++------ docs/ko/README.md | 2 +- docs/ko/jpql-with-kotlin-jdsl/README.md | 12 ++++++------ 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index f52e2ab58..afd9b8bd7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -25,7 +25,7 @@ allprojects { apply(plugin = "signing") group = "com.linecorp.kotlin-jdsl" - version = "3.4.1" + version = "3.4.2" repositories { mavenCentral() diff --git a/docs/en/README.md b/docs/en/README.md index 77333d721..6fdc57aa8 100644 --- a/docs/en/README.md +++ b/docs/en/README.md @@ -1,5 +1,5 @@ --- -description: 'Latest stable version: 3.4.1' +description: 'Latest stable version: 3.4.2' --- # Kotlin JDSL diff --git a/docs/en/jpql-with-kotlin-jdsl/README.md b/docs/en/jpql-with-kotlin-jdsl/README.md index e67472a1b..ed3c46e2a 100644 --- a/docs/en/jpql-with-kotlin-jdsl/README.md +++ b/docs/en/jpql-with-kotlin-jdsl/README.md @@ -99,8 +99,8 @@ The following dependencies are the minimum requirement for all Kotlin JDSL appli ```kotlin dependencies { - implementation("com.linecorp.kotlin-jdsl:jpql-dsl:3.4.1") - implementation("com.linecorp.kotlin-jdsl:jpql-render:3.4.1") + implementation("com.linecorp.kotlin-jdsl:jpql-dsl:3.4.2") + implementation("com.linecorp.kotlin-jdsl:jpql-render:3.4.2") } ``` @@ -110,8 +110,8 @@ dependencies { ```groovy dependencies { - implementation 'com.linecorp.kotlin-jdsl:jpql-dsl:3.4.1' - implementation 'com.linecorp.kotlin-jdsl:jpql-render:3.4.1' + implementation 'com.linecorp.kotlin-jdsl:jpql-dsl:3.4.2' + implementation 'com.linecorp.kotlin-jdsl:jpql-render:3.4.2' } ``` @@ -125,12 +125,12 @@ dependencies { com.linecorp.kotlin-jdsl jpql-dsl - 3.4.1 + 3.4.2 com.linecorp.kotlin-jdsl jpql-render - 3.4.1 + 3.4.2 ``` diff --git a/docs/ko/README.md b/docs/ko/README.md index 6f69b6269..732b9bffe 100644 --- a/docs/ko/README.md +++ b/docs/ko/README.md @@ -1,5 +1,5 @@ --- -description: 'Latest stable version: 3.4.1' +description: 'Latest stable version: 3.4.2' --- # Kotlin JDSL diff --git a/docs/ko/jpql-with-kotlin-jdsl/README.md b/docs/ko/jpql-with-kotlin-jdsl/README.md index 583cdf149..467c7a399 100644 --- a/docs/ko/jpql-with-kotlin-jdsl/README.md +++ b/docs/ko/jpql-with-kotlin-jdsl/README.md @@ -100,8 +100,8 @@ Kotlin JDSL을 실행시키기 위해서는 다음 dependency들이 필수로 ```kotlin dependencies { - implementation("com.linecorp.kotlin-jdsl:jpql-dsl:3.4.1") - implementation("com.linecorp.kotlin-jdsl:jpql-render:3.4.1") + implementation("com.linecorp.kotlin-jdsl:jpql-dsl:3.4.2") + implementation("com.linecorp.kotlin-jdsl:jpql-render:3.4.2") } ``` @@ -111,8 +111,8 @@ dependencies { ```groovy dependencies { - implementation 'com.linecorp.kotlin-jdsl:jpql-dsl:3.4.1' - implementation 'com.linecorp.kotlin-jdsl:jpql-render:3.4.1' + implementation 'com.linecorp.kotlin-jdsl:jpql-dsl:3.4.2' + implementation 'com.linecorp.kotlin-jdsl:jpql-render:3.4.2' } ``` @@ -126,12 +126,12 @@ dependencies { com.linecorp.kotlin-jdsl jpql-dsl - 3.4.1 + 3.4.2 com.linecorp.kotlin-jdsl jpql-render - 3.4.1 + 3.4.2 ```