Skip to content

Commit 347c2da

Browse files
committed
Test for multiple interfaces at BridgeMethodResolver level
Issue: SPR-16288
1 parent e39bf87 commit 347c2da

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2017 the original author or authors.
2+
* Copyright 2002-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -807,9 +807,9 @@ public static class ModifiedMessageEvent extends MessageEvent {
807807

808808

809809
@SuppressWarnings("unchecked")
810-
public static class MessageBroadcasterImpl extends
811-
GenericEventBroadcasterImpl<MessageEvent>
812-
implements MessageBroadcaster {
810+
public static class MessageBroadcasterImpl extends GenericEventBroadcasterImpl<MessageEvent>
811+
implements Serializable, // implement an unrelated interface first (SPR-16288)
812+
MessageBroadcaster {
813813

814814
public MessageBroadcasterImpl() {
815815
super(NewMessageEvent.class);
@@ -864,7 +864,7 @@ public interface RepositoryRegistry {
864864

865865
@SuppressWarnings("unchecked")
866866
public static class SettableRepositoryRegistry<R extends SimpleGenericRepository<?>>
867-
implements RepositoryRegistry {
867+
implements RepositoryRegistry {
868868

869869
protected void injectInto(R rep) {
870870
}
@@ -902,7 +902,7 @@ public interface ConvenientGenericRepository<T, ID extends Serializable>
902902

903903

904904
public static class GenericHibernateRepository<T, ID extends Serializable>
905-
implements ConvenientGenericRepository<T, ID> {
905+
implements ConvenientGenericRepository<T, ID> {
906906

907907
/**
908908
* @param c Mandatory. The domain class this repository is responsible for.
@@ -964,8 +964,8 @@ public void delete(Collection<T> entities) {
964964
}
965965

966966

967-
public static class HibernateRepositoryRegistry extends
968-
SettableRepositoryRegistry<GenericHibernateRepository<?, ?>> {
967+
public static class HibernateRepositoryRegistry
968+
extends SettableRepositoryRegistry<GenericHibernateRepository<?, ?>> {
969969

970970
@Override
971971
public void injectInto(GenericHibernateRepository<?, ?> rep) {

0 commit comments

Comments
 (0)