You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/03/07 16:20:55 UTC
[2/4] camel git commit: CAMEL-10953 solve checkstyle issues
CAMEL-10953 solve checkstyle issues
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/255124eb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/255124eb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/255124eb
Branch: refs/heads/master
Commit: 255124eb83b2ab6c6d154fef438ceb25f5b74d43
Parents: 692ecaa
Author: Peter van Gestel <pe...@osudio.com>
Authored: Mon Mar 6 19:39:04 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Mar 7 17:18:43 2017 +0100
----------------------------------------------------------------------
.../camel/component/aws/sns/SnsEndpoint.java | 7 ++-
.../camel/component/aws/sns/SnsProducer.java | 54 ++++++++++----------
2 files changed, 34 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/255124eb/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 b9276da..374a420 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
@@ -35,7 +35,12 @@ 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.*;
+import org.apache.camel.spi.HeaderFilterStrategy;
+import org.apache.camel.spi.HeaderFilterStrategyAware;
+import org.apache.camel.spi.Metadata;
+import org.apache.camel.spi.UriEndpoint;
+import org.apache.camel.spi.UriParam;
+import org.apache.camel.spi.UriPath;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/camel/blob/255124eb/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 69c11f7..087c436 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
@@ -16,23 +16,24 @@
*/
package org.apache.camel.component.aws.sns;
-import com.amazonaws.services.sns.model.*;
+import java.nio.ByteBuffer;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import com.amazonaws.services.sns.model.MessageAttributeValue;
+import com.amazonaws.services.sns.model.PublishRequest;
+import com.amazonaws.services.sns.model.PublishResult;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.impl.DefaultProducer;
-import org.apache.camel.util.URISupport;
import org.apache.camel.spi.HeaderFilterStrategy;
+import org.apache.camel.util.URISupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.nio.ByteBuffer;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-
import static org.apache.camel.component.aws.common.AwsExchangeUtil.getMessageForResponse;
@@ -43,7 +44,7 @@ import static org.apache.camel.component.aws.common.AwsExchangeUtil.getMessageFo
public class SnsProducer extends DefaultProducer {
private static final Logger LOG = LoggerFactory.getLogger(SnsProducer.class);
-
+
private transient String snsProducerToString;
public SnsProducer(Endpoint endpoint) {
@@ -58,13 +59,13 @@ public class SnsProducer extends DefaultProducer {
request.setMessageStructure(determineMessageStructure(exchange));
request.setMessage(exchange.getIn().getBody(String.class));
request.setMessageAttributes(this.translateAttributes(exchange.getIn().getHeaders(), exchange));
-
+
LOG.trace("Sending request [{}] from exchange [{}]...", request, exchange);
-
+
PublishResult result = getEndpoint().getSNSClient().publish(request);
LOG.trace("Received result [{}]", result);
-
+
Message message = getMessageForResponse(exchange);
message.setHeader(SnsConstants.MESSAGE_ID, result.getMessageId());
}
@@ -74,7 +75,7 @@ public class SnsProducer extends DefaultProducer {
if (subject == null) {
subject = getConfiguration().getSubject();
}
-
+
return subject;
}
@@ -86,25 +87,26 @@ public class SnsProducer extends DefaultProducer {
return structure;
}
- private Map<String, MessageAttributeValue> translateAttributes(Map<String, Object> headers, Exchange exchange) {
+
+ 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)) {
+ while (var5.hasNext()) {
+ Entry entry = (Entry) var5.next();
+ if (!headerFilterStrategy.applyFilterToCamelHeaders((String) entry.getKey(), entry.getValue(), exchange)) {
Object value = entry.getValue();
MessageAttributeValue mav;
- if(value instanceof String) {
+ if (value instanceof String) {
mav = new MessageAttributeValue();
mav.setDataType("String");
- mav.withStringValue((String)value);
+ mav.withStringValue((String) value);
result.put(entry.getKey(), mav);
- } else if(value instanceof ByteBuffer) {
+ } else if (value instanceof ByteBuffer) {
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());
@@ -114,11 +116,11 @@ public class SnsProducer extends DefaultProducer {
return result;
}
-
+
protected SnsConfiguration getConfiguration() {
return getEndpoint().getConfiguration();
}
-
+
@Override
public String toString() {
if (snsProducerToString == null) {
@@ -126,11 +128,11 @@ public class SnsProducer extends DefaultProducer {
}
return snsProducerToString;
}
-
+
@Override
public SnsEndpoint getEndpoint() {
return (SnsEndpoint) super.getEndpoint();
}
-
-
+
+
}
\ No newline at end of file