Merge branch 'refs/heads/main' into FMWK-576-add-writeSortedMaps

# Conflicts: # spring-boot-autoconfigure-data-aerospike/src/main/java/org/springframework/boot/autoconfigure/data/aerospike/AerospikeDataProperties.java
aerospike-community · Oct 15, 2024 · 394704c · 394704c
2 parents 6fb9b8a + 574ab99
commit 394704c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/...ava/org/springframework/boot/autoconfigure/data/aerospike/AerospikeDataConfiguration.java b/...ava/org/springframework/boot/autoconfigure/data/aerospike/AerospikeDataConfiguration.java
@@ -123,6 +123,7 @@ private AerospikeDataSettings configureDataSettings(AerospikeDataSettings dataSe
                                                         AerospikeDataProperties aerospikeDataProperties) {
         dataSettings.setScansEnabled(aerospikeDataProperties.isScansEnabled());
         dataSettings.setCreateIndexesOnStartup(aerospikeDataProperties.isCreateIndexesOnStartup());
+        dataSettings.setWriteSortedMaps(aerospikeDataProperties.isWriteSortedMaps());
         return dataSettings;
     }
 }
diff --git a/...n/java/org/springframework/boot/autoconfigure/data/aerospike/AerospikeDataProperties.java b/...n/java/org/springframework/boot/autoconfigure/data/aerospike/AerospikeDataProperties.java
@@ -96,5 +96,5 @@ public class AerospikeDataProperties {
      * Writing unsorted maps (false) degrades performance of Map-related operations and does not allow comparing Maps,
      * strongly recommended not to use except during upgrade from older versions of Spring Data Aerospike (if required)
      */
-    boolean writeSortedMaps = true;
+    private boolean writeSortedMaps = true;
 }