Skip to content

CAMEL-24238: camel-aws2-ses - send RawMessage body content instead of the SdkBytes descriptor #25017

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oscerd wants to merge 1 commit into
base: camel-4.14.x
Choose a base branch
from
+21 −1
Open

CAMEL-24238: camel-aws2-ses - send RawMessage body content instead of the SdkBytes descriptor #25017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions components/camel-aws/camel-aws2-ses/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,5 +80,10 @@
<artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
3 changes: 2 additions & 1 deletion ...el-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Producer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@ private software.amazon.awssdk.services.ses.model.Message createMessage(Exchange
= software.amazon.awssdk.services.ses.model.Message.builder();
String content;
if (exchange.getIn().getBody() instanceof RawMessage raw) {
content = raw.data().toString();
// SdkBytes.toString() is a debug descriptor (SdkBytes(bytes=0x...)), not the payload
content = raw.data().asUtf8String();
} else {
content = exchange.getIn().getBody(String.class);
}
Expand Down
14 changes: 14 additions & 0 deletions ...ws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SesComponentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,30 @@
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.core.SdkBytes;
import software.amazon.awssdk.services.ses.model.MessageTag;
import software.amazon.awssdk.services.ses.model.RawMessage;
import software.amazon.awssdk.services.ses.model.SendEmailRequest;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.*;

public class SesComponentTest extends CamelTestSupport {

@BindToRegistry("amazonSESClient")
private AmazonSESClientMock sesClient = new AmazonSESClientMock();

@Test
void rawMessageBodyIsSentAsItsContentNotTheSdkBytesDescriptor() {
String mime = "From: from@example.com\r\nSubject: Subject\r\n\r\nThis is my message text.";
template.send("direct:start", exchange -> exchange.getIn().setBody(
RawMessage.builder().data(SdkBytes.fromUtf8String(mime)).build()));

// SdkBytes.toString() would yield "SdkBytes(bytes=0x...)" rather than the message content
String sent = sesClient.getSendEmailRequest().message().body().text().data();
assertThat(sent).isEqualTo(mime);
}

@Test
public void sendInOnlyMessageUsingUrlOptions() {
Exchange exchange = template.send("direct:start", new Processor() {
Expand Down
Loading