3.x Use waitlist queue name as routing key (#462)

* Use waitlist queue name as routing key

Author: Christoffer-Cortes

src/functionaltests/java/com/ericsson/ei/rabbitmq/connection/RabbitMQTestConnectionSteps.java

@@ -145,7 +145,7 @@ private RabbitAdmin createExchange(final RMQHandler rmqHandler) {
         admin.getQueueProperties(queueName);
         RabbitTemplate rabbitTemplate = admin.getRabbitTemplate();
         rabbitTemplate.setExchange(exchangeName);
-        rabbitTemplate.setRoutingKey(RMQProperties.WAITLIST_BINDING_KEY);
+        rabbitTemplate.setRoutingKey(rmqProperties.getWaitlistQueueName());
         rabbitTemplate.setQueue(queueName);
         return admin;
     }

src/main/java/com/ericsson/ei/handlers/RMQHandler.java

@@ -122,7 +122,7 @@ public RabbitTemplate rabbitMqTemplate() {
 
             rabbitTemplate.setQueue(rmqProperties.getWaitlistQueueName());
             rabbitTemplate.setExchange(rmqProperties.getExchangeName());
-            rabbitTemplate.setRoutingKey(RMQProperties.WAITLIST_BINDING_KEY);
+            rabbitTemplate.setRoutingKey(rmqProperties.getWaitlistQueueName());
             rabbitTemplate.setConfirmCallback(new ConfirmCallback() {
                 @Override
                 public void confirm(CorrelationData correlationData, boolean ack, String cause) {
@@ -164,7 +164,7 @@ protected TopicExchange exchange() {
 
     @Bean
     protected Binding binding() {
-        return BindingBuilder.bind(internalQueue()).to(exchange()).with(RMQProperties.WAITLIST_BINDING_KEY);
+        return BindingBuilder.bind(internalQueue()).to(exchange()).with(rmqProperties.getWaitlistQueueName());
     }
 
     @Bean

src/main/java/com/ericsson/ei/handlers/RMQProperties.java

@@ -88,7 +88,6 @@ public class RMQProperties {
     @Value("${rabbitmq.queue.suffix}")
     private String queueSuffix;
 
-    public static final String WAITLIST_BINDING_KEY = "eiffel-intelligence.waitlist";
 
     public String getQueueName() {
         final String durableName = this.queueDurable ? "durable" : "transient";

wiki/configuration.md

@@ -187,7 +187,7 @@ An internal waitlist queue is also created that uses all of the previously menti
 attaches the rabbitmq.waitlist.queue.suffix property at the end of the name.
 This queue does not get the routing key bindings from the rabbitmq.binding.key property and is only meant for
 sending and consuming messages by Eiffel Intelligence.
-It instead uses the non-configurable routing key "eiffel-intelligence.waitlist".
+It instead uses the full name of the waitlist queue as a routing key.
 The rabbitmq.tls.version property specifies the security protocol and you can find valid names
 [here](https://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#SSLContext)