Fix property lookup for projections on Kotlin types.

This commit makes sure to use the target objects method to determine the property used for the projection.

Closes: #3127
Original pull request: #3129
This commit is contained in:
Christoph Strobl
2024-07-30 14:03:17 +02:00
committed by Mark Paluch
parent 3b481609e6
commit ac09de8c72
3 changed files with 44 additions and 3 deletions

View File

@@ -33,6 +33,7 @@ import org.springframework.util.ReflectionUtils;
* @author Oliver Gierke
* @author Mark Paluch
* @author Johannes Englmeier
* @author Christoph Strobl
* @since 1.10
*/
class PropertyAccessingMethodInterceptor implements MethodInterceptor {
@@ -54,12 +55,11 @@ class PropertyAccessingMethodInterceptor implements MethodInterceptor {
@Override
public Object invoke(@SuppressWarnings("null") MethodInvocation invocation) throws Throwable {
Method method = invocation.getMethod();
if (ReflectionUtils.isObjectMethod(method)) {
if (ReflectionUtils.isObjectMethod(invocation.getMethod())) {
return invocation.proceed();
}
Method method = lookupTargetMethod(invocation, target.getWrappedClass());
PropertyDescriptor descriptor = BeanUtils.findPropertyForMethod(method);
if (descriptor == null) {
@@ -81,4 +81,12 @@ class PropertyAccessingMethodInterceptor implements MethodInterceptor {
private static boolean isSetterMethod(Method method, PropertyDescriptor descriptor) {
return method.equals(descriptor.getWriteMethod());
}
private static Method lookupTargetMethod(MethodInvocation invocation, Class<?> targetType) {
Method method = BeanUtils.findMethod(targetType, invocation.getMethod().getName(),
invocation.getMethod().getParameterTypes());
return method != null ? method : invocation.getMethod();
}
}

View File

@@ -32,6 +32,7 @@ import org.springframework.beans.NotWritablePropertyException;
*
* @author Oliver Gierke
* @author Mark Paluch
* @author Christoph Strobl
*/
@ExtendWith(MockitoExtension.class)
class PropertyAccessingMethodInterceptorUnitTests {
@@ -111,6 +112,15 @@ class PropertyAccessingMethodInterceptorUnitTests {
.isThrownBy(() -> new PropertyAccessingMethodInterceptor(new Source()).invoke(invocation));
}
@Test // GH-3127
void detectsKotlinPropertiesWithLeadingIsOnTargetType() throws Throwable {
var source = new WithIsNamedProperty(true);
when(invocation.getMethod()).thenReturn(WithIsNamedPropertyProjection.class.getMethod("isValid"));
assertThat(new PropertyAccessingMethodInterceptor(source).invoke(invocation)).isEqualTo(true);
}
static class Source {
String firstname;

View File

@@ -0,0 +1,23 @@
/*
* Copyright 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.springframework.data.projection
interface WithIsNamedPropertyProjection {
val isValid: Boolean
}
class WithIsNamedProperty(val isValid : Boolean)