2.x Use waitlist queue name as routing key (#461)

Author: Christoffer-Cortes

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

@@ -122,8 +122,6 @@ public class RmqHandler {
     @JsonIgnore
     private SimpleMessageListenerContainer container;
 
-    private static final String WAITLIST_BINDING_KEY = "eiffel-intelligence.waitlist";
-
     @Bean
     public ConnectionFactory connectionFactory() {
         cachingConnectionFactory = new CachingConnectionFactory(host, port);
@@ -169,7 +167,7 @@ public TopicExchange exchange() {
 
     @Bean
     Binding binding() {
-        return BindingBuilder.bind(internalQueue()).to(exchange()).with(WAITLIST_BINDING_KEY);
+        return BindingBuilder.bind(internalQueue()).to(exchange()).with(getWaitlistQueueName());
     }
 
     @Bean
@@ -213,7 +211,7 @@ public RabbitTemplate rabbitMqTemplate() {
 
             rabbitTemplate.setExchange(exchangeName);
             rabbitTemplate.setQueue(getWaitlistQueueName());
-            rabbitTemplate.setRoutingKey(WAITLIST_BINDING_KEY);
+            rabbitTemplate.setRoutingKey(getWaitlistQueueName());
             rabbitTemplate.setConfirmCallback(new ConfirmCallback() {
                 @Override
                 public void confirm(CorrelationData correlationData, boolean ack, String cause) {

wiki/markdown/configuration.md

@@ -153,7 +153,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.tlsVersion 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)