FMWK-573 Prepare 0.12.1 patch adding durableDelete for batch ClientPo…

…licies (#259)
aerospike-community · Oct 8, 2024 · d7c414f · d7c414f
1 parent c7b3603
commit d7c414f
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,7 @@
  </modules>
 
  <properties>
- <revision>0.12.0</revision>
+ <revision>0.12.1</revision>
  <java.version>17</java.version>
  <maven.compiler.source>${java.version}</maven.compiler.source>
  <maven.compiler.target>${java.version}</maven.compiler.target>

diff --git a/...ain/java/org/springframework/boot/autoconfigure/aerospike/AerospikeAutoConfiguration.java b/...ain/java/org/springframework/boot/autoconfigure/aerospike/AerospikeAutoConfiguration.java
@@ -21,11 +21,14 @@
 import com.aerospike.client.IAerospikeClient;
 import com.aerospike.client.async.EventLoops;
 import com.aerospike.client.async.NioEventLoops;
-import com.aerospike.client.policy.BatchPolicy;
-import com.aerospike.client.policy.ClientPolicy;
 import com.aerospike.client.policy.Policy;
+import com.aerospike.client.policy.ClientPolicy;
 import com.aerospike.client.policy.QueryPolicy;
 import com.aerospike.client.policy.WritePolicy;
+import com.aerospike.client.policy.BatchPolicy;
+import com.aerospike.client.policy.BatchDeletePolicy;
+import com.aerospike.client.policy.BatchUDFPolicy;
+import com.aerospike.client.policy.BatchWritePolicy;
 import com.aerospike.client.reactor.AerospikeReactorClient;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -78,8 +81,11 @@ public ClientPolicy aerospikeClientPolicy(AerospikeProperties properties,
 
  clientPolicy.readPolicyDefault = setupReadPolicy(properties);
  clientPolicy.writePolicyDefault = setupWritePolicy(properties);
- clientPolicy.batchPolicyDefault = setupBatchPolicy(properties);
  clientPolicy.queryPolicyDefault = setupQueryPolicy(properties);
+ clientPolicy.batchPolicyDefault = setupBatchPolicy(properties);
+ clientPolicy.batchWritePolicyDefault = setupBatchWritePolicy(properties);
+ clientPolicy.batchDeletePolicyDefault = setupBatchDeletePolicy(properties);
+ clientPolicy.batchUDFPolicyDefault = setupBatchUDFPolicy(properties);
  aerospikeEventLoops.ifPresent(loops -> clientPolicy.eventLoops = loops);
 
  return clientPolicy;
@@ -140,6 +146,27 @@ private QueryPolicy setupQueryPolicy(AerospikeProperties properties) {
  return policy;
  }
 
+ private BatchWritePolicy setupBatchWritePolicy(AerospikeProperties properties) {
+ AerospikeProperties.BatchWritePolicyDefault batchWritePolicyDefault = properties.getBatchWrite();
+ BatchWritePolicy policy = new BatchWritePolicy();
+ whenPresent(batchWritePolicyDefault.durableDelete, p -> policy.durableDelete = p);
+ return policy;
+ }
+
+ private BatchDeletePolicy setupBatchDeletePolicy(AerospikeProperties properties) {
+ AerospikeProperties.BatchDeletePolicyDefault batchDeletePolicyDefault = properties.getBatchDelete();
+ BatchDeletePolicy policy = new BatchDeletePolicy();
+ whenPresent(batchDeletePolicyDefault.durableDelete, p -> policy.durableDelete = p);
+ return policy;
+ }
+
+ private BatchUDFPolicy setupBatchUDFPolicy(AerospikeProperties properties) {
+ AerospikeProperties.BatchUDFPolicyDefault batchUDFPolicyDefault = properties.getBatchUdf();
+ BatchUDFPolicy policy = new BatchUDFPolicy();
+ whenPresent(batchUDFPolicyDefault.durableDelete, p -> policy.durableDelete = p);
+ return policy;
+ }
+
  private void setGeneralPolicyProperties(Policy policy, AerospikeProperties.PolicyDefault policyDefault) {
  whenPresent(policyDefault.socketTimeout, p -> policy.socketTimeout = (int) p.toMillis());
  whenPresent(policyDefault.totalTimeout, p -> policy.totalTimeout = (int) p.toMillis());

diff --git a/...e/src/main/java/org/springframework/boot/autoconfigure/aerospike/AerospikeProperties.java b/...e/src/main/java/org/springframework/boot/autoconfigure/aerospike/AerospikeProperties.java
@@ -110,9 +110,16 @@ public class AerospikeProperties {
 
  private WritePolicyDefault write = new WritePolicyDefault();
 
+ private QueryPolicyDefault query = new QueryPolicyDefault();
+
  private BatchPolicyDefault batch = new BatchPolicyDefault();
 
- private QueryPolicyDefault query = new QueryPolicyDefault();
+ private BatchWritePolicyDefault batchWrite = new BatchWritePolicyDefault();
+
+ private BatchDeletePolicyDefault batchDelete = new BatchDeletePolicyDefault();
+
+ private BatchUDFPolicyDefault batchUdf = new BatchUDFPolicyDefault();
+
 
  /**
  * For more details on each option see corresponding field documentation in {@link com.aerospike.client.policy.Policy}.
@@ -223,4 +230,40 @@ public static class BatchPolicyDefault extends PolicyDefault {
  */
  public Boolean sendSetName;
  }
+
+ /**
+ * For more details on each option see corresponding field documentation in {@link com.aerospike.client.policy.BatchWritePolicy}.
+ */
+ @Data
+ public static class BatchWritePolicyDefault extends PolicyDefault {
+
+ /**
+ * If the transaction results in a record deletion, leave a tombstone for the record.
+ */
+ public Boolean durableDelete;
+ }
+
+ /**
+ * For more details on each option see corresponding field documentation in {@link com.aerospike.client.policy.BatchDeletePolicy}.
+ */
+ @Data
+ public static class BatchDeletePolicyDefault extends PolicyDefault {
+
+ /**
+ * If the transaction results in a record deletion, leave a tombstone for the record.
+ */
+ public Boolean durableDelete;
+ }
+
+ /**
+ * For more details on each option see corresponding field documentation in {@link com.aerospike.client.policy.BatchUDFPolicy}.
+ */
+ @Data
+ public static class BatchUDFPolicyDefault extends PolicyDefault {
+
+ /**
+ * If the transaction results in a record deletion, leave a tombstone for the record.
+ */
+ public Boolean durableDelete;
+ }
 }