Ensure methods declared in Object can be invoked on a JDK proxy in SpEL

This commit ensures that methods declared in java.lang.Object (such as
toString() can be invoked on a JDK proxy instance in a SpEL expression.

Closes gh-25316
This commit is contained in:
mrcoffee77
2020-06-25 11:02:17 +02:00
committed by Sam Brannen
parent 4751769a7c
commit 97b5af8a55
2 changed files with 25 additions and 12 deletions

View File

@@ -18,21 +18,21 @@ package org.springframework.expression.spel.support;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.ArrayList;
import java.util.List;
import org.junit.jupiter.api.Test;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.expression.EvaluationContext;
import org.springframework.expression.ParseException;
import org.springframework.expression.PropertyAccessor;
import org.springframework.expression.TypedValue;
import org.springframework.expression.*;
import org.springframework.expression.spel.AbstractExpressionTests;
import org.springframework.expression.spel.SpelUtilities;
import org.springframework.expression.spel.standard.SpelExpression;
import org.springframework.expression.spel.support.ReflectionHelper.ArgumentsMatchKind;
import org.springframework.util.Assert;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -364,6 +364,19 @@ public class ReflectionHelperTests extends AbstractExpressionTests {
field.write(ctx, tester, "field", null));
}
@Test
void testReflectiveMethodResolver() throws AccessException {
MethodResolver resolver=new ReflectiveMethodResolver();
StandardEvaluationContext evaluationContext = new StandardEvaluationContext();
Object obj= Proxy.newProxyInstance(this.getClass().getClassLoader(), new Class<?>[]{Runnable.class}, new InvocationHandler() {
@Override
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
return null;
}
});
MethodExecutor mexec=resolver.resolve(evaluationContext,obj,"toString",new ArrayList<>());
Assert.notNull(mexec,"MethodExecutor should not be empty.");
}
/**
* Used to validate the match returned from a compareArguments call.