Skip to content
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.

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

101: Add support for immutable collection constructor creation #3108

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
5c23022
101: Add support for immutable collection constructor creation
epochcoder Mar 8, 2024
d79f125
Merge branch 'master' into pr/3108
harawata Nov 16, 2024
0497117
Added tests covering basics with simpler objects
harawata Nov 18, 2024
7fdfb4d
Merge branch 'master' into feature/101-support-constructor-collection…
epochcoder Nov 19, 2024
558c8a1
#101: Pass CollectionInConstructorTest
epochcoder Nov 19, 2024
a01b27e
#101: Remove experimental flag
epochcoder Nov 19, 2024
e163a91
#101: Keep track of pending creations that were set as property mappings
epochcoder Nov 20, 2024
bc53e84
#101: Add test which violates equals contract
epochcoder Nov 21, 2024
685bafb
isle -> aisle 😑
harawata Dec 26, 2024
ccc2071
Cleanup by maven plugins
harawata Dec 27, 2024
9ade243
Remove constructor verification process
harawata Dec 27, 2024
462d890
Merge branch 'master' into pr/3108
harawata Dec 28, 2024
be53709
Merge branch 'master' into pr/3108
harawata Dec 28, 2024
d1dca2a
Merge branch 'master' into feature/101-support-constructor-collection…
epochcoder Dec 30, 2024
f3a2432
Remove redundant containsKey invocations, etc.
harawata Dec 31, 2024
9886f1d
Merge branch 'master' into pr/3108
harawata Jan 1, 2025
212cbad
Revert the unnecessary change (for diff)
harawata Jan 1, 2025
1562473
Edited en doc a little bit and copied the doc changes to the other lo…
harawata Jan 1, 2025
9a92894
License year
harawata Jan 2, 2025
5916710
Remove unused variable
epochcoder Jan 2, 2025
fd69cf0
Merge branch 'master' into feature/101-support-constructor-collection…
epochcoder Jan 2, 2025
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

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
/*
* Copyright 2009-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.ibatis.executor.resultset;

import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.apache.ibatis.executor.ExecutorException;
import org.apache.ibatis.mapping.ResultMap;
import org.apache.ibatis.mapping.ResultMapping;
import org.apache.ibatis.reflection.ReflectionException;
import org.apache.ibatis.reflection.factory.ObjectFactory;

/**
* Represents an object that is still to be created once all nested results with collection values have been gathered
*
* @author Willie Scholtz
*/
final class PendingConstructorCreation {

private final Class<?> resultType;
private final List<Class<?>> constructorArgTypes;
private final List<Object> constructorArgs;

private final Map<Integer, PendingCreationMetaInfo> linkedCollectionMetaInfo;
private final Map<PendingCreationKey, Collection<Object>> linkedCollectionsByKey;
private final Map<PendingCreationKey, List<PendingConstructorCreation>> linkedCreationsByKey;

PendingConstructorCreation(Class<?> resultType, List<Class<?>> types, List<Object> args) {
// since all our keys are based on result map id, we know we will never go over args size
final int maxSize = types.size();

this.linkedCollectionMetaInfo = new HashMap<>(maxSize);
this.linkedCollectionsByKey = new HashMap<>(maxSize);
this.linkedCreationsByKey = new HashMap<>(maxSize);

this.resultType = resultType;
this.constructorArgTypes = types;
this.constructorArgs = args;
}

@SuppressWarnings("unchecked")
Collection<Object> initializeCollectionForResultMapping(ObjectFactory objectFactory, ResultMap resultMap,
ResultMapping constructorMapping, Integer index) {
final Class<?> parameterType = constructorMapping.getJavaType();
if (!objectFactory.isCollection(parameterType)) {
throw new ReflectionException(
"Cannot add a collection result to non-collection based resultMapping: " + constructorMapping);
}

return linkedCollectionsByKey.computeIfAbsent(new PendingCreationKey(constructorMapping), k -> {
// this will allow us to verify the types of the collection before creating the final object
linkedCollectionMetaInfo.put(index, new PendingCreationMetaInfo(resultMap.getType(), k));

// will be checked before we finally create the object) as we cannot reliably do that here
return (Collection<Object>) objectFactory.create(parameterType);
});
}

void linkCreation(ResultMapping constructorMapping, PendingConstructorCreation pcc) {
final PendingCreationKey creationKey = new PendingCreationKey(constructorMapping);
final List<PendingConstructorCreation> pendingConstructorCreations = linkedCreationsByKey
.computeIfAbsent(creationKey, k -> new ArrayList<>());

if (pendingConstructorCreations.contains(pcc)) {
throw new ExecutorException("Cannot link inner constructor creation with same value, MyBatis internal error!");
}

pendingConstructorCreations.add(pcc);
}

void linkCollectionValue(ResultMapping constructorMapping, Object value) {
// not necessary to add null results to the collection
if (value == null) {
return;
}

linkedCollectionsByKey.computeIfAbsent(new PendingCreationKey(constructorMapping), k -> {
throw new ExecutorException("Cannot link collection value for key: " + constructorMapping
+ ", resultMap has not been seen/initialized yet! Mybatis internal error!");
}).add(value);
}

@Override
public String toString() {
return "PendingConstructorCreation(" + this.hashCode() + "){" + "resultType=" + resultType + '}';
}

/**
* Recursively creates the final result of this creation.
*
* @param objectFactory
* the object factory
*
* @return the new immutable result
*/
Object create(ObjectFactory objectFactory) {
final List<Object> newArguments = new ArrayList<>(constructorArgs.size());
for (int i = 0; i < constructorArgs.size(); i++) {
final PendingCreationMetaInfo creationMetaInfo = linkedCollectionMetaInfo.get(i);
final Object existingArg = constructorArgs.get(i);

if (creationMetaInfo == null) {
// we are not aware of this argument wrt pending creations
newArguments.add(existingArg);
continue;
}

// time to finally build this collection
final PendingCreationKey pendingCreationKey = creationMetaInfo.getPendingCreationKey();
final List<PendingConstructorCreation> linkedCreations = linkedCreationsByKey.get(pendingCreationKey);
if (linkedCreations != null) {
@SuppressWarnings("unchecked")
final Collection<Object> emptyCollection = (Collection<Object>) existingArg;

for (PendingConstructorCreation linkedCreation : linkedCreations) {
emptyCollection.add(linkedCreation.create(objectFactory));
}

newArguments.add(emptyCollection);
continue;
}

// handle the base collection (it was built inline already)
newArguments.add(existingArg);
}

return objectFactory.create(resultType, constructorArgTypes, newArguments);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
/*
* Copyright 2009-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.ibatis.executor.resultset;

import java.util.Objects;

import org.apache.ibatis.mapping.ResultMapping;

/**
* A unique identifier for a pending constructor creation, prefix is used to distinguish between equal result maps for
* different columns
*
* @author Willie Scholtz
*/
final class PendingCreationKey {
private final String resultMapId;
private final String constructorColumnPrefix;

PendingCreationKey(ResultMapping constructorMapping) {
this.resultMapId = constructorMapping.getNestedResultMapId();
this.constructorColumnPrefix = constructorMapping.getColumnPrefix();
}

String getConstructorColumnPrefix() {
return constructorColumnPrefix;
}

String getResultMapId() {
return resultMapId;
}

@Override
public boolean equals(Object o) {
if (this == o)
return true;
if (o == null || getClass() != o.getClass())
return false;

PendingCreationKey that = (PendingCreationKey) o;
return Objects.equals(resultMapId, that.resultMapId)
&& Objects.equals(constructorColumnPrefix, that.constructorColumnPrefix);
}

@Override
public int hashCode() {
return Objects.hash(resultMapId, constructorColumnPrefix);
}

@Override
public String toString() {
return "PendingCreationKey{" + "resultMapId='" + resultMapId + '\'' + ", constructorColumnPrefix='"
+ constructorColumnPrefix + '\'' + '}';
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/*
* Copyright 2009-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.ibatis.executor.resultset;

/**
* Used to keep track of specific argument types for pending creations
*
* @author Willie Scholtz
*/
final class PendingCreationMetaInfo {

private final Class<?> argumentType;
private final PendingCreationKey pendingCreationKey;

PendingCreationMetaInfo(Class<?> argumentType, PendingCreationKey pendingCreationKey) {
this.argumentType = argumentType;
this.pendingCreationKey = pendingCreationKey;
}

Class<?> getArgumentType() {
return argumentType;
}

PendingCreationKey getPendingCreationKey() {
return pendingCreationKey;
}

@Override
public String toString() {
return "PendingCreationMetaInfo{" + "argumentType=" + argumentType + ", pendingCreationKey='" + pendingCreationKey
+ '\'' + '}';
}
}
12 changes: 12 additions & 0 deletions src/main/java/org/apache/ibatis/mapping/ResultMap.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ public class ResultMap {
private Set<String> mappedColumns;
private Set<String> mappedProperties;
private Discriminator discriminator;
private boolean hasResultMapsUsingConstructorCollection;
private boolean hasNestedResultMaps;
private boolean hasNestedQueries;
private Boolean autoMapping;
Expand Down Expand Up @@ -111,6 +112,13 @@ public ResultMap build() {
}
if (resultMapping.getFlags().contains(ResultFlag.CONSTRUCTOR)) {
resultMap.constructorResultMappings.add(resultMapping);

// #101
Class<?> javaType = resultMapping.getJavaType();
resultMap.hasResultMapsUsingConstructorCollection = resultMap.hasResultMapsUsingConstructorCollection
|| (resultMapping.getNestedQueryId() == null && javaType != null
&& resultMap.configuration.getObjectFactory().isCollection(javaType));

if (resultMapping.getProperty() != null) {
constructorArgNames.add(resultMapping.getProperty());
}
Expand Down Expand Up @@ -210,6 +218,10 @@ public String getId() {
return id;
}

public boolean hasResultMapsUsingConstructorCollection() {
return hasResultMapsUsingConstructorCollection;
}

public boolean hasNestedResultMaps() {
return hasNestedResultMaps;
}
Expand Down
Loading
Loading