You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/02/25 09:04:48 UTC

[camel] branch master updated (1149533 -> 6c9cfbe)

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

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


    from 1149533  Regen
     new abf5b1f  CAMEL-14020: Fixed test
     new 6c9cfbe  Revert "CAMEL-14020 - Migrate getOut to getMessage in camel-spring-integration"

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../java/org/apache/camel/component/quickfixj/QuickfixjConsumer.java  | 2 +-
 .../org/apache/camel/component/quickfixj/QuickfixjProducerTest.java   | 2 +-
 .../org/apache/camel/component/spring/integration/MyProcessor.java    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)


[camel] 01/02: CAMEL-14020: Fixed test

Posted by 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

commit abf5b1f68d298e65782f250f28406b11386f114c
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Feb 25 09:40:31 2020 +0100

    CAMEL-14020: Fixed test
---
 .../java/org/apache/camel/component/quickfixj/QuickfixjConsumer.java    | 2 +-
 .../org/apache/camel/component/quickfixj/QuickfixjProducerTest.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjConsumer.java b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjConsumer.java
index 5bac9a0..1703729 100644
--- a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjConsumer.java
+++ b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjConsumer.java
@@ -55,7 +55,7 @@ public class QuickfixjConsumer extends DefaultConsumer {
     }
 
     private void sendOutMessage(Exchange exchange) throws QFJException {
-        Message camelMessage = exchange.getOut();
+        Message camelMessage = exchange.getMessage();
         quickfix.Message quickfixjMessage = camelMessage.getBody(quickfix.Message.class);
 
         LOG.debug("Sending FIX message reply: {}", quickfixjMessage);
diff --git a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjProducerTest.java b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjProducerTest.java
index aadd05c..de0399c 100644
--- a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjProducerTest.java
+++ b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjProducerTest.java
@@ -125,7 +125,7 @@ public class QuickfixjProducerTest {
             1000L, Long.class)).thenReturn(5000L);
                 
         org.apache.camel.Message mockOutboundCamelMessage = Mockito.mock(org.apache.camel.Message.class);
-        Mockito.when(mockExchange.getMessage()).thenReturn(mockOutboundCamelMessage);
+        Mockito.when(mockExchange.getOut()).thenReturn(mockOutboundCamelMessage);
         
         final Message outboundFixMessage = new Email();
         outboundFixMessage.getHeader().setString(SenderCompID.FIELD, "TARGET");


[camel] 02/02: Revert "CAMEL-14020 - Migrate getOut to getMessage in camel-spring-integration"

Posted by 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

commit 6c9cfbe648f862719d449f3187d279b8f409b7bb
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Feb 25 10:03:58 2020 +0100

    Revert "CAMEL-14020 - Migrate getOut to getMessage in camel-spring-integration"
    
    This reverts commit d3586cc0af2af7719f5612ab3398d079f398e1ef.
---
 .../org/apache/camel/component/spring/integration/MyProcessor.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/MyProcessor.java b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/MyProcessor.java
index 716d97c..ccc7146 100644
--- a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/MyProcessor.java
+++ b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/MyProcessor.java
@@ -23,9 +23,9 @@ public class MyProcessor implements Processor {
 
     @Override
     public void process(Exchange exchange) throws Exception {
-        exchange.getMessage().setHeader("Status", "Done");
+        exchange.getOut().setHeader("Status", "Done");
         String result = exchange.getIn().getBody() + " is processed";
-        exchange.getMessage().setBody(result);
+        exchange.getOut().setBody(result);
     }
 
 }