You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/03/17 12:02:24 UTC
[camel] branch master updated (44de364 -> 11c4e95)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 44de364 Camel-AWS2-CW: Fixed CS
new 7bc1d12 Camel-AWS2-DDB: Cleanup
new cae8d23 Camel-AWS2-DDB: Cleanup
new 11c4e95 Camel-AWS2-DDB: Fixed CS
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/camel/component/aws2/ddb/AbstractDdbCommand.java | 6 +++---
.../org/apache/camel/component/aws2/ddb/BatchGetItemsCommand.java | 2 +-
.../org/apache/camel/component/aws2/ddb/DeleteTableCommand.java | 3 +--
.../java/org/apache/camel/component/aws2/ddb/QueryCommand.java | 7 +++++--
.../main/java/org/apache/camel/component/aws2/ddb/ScanCommand.java | 2 +-
.../apache/camel/component/aws2/ddb/BatchGetItemsCommandTest.java | 1 +
.../camel/component/aws2/ddb/DdbComponentRegistryClientTest.java | 2 +-
.../aws2/ddb/integration/DdbComponentIntegrationTest.java | 2 +-
8 files changed, 14 insertions(+), 11 deletions(-)
[camel] 02/03: Camel-AWS2-DDB: Cleanup
Posted by ac...@apache.org.
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 cae8d237728865746ae40da1acc2c5f581ca8f5c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 17 12:53:33 2020 +0100
Camel-AWS2-DDB: Cleanup
---
.../org/apache/camel/component/aws2/ddb/BatchGetItemsCommandTest.java | 3 ++-
.../camel/component/aws2/ddb/DdbComponentRegistryClientTest.java | 2 +-
.../component/aws2/ddb/integration/DdbComponentIntegrationTest.java | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/BatchGetItemsCommandTest.java b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/BatchGetItemsCommandTest.java
index 3143725..5fc8755 100644
--- a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/BatchGetItemsCommandTest.java
+++ b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/BatchGetItemsCommandTest.java
@@ -45,7 +45,8 @@ public class BatchGetItemsCommandTest {
command = new BatchGetItemsCommand(ddbClient, configuration, exchange);
}
- @Test
+ @SuppressWarnings("unchecked")
+ @Test
public void execute() {
Map<String, AttributeValue> key = new HashMap<>();
key.put("1", AttributeValue.builder().s("Key_1").build());
diff --git a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentRegistryClientTest.java b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentRegistryClientTest.java
index d593e08..9210038 100644
--- a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentRegistryClientTest.java
+++ b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentRegistryClientTest.java
@@ -38,7 +38,7 @@ public class DdbComponentRegistryClientTest extends CamelTestSupport {
public void createEndpointWithoutRegistryClient() throws Exception {
Ddb2Component component = context.getComponent("aws2-ddb", Ddb2Component.class);
assertThrows(IllegalArgumentException.class, () -> {
- Ddb2Endpoint endpoint = (Ddb2Endpoint)component.createEndpoint("aws2-ddb://myTable");
+ component.createEndpoint("aws2-ddb://myTable");
});
}
}
diff --git a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/integration/DdbComponentIntegrationTest.java b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/integration/DdbComponentIntegrationTest.java
index a198e47..d6a7f93 100644
--- a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/integration/DdbComponentIntegrationTest.java
+++ b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/integration/DdbComponentIntegrationTest.java
@@ -122,7 +122,7 @@ public class DdbComponentIntegrationTest extends CamelTestSupport {
Map<String, AttributeValue> key = new HashMap<>();
key.put(attributeName, AttributeValue.builder().n(randomId).build());
- Exchange exchange = template.send("direct:start", new Processor() {
+ template.send("direct:start", new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setHeader(Ddb2Constants.KEY, key);
exchange.getIn().setHeader(Ddb2Constants.RETURN_VALUES, "ALL_OLD");
[camel] 01/03: Camel-AWS2-DDB: Cleanup
Posted by ac...@apache.org.
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 7bc1d123c11bf4e9c5e2f949eab3b788a70c9cd8
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 17 12:51:06 2020 +0100
Camel-AWS2-DDB: Cleanup
---
.../org/apache/camel/component/aws2/ddb/AbstractDdbCommand.java | 6 +++---
.../apache/camel/component/aws2/ddb/BatchGetItemsCommand.java | 2 +-
.../org/apache/camel/component/aws2/ddb/DeleteTableCommand.java | 3 +--
.../java/org/apache/camel/component/aws2/ddb/QueryCommand.java | 9 ++++++---
.../java/org/apache/camel/component/aws2/ddb/ScanCommand.java | 2 +-
5 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/AbstractDdbCommand.java b/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/AbstractDdbCommand.java
index 620dda7..6a243c2 100644
--- a/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/AbstractDdbCommand.java
+++ b/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/AbstractDdbCommand.java
@@ -67,10 +67,10 @@ public abstract class AbstractDdbCommand {
msg.setHeader(Ddb2Constants.ATTRIBUTES, attributes);
}
- protected void addToResults(Map<String, Object> map) {
+ protected void addToResults(Map<Object, Object> map) {
Message msg = getMessageForResponse(exchange);
- for (Map.Entry<String, Object> en : map.entrySet()) {
- msg.setHeader(en.getKey(), en.getValue());
+ for (Map.Entry<Object, Object> en : map.entrySet()) {
+ msg.setHeader((String) en.getKey(), en.getValue());
}
}
diff --git a/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/BatchGetItemsCommand.java b/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/BatchGetItemsCommand.java
index 792b032..ce610dc 100644
--- a/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/BatchGetItemsCommand.java
+++ b/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/BatchGetItemsCommand.java
@@ -35,7 +35,7 @@ public class BatchGetItemsCommand extends AbstractDdbCommand {
public void execute() {
BatchGetItemResponse result = ddbClient.batchGetItem(BatchGetItemRequest.builder().requestItems(determineBatchItems()).build());
- Map tmp = new HashMap<>();
+ HashMap<Object, Object> tmp = new HashMap<>();
tmp.put(Ddb2Constants.BATCH_RESPONSE, result.responses());
tmp.put(Ddb2Constants.UNPROCESSED_KEYS, result.unprocessedKeys());
addToResults(tmp);
diff --git a/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/DeleteTableCommand.java b/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/DeleteTableCommand.java
index 2a4af6c..1369e15 100644
--- a/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/DeleteTableCommand.java
+++ b/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/DeleteTableCommand.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.aws2.ddb;
import java.util.HashMap;
-import java.util.Map;
import org.apache.camel.Exchange;
import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
@@ -34,7 +33,7 @@ public class DeleteTableCommand extends AbstractDdbCommand {
public void execute() {
TableDescription tableDescription = ddbClient.deleteTable(DeleteTableRequest.builder().tableName(determineTableName()).build()).tableDescription();
- Map tmp = new HashMap<>();
+ HashMap<Object, Object> tmp = new HashMap<>();
tmp.put(Ddb2Constants.PROVISIONED_THROUGHPUT, tableDescription.provisionedThroughput());
tmp.put(Ddb2Constants.CREATION_DATE, tableDescription.creationDateTime());
tmp.put(Ddb2Constants.ITEM_COUNT, tableDescription.itemCount());
diff --git a/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/QueryCommand.java b/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/QueryCommand.java
index 2e9e18d..99d79a4 100644
--- a/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/QueryCommand.java
+++ b/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/QueryCommand.java
@@ -22,6 +22,7 @@ import java.util.Map;
import org.apache.camel.Exchange;
import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.Condition;
import software.amazon.awssdk.services.dynamodb.model.QueryRequest;
import software.amazon.awssdk.services.dynamodb.model.QueryResponse;
@@ -44,7 +45,7 @@ public class QueryCommand extends AbstractDdbCommand {
QueryResponse result = ddbClient.query(query.build());
- Map tmp = new HashMap<>();
+ Map<Object, Object> tmp = new HashMap<>();
tmp.put(Ddb2Constants.ITEMS, result.items());
tmp.put(Ddb2Constants.LAST_EVALUATED_KEY, result.lastEvaluatedKey());
tmp.put(Ddb2Constants.CONSUMED_CAPACITY, result.consumedCapacity());
@@ -52,7 +53,8 @@ public class QueryCommand extends AbstractDdbCommand {
addToResults(tmp);
}
- private Map<String, AttributeValue> determineStartKey() {
+ @SuppressWarnings("unchecked")
+ private Map<String, AttributeValue> determineStartKey() {
return exchange.getIn().getHeader(Ddb2Constants.START_KEY, Map.class);
}
@@ -60,7 +62,8 @@ public class QueryCommand extends AbstractDdbCommand {
return exchange.getIn().getHeader(Ddb2Constants.SCAN_INDEX_FORWARD, Boolean.class);
}
- private Map determineKeyConditions() {
+ @SuppressWarnings("unchecked")
+ private Map<String, Condition> determineKeyConditions() {
return exchange.getIn().getHeader(Ddb2Constants.KEY_CONDITIONS, Map.class);
}
}
diff --git a/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/ScanCommand.java b/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/ScanCommand.java
index 99af381..c691058 100644
--- a/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/ScanCommand.java
+++ b/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/ScanCommand.java
@@ -36,7 +36,7 @@ public class ScanCommand extends AbstractDdbCommand {
ScanResponse result = ddbClient.scan(ScanRequest.builder().tableName(determineTableName()).limit(determineLimit()).exclusiveStartKey(determineExclusiveStartKey())
.scanFilter(determineScanFilter()).build());
- Map tmp = new HashMap<>();
+ Map<Object, Object> tmp = new HashMap<>();
tmp.put(Ddb2Constants.ITEMS, result.items());
tmp.put(Ddb2Constants.LAST_EVALUATED_KEY, result.lastEvaluatedKey());
tmp.put(Ddb2Constants.CONSUMED_CAPACITY, result.consumedCapacity());
[camel] 03/03: Camel-AWS2-DDB: Fixed CS
Posted by ac...@apache.org.
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 11c4e95cd436aeac5511e056604c2132e6eb251c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 17 13:01:49 2020 +0100
Camel-AWS2-DDB: Fixed CS
---
.../main/java/org/apache/camel/component/aws2/ddb/QueryCommand.java | 4 ++--
.../org/apache/camel/component/aws2/ddb/BatchGetItemsCommandTest.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/QueryCommand.java b/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/QueryCommand.java
index 99d79a4..a6224f3 100644
--- a/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/QueryCommand.java
+++ b/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/QueryCommand.java
@@ -54,7 +54,7 @@ public class QueryCommand extends AbstractDdbCommand {
}
@SuppressWarnings("unchecked")
- private Map<String, AttributeValue> determineStartKey() {
+ private Map<String, AttributeValue> determineStartKey() {
return exchange.getIn().getHeader(Ddb2Constants.START_KEY, Map.class);
}
@@ -63,7 +63,7 @@ public class QueryCommand extends AbstractDdbCommand {
}
@SuppressWarnings("unchecked")
- private Map<String, Condition> determineKeyConditions() {
+ private Map<String, Condition> determineKeyConditions() {
return exchange.getIn().getHeader(Ddb2Constants.KEY_CONDITIONS, Map.class);
}
}
diff --git a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/BatchGetItemsCommandTest.java b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/BatchGetItemsCommandTest.java
index 5fc8755..e556ee0 100644
--- a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/BatchGetItemsCommandTest.java
+++ b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/BatchGetItemsCommandTest.java
@@ -46,7 +46,7 @@ public class BatchGetItemsCommandTest {
}
@SuppressWarnings("unchecked")
- @Test
+ @Test
public void execute() {
Map<String, AttributeValue> key = new HashMap<>();
key.put("1", AttributeValue.builder().s("Key_1").build());