Skip to content

Commit

Permalink
Fix property lookup for projections on Kotlin types.
Browse files Browse the repository at this point in the history
This commit makes sure to use the target objects method to determine the property used for the projection.

Closes: #3127
Original pull request: #3129
  • Loading branch information
christophstrobl authored and mp911de committed Aug 1, 2024
1 parent 2ee3a86 commit 431a1f5
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
* @author Oliver Gierke
* @author Mark Paluch
* @author Johannes Englmeier
* @author Christoph Strobl
* @since 1.10
*/
class PropertyAccessingMethodInterceptor implements MethodInterceptor {
Expand All @@ -54,12 +55,11 @@ public PropertyAccessingMethodInterceptor(Object target) {
@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) {
Expand All @@ -81,4 +81,12 @@ public Object invoke(@SuppressWarnings("null") MethodInvocation invocation) thro
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();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
*
* @author Oliver Gierke
* @author Mark Paluch
* @author Christoph Strobl
*/
@ExtendWith(MockitoExtension.class)
class PropertyAccessingMethodInterceptorUnitTests {
Expand Down Expand Up @@ -111,6 +112,15 @@ void throwsAppropriateExceptionIfThePropertyCannotWritten() throws Throwable {
.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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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)

0 comments on commit 431a1f5

Please sign in to comment.