Skip to content

DDB-Enhanced: Fixed NPE in DeleteItemOperation when ConditionExpressi… #1925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 24, 2020
Merged

DDB-Enhanced: Fixed NPE in DeleteItemOperation when ConditionExpressi… #1925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ed3bdf
DDB-Enhanced: Fixed NPE in DeleteItemOperation when ConditionExpressi…
bmaizels Jun 24, 2020
c48d473
Merge branch 'master' into bmaizels/ddbenhanced-deleteitem-npe-fix
bmaizels Jun 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changes/next-release/bugfix-AWSDynamoDBEnhancedClient-e497ad9.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"type": "bugfix",
"category": "AWS DynamoDB Enhanced Client",
"description": "Fixed a bug causing a NullPointerException to be thrown in the enhanced DeleteItem operation if a conditionExpression was given with null attributeNames or null attributeValues."
}
12 changes: 8 additions & 4 deletions ...ava/software/amazon/awssdk/enhanced/dynamodb/internal/operations/DeleteItemOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

package software.amazon.awssdk.enhanced.dynamodb.internal.operations;

import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.function.Function;
import software.amazon.awssdk.annotations.SdkInternalApi;
Expand All @@ -26,6 +27,7 @@
import software.amazon.awssdk.enhanced.dynamodb.model.DeleteItemEnhancedRequest;
import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
import software.amazon.awssdk.services.dynamodb.model.Delete;
import software.amazon.awssdk.services.dynamodb.model.DeleteItemRequest;
import software.amazon.awssdk.services.dynamodb.model.DeleteItemResponse;
Expand Down Expand Up @@ -123,14 +125,16 @@ public TransactWriteItem generateTransactWriteItem(TableSchema<T> tableSchema,
private DeleteItemRequest.Builder addExpressionsIfExist(DeleteItemRequest.Builder requestBuilder) {
if (this.request.conditionExpression() != null) {
requestBuilder = requestBuilder.conditionExpression(this.request.conditionExpression().expression());
Map<String, String> expressionNames = this.request.conditionExpression().expressionNames();
Map<String, AttributeValue> expressionValues = this.request.conditionExpression().expressionValues();

// Avoiding adding empty collections that the low level SDK will propagate to DynamoDb where it causes error.
if (!this.request.conditionExpression().expressionNames().isEmpty()) {
requestBuilder = requestBuilder.expressionAttributeNames(this.request.conditionExpression().expressionNames());
if (expressionNames != null && !expressionNames.isEmpty()) {
requestBuilder = requestBuilder.expressionAttributeNames(expressionNames);
}

if (!this.request.conditionExpression().expressionValues().isEmpty()) {
requestBuilder = requestBuilder.expressionAttributeValues(this.request.conditionExpression().expressionValues());
if (expressionValues != null && !expressionValues.isEmpty()) {
requestBuilder = requestBuilder.expressionAttributeValues(expressionValues);
}
}
return requestBuilder;
Expand Down
20 changes: 20 additions & 0 deletions ...software/amazon/awssdk/enhanced/dynamodb/internal/operations/DeleteItemOperationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

package software.amazon.awssdk.enhanced.dynamodb.internal.operations;

import static java.util.Collections.emptyMap;
import static java.util.Collections.singletonList;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
Expand Down Expand Up @@ -65,6 +66,7 @@ public class DeleteItemOperationTest {
private static final OperationContext GSI_1_CONTEXT =
DefaultOperationContext.create(TABLE_NAME, "gsi_1");
private static final Expression CONDITION_EXPRESSION;
private static final Expression MINIMAL_CONDITION_EXPRESSION = Expression.builder().expression("foo = bar").build();

static {
Map<String, String> expressionNames = new HashMap<>();
Expand Down Expand Up @@ -162,6 +164,24 @@ public void generateRequest_withConditionExpression() {
assertThat(request.expressionAttributeValues(), is(CONDITION_EXPRESSION.expressionValues()));
}

@Test
public void generateRequest_withMinimalConditionExpression() {
FakeItem keyItem = createUniqueFakeItem();
DeleteItemOperation<FakeItem> deleteItemOperation =
DeleteItemOperation.create(DeleteItemEnhancedRequest.builder()
.key(k -> k.partitionValue(keyItem.getId()))
.conditionExpression(MINIMAL_CONDITION_EXPRESSION)
.build());

DeleteItemRequest request = deleteItemOperation.generateRequest(FakeItem.getTableSchema(),
PRIMARY_CONTEXT,
null);

assertThat(request.conditionExpression(), is(MINIMAL_CONDITION_EXPRESSION.expression()));
assertThat(request.expressionAttributeNames(), is(emptyMap()));
assertThat(request.expressionAttributeValues(), is(emptyMap()));
}

@Test(expected = IllegalArgumentException.class)
public void generateRequest_noPartitionKey_throwsIllegalArgumentException() {
DeleteItemOperation<FakeItemComposedClass> deleteItemOperation =
Expand Down
20 changes: 20 additions & 0 deletions ...va/software/amazon/awssdk/enhanced/dynamodb/internal/operations/PutItemOperationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

package software.amazon.awssdk.enhanced.dynamodb.internal.operations;

import static java.util.Collections.emptyMap;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
Expand Down Expand Up @@ -61,6 +62,7 @@ public class PutItemOperationTest {
DefaultOperationContext.create(TABLE_NAME, "gsi_1");
private static final Expression CONDITION_EXPRESSION;
private static final Expression CONDITION_EXPRESSION_2;
private static final Expression MINIMAL_CONDITION_EXPRESSION = Expression.builder().expression("foo = bar").build();

static {
Map<String, String> expressionNames = new HashMap<>();
Expand Down Expand Up @@ -166,6 +168,24 @@ public void generateRequest_withConditionExpression_generatesCorrectRequest() {
assertThat(request, is(expectedRequest));
}

@Test
public void generateRequest_withMinimalConditionExpression() {
FakeItem fakeItem = createUniqueFakeItem();
PutItemOperation<FakeItem> putItemOperation =
PutItemOperation.create(PutItemEnhancedRequest.builder(FakeItem.class)
.item(fakeItem)
.conditionExpression(MINIMAL_CONDITION_EXPRESSION)
.build());

PutItemRequest request = putItemOperation.generateRequest(FakeItem.getTableSchema(),
PRIMARY_CONTEXT,
null);

assertThat(request.conditionExpression(), is(MINIMAL_CONDITION_EXPRESSION.expression()));
assertThat(request.expressionAttributeNames(), is(emptyMap()));
assertThat(request.expressionAttributeValues(), is(emptyMap()));
}

@Test
public void generateRequest_withConditionExpression_andExtensionWithSingleCondition() {
FakeItem baseFakeItem = createUniqueFakeItem();
Expand Down
27 changes: 27 additions & 0 deletions ...software/amazon/awssdk/enhanced/dynamodb/internal/operations/UpdateItemOperationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ public class UpdateItemOperationTest {
private static final OperationContext GSI_1_CONTEXT =
DefaultOperationContext.create(TABLE_NAME, "gsi_1");
private static final Expression CONDITION_EXPRESSION;
private static final Expression MINIMAL_CONDITION_EXPRESSION = Expression.builder().expression("foo = bar").build();


static {
Map<String, String> expressionNames = new HashMap<>();
Expand Down Expand Up @@ -190,6 +192,31 @@ public void generateRequest_withConditionExpression() {
assertThat(request, is(expectedRequest));
}

@Test
public void generateRequest_withMinimalConditionExpression() {
FakeItemWithSort item = createUniqueFakeItemWithSort();
item.setOtherAttribute1("value-1");

UpdateItemOperation<FakeItemWithSort> updateItemOperation =
UpdateItemOperation.create(UpdateItemEnhancedRequest.builder(FakeItemWithSort.class)
.item(item)
.conditionExpression(MINIMAL_CONDITION_EXPRESSION)
.build());

UpdateItemRequest request = updateItemOperation.generateRequest(FakeItemWithSort.getTableSchema(),
PRIMARY_CONTEXT,
null);

Map<String, AttributeValue> expectedValues = new HashMap<>();
expectedValues.put(OTHER_ATTRIBUTE_1_VALUE, AttributeValue.builder().s("value-1").build());
Map<String, String> expectedNames = new HashMap<>();
expectedNames.put(OTHER_ATTRIBUTE_1_NAME, "other_attribute_1");
expectedNames.put(OTHER_ATTRIBUTE_2_NAME, "other_attribute_2");
assertThat(request.conditionExpression(), is(MINIMAL_CONDITION_EXPRESSION.expression()));
assertThat(request.expressionAttributeNames(), is(expectedNames));
assertThat(request.expressionAttributeValues(), is(expectedValues));
}

@Test
public void generateRequest_explicitlyUnsetIgnoreNulls() {
FakeItemWithSort item = createUniqueFakeItemWithSort();
Expand Down