Skip to content

Commit e63c6f5

Browse files
timis1timis1
andauthored
[JAVA-37275] Upgrade main Kotlin version (#1002)
Co-authored-by: timis1 <[email protected]>
1 parent 5a9165b commit e63c6f5

File tree

3 files changed

+27
-9
lines changed

3 files changed

+27
-9
lines changed

kotlin-kotest/kotest/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
</build>
125125

126126
<properties>
127-
<kotlin.version>1.9.24</kotlin.version>
127+
<kotlin.version>2.0.0</kotlin.version>
128128
<kotest.version>5.9.0</kotest.version>
129129
<kotest-extensions-testcontainers.version>2.0.1</kotest-extensions-testcontainers.version>
130130
<jackson.version>2.15.4</jackson.version>

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@
754754
</profiles>
755755

756756
<properties>
757-
<kotlin.version>1.9.24</kotlin.version>
757+
<kotlin.version>2.0.0</kotlin.version>
758758
<kotlinx.version>1.7.1</kotlinx.version>
759759
<ktlint-cli.version>1.0.1</ktlint-cli.version>
760760

@@ -793,7 +793,7 @@
793793
<gib.failOnError>false</gib.failOnError>
794794
<gib.enabled>false</gib.enabled>
795795

796-
<java.version>11</java.version>
796+
<java.version>17</java.version>
797797

798798
<serialization.version>1.4.1</serialization.version>
799799
<jackson.version>2.15.0</jackson.version>

spring-mvc-kotlin/src/test/kotlin/com/baeldung/kotlin/jpa/HibernateKotlinIntegrationTest.kt

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package com.baeldung.kotlin.jpa
22

33
import org.hibernate.Hibernate
4+
import org.hibernate.Session
5+
import org.hibernate.Transaction
46
import org.hibernate.cfg.Configuration
57
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase
6-
import org.hibernate.testing.transaction.TransactionUtil.doInHibernate
78
import org.junit.Assert.assertTrue
89
import org.junit.Test
910
import org.slf4j.LoggerFactory
@@ -32,9 +33,26 @@ class HibernateKotlinIntegrationTest : BaseCoreFunctionalTestCase() {
3233
configuration.properties = properties
3334
}
3435

36+
fun doInHibernate(action: (Session) -> Unit) {
37+
val sessionFactory = sessionFactory()
38+
val session = sessionFactory.openSession()
39+
val transaction: Transaction = session.beginTransaction()
40+
41+
try {
42+
action(session)
43+
transaction.commit()
44+
} catch (e: Exception) {
45+
transaction.rollback()
46+
throw e
47+
} finally {
48+
session.close()
49+
}
50+
}
51+
52+
3553
@Test
3654
fun givenPersonWithFullData_whenSaved_thenFound() {
37-
doInHibernate(({ this.sessionFactory() })) { session ->
55+
doInHibernate { session ->
3856
val personToSave = Person(
3957
"John",
4058
@@ -49,7 +67,7 @@ class HibernateKotlinIntegrationTest : BaseCoreFunctionalTestCase() {
4967

5068
@Test
5169
fun givenPerson_whenSaved_thenFound() {
52-
doInHibernate(({ this.sessionFactory() })) { session ->
70+
doInHibernate { session ->
5371
val personToSave = Person( "John")
5472
session.persist(personToSave)
5573
val personFound = session.find(Person::class.java, personToSave.id)
@@ -61,7 +79,7 @@ class HibernateKotlinIntegrationTest : BaseCoreFunctionalTestCase() {
6179

6280
@Test
6381
fun givenPersonWithNullFields_whenSaved_thenFound() {
64-
doInHibernate(({ this.sessionFactory() })) { session ->
82+
doInHibernate { session ->
6583
val personToSave = Person("John", null, null)
6684
session.persist(personToSave)
6785
val personFound = session.find(Person::class.java, personToSave.id)
@@ -73,7 +91,7 @@ class HibernateKotlinIntegrationTest : BaseCoreFunctionalTestCase() {
7391

7492
@Test
7593
fun givenAddressWithDefaultEquals_whenAddedToSet_thenNotFound() {
76-
doInHibernate({ sessionFactory() }) { session ->
94+
doInHibernate{ session ->
7795
val addresses = mutableSetOf<Address>()
7896
val address = Address(name = "Berlin", phoneNumbers = listOf(PhoneNumber( "42")))
7997
addresses.add(address)
@@ -86,7 +104,7 @@ class HibernateKotlinIntegrationTest : BaseCoreFunctionalTestCase() {
86104

87105
@Test
88106
fun givenAddress_whenLogging_thenFetchesLazyAssociations() {
89-
doInHibernate({ this.sessionFactory() }) { session ->
107+
doInHibernate{ session ->
90108
val addressToSave = Address(name = "Berlin", phoneNumbers = listOf(PhoneNumber("42")))
91109
session.persist(addressToSave)
92110
session.clear()

0 commit comments

Comments
 (0)