|
|
|
@ -1,5 +1,5 @@ |
|
|
|
/* |
|
|
|
/* |
|
|
|
* Copyright 2002-2018 the original author or authors. |
|
|
|
* Copyright 2002-2019 the original author or authors. |
|
|
|
* |
|
|
|
* |
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
|
|
|
* you may not use this file except in compliance with the License. |
|
|
|
* you may not use this file except in compliance with the License. |
|
|
|
@ -41,6 +41,7 @@ import org.springframework.expression.spel.CodeFlow; |
|
|
|
import org.springframework.expression.spel.CompilablePropertyAccessor; |
|
|
|
import org.springframework.expression.spel.CompilablePropertyAccessor; |
|
|
|
import org.springframework.lang.Nullable; |
|
|
|
import org.springframework.lang.Nullable; |
|
|
|
import org.springframework.util.Assert; |
|
|
|
import org.springframework.util.Assert; |
|
|
|
|
|
|
|
import org.springframework.util.ClassUtils; |
|
|
|
import org.springframework.util.ReflectionUtils; |
|
|
|
import org.springframework.util.ReflectionUtils; |
|
|
|
import org.springframework.util.StringUtils; |
|
|
|
import org.springframework.util.StringUtils; |
|
|
|
|
|
|
|
|
|
|
|
@ -413,7 +414,7 @@ public class ReflectivePropertyAccessor implements PropertyAccessor { |
|
|
|
method.getParameterCount() == numberOfParams && |
|
|
|
method.getParameterCount() == numberOfParams && |
|
|
|
(!mustBeStatic || Modifier.isStatic(method.getModifiers())) && |
|
|
|
(!mustBeStatic || Modifier.isStatic(method.getModifiers())) && |
|
|
|
(requiredReturnTypes.isEmpty() || requiredReturnTypes.contains(method.getReturnType()))) { |
|
|
|
(requiredReturnTypes.isEmpty() || requiredReturnTypes.contains(method.getReturnType()))) { |
|
|
|
return method; |
|
|
|
return ClassUtils.getInterfaceMethodIfPossible(method); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|