Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FMWK-443 Add configuration flag writeSortedMaps #745

Merged
merged 8 commits into from
May 28, 2024
Merged

FMWK-443 Add configuration flag writeSortedMaps #745

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
945377d
add flag to control writing Maps as TreeMaps
agrgr May 26, 2024
681a02d
add flag to control writing Maps as TreeMaps
agrgr May 26, 2024
0c57e1e
code format
agrgr May 26, 2024
d578919
Merge branch 'main' into FMWK-443-flag-writeTreeMaps
agrgr May 26, 2024
91875bc
code format, allow null key when writeTreeMaps == false
agrgr May 27, 2024
d859c63
allow null key when writeTreeMaps == false
agrgr May 27, 2024
605e0a1
code format
agrgr May 28, 2024
e3a7d20
Merge branch 'main' into FMWK-443-flag-writeTreeMaps
agrgr May 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/java/org/springframework/data/aerospike/config/AerospikeDataSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,6 @@ public class AerospikeDataSettings {
// Define how @Id fields (primary keys) and Map keys are stored: false - always as String,
// true - preserve original type if supported
boolean keepOriginalKeyTypes = false;
// Define how Maps are written: true - as TreeMaps (default), false - as HashMaps
boolean writeTreeMaps = true;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider renaming to useSortedMap.

}
23 changes: 19 additions & 4 deletions src/main/java/org/springframework/data/aerospike/convert/MappingAerospikeWriteConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,12 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.TreeMap;
import java.util.function.Supplier;
import java.util.stream.Collectors;

import static com.aerospike.client.ResultCode.OP_NOT_APPLICABLE;
Expand Down Expand Up @@ -157,7 +159,12 @@ private void convertToAerospikeWriteData(Object source, AerospikeWriteData data)

private Map<String, Object> convertProperties(TypeInformation<?> type, AerospikePersistentEntity<?> entity,
ConvertingPropertyAccessor<?> accessor, boolean isCustomType) {
Map<String, Object> target = new TreeMap<>();
Map<String, Object> target;
if (!settings.isWriteTreeMaps()) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

simpler to check isWriteTreeMaps and set target as TreeMap, otherwise use HashMap (follow the condition, no need for !

target = new HashMap<>();
} else {
target = new TreeMap<>();
}
typeMapper.writeType(type, target);
entity.doWithProperties((PropertyHandler<AerospikePersistentProperty>) property -> {

Expand Down Expand Up @@ -234,7 +241,14 @@ protected Map<Object, Object> convertMap(final Map<Object, Object> source, final
Assert.notNull(source, "Given map must not be null!");
Assert.notNull(type, "Given type must not be null!");

return source.entrySet().stream().collect(TreeMap::new, (m, e) -> {
Supplier<Map<Object, Object>> mapSupplier;
if (!settings.isWriteTreeMaps()) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here:

simpler to check isWriteTreeMaps and set target as TreeMap, otherwise use HashMap (follow the condition, no need for !

mapSupplier = HashMap::new;
} else {
mapSupplier = TreeMap::new;
}
Map<Object, Object> map = mapSupplier.get();
for (Map.Entry<Object, Object> e : source.entrySet()) {
Object key = e.getKey();
Object value = e.getValue();
if (key == null) {
Expand All @@ -260,8 +274,9 @@ protected Map<Object, Object> convertMap(final Map<Object, Object> source, final

Object convertedValue = getValueToWrite(value, type.getMapValueType());
if (simpleKey instanceof byte[]) simpleKey = ByteBuffer.wrap((byte[]) simpleKey);
m.put(simpleKey, convertedValue);
}, TreeMap::putAll);
map.put(simpleKey, convertedValue);
}
return map;
}

private Map<String, Object> convertCustomType(Object source, TypeInformation<?> type) {
Expand Down
Loading