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 2022/03/28 09:37:28 UTC
[camel] branch main updated (8716cba -> 98c8ee9)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 8716cba Sync deps
new b052d47 CAMEL-17854 - Camel-AWS-SNS: support byte arrays when mapping camel headers to sns attribute
new 7b261f6 CAMEL-17854 - Camel-AWS-SNS: support byte arrays when mapping camel headers to sns attribute
new 98c8ee9 CAMEL-17854 - Camel-AWS-SNS: support byte arrays when mapping camel headers to sns attribute
The 3 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:
.../org/apache/camel/component/aws2/sns/Sns2Producer.java | 5 +++++
...roducerIT.java => SnsTopicProducerByteArrayHeaderIT.java} | 12 +++++++++++-
2 files changed, 16 insertions(+), 1 deletion(-)
copy components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/{SnsTopicProducerIT.java => SnsTopicProducerByteArrayHeaderIT.java} (79%)
[camel] 02/03: CAMEL-17854 - Camel-AWS-SNS: support byte arrays when mapping camel headers to sns attribute
Posted by ac...@apache.org.
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 7b261f61b3e0e2908c3be5fa6ccbc6dab7ad06f5
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Mar 28 11:32:49 2022 +0200
CAMEL-17854 - Camel-AWS-SNS: support byte arrays when mapping camel headers to sns attribute
---
.../src/main/java/org/apache/camel/component/aws2/sns/Sns2Producer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Producer.java b/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Producer.java
index 14b6196..b09f957 100644
--- a/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Producer.java
+++ b/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Producer.java
@@ -120,7 +120,7 @@ public class Sns2Producer extends DefaultProducer {
mav.dataType("Binary");
mav.binaryValue(SdkBytes.fromByteArray((byte[]) value));
result.put(entry.getKey(), mav.build());
- } else if (value instanceof Date) {
+ } else if (value instanceof Date) {
MessageAttributeValue.Builder mav = MessageAttributeValue.builder();
mav.dataType("String");
mav.stringValue(value.toString());
[camel] 03/03: CAMEL-17854 - Camel-AWS-SNS: support byte arrays when mapping camel headers to sns attribute
Posted by ac...@apache.org.
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 98c8ee947b21d981806ed08aa18ef4fe3781ad5d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Mar 28 11:34:59 2022 +0200
CAMEL-17854 - Camel-AWS-SNS: support byte arrays when mapping camel headers to sns attribute
---
.../SnsTopicProducerByteArrayHeaderIT.java | 80 ++++++++++++++++++++++
1 file changed, 80 insertions(+)
diff --git a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsTopicProducerByteArrayHeaderIT.java b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsTopicProducerByteArrayHeaderIT.java
new file mode 100644
index 0000000..0c257e6
--- /dev/null
+++ b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsTopicProducerByteArrayHeaderIT.java
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.aws2.sns.integration;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.aws2.sns.Sns2Constants;
+import org.apache.camel.test.infra.common.SharedNameGenerator;
+import org.apache.camel.test.infra.common.TestEntityNameGenerator;
+import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.testcontainers.shaded.org.bouncycastle.util.Strings;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class SnsTopicProducerByteArrayHeaderIT extends Aws2SNSBase {
+
+ @RegisterExtension
+ public static SharedNameGenerator sharedNameGenerator = new TestEntityNameGenerator();
+
+ @Test
+ public void sendInOnly() {
+ Exchange exchange = template.send("direct:start", ExchangePattern.InOnly, new Processor() {
+ public void process(Exchange exchange) {
+ byte[] headerValue = "HeaderTest".getBytes();
+ exchange.getIn().setHeader("value1", headerValue);
+ exchange.getIn().setHeader(Sns2Constants.SUBJECT, "This is my subject");
+ exchange.getIn().setBody("This is my message text.");
+ }
+ });
+
+ assertNotNull(exchange.getIn().getHeader(Sns2Constants.MESSAGE_ID));
+ Assert.assertEquals("HeaderTest",
+ Strings.fromByteArray((byte[]) exchange.getMessage().getHeaders().get("value1")));
+ }
+
+ @Test
+ public void sendInOut() {
+ Exchange exchange = template.send("direct:start", ExchangePattern.InOut, new Processor() {
+ public void process(Exchange exchange) {
+ byte[] headerValue = "HeaderTest".getBytes();
+ exchange.getIn().setHeader("value1", headerValue);
+ exchange.getIn().setHeader(Sns2Constants.SUBJECT, "This is my subject");
+ exchange.getIn().setBody("This is my message text.");
+ }
+ });
+
+ assertNotNull(exchange.getMessage().getHeader(Sns2Constants.MESSAGE_ID));
+ Assert.assertEquals("HeaderTest",
+ Strings.fromByteArray((byte[]) exchange.getMessage().getHeaders().get("value1")));
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() {
+ return new RouteBuilder() {
+ @Override
+ public void configure() {
+ from("direct:start")
+ .toF("aws2-sns://%s?subject=The+subject+message&autoCreateTopic=true", sharedNameGenerator.getName());
+ }
+ };
+ }
+}
[camel] 01/03: CAMEL-17854 - Camel-AWS-SNS: support byte arrays when mapping camel headers to sns attribute
Posted by ac...@apache.org.
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 b052d47baea5ac442965b376c87bca84ce3b4371
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Mar 28 11:26:39 2022 +0200
CAMEL-17854 - Camel-AWS-SNS: support byte arrays when mapping camel headers to sns attribute
---
.../java/org/apache/camel/component/aws2/sns/Sns2Producer.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Producer.java b/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Producer.java
index 66babdd..14b6196 100644
--- a/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Producer.java
+++ b/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Producer.java
@@ -115,7 +115,12 @@ public class Sns2Producer extends DefaultProducer {
mav.dataType("Binary");
mav.binaryValue(SdkBytes.fromByteBuffer((ByteBuffer) value));
result.put(entry.getKey(), mav.build());
- } else if (value instanceof Date) {
+ } else if (value instanceof byte[]) {
+ MessageAttributeValue.Builder mav = MessageAttributeValue.builder();
+ mav.dataType("Binary");
+ mav.binaryValue(SdkBytes.fromByteArray((byte[]) value));
+ result.put(entry.getKey(), mav.build());
+ } else if (value instanceof Date) {
MessageAttributeValue.Builder mav = MessageAttributeValue.builder();
mav.dataType("String");
mav.stringValue(value.toString());