[camel] branch camel-3.11.x updated: Revert "Camel-AWS2-S3: When includeBody is false, the message Body should not be set"

[acosentino]

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

acosentino pushed a commit to branch camel-3.11.x
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/camel-3.11.x by this push:
     new a306d3c  Revert "Camel-AWS2-S3: When includeBody is false, the message 
Body should not be set"
a306d3c is described below

commit a306d3cccfb62363248e6c5713031b4a6ca50cf8
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Thu Nov 25 18:42:42 2021 +0100

    Revert "Camel-AWS2-S3: When includeBody is false, the message Body should 
not be set"
    
    This reverts commit f73a2b7d5b0f1c43ce9c1e5ab2512bc55fe2aeba.
---
 .../java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java     | 2 ++
 .../component/aws2/s3/integration/S3ConsumerIncludeBodyIT.java      | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git 
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java
 
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java
index d2d84e5..c41bc78 100644
--- 
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java
+++ 
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java
@@ -386,6 +386,8 @@ public class AWS2S3Consumer extends 
ScheduledBatchPollingConsumer {
                 } catch (IOException e) {
                     throw new RuntimeCamelException(e);
                 }
+            } else {
+                message.setBody(s3Object);
             }
         }
 
diff --git 
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIncludeBodyIT.java
 
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIncludeBodyIT.java
index 2772d07..8c63f6b 100644
--- 
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIncludeBodyIT.java
+++ 
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIncludeBodyIT.java
@@ -26,7 +26,7 @@ import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertNotNull;
 
 public class S3ConsumerIncludeBodyIT extends Aws2S3Base {
 
@@ -69,7 +69,7 @@ public class S3ConsumerIncludeBodyIT extends Aws2S3Base {
 
         assertMockEndpointsSatisfied();
         assertEquals(3, result.getExchanges().size());
-        assertNull(result.getExchanges().get(0).getMessage().getBody());
+        assertNotNull(result.getExchanges().get(0).getMessage().getBody());
     }
 
     @Override
@@ -79,7 +79,7 @@ public class S3ConsumerIncludeBodyIT extends Aws2S3Base {
             public void configure() throws Exception {
                 String awsEndpoint = "aws2-s3://mycamel?autoCreateBucket=true";
 
-                from("direct:putObject").startupOrder(1).to(awsEndpoint);
+                
from("direct:putObject").startupOrder(1).to(awsEndpoint).to("mock:result");
 
                 
from("aws2-s3://mycamel?moveAfterRead=true&destinationBucket=camel-kafka-connector&autoCreateBucket=true&destinationBucketPrefix=RAW(movedPrefix)&destinationBucketSuffix=RAW(movedSuffix)&includeBody=false")
                         .startupOrder(2).to("mock:result");