Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BridgeMethodResolver properly resolves all declared interfaces

Browse Source 
Issue: SPR-16288
This commit is contained in:
Juergen Hoeller
2018-01-19 19:08:17 +01:00
parent 64af3a0f64
commit 69c882cfbc
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2018 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.
@@ -192,7 +192,10 @@ public abstract class BridgeMethodResolver {
return method;
}
else {
return searchInterfaces(ifc.getInterfaces(), bridgeMethod);
method = searchInterfaces(ifc.getInterfaces(), bridgeMethod);
if (method != null) {
return method;
}
}
}
return null;

16
spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2018 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.
@@ -782,7 +782,7 @@ public class BridgeMethodResolverTests {
}
@SuppressWarnings({ "unused", "unchecked" })
@SuppressWarnings({"unused", "unchecked"})
public static abstract class GenericEventBroadcasterImpl<T extends Event>
extends GenericBroadcasterImpl implements EventBroadcaster {
@@ -847,10 +847,10 @@ public class BridgeMethodResolverTests {
}
@SuppressWarnings("unchecked")
public static class MessageBroadcasterImpl extends
GenericEventBroadcasterImpl<MessageEvent>
implements MessageBroadcaster {
@SuppressWarnings({"serial", "unchecked"})
public static class MessageBroadcasterImpl extends GenericEventBroadcasterImpl<MessageEvent>
implements Serializable, // implement an unrelated interface first (SPR-16288)
MessageBroadcaster {
public MessageBroadcasterImpl() {
super(NewMessageEvent.class);
@@ -1005,8 +1005,8 @@ public class BridgeMethodResolverTests {
}
public static class HibernateRepositoryRegistry extends
SettableRepositoryRegistry<GenericHibernateRepository<?, ?>> {
public static class HibernateRepositoryRegistry
extends SettableRepositoryRegistry<GenericHibernateRepository<?, ?>> {
@Override
public void injectInto(GenericHibernateRepository<?, ?> rep) {