Skip to content

Commit 17be3a5

Browse files
joviegasjoviegas
committed
Removed extra newlines from test cases
1 parent 3b0c1c8 commit 17be3a5

File tree

7 files changed

+5
-238
lines changed

7 files changed

+5
-238
lines changed

‎services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/document/EnhancedDocument.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
* // CustomAttributeConverterProvider.create() is an example for some Custom converter provider
5353
* EnhancedDocument enhancedDocumentWithCustomConverter = EnhancedDocument.builder().attributeConverterProviders
5454
* (CustomAttributeConverterProvider.create(), AttributeConverterProvide.defaultProvider()
55-
* .putWithTypethType("customObject", customObject, EnhancedType.of(CustomClass.class))
55+
* .put("customObject", customObject, EnhancedType.of(CustomClass.class))
5656
* .build();
5757
*}
5858
* <p>Enhanced Document can be created with Json as input using Static factory method.In this case it used

‎services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/document/BasicAsyncCrudTest.java

+1-26
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import static org.hamcrest.Matchers.nullValue;
2222
import static software.amazon.awssdk.enhanced.dynamodb.AttributeConverterProvider.defaultProvider;
2323
import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
24-
2524
import java.util.Collection;
2625
import java.util.LinkedHashMap;
2726
import java.util.Map;
@@ -38,8 +37,6 @@
3837
import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
3938
import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable;
4039
import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedAsyncClient;
41-
import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
42-
import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
4340
import software.amazon.awssdk.enhanced.dynamodb.Expression;
4441
import software.amazon.awssdk.enhanced.dynamodb.Key;
4542
import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
@@ -48,23 +45,21 @@
4845
import software.amazon.awssdk.enhanced.dynamodb.document.EnhancedDocumentTestData;
4946
import software.amazon.awssdk.enhanced.dynamodb.document.TestData;
5047
import software.amazon.awssdk.enhanced.dynamodb.functionaltests.LocalDynamoDbAsyncTestBase;
51-
import software.amazon.awssdk.enhanced.dynamodb.functionaltests.LocalDynamoDbSyncTestBase;
5248
import software.amazon.awssdk.enhanced.dynamodb.model.DeleteItemEnhancedRequest;
5349
import software.amazon.awssdk.enhanced.dynamodb.model.PutItemEnhancedRequest;
5450
import software.amazon.awssdk.enhanced.dynamodb.model.UpdateItemEnhancedRequest;
5551
import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
56-
import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
5752
import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
5853
import software.amazon.awssdk.services.dynamodb.model.ConditionalCheckFailedException;
5954
import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
6055
import software.amazon.awssdk.services.dynamodb.model.GetItemResponse;
6156

62-
6357
@RunWith(Parameterized.class)
6458
public class BasicAsyncCrudTest extends LocalDynamoDbAsyncTestBase {
6559

6660
private static final String ATTRIBUTE_NAME_WITH_SPECIAL_CHARACTERS = "a*t:t.r-i#bute+3/4(&?5=@)<6>!ch$ar%";
6761
private final TestData testData;
62+
6863
@Rule
6964
public ExpectedException exception = ExpectedException.none();
7065
private DynamoDbEnhancedAsyncClient enhancedClient;
@@ -73,7 +68,6 @@ public class BasicAsyncCrudTest extends LocalDynamoDbAsyncTestBase {
7368

7469
private DynamoDbAsyncTable<EnhancedDocument> docMappedtable ;
7570

76-
7771
@Before
7872
public void setUp(){
7973
lowLevelClient = getDynamoDbAsyncClient();
@@ -89,9 +83,6 @@ public void setUp(){
8983
.attributeConverterProviders(defaultProvider())
9084
.build());
9185
docMappedtable.createTable().join();
92-
93-
94-
9586
}
9687

9788
public BasicAsyncCrudTest(TestData testData) {
@@ -125,7 +116,6 @@ private static Map<String, AttributeValue> appendKeysToTestDataAttributeMap(Map<
125116
return result;
126117
}
127118

128-
129119
@After
130120
public void deleteTable() {
131121
getDynamoDbAsyncClient().deleteTable(DeleteTableRequest.builder()
@@ -174,7 +164,6 @@ public void updateOverwriteCompleteItem_usingShortcutForm() {
174164
.putString("attribute2", "two")
175165
.putString("attribute3", "three")
176166
.build();
177-
178167
docMappedtable.putItem(enhancedDocument).join();
179168

180169
// Updating new Items other than the one present in testData
@@ -256,7 +245,6 @@ public void putThenDeleteItem_usingShortcutForm() {
256245

257246
GetItemResponse lowLevelGetAfterDelete = lowLevelClient.getItem(r -> r.key(key).tableName(tableName)).join();
258247

259-
260248
assertThat(enhancedDocument.toMap(), is(EnhancedDocument.fromAttributeValueMap(lowLevelGetBeforeDelete.item()).toMap()));
261249
assertThat(beforeDeleteResult.toMap(), is(enhancedDocument.toMap()));
262250
assertThat(beforeDeleteResult.toMap(), is(lowLevelGetBeforeDelete.item()));
@@ -314,8 +302,6 @@ public void putWithConditionThatSucceeds() {
314302

315303
EnhancedDocument result = docMappedtable.getItem(r -> r.key(k -> k.partitionValue("id-value").sortValue("sort-value"))).join();
316304
assertThat(result.toMap(), is(newDoc.toMap()));
317-
318-
319305
}
320306

321307
@Test
@@ -419,8 +405,6 @@ public void updateOverwriteCompleteRecord_usingShortcutForm() {
419405
.putString(ATTRIBUTE_NAME_WITH_SPECIAL_CHARACTERS, "six");
420406

421407
EnhancedDocument expectedDocument = updateDocBuilder.build();
422-
423-
424408
// Explicitly Nullify each of the previous members
425409
testData.getEnhancedDocument().toMap().keySet().forEach(r -> {
426410
updateDocBuilder.putNull(r);
@@ -479,8 +463,6 @@ public void updateOverwriteModelledNulls() {
479463
.putString("attribute2", "two")
480464
.putString(ATTRIBUTE_NAME_WITH_SPECIAL_CHARACTERS, "three")
481465
.build();
482-
483-
484466
docMappedtable.putItem(r -> r.item(enhancedDocument)).join();
485467

486468
EnhancedDocument updateDocument = EnhancedDocument.builder().attributeConverterProviders(defaultProvider())
@@ -522,17 +504,13 @@ public void updateCanIgnoreNullsDoesNotIgnoreNullAttributeValues() {
522504
.putNull("attribute")
523505
.putNull(ATTRIBUTE_NAME_WITH_SPECIAL_CHARACTERS)
524506
.build();
525-
526-
527507
EnhancedDocument result = docMappedtable.updateItem(UpdateItemEnhancedRequest.builder(EnhancedDocument.class)
528508
.item(updateDocument)
529509
.ignoreNulls(true)
530510
.build()).join();
531-
532511
EnhancedDocument expectedResult = appendKeysToDoc(testData).toBuilder()
533512
.putString("attribute2", "two")
534513
.build();
535-
536514
assertThat(result.toMap(), is(expectedResult.toMap()));
537515
}
538516

@@ -552,8 +530,6 @@ public void updateKeyOnlyExistingRecordDoesNothing() {
552530

553531
@Test
554532
public void updateWithConditionThatSucceeds() {
555-
556-
557533
EnhancedDocument enhancedDocument = appendKeysToDoc(testData).toBuilder()
558534
.putString("attribute", "one")
559535
.putString("attribute2", "two")
@@ -594,7 +570,6 @@ public void updateWithConditionThatFails() {
594570
.putString("attribute2", "two")
595571
.putString(ATTRIBUTE_NAME_WITH_SPECIAL_CHARACTERS, "three")
596572
.build();
597-
598573
docMappedtable.putItem(r -> r.item(enhancedDocument)).join();
599574

600575
EnhancedDocument newDoc = EnhancedDocument.builder()

‎services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/document/BasicCrudTest.java

+1-32
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,7 @@ public void setUp(){
8282
.attributeConverterProviders(defaultProvider())
8383
.build());
8484
docMappedtable.createTable();
85-
86-
87-
88-
}
85+
}
8986

9087
public BasicCrudTest(TestData testData) {
9188
this.testData = testData;
@@ -118,7 +115,6 @@ private static Map<String, AttributeValue> appendKeysToTestDataAttributeMap(Map<
118115
return result;
119116
}
120117

121-
122118
@After
123119
public void deleteTable() {
124120
getDynamoDbClient().deleteTable(DeleteTableRequest.builder()
@@ -161,13 +157,11 @@ public void getNonExistentItem() {
161157

162158
@Test
163159
public void updateOverwriteCompleteItem_usingShortcutForm() {
164-
165160
EnhancedDocument enhancedDocument = appendKeysToDoc(testData).toBuilder()
166161
.putString("attribute", "one")
167162
.putString("attribute2", "two")
168163
.putString("attribute3", "three")
169164
.build();
170-
171165
docMappedtable.putItem(enhancedDocument);
172166

173167
// Updating new Items other than the one present in testData
@@ -201,7 +195,6 @@ public void putTwiceThenGetItem() {
201195
.putString("attribute2", "two")
202196
.putString("attribute3", "three")
203197
.build();
204-
205198
docMappedtable.putItem(enhancedDocument);
206199

207200
// Updating new Items other than the one present in testData
@@ -216,7 +209,6 @@ public void putTwiceThenGetItem() {
216209
docMappedtable.putItem(r -> r.item(updateDocument));
217210
Map<String, AttributeValue> key = simpleKey();
218211
GetItemResponse lowLevelGet = lowLevelClient.getItem(r -> r.key(key).tableName(tableName));
219-
220212
// All the items are overwritten
221213
Assertions.assertThat(lowLevelGet.item()).isEqualTo(updateDocument.toMap());
222214

@@ -233,9 +225,7 @@ public void putThenDeleteItem_usingShortcutForm() {
233225
.putString("attribute2", "two")
234226
.putString("attribute3", "three")
235227
.build();
236-
237228
Map<String, AttributeValue> key = simpleKey();
238-
239229
docMappedtable.putItem(r -> r.item(enhancedDocument));
240230
GetItemResponse lowLevelGetBeforeDelete = lowLevelClient.getItem(r -> r.key(key).tableName(tableName));
241231

@@ -248,8 +238,6 @@ public void putThenDeleteItem_usingShortcutForm() {
248238
docMappedtable.getItem(Key.builder().partitionValue("id-value").sortValue("sort-value").build());
249239

250240
GetItemResponse lowLevelGetAfterDelete = lowLevelClient.getItem(r -> r.key(key).tableName(tableName));
251-
252-
253241
assertThat(enhancedDocument.toMap(), is(EnhancedDocument.fromAttributeValueMap(lowLevelGetBeforeDelete.item()).toMap()));
254242
assertThat(beforeDeleteResult.toMap(), is(enhancedDocument.toMap()));
255243
assertThat(beforeDeleteResult.toMap(), is(lowLevelGetBeforeDelete.item()));
@@ -265,7 +253,6 @@ public void putThenDeleteItem_usingKeyItemForm() {
265253
.putString("attribute2", "two")
266254
.putString("attribute3", "three")
267255
.build();
268-
269256
docMappedtable.putItem(enhancedDocument);
270257
EnhancedDocument beforeDeleteResult =
271258
docMappedtable.deleteItem(enhancedDocument);
@@ -282,13 +269,11 @@ public void putThenDeleteItem_usingKeyItemForm() {
282269

283270
@Test
284271
public void putWithConditionThatSucceeds() {
285-
286272
EnhancedDocument enhancedDocument = appendKeysToDoc(testData).toBuilder()
287273
.putString("attribute", "one")
288274
.putString("attribute2", "two")
289275
.putString("attribute3", "three")
290276
.build();
291-
292277
docMappedtable.putItem(r -> r.item(enhancedDocument));
293278

294279

@@ -307,8 +292,6 @@ public void putWithConditionThatSucceeds() {
307292

308293
EnhancedDocument result = docMappedtable.getItem(r -> r.key(k -> k.partitionValue("id-value").sortValue("sort-value")));
309294
assertThat(result.toMap(), is(newDoc.toMap()));
310-
311-
312295
}
313296

314297
@Test
@@ -319,7 +302,6 @@ public void putWithConditionThatFails() {
319302
.putString("attribute2", "two")
320303
.putString("attribute3", "three")
321304
.build();
322-
323305
docMappedtable.putItem(r -> r.item(enhancedDocument));
324306

325307

@@ -363,7 +345,6 @@ public void deleteWithConditionThatSucceeds() {
363345

364346
Key key = docMappedtable.keyFrom(enhancedDocument);
365347
docMappedtable.deleteItem(DeleteItemEnhancedRequest.builder().key(key).conditionExpression(conditionExpression).build());
366-
367348
EnhancedDocument result = docMappedtable.getItem(r -> r.key(key));
368349
assertThat(result, is(nullValue()));
369350
}
@@ -398,7 +379,6 @@ public void updateOverwriteCompleteRecord_usingShortcutForm() {
398379
.putString("attribute2", "two")
399380
.putString(ATTRIBUTE_NAME_WITH_SPECIAL_CHARACTERS, "three")
400381
.build();
401-
402382
docMappedtable.putItem(enhancedDocument);
403383
// Updating new Items other than the one present in testData
404384
EnhancedDocument.Builder updateDocBuilder = EnhancedDocument.builder()
@@ -410,8 +390,6 @@ public void updateOverwriteCompleteRecord_usingShortcutForm() {
410390
.putString(ATTRIBUTE_NAME_WITH_SPECIAL_CHARACTERS, "six");
411391

412392
EnhancedDocument expectedDocument = updateDocBuilder.build();
413-
414-
415393
// Explicitly Nullify each of the previous members
416394
testData.getEnhancedDocument().toMap().keySet().forEach(r -> {
417395
updateDocBuilder.putNull(r);
@@ -471,8 +449,6 @@ public void updateOverwriteModelledNulls() {
471449
.putString("attribute2", "two")
472450
.putString(ATTRIBUTE_NAME_WITH_SPECIAL_CHARACTERS, "three")
473451
.build();
474-
475-
476452
docMappedtable.putItem(r -> r.item(enhancedDocument));
477453

478454
EnhancedDocument updateDocument = EnhancedDocument.builder().attributeConverterProviders(defaultProvider())
@@ -483,8 +459,6 @@ public void updateOverwriteModelledNulls() {
483459
.putNull(ATTRIBUTE_NAME_WITH_SPECIAL_CHARACTERS).build();
484460

485461
EnhancedDocument result = docMappedtable.updateItem(r -> r.item(updateDocument));
486-
487-
488462
assertThat(result.isPresent("attribute2"), is(false));
489463
assertThat(result.isPresent(ATTRIBUTE_NAME_WITH_SPECIAL_CHARACTERS), is(false));
490464
assertThat(result.getString("attribute"), is("four"));
@@ -505,7 +479,6 @@ public void updateCanIgnoreNullsDoesNotIgnoreNullAttributeValues() {
505479
.putString("attribute2", "two")
506480
.putString(ATTRIBUTE_NAME_WITH_SPECIAL_CHARACTERS, "three")
507481
.build();
508-
509482
docMappedtable.putItem(r -> r.item(enhancedDocument));
510483

511484
EnhancedDocument updateDocument = EnhancedDocument.builder()
@@ -514,13 +487,10 @@ public void updateCanIgnoreNullsDoesNotIgnoreNullAttributeValues() {
514487
.putNull("attribute")
515488
.putNull(ATTRIBUTE_NAME_WITH_SPECIAL_CHARACTERS)
516489
.build();
517-
518-
519490
EnhancedDocument result = docMappedtable.updateItem(UpdateItemEnhancedRequest.builder(EnhancedDocument.class)
520491
.item(updateDocument)
521492
.ignoreNulls(true)
522493
.build());
523-
524494
EnhancedDocument expectedResult = appendKeysToDoc(testData).toBuilder()
525495
.putString("attribute2", "two")
526496
.build();
@@ -579,7 +549,6 @@ public void updateWithConditionThatSucceeds() {
579549

580550
@Test
581551
public void updateWithConditionThatFails() {
582-
583552
EnhancedDocument enhancedDocument = appendKeysToDoc(testData).toBuilder()
584553
.putString("attribute", "one")
585554
.putString("attribute2", "two")

0 commit comments

Comments
 (0)