AMQP-836: Revert

This was not an issue in 2.0.x since the super class `add/removeQueues`
delegates to `add/removeQueueNames`.

So, this change causes the consumers to be cycled twice.

Revert the src/main changes but retain the test.

Author: garyrussell

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/AbstractMessageListenerContainer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-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.
@@ -305,7 +305,7 @@ public void addQueueNames(String... queueNames) {
 	 * Add queue(s) to this container's list of queues.
 	 * @param queues The queue(s) to add.
 	 */
-	public void addQueues(Queue... queues) {
+	public final void addQueues(Queue... queues) {
 		addQueueNames(collectQueueNames(queues));
 	}
 
@@ -325,7 +325,7 @@ public boolean removeQueueNames(String... queueNames) {
 	 * @param queues The queue(s) to remove.
 	 * @return the boolean result of removal on the target {@code queueNames} List.
 	 */
-	public boolean removeQueues(Queue... queues) {
+	public final boolean removeQueues(Queue... queues) {
 		return removeQueueNames(collectQueueNames(queues));
 	}
 

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/SimpleMessageListenerContainer.java

@@ -41,7 +41,6 @@
 import org.springframework.amqp.ImmediateAcknowledgeAmqpException;
 import org.springframework.amqp.core.AcknowledgeMode;
 import org.springframework.amqp.core.Message;
-import org.springframework.amqp.core.Queue;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
 import org.springframework.amqp.rabbit.connection.ConnectionFactoryUtils;
 import org.springframework.amqp.rabbit.connection.ConsumerChannelRegistry;
@@ -370,36 +369,6 @@ public boolean removeQueueNames(String... queueName) {
 		}
 	}
 
-	/**
-	 * Add queue(s) to this container's list of queues. The existing consumers
-	 * will be cancelled after they have processed any pre-fetched messages and
-	 * new consumers will be created. The queue must exist to avoid problems when
-	 * restarting the consumers.
-	 * @param queue The queue to add.
-	 */
-	@Override
-	public void addQueues(Queue... queue) {
-		super.addQueues(queue);
-		queuesChanged();
-	}
-
-	/**
-	 * Remove queues from this container's list of queues. The existing consumers
-	 * will be cancelled after they have processed any pre-fetched messages and
-	 * new consumers will be created. At least one queue must remain.
-	 * @param queue The queue to remove.
-	 */
-	@Override
-	public boolean removeQueues(Queue... queue) {
-		if (super.removeQueues(queue)) {
-			queuesChanged();
-			return true;
-		}
-		else {
-			return false;
-		}
-	}
-
 	/**
 	 * Set the number of retries after passive queue declaration fails.
 	 * @param declarationRetries The number of retries, default 3.