Fixed CS. This closes #970
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/50d029ae Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/50d029ae Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/50d029ae Branch: refs/heads/master Commit: 50d029ae217d8a46e07fe24a3f1e5780f5111e81 Parents: 84fbf55 Author: Claus Ibsen <davscl...@apache.org> Authored: Sun May 1 07:44:32 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun May 1 07:44:32 2016 +0200 ---------------------------------------------------------------------- .../apache/camel/component/aws/ddb/AbstractDdbCommand.java | 9 ++------- .../camel/component/aws/ddb/BatchGetItemsCommand.java | 1 + .../apache/camel/component/aws/ddb/DeleteItemCommand.java | 1 + .../apache/camel/component/aws/ddb/DeleteTableCommand.java | 8 ++++---- .../camel/component/aws/ddb/DescribeTableCommand.java | 1 + .../org/apache/camel/component/aws/ddb/GetItemCommand.java | 1 + .../org/apache/camel/component/aws/ddb/PutItemCommand.java | 1 + .../org/apache/camel/component/aws/ddb/QueryCommand.java | 1 + .../org/apache/camel/component/aws/ddb/ScanCommand.java | 1 + .../apache/camel/component/aws/ddb/UpdateItemCommand.java | 1 + .../apache/camel/component/aws/ddb/UpdateTableCommand.java | 1 + 11 files changed, 15 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/50d029ae/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 6ea5bd7..a435c57 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 @@ -22,7 +22,6 @@ import java.util.Map; 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; import org.apache.camel.component.aws.common.AwsExchangeUtil; @@ -40,7 +39,6 @@ public abstract class AbstractDdbCommand { this.exchange = exchange; } - public abstract void execute(); protected Message getMessageForResponse(Exchange exchange) { @@ -73,15 +71,12 @@ public abstract class AbstractDdbCommand { protected void addToResults(Map<String, Object> map) { Message msg = getMessageForResponse(exchange); - for(Map.Entry<String,Object> en : map.entrySet()){ + for (Map.Entry<String, Object> en : map.entrySet()) { msg.setHeader(en.getKey(), en.getValue()); } } - protected void addToResult(String headerKey, Object value) { - Message msg = getMessageForResponse(exchange); - msg.setHeader(headerKey, value); - } + @SuppressWarnings("unchecked") protected Map<String, AttributeValue> determineKey() { return exchange.getIn().getHeader(DdbConstants.KEY, Map.class); } http://git-wip-us.apache.org/repos/asf/camel/blob/50d029ae/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 8e3cf36..7973a59 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 @@ -27,6 +27,7 @@ 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/50d029ae/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 9952d92..a79d6a4 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 @@ -23,6 +23,7 @@ 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/50d029ae/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 a2d5faa..bc1599c 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,16 +16,16 @@ */ package org.apache.camel.component.aws.ddb; +import java.util.HashMap; +import java.util.Map; + 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; -import java.util.HashMap; -import java.util.Map; - public class DeleteTableCommand extends AbstractDdbCommand { + public DeleteTableCommand(AmazonDynamoDB ddbClient, DdbConfiguration configuration, Exchange exchange) { super(ddbClient, configuration, exchange); http://git-wip-us.apache.org/repos/asf/camel/blob/50d029ae/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 d010f29..dc20f38 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 @@ -24,6 +24,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; public class DescribeTableCommand extends AbstractDdbCommand { + public DescribeTableCommand(AmazonDynamoDB ddbClient, DdbConfiguration configuration, Exchange exchange) { super(ddbClient, configuration, exchange); http://git-wip-us.apache.org/repos/asf/camel/blob/50d029ae/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 8615c65..8057456 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 @@ -23,6 +23,7 @@ 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/50d029ae/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 e0050a6..a91bd08 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 @@ -23,6 +23,7 @@ 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/50d029ae/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 5651dac..8719bfe 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 @@ -27,6 +27,7 @@ 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/50d029ae/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 cafc60e..55655dc 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 @@ -27,6 +27,7 @@ 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/50d029ae/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 8538f59..91ccfbf 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 @@ -26,6 +26,7 @@ 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/50d029ae/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 e373a08..4c724c8 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 @@ -23,6 +23,7 @@ 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); }
