Configure MessageConverter (if available) on TracingJmsTemplate

Signed-off-by: Gary Brown <gary@brownuk.com>

.gitignore

@@ -2,3 +2,11 @@
 *.iml
 activemq-data/
 target/
+
+# Eclipse
+.project
+.classpath
+.settings
+
+# VS Code
+.vscode

opentracing-jms-spring/src/main/java/io/opentracing/contrib/jms/spring/TracingJmsConfiguration.java

@@ -18,14 +18,22 @@
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.aop.target.AbstractLazyCreationTargetSource;
 import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.jms.annotation.JmsListenerConfigurer;
 import org.springframework.jms.core.JmsTemplate;
+import org.springframework.jms.support.converter.MessageConverter;
 
 @Configuration
 public class TracingJmsConfiguration {
 
+  private final ObjectProvider<MessageConverter> messageConverter;
+
+  public TracingJmsConfiguration(ObjectProvider<MessageConverter> messageConverter) {
+    this.messageConverter = messageConverter;
+  }
+
   @Bean
   public TracingJmsListenerEndpointRegistry createTracingJmsListenerEndpointRegistry(
       Tracer tracer) {
@@ -44,7 +52,12 @@ public JmsTemplate jmsTemplate(BeanFactory beanFactory, Tracer tracer) {
     // if JMS is used, and ConnectionFactory bean is not present,
     // it will throw an error on first use, so imo, we should be all good
     ConnectionFactory connectionFactory = createProxy(beanFactory);
-    return new TracingJmsTemplate(connectionFactory, tracer);
+    JmsTemplate ret = new TracingJmsTemplate(connectionFactory, tracer);
+    MessageConverter mc = messageConverter.getIfAvailable();
+    if (mc != null) {
+      ret.setMessageConverter(mc);
+    }
+    return ret;
   }
 
   private ConnectionFactory createProxy(final BeanFactory beanFactory) {

opentracing-jms-spring/src/test/java/io/opentracing/contrib/jms/spring/TestConfiguration.java

@@ -23,8 +23,11 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.jms.annotation.EnableJms;
 import org.springframework.jms.config.DefaultJmsListenerContainerFactory;
+import org.springframework.jms.support.converter.MessageConverter;
 import org.springframework.jms.support.destination.DestinationResolver;
 import org.springframework.jms.support.destination.DynamicDestinationResolver;
+import org.springframework.jms.support.converter.MappingJackson2MessageConverter;
+import org.springframework.jms.support.converter.MessageType;
 
 @Configuration
 @EnableJms
@@ -56,5 +59,11 @@ public DefaultJmsListenerContainerFactory jmsListenerContainerFactory() {
     return factory;
   }
 
-
+  @Bean
+  public MessageConverter messageConverter() {
+      MappingJackson2MessageConverter converter = new MappingJackson2MessageConverter();
+      converter.setTargetType(MessageType.TEXT);
+      converter.setTypeIdPropertyName("_type");
+      return converter;
+  }
 }

opentracing-jms-spring/src/test/java/io/opentracing/contrib/jms/spring/TracingJmsTemplateTest.java

@@ -16,6 +16,7 @@
 import static org.awaitility.Awaitility.await;
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
@@ -39,6 +40,7 @@
 import org.springframework.jms.core.MessageCreator;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.jms.support.converter.MappingJackson2MessageConverter;
 
 @RunWith(SpringRunner.class)
 @ContextConfiguration(classes = {TracingJmsConfiguration.class, TestConfiguration.class})
@@ -55,6 +57,11 @@ public void before() throws IOException, JMSException {
     mockTracer.reset();
   }
 
+  @Test
+  public void messageConverterConfigured() {
+    assertTrue(jmsTemplate.getMessageConverter() instanceof MappingJackson2MessageConverter);
+  }
+
   @Test
   public void oneListener() throws Exception {
     jmsTemplate.convertAndSend("TEST.SECOND", "test");