tiennm99/zfoo
1
0
Fork 0
mirror of https://github.com/tiennm99/zfoo.git synced 2026-06-02 00:15:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix[storage]: Fix record class generation protocol error.

Browse Source
This commit is contained in:
凌星
2023-09-18 17:45:18 +08:00
parent 91a60a8fa8
commit 41bfac323e
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java
+9 -4
View File
@@ -429,7 +429,8 @@ public class ProtocolAnalysis {
try {
var registrationList = new ArrayList<IFieldRegistration>();
List<Field> fields = fieldsEntry.getKey();
if (clazz.isRecord()) {
boolean isRecord = clazz.isRecord();
if (isRecord) {
fields = fieldsEntry.getValue();
}
for (var field : fields) {
@@ -437,7 +438,7 @@ public class ProtocolAnalysis {
}
Constructor constructor;
if (clazz.isRecord()) {
if (isRecord) {
constructor = ReflectionUtils.getConstructor(clazz, fields.stream().map(p -> p.getType()).toList().toArray(new Class[]{}));
} else {
constructor = clazz.getDeclaredConstructor();
@@ -447,8 +448,12 @@ public class ProtocolAnalysis {
var protocol = new ProtocolRegistration();
protocol.setId(protocolId);
protocol.setConstructor(constructor);
protocol.setFields(ArrayUtils.listToArray(fieldsEntry.getKey(), Field.class));
protocol.setOriginalFields(ArrayUtils.listToArray(fieldsEntry.getValue(), Field.class));
if (isRecord) {
protocol.setFields(ArrayUtils.listToArray(fieldsEntry.getValue(), Field.class));
protocol.setOriginalFields(ArrayUtils.listToArray(fieldsEntry.getValue(), Field.class));
} else {
protocol.setFields(ArrayUtils.listToArray(fieldsEntry.getKey(), Field.class));
}
protocol.setFieldRegistrations(ArrayUtils.listToArray(registrationList, IFieldRegistration.class));
protocol.setModule(module.getId());
return protocol;
storage/src/main/java/com/zfoo/storage/manager/StorageInt.java
+1 -1
View File
@@ -86,7 +86,7 @@ public class StorageInt<K, V> extends StorageObject<K, V> {
@Override
public Collection<V> getAll() {
return dataMap.values().stream().collect(Collectors.toUnmodifiableList());
return dataMap.values().stream().toList();
}
@Override
storage/src/main/java/com/zfoo/storage/manager/StorageLong.java
+1 -1
View File
@@ -86,7 +86,7 @@ public class StorageLong<K, V> extends StorageObject<K, V> {
@Override
public Collection<V> getAll() {
return dataMap.values().stream().collect(Collectors.toUnmodifiableList());
return dataMap.values().stream().toList();
}
@Override
storage/src/main/java/com/zfoo/storage/manager/StorageObject.java
+1 -1
View File
@@ -145,7 +145,7 @@ public class StorageObject<K, V> implements IStorage<K, V> {
@Override
public List<V> getList() {
Collection<V> all = getAll();
return all.stream().collect(Collectors.toUnmodifiableList());
return all.stream().toList();
}
@Override