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

Fix Sonar Detected Bad instanceof Check

Browse Source 
https://sonar.spring.io/component_issues?id=org.springframework.amqp%3Aspring-amqp-dist%3Amaster#resolved=false|types=BUG

Checking wrong connection object to attach recovery listener.

After merge, needs backport of this default listener.
This commit is contained in:
Gary Russell
2016-12-03 14:24:13 -05:00
parent 3859b10caf
commit 6843903a67
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/AbstractConnectionFactory.java
View File

@@ -345,8 +345,8 @@ public abstract class AbstractConnectionFactory implements ConnectionFactory, Di
if (this.logger.isInfoEnabled()) {
this.logger.info("Created new connection: " + connection);
}
if (this.recoveryListener != null && connection instanceof AutorecoveringConnection) {
((AutorecoveringConnection) connection).addRecoveryListener(this.recoveryListener);
if (this.recoveryListener != null && rabbitConnection instanceof AutorecoveringConnection) {
((AutorecoveringConnection) rabbitConnection).addRecoveryListener(this.recoveryListener);
}
return connection;
}

17
spring-rabbit/src/test/java/org/springframework/amqp/rabbit/connection/CachingConnectionFactoryIntegrationTests.java
View File

@@ -16,14 +16,18 @@
package org.springframework.amqp.rabbit.connection;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.Matchers.anyOf;
import static org.hamcrest.Matchers.instanceOf;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.BDDMockito.willReturn;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -53,6 +57,7 @@ import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.mockito.ArgumentCaptor;
import org.springframework.amqp.AmqpAuthenticationException;
import org.springframework.amqp.AmqpException;
@@ -366,6 +371,8 @@ public class CachingConnectionFactoryIntegrationTests {
@Test
public void testHardErrorAndReconnectAuto() throws Exception {
Log cfLogger = spyOnLogger(this.connectionFactory);
willReturn(true).given(cfLogger).isDebugEnabled();
RabbitTemplate template = new RabbitTemplate(connectionFactory);
RabbitAdmin admin = new RabbitAdmin(connectionFactory);
Queue queue = new Queue(CF_INTEGRATION_TEST_QUEUE);
@@ -455,6 +462,9 @@ public class CachingConnectionFactoryIntegrationTests {
if (logger.isDebugEnabled()) {
logger.debug("Resuming test after recovery complete");
}
ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
verify(cfLogger, atLeastOnce()).debug(captor.capture());
assertThat(captor.getValue(), containsString("Connection recovery complete:"));
template.convertAndSend(route, "message");
assertTrue(latch.await(10, TimeUnit.SECONDS));
String result = (String) template.receiveAndConvert(route);
@@ -536,4 +546,11 @@ public class CachingConnectionFactoryIntegrationTests {
factory.destroy();
}
private Log spyOnLogger(CachingConnectionFactory connectionFactory2) {
DirectFieldAccessor dfa = new DirectFieldAccessor(connectionFactory2);
Log logger = spy((Log) dfa.getPropertyValue("logger"));
dfa.setPropertyValue("logger", logger);
return logger;
}
}