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

GH-671: Fix RabbitManagementTemplate.delExchange

Browse Source 
Fixes spring-projects/spring-amqp#671

The `RabbitManagementTemplate.deleteExchange(Exchange)` delegates
to the `client.deleteQueue()`

* Fix `RabbitManagementTemplate.deleteExchange(Exchange)` to properly
delegate to the `client.deleteExchange()`

**Cherry-pick to 1.7.x, 1.6.x & 1.5.x**

(cherry picked from commit 6525559)
This commit is contained in:
Artem Bilan
2017-10-03 11:07:15 -04:00
parent e2e264fad5
commit dc31942b4a
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/core/RabbitManagementTemplate.java
View File

@@ -45,6 +45,8 @@ import com.rabbitmq.http.client.domain.QueueInfo;
* directly.
*
* @author Gary Russell
* @author Artem Bilan
*
* @since 1.5
*
*/
@@ -192,7 +194,7 @@ public class RabbitManagementTemplate implements AmqpManagementOperations {
@Override
public void deleteExchange(Exchange exchange) {
this.rabbitClient.deleteQueue(DEFAULT_VHOST, exchange.getName());
deleteExchange(DEFAULT_VHOST, exchange);
}
@Override

17
spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitManagementTemplateTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2015-2016 the original author or authors.
* Copyright 2015-2017 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.
@@ -21,6 +21,7 @@ import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
@@ -48,6 +49,8 @@ import com.rabbitmq.http.client.domain.QueueInfo;
/**
* @author Gary Russell
* @author Artem Bilan
*
* @since 1.5
*
*/
@@ -204,4 +207,16 @@ public class RabbitManagementTemplateTests {
admin.deleteQueue(queue2.getName());
}
@Test
public void testDeleteExchange() {
String exchangeName = "testExchange";
Exchange testExchange = new DirectExchange(exchangeName);
this.template.addExchange(testExchange);
Exchange exchangeToAssert = this.template.getExchange(exchangeName);
assertEquals(testExchange.getName(), exchangeToAssert.getName());
assertEquals(testExchange.getType(), exchangeToAssert.getType());
this.template.deleteExchange(testExchange);
assertNull(this.template.getExchange(exchangeName));
}
}