Repository: camel Updated Branches: refs/heads/master cace0ee7e -> 9f1a4524e
CAMEL-10953 handle pr comments Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/af830c52 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/af830c52 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/af830c52 Branch: refs/heads/master Commit: af830c52469b5288cf4ea688419dd4cdb497dda8 Parents: 255124e Author: Peter van Gestel <peter.van.ges...@osudio.com> Authored: Tue Mar 7 16:54:06 2017 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Mar 7 17:18:43 2017 +0100 ---------------------------------------------------------------------- .../camel/component/aws/sns/SnsEndpoint.java | 3 +-- .../camel/component/aws/sns/SnsProducer.java | 26 +++++++++----------- 2 files changed, 12 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/af830c52/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java index 374a420..469ee4a 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java @@ -33,7 +33,6 @@ import org.apache.camel.Component; import org.apache.camel.Consumer; import org.apache.camel.Processor; import org.apache.camel.Producer; -import org.apache.camel.component.aws.sqs.SqsHeaderFilterStrategy; import org.apache.camel.impl.DefaultEndpoint; import org.apache.camel.spi.HeaderFilterStrategy; import org.apache.camel.spi.HeaderFilterStrategyAware; @@ -111,7 +110,7 @@ public class SnsEndpoint extends DefaultEndpoint implements HeaderFilterStrategy // check the setting the headerFilterStrategy if (headerFilterStrategy == null) { - headerFilterStrategy = new SqsHeaderFilterStrategy(); + headerFilterStrategy = new SnsHeaderFilterStrategy(); } if (configuration.getTopicArn() == null) { http://git-wip-us.apache.org/repos/asf/camel/blob/af830c52/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java index 087c436..36c4a15 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java @@ -18,7 +18,6 @@ package org.apache.camel.component.aws.sns; import java.nio.ByteBuffer; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; @@ -89,31 +88,28 @@ public class SnsProducer extends DefaultProducer { } private Map<String, MessageAttributeValue> translateAttributes(Map<String, Object> headers, Exchange exchange) { - HashMap result = new HashMap(); - HeaderFilterStrategy headerFilterStrategy = this.getEndpoint().getHeaderFilterStrategy(); - Iterator var5 = headers.entrySet().iterator(); - - while (var5.hasNext()) { - Entry entry = (Entry) var5.next(); - if (!headerFilterStrategy.applyFilterToCamelHeaders((String) entry.getKey(), entry.getValue(), exchange)) { + Map<String, MessageAttributeValue> result = new HashMap<String, MessageAttributeValue>(); + HeaderFilterStrategy headerFilterStrategy = getEndpoint().getHeaderFilterStrategy(); + for (Entry<String, Object> entry : headers.entrySet()) { + // only put the message header which is not filtered into the message attribute + if (!headerFilterStrategy.applyFilterToCamelHeaders(entry.getKey(), entry.getValue(), exchange)) { Object value = entry.getValue(); - MessageAttributeValue mav; if (value instanceof String) { - mav = new MessageAttributeValue(); + MessageAttributeValue mav = new MessageAttributeValue(); mav.setDataType("String"); - mav.withStringValue((String) value); + mav.withStringValue((String)value); result.put(entry.getKey(), mav); } else if (value instanceof ByteBuffer) { - mav = new MessageAttributeValue(); + MessageAttributeValue mav = new MessageAttributeValue(); mav.setDataType("Binary"); - mav.withBinaryValue((ByteBuffer) value); + mav.withBinaryValue((ByteBuffer)value); result.put(entry.getKey(), mav); } else { - LOG.warn("Cannot put the message header key={}, value={} into Sqs MessageAttribute", entry.getKey(), entry.getValue()); + // cannot translate the message header to message attribute value + LOG.warn("Cannot put the message header key={}, value={} into Sns MessageAttribute", entry.getKey(), entry.getValue()); } } } - return result; }
