Skip to content

Commit a802297

Browse files
roamarieiroamariei
committed
Made DefaultSdkAutoConstructList and DefaultSdkAutoConstructMap serializable
1 parent b2fe89e commit a802297

File tree

5 files changed

+151
-47
lines changed

5 files changed

+151
-47
lines changed

‎.changes/next-release/bugfix-AmazonDynamoDBEnhancedClient-bd68809.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"type": "bugfix",
3+
"category": "Amazon DynamoDB Enhanced Client",
4+
"contributor": "",
5+
"description": "Fixed DynamoDbEnhancedClient DefaultDynamoDbAsyncTable::createTable() to create secondary indices that are defined on annotations of the POJO class, similar to DefaultDynamoDbTable::createTable()."
6+
}

‎services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/IndexUtils.java

+76
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* A copy of the License is located at
7+
*
8+
* http://aws.amazon.com/apache2.0
9+
*
10+
* or in the "license" file accompanying this file. This file is distributed
11+
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
12+
* express or implied. See the License for the specific language governing
13+
* permissions and limitations under the License.
14+
*/
15+
16+
package software.amazon.awssdk.enhanced.dynamodb.internal;
17+
18+
import static java.util.Collections.emptyList;
19+
20+
import java.util.Collection;
21+
import java.util.List;
22+
import java.util.Map;
23+
import java.util.stream.Collectors;
24+
import software.amazon.awssdk.annotations.SdkInternalApi;
25+
import software.amazon.awssdk.enhanced.dynamodb.IndexMetadata;
26+
import software.amazon.awssdk.enhanced.dynamodb.KeyAttributeMetadata;
27+
import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
28+
import software.amazon.awssdk.enhanced.dynamodb.internal.client.IndexType;
29+
import software.amazon.awssdk.enhanced.dynamodb.model.EnhancedGlobalSecondaryIndex;
30+
import software.amazon.awssdk.enhanced.dynamodb.model.EnhancedLocalSecondaryIndex;
31+
import software.amazon.awssdk.services.dynamodb.model.ProjectionType;
32+
33+
@SdkInternalApi
34+
public final class IndexUtils {
35+
36+
private IndexUtils() {
37+
}
38+
39+
public static Map<IndexType, List<IndexMetadata>> splitSecondaryIndicesToLocalAndGlobalOnes(Collection<IndexMetadata> indices) {
40+
return indices.stream()
41+
.filter(index -> !TableMetadata.primaryIndexName().equals(index.name()))
42+
.collect(Collectors.groupingBy(metadata -> {
43+
String partitionKeyName = metadata.partitionKey().map(KeyAttributeMetadata::name).orElse(null);
44+
if (partitionKeyName == null) {
45+
return IndexType.LSI;
46+
}
47+
return IndexType.GSI;
48+
}));
49+
}
50+
51+
public static List<EnhancedLocalSecondaryIndex> extractLocalSecondaryIndices(Map<IndexType, List<IndexMetadata>> indicesGroups) {
52+
return indicesGroups.getOrDefault(IndexType.LSI, emptyList()).stream()
53+
.map(IndexUtils::mapIndexMetadataToEnhancedLocalSecondaryIndex)
54+
.collect(Collectors.toList());
55+
}
56+
57+
private static EnhancedLocalSecondaryIndex mapIndexMetadataToEnhancedLocalSecondaryIndex(IndexMetadata indexMetadata) {
58+
return EnhancedLocalSecondaryIndex.builder()
59+
.indexName(indexMetadata.name())
60+
.projection(pb -> pb.projectionType(ProjectionType.ALL))
61+
.build();
62+
}
63+
64+
public static List<EnhancedGlobalSecondaryIndex> extractGlobalSecondaryIndices(Map<IndexType, List<IndexMetadata>> indicesGroups) {
65+
return indicesGroups.getOrDefault(IndexType.GSI, emptyList()).stream()
66+
.map(IndexUtils::mapIndexMetadataToEnhancedGlobalSecondaryIndex)
67+
.collect(Collectors.toList());
68+
}
69+
70+
private static EnhancedGlobalSecondaryIndex mapIndexMetadataToEnhancedGlobalSecondaryIndex(IndexMetadata indexMetadata) {
71+
return EnhancedGlobalSecondaryIndex.builder()
72+
.indexName(indexMetadata.name())
73+
.projection(pb -> pb.projectionType(ProjectionType.ALL))
74+
.build();
75+
}
76+
}

‎services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbAsyncTable.java

+13-1
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,19 @@
1616
package software.amazon.awssdk.enhanced.dynamodb.internal.client;
1717

1818
import static software.amazon.awssdk.enhanced.dynamodb.internal.EnhancedClientUtils.createKeyFromItem;
19+
import static software.amazon.awssdk.enhanced.dynamodb.internal.IndexUtils.extractGlobalSecondaryIndices;
20+
import static software.amazon.awssdk.enhanced.dynamodb.internal.IndexUtils.extractLocalSecondaryIndices;
21+
import static software.amazon.awssdk.enhanced.dynamodb.internal.IndexUtils.splitSecondaryIndicesToLocalAndGlobalOnes;
1922

23+
import java.util.Collection;
24+
import java.util.List;
25+
import java.util.Map;
2026
import java.util.concurrent.CompletableFuture;
2127
import java.util.function.Consumer;
2228
import software.amazon.awssdk.annotations.SdkInternalApi;
2329
import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable;
2430
import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
31+
import software.amazon.awssdk.enhanced.dynamodb.IndexMetadata;
2532
import software.amazon.awssdk.enhanced.dynamodb.Key;
2633
import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
2734
import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
@@ -114,7 +121,12 @@ public CompletableFuture<Void> createTable(Consumer<CreateTableEnhancedRequest.B
114121

115122
@Override
116123
public CompletableFuture<Void> createTable() {
117-
return createTable(CreateTableEnhancedRequest.builder().build());
124+
Collection<IndexMetadata> indices = tableSchema.tableMetadata().indices();
125+
Map<IndexType, List<IndexMetadata>> indexGroups = splitSecondaryIndicesToLocalAndGlobalOnes(indices);
126+
return createTable(CreateTableEnhancedRequest.builder()
127+
.localSecondaryIndices(extractLocalSecondaryIndices(indexGroups))
128+
.globalSecondaryIndices(extractGlobalSecondaryIndices(indexGroups))
129+
.build());
118130
}
119131

120132
@Override

‎services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbTable.java

+5-46
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@
1515

1616
package software.amazon.awssdk.enhanced.dynamodb.internal.client;
1717

18-
import static java.util.Collections.emptyList;
1918
import static software.amazon.awssdk.enhanced.dynamodb.internal.EnhancedClientUtils.createKeyFromItem;
19+
import static software.amazon.awssdk.enhanced.dynamodb.internal.IndexUtils.extractGlobalSecondaryIndices;
20+
import static software.amazon.awssdk.enhanced.dynamodb.internal.IndexUtils.extractLocalSecondaryIndices;
21+
import static software.amazon.awssdk.enhanced.dynamodb.internal.IndexUtils.splitSecondaryIndicesToLocalAndGlobalOnes;
2022

2123
import java.util.Collection;
2224
import java.util.List;
2325
import java.util.Map;
2426
import java.util.function.Consumer;
25-
import java.util.stream.Collectors;
2627
import software.amazon.awssdk.annotations.SdkInternalApi;
2728
import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
2829
import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
2930
import software.amazon.awssdk.enhanced.dynamodb.IndexMetadata;
3031
import software.amazon.awssdk.enhanced.dynamodb.Key;
31-
import software.amazon.awssdk.enhanced.dynamodb.KeyAttributeMetadata;
3232
import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
3333
import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
3434
import software.amazon.awssdk.enhanced.dynamodb.internal.operations.CreateTableOperation;
@@ -46,8 +46,6 @@
4646
import software.amazon.awssdk.enhanced.dynamodb.model.DeleteItemEnhancedRequest;
4747
import software.amazon.awssdk.enhanced.dynamodb.model.DeleteItemEnhancedResponse;
4848
import software.amazon.awssdk.enhanced.dynamodb.model.DescribeTableEnhancedResponse;
49-
import software.amazon.awssdk.enhanced.dynamodb.model.EnhancedGlobalSecondaryIndex;
50-
import software.amazon.awssdk.enhanced.dynamodb.model.EnhancedLocalSecondaryIndex;
5149
import software.amazon.awssdk.enhanced.dynamodb.model.GetItemEnhancedRequest;
5250
import software.amazon.awssdk.enhanced.dynamodb.model.GetItemEnhancedResponse;
5351
import software.amazon.awssdk.enhanced.dynamodb.model.PageIterable;
@@ -61,7 +59,6 @@
6159
import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
6260
import software.amazon.awssdk.services.dynamodb.model.DescribeTableRequest;
6361
import software.amazon.awssdk.services.dynamodb.model.DescribeTableResponse;
64-
import software.amazon.awssdk.services.dynamodb.model.ProjectionType;
6562

6663
@SdkInternalApi
6764
public class DefaultDynamoDbTable<T> implements DynamoDbTable<T> {
@@ -126,52 +123,14 @@ public void createTable(Consumer<CreateTableEnhancedRequest.Builder> requestCons
126123

127124
@Override
128125
public void createTable() {
129-
Map<IndexType, List<IndexMetadata>> indexGroups = splitSecondaryIndicesToLocalAndGlobalOnes();
126+
Collection<IndexMetadata> indices = tableSchema.tableMetadata().indices();
127+
Map<IndexType, List<IndexMetadata>> indexGroups = splitSecondaryIndicesToLocalAndGlobalOnes(indices);
130128
createTable(CreateTableEnhancedRequest.builder()
131129
.localSecondaryIndices(extractLocalSecondaryIndices(indexGroups))
132130
.globalSecondaryIndices(extractGlobalSecondaryIndices(indexGroups))
133131
.build());
134132
}
135133

136-
private Map<IndexType, List<IndexMetadata>> splitSecondaryIndicesToLocalAndGlobalOnes() {
137-
Collection<IndexMetadata> indices = tableSchema.tableMetadata().indices();
138-
return indices.stream()
139-
.filter(index -> !TableMetadata.primaryIndexName().equals(index.name()))
140-
.collect(Collectors.groupingBy(metadata -> {
141-
String partitionKeyName = metadata.partitionKey().map(KeyAttributeMetadata::name).orElse(null);
142-
if (partitionKeyName == null) {
143-
return IndexType.LSI;
144-
}
145-
return IndexType.GSI;
146-
}));
147-
}
148-
149-
private List<EnhancedLocalSecondaryIndex> extractLocalSecondaryIndices(Map<IndexType, List<IndexMetadata>> indicesGroups) {
150-
return indicesGroups.getOrDefault(IndexType.LSI, emptyList()).stream()
151-
.map(this::mapIndexMetadataToEnhancedLocalSecondaryIndex)
152-
.collect(Collectors.toList());
153-
}
154-
155-
private EnhancedLocalSecondaryIndex mapIndexMetadataToEnhancedLocalSecondaryIndex(IndexMetadata indexMetadata) {
156-
return EnhancedLocalSecondaryIndex.builder()
157-
.indexName(indexMetadata.name())
158-
.projection(pb -> pb.projectionType(ProjectionType.ALL))
159-
.build();
160-
}
161-
162-
private List<EnhancedGlobalSecondaryIndex> extractGlobalSecondaryIndices(Map<IndexType, List<IndexMetadata>> indicesGroups) {
163-
return indicesGroups.getOrDefault(IndexType.GSI, emptyList()).stream()
164-
.map(this::mapIndexMetadataToEnhancedGlobalSecondaryIndex)
165-
.collect(Collectors.toList());
166-
}
167-
168-
private EnhancedGlobalSecondaryIndex mapIndexMetadataToEnhancedGlobalSecondaryIndex(IndexMetadata indexMetadata) {
169-
return EnhancedGlobalSecondaryIndex.builder()
170-
.indexName(indexMetadata.name())
171-
.projection(pb -> pb.projectionType(ProjectionType.ALL))
172-
.build();
173-
}
174-
175134
@Override
176135
public T deleteItem(DeleteItemEnhancedRequest request) {
177136
TableOperation<T, ?, ?, DeleteItemEnhancedResponse<T>> operation = DeleteItemOperation.create(request);

‎services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/IndexUtilsTest.java

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* A copy of the License is located at
7+
*
8+
* http://aws.amazon.com/apache2.0
9+
*
10+
* or in the "license" file accompanying this file. This file is distributed
11+
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
12+
* express or implied. See the License for the specific language governing
13+
* permissions and limitations under the License.
14+
*/
15+
16+
package software.amazon.awssdk.enhanced.dynamodb;
17+
18+
import static org.assertj.core.api.Assertions.assertThat;
19+
20+
import java.util.Arrays;
21+
import java.util.Collection;
22+
import java.util.List;
23+
import java.util.Map;
24+
import org.junit.jupiter.api.Test;
25+
import software.amazon.awssdk.enhanced.dynamodb.internal.IndexUtils;
26+
import software.amazon.awssdk.enhanced.dynamodb.internal.client.IndexType;
27+
import software.amazon.awssdk.enhanced.dynamodb.internal.mapper.StaticIndexMetadata;
28+
import software.amazon.awssdk.enhanced.dynamodb.internal.mapper.StaticKeyAttributeMetadata;
29+
30+
public class IndexUtilsTest {
31+
32+
@Test
33+
public void splitSecondaryIndicesToLocalAndGlobalOnes_separateIndices() {
34+
Collection<IndexMetadata> indices = Arrays.asList(StaticIndexMetadata.builder()
35+
.name("LocalIndex1")
36+
.build(),
37+
StaticIndexMetadata.builder()
38+
.name("GlobalIndex1")
39+
.partitionKey(StaticKeyAttributeMetadata.create(
40+
"GlobalIndexPartitionKey",
41+
AttributeValueType.N))
42+
.build());
43+
44+
Map<IndexType, List<IndexMetadata>> indexGroups = IndexUtils.splitSecondaryIndicesToLocalAndGlobalOnes(indices);
45+
46+
assertThat(indexGroups.get(IndexType.LSI)).hasSize(1);
47+
assertThat(indexGroups.get(IndexType.LSI).get(0).name()).isEqualTo("LocalIndex1");
48+
assertThat(indexGroups.get(IndexType.GSI)).hasSize(1);
49+
assertThat(indexGroups.get(IndexType.GSI).get(0).name()).isEqualTo("GlobalIndex1");
50+
}
51+
}

0 commit comments

Comments
 (0)