Merge branch 'bugfix/hibernate-entity-mapping' into develop

benchmark/build.gradle.kts

@@ -1,14 +1,14 @@
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 plugins {
-    alias(exampleLibs.plugins.kotlin.benchmark)
-    alias(exampleLibs.plugins.kotlin.allopen)
-    alias(exampleLibs.plugins.kotlin.spring)
-    alias(exampleLibs.plugins.kotlin.jpa)
+    alias(libs.plugins.kotlin.benchmark)
+    alias(libs.plugins.kotlin.allopen)
+    alias(libs.plugins.kotlin.spring)
+    alias(libs.plugins.kotlin.jpa)
 }
 
 dependencies {
-    implementation(exampleLibs.kotlin.benchmark)
+    implementation(libs.kotlin.benchmark)
     implementation(exampleLibs.jakarta.persistence.api)
     implementation(exampleLibs.logback)
     implementation(projects.jpqlDsl)

example/eclipselink-javax/build.gradle.kts

@@ -1,9 +1,9 @@
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 plugins {
-    alias(exampleLibs.plugins.kotlin.noarg)
-    alias(exampleLibs.plugins.kotlin.allopen)
-    alias(exampleLibs.plugins.kotlin.jpa)
+    alias(libs.plugins.kotlin.noarg)
+    alias(libs.plugins.kotlin.allopen)
+    alias(libs.plugins.kotlin.jpa)
 }
 
 dependencies {

example/eclipselink/build.gradle.kts

@@ -1,9 +1,9 @@
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 plugins {
-    alias(exampleLibs.plugins.kotlin.noarg)
-    alias(exampleLibs.plugins.kotlin.allopen)
-    alias(exampleLibs.plugins.kotlin.jpa)
+    alias(libs.plugins.kotlin.noarg)
+    alias(libs.plugins.kotlin.allopen)
+    alias(libs.plugins.kotlin.jpa)
 }
 
 dependencies {

example/hibernate-javax/build.gradle.kts

@@ -1,9 +1,9 @@
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 plugins {
-    alias(exampleLibs.plugins.kotlin.noarg)
-    alias(exampleLibs.plugins.kotlin.allopen)
-    alias(exampleLibs.plugins.kotlin.jpa)
+    alias(libs.plugins.kotlin.noarg)
+    alias(libs.plugins.kotlin.allopen)
+    alias(libs.plugins.kotlin.jpa)
 }
 
 dependencies {

example/hibernate-javax/src/main/resources/META-INF/persistence.xml

@@ -1,10 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<persistence xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.1"
+<persistence xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.2"
              xmlns="http://xmlns.jcp.org/xml/ns/persistence"
              xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence
         http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd">
 
     <persistence-unit name="example">
+        <class>com.linecorp.kotlinjdsl.example.jpql.hibernate.javax.entity.author.Author</class>
+        <class>com.linecorp.kotlinjdsl.example.jpql.hibernate.javax.entity.book.Book</class>
+        <class>com.linecorp.kotlinjdsl.example.jpql.hibernate.javax.entity.book.BookAuthor</class>
+        <class>com.linecorp.kotlinjdsl.example.jpql.hibernate.javax.entity.book.BookPublisher</class>
+        <class>com.linecorp.kotlinjdsl.example.jpql.hibernate.javax.entity.department.Department</class>
+        <class>com.linecorp.kotlinjdsl.example.jpql.hibernate.javax.entity.employee.Employee</class>
+        <class>com.linecorp.kotlinjdsl.example.jpql.hibernate.javax.entity.employee.EmployeeDepartment</class>
+        <class>com.linecorp.kotlinjdsl.example.jpql.hibernate.javax.entity.employee.FullTimeEmployee</class>
+        <class>com.linecorp.kotlinjdsl.example.jpql.hibernate.javax.entity.employee.PartTimeEmployee</class>
+        <class>com.linecorp.kotlinjdsl.example.jpql.hibernate.javax.entity.publisher.Publisher</class>
+
         <properties>
             <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test;MODE=MYSQL;DATABASE_TO_LOWER=TRUE"/>
             <property name="javax.persistence.jdbc.user" value="sa"/>

example/hibernate-reactive-javax/build.gradle.kts

@@ -1,9 +1,9 @@
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 plugins {
-    alias(exampleLibs.plugins.kotlin.noarg)
-    alias(exampleLibs.plugins.kotlin.allopen)
-    alias(exampleLibs.plugins.kotlin.jpa)
+    alias(libs.plugins.kotlin.noarg)
+    alias(libs.plugins.kotlin.allopen)
+    alias(libs.plugins.kotlin.jpa)
 }
 
 dependencies {

example/hibernate-reactive-javax/src/main/resources/META-INF/persistence.xml

@@ -7,8 +7,18 @@
     <persistence-unit name="example">
         <provider>org.hibernate.reactive.provider.ReactivePersistenceProvider</provider>
 
+        <class>com.linecorp.kotlinjdsl.example.hibernate.reactive.javax.jpql.entity.author.Author</class>
+        <class>com.linecorp.kotlinjdsl.example.hibernate.reactive.javax.jpql.entity.book.Book</class>
+        <class>com.linecorp.kotlinjdsl.example.hibernate.reactive.javax.jpql.entity.book.BookAuthor</class>
+        <class>com.linecorp.kotlinjdsl.example.hibernate.reactive.javax.jpql.entity.book.BookPublisher</class>
+        <class>com.linecorp.kotlinjdsl.example.hibernate.reactive.javax.jpql.entity.department.Department</class>
+        <class>com.linecorp.kotlinjdsl.example.hibernate.reactive.javax.jpql.entity.employee.Employee</class>
+        <class>com.linecorp.kotlinjdsl.example.hibernate.reactive.javax.jpql.entity.employee.EmployeeDepartment</class>
+        <class>com.linecorp.kotlinjdsl.example.hibernate.reactive.javax.jpql.entity.employee.FullTimeEmployee</class>
+        <class>com.linecorp.kotlinjdsl.example.hibernate.reactive.javax.jpql.entity.employee.PartTimeEmployee</class>
+        <class>com.linecorp.kotlinjdsl.example.hibernate.reactive.javax.jpql.entity.publisher.Publisher</class>
+
         <properties>
-            <property name="packagesToScan" value="com.linecorp.kotlinjdsl.example.hibernate.reactive.javax.jpql.entity"/>
             <property name="hibernate.vertx.pool.class" value="com.linecorp.kotlinjdsl.example.hibernate.reactive.javax.jpql.configuration.H2DBConnectionPool"/>
             <property name="hibernate.vertx.pool.configuration_class" value="com.linecorp.kotlinjdsl.example.hibernate.reactive.javax.jpql.configuration.H2DBConnectionPoolConfiguration"/>
 

example/hibernate-reactive/build.gradle.kts

@@ -1,9 +1,9 @@
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 plugins {
-    alias(exampleLibs.plugins.kotlin.noarg)
-    alias(exampleLibs.plugins.kotlin.allopen)
-    alias(exampleLibs.plugins.kotlin.jpa)
+    alias(libs.plugins.kotlin.noarg)
+    alias(libs.plugins.kotlin.allopen)
+    alias(libs.plugins.kotlin.jpa)
 }
 
 dependencies {

example/hibernate-reactive/src/main/resources/META-INF/persistence.xml

@@ -7,8 +7,18 @@
     <persistence-unit name="example">
         <provider>org.hibernate.reactive.provider.ReactivePersistenceProvider</provider>
 
+        <class>com.linecorp.kotlinjdsl.example.hibernate.reactive.jakarta.jpql.entity.author.Author</class>
+        <class>com.linecorp.kotlinjdsl.example.hibernate.reactive.jakarta.jpql.entity.book.Book</class>
+        <class>com.linecorp.kotlinjdsl.example.hibernate.reactive.jakarta.jpql.entity.book.BookAuthor</class>
+        <class>com.linecorp.kotlinjdsl.example.hibernate.reactive.jakarta.jpql.entity.book.BookPublisher</class>
+        <class>com.linecorp.kotlinjdsl.example.hibernate.reactive.jakarta.jpql.entity.department.Department</class>
+        <class>com.linecorp.kotlinjdsl.example.hibernate.reactive.jakarta.jpql.entity.employee.Employee</class>
+        <class>com.linecorp.kotlinjdsl.example.hibernate.reactive.jakarta.jpql.entity.employee.EmployeeDepartment</class>
+        <class>com.linecorp.kotlinjdsl.example.hibernate.reactive.jakarta.jpql.entity.employee.FullTimeEmployee</class>
+        <class>com.linecorp.kotlinjdsl.example.hibernate.reactive.jakarta.jpql.entity.employee.PartTimeEmployee</class>
+        <class>com.linecorp.kotlinjdsl.example.hibernate.reactive.jakarta.jpql.entity.publisher.Publisher</class>
+
         <properties>
-            <property name="packagesToScan" value="com.linecorp.kotlinjdsl.example.hibernate.reactive.jakarta.jpql.entity"/>
             <property name="hibernate.vertx.pool.class" value="com.linecorp.kotlinjdsl.example.hibernate.reactive.jakarta.jpql.configuration.H2DBConnectionPool"/>
             <property name="hibernate.vertx.pool.configuration_class" value="com.linecorp.kotlinjdsl.example.hibernate.reactive.jakarta.jpql.configuration.H2DBConnectionPoolConfiguration"/>
 

example/hibernate/build.gradle.kts

@@ -1,9 +1,9 @@
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 plugins {
-    alias(exampleLibs.plugins.kotlin.noarg)
-    alias(exampleLibs.plugins.kotlin.allopen)
-    alias(exampleLibs.plugins.kotlin.jpa)
+    alias(libs.plugins.kotlin.noarg)
+    alias(libs.plugins.kotlin.allopen)
+    alias(libs.plugins.kotlin.jpa)
 }
 
 dependencies {

example/hibernate/src/main/resources/META-INF/persistence.xml

@@ -1,10 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<persistence xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.1"
+<persistence xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.2"
              xmlns="http://xmlns.jcp.org/xml/ns/persistence"
              xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence
         http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd">
 
     <persistence-unit name="example">
+        <class>com.linecorp.kotlinjdsl.example.jpql.hibernate.entity.author.Author</class>
+        <class>com.linecorp.kotlinjdsl.example.jpql.hibernate.entity.book.Book</class>
+        <class>com.linecorp.kotlinjdsl.example.jpql.hibernate.entity.book.BookAuthor</class>
+        <class>com.linecorp.kotlinjdsl.example.jpql.hibernate.entity.book.BookPublisher</class>
+        <class>com.linecorp.kotlinjdsl.example.jpql.hibernate.entity.department.Department</class>
+        <class>com.linecorp.kotlinjdsl.example.jpql.hibernate.entity.employee.Employee</class>
+        <class>com.linecorp.kotlinjdsl.example.jpql.hibernate.entity.employee.EmployeeDepartment</class>
+        <class>com.linecorp.kotlinjdsl.example.jpql.hibernate.entity.employee.FullTimeEmployee</class>
+        <class>com.linecorp.kotlinjdsl.example.jpql.hibernate.entity.employee.PartTimeEmployee</class>
+        <class>com.linecorp.kotlinjdsl.example.jpql.hibernate.entity.publisher.Publisher</class>
+
         <properties>
             <property name="jakarta.persistence.jdbc.url" value="jdbc:h2:mem:test;MODE=MYSQL;DATABASE_TO_LOWER=TRUE"/>
             <property name="jakarta.persistence.jdbc.user" value="sa"/>

example/spring-batch-javax/build.gradle.kts

@@ -2,10 +2,10 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 plugins {
     alias(exampleLibs.plugins.spring.boot2)
-    alias(exampleLibs.plugins.kotlin.noarg)
-    alias(exampleLibs.plugins.kotlin.allopen)
-    alias(exampleLibs.plugins.kotlin.spring)
-    alias(exampleLibs.plugins.kotlin.jpa)
+    alias(libs.plugins.kotlin.noarg)
+    alias(libs.plugins.kotlin.allopen)
+    alias(libs.plugins.kotlin.spring)
+    alias(libs.plugins.kotlin.jpa)
 }
 
 dependencies {

example/spring-batch/build.gradle.kts

@@ -2,10 +2,10 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 plugins {
     alias(exampleLibs.plugins.spring.boot3)
-    alias(exampleLibs.plugins.kotlin.noarg)
-    alias(exampleLibs.plugins.kotlin.allopen)
-    alias(exampleLibs.plugins.kotlin.spring)
-    alias(exampleLibs.plugins.kotlin.jpa)
+    alias(libs.plugins.kotlin.noarg)
+    alias(libs.plugins.kotlin.allopen)
+    alias(libs.plugins.kotlin.spring)
+    alias(libs.plugins.kotlin.jpa)
 }
 
 dependencies {

example/spring-data-jpa-javax/build.gradle.kts

@@ -2,10 +2,10 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 plugins {
     alias(exampleLibs.plugins.spring.boot2)
-    alias(exampleLibs.plugins.kotlin.noarg)
-    alias(exampleLibs.plugins.kotlin.allopen)
-    alias(exampleLibs.plugins.kotlin.spring)
-    alias(exampleLibs.plugins.kotlin.jpa)
+    alias(libs.plugins.kotlin.noarg)
+    alias(libs.plugins.kotlin.allopen)
+    alias(libs.plugins.kotlin.spring)
+    alias(libs.plugins.kotlin.jpa)
 }
 
 dependencies {

example/spring-data-jpa/build.gradle.kts

@@ -2,10 +2,10 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 plugins {
     alias(exampleLibs.plugins.spring.boot3)
-    alias(exampleLibs.plugins.kotlin.noarg)
-    alias(exampleLibs.plugins.kotlin.allopen)
-    alias(exampleLibs.plugins.kotlin.spring)
-    alias(exampleLibs.plugins.kotlin.jpa)
+    alias(libs.plugins.kotlin.noarg)
+    alias(libs.plugins.kotlin.allopen)
+    alias(libs.plugins.kotlin.spring)
+    alias(libs.plugins.kotlin.jpa)
 }
 
 dependencies {

libs.example.versions.toml

@@ -1,13 +1,8 @@
 [versions]
-kotlin = "1.9.22"
-
 spring-boot3 = "3.2.1"
 spring-boot2 = "2.7.18"
 
 [libraries]
-# kotlin
-kotlin-benchmark = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-runtime", version = "0.4.10" }
-
 # log
 slf4j = { module = "org.slf4j:slf4j-api", version = "2.0.11" }
 logback = { module = "ch.qos.logback:logback-classic", version = "1.4.14" }
@@ -50,12 +45,5 @@ agroal-pool = { module = "io.agroal:agroal-pool", version = "2.2" }
 h2 = { module = "com.h2database:h2", version = "2.2.224" }
 
 [plugins]
-kotlin-benchmark = { id = "org.jetbrains.kotlinx.benchmark", version = "0.4.10" }
-kotlin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlin" }
-kotlin-noarg = { id = "org.jetbrains.kotlin.plugin.noarg", version.ref = "kotlin" }
-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
-kotlin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" }
-kotlin-jpa = { id = "org.jetbrains.kotlin.plugin.jpa", version.ref = "kotlin" }
-
 spring-boot3 = { id = "org.springframework.boot", version.ref = "spring-boot3" }
 spring-boot2 = { id = "org.springframework.boot", version.ref = "spring-boot2" }

libs.versions.toml

@@ -5,6 +5,7 @@ kotlin = "1.9.22"
 # kotlin
 kotlin = { module = "org.jetbrains.kotlin:kotlin-stdlib" }
 kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect" }
+kotlin-benchmark = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-runtime", version = "0.4.10" }
 
 # coroutines
 coroutine-jdk8 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8", version = "1.7.3" }
@@ -48,7 +49,12 @@ assertJ = { module = "org.assertj:assertj-core", version = "3.24.2" }
 mockk = { module = "io.mockk:mockk", version = "1.13.7" }
 
 [plugins]
+kotlin-benchmark = { id = "org.jetbrains.kotlinx.benchmark", version = "0.4.10" }
+kotlin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlin" }
+kotlin-noarg = { id = "org.jetbrains.kotlin.plugin.noarg", version.ref = "kotlin" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+kotlin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" }
+kotlin-jpa = { id = "org.jetbrains.kotlin.plugin.jpa", version.ref = "kotlin" }
 kover = { id = "org.jetbrains.kotlinx.kover", version = "0.7.1" }
 ktlint = { id = "org.jmailen.kotlinter", version = "3.16.0" }
 nexus-publish = { id = "io.github.gradle-nexus.publish-plugin", version = "1.3.0" }