This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6edfe849d1a22151ff75f7504430448f17bbacc6
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Mon Feb 17 12:51:38 2020 +0100
CAMEL-14553 - Create an AWS-SQS component based on SDK v2, fixed CS
---
.../camel/component/aws2/sqs/Sqs2Component.java | 1 -
.../aws2/sqs/Sqs2ComponentVerifierExtension.java | 1 -
.../component/aws2/sqs/Sqs2Configuration.java | 3 +-
.../camel/component/aws2/sqs/Sqs2Consumer.java | 4 +--
.../camel/component/aws2/sqs/Sqs2Endpoint.java | 38 ++++++++++------------
.../camel/component/aws2/sqs/Sqs2Producer.java | 5 ++-
.../component/aws2/sqs/AmazonSQSClientMock.java | 28 ++++++++--------
.../component/aws2/sqs/SqsBatchConsumerTest.java | 1 -
.../aws2/sqs/SqsComponentClientRegistryTest.java | 2 --
.../aws2/sqs/SqsComponentConfigurationTest.java | 14 ++++----
.../component/aws2/sqs/SqsComponentSpringTest.java | 7 ++--
.../camel/component/aws2/sqs/SqsComponentTest.java | 1 -
.../aws2/sqs/SqsConcurrentConsumerTest.java | 1 -
.../component/aws2/sqs/SqsConfigurationTest.java | 2 --
.../aws2/sqs/SqsConsumerIdleMessageTest.java | 3 +-
.../sqs/SqsDoesNotExtendMessageVisibilityTest.java | 1 -
.../aws2/sqs/SqsEndpointExplicitQueueUrlTest.java | 4 ---
.../component/aws2/sqs/SqsProducerBatchTest.java | 1 -
.../component/aws2/sqs/SqsProducerDeleteTest.java | 2 --
.../aws2/sqs/SqsProducerListQueuesTest.java | 2 --
.../SqsProducerDeleteMessageIntegrationTest.java | 4 +--
21 files changed, 49 insertions(+), 76 deletions(-)
diff --git
a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java
b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java
index 6acad08..e6dac5b 100644
---
a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java
+++
b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java
@@ -24,7 +24,6 @@ import org.apache.camel.Endpoint;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
-
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.sqs.SqsClient;
diff --git
a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2ComponentVerifierExtension.java
b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2ComponentVerifierExtension.java
index f0d79c0..631c8c1 100644
---
a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2ComponentVerifierExtension.java
+++
b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2ComponentVerifierExtension.java
@@ -22,7 +22,6 @@ import
org.apache.camel.component.extension.verifier.DefaultComponentVerifierExt
import org.apache.camel.component.extension.verifier.ResultBuilder;
import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
import org.apache.camel.component.extension.verifier.ResultErrorHelper;
-
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
import software.amazon.awssdk.core.exception.SdkClientException;
diff --git
a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java
b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java
index df0e194..84dee97 100644
---
a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java
+++
b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.aws2.sqs;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
-
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.services.sqs.SqsClient;
@@ -406,7 +405,7 @@ public class Sqs2Configuration implements Cloneable {
public void setQueueUrl(String queueUrl) {
this.queueUrl = queueUrl;
}
-
+
public Protocol getProxyProtocol() {
return proxyProtocol;
}
diff --git
a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Consumer.java
b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Consumer.java
index 84c67db..1d9111d 100644
---
a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Consumer.java
+++
b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Consumer.java
@@ -36,7 +36,6 @@ import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.URISupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import software.amazon.awssdk.awscore.exception.AwsServiceException;
import software.amazon.awssdk.services.sqs.SqsClient;
import
software.amazon.awssdk.services.sqs.model.ChangeMessageVisibilityRequest;
@@ -315,7 +314,8 @@ public class Sqs2Consumer extends
ScheduledBatchPollingConsumer {
@Override
public void run() {
- ChangeMessageVisibilityRequest.Builder request =
ChangeMessageVisibilityRequest.builder().queueUrl(getQueueUrl()).visibilityTimeout(repeatSeconds).receiptHandle(exchange.getIn().getHeader(Sqs2Constants.RECEIPT_HANDLE,
String.class));
+ ChangeMessageVisibilityRequest.Builder request =
ChangeMessageVisibilityRequest.builder().queueUrl(getQueueUrl()).visibilityTimeout(repeatSeconds)
+
.receiptHandle(exchange.getIn().getHeader(Sqs2Constants.RECEIPT_HANDLE,
String.class));
try {
LOG.trace("Extending visibility window by {} seconds for
exchange {}", this.repeatSeconds, this.exchange);
diff --git
a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java
b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java
index 80e702d..fbcab87 100644
---
a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java
+++
b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java
@@ -39,7 +39,6 @@ import org.apache.camel.util.FileUtil;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
import software.amazon.awssdk.http.apache.ApacheHttpClient;
@@ -113,8 +112,8 @@ public class Sqs2Endpoint extends ScheduledPollEndpoint
implements HeaderFilterS
}
/*
- If using a different AWS host, do not assume specific parts of the AWS
host
- and, instead, just return whatever is provided as the host.
+ * If using a different AWS host, do not assume specific parts of the AWS
+ * host and, instead, just return whatever is provided as the host.
*/
private String getFullyQualifiedAWSHost() {
String host = configuration.getAmazonAWSHost();
@@ -147,8 +146,7 @@ public class Sqs2Endpoint extends ScheduledPollEndpoint
implements HeaderFilterS
if (configuration.getRegion() != null &&
configuration.getQueueOwnerAWSAccountId() != null) {
String protocol = configuration.getProtocol();
- queueUrl = protocol + "://" + getFullyQualifiedAWSHost() + "/"
+ configuration.getQueueOwnerAWSAccountId() + "/"
- + configuration.getQueueName();
+ queueUrl = protocol + "://" + getFullyQualifiedAWSHost() + "/"
+ configuration.getQueueOwnerAWSAccountId() + "/" +
configuration.getQueueName();
} else if (configuration.getQueueOwnerAWSAccountId() != null) {
GetQueueUrlRequest.Builder getQueueUrlRequest =
GetQueueUrlRequest.builder();
getQueueUrlRequest.queueName(configuration.getQueueName());
@@ -188,13 +186,13 @@ public class Sqs2Endpoint extends ScheduledPollEndpoint
implements HeaderFilterS
attributes.put(QueueAttributeName.CONTENT_BASED_DEDUPLICATION,
String.valueOf(useContentBasedDeduplication));
}
if (getConfiguration().getDefaultVisibilityTimeout() != null) {
- attributes.put(QueueAttributeName.VISIBILITY_TIMEOUT,
String.valueOf(getConfiguration().getDefaultVisibilityTimeout()));
+ attributes.put(QueueAttributeName.VISIBILITY_TIMEOUT,
String.valueOf(getConfiguration().getDefaultVisibilityTimeout()));
}
if (getConfiguration().getMaximumMessageSize() != null) {
- attributes.put(QueueAttributeName.MAXIMUM_MESSAGE_SIZE,
String.valueOf(getConfiguration().getMaximumMessageSize()));
+ attributes.put(QueueAttributeName.MAXIMUM_MESSAGE_SIZE,
String.valueOf(getConfiguration().getMaximumMessageSize()));
}
if (getConfiguration().getMessageRetentionPeriod() != null) {
- attributes.put(QueueAttributeName.MESSAGE_RETENTION_PERIOD,
String.valueOf(getConfiguration().getMessageRetentionPeriod()));
+ attributes.put(QueueAttributeName.MESSAGE_RETENTION_PERIOD,
String.valueOf(getConfiguration().getMessageRetentionPeriod()));
}
if (getConfiguration().getPolicy() != null) {
attributes.put(QueueAttributeName.POLICY,
String.valueOf(getConfiguration().getPolicy()));
@@ -203,17 +201,17 @@ public class Sqs2Endpoint extends ScheduledPollEndpoint
implements HeaderFilterS
attributes.put(QueueAttributeName.RECEIVE_MESSAGE_WAIT_TIME_SECONDS,
String.valueOf(getConfiguration().getReceiveMessageWaitTimeSeconds()));
}
if (getConfiguration().getDelaySeconds() != null &&
getConfiguration().isDelayQueue()) {
- attributes.put(QueueAttributeName.DELAY_SECONDS,
String.valueOf(getConfiguration().getDelaySeconds()));
+ attributes.put(QueueAttributeName.DELAY_SECONDS,
String.valueOf(getConfiguration().getDelaySeconds()));
}
if (getConfiguration().getRedrivePolicy() != null) {
- attributes.put(QueueAttributeName.REDRIVE_POLICY,
getConfiguration().getRedrivePolicy());
+ attributes.put(QueueAttributeName.REDRIVE_POLICY,
getConfiguration().getRedrivePolicy());
}
if (getConfiguration().isServerSideEncryptionEnabled()) {
if (getConfiguration().getKmsMasterKeyId() != null) {
- attributes.put(QueueAttributeName.KMS_MASTER_KEY_ID,
getConfiguration().getKmsMasterKeyId());
+ attributes.put(QueueAttributeName.KMS_MASTER_KEY_ID,
getConfiguration().getKmsMasterKeyId());
}
if (getConfiguration().getKmsDataKeyReusePeriodSeconds() != null) {
-
attributes.put(QueueAttributeName.KMS_DATA_KEY_REUSE_PERIOD_SECONDS,
String.valueOf(getConfiguration().getKmsDataKeyReusePeriodSeconds()));
+
attributes.put(QueueAttributeName.KMS_DATA_KEY_REUSE_PERIOD_SECONDS,
String.valueOf(getConfiguration().getKmsDataKeyReusePeriodSeconds()));
}
}
LOG.trace("Creating queue [{}] with request [{}]...",
configuration.getQueueName(), request);
@@ -229,13 +227,13 @@ public class Sqs2Endpoint extends ScheduledPollEndpoint
implements HeaderFilterS
SetQueueAttributesRequest.Builder request =
SetQueueAttributesRequest.builder().queueUrl(queueUrl);
Map<QueueAttributeName, String> attributes = new
HashMap<QueueAttributeName, String>();
if (getConfiguration().getDefaultVisibilityTimeout() != null) {
- attributes.put(QueueAttributeName.VISIBILITY_TIMEOUT,
String.valueOf(getConfiguration().getDefaultVisibilityTimeout()));
+ attributes.put(QueueAttributeName.VISIBILITY_TIMEOUT,
String.valueOf(getConfiguration().getDefaultVisibilityTimeout()));
}
if (getConfiguration().getMaximumMessageSize() != null) {
- attributes.put(QueueAttributeName.MAXIMUM_MESSAGE_SIZE,
String.valueOf(getConfiguration().getMaximumMessageSize()));
+ attributes.put(QueueAttributeName.MAXIMUM_MESSAGE_SIZE,
String.valueOf(getConfiguration().getMaximumMessageSize()));
}
if (getConfiguration().getMessageRetentionPeriod() != null) {
- attributes.put(QueueAttributeName.MESSAGE_RETENTION_PERIOD,
String.valueOf(getConfiguration().getMessageRetentionPeriod()));
+ attributes.put(QueueAttributeName.MESSAGE_RETENTION_PERIOD,
String.valueOf(getConfiguration().getMessageRetentionPeriod()));
}
if (getConfiguration().getPolicy() != null) {
attributes.put(QueueAttributeName.POLICY,
String.valueOf(getConfiguration().getPolicy()));
@@ -244,21 +242,21 @@ public class Sqs2Endpoint extends ScheduledPollEndpoint
implements HeaderFilterS
attributes.put(QueueAttributeName.RECEIVE_MESSAGE_WAIT_TIME_SECONDS,
String.valueOf(getConfiguration().getReceiveMessageWaitTimeSeconds()));
}
if (getConfiguration().getDelaySeconds() != null &&
getConfiguration().isDelayQueue()) {
- attributes.put(QueueAttributeName.DELAY_SECONDS,
String.valueOf(getConfiguration().getDelaySeconds()));
+ attributes.put(QueueAttributeName.DELAY_SECONDS,
String.valueOf(getConfiguration().getDelaySeconds()));
}
if (getConfiguration().getRedrivePolicy() != null) {
- attributes.put(QueueAttributeName.REDRIVE_POLICY,
getConfiguration().getRedrivePolicy());
+ attributes.put(QueueAttributeName.REDRIVE_POLICY,
getConfiguration().getRedrivePolicy());
}
if (getConfiguration().isServerSideEncryptionEnabled()) {
if (getConfiguration().getKmsMasterKeyId() != null) {
- attributes.put(QueueAttributeName.KMS_MASTER_KEY_ID,
getConfiguration().getKmsMasterKeyId());
+ attributes.put(QueueAttributeName.KMS_MASTER_KEY_ID,
getConfiguration().getKmsMasterKeyId());
}
if (getConfiguration().getKmsDataKeyReusePeriodSeconds() != null) {
-
attributes.put(QueueAttributeName.KMS_DATA_KEY_REUSE_PERIOD_SECONDS,
String.valueOf(getConfiguration().getKmsDataKeyReusePeriodSeconds()));
+
attributes.put(QueueAttributeName.KMS_DATA_KEY_REUSE_PERIOD_SECONDS,
String.valueOf(getConfiguration().getKmsDataKeyReusePeriodSeconds()));
}
}
if (!attributes.isEmpty()) {
- request.attributes(attributes);
+ request.attributes(attributes);
LOG.trace("Updating queue '{}' with the provided queue
attributes...", configuration.getQueueName());
client.setQueueAttributes(request.build());
LOG.trace("Queue '{}' updated and available at {}'",
configuration.getQueueName(), queueUrl);
diff --git
a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Producer.java
b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Producer.java
index ac1b0b7..f7d3c49 100644
---
a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Producer.java
+++
b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Producer.java
@@ -34,7 +34,6 @@ import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.URISupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import software.amazon.awssdk.core.SdkBytes;
import software.amazon.awssdk.services.sqs.SqsClient;
import software.amazon.awssdk.services.sqs.model.DeleteMessageRequest;
@@ -125,7 +124,7 @@ public class Sqs2Producer extends DefaultProducer {
Message message = getMessageForResponse(exchange);
message.setBody(result);
} else {
- SendMessageBatchRequest req =
exchange.getIn().getBody(SendMessageBatchRequest.class);
+ SendMessageBatchRequest req =
exchange.getIn().getBody(SendMessageBatchRequest.class);
SendMessageBatchResponse result = amazonSQS.sendMessageBatch(req);
Message message = getMessageForResponse(exchange);
message.setBody(result);
@@ -252,7 +251,7 @@ public class Sqs2Producer extends DefaultProducer {
} else if (value instanceof ByteBuffer) {
MessageAttributeValue.Builder mav =
MessageAttributeValue.builder();
mav.dataType("Binary");
- mav.binaryValue(SdkBytes.fromByteBuffer((ByteBuffer)
value));
+
mav.binaryValue(SdkBytes.fromByteBuffer((ByteBuffer)value));
result.put(entry.getKey(), mav.build());
} else if (value instanceof Boolean) {
MessageAttributeValue.Builder mav =
MessageAttributeValue.builder();
diff --git
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/AmazonSQSClientMock.java
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/AmazonSQSClientMock.java
index bb23de3..8791bcb 100644
---
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/AmazonSQSClientMock.java
+++
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/AmazonSQSClientMock.java
@@ -68,7 +68,7 @@ public class AmazonSQSClientMock implements SqsClient {
@Override
public ListQueuesResponse listQueues(ListQueuesRequest request) {
- ListQueuesResponse.Builder result = ListQueuesResponse.builder();
+ ListQueuesResponse.Builder result = ListQueuesResponse.builder();
List<String> queues = new ArrayList<>();
queues.add("queue1");
queues.add("queue2");
@@ -92,15 +92,13 @@ public class AmazonSQSClientMock implements SqsClient {
message.md5OfBody("6a1559560f67c5e7a7d5d838bf0272ee");
message.messageId("f6fb6f99-5eb2-4be4-9b15-144774141458");
message.receiptHandle("0NNAq8PwvXsyZkR6yu4nQ07FGxNmOBWi5zC9+4QMqJZ0DJ3gVOmjI2Gh/oFnb0IeJqy5Zc8kH4JX7GVpfjcEDjaAPSeOkXQZRcaBqt"
- +
"4lOtyfj0kcclVV/zS7aenhfhX5Ixfgz/rHhsJwtCPPvTAdgQFGYrqaHly+etJiawiNPVc=");
+ +
"4lOtyfj0kcclVV/zS7aenhfhX5Ixfgz/rHhsJwtCPPvTAdgQFGYrqaHly+etJiawiNPVc=");
synchronized (messages) {
messages.add(message.build());
}
- return SendMessageResponse.builder()
- .messageId("f6fb6f99-5eb2-4be4-9b15-144774141458")
- .md5OfMessageBody("6a1559560f67c5e7a7d5d838bf0272ee").build();
+ return
SendMessageResponse.builder().messageId("f6fb6f99-5eb2-4be4-9b15-144774141458").md5OfMessageBody("6a1559560f67c5e7a7d5d838bf0272ee").build();
}
@Override
@@ -213,15 +211,15 @@ public class AmazonSQSClientMock implements SqsClient {
return result.build();
}
- @Override
- public String serviceName() {
- // TODO Auto-generated method stub
- return null;
- }
+ @Override
+ public String serviceName() {
+ // TODO Auto-generated method stub
+ return null;
+ }
- @Override
- public void close() {
- // TODO Auto-generated method stub
-
- }
+ @Override
+ public void close() {
+ // TODO Auto-generated method stub
+
+ }
}
diff --git
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerTest.java
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerTest.java
index caad417..c3a4d34 100644
---
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerTest.java
+++
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerTest.java
@@ -23,7 +23,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-
import software.amazon.awssdk.services.sqs.model.Message;
public class SqsBatchConsumerTest extends CamelTestSupport {
diff --git
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentClientRegistryTest.java
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentClientRegistryTest.java
index 5096289..cf33f01 100644
---
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentClientRegistryTest.java
+++
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentClientRegistryTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.aws2.sqs;
-import org.apache.camel.component.aws2.sqs.Sqs2Component;
-import org.apache.camel.component.aws2.sqs.Sqs2Endpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
diff --git
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentConfigurationTest.java
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentConfigurationTest.java
index 70acc03..04c3518 100644
---
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentConfigurationTest.java
+++
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentConfigurationTest.java
@@ -16,12 +16,8 @@
*/
package org.apache.camel.component.aws2.sqs;
-import org.apache.camel.component.aws2.sqs.Sqs2Component;
-import org.apache.camel.component.aws2.sqs.Sqs2Consumer;
-import org.apache.camel.component.aws2.sqs.Sqs2Endpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.regions.Region;
@@ -221,7 +217,8 @@ public class SqsComponentConfigurationTest extends
CamelTestSupport {
context.getRegistry().bind("amazonSQSClient", mock);
Sqs2Component component = context.getComponent("aws2-sqs",
Sqs2Component.class);
-
assertNotNull(component.createEndpoint("aws2-sqs://MyQueue?amazonSQSClient=#amazonSQSClient&accessKey=xxx&secretKey=yyy&visibilityTimeout=30&extendMessageVisibility=true"));
+ assertNotNull(component
+
.createEndpoint("aws2-sqs://MyQueue?amazonSQSClient=#amazonSQSClient&accessKey=xxx&secretKey=yyy&visibilityTimeout=30&extendMessageVisibility=true"));
}
@Test
@@ -287,15 +284,16 @@ public class SqsComponentConfigurationTest extends
CamelTestSupport {
assertEquals("US_EAST_1", endpoint.getConfiguration().getRegion());
assertEquals(false, endpoint.getConfiguration().isAutoCreateQueue());
}
-
+
@Test
public void createEndpointWithComponentEndpointElementsAndProxy() throws
Exception {
Sqs2Component component = context.getComponent("aws2-sqs",
Sqs2Component.class);
component.setAccessKey("XXX");
component.setSecretKey("YYY");
component.setRegion(Region.US_WEST_1.toString());
- Sqs2Endpoint endpoint =
(Sqs2Endpoint)component.createEndpoint("aws2-sqs://label?accessKey=xxxxxx&secretKey=yyyyy®ion=US_EAST_1&proxyHost=localhost&proxyPort=9000&proxyProtocol=HTTP");
-
+ Sqs2Endpoint endpoint = (Sqs2Endpoint)component
+
.createEndpoint("aws2-sqs://label?accessKey=xxxxxx&secretKey=yyyyy®ion=US_EAST_1&proxyHost=localhost&proxyPort=9000&proxyProtocol=HTTP");
+
assertEquals("xxxxxx", endpoint.getConfiguration().getAccessKey());
assertEquals("yyyyy", endpoint.getConfiguration().getSecretKey());
assertEquals("US_EAST_1", endpoint.getConfiguration().getRegion());
diff --git
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentSpringTest.java
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentSpringTest.java
index db0cf18..20ba9a1 100644
---
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentSpringTest.java
+++
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentSpringTest.java
@@ -19,19 +19,18 @@ package org.apache.camel.component.aws2.sqs;
import java.util.ArrayList;
import java.util.Collection;
-import software.amazon.awssdk.services.sqs.model.DeleteMessageResponse;
-import software.amazon.awssdk.services.sqs.model.SendMessageBatchResponse;
-
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
-import org.apache.camel.component.aws2.sqs.Sqs2Constants;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.spring.CamelSpringTestSupport;
import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import software.amazon.awssdk.services.sqs.model.DeleteMessageResponse;
+import software.amazon.awssdk.services.sqs.model.SendMessageBatchResponse;
+
public class SqsComponentSpringTest extends CamelSpringTestSupport {
diff --git
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentTest.java
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentTest.java
index 2016670..4a278ab 100644
---
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentTest.java
+++
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentTest.java
@@ -23,7 +23,6 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.aws2.sqs.Sqs2Constants;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
diff --git
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConcurrentConsumerTest.java
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConcurrentConsumerTest.java
index 197b333..6ec3dce 100644
---
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConcurrentConsumerTest.java
+++
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConcurrentConsumerTest.java
@@ -27,7 +27,6 @@ import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-
import software.amazon.awssdk.services.sqs.model.Message;
public class SqsConcurrentConsumerTest extends CamelTestSupport {
diff --git
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConfigurationTest.java
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConfigurationTest.java
index 7a0a05c..4adb4f1 100644
---
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConfigurationTest.java
+++
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConfigurationTest.java
@@ -21,8 +21,6 @@ import org.junit.Test;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import org.apache.camel.component.aws2.sqs.Sqs2Configuration;
-
public class SqsConfigurationTest {
@Test
diff --git
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConsumerIdleMessageTest.java
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConsumerIdleMessageTest.java
index c5696cf..77d29c8 100644
---
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConsumerIdleMessageTest.java
+++
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConsumerIdleMessageTest.java
@@ -24,7 +24,8 @@ import org.junit.Test;
/**
* Test to verify that the polling consumer delivers an empty Exchange when the
- * sendEmptyMessageWhenIdle property is set and a polling event yields no
results.
+ * sendEmptyMessageWhenIdle property is set and a polling event yields no
+ * results.
*/
public class SqsConsumerIdleMessageTest extends CamelTestSupport {
diff --git
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsDoesNotExtendMessageVisibilityTest.java
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsDoesNotExtendMessageVisibilityTest.java
index 8e83f95..ae84ed2 100644
---
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsDoesNotExtendMessageVisibilityTest.java
+++
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsDoesNotExtendMessageVisibilityTest.java
@@ -24,7 +24,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-
import software.amazon.awssdk.services.sqs.model.Message;
public class SqsDoesNotExtendMessageVisibilityTest extends CamelTestSupport {
diff --git
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsEndpointExplicitQueueUrlTest.java
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsEndpointExplicitQueueUrlTest.java
index b8a601e..dec9870 100644
---
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsEndpointExplicitQueueUrlTest.java
+++
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsEndpointExplicitQueueUrlTest.java
@@ -16,14 +16,10 @@
*/
package org.apache.camel.component.aws2.sqs;
-import org.apache.camel.component.aws2.sqs.Sqs2Component;
-import org.apache.camel.component.aws2.sqs.Sqs2Configuration;
-import org.apache.camel.component.aws2.sqs.Sqs2Endpoint;
import org.apache.camel.impl.DefaultCamelContext;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-
import software.amazon.awssdk.services.sqs.SqsClient;
public class SqsEndpointExplicitQueueUrlTest extends Assert {
diff --git
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerBatchTest.java
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerBatchTest.java
index 68671fa..3a2cf96 100644
---
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerBatchTest.java
+++
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerBatchTest.java
@@ -28,7 +28,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-
import software.amazon.awssdk.services.sqs.model.SendMessageBatchResponse;
public class SqsProducerBatchTest extends CamelTestSupport {
diff --git
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDeleteTest.java
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDeleteTest.java
index cb3f2e5..16ac8d0 100644
---
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDeleteTest.java
+++
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDeleteTest.java
@@ -22,11 +22,9 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.aws2.sqs.Sqs2Constants;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-
import software.amazon.awssdk.services.sqs.model.DeleteMessageResponse;
public class SqsProducerDeleteTest extends CamelTestSupport {
diff --git
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerListQueuesTest.java
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerListQueuesTest.java
index 3f8d756..69cb198 100644
---
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerListQueuesTest.java
+++
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerListQueuesTest.java
@@ -22,11 +22,9 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.aws2.sqs.Sqs2Constants;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-
import software.amazon.awssdk.services.sqs.model.ListQueuesResponse;
public class SqsProducerListQueuesTest extends CamelTestSupport {
diff --git
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerDeleteMessageIntegrationTest.java
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerDeleteMessageIntegrationTest.java
index d0557c7..2ed8f12 100644
---
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerDeleteMessageIntegrationTest.java
+++
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerDeleteMessageIntegrationTest.java
@@ -59,8 +59,8 @@ public class SqsProducerDeleteMessageIntegrationTest extends
CamelTestSupport {
from("direct:start").startupOrder(2).to(sqsEndpointUri);
from("aws2-sqs://camel-1?accessKey=RAW(xxx)&secretKey=RAW(xxx)®ion=EU_WEST_1&deleteAfterRead=false").startupOrder(1).log("${body}")
-
.to("aws2-sqs://camel-1?accessKey=RAW(xxx)&secretKey=RAW(xxx)®ion=EU_WEST_1&operation=deleteMessage").log("${body}").log("${header.CamelAwsSqsReceiptHandle}")
- .to("mock:result");
+
.to("aws2-sqs://camel-1?accessKey=RAW(xxx)&secretKey=RAW(xxx)®ion=EU_WEST_1&operation=deleteMessage").log("${body}")
+
.log("${header.CamelAwsSqsReceiptHandle}").to("mock:result");
}
};
}
