This is an automated email from the ASF dual-hosted git repository.
gzurowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new fea5863 Code cleanup
fea5863 is described below
commit fea58635014379fc3838a898332368890c54ddc0
Author: Gregor Zurowski <gre...@zurowski.org>
AuthorDate: Fri Jun 7 10:11:32 2019 +0200
Code cleanup
- Simplify expressions
- Use diamond operator
- Remove unused imports
---
.../main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java | 5 ++---
.../main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java | 2 +-
.../main/java/org/apache/camel/component/aws/sqs/SqsProducer.java | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git
a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
index c9ac68a..283efc4 100644
---
a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
+++
b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
@@ -37,7 +37,6 @@ import
com.amazonaws.services.sqs.model.ReceiptHandleIsInvalidException;
import com.amazonaws.services.sqs.model.ReceiveMessageRequest;
import com.amazonaws.services.sqs.model.ReceiveMessageResult;
-import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
import org.apache.camel.NoFactoryAvailableException;
import org.apache.camel.Processor;
@@ -79,8 +78,8 @@ public class SqsConsumer extends
ScheduledBatchPollingConsumer {
ReceiveMessageRequest request = new
ReceiveMessageRequest(getQueueUrl());
request.setMaxNumberOfMessages(getMaxMessagesPerPoll() > 0 ?
getMaxMessagesPerPoll() : null);
- request.setVisibilityTimeout(getConfiguration().getVisibilityTimeout()
!= null ? getConfiguration().getVisibilityTimeout() : null);
- request.setWaitTimeSeconds(getConfiguration().getWaitTimeSeconds() !=
null ? getConfiguration().getWaitTimeSeconds() : null);
+
request.setVisibilityTimeout(getConfiguration().getVisibilityTimeout());
+ request.setWaitTimeSeconds(getConfiguration().getWaitTimeSeconds());
if (attributeNames != null) {
request.setAttributeNames(attributeNames);
diff --git
a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
index 18fd053..19fdfca 100644
---
a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
+++
b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
@@ -254,7 +254,7 @@ public class SqsEndpoint extends ScheduledPollEndpoint
implements HeaderFilterSt
Exchange exchange = super.createExchange(pattern);
Message message = exchange.getIn();
message.setBody(msg.getBody());
- message.setHeaders(new HashMap<String, Object>(msg.getAttributes()));
+ message.setHeaders(new HashMap<>(msg.getAttributes()));
message.setHeader(SqsConstants.MESSAGE_ID, msg.getMessageId());
message.setHeader(SqsConstants.MD5_OF_BODY, msg.getMD5OfBody());
message.setHeader(SqsConstants.RECEIPT_HANDLE, msg.getReceiptHandle());
diff --git
a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
index 7aa5ff3..640744d 100644
---
a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
+++
b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
@@ -101,7 +101,7 @@ public class SqsProducer extends DefaultProducer {
private void sendBatchMessage(AmazonSQS amazonSQS, Exchange exchange) {
SendMessageBatchRequest request = new
SendMessageBatchRequest(getQueueUrl());
- Collection<SendMessageBatchRequestEntry> entries = new
ArrayList<SendMessageBatchRequestEntry>();
+ Collection<SendMessageBatchRequestEntry> entries = new ArrayList<>();
if (exchange.getIn().getBody() instanceof Iterable) {
Iterable c = exchange.getIn().getBody(Iterable.class);
for (Iterator iterator = c.iterator(); iterator.hasNext();) {
