[camel] branch master updated: camel-sjms2: fix deprecation warnings (#4131)

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new a6f9e0c  camel-sjms2: fix deprecation warnings (#4131)
a6f9e0c is described below

commit a6f9e0cce960a9e88846f5be313931ffa52d29b3
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Wed Aug 26 13:58:54 2020 +0200

    camel-sjms2: fix deprecation warnings (#4131)
    
    Replaced embedded deprecated JMS broker with EmbeddedActiveMQ since the embedded one is deprecated since Artemis 2.0
---
 .../component/sjms2/support/Jms2TestSupport.java   | 28 ++++------------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/support/Jms2TestSupport.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/support/Jms2TestSupport.java
index 514689f..85a993d 100644
--- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/support/Jms2TestSupport.java
+++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/support/Jms2TestSupport.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.sjms2.support;
 
-import java.util.Arrays;
-
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
 import javax.jms.MessageConsumer;
@@ -31,13 +29,7 @@ import org.apache.activemq.artemis.core.config.Configuration;
 import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
 import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
 import org.apache.activemq.artemis.core.server.QueueQueryResult;
-import org.apache.activemq.artemis.jms.server.config.ConnectionFactoryConfiguration;
-import org.apache.activemq.artemis.jms.server.config.JMSConfiguration;
-import org.apache.activemq.artemis.jms.server.config.JMSQueueConfiguration;
-import org.apache.activemq.artemis.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
-import org.apache.activemq.artemis.jms.server.config.impl.JMSConfigurationImpl;
-import org.apache.activemq.artemis.jms.server.config.impl.JMSQueueConfigurationImpl;
-import org.apache.activemq.artemis.jms.server.embedded.EmbeddedJMS;
+import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Produce;
 import org.apache.camel.ProducerTemplate;
@@ -64,7 +56,7 @@ public class Jms2TestSupport extends CamelTestSupport {
     protected ProducerTemplate template;
     protected String brokerUri;
     protected int port;
-    private EmbeddedJMS broker;
+    private EmbeddedActiveMQ broker;
     private Connection connection;
     private Session session;
     private DestinationCreationStrategy destinationCreationStrategy = new DefaultDestinationCreationStrategy();
@@ -78,7 +70,7 @@ public class Jms2TestSupport extends CamelTestSupport {
      */
     @Override
     protected void doPreSetup() throws Exception {
-        broker = new EmbeddedJMS();
+        broker = new EmbeddedActiveMQ();
         deleteDirectory("target/data");
         port = AvailablePortFinder.getNextAvailable();
         brokerUri = "tcp://localhost:" + port;
@@ -86,7 +78,7 @@ public class Jms2TestSupport extends CamelTestSupport {
         startBroker();
     }
 
-    protected void configureBroker(EmbeddedJMS broker) throws Exception {
+    protected void configureBroker(EmbeddedActiveMQ broker) throws Exception {
         Configuration configuration = new ConfigurationImpl()
                 .setPersistenceEnabled(false)
                 .setJournalDirectory("target/data/journal")
@@ -95,17 +87,7 @@ public class Jms2TestSupport extends CamelTestSupport {
                 .addAcceptorConfiguration("vm", "vm://broker")
                 .addConnectorConfiguration("connector", new TransportConfiguration(NettyConnectorFactory.class.getName()));
 
-        JMSConfiguration jmsConfig = new JMSConfigurationImpl();
-
-        ConnectionFactoryConfiguration cfConfig = new ConnectionFactoryConfigurationImpl().setName("cf").setConnectorNames(
-                Arrays.asList("connector")).setBindings("cf");
-        jmsConfig.getConnectionFactoryConfigurations().add(cfConfig);
-
-        JMSQueueConfiguration queueConfig
-                = new JMSQueueConfigurationImpl().setName("queue1").setDurable(false).setBindings("queue/queue1");
-        jmsConfig.getQueueConfigurations().add(queueConfig);
-
-        broker.setConfiguration(configuration).setJmsConfiguration(jmsConfig);
+        broker.setConfiguration(configuration);
     }
 
     private void startBroker() throws Exception {