chore(example): spring boot version v3.1.4

line · Sep 21, 2023 · da226fa · da226fa
1 parent 04e4894
commit da226fa
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 14 deletions.
diff --git a/...tch/src/main/kotlin/com/linecorp/kotlinjdsl/example/spring/batch/jpql/entity/book/Book.kt b/...tch/src/main/kotlin/com/linecorp/kotlinjdsl/example/spring/batch/jpql/entity/book/Book.kt
@@ -10,7 +10,6 @@ import jakarta.persistence.EmbeddedId
 import jakarta.persistence.Entity
 import jakarta.persistence.Id
 import jakarta.persistence.OneToMany
-import jakarta.persistence.OneToOne
 import jakarta.persistence.Table
 import java.time.OffsetDateTime
 import java.util.*
@@ -43,12 +42,12 @@ class Book(
     @OneToMany(mappedBy = "book", cascade = [CascadeType.ALL], orphanRemoval = true)
     val authors: MutableSet<BookAuthor>,
 
-    @OneToOne(mappedBy = "book", cascade = [CascadeType.ALL], orphanRemoval = true)
-    val publisher: BookPublisher,
+    @OneToMany(mappedBy = "book", cascade = [CascadeType.ALL], orphanRemoval = true)
+    val publishers: MutableSet<BookPublisher>,
 ) {
     init {
         authors.forEach { it.book = this }
-        publisher.book = this
+        publishers.forEach { it.book = this }
     }
 
     override fun equals(other: Any?): Boolean = Objects.equals(isbn, (other as? Book)?.isbn)

diff --git a/...ain/kotlin/com/linecorp/kotlinjdsl/example/spring/batch/jpql/entity/book/BookPublisher.kt b/...ain/kotlin/com/linecorp/kotlinjdsl/example/spring/batch/jpql/entity/book/BookPublisher.kt
@@ -8,7 +8,7 @@ import jakarta.persistence.Entity
 import jakarta.persistence.Id
 import jakarta.persistence.IdClass
 import jakarta.persistence.JoinColumn
-import jakarta.persistence.OneToOne
+import jakarta.persistence.ManyToOne
 import jakarta.persistence.Table
 import java.io.Serializable
 import java.util.*
@@ -22,7 +22,7 @@ class BookPublisher(
     val publisherId: Long,
 ) {
     @Id
-    @OneToOne
+    @ManyToOne
     @JoinColumn(name = "isbn")
     lateinit var book: Book
 

diff --git a/...tch/src/test/kotlin/com/linecorp/kotlinjdsl/example/spring/batch/jpql/BatchExampleTest.kt b/...tch/src/test/kotlin/com/linecorp/kotlinjdsl/example/spring/batch/jpql/BatchExampleTest.kt
@@ -94,7 +94,7 @@ class BatchExampleTest : WithAssertions {
                 entity(Book::class),
             ).from(
                 entity(Book::class),
-                fetchJoin(Book::publisher),
+                fetchJoin(Book::publishers),
             )
         }
 

diff --git a/.../src/main/kotlin/com/linecorp/kotlinjdsl/example/spring/data/jpa/jpql/entity/book/Book.kt b/.../src/main/kotlin/com/linecorp/kotlinjdsl/example/spring/data/jpa/jpql/entity/book/Book.kt
@@ -10,7 +10,6 @@ import jakarta.persistence.EmbeddedId
 import jakarta.persistence.Entity
 import jakarta.persistence.Id
 import jakarta.persistence.OneToMany
-import jakarta.persistence.OneToOne
 import jakarta.persistence.Table
 import java.time.OffsetDateTime
 import java.util.*
@@ -43,12 +42,12 @@ class Book(
     @OneToMany(mappedBy = "book", cascade = [CascadeType.ALL], orphanRemoval = true)
     val authors: MutableSet<BookAuthor>,
 
-    @OneToOne(mappedBy = "book", cascade = [CascadeType.ALL], orphanRemoval = true)
-    val publisher: BookPublisher,
+    @OneToMany(mappedBy = "book", cascade = [CascadeType.ALL], orphanRemoval = true)
+    val publishers: MutableSet<BookPublisher>,
 ) {
     init {
         authors.forEach { it.book = this }
-        publisher.book = this
+        publishers.forEach { it.book = this }
     }
 
     override fun equals(other: Any?): Boolean = Objects.equals(isbn, (other as? Book)?.isbn)

diff --git a/.../kotlin/com/linecorp/kotlinjdsl/example/spring/data/jpa/jpql/entity/book/BookPublisher.kt b/.../kotlin/com/linecorp/kotlinjdsl/example/spring/data/jpa/jpql/entity/book/BookPublisher.kt
@@ -8,7 +8,7 @@ import jakarta.persistence.Entity
 import jakarta.persistence.Id
 import jakarta.persistence.IdClass
 import jakarta.persistence.JoinColumn
-import jakarta.persistence.OneToOne
+import jakarta.persistence.ManyToOne
 import jakarta.persistence.Table
 import java.io.Serializable
 import java.util.*
@@ -22,7 +22,7 @@ class BookPublisher(
     val publisherId: Long,
 ) {
     @Id
-    @OneToOne
+    @ManyToOne
     @JoinColumn(name = "isbn")
     lateinit var book: Book
 

diff --git a/libs.example.versions.toml b/libs.example.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 kotlin = "1.9.10"
 
-spring-boot3 = "3.1.3"
+spring-boot3 = "3.1.4"
 spring-boot2 = "2.7.16"
 
 [libraries]