Browse Source

Polishing

pull/33047/head
Juergen Hoeller 2 years ago
parent
commit
26d1c38d84
  1. 7
      spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
  2. 6
      spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java

7
spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java

@ -344,7 +344,7 @@ class BeanUtilsTests {
} }
@Test // gh-32888 @Test // gh-32888
public void copyPropertiesWithGenericCglibCLass() { public void copyPropertiesWithGenericCglibClass() {
Enhancer enhancer = new Enhancer(); Enhancer enhancer = new Enhancer();
enhancer.setSuperclass(User.class); enhancer.setSuperclass(User.class);
enhancer.setCallback((MethodInterceptor) (obj, method, args, proxy) -> proxy.invokeSuper(obj, args)); enhancer.setCallback((MethodInterceptor) (obj, method, args, proxy) -> proxy.invokeSuper(obj, args));
@ -934,6 +934,7 @@ class BeanUtilsTests {
private static class Order { private static class Order {
private String id; private String id;
private List<String> lineItems; private List<String> lineItems;
Order() { Order() {
@ -999,10 +1000,8 @@ class BeanUtilsTests {
private static class GenericBaseModel<T> { private static class GenericBaseModel<T> {
public GenericBaseModel() {
}
private T id; private T id;
private String name; private String name;
public T getId() { public T getId() {

6
spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java

@ -79,9 +79,9 @@ public final class BridgeMethodResolver {
* method has been generated at the same class hierarchy level (a known difference * method has been generated at the same class hierarchy level (a known difference
* between the Eclipse compiler and regular javac). * between the Eclipse compiler and regular javac).
* @param bridgeMethod the method to introspect against the given target class * @param bridgeMethod the method to introspect against the given target class
* @param targetClass the target class to find methods on * @param targetClass the target class to find the most specific method on
* @return the original method (either the bridged method or the passed-in method * @return the most specific method corresponding to the given bridge method
* if no more specific one could be found) * (can be the original method if no more specific one could be found)
* @since 6.1.3 * @since 6.1.3
* @see #findBridgedMethod * @see #findBridgedMethod
* @see org.springframework.util.ClassUtils#getMostSpecificMethod * @see org.springframework.util.ClassUtils#getMostSpecificMethod

Loading…
Cancel
Save