Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
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"
}
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
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));
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
/*
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
* A copy of the License is located at
*
* http://aws.amazon.com/apache2.0
*
* or in the "license" file accompanying this file. This file 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 software.amazon.awssdk.enhanced.dynamodb.internal.operations;

import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;

import org.junit.Test;

public class OperationNameTest {

@Test
public void values_returnsExpectedConstantsInDeclarationOrder() {
assertArrayEquals(new OperationName[] {
OperationName.NONE,
OperationName.BATCH_GET_ITEM,
OperationName.BATCH_WRITE_ITEM,
OperationName.CREATE_TABLE,
OperationName.DELETE_ITEM,
OperationName.DELETE_TABLE,
OperationName.DESCRIBE_TABLE,
OperationName.GET_ITEM,
OperationName.QUERY,
OperationName.PUT_ITEM,
OperationName.SCAN,
OperationName.TRANSACT_GET_ITEMS,
OperationName.TRANSACT_WRITE_ITEMS,
OperationName.UPDATE_ITEM
}, OperationName.values());
}

@Test
public void label_returnsExpectedLabelForEachConstant() {
int operationNameCount = OperationName.values().length;
assertEquals(14, operationNameCount);

assertNull(OperationName.NONE.label());
assertEquals("BatchGetItem", OperationName.BATCH_GET_ITEM.label());
assertEquals("BatchWriteItem", OperationName.BATCH_WRITE_ITEM.label());
assertEquals("CreateTable", OperationName.CREATE_TABLE.label());
assertEquals("DeleteItem", OperationName.DELETE_ITEM.label());
assertEquals("DeleteTable", OperationName.DELETE_TABLE.label());
assertEquals("DescribeTable", OperationName.DESCRIBE_TABLE.label());
assertEquals("GetItem", OperationName.GET_ITEM.label());
assertEquals("Query", OperationName.QUERY.label());
assertEquals("PutItem", OperationName.PUT_ITEM.label());
assertEquals("Scan", OperationName.SCAN.label());
assertEquals("TransactGetItems", OperationName.TRANSACT_GET_ITEMS.label());
assertEquals("TransactWriteItems", OperationName.TRANSACT_WRITE_ITEMS.label());
assertEquals("UpdateItem", OperationName.UPDATE_ITEM.label());
}
}