This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit e5cf3d40881a225d5042d8652de951e6f1453026 Author: Andrea Cosentino <[email protected]> AuthorDate: Fri Mar 11 18:43:20 2022 +0100 CAMEL-17669 - AWS Kinesis: Make the consumer set only the raw data on the body, and enrich the exchange with more header --- .../apache/camel/component/aws2/kinesis/Kinesis2Consumer.java | 2 +- .../aws2/kinesis/KinesisConsumerClosedShardWithSilentTest.java | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Consumer.java b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Consumer.java index 22cb7bf..b5934a0 100644 --- a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Consumer.java +++ b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Consumer.java @@ -191,7 +191,7 @@ public class Kinesis2Consumer extends ScheduledBatchPollingConsumer implements R protected Exchange createExchange(Record record) { Exchange exchange = createExchange(true); - exchange.getIn().setBody(record); + exchange.getIn().setBody(record.data().asInputStream()); exchange.getIn().setHeader(Kinesis2Constants.APPROX_ARRIVAL_TIME, record.approximateArrivalTimestamp()); exchange.getIn().setHeader(Kinesis2Constants.PARTITION_KEY, record.partitionKey()); exchange.getIn().setHeader(Kinesis2Constants.SEQUENCE_NUMBER, record.sequenceNumber()); diff --git a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisConsumerClosedShardWithSilentTest.java b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisConsumerClosedShardWithSilentTest.java index 3197f13..41afc44 100644 --- a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisConsumerClosedShardWithSilentTest.java +++ b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisConsumerClosedShardWithSilentTest.java @@ -16,6 +16,7 @@ */ package org.apache.camel.component.aws2.kinesis; +import java.nio.charset.Charset; import java.util.ArrayList; import org.apache.camel.AsyncProcessor; @@ -27,6 +28,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import software.amazon.awssdk.core.SdkBytes; import software.amazon.awssdk.services.kinesis.KinesisClient; import software.amazon.awssdk.services.kinesis.model.DescribeStreamRequest; import software.amazon.awssdk.services.kinesis.model.DescribeStreamResponse; @@ -78,7 +80,12 @@ public class KinesisConsumerClosedShardWithSilentTest { when(kinesisClient.getRecords(any(GetRecordsRequest.class))).thenReturn(GetRecordsResponse.builder() .nextShardIterator("nextShardIterator") - .records(Record.builder().sequenceNumber("1").build(), Record.builder().sequenceNumber("2").build()).build()); + .records( + Record.builder().sequenceNumber("1").data(SdkBytes.fromString("Hello", Charset.defaultCharset())) + .build(), + Record.builder().sequenceNumber("2").data(SdkBytes.fromString("Hello", Charset.defaultCharset())) + .build()) + .build()); when(kinesisClient.describeStream(any(DescribeStreamRequest.class))) .thenReturn(DescribeStreamResponse.builder() .streamDescription(StreamDescription.builder().shards(shardList).build()).build());
