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

GH-2456: Suppress Duplicate Annotations with Spy

Browse Source 
Resolves https://github.com/spring-projects/spring-amqp/issues/2456

When spying a `@RabbitListener` bean, duplicate methods are resolved as well
as duplicate class level `@RabbitListener` annotations.

**cherry-pick to 2.4.x** (will require instanceof polishing for Java 8)
This commit is contained in:
Gary Russell
2023-05-22 17:07:05 -04:00
committed by GitHub
parent ee681bd015
commit 5451bfe000
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-rabbit/src/main/java/org/springframework/amqp/rabbit/annotation/RabbitListenerAnnotationBeanPostProcessor.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2022 the original author or authors.
* Copyright 2014-2023 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.
@@ -339,7 +339,8 @@ public class RabbitListenerAnnotationBeanPostProcessor
multiMethods.add(method);
}
}
}, ReflectionUtils.USER_DECLARED_METHODS);
}, ReflectionUtils.USER_DECLARED_METHODS
.and(meth -> !meth.getDeclaringClass().getName().contains("$MockitoMock$")));
if (methods.isEmpty() && multiMethods.isEmpty()) {
return TypeMetadata.EMPTY;
}
@@ -352,6 +353,17 @@ public class RabbitListenerAnnotationBeanPostProcessor
private List<RabbitListener> findListenerAnnotations(AnnotatedElement element) {
return MergedAnnotations.from(element, SearchStrategy.TYPE_HIERARCHY)
.stream(RabbitListener.class)
.filter(tma -> {
Object source = tma.getSource();
String name = "";
if (source instanceof Class<?> clazz) {
name = clazz.getName();
}
else if (source instanceof Method method) {
name = method.getDeclaringClass().getName();
}
return !name.contains("$MockitoMock$");
})
.map(ann -> ann.synthesize())
.collect(Collectors.toList());
}

11
spring-rabbit/src/test/java/org/springframework/amqp/rabbit/annotation/EnableRabbitIntegrationTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2022 the original author or authors.
* Copyright 2014-2023 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.
@@ -19,8 +19,12 @@ package org.springframework.amqp.rabbit.annotation;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
import static org.awaitility.Awaitility.await;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.willAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import java.io.IOException;
import java.io.Serializable;
@@ -389,6 +393,7 @@ public class EnableRabbitIntegrationTests extends NeedsManagementTests {
rabbitTemplate.convertAndSend("multi.exch", "multi.rk", bar);
assertThat(this.rabbitTemplate.receiveAndConvert("sendTo.replies"))
.isEqualTo("CRASHCRASH Test reply from error handler");
verify(this.multi, times(2)).bar(any());
bar.field = "bar";
Baz baz = new Baz();
baz.field = "baz";
@@ -404,7 +409,7 @@ public class EnableRabbitIntegrationTests extends NeedsManagementTests {
this.rabbitTemplate.setAfterReceivePostProcessors(mpp);
assertThat(rabbitTemplate.convertSendAndReceive("multi.exch", "multi.rk", qux)).isEqualTo("QUX: qux: multi.rk");
assertThat(beanMethodHeaders).hasSize(2);
assertThat(beanMethodHeaders.get(0)).isEqualTo("MultiListenerBean");
assertThat(beanMethodHeaders.get(0)).contains("$MultiListenerBean");
assertThat(beanMethodHeaders.get(1)).isEqualTo("qux");
this.rabbitTemplate.removeAfterReceivePostProcessor(mpp);
assertThat(rabbitTemplate.convertSendAndReceive("multi.exch.tx", "multi.rk.tx", bar)).isEqualTo("BAR: barbar");
@@ -1978,7 +1983,7 @@ public class EnableRabbitIntegrationTests extends NeedsManagementTests {
@Bean
public MultiListenerBean multiListener() {
return new MultiListenerBean();
return spy(new MultiListenerBean());
}
@Bean