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 2021/04/09 13:12:43 UTC
[camel] branch master updated (1f54db2 -> 575d69d)
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 1f54db2 Regen for commit 80f0e28f6e76dc7e76824c1a3ca617de489d7202
new d721270 Camel-AWS2-DDB: Added a PutItem IT Test
new 575d69d Camel-AWS2-DDB: Added an update item IT Test
The 2 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:
.../camel/component/aws2/ddb/Ddb2Endpoint.java | 8 +-
.../aws2/ddb/localstack/AWS2PutItemRuleIT.java | 76 ++++++++++++++++++
.../AWS2UpdateItemRuleIT.java} | 93 +++++++---------------
3 files changed, 111 insertions(+), 66 deletions(-)
create mode 100644 components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/localstack/AWS2PutItemRuleIT.java
copy components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/{integration/DdbComponentIntegrationTest.java => localstack/AWS2UpdateItemRuleIT.java} (53%)
[camel] 01/02: Camel-AWS2-DDB: Added a PutItem IT Test
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 d721270406e14a9d3228e0f447f4d41381358774
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Apr 9 15:11:23 2021 +0200
Camel-AWS2-DDB: Added a PutItem IT Test
---
.../camel/component/aws2/ddb/Ddb2Endpoint.java | 8 ++-
.../aws2/ddb/localstack/AWS2PutItemRuleIT.java | 76 ++++++++++++++++++++++
2 files changed, 83 insertions(+), 1 deletion(-)
diff --git a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/Ddb2Endpoint.java b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/Ddb2Endpoint.java
index 1828ee9..dcc63db 100644
--- a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/Ddb2Endpoint.java
+++ b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/Ddb2Endpoint.java
@@ -39,11 +39,13 @@ import software.amazon.awssdk.http.apache.ProxyConfiguration;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
import software.amazon.awssdk.services.dynamodb.DynamoDbClientBuilder;
+import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition;
import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
import software.amazon.awssdk.services.dynamodb.model.DescribeTableRequest;
import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement;
import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
import software.amazon.awssdk.services.dynamodb.model.ResourceNotFoundException;
+import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
import software.amazon.awssdk.services.dynamodb.model.TableDescription;
import software.amazon.awssdk.services.dynamodb.model.TableStatus;
import software.amazon.awssdk.utils.AttributeMap;
@@ -122,7 +124,11 @@ public class Ddb2Endpoint extends ScheduledPollEndpoint {
.keySchema(KeySchemaElement.builder().attributeName(configuration.getKeyAttributeName())
.keyType(configuration.getKeyAttributeType()).build())
.provisionedThroughput(ProvisionedThroughput.builder().readCapacityUnits(configuration.getReadCapacity())
- .writeCapacityUnits(configuration.getWriteCapacity()).build());
+ .writeCapacityUnits(configuration.getWriteCapacity()).build())
+ .attributeDefinitions(AttributeDefinition.builder()
+ .attributeName(configuration.getKeyAttributeName())
+ .attributeType(ScalarAttributeType.S)
+ .build());
return getDdbClient().createTable(createTableRequest.build()).tableDescription();
}
diff --git a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/localstack/AWS2PutItemRuleIT.java b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/localstack/AWS2PutItemRuleIT.java
new file mode 100644
index 0000000..f12f499
--- /dev/null
+++ b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/localstack/AWS2PutItemRuleIT.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.aws2.ddb.localstack;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.EndpointInject;
+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.ddb.Ddb2Constants;
+import org.apache.camel.component.aws2.ddb.Ddb2Operations;
+import org.junit.jupiter.api.Test;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.KeyType;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class AWS2PutItemRuleIT extends Aws2DDBBase {
+
+ @EndpointInject("direct:start")
+ private ProducerTemplate template;
+
+ private final String attributeName = "clave";
+ private final String tableName = "TestTable";
+
+ private final String randomId = String.valueOf(System.currentTimeMillis());
+
+ @Test
+ public void putItem() {
+ final Map<String, AttributeValue> attributeMap = new HashMap<>();
+ AttributeValue attributeValue = AttributeValue.builder().s("hello").build();
+ attributeMap.put(attributeName, attributeValue);
+ attributeMap.put("secondary_attribute", AttributeValue.builder().s("value").build());
+
+ Exchange exchange = template.send("direct:start", new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setHeader(Ddb2Constants.OPERATION, Ddb2Operations.PutItem);
+ exchange.getIn().setHeader(Ddb2Constants.CONSISTENT_READ, "true");
+ exchange.getIn().setHeader(Ddb2Constants.RETURN_VALUES, "ALL_OLD");
+ exchange.getIn().setHeader(Ddb2Constants.ITEM, attributeMap);
+ exchange.getIn().setHeader(Ddb2Constants.ATTRIBUTE_NAMES, attributeMap.keySet());
+ }
+ });
+
+ assertNotNull(exchange.getIn().getHeader(Ddb2Constants.ITEM));
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start").to(
+ "aws2-ddb://" + tableName + "?keyAttributeName=" + attributeName + "&keyAttributeType=" + KeyType.HASH
+ + "&readCapacity=1&writeCapacity=1");
+ }
+ };
+ }
+}
[camel] 02/02: Camel-AWS2-DDB: Added an update item IT Test
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 575d69d2cda30026c76796223072474ac02eeb83
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Apr 9 15:11:43 2021 +0200
Camel-AWS2-DDB: Added an update item IT Test
---
.../aws2/ddb/localstack/AWS2UpdateItemRuleIT.java | 110 +++++++++++++++++++++
1 file changed, 110 insertions(+)
diff --git a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/localstack/AWS2UpdateItemRuleIT.java b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/localstack/AWS2UpdateItemRuleIT.java
new file mode 100644
index 0000000..80309e2
--- /dev/null
+++ b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/localstack/AWS2UpdateItemRuleIT.java
@@ -0,0 +1,110 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.aws2.ddb.localstack;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.EndpointInject;
+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.ddb.Ddb2Constants;
+import org.apache.camel.component.aws2.ddb.Ddb2Operations;
+import org.junit.jupiter.api.Test;
+import software.amazon.awssdk.services.dynamodb.model.AttributeAction;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValueUpdate;
+import software.amazon.awssdk.services.dynamodb.model.ComparisonOperator;
+import software.amazon.awssdk.services.dynamodb.model.ExpectedAttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.KeyType;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class AWS2UpdateItemRuleIT extends Aws2DDBBase {
+
+ @EndpointInject("direct:start")
+ private ProducerTemplate template;
+
+ private final String attributeName = "clave";
+ private final String tableName = "TestTable";
+
+ private final String randomId = String.valueOf(System.currentTimeMillis());
+
+ @Test
+ public void putItem() {
+ final Map<String, AttributeValue> attributeMap = new HashMap<>();
+ AttributeValue attributeValue = AttributeValue.builder().s("hello").build();
+ attributeMap.put(attributeName, attributeValue);
+ attributeMap.put("secondary_attribute", AttributeValue.builder().s("value").build());
+
+ Exchange exchange = template.send("direct:start", new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setHeader(Ddb2Constants.OPERATION, Ddb2Operations.PutItem);
+ exchange.getIn().setHeader(Ddb2Constants.CONSISTENT_READ, "true");
+ exchange.getIn().setHeader(Ddb2Constants.RETURN_VALUES, "ALL_OLD");
+ exchange.getIn().setHeader(Ddb2Constants.ITEM, attributeMap);
+ exchange.getIn().setHeader(Ddb2Constants.ATTRIBUTE_NAMES, attributeMap.keySet());
+ }
+ });
+
+ assertNotNull(exchange.getIn().getHeader(Ddb2Constants.ITEM));
+
+ HashMap<String, AttributeValue> itemKey = new HashMap<String, AttributeValue>();
+
+ itemKey.put(attributeName, AttributeValue.builder().s("hello").build());
+
+ Map<String, ExpectedAttributeValue> expectedAttributeValueMap = new HashMap<>();
+ expectedAttributeValueMap.put(attributeName,
+ ExpectedAttributeValue.builder().comparisonOperator(ComparisonOperator.EQ)
+ .attributeValueList(AttributeValue.builder().s("hello").build()).build());
+ HashMap<String, AttributeValueUpdate> attributeMapUpdated = new HashMap<String, AttributeValueUpdate>();
+
+ attributeMapUpdated.put("secondary_attribute", AttributeValueUpdate.builder()
+ .value(AttributeValue.builder().s("new").build())
+ .action(AttributeAction.PUT)
+ .build());
+
+ exchange = template.send("direct:start", new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setHeader(Ddb2Constants.KEY, itemKey);
+ exchange.getIn().setHeader(Ddb2Constants.UPDATE_VALUES, attributeMapUpdated);
+ exchange.getIn().setHeader(Ddb2Constants.RETURN_VALUES, "ALL_NEW");
+ exchange.getIn().setHeader(Ddb2Constants.OPERATION, Ddb2Operations.UpdateItem);
+ exchange.getIn().setHeader(Ddb2Constants.UPDATE_CONDITION, expectedAttributeValueMap);
+ }
+ });
+
+ assertNotNull(exchange.getIn().getHeader(Ddb2Constants.ATTRIBUTES));
+ Map<String, AttributeValue> attributes = exchange.getIn().getHeader(Ddb2Constants.ATTRIBUTES, Map.class);
+ assertEquals("new", attributes.get("secondary_attribute").s());
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start").to(
+ "aws2-ddb://" + tableName + "?keyAttributeName=" + attributeName + "&keyAttributeType=" + KeyType.HASH
+ + "&readCapacity=1&writeCapacity=1");
+ }
+ };
+ }
+}