Skip to content

Enhance Kotlin Class Conversion by Minimizing Equals Comparisons #3000

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Enhance Kotlin Class Conversion by Minimizing Equals Comparisons #3000

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/main/java/org/springframework/data/mapping/model/KotlinInstantiationDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@
import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.IntStream;

import org.springframework.data.mapping.InstanceCreatorMetadata;
Expand All @@ -40,12 +42,14 @@
* constructor argument extraction.
*
* @author Mark Paluch
* @author Yohan Lee
* @since 3.1
*/
class KotlinInstantiationDelegate {

private final KFunction<?> constructor;
private final List<KParameter> kParameters;
private final Map<KParameter, Integer> indexByKParameter;
private final List<Function<Object, Object>> wrappers = new ArrayList<>();
private final Constructor<?> constructorToInvoke;
private final boolean hasDefaultConstructorMarker;
Expand All @@ -62,6 +66,8 @@ public KotlinInstantiationDelegate(PreferredConstructor<?, ?> preferredConstruct

this.constructor = kotlinConstructor;
this.kParameters = kotlinConstructor.getParameters();
this.indexByKParameter = IntStream.range(0, kParameters.size()).boxed()
.collect(Collectors.toMap(kParameters::get, Function.identity()));
this.constructorToInvoke = constructorToInvoke;
this.hasDefaultConstructorMarker = hasDefaultConstructorMarker(constructorToInvoke.getParameters());

Expand Down Expand Up @@ -118,7 +124,7 @@ public <P extends PersistentProperty<P>> Object[] extractInvocationArguments(Obj

KotlinDefaultMask defaultMask = KotlinDefaultMask.forConstructor(constructor, it -> {

int index = kParameters.indexOf(it);
int index = indexByKParameter.get(it);

Parameter<Object, P> parameter = parameters.get(index);
Class<Object> type = parameter.getType().getType();
Expand Down