You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/08/23 09:31:12 UTC

[camel] branch master updated: camel-activemq: fix deprecation warnings (#4120)

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

acosentino 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 7912c84  camel-activemq: fix deprecation warnings (#4120)
7912c84 is described below

commit 7912c848ded4609f220c899432b1b52dc5774bc6
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Sun Aug 23 11:30:53 2020 +0200

    camel-activemq: fix deprecation warnings (#4120)
---
 .../activemq/ActiveMQComponentFactoryUserNamePasswordTest.java         | 2 +-
 .../component/activemq/ActiveMQComponentUserNamePasswordTest.java      | 2 +-
 .../org/apache/camel/component/activemq/ComplexRequestReplyTest.java   | 3 ++-
 .../java/org/apache/camel/component/activemq/SetGroupIdProcessor.java  | 2 +-
 .../org/apache/camel/component/activemq/TransactedConsumeTest.java     | 3 ++-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQComponentFactoryUserNamePasswordTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQComponentFactoryUserNamePasswordTest.java
index 1f0470c..474a0ba 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQComponentFactoryUserNamePasswordTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQComponentFactoryUserNamePasswordTest.java
@@ -39,7 +39,7 @@ public class ActiveMQComponentFactoryUserNamePasswordTest extends CamelSpringTes
 
         ActiveMQConfiguration config = (ActiveMQConfiguration) comp.getConfiguration();
         assertNotNull(config);
-        assertEquals("admin2", config.getUserName());
+        assertEquals("admin2", config.getUsername());
         assertEquals("secret2", config.getPassword());
 
         getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQComponentUserNamePasswordTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQComponentUserNamePasswordTest.java
index f33606c..b4058d3 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQComponentUserNamePasswordTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQComponentUserNamePasswordTest.java
@@ -38,7 +38,7 @@ public class ActiveMQComponentUserNamePasswordTest extends CamelSpringTestSuppor
 
         ActiveMQConfiguration config = (ActiveMQConfiguration) comp.getConfiguration();
         assertNotNull(config);
-        assertEquals("admin", config.getUserName());
+        assertEquals("admin", config.getUsername());
         assertEquals("secret", config.getPassword());
 
         getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ComplexRequestReplyTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ComplexRequestReplyTest.java
index ac6f21e..9cebabf 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ComplexRequestReplyTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ComplexRequestReplyTest.java
@@ -22,6 +22,7 @@ import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.pool.PooledConnectionFactory;
 import org.apache.camel.CamelContext;
+import org.apache.camel.ExchangePattern;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.impl.DefaultCamelContext;
@@ -127,7 +128,7 @@ public class ComplexRequestReplyTest {
         camelContext.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from(fromEndpoint).inOut(toEndpoint);
+                from(fromEndpoint).to(ExchangePattern.InOut, toEndpoint);
             }
         });
         camelContext.start();
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/SetGroupIdProcessor.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/SetGroupIdProcessor.java
index b976f26..5e0a851 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/SetGroupIdProcessor.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/SetGroupIdProcessor.java
@@ -27,7 +27,7 @@ public class SetGroupIdProcessor implements Processor {
     @Override
     public void process(Exchange exchange) throws Exception {
         // lets copy the IN to the OUT message
-        Message out = exchange.getOut();
+        Message out = exchange.getMessage();
         out.copyFrom(exchange.getIn());
 
         // now lets set a header
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/TransactedConsumeTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/TransactedConsumeTest.java
index 9c7768f..fe26341 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/TransactedConsumeTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/TransactedConsumeTest.java
@@ -30,6 +30,7 @@ import org.apache.activemq.broker.region.policy.PolicyMap;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ActiveMQTextMessage;
 import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
+import org.apache.activemq.store.kahadb.disk.journal.Journal;
 import org.apache.activemq.util.Wait;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
@@ -98,7 +99,7 @@ public class TransactedConsumeTest extends CamelSpringTestSupport {
         // amq.setDirectory(new File("target/data"));
         // brokerService.setPersistenceAdapter(amq);
         KahaDBPersistenceAdapter kahaDBPersistenceAdapter = (KahaDBPersistenceAdapter) brokerService.getPersistenceAdapter();
-        kahaDBPersistenceAdapter.setEnableJournalDiskSyncs(false);
+        kahaDBPersistenceAdapter.setJournalDiskSyncStrategy(Journal.JournalDiskSyncStrategy.NEVER.toString());
         brokerService.addConnector("tcp://localhost:61616");
         return brokerService;
     }