VES Heartbeat and Software Management Feature

[oam/tr069-adapter.git] / acs / application-booter / src / main / java / org / commscope / tr069adapter / acs / booter / ACSServiceBooter.java

diff --git a/acs/application-booter/src/main/java/org/commscope/tr069adapter/acs/booter/ACSServiceBooter.java b/acs/application-booter/src/main/java/org/commscope/tr069adapter/acs/booter/ACSServiceBooter.java
index 37dc186..ee7c1f8 100644 (file)
--- a/acs/application-booter/src/main/java/org/commscope/tr069adapter/acs/booter/ACSServiceBooter.java
+++ b/acs/application-booter/src/main/java/org/commscope/tr069adapter/acs/booter/ACSServiceBooter.java
@@ -48,6 +48,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.jms.annotation.EnableJms;\r
 import org.springframework.jms.config.DefaultJmsListenerContainerFactory;\r
 import org.springframework.jms.config.JmsListenerContainerFactory;\r
+import org.springframework.jms.listener.MessageListenerContainer;\r
 import org.springframework.jms.support.converter.MappingJackson2MessageConverter;\r
 import org.springframework.jms.support.converter.MessageConverter;\r
 import org.springframework.jms.support.converter.MessageType;\r
@@ -137,33 +138,36 @@ public class ACSServiceBooter {
   }\r
   // End\r
 \r
-\r
   @Bean\r
-  public JmsListenerContainerFactory<?> tr069NBIRequestCF(ConnectionFactory connectionFactory,\r
+  public JmsListenerContainerFactory<MessageListenerContainer> tr069NBIRequestCF(\r
+      ConnectionFactory connectionFactory,\r
       DefaultJmsListenerContainerFactoryConfigurer configurer) {\r
-    DefaultJmsListenerContainerFactory factory = new DefaultJmsListenerContainerFactory();\r
-    configurer.configure(factory, connectionFactory);\r
-    return factory;\r
+    return handleJMSCommonConfiguration(connectionFactory, configurer);\r
   }\r
 \r
   @Bean\r
-  public JmsListenerContainerFactory<?> tr069DeviceResponseCF(ConnectionFactory connectionFactory,\r
+  public JmsListenerContainerFactory<MessageListenerContainer> tr069DeviceResponseCF(\r
+      ConnectionFactory connectionFactory,\r
       DefaultJmsListenerContainerFactoryConfigurer configurer) {\r
-    DefaultJmsListenerContainerFactory factory = new DefaultJmsListenerContainerFactory();\r
-    configurer.configure(factory, connectionFactory);\r
-    return factory;\r
+    return handleJMSCommonConfiguration(connectionFactory, configurer);\r
   }\r
 \r
   @Bean\r
-  public JmsListenerContainerFactory<?> nbiNotificationCF(ConnectionFactory connectionFactory,\r
+  public JmsListenerContainerFactory<MessageListenerContainer> nbiNotificationCF(\r
+      ConnectionFactory connectionFactory,\r
       DefaultJmsListenerContainerFactoryConfigurer configurer) {\r
-    DefaultJmsListenerContainerFactory factory = new DefaultJmsListenerContainerFactory();\r
-    configurer.configure(factory, connectionFactory);\r
-    return factory;\r
+    return handleJMSCommonConfiguration(connectionFactory, configurer);\r
   }\r
 \r
   @Bean\r
-  public JmsListenerContainerFactory<?> nbiOpResultCF(ConnectionFactory connectionFactory,\r
+  public JmsListenerContainerFactory<MessageListenerContainer> nbiOpResultCF(\r
+      ConnectionFactory connectionFactory,\r
+      DefaultJmsListenerContainerFactoryConfigurer configurer) {\r
+    return handleJMSCommonConfiguration(connectionFactory, configurer);\r
+  }\r
+\r
+  public JmsListenerContainerFactory handleJMSCommonConfiguration(\r
+      ConnectionFactory connectionFactory,\r
       DefaultJmsListenerContainerFactoryConfigurer configurer) {\r
     DefaultJmsListenerContainerFactory factory = new DefaultJmsListenerContainerFactory();\r
     configurer.configure(factory, connectionFactory);\r