CAMEL-8572 Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/eb533c4d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/eb533c4d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/eb533c4d Branch: refs/heads/master Commit: eb533c4d90c8127e1b10290411f50184131bd98e Parents: 90d5906 Author: ancosen <anco...@gmail.com> Authored: Thu Apr 2 23:06:31 2015 +0200 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Fri Apr 3 10:01:17 2015 +0800 ---------------------------------------------------------------------- .../component/aws/ddb/AbstractDdbCommand.java | 6 ++--- .../component/aws/ddb/BatchGetItemsCommand.java | 4 +-- .../component/aws/ddb/DdbConfiguration.java | 4 +-- .../camel/component/aws/ddb/DdbEndpoint.java | 24 ++++++++--------- .../component/aws/ddb/DeleteItemCommand.java | 7 ++--- .../component/aws/ddb/DeleteTableCommand.java | 4 +-- .../component/aws/ddb/DescribeTableCommand.java | 6 ++--- .../camel/component/aws/ddb/GetItemCommand.java | 4 +-- .../camel/component/aws/ddb/PutItemCommand.java | 4 +-- .../camel/component/aws/ddb/QueryCommand.java | 4 +-- .../camel/component/aws/ddb/ScanCommand.java | 4 +-- .../component/aws/ddb/UpdateItemCommand.java | 4 +-- .../component/aws/ddb/UpdateTableCommand.java | 4 +-- .../component/aws/ddb/AmazonDDBClientMock.java | 9 +++---- .../aws/ddb/BatchGetItemsCommandTest.java | 19 +++++++------ .../aws/ddb/DeleteItemCommandTest.java | 13 +++++---- .../aws/ddb/DeleteTableCommandTest.java | 13 ++++----- .../aws/ddb/DescribeTableCommandTest.java | 13 ++++----- .../component/aws/ddb/GetItemCommandTest.java | 11 ++++---- .../component/aws/ddb/PutItemCommandTest.java | 9 +++---- .../component/aws/ddb/QueryCommandTest.java | 28 +++++++++----------- .../component/aws/ddb/ScanCommandTest.java | 21 +++++++-------- .../aws/ddb/UpdateItemCommandTest.java | 17 ++++++------ .../DdbComponentIntegrationTest.java | 4 +-- 24 files changed, 109 insertions(+), 127 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/eb533c4d/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/AbstractDdbCommand.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/AbstractDdbCommand.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/AbstractDdbCommand.java index 09c7075..1230eed 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/AbstractDdbCommand.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/AbstractDdbCommand.java @@ -19,13 +19,13 @@ package org.apache.camel.component.aws.ddb; import java.util.Collection; import java.util.Map; -import org.apache.camel.Exchange; -import org.apache.camel.Message; - import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.ExpectedAttributeValue; +import org.apache.camel.Exchange; +import org.apache.camel.Message; + public abstract class AbstractDdbCommand { protected DdbConfiguration configuration; protected Exchange exchange; http://git-wip-us.apache.org/repos/asf/camel/blob/eb533c4d/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommand.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommand.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommand.java index c1513d1..74b340a 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommand.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommand.java @@ -18,13 +18,13 @@ package org.apache.camel.component.aws.ddb; import java.util.Map; -import org.apache.camel.Exchange; - import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; import com.amazonaws.services.dynamodbv2.model.BatchGetItemRequest; import com.amazonaws.services.dynamodbv2.model.BatchGetItemResult; import com.amazonaws.services.dynamodbv2.model.KeysAndAttributes; +import org.apache.camel.Exchange; + public class BatchGetItemsCommand extends AbstractDdbCommand { public BatchGetItemsCommand(AmazonDynamoDB ddbClient, DdbConfiguration configuration, Exchange exchange) { super(ddbClient, configuration, exchange); http://git-wip-us.apache.org/repos/asf/camel/blob/eb533c4d/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbConfiguration.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbConfiguration.java index e221822..25c9c73 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbConfiguration.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbConfiguration.java @@ -16,13 +16,13 @@ */ package org.apache.camel.component.aws.ddb; +import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; + import org.apache.camel.spi.Metadata; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriParams; import org.apache.camel.spi.UriPath; -import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; - @UriParams public class DdbConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/eb533c4d/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java index 86a6efd..18dd765 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java @@ -16,18 +16,6 @@ */ package org.apache.camel.component.aws.ddb; -import org.apache.camel.CamelContext; -import org.apache.camel.Component; -import org.apache.camel.Consumer; -import org.apache.camel.Processor; -import org.apache.camel.Producer; -import org.apache.camel.impl.ScheduledPollEndpoint; -import org.apache.camel.spi.UriEndpoint; -import org.apache.camel.spi.UriParam; -import org.apache.camel.util.ObjectHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.amazonaws.AmazonServiceException; import com.amazonaws.auth.AWSCredentials; import com.amazonaws.auth.BasicAWSCredentials; @@ -41,6 +29,18 @@ import com.amazonaws.services.dynamodbv2.model.ResourceNotFoundException; import com.amazonaws.services.dynamodbv2.model.TableDescription; import com.amazonaws.services.dynamodbv2.model.TableStatus; +import org.apache.camel.CamelContext; +import org.apache.camel.Component; +import org.apache.camel.Consumer; +import org.apache.camel.Processor; +import org.apache.camel.Producer; +import org.apache.camel.impl.ScheduledPollEndpoint; +import org.apache.camel.spi.UriEndpoint; +import org.apache.camel.spi.UriParam; +import org.apache.camel.util.ObjectHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * Defines the <a href="http://aws.amazon.com/dynamodb/";>AWS DynamoDB endpoint</a> */ http://git-wip-us.apache.org/repos/asf/camel/blob/eb533c4d/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DeleteItemCommand.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DeleteItemCommand.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DeleteItemCommand.java index aa38abd..9952d92 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DeleteItemCommand.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DeleteItemCommand.java @@ -16,15 +16,12 @@ */ package org.apache.camel.component.aws.ddb; -import java.util.Map; - -import org.apache.camel.Exchange; - import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; -import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.DeleteItemRequest; import com.amazonaws.services.dynamodbv2.model.DeleteItemResult; +import org.apache.camel.Exchange; + public class DeleteItemCommand extends AbstractDdbCommand { public DeleteItemCommand(AmazonDynamoDB ddbClient, DdbConfiguration configuration, Exchange exchange) { super(ddbClient, configuration, exchange); http://git-wip-us.apache.org/repos/asf/camel/blob/eb533c4d/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DeleteTableCommand.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DeleteTableCommand.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DeleteTableCommand.java index 0c4586b..5bb1181 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DeleteTableCommand.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DeleteTableCommand.java @@ -16,12 +16,12 @@ */ package org.apache.camel.component.aws.ddb; -import org.apache.camel.Exchange; - import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; import com.amazonaws.services.dynamodbv2.model.DeleteTableRequest; import com.amazonaws.services.dynamodbv2.model.TableDescription; +import org.apache.camel.Exchange; + public class DeleteTableCommand extends AbstractDdbCommand { public DeleteTableCommand(AmazonDynamoDB ddbClient, DdbConfiguration configuration, Exchange exchange) { http://git-wip-us.apache.org/repos/asf/camel/blob/eb533c4d/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DescribeTableCommand.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DescribeTableCommand.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DescribeTableCommand.java index 12b6c52..d010f29 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DescribeTableCommand.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DescribeTableCommand.java @@ -16,13 +16,13 @@ */ package org.apache.camel.component.aws.ddb; -import org.apache.camel.Exchange; -import org.apache.camel.Message; - import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; import com.amazonaws.services.dynamodbv2.model.DescribeTableRequest; import com.amazonaws.services.dynamodbv2.model.DescribeTableResult; +import org.apache.camel.Exchange; +import org.apache.camel.Message; + public class DescribeTableCommand extends AbstractDdbCommand { public DescribeTableCommand(AmazonDynamoDB ddbClient, DdbConfiguration configuration, Exchange exchange) { http://git-wip-us.apache.org/repos/asf/camel/blob/eb533c4d/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/GetItemCommand.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/GetItemCommand.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/GetItemCommand.java index 8a7e6c3..8615c65 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/GetItemCommand.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/GetItemCommand.java @@ -16,12 +16,12 @@ */ package org.apache.camel.component.aws.ddb; -import org.apache.camel.Exchange; - import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; import com.amazonaws.services.dynamodbv2.model.GetItemRequest; import com.amazonaws.services.dynamodbv2.model.GetItemResult; +import org.apache.camel.Exchange; + public class GetItemCommand extends AbstractDdbCommand { public GetItemCommand(AmazonDynamoDB ddbClient, DdbConfiguration configuration, Exchange exchange) { super(ddbClient, configuration, exchange); http://git-wip-us.apache.org/repos/asf/camel/blob/eb533c4d/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/PutItemCommand.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/PutItemCommand.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/PutItemCommand.java index cf0d9ab..e0050a6 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/PutItemCommand.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/PutItemCommand.java @@ -16,12 +16,12 @@ */ package org.apache.camel.component.aws.ddb; -import org.apache.camel.Exchange; - import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; import com.amazonaws.services.dynamodbv2.model.PutItemRequest; import com.amazonaws.services.dynamodbv2.model.PutItemResult; +import org.apache.camel.Exchange; + public class PutItemCommand extends AbstractDdbCommand { public PutItemCommand(AmazonDynamoDB ddbClient, DdbConfiguration configuration, Exchange exchange) { super(ddbClient, configuration, exchange); http://git-wip-us.apache.org/repos/asf/camel/blob/eb533c4d/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/QueryCommand.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/QueryCommand.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/QueryCommand.java index 9da8840..0204abb 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/QueryCommand.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/QueryCommand.java @@ -18,13 +18,13 @@ package org.apache.camel.component.aws.ddb; import java.util.Map; -import org.apache.camel.Exchange; - import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.QueryRequest; import com.amazonaws.services.dynamodbv2.model.QueryResult; +import org.apache.camel.Exchange; + public class QueryCommand extends AbstractDdbCommand { public QueryCommand(AmazonDynamoDB ddbClient, DdbConfiguration configuration, Exchange exchange) { super(ddbClient, configuration, exchange); http://git-wip-us.apache.org/repos/asf/camel/blob/eb533c4d/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/ScanCommand.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/ScanCommand.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/ScanCommand.java index 350bf0f..e33e635 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/ScanCommand.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/ScanCommand.java @@ -18,13 +18,13 @@ package org.apache.camel.component.aws.ddb; import java.util.Map; -import org.apache.camel.Exchange; - import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; import com.amazonaws.services.dynamodbv2.model.Condition; import com.amazonaws.services.dynamodbv2.model.ScanRequest; import com.amazonaws.services.dynamodbv2.model.ScanResult; +import org.apache.camel.Exchange; + public class ScanCommand extends AbstractDdbCommand { public ScanCommand(AmazonDynamoDB ddbClient, DdbConfiguration configuration, Exchange exchange) { super(ddbClient, configuration, exchange); http://git-wip-us.apache.org/repos/asf/camel/blob/eb533c4d/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/UpdateItemCommand.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/UpdateItemCommand.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/UpdateItemCommand.java index cf770e1..8538f59 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/UpdateItemCommand.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/UpdateItemCommand.java @@ -18,13 +18,13 @@ package org.apache.camel.component.aws.ddb; import java.util.Map; -import org.apache.camel.Exchange; - import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; import com.amazonaws.services.dynamodbv2.model.AttributeValueUpdate; import com.amazonaws.services.dynamodbv2.model.UpdateItemRequest; import com.amazonaws.services.dynamodbv2.model.UpdateItemResult; +import org.apache.camel.Exchange; + public class UpdateItemCommand extends AbstractDdbCommand { public UpdateItemCommand(AmazonDynamoDB ddbClient, DdbConfiguration configuration, Exchange exchange) { super(ddbClient, configuration, exchange); http://git-wip-us.apache.org/repos/asf/camel/blob/eb533c4d/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/UpdateTableCommand.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/UpdateTableCommand.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/UpdateTableCommand.java index 7e9f459..e373a08 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/UpdateTableCommand.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/UpdateTableCommand.java @@ -16,12 +16,12 @@ */ package org.apache.camel.component.aws.ddb; -import org.apache.camel.Exchange; - import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput; import com.amazonaws.services.dynamodbv2.model.UpdateTableRequest; +import org.apache.camel.Exchange; + public class UpdateTableCommand extends AbstractDdbCommand { public UpdateTableCommand(AmazonDynamoDB ddbClient, DdbConfiguration configuration, Exchange exchange) { super(ddbClient, configuration, exchange); http://git-wip-us.apache.org/repos/asf/camel/blob/eb533c4d/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/AmazonDDBClientMock.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/AmazonDDBClientMock.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/AmazonDDBClientMock.java index e508e89..2ddb5d6 100644 --- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/AmazonDDBClientMock.java +++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/AmazonDDBClientMock.java @@ -165,11 +165,10 @@ public class AmazonDDBClientMock extends AmazonDynamoDBClient { List<Map<String, AttributeValue>> p = new ArrayList<Map<String, AttributeValue>>(); p.add(getAttributes()); responseMap.put("DOMAIN1", p); - Map<String,AttributeValue> keysMap = new HashMap<String, AttributeValue>(); + Map<String, AttributeValue> keysMap = new HashMap<String, AttributeValue>(); keysMap.put("1", new AttributeValue("UNPROCESSED_KEY")); Map<String, KeysAndAttributes> unprocessedKeys = new HashMap<String, KeysAndAttributes>(); - unprocessedKeys.put("DOMAIN1", new KeysAndAttributes().withKeys( - keysMap)); + unprocessedKeys.put("DOMAIN1", new KeysAndAttributes().withKeys(keysMap)); return new BatchGetItemResult() .withResponses(responseMap) @@ -182,7 +181,7 @@ public class AmazonDDBClientMock extends AmazonDynamoDBClient { this.scanRequest = scanRequest; ConsumedCapacity consumed = new ConsumedCapacity(); consumed.setCapacityUnits(1.0); - Map<String,AttributeValue> lastEvaluatedKey = new HashMap<String, AttributeValue>(); + Map<String, AttributeValue> lastEvaluatedKey = new HashMap<String, AttributeValue>(); lastEvaluatedKey.put("1", new AttributeValue("LAST_KEY")); return new ScanResult() .withConsumedCapacity(consumed) @@ -198,7 +197,7 @@ public class AmazonDDBClientMock extends AmazonDynamoDBClient { this.queryRequest = queryRequest; ConsumedCapacity consumed = new ConsumedCapacity(); consumed.setCapacityUnits(1.0); - Map<String,AttributeValue> lastEvaluatedKey = new HashMap<String, AttributeValue>(); + Map<String, AttributeValue> lastEvaluatedKey = new HashMap<String, AttributeValue>(); lastEvaluatedKey.put("1", new AttributeValue("LAST_KEY")); return new QueryResult() .withConsumedCapacity(consumed) http://git-wip-us.apache.org/repos/asf/camel/blob/eb533c4d/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommandTest.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommandTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommandTest.java index 27ee44d..e8af0f9 100644 --- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommandTest.java +++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommandTest.java @@ -16,20 +16,19 @@ */ package org.apache.camel.component.aws.ddb; -import static org.junit.Assert.assertEquals; - import java.util.HashMap; import java.util.List; import java.util.Map; +import com.amazonaws.services.dynamodbv2.model.AttributeValue; +import com.amazonaws.services.dynamodbv2.model.KeysAndAttributes; + import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.impl.DefaultExchange; import org.junit.Before; import org.junit.Test; - -import com.amazonaws.services.dynamodbv2.model.AttributeValue; -import com.amazonaws.services.dynamodbv2.model.KeysAndAttributes; +import static org.junit.Assert.assertEquals; public class BatchGetItemsCommandTest { @@ -48,10 +47,10 @@ public class BatchGetItemsCommandTest { @Test public void execute() { - Map<String,AttributeValue> key = new HashMap<String, AttributeValue>(); - key.put("1", new AttributeValue("Key_1")); - Map<String,AttributeValue> unprocessedKey = new HashMap<String, AttributeValue>(); - unprocessedKey.put("1", new AttributeValue("UNPROCESSED_KEY")); + Map<String, AttributeValue> key = new HashMap<String, AttributeValue>(); + key.put("1", new AttributeValue("Key_1")); + Map<String, AttributeValue> unprocessedKey = new HashMap<String, AttributeValue>(); + unprocessedKey.put("1", new AttributeValue("UNPROCESSED_KEY")); Map<String, KeysAndAttributes> keysAndAttributesMap = new HashMap<String, KeysAndAttributes>(); KeysAndAttributes keysAndAttributes = new KeysAndAttributes().withKeys(key); keysAndAttributesMap.put("DOMAIN1", keysAndAttributes); @@ -67,7 +66,7 @@ public class BatchGetItemsCommandTest { KeysAndAttributes unProcessedAttributes = (KeysAndAttributes)exchange.getIn().getHeader( DdbConstants.UNPROCESSED_KEYS, Map.class).get("DOMAIN1"); - Map<String,AttributeValue> next = unProcessedAttributes.getKeys().iterator().next(); + Map<String, AttributeValue> next = unProcessedAttributes.getKeys().iterator().next(); assertEquals(new AttributeValue("attrValue"), value); assertEquals(unprocessedKey, next); http://git-wip-us.apache.org/repos/asf/camel/blob/eb533c4d/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DeleteItemCommandTest.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DeleteItemCommandTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DeleteItemCommandTest.java index e57ab6b..4665f76 100644 --- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DeleteItemCommandTest.java +++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DeleteItemCommandTest.java @@ -16,19 +16,18 @@ */ package org.apache.camel.component.aws.ddb; -import static org.junit.Assert.assertEquals; - import java.util.HashMap; import java.util.Map; +import com.amazonaws.services.dynamodbv2.model.AttributeValue; +import com.amazonaws.services.dynamodbv2.model.ExpectedAttributeValue; + import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.impl.DefaultExchange; import org.junit.Before; import org.junit.Test; - -import com.amazonaws.services.dynamodbv2.model.AttributeValue; -import com.amazonaws.services.dynamodbv2.model.ExpectedAttributeValue; +import static org.junit.Assert.assertEquals; public class DeleteItemCommandTest { @@ -48,8 +47,8 @@ public class DeleteItemCommandTest { @Test public void execute() { - Map<String,AttributeValue> key = new HashMap<String, AttributeValue>(); - key.put("1", new AttributeValue("Key_1")); + Map<String, AttributeValue> key = new HashMap<String, AttributeValue>(); + key.put("1", new AttributeValue("Key_1")); exchange.getIn().setHeader(DdbConstants.KEY, key); http://git-wip-us.apache.org/repos/asf/camel/blob/eb533c4d/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DeleteTableCommandTest.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DeleteTableCommandTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DeleteTableCommandTest.java index 18533c4..6b7c1e3 100644 --- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DeleteTableCommandTest.java +++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DeleteTableCommandTest.java @@ -16,22 +16,19 @@ */ package org.apache.camel.component.aws.ddb; -import static org.junit.Assert.assertEquals; - import java.util.ArrayList; import java.util.Date; -import java.util.List; + +import com.amazonaws.services.dynamodbv2.model.KeySchemaElement; +import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughputDescription; +import com.amazonaws.services.dynamodbv2.model.TableStatus; import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.impl.DefaultExchange; import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.assertArrayEquals; - -import com.amazonaws.services.dynamodbv2.model.KeySchemaElement; -import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughputDescription; -import com.amazonaws.services.dynamodbv2.model.TableStatus; +import static org.junit.Assert.assertEquals; public class DeleteTableCommandTest { http://git-wip-us.apache.org/repos/asf/camel/blob/eb533c4d/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DescribeTableCommandTest.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DescribeTableCommandTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DescribeTableCommandTest.java index 60af09f..06f7682 100644 --- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DescribeTableCommandTest.java +++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DescribeTableCommandTest.java @@ -16,19 +16,18 @@ */ package org.apache.camel.component.aws.ddb; -import static org.junit.Assert.assertEquals; - import java.util.ArrayList; import java.util.Date; import java.util.List; +import com.amazonaws.services.dynamodbv2.model.KeySchemaElement; + import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.impl.DefaultExchange; import org.junit.Before; import org.junit.Test; - -import com.amazonaws.services.dynamodbv2.model.KeySchemaElement; +import static org.junit.Assert.assertEquals; public class DescribeTableCommandTest { @@ -49,10 +48,8 @@ public class DescribeTableCommandTest { @Test public void testExecute() { command.execute(); - - List<KeySchemaElement> keySchema = new ArrayList<KeySchemaElement>(); - keySchema.add(new KeySchemaElement().withAttributeName("name")); - + List<KeySchemaElement> keySchema = new ArrayList<KeySchemaElement>(); + keySchema.add(new KeySchemaElement().withAttributeName("name")); assertEquals("FULL_DESCRIBE_TABLE", ddbClient.describeTableRequest.getTableName()); assertEquals("FULL_DESCRIBE_TABLE", exchange.getIn().getHeader(DdbConstants.TABLE_NAME)); assertEquals("ACTIVE", exchange.getIn().getHeader(DdbConstants.TABLE_STATUS)); http://git-wip-us.apache.org/repos/asf/camel/blob/eb533c4d/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/GetItemCommandTest.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/GetItemCommandTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/GetItemCommandTest.java index a55f5bd..a813fe4 100644 --- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/GetItemCommandTest.java +++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/GetItemCommandTest.java @@ -16,20 +16,19 @@ */ package org.apache.camel.component.aws.ddb; -import static org.junit.Assert.assertEquals; - import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import com.amazonaws.services.dynamodbv2.model.AttributeValue; + import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.impl.DefaultExchange; import org.junit.Before; import org.junit.Test; - -import com.amazonaws.services.dynamodbv2.model.AttributeValue; +import static org.junit.Assert.assertEquals; public class GetItemCommandTest { private GetItemCommand command; @@ -48,8 +47,8 @@ public class GetItemCommandTest { @Test public void execute() { - Map<String,AttributeValue> key = new HashMap<String, AttributeValue>(); - key.put("1", new AttributeValue("Key_1")); + Map<String, AttributeValue> key = new HashMap<String, AttributeValue>(); + key.put("1", new AttributeValue("Key_1")); exchange.getIn().setHeader(DdbConstants.KEY, key); List<String> attrNames = Arrays.asList("attrName"); http://git-wip-us.apache.org/repos/asf/camel/blob/eb533c4d/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/PutItemCommandTest.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/PutItemCommandTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/PutItemCommandTest.java index 5ef0745..63a4a01 100644 --- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/PutItemCommandTest.java +++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/PutItemCommandTest.java @@ -16,19 +16,18 @@ */ package org.apache.camel.component.aws.ddb; -import static org.junit.Assert.assertEquals; - import java.util.HashMap; import java.util.Map; +import com.amazonaws.services.dynamodbv2.model.AttributeValue; +import com.amazonaws.services.dynamodbv2.model.ExpectedAttributeValue; + import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.impl.DefaultExchange; import org.junit.Before; import org.junit.Test; - -import com.amazonaws.services.dynamodbv2.model.AttributeValue; -import com.amazonaws.services.dynamodbv2.model.ExpectedAttributeValue; +import static org.junit.Assert.assertEquals; public class PutItemCommandTest { http://git-wip-us.apache.org/repos/asf/camel/blob/eb533c4d/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/QueryCommandTest.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/QueryCommandTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/QueryCommandTest.java index d266b89..97e5897 100644 --- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/QueryCommandTest.java +++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/QueryCommandTest.java @@ -16,24 +16,22 @@ */ package org.apache.camel.component.aws.ddb; -import static org.junit.Assert.assertEquals; - import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import com.amazonaws.services.dynamodbv2.model.AttributeValue; +import com.amazonaws.services.dynamodbv2.model.ComparisonOperator; +import com.amazonaws.services.dynamodbv2.model.Condition; +import com.amazonaws.services.dynamodbv2.model.ConsumedCapacity; + import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.impl.DefaultExchange; import org.junit.Before; import org.junit.Test; - -import com.amazonaws.services.dynamodbv2.model.AttributeValue; -import com.amazonaws.services.dynamodbv2.model.ComparisonOperator; -import com.amazonaws.services.dynamodbv2.model.Condition; -import com.amazonaws.services.dynamodbv2.model.ConsumedCapacity; -import com.amazonaws.services.dynamodbv2.model.KeySchemaElement; +import static org.junit.Assert.assertEquals; public class QueryCommandTest { @@ -54,8 +52,8 @@ public class QueryCommandTest { @Test public void execute() { - Map<String,AttributeValue> startKey = new HashMap<String, AttributeValue>(); - startKey.put("1", new AttributeValue("startKey")); + Map<String, AttributeValue> startKey = new HashMap<String, AttributeValue>(); + startKey.put("1", new AttributeValue("startKey")); List<String> attributeNames = Arrays.asList("attrNameOne", "attrNameTwo"); exchange.getIn().setHeader(DdbConstants.ATTRIBUTE_NAMES, attributeNames); @@ -66,8 +64,8 @@ public class QueryCommandTest { Map<String, Condition> keyConditions = new HashMap<String, Condition>(); Condition condition = new Condition() - .withComparisonOperator(ComparisonOperator.GT.toString()) - .withAttributeValueList(new AttributeValue().withN("1985")); + .withComparisonOperator(ComparisonOperator.GT.toString()) + .withAttributeValueList(new AttributeValue().withN("1985")); keyConditions.put("1", condition); @@ -75,9 +73,9 @@ public class QueryCommandTest { command.execute(); - Map<String,AttributeValue> mapAssert = new HashMap<String, AttributeValue>(); - mapAssert.put("1", new AttributeValue("LAST_KEY")); - ConsumedCapacity consumed = (ConsumedCapacity) exchange.getIn().getHeader(DdbConstants.CONSUMED_CAPACITY); + Map<String, AttributeValue> mapAssert = new HashMap<String, AttributeValue>(); + mapAssert.put("1", new AttributeValue("LAST_KEY")); + ConsumedCapacity consumed = (ConsumedCapacity) exchange.getIn().getHeader(DdbConstants.CONSUMED_CAPACITY); assertEquals(Integer.valueOf(1), exchange.getIn().getHeader(DdbConstants.COUNT, Integer.class)); assertEquals(Double.valueOf(1.0), consumed.getCapacityUnits()); assertEquals(mapAssert, exchange.getIn().getHeader(DdbConstants.LAST_EVALUATED_KEY, Map.class)); http://git-wip-us.apache.org/repos/asf/camel/blob/eb533c4d/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/ScanCommandTest.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/ScanCommandTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/ScanCommandTest.java index d08af2a..9bcfc6a 100644 --- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/ScanCommandTest.java +++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/ScanCommandTest.java @@ -16,22 +16,21 @@ */ package org.apache.camel.component.aws.ddb; -import static org.junit.Assert.assertEquals; - import java.util.HashMap; import java.util.List; import java.util.Map; +import com.amazonaws.services.dynamodbv2.model.AttributeValue; +import com.amazonaws.services.dynamodbv2.model.ComparisonOperator; +import com.amazonaws.services.dynamodbv2.model.Condition; +import com.amazonaws.services.dynamodbv2.model.ConsumedCapacity; + import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.impl.DefaultExchange; import org.junit.Before; import org.junit.Test; - -import com.amazonaws.services.dynamodbv2.model.AttributeValue; -import com.amazonaws.services.dynamodbv2.model.ComparisonOperator; -import com.amazonaws.services.dynamodbv2.model.Condition; -import com.amazonaws.services.dynamodbv2.model.ConsumedCapacity; +import static org.junit.Assert.assertEquals; public class ScanCommandTest { @@ -60,10 +59,10 @@ public class ScanCommandTest { command.execute(); - Map<String,AttributeValue> mapAssert = new HashMap<String, AttributeValue>(); - mapAssert.put("1", new AttributeValue("LAST_KEY")); - - ConsumedCapacity consumed = (ConsumedCapacity) exchange.getIn().getHeader(DdbConstants.CONSUMED_CAPACITY); + Map<String, AttributeValue> mapAssert = new HashMap<String, AttributeValue>(); + mapAssert.put("1", new AttributeValue("LAST_KEY")); + + ConsumedCapacity consumed = (ConsumedCapacity) exchange.getIn().getHeader(DdbConstants.CONSUMED_CAPACITY); assertEquals(scanFilter, ddbClient.scanRequest.getScanFilter()); assertEquals(Integer.valueOf(10), exchange.getIn().getHeader(DdbConstants.SCANNED_COUNT, Integer.class)); assertEquals(Integer.valueOf(1), exchange.getIn().getHeader(DdbConstants.COUNT, Integer.class)); http://git-wip-us.apache.org/repos/asf/camel/blob/eb533c4d/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/UpdateItemCommandTest.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/UpdateItemCommandTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/UpdateItemCommandTest.java index 001e720..5f2f0e5 100644 --- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/UpdateItemCommandTest.java +++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/UpdateItemCommandTest.java @@ -16,21 +16,20 @@ */ package org.apache.camel.component.aws.ddb; -import static org.junit.Assert.assertEquals; - import java.util.HashMap; import java.util.Map; +import com.amazonaws.services.dynamodbv2.model.AttributeAction; +import com.amazonaws.services.dynamodbv2.model.AttributeValue; +import com.amazonaws.services.dynamodbv2.model.AttributeValueUpdate; +import com.amazonaws.services.dynamodbv2.model.ExpectedAttributeValue; + import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.impl.DefaultExchange; import org.junit.Before; import org.junit.Test; - -import com.amazonaws.services.dynamodbv2.model.AttributeAction; -import com.amazonaws.services.dynamodbv2.model.AttributeValue; -import com.amazonaws.services.dynamodbv2.model.AttributeValueUpdate; -import com.amazonaws.services.dynamodbv2.model.ExpectedAttributeValue; +import static org.junit.Assert.assertEquals; public class UpdateItemCommandTest { @@ -50,8 +49,8 @@ public class UpdateItemCommandTest { @Test public void execute() { - Map<String,AttributeValue> key = new HashMap<String, AttributeValue>(); - key.put("1", new AttributeValue("Key_1")); + Map<String, AttributeValue> key = new HashMap<String, AttributeValue>(); + key.put("1", new AttributeValue("Key_1")); exchange.getIn().setHeader(DdbConstants.KEY, key); Map<String, AttributeValueUpdate> attributeMap = new HashMap<String, AttributeValueUpdate>(); http://git-wip-us.apache.org/repos/asf/camel/blob/eb533c4d/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/integration/DdbComponentIntegrationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/integration/DdbComponentIntegrationTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/integration/DdbComponentIntegrationTest.java index 9d2bbb7..0c485fc 100644 --- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/integration/DdbComponentIntegrationTest.java +++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/integration/DdbComponentIntegrationTest.java @@ -20,6 +20,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.amazonaws.services.dynamodbv2.model.AttributeValue; + import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; import org.apache.camel.Processor; @@ -31,8 +33,6 @@ import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Ignore; import org.junit.Test; -import com.amazonaws.services.dynamodbv2.model.AttributeValue; - @Ignore("Must be manually tested. Provide your own accessKey and secretKey!") public class DdbComponentIntegrationTest extends CamelTestSupport {
