Enable message converter customization (Azure#19346)

* remove bean definition of jmstemplate

Author: yiliuTo

sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/autoconfigure/jms/ServiceBusJMSAutoConfiguration.java

@@ -14,7 +14,6 @@
 import org.springframework.jms.config.DefaultJmsListenerContainerFactory;
 import org.springframework.jms.config.JmsListenerContainerFactory;
 import org.springframework.jms.connection.CachingConnectionFactory;
-import org.springframework.jms.core.JmsTemplate;
 
 import javax.jms.ConnectionFactory;
 
@@ -51,14 +50,6 @@ public ConnectionFactory jmsConnectionFactory(AzureServiceBusJMSProperties servi
         return new CachingConnectionFactory(jmsConnectionFactory);
     }
 
-    @Bean
-    @ConditionalOnMissingBean
-    public JmsTemplate jmsTemplate(ConnectionFactory jmsConnectionFactory) {
-        final JmsTemplate jmsTemplate = new JmsTemplate();
-        jmsTemplate.setConnectionFactory(jmsConnectionFactory);
-        return jmsTemplate;
-    }
-
     @Bean
     @ConditionalOnMissingBean
     public JmsListenerContainerFactory<?> jmsListenerContainerFactory(ConnectionFactory connectionFactory) {

sdk/spring/azure-spring-boot/src/test/java/com/azure/spring/autoconfigure/jms/ServiceBusJMSAutoConfigurationTest.java

@@ -6,58 +6,86 @@
 import org.apache.qpid.jms.JmsConnectionFactory;
 import org.junit.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration;
 import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.jms.core.JmsTemplate;
+
+import javax.jms.ConnectionFactory;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ServiceBusJMSAutoConfigurationTest {
-    private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-        .withConfiguration(AutoConfigurations.of(ServiceBusJMSAutoConfiguration.class));
+
+    private static final String CONNECTION_STRING = "Endpoint=sb://host/;SharedAccessKeyName=sasKeyName;"
+        + "SharedAccessKey=sasKey";
 
     @Test
     public void testAzureServiceBusDisabled() {
-        this.contextRunner.withPropertyValues("spring.jms.servicebus.enabled=false")
-            .run(context -> assertThat(context).doesNotHaveBean(AzureServiceBusJMSProperties.class));
+        ApplicationContextRunner contextRunner = getEmptyContextRunner();
+        contextRunner.withPropertyValues("spring.jms.servicebus.enabled=false")
+                     .run(context -> assertThat(context).doesNotHaveBean(AzureServiceBusJMSProperties.class));
     }
 
     @Test
     public void testWithoutServiceBusJMSNamespace() {
-        this.contextRunner.withClassLoader(new FilteredClassLoader(JmsConnectionFactory.class))
-            .run(context -> assertThat(context).doesNotHaveBean(AzureServiceBusJMSProperties.class));
+        ApplicationContextRunner contextRunner = getEmptyContextRunner();
+        contextRunner.withClassLoader(new FilteredClassLoader(JmsConnectionFactory.class))
+                     .run(context -> assertThat(context).doesNotHaveBean(AzureServiceBusJMSProperties.class));
     }
 
     @Test(expected = IllegalStateException.class)
     public void testAzureServiceBusJMSPropertiesValidation() {
-        this.contextRunner.run(context -> context.getBean(AzureServiceBusJMSProperties.class));
+        ApplicationContextRunner contextRunner = getEmptyContextRunner();
+        contextRunner.run(context -> context.getBean(AzureServiceBusJMSProperties.class));
     }
 
     @Test
-    public void testAzureServiceBusJMSPropertiesConfigured() {
+    public void testCachingConnectionFactoryIsAutowired() {
 
-        final String connectionString = "Endpoint=sb://host/;SharedAccessKeyName=sasKeyName;SharedAccessKey=sasKey";
+        ApplicationContextRunner contextRunner = getContextRunnerWithProperties();
 
-        this.contextRunner = this.contextRunner.withPropertyValues(
-            "spring.jms.servicebus.connection-string=" + connectionString
+        contextRunner.run(
+            context -> {
+                assertThat(context).hasSingleBean(ConnectionFactory.class);
+                assertThat(context).hasSingleBean(JmsTemplate.class);
+                ConnectionFactory connectionFactory = context.getBean(ConnectionFactory.class);
+                assertTrue(connectionFactory == context.getBean(JmsTemplate.class).getConnectionFactory());
+            }
         );
+    }
 
-        this.contextRunner = this.contextRunner.withPropertyValues(
-            "spring.jms.servicebus.topic-client-id=cid"
-        );
+    @Test
+    public void testAzureServiceBusJMSPropertiesConfigured() {
 
-        this.contextRunner = this.contextRunner.withPropertyValues(
-            "spring.jms.servicebus.idle-timeout=123"
-        );
+        ApplicationContextRunner contextRunner = getContextRunnerWithProperties();
 
-        this.contextRunner.run(
+        contextRunner.run(
             context -> {
                 assertThat(context).hasSingleBean(AzureServiceBusJMSProperties.class);
                 assertThat(context.getBean(AzureServiceBusJMSProperties.class).getConnectionString()).isEqualTo(
-                    connectionString);
+                    CONNECTION_STRING);
                 assertThat(context.getBean(AzureServiceBusJMSProperties.class).getTopicClientId()).isEqualTo("cid");
                 assertThat(context.getBean(AzureServiceBusJMSProperties.class).getIdleTimeout()).isEqualTo(123);
             }
         );
     }
 
+    private ApplicationContextRunner getEmptyContextRunner() {
+
+        return new ApplicationContextRunner()
+            .withConfiguration(AutoConfigurations.of(ServiceBusJMSAutoConfiguration.class, JmsAutoConfiguration.class));
+    }
+
+    private ApplicationContextRunner getContextRunnerWithProperties() {
+
+        return new ApplicationContextRunner()
+            .withConfiguration(AutoConfigurations.of(ServiceBusJMSAutoConfiguration.class, JmsAutoConfiguration.class))
+            .withPropertyValues(
+                "spring.jms.servicebus.connection-string=" + CONNECTION_STRING,
+                "spring.jms.servicebus.topic-client-id=cid",
+                "spring.jms.servicebus.idle-timeout=123"
+            );
+    }
 }