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 5cb99f5 Code cleanup
5cb99f5 is described below
commit 5cb99f5e0cfe19898652ee2a2568f3f859423a52
Author: Gregor Zurowski <[email protected]>
AuthorDate: Fri Jun 7 10:16:15 2019 +0200
Code cleanup
- Remove redundant variable assignments
- Remove redundant object creation in log statements
---
.../org/apache/camel/component/aws/sqs/SqsConsumer.java | 4 ++--
.../org/apache/camel/component/aws/sqs/SqsEndpoint.java | 4 ++--
.../org/apache/camel/component/aws/sqs/SqsProducer.java | 13 +++++--------
3 files changed, 9 insertions(+), 12 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 283efc4..0958a28 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
@@ -90,7 +90,7 @@ public class SqsConsumer extends
ScheduledBatchPollingConsumer {
log.trace("Receiving messages with request [{}]...", request);
- ReceiveMessageResult messageResult = null;
+ ReceiveMessageResult messageResult;
try {
messageResult = getClient().receiveMessage(request);
} catch (QueueDoesNotExistException e) {
@@ -161,7 +161,7 @@ public class SqsConsumer extends
ScheduledBatchPollingConsumer {
int repeatSeconds =
Double.valueOf(visibilityTimeout.doubleValue() * 1.5).intValue();
if (log.isDebugEnabled()) {
log.debug("Scheduled TimeoutExtender task to start after
{} delay, and run with {}/{} period/repeat (seconds), to extend exchangeId: {}",
- new Object[] {delay, period, repeatSeconds,
exchange.getExchangeId()});
+ delay, period, repeatSeconds,
exchange.getExchangeId());
}
final ScheduledFuture<?> scheduledFuture =
this.scheduledExecutor.scheduleAtFixedRate(new TimeoutExtender(exchange,
repeatSeconds), delay, period,
TimeUnit.SECONDS);
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 19fdfca..16354e8 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
@@ -299,8 +299,8 @@ public class SqsEndpoint extends ScheduledPollEndpoint
implements HeaderFilterSt
* @return AmazonSQSClient
*/
AmazonSQS createClient() {
- AmazonSQS client = null;
- AmazonSQSClientBuilder clientBuilder = null;
+ AmazonSQS client;
+ AmazonSQSClientBuilder clientBuilder;
ClientConfiguration clientConfiguration = null;
boolean isClientConfigFound = false;
if (ObjectHelper.isNotEmpty(configuration.getProxyHost()) &&
ObjectHelper.isNotEmpty(configuration.getProxyPort())) {
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 640744d..12120f6 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
@@ -21,7 +21,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
@@ -104,8 +103,8 @@ public class SqsProducer extends DefaultProducer {
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();) {
- String object = (String) iterator.next();
+ for (Object o : c) {
+ String object = (String) o;
SendMessageBatchRequestEntry entry = new
SendMessageBatchRequestEntry();
entry.setId(UUID.randomUUID().toString());
entry.setMessageAttributes(translateAttributes(exchange.getIn().getHeaders(),
exchange));
@@ -134,8 +133,7 @@ public class SqsProducer extends DefaultProducer {
throw new IllegalArgumentException("Receipt Handle must be
specified for the operation deleteMessage");
}
request.setReceiptHandle(receiptHandle);
- DeleteMessageResult result = new DeleteMessageResult();
- result = amazonSQS.deleteMessage(request);
+ DeleteMessageResult result = amazonSQS.deleteMessage(request);
Message message = getMessageForResponse(exchange);
message.setBody(result);
}
@@ -145,8 +143,7 @@ public class SqsProducer extends DefaultProducer {
if
(ObjectHelper.isNotEmpty(exchange.getIn().getHeader(SqsConstants.SQS_QUEUE_PREFIX)))
{
request.setQueueNamePrefix(exchange.getIn().getHeader(SqsConstants.SQS_QUEUE_PREFIX,
String.class));
}
- ListQueuesResult result = new ListQueuesResult();
- result = amazonSQS.listQueues(request);
+ ListQueuesResult result = amazonSQS.listQueues(request);
Message message = getMessageForResponse(exchange);
message.setBody(result);
}
@@ -274,7 +271,7 @@ public class SqsProducer extends DefaultProducer {
dataType = "Number";
}
mav.setDataType(dataType);
- mav.withStringValue(((Number)value).toString());
+ mav.withStringValue(value.toString());
result.put(entry.getKey(), mav);
} else if (value instanceof Date) {
MessageAttributeValue mav = new MessageAttributeValue();
