From 6fe5a4b4361f2244736e30a394e3b8e5b05a66b7 Mon Sep 17 00:00:00 2001
From: agrgr <agrgr@users.noreply.github.com>
Date: Thu, 21 Mar 2024 16:58:11 +0200
Subject: [PATCH] deprecate two fields in AerospikeProperties as duplicating
 configuration, update dependency

---
 pom.xml                                                  | 2 +-
 .../autoconfigure/aerospike/AerospikeProperties.java     | 9 +++++++++
 .../data/aerospike/AerospikeDataProperties.java          | 3 ++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2bc1e8b..5190c97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
         <maven.gpg.plugin.version>1.6</maven.gpg.plugin.version>
         <flatten.maven.plugin.version>1.6.0</flatten.maven.plugin.version>
 
-        <spring-data-aerospike.version>4.7.0</spring-data-aerospike.version>
+        <spring-data-aerospike.version>4.7.1</spring-data-aerospike.version>
         <aerospike-reactor-client.version>7.1.0</aerospike-reactor-client.version>
         <aerospike-client.version>7.2.1</aerospike-client.version>
         <embedded-aerospike.version>3.1.5</embedded-aerospike.version>
diff --git a/spring-boot-autoconfigure-data-aerospike/src/main/java/org/springframework/boot/autoconfigure/aerospike/AerospikeProperties.java b/spring-boot-autoconfigure-data-aerospike/src/main/java/org/springframework/boot/autoconfigure/aerospike/AerospikeProperties.java
index 10ff6c1..8759629 100644
--- a/spring-boot-autoconfigure-data-aerospike/src/main/java/org/springframework/boot/autoconfigure/aerospike/AerospikeProperties.java
+++ b/spring-boot-autoconfigure-data-aerospike/src/main/java/org/springframework/boot/autoconfigure/aerospike/AerospikeProperties.java
@@ -19,6 +19,7 @@
 import com.aerospike.client.policy.AuthMode;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.data.aerospike.config.AerospikeDataSettings;
 
 import java.time.Duration;
 
@@ -36,14 +37,22 @@ public class AerospikeProperties {
      * Potential hosts to seed the cluster from string format: hostname1:port1,hostname2:port2 ... .
      * <p>
      * See {@link com.aerospike.client.Host#parseHosts} documentation for more details.
+     *
+     * @deprecated since 0.14.0, {@link AerospikeDataSettings} with the prefix "spring-data-aerospike.connection".
+     * will be used instead to read from application.properties
      */
+    @Deprecated(since = "0.14.0", forRemoval = true)
     private String hosts;
 
     /**
      * Port is used if no port specified in AerospikeProperties#hosts.
      * <p>
      * See {@link com.aerospike.client.Host#parseHosts} documentation for more details.
+     *
+     * @deprecated since 0.14.0, {@link AerospikeDataSettings} with the prefix "spring-data-aerospike.connection".
+     * will be used instead to read from application.properties
      */
+    @Deprecated(since = "0.14.0", forRemoval = true)
     private int defaultPort = 3000;
 
     /**
diff --git a/spring-boot-autoconfigure-data-aerospike/src/main/java/org/springframework/boot/autoconfigure/data/aerospike/AerospikeDataProperties.java b/spring-boot-autoconfigure-data-aerospike/src/main/java/org/springframework/boot/autoconfigure/data/aerospike/AerospikeDataProperties.java
index 5beb847..7a7d2bf 100644
--- a/spring-boot-autoconfigure-data-aerospike/src/main/java/org/springframework/boot/autoconfigure/data/aerospike/AerospikeDataProperties.java
+++ b/spring-boot-autoconfigure-data-aerospike/src/main/java/org/springframework/boot/autoconfigure/data/aerospike/AerospikeDataProperties.java
@@ -23,7 +23,8 @@
 
 /**
  * Configuration properties for Spring Data Aerospike.
- * @deprecated since 0.14.0, {@link AerospikeDataSettings} will be used instead.
+ * @deprecated since 0.14.0, {@link AerospikeDataSettings} with the prefix "spring-data-aerospike.data".
+ * will be used instead to read from application.properties.
  *
  * @author Igor Ermolenko
  * @author Anastasiia Smirnova