From ec8eb840522a2fba9ef2d2602d6c3e347158315b Mon Sep 17 00:00:00 2001 From: sangyongchoi Date: Thu, 6 Oct 2022 02:19:30 +0900 Subject: [PATCH 1/2] set null when "kotlin.jvm.internal.DefaultConstructorMarker" --- .../mapping/model/ClassGeneratingEntityInstantiator.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/springframework/data/mapping/model/ClassGeneratingEntityInstantiator.java b/src/main/java/org/springframework/data/mapping/model/ClassGeneratingEntityInstantiator.java index 797f61e3f7..a4ce626ebc 100644 --- a/src/main/java/org/springframework/data/mapping/model/ClassGeneratingEntityInstantiator.java +++ b/src/main/java/org/springframework/data/mapping/model/ClassGeneratingEntityInstantiator.java @@ -298,7 +298,12 @@ static

, T> Object[] extractInvocationArguments( int index = 0; for (Parameter parameter : constructor.getParameters()) { - params[index++] = provider.getParameterValue(parameter); + if (parameter.getType().getType().getName() + .equals("kotlin.jvm.internal.DefaultConstructorMarker")) { + params[index++] = null; + } else { + params[index++] = provider.getParameterValue(parameter); + } } return params; From 0613d9c18fd142a68af74fa96418cf96d3fd9483 Mon Sep 17 00:00:00 2001 From: sangyongchoi Date: Thu, 6 Oct 2022 02:22:05 +0900 Subject: [PATCH 2/2] set null when "kotlin.jvm.internal.DefaultConstructorMarker" --- .../mapping/model/ClassGeneratingEntityInstantiator.java | 7 +------ .../model/PersistentEntityParameterValueProvider.java | 5 +++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/springframework/data/mapping/model/ClassGeneratingEntityInstantiator.java b/src/main/java/org/springframework/data/mapping/model/ClassGeneratingEntityInstantiator.java index a4ce626ebc..797f61e3f7 100644 --- a/src/main/java/org/springframework/data/mapping/model/ClassGeneratingEntityInstantiator.java +++ b/src/main/java/org/springframework/data/mapping/model/ClassGeneratingEntityInstantiator.java @@ -298,12 +298,7 @@ static

, T> Object[] extractInvocationArguments( int index = 0; for (Parameter parameter : constructor.getParameters()) { - if (parameter.getType().getType().getName() - .equals("kotlin.jvm.internal.DefaultConstructorMarker")) { - params[index++] = null; - } else { - params[index++] = provider.getParameterValue(parameter); - } + params[index++] = provider.getParameterValue(parameter); } return params; diff --git a/src/main/java/org/springframework/data/mapping/model/PersistentEntityParameterValueProvider.java b/src/main/java/org/springframework/data/mapping/model/PersistentEntityParameterValueProvider.java index d40fab20c4..bc3dbacc6e 100644 --- a/src/main/java/org/springframework/data/mapping/model/PersistentEntityParameterValueProvider.java +++ b/src/main/java/org/springframework/data/mapping/model/PersistentEntityParameterValueProvider.java @@ -55,6 +55,11 @@ public T getParameterValue(Parameter parameter) { return (T) parent; } + if (parameter.getType().getType().getName() + .equals("kotlin.jvm.internal.DefaultConstructorMarker")) { + return null; + } + String name = parameter.getName(); if (name == null) {