From 30ba98ff8e2d7fa7386460bfa2e25fa47dba2c52 Mon Sep 17 00:00:00 2001
From: SirWayne <dennis.melzer@bosch-si.com>
Date: Wed, 13 Apr 2016 17:27:49 +0200
Subject: [PATCH] TTL

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
---
 .../eclipse/hawkbit/amqp/AmqpConfiguration.java | 17 +++++++----------
 .../hawkbit/amqp/AmqpDeadletterProperties.java  |  3 +--
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpConfiguration.java b/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpConfiguration.java
index 1e25e3717..448206924 100644
--- a/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpConfiguration.java
+++ b/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpConfiguration.java
@@ -15,6 +15,7 @@ import org.springframework.amqp.core.FanoutExchange;
 import org.springframework.amqp.core.Queue;
 import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
+import org.springframework.amqp.rabbit.core.RabbitAdmin;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer;
 import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
@@ -40,16 +41,12 @@ public class AmqpConfiguration {
     @Autowired
     private ConnectionFactory connectionFactory;
 
-    // /**
-    // * Method to set the Jackson2JsonMessageConverter.
-    // *
-    // * @return the Jackson2JsonMessageConverter
-    // */
-    // @Bean
-    // public RabbitAdmin rabbitAdmin(final RabbitAdmin rabbitAdmin) {
-    // rabbitAdmin.setIgnoreDeclarationExceptions(true);
-    // return rabbitAdmin;
-    // }
+    @Bean
+    public RabbitAdmin rabbitAdmin() {
+        final RabbitAdmin rabbitAdmin = new RabbitAdmin(connectionFactory);
+        rabbitAdmin.setIgnoreDeclarationExceptions(true);
+        return rabbitAdmin;
+    }
 
     /**
      * Method to set the Jackson2JsonMessageConverter.
diff --git a/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpDeadletterProperties.java b/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpDeadletterProperties.java
index 8e988ff16..e9ad60a1c 100644
--- a/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpDeadletterProperties.java
+++ b/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpDeadletterProperties.java
@@ -48,8 +48,7 @@ public class AmqpDeadletterProperties {
      * @return the deadletter queue
      */
     public Queue createDeadletterQueue(final String queueName) {
-        // getTTLArgs()
-        return new Queue(queueName, true, false, false, null);
+        return new Queue(queueName, true, false, false, getTTLArgs());
     }
 
     private Map<String, Object> getTTLArgs() {