Skip to content

Commit 8b560f9

Browse files
committed
Upgrade to Kotlin 1.7.
Adopt to stricter nullability checks. Closes #2648
1 parent 2a299b2 commit 8b560f9

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

src/main/kotlin/org/springframework/data/repository/CrudRepositoryExtensions.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ package org.springframework.data.repository
2323
* @author Sebastien Deleuze
2424
* @since 2.1.4
2525
*/
26-
fun <T, ID> CrudRepository<T, ID>.findByIdOrNull(id: ID): T? = findById(id).orElse(null)
26+
fun <T, ID> CrudRepository<T, ID>.findByIdOrNull(id: ID): T? = findById(id!!).orElse(null)

src/test/kotlin/org/springframework/data/mapping/model/KotlinClassGeneratingEntityInstantiatorUnitTests.kt

+7-6
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class KotlinClassGeneratingEntityInstantiatorUnitTests {
4646

4747
every { provider.getParameterValue<String>(any()) }.returnsMany("Walter", "White")
4848
every { entity.instanceCreatorMetadata } returns constructor
49-
every { entity.type } returns constructor.constructor.declaringClass
49+
every { entity.type } returns constructor!!.constructor.declaringClass
5050
every { entity.typeInformation } returns mockk()
5151

5252
val instance: Contact =
@@ -74,7 +74,7 @@ class KotlinClassGeneratingEntityInstantiatorUnitTests {
7474
)
7575

7676
every { entity.instanceCreatorMetadata } returns constructor
77-
every { entity.type } returns constructor.constructor.declaringClass
77+
every { entity.type } returns constructor!!.constructor.declaringClass
7878
every { entity.typeInformation } returns mockk()
7979

8080
val instance: ContactWithDefaulting = KotlinClassGeneratingEntityInstantiator().createInstance(entity, provider)
@@ -98,7 +98,7 @@ class KotlinClassGeneratingEntityInstantiatorUnitTests {
9898

9999
every { provider.getParameterValue<Boolean>(any()) } returns null
100100
every { entity.instanceCreatorMetadata } returns constructor
101-
every { entity.type } returns constructor.constructor.declaringClass
101+
every { entity.type } returns constructor!!.constructor.declaringClass
102102
every { entity.typeInformation } returns mockk()
103103

104104
assertThatThrownBy {
@@ -108,7 +108,8 @@ class KotlinClassGeneratingEntityInstantiatorUnitTests {
108108
)
109109
} //
110110
.isInstanceOf(MappingInstantiationException::class.java) //
111-
.hasMessageContaining("fun <init>(kotlin.Boolean)") //
111+
.hasMessageContaining("init") //
112+
.hasMessageContaining("kotlin.Boolean") //
112113
.hasCauseInstanceOf(IllegalArgumentException::class.java)
113114
}
114115

@@ -131,7 +132,7 @@ class KotlinClassGeneratingEntityInstantiatorUnitTests {
131132
every { provider.getParameterValue<Char>(any()) } returns null
132133
every { provider.getParameterValue<Boolean>(any()) } returns null
133134
every { entity.instanceCreatorMetadata } returns constructor
134-
every { entity.type } returns constructor.constructor.declaringClass
135+
every { entity.type } returns constructor!!.constructor.declaringClass
135136
every { entity.typeInformation } returns mockk()
136137

137138
val instance: WithPrimitiveDefaulting = KotlinClassGeneratingEntityInstantiator().createInstance(entity, provider)
@@ -157,7 +158,7 @@ class KotlinClassGeneratingEntityInstantiatorUnitTests {
157158

158159
every { provider.getParameterValue<String>(any()) } returns "Walter"
159160
every { entity.instanceCreatorMetadata } returns constructor
160-
every { entity.type } returns constructor.constructor.declaringClass
161+
every { entity.type } returns constructor!!.constructor.declaringClass
161162
every { entity.typeInformation } returns mockk()
162163

163164
val instance: CustomUser =

src/test/kotlin/org/springframework/data/mapping/model/PreferredConstructorDiscovererUnitTests.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -32,47 +32,47 @@ class PreferredConstructorDiscovererUnitTests {
3232

3333
val constructor = PreferredConstructorDiscoverer.discover<Simple, SamplePersistentProperty>(Simple::class.java)
3434

35-
assertThat(constructor.parameters.size).isEqualTo(1)
35+
assertThat(constructor!!.parameters.size).isEqualTo(1)
3636
}
3737

3838
@Test // DATACMNS-1126
3939
fun `should reject two constructors`() {
4040

4141
val constructor = PreferredConstructorDiscoverer.discover<TwoConstructors, SamplePersistentProperty>(TwoConstructors::class.java)
4242

43-
assertThat(constructor.parameters.size).isEqualTo(1)
43+
assertThat(constructor!!.parameters.size).isEqualTo(1)
4444
}
4545

4646
@Test // DATACMNS-1170
4747
fun `should fall back to no-args constructor if no primary constructor available`() {
4848

4949
val constructor = PreferredConstructorDiscoverer.discover<TwoConstructorsWithoutDefault, SamplePersistentProperty>(TwoConstructorsWithoutDefault::class.java)
5050

51-
assertThat(constructor.parameters).isEmpty()
51+
assertThat(constructor!!.parameters).isEmpty()
5252
}
5353

5454
@Test // DATACMNS-1126
5555
fun `should discover annotated constructor`() {
5656

5757
val constructor = PreferredConstructorDiscoverer.discover<AnnotatedConstructors, SamplePersistentProperty>(AnnotatedConstructors::class.java)
5858

59-
assertThat(constructor.parameters.size).isEqualTo(2)
59+
assertThat(constructor!!.parameters.size).isEqualTo(2)
6060
}
6161

6262
@Test // DATACMNS-1126
6363
fun `should discover default constructor`() {
6464

6565
val constructor = PreferredConstructorDiscoverer.discover<DefaultConstructor, SamplePersistentProperty>(DefaultConstructor::class.java)
6666

67-
assertThat(constructor.parameters.size).isEqualTo(1)
67+
assertThat(constructor!!.parameters.size).isEqualTo(1)
6868
}
6969

7070
@Test // DATACMNS-1126
7171
fun `should discover default annotated constructor`() {
7272

7373
val constructor = PreferredConstructorDiscoverer.discover<TwoDefaultConstructorsAnnotated, SamplePersistentProperty>(TwoDefaultConstructorsAnnotated::class.java)
7474

75-
assertThat(constructor.parameters.size).isEqualTo(3)
75+
assertThat(constructor!!.parameters.size).isEqualTo(3)
7676
}
7777

7878
@Test // DATACMNS-1171

src/test/kotlin/org/springframework/data/repository/query/ParameterUnitTests.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ class ParameterUnitTests {
3131
@Test // DATACMNS-1508
3232
fun `should consider Continuation a special parameter`() {
3333

34-
val methodParameter = MethodParameter(MyCoroutineRepository::hello.javaMethod, 0)
34+
val methodParameter =
35+
MethodParameter(MyCoroutineRepository::hello.javaMethod!!, 0)
3536
methodParameter.initParameterNameDiscovery(DefaultParameterNameDiscoverer())
3637
val parameter = Parameter(methodParameter)
3738

0 commit comments

Comments
 (0)