From 047b6be83fee23bd5db47b5bf8ec9669c838ed5d Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 21 Feb 2024 14:19:13 +0100 Subject: [PATCH] Polishing. Tiny naming tweaks. See #3041 Original pull request: #3048 --- .../data/mapping/model/KotlinValueUtils.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/springframework/data/mapping/model/KotlinValueUtils.java b/src/main/java/org/springframework/data/mapping/model/KotlinValueUtils.java index 7823e6919..fa987a8fd 100644 --- a/src/main/java/org/springframework/data/mapping/model/KotlinValueUtils.java +++ b/src/main/java/org/springframework/data/mapping/model/KotlinValueUtils.java @@ -75,18 +75,14 @@ class KotlinValueUtils { public static ValueBoxing getConstructorValueHierarchy(Class cls) { KClass kotlinClass = JvmClassMappingKt.getKotlinClass(cls); - KType kType = extractKType(kotlinClass); - return new ValueBoxing(BoxingRules.CONSTRUCTOR, kType, kotlinClass, false); + return new ValueBoxing(BoxingRules.CONSTRUCTOR, typeOf(kotlinClass), kotlinClass, false); } /** * Get the {@link KType} for a given {@link KClass} and potentially fill missing generic type arguments with * {@link KTypeProjection#star} to prevent Kotlin internal checks to fail. - * - * @param kotlinClass - * @return */ - private static KType extractKType(KClass kotlinClass) { + private static KType typeOf(KClass kotlinClass) { return kotlinClass.getTypeParameters().isEmpty() ? Reflection.typeOf(kotlinClass) : Reflection.typeOf(JvmClassMappingKt.getJavaClass(kotlinClass), stubKTypeProjections(kotlinClass));