Skip to content

Returning correct operation name for DeleteTableOperation #6792

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

Open
andreas-grafenberger wants to merge 1 commit into
base: master
Choose a base branch
from
+52 −8
Open

Returning correct operation name for DeleteTableOperation #6792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions .changes/next-release/bugfix-AmazonDynamoDBEnhancedClient-d29ad20.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"type": "bugfix",
"category": "Amazon DynamoDB Enhanced Client",
"contributor": "",
"description": "Returning correct operation name for DeleteTableOperation"
}
2 changes: 1 addition & 1 deletion ...va/software/amazon/awssdk/enhanced/dynamodb/internal/operations/DeleteTableOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public static <T> DeleteTableOperation<T> create() {

@Override
public OperationName operationName() {
return OperationName.DELETE_ITEM;
return OperationName.DELETE_TABLE;
}

@Override
Expand Down
52 changes: 45 additions & 7 deletions ...oftware/amazon/awssdk/enhanced/dynamodb/internal/operations/DeleteTableOperationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@

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

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.mockito.ArgumentMatchers.same;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import java.util.concurrent.CompletableFuture;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
Expand All @@ -24,14 +31,10 @@
import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithIndices;
import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithSort;
import software.amazon.awssdk.enhanced.dynamodb.model.CreateTableEnhancedRequest;
import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.mockito.ArgumentMatchers.same;
import static org.mockito.Mockito.verify;
import software.amazon.awssdk.services.dynamodb.model.DeleteTableResponse;

@RunWith(MockitoJUnitRunner.class)
public class DeleteTableOperationTest {
Expand All @@ -46,6 +49,14 @@ public class DeleteTableOperationTest {
@Mock
private DynamoDbClient mockDynamoDbClient;

@Mock
private DynamoDbAsyncClient mockDynamoDbAsyncClient;

@Test
public void operationName_returnsDeleteTable() {
DeleteTableOperation<FakeItem> operation = DeleteTableOperation.create();
assertThat(operation.operationName(), is(OperationName.DELETE_TABLE));
}

@Test
public void getServiceCall_makesTheRightCall() {
Expand All @@ -55,11 +66,26 @@ public void getServiceCall_makesTheRightCall() {
verify(mockDynamoDbClient).deleteTable(same(deleteTableRequest));
}

@Test
public void getAsyncServiceCall_makesTheRightCallAndReturnsResponse() {
DeleteTableOperation<FakeItem> operation = DeleteTableOperation.create();
DeleteTableRequest deleteTableRequest = DeleteTableRequest.builder().build();
CompletableFuture<DeleteTableResponse> expectedResponse =
CompletableFuture.completedFuture(DeleteTableResponse.builder().build());

when(mockDynamoDbAsyncClient.deleteTable(same(deleteTableRequest))).thenReturn(expectedResponse);

CompletableFuture<DeleteTableResponse> response = operation.asyncServiceCall(mockDynamoDbAsyncClient)
.apply(deleteTableRequest);

assertThat(response, is(expectedResponse));
verify(mockDynamoDbAsyncClient).deleteTable(same(deleteTableRequest));
}

@Test
public void generateRequest_from_deleteTableOperation() {
DeleteTableOperation<FakeItemWithSort> deleteTableOperation = DeleteTableOperation.create();
final DeleteTableRequest deleteTableRequest = deleteTableOperation
DeleteTableRequest deleteTableRequest = deleteTableOperation
.generateRequest(FakeItemWithSort.getTableSchema(),
PRIMARY_CONTEXT,
null);
Expand All @@ -72,4 +98,16 @@ public void generateRequest_doesNotWorkForIndex() {
operation.generateRequest(FakeItemWithIndices.getTableSchema(), GSI_1_CONTEXT, null);
}

@Test
public void transformResponse_returnsNull() {
DeleteTableOperation<FakeItem> operation = DeleteTableOperation.create();

Void response = operation.transformResponse(DeleteTableResponse.builder().build(),
FakeItem.getTableSchema(),
PRIMARY_CONTEXT,
null);

assertThat(response, is((Void) null));
}

}