AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-09-15 23:06:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

修复 Config 的序列化问题 (#4402)

Browse Source
This commit is contained in:
Glavo 2025-09-06 17:46:43 +08:00 committed by GitHub
parent 4883c3897b
commit 86ad055f8f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/ObservableField.java
View File

@ -70,7 +70,7 @@ public abstract class ObservableField<T> {
Type listType = TypeUtils.getSupertype(field.getGenericType(), field.getType(), List.class); Type listType = TypeUtils.getSupertype(field.getGenericType(), field.getType(), List.class);
if (!(listType instanceof ParameterizedType)) if (!(listType instanceof ParameterizedType))
throw new IllegalArgumentException("Cannot resolve the list type of " + field.getName()); throw new IllegalArgumentException("Cannot resolve the list type of " + field.getName());
return new CollectionField<>(name, alternateNames, varHandle, listType); return new CollectionField<>(name, alternateNames, varHandle, listType, listType);
} else if (ObservableSet.class.isAssignableFrom(field.getType())) { } else if (ObservableSet.class.isAssignableFrom(field.getType())) {
Type setType = TypeUtils.getSupertype(field.getGenericType(), field.getType(), Set.class); Type setType = TypeUtils.getSupertype(field.getGenericType(), field.getType(), Set.class);
if (!(setType instanceof ParameterizedType)) if (!(setType instanceof ParameterizedType))
@ -81,7 +81,7 @@ public abstract class ObservableField<T> {
List.class, List.class,
((ParameterizedType) setType).getActualTypeArguments()[0] ((ParameterizedType) setType).getActualTypeArguments()[0]
); );
return new CollectionField<>(name, alternateNames, varHandle, listType); return new CollectionField<>(name, alternateNames, varHandle, setType, listType);
} else if (ObservableMap.class.isAssignableFrom(field.getType())) { } else if (ObservableMap.class.isAssignableFrom(field.getType())) {
Type mapType = TypeUtils.getSupertype(field.getGenericType(), field.getType(), Map.class); Type mapType = TypeUtils.getSupertype(field.getGenericType(), field.getType(), Map.class);
if (!(mapType instanceof ParameterizedType)) if (!(mapType instanceof ParameterizedType))
@ -134,7 +134,7 @@ public abstract class ObservableField<T> {
@Override @Override
public JsonElement serialize(T value, JsonSerializationContext context) { public JsonElement serialize(T value, JsonSerializationContext context) {
return context.serialize(((Property<?>) get(value)).getValue()); return context.serialize(((Property<?>) get(value)).getValue(), elementType);
} }
@Override @Override
@ -145,16 +145,21 @@ public abstract class ObservableField<T> {
} }
private static final class CollectionField<T> extends ObservableField<T> { private static final class CollectionField<T> extends ObservableField<T> {
private final Type collectionType;
/// When deserializing a Set, we first deserialize it into a `List`, then put the elements into the Set.
private final Type listType; private final Type listType;
CollectionField(String serializedName, List<String> alternate, VarHandle varHandle, Type listType) { CollectionField(String serializedName, List<String> alternate, VarHandle varHandle,
Type collectionType, Type listType) {
super(serializedName, alternate, varHandle); super(serializedName, alternate, varHandle);
this.collectionType = collectionType;
this.listType = listType; this.listType = listType;
} }
@Override @Override
public JsonElement serialize(T value, JsonSerializationContext context) { public JsonElement serialize(T value, JsonSerializationContext context) {
return context.serialize(get(value), listType); return context.serialize(get(value), collectionType);
} }
@SuppressWarnings({"unchecked"}) @SuppressWarnings({"unchecked"})