Skip to content

Commit a60dd85

Browse files
agrgragrgr
committed
Add durable delete in tests
1 parent c588fa3 commit a60dd85

5 files changed

Lines changed: 53 additions & 16 deletions

File tree

‎legacyapi/src/test/java/com/aerospike/mapper/AeroMapperBaseTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ public static void setupClass() {
2626
ClientPolicy policy = new ClientPolicy();
2727
// Set event loops to use in asynchronous commands.
2828
policy.eventLoops = new NioEventLoops(1);
29+
// policy.user = "";
30+
// policy.password = "";
31+
policy.writePolicyDefault.durableDelete = true;
2932
Host[] hosts = Host.parseHosts(System.getProperty("test.host", "localhost:3000"), 3000);
3033
client = new AerospikeClient(policy, hosts);
3134
}

‎legacyapi/src/test/java/com/aerospike/mapper/ConfigurationThroughCodeTest.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.util.ArrayList;
44
import java.util.List;
55

6+
import com.aerospike.client.policy.WritePolicy;
67
import org.junit.jupiter.api.Assertions;
78
import org.junit.jupiter.api.Test;
89

@@ -71,7 +72,9 @@ private A setupA() {
7172
public void testNoConfiguration() {
7273
AeroMapper mapper = new AeroMapper.Builder(client).build();
7374
A a = setupA();
74-
mapper.delete(a);
75+
WritePolicy writePolicy = new WritePolicy();
76+
writePolicy.durableDelete = true;
77+
mapper.delete(writePolicy, a);
7578

7679
try {
7780
mapper.save(a);
@@ -114,7 +117,9 @@ public void testWithConfiguration() {
114117
.withClassConfigurations(classConfigB, classConfigC)
115118
.build();
116119
A a = setupA();
117-
mapper.delete(a);
120+
WritePolicy writePolicy = new WritePolicy();
121+
writePolicy.durableDelete = true;
122+
mapper.delete(writePolicy, a);
118123

119124
mapper.save(a);
120125

‎legacyapi/src/test/java/com/aerospike/mapper/GenerationAnnotationTest.java‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,9 @@ public void testGenerationFieldMapping() {
115115
AeroMapper mapper = new AeroMapper.Builder(client).build();
116116

117117
// Start with a clean slate
118-
mapper.delete(GenerationEntity.class, 1);
118+
WritePolicy writePolicy = new WritePolicy();
119+
writePolicy.durableDelete = true;
120+
mapper.delete(writePolicy, GenerationEntity.class, 1);
119121

120122
// Create and save entity
121123
GenerationEntity entity = new GenerationEntity(1, "Test Entity");
@@ -134,7 +136,9 @@ public void testGenerationFieldMapping() {
134136
public void testGenerationFieldMappingWithInteger() {
135137
AeroMapper mapper = new AeroMapper.Builder(client).build();
136138
// Start with a clean slate
137-
mapper.delete(GenerationEntityWithInteger.class, 2);
139+
WritePolicy writePolicy = new WritePolicy();
140+
writePolicy.durableDelete = true;
141+
mapper.delete(writePolicy, GenerationEntityWithInteger.class, 2);
138142

139143
// Create and save entity
140144
GenerationEntityWithInteger entity = new GenerationEntityWithInteger(2, "Test Entity Integer");
@@ -154,7 +158,9 @@ public void testGenerationFieldMappingWithMethods() {
154158
AeroMapper mapper = new AeroMapper.Builder(client).build();
155159

156160
// Start with a clean slate
157-
mapper.delete(GenerationEntityWithMethods.class, 3);
161+
WritePolicy writePolicy = new WritePolicy();
162+
writePolicy.durableDelete = true;
163+
mapper.delete(writePolicy, GenerationEntityWithMethods.class, 3);
158164

159165
// Create and save entity
160166
GenerationEntityWithMethods entity = new GenerationEntityWithMethods(3, "Test Entity Methods");
@@ -174,7 +180,9 @@ public void testOptimisticConcurrencyControl() {
174180
AeroMapper mapper = new AeroMapper.Builder(client).build();
175181

176182
// Start with a clean slate
177-
mapper.delete(GenerationEntity.class, 4);
183+
WritePolicy writePolicy = new WritePolicy();
184+
writePolicy.durableDelete = true;
185+
mapper.delete(writePolicy, GenerationEntity.class, 4);
178186

179187
// Create and save entity
180188
GenerationEntity entity = new GenerationEntity(4, "Concurrency Test");
@@ -201,7 +209,9 @@ public void testGenerationIncrementOnUpdate() {
201209
AeroMapper mapper = new AeroMapper.Builder(client).build();
202210

203211
// Start with a clean slate
204-
mapper.delete(GenerationEntity.class, 5);
212+
WritePolicy writePolicy = new WritePolicy();
213+
writePolicy.durableDelete = true;
214+
mapper.delete(writePolicy, GenerationEntity.class, 5);
205215

206216
// Create and save entity
207217
GenerationEntity entity = new GenerationEntity(5, "Generation Increment Test");
@@ -253,7 +263,9 @@ public void testGenerationThroughConfiguration() {
253263
.build();
254264

255265
// Start with a clean slate
256-
mapper.delete(GenerationEntity.class, 8);
266+
WritePolicy writePolicy = new WritePolicy();
267+
writePolicy.durableDelete = true;
268+
mapper.delete(writePolicy, GenerationEntity.class, 8);
257269

258270
GenerationEntity entity = new GenerationEntity(8, "Config Test");
259271
mapper.save(entity);
@@ -267,7 +279,9 @@ public void testWritePolicyGeneration() {
267279
AeroMapper mapper = new AeroMapper.Builder(client).build();
268280

269281
// Start with a clean slate
270-
mapper.delete(GenerationEntity.class, 9);
282+
WritePolicy writePolicyForDelete = new WritePolicy();
283+
writePolicyForDelete.durableDelete = true;
284+
mapper.delete(writePolicyForDelete, GenerationEntity.class, 9);
271285

272286
// Create entity with specific generation
273287
GenerationEntity entity = new GenerationEntity(9, "Policy Test");
@@ -289,7 +303,9 @@ public void testZeroGenerationDoesNotSetGeneration() {
289303
AeroMapper mapper = new AeroMapper.Builder(client).build();
290304

291305
// Start with a clean slate
292-
mapper.delete(GenerationEntity.class, 10);
306+
WritePolicy writePolicy = new WritePolicy();
307+
writePolicy.durableDelete = true;
308+
mapper.delete(writePolicy, GenerationEntity.class, 10);
293309

294310
// Create entity with generation 0 (should not set generation policy)
295311
GenerationEntity entity = new GenerationEntity(10, "Zero Generation Test");

‎legacyapi/src/test/java/com/aerospike/mapper/GenerationConfigurationTest.java‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import static org.junit.jupiter.api.Assertions.*;
44

5+
import com.aerospike.client.policy.WritePolicy;
56
import com.aerospike.mapper.annotations.AerospikeKey;
67
import lombok.Getter;
78
import lombok.Setter;
@@ -39,13 +40,15 @@ public void testGenerationThroughCodeConfiguration() {
3940
ClassConfig config = new ClassConfig.Builder(ConfigGenerationEntity.class)
4041
.withFieldNamed("generation").asGenerationField()
4142
.build();
42-
43+
4344
AeroMapper mapper = new AeroMapper.Builder(client)
4445
.withClassConfigurations(config)
4546
.build();
4647

4748
// Start with a clean slate
48-
mapper.delete(ConfigGenerationEntity.class, 1);
49+
WritePolicy writePolicy = new WritePolicy();
50+
writePolicy.durableDelete = true;
51+
mapper.delete(writePolicy, ConfigGenerationEntity.class, 1);
4952

5053
// Create and save entity
5154
ConfigGenerationEntity entity = new ConfigGenerationEntity(1, "Config Test");
@@ -73,7 +76,9 @@ public void testGenerationThroughYamlConfiguration() throws Exception {
7376
.build();
7477

7578
// Start with a clean slate
76-
mapper.delete(ConfigGenerationEntity.class, 2);
79+
WritePolicy writePolicy = new WritePolicy();
80+
writePolicy.durableDelete = true;
81+
mapper.delete(writePolicy, ConfigGenerationEntity.class, 2);
7782

7883
// Create and save entity
7984
ConfigGenerationEntity entity = new ConfigGenerationEntity(2, "YAML Config Test");
@@ -100,7 +105,9 @@ public void testOptimisticConcurrencyWithConfiguration() {
100105
.build();
101106

102107
// Start with a clean slate
103-
mapper.delete(ConfigGenerationEntity.class, 3);
108+
WritePolicy writePolicy = new WritePolicy();
109+
writePolicy.durableDelete = true;
110+
mapper.delete(writePolicy, ConfigGenerationEntity.class, 3);
104111

105112
// Create and save entity
106113
ConfigGenerationEntity entity = new ConfigGenerationEntity(3, "Concurrency Config Test");
@@ -134,7 +141,9 @@ public void testGenerationIncrementWithConfiguration() {
134141
.build();
135142

136143
// Start with a clean slate
137-
mapper.delete(ConfigGenerationEntity.class, 4);
144+
WritePolicy writePolicy = new WritePolicy();
145+
writePolicy.durableDelete = true;
146+
mapper.delete(writePolicy, ConfigGenerationEntity.class, 4);
138147

139148
// Create and save entity
140149
ConfigGenerationEntity entity = new ConfigGenerationEntity(4, "Generation Increment Config Test");

‎legacyapi/src/test/java/com/aerospike/mapper/examples/Application.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.aerospike.client.AerospikeClient;
44
import com.aerospike.client.IAerospikeClient;
5+
import com.aerospike.client.policy.ClientPolicy;
56
import com.aerospike.client.policy.Policy;
67
import com.aerospike.client.policy.Replica;
78
import com.aerospike.client.policy.WritePolicy;
@@ -37,7 +38,10 @@ public void run() throws JsonProcessingException {
3738
writePolicy.durableDelete = true;
3839
writePolicy.sendKey = true; // For ease of debugging for now
3940

40-
IAerospikeClient client = new AerospikeClient(null, "127.0.0.1", 3000);
41+
ClientPolicy policy = new ClientPolicy();
42+
// policy.user = "";
43+
// policy.password = "";
44+
IAerospikeClient client = new AerospikeClient(policy, "127.0.0.1", 3000);
4145

4246
AeroMapper mapper = new AeroMapper.Builder(client)
4347
.withWritePolicy(writePolicy).forAll()

0 commit comments

Comments
 (0)