Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACMNS-1200 - Fix entity instantiation of Kotlin types using primitives with default values.

Browse Source 
We now determine initial values for primitive parameters in Kotlin constructors that are absent (null) and defaulted. We default all Java primitive types to their initial zero value to prevent possible NullPointerExceptions. Kotlin defaulting uses a bitmask to determine which parameter should be defaulted but still requires the appropriate type.

Previously, null values were attempted to cast/unbox and caused NullPointerException even though they had default values through Kotlin assigned.

Original pull request: #255.
This commit is contained in:
Mark Paluch
2017-10-18 15:12:38 +02:00
committed by Oliver Gierke
parent 506fe37aea
commit cf5af6a971
2 changed files with 69 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/test/kotlin/org/springframework/data/convert/KotlinClassGeneratingEntityInstantiatorUnitTests.kt
View File

@@ -96,6 +96,27 @@ class KotlinClassGeneratingEntityInstantiatorUnitTests {
.hasCauseInstanceOf(IllegalArgumentException::class.java)
}
@Test // DATACMNS-1200
fun `should apply primitive defaulting for absent parameters`() {
val entity = this.entity as PersistentEntity<WithPrimitiveDefaulting, SamplePersistentProperty>
val constructor = PreferredConstructorDiscoverer.discover<WithPrimitiveDefaulting, SamplePersistentProperty>(WithPrimitiveDefaulting::class.java)
doReturn(constructor).whenever(entity).persistenceConstructor
doReturn(constructor.constructor.declaringClass).whenever(entity).type
val instance: WithPrimitiveDefaulting = KotlinClassGeneratingEntityInstantiator().createInstance(entity, provider)
Assertions.assertThat(instance.aByte).isEqualTo(0)
Assertions.assertThat(instance.aShort).isEqualTo(0)
Assertions.assertThat(instance.anInt).isEqualTo(0)
Assertions.assertThat(instance.aLong).isEqualTo(0L)
Assertions.assertThat(instance.aFloat).isEqualTo(0.0f)
Assertions.assertThat(instance.aDouble).isEqualTo(0.0)
Assertions.assertThat(instance.aChar).isEqualTo('a')
Assertions.assertThat(instance.aBool).isTrue()
}
data class Contact(val firstname: String, val lastname: String)
data class ContactWithDefaulting(val prop0: String, val prop1: String = "White", val prop2: String,
@@ -113,5 +134,8 @@ class KotlinClassGeneratingEntityInstantiatorUnitTests {
)
data class WithBoolean(val state: Boolean)
data class WithPrimitiveDefaulting(val aByte: Byte = 0, val aShort: Short = 0, val anInt: Int = 0, val aLong: Long = 0L,
val aFloat: Float = 0.0f, val aDouble: Double = 0.0, val aChar: Char = 'a', val aBool: Boolean = true)
}