From cbb4b0c51b169a73f0861107c77cca5e2126fab5 Mon Sep 17 00:00:00 2001 From: Glavo Date: Sun, 2 Nov 2025 21:33:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=20ObservableSetting=20?= =?UTF-8?q?=E8=BE=85=E5=8A=A9=E7=B1=BB=20(#4719)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jackhuang/hmcl/setting/Config.java | 100 +---- .../hmcl/util/gson/ObservableField.java | 232 ----------- .../hmcl/util/gson/ObservableSetting.java | 369 ++++++++++++++++++ .../gson/RawPreservingObjectProperty.java | 1 + 4 files changed, 377 insertions(+), 325 deletions(-) delete mode 100644 HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/ObservableField.java create mode 100644 HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/ObservableSetting.java diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Config.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Config.java index 46004c63e..0cf008a42 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Config.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Config.java @@ -20,7 +20,6 @@ package org.jackhuang.hmcl.setting; import com.google.gson.*; import com.google.gson.annotations.JsonAdapter; import com.google.gson.annotations.SerializedName; -import javafx.beans.InvalidationListener; import javafx.beans.Observable; import javafx.beans.property.*; import javafx.collections.FXCollections; @@ -38,18 +37,15 @@ import org.jackhuang.hmcl.java.JavaRuntime; import org.jackhuang.hmcl.ui.FXUtils; import org.jackhuang.hmcl.util.gson.*; import org.jackhuang.hmcl.util.i18n.SupportedLocale; -import org.jackhuang.hmcl.util.javafx.DirtyTracker; -import org.jackhuang.hmcl.util.javafx.ObservableHelper; import org.jetbrains.annotations.Nullable; -import java.lang.invoke.MethodHandles; import java.lang.reflect.*; import java.net.Proxy; import java.nio.file.Path; import java.util.*; @JsonAdapter(value = Config.Adapter.class) -public final class Config implements Observable { +public final class Config extends ObservableSetting { public static final int CURRENT_VERSION = 2; public static final int CURRENT_UI_VERSION = 0; @@ -67,54 +63,15 @@ public final class Config implements Observable { .setObjectToNumberStrategy(ToNumberPolicy.LONG_OR_DOUBLE) .create(); - private static final List> FIELDS; - - static { - final MethodHandles.Lookup lookup = MethodHandles.lookup(); - Field[] fields = Config.class.getDeclaredFields(); - - var configFields = new ArrayList>(fields.length); - for (Field field : fields) { - int modifiers = field.getModifiers(); - if (Modifier.isTransient(modifiers) || Modifier.isStatic(modifiers)) - continue; - - configFields.add(ObservableField.of(lookup, field)); - } - FIELDS = List.copyOf(configFields); - } - @Nullable public static Config fromJson(String json) throws JsonParseException { return CONFIG_GSON.fromJson(json, Config.class); } - private transient final ObservableHelper helper = new ObservableHelper(this); - private transient final DirtyTracker tracker = new DirtyTracker(); - private transient final Map unknownFields = new HashMap<>(); - public Config() { - var shouldBeWrite = Collections.newSetFromMap(new IdentityHashMap<>()); - Collections.addAll(shouldBeWrite, configVersion, uiVersion); - - for (var field : FIELDS) { - Observable observable = field.get(this); - if (shouldBeWrite.contains(observable)) - tracker.markDirty(observable); - else - tracker.track(observable); - observable.addListener(helper); - } - } - - @Override - public void addListener(InvalidationListener listener) { - helper.addListener(listener); - } - - @Override - public void removeListener(InvalidationListener listener) { - helper.removeListener(listener); + tracker.markDirty(configVersion); + tracker.markDirty(uiVersion); + register(); } public String toJson() { @@ -775,53 +732,10 @@ public final class Config implements Observable { return configurations; } - public static final class Adapter implements JsonSerializer, JsonDeserializer { - + public static final class Adapter extends ObservableSetting.Adapter { @Override - public JsonElement serialize(Config config, Type typeOfSrc, JsonSerializationContext context) { - if (config == null) - return JsonNull.INSTANCE; - - JsonObject result = new JsonObject(); - for (var field : FIELDS) { - Observable observable = field.get(config); - if (config.tracker.isDirty(observable)) { - field.serialize(result, config, context); - } - } - config.unknownFields.forEach(result::add); - return result; - } - - @Override - public Config deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { - if (json == null || json.isJsonNull()) - return null; - - if (!json.isJsonObject()) - throw new JsonParseException("Config is not an object: " + json); - - Config config = new Config(); - - var values = new LinkedHashMap<>(json.getAsJsonObject().asMap()); - for (ObservableField field : FIELDS) { - JsonElement value = values.remove(field.getSerializedName()); - if (value == null) { - for (String alternateName : field.getAlternateNames()) { - value = values.remove(alternateName); - if (value != null) - break; - } - } - - if (value != null) { - config.tracker.markDirty(field.get(config)); - field.deserialize(config, value, context); - } - } - - config.unknownFields.putAll(values); - return config; + protected Config createInstance() { + return new Config(); } } } diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/ObservableField.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/ObservableField.java deleted file mode 100644 index 1208600d3..000000000 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/ObservableField.java +++ /dev/null @@ -1,232 +0,0 @@ -/* - * Hello Minecraft! Launcher - * Copyright (C) 2025 huangyuhui and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.jackhuang.hmcl.util.gson; - -import com.google.gson.*; -import com.google.gson.annotations.SerializedName; -import javafx.beans.Observable; -import javafx.beans.property.ListProperty; -import javafx.beans.property.MapProperty; -import javafx.beans.property.Property; -import javafx.beans.property.SetProperty; -import javafx.collections.FXCollections; -import javafx.collections.ObservableList; -import javafx.collections.ObservableMap; -import javafx.collections.ObservableSet; -import org.jackhuang.hmcl.util.TypeUtils; - -import java.lang.invoke.MethodHandles; -import java.lang.invoke.VarHandle; -import java.lang.reflect.Field; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -/// @author Glavo -public abstract class ObservableField { - - public static ObservableField of(MethodHandles.Lookup lookup, Field field) { - String name; - List alternateNames; - - SerializedName serializedName = field.getAnnotation(SerializedName.class); - if (serializedName == null) { - name = field.getName(); - alternateNames = List.of(); - } else { - name = serializedName.value(); - alternateNames = List.of(serializedName.alternate()); - } - - VarHandle varHandle; - try { - varHandle = lookup.unreflectVarHandle(field); - } catch (IllegalAccessException e) { - throw new IllegalArgumentException(e); - } - - if (ObservableList.class.isAssignableFrom(field.getType())) { - Type listType = TypeUtils.getSupertype(field.getGenericType(), field.getType(), List.class); - if (!(listType instanceof ParameterizedType)) - throw new IllegalArgumentException("Cannot resolve the list type of " + field.getName()); - return new CollectionField<>(name, alternateNames, varHandle, listType, listType); - } else if (ObservableSet.class.isAssignableFrom(field.getType())) { - Type setType = TypeUtils.getSupertype(field.getGenericType(), field.getType(), Set.class); - if (!(setType instanceof ParameterizedType)) - throw new IllegalArgumentException("Cannot resolve the set type of " + field.getName()); - - ParameterizedType listType = TypeUtils.newParameterizedTypeWithOwner( - null, - List.class, - ((ParameterizedType) setType).getActualTypeArguments()[0] - ); - return new CollectionField<>(name, alternateNames, varHandle, setType, listType); - } else if (ObservableMap.class.isAssignableFrom(field.getType())) { - Type mapType = TypeUtils.getSupertype(field.getGenericType(), field.getType(), Map.class); - if (!(mapType instanceof ParameterizedType)) - throw new IllegalArgumentException("Cannot resolve the map type of " + field.getName()); - return new MapField<>(name, alternateNames, varHandle, mapType); - } else if (Property.class.isAssignableFrom(field.getType())) { - Type propertyType = TypeUtils.getSupertype(field.getGenericType(), field.getType(), Property.class); - if (!(propertyType instanceof ParameterizedType)) - throw new IllegalArgumentException("Cannot resolve the element type of " + field.getName()); - Type elementType = ((ParameterizedType) propertyType).getActualTypeArguments()[0]; - return new PropertyField<>(name, alternateNames, varHandle, elementType); - } else { - throw new IllegalArgumentException("Field " + field.getName() + " is not a property or observable collection"); - } - } - - protected final String serializedName; - protected final List alternateNames; - protected final VarHandle varHandle; - - private ObservableField(String serializedName, List alternateNames, VarHandle varHandle) { - this.serializedName = serializedName; - this.alternateNames = alternateNames; - this.varHandle = varHandle; - } - - public String getSerializedName() { - return serializedName; - } - - public List getAlternateNames() { - return alternateNames; - } - - public Observable get(T value) { - return (Observable) varHandle.get(value); - } - - public abstract void serialize(JsonObject result, T value, JsonSerializationContext context); - - public abstract void deserialize(T value, JsonElement element, JsonDeserializationContext context); - - private static final class PropertyField extends ObservableField { - private final Type elementType; - - PropertyField(String serializedName, List alternate, VarHandle varHandle, Type elementType) { - super(serializedName, alternate, varHandle); - this.elementType = elementType; - } - - @Override - public void serialize(JsonObject result, T value, JsonSerializationContext context) { - Property property = (Property) get(value); - - if (property instanceof RawPreservingProperty rawPreserving) { - JsonElement rawJson = rawPreserving.getRawJson(); - if (rawJson != null) { - result.add(getSerializedName(), rawJson); - return; - } - } - - JsonElement serialized = context.serialize(property.getValue(), elementType); - if (serialized != null && !serialized.isJsonNull()) - result.add(getSerializedName(), serialized); - } - - @Override - @SuppressWarnings({"unchecked", "rawtypes"}) - public void deserialize(T value, JsonElement element, JsonDeserializationContext context) { - Property property = (Property) get(value); - - try { - property.setValue(context.deserialize(element, elementType)); - } catch (Throwable e) { - if (property instanceof RawPreservingProperty) { - ((RawPreservingProperty) property).setRawJson(element); - } else { - throw e; - } - } - } - } - - private static final class CollectionField extends ObservableField { - 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; - - CollectionField(String serializedName, List alternate, VarHandle varHandle, - Type collectionType, Type listType) { - super(serializedName, alternate, varHandle); - this.collectionType = collectionType; - this.listType = listType; - } - - @Override - public void serialize(JsonObject result, T value, JsonSerializationContext context) { - result.add(getSerializedName(), context.serialize(get(value), collectionType)); - } - - @SuppressWarnings({"unchecked"}) - @Override - public void deserialize(T value, JsonElement element, JsonDeserializationContext context) { - List deserialized = context.deserialize(element, listType); - Object fieldValue = get(value); - - if (fieldValue instanceof ListProperty) { - ((ListProperty) fieldValue).set(FXCollections.observableList((List) deserialized)); - } else if (fieldValue instanceof ObservableList) { - ((ObservableList) fieldValue).setAll(deserialized); - } else if (fieldValue instanceof SetProperty) { - ((SetProperty) fieldValue).set(FXCollections.observableSet(new HashSet<>(deserialized))); - } else if (fieldValue instanceof ObservableSet) { - ObservableSet set = (ObservableSet) fieldValue; - set.clear(); - set.addAll(deserialized); - } else { - throw new JsonParseException("Unsupported field type: " + fieldValue.getClass()); - } - } - } - - private static final class MapField extends ObservableField { - private final Type mapType; - - MapField(String serializedName, List alternate, VarHandle varHandle, Type mapType) { - super(serializedName, alternate, varHandle); - this.mapType = mapType; - } - - @Override - public void serialize(JsonObject result, T value, JsonSerializationContext context) { - result.add(getSerializedName(), context.serialize(get(value), mapType)); - } - - @SuppressWarnings({"unchecked"}) - @Override - public void deserialize(T config, JsonElement element, JsonDeserializationContext context) { - Map deserialized = context.deserialize(element, mapType); - ObservableMap map = (ObservableMap) varHandle.get(config); - if (map instanceof MapProperty) - ((MapProperty) map).set(FXCollections.observableMap(deserialized)); - else { - map.clear(); - map.putAll(deserialized); - } - } - } -} diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/ObservableSetting.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/ObservableSetting.java new file mode 100644 index 000000000..9d65bbb41 --- /dev/null +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/ObservableSetting.java @@ -0,0 +1,369 @@ +/* + * Hello Minecraft! Launcher + * Copyright (C) 2025 huangyuhui and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.jackhuang.hmcl.util.gson; + +import com.google.gson.*; +import com.google.gson.annotations.SerializedName; +import javafx.beans.InvalidationListener; +import javafx.beans.Observable; +import javafx.beans.property.ListProperty; +import javafx.beans.property.MapProperty; +import javafx.beans.property.Property; +import javafx.beans.property.SetProperty; +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import javafx.collections.ObservableMap; +import javafx.collections.ObservableSet; +import org.jackhuang.hmcl.util.TypeUtils; +import org.jackhuang.hmcl.util.javafx.DirtyTracker; +import org.jackhuang.hmcl.util.javafx.ObservableHelper; +import org.jetbrains.annotations.NotNull; + +import java.lang.invoke.MethodHandles; +import java.lang.invoke.VarHandle; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.util.*; + +/// Represents a settings object with multiple [Observable] fields. +/// +/// All instance fields in this object, unless marked as `transient`, are considered observable fields. +/// The field types should be subclasses of one of [javafx.beans.property.Property], [javafx.collections.ObservableList], [javafx.collections.ObservableSet], or [javafx.collections.ObservableMap]. +/// +/// This class implements the [Observable] interface. +/// If any field in a settings object changes, all listeners installed via [#addListener(InvalidationListener)] will be triggered. +/// +/// For each observable field, this object tracks whether it has been modified. When serializing, fields that have never been modified will not be serialized by default. +/// +/// All subclasses of this class must call [#register()] once in their constructor. +/// +/// @author Glavo +public abstract class ObservableSetting implements Observable { + + private static final ClassValue>> FIELDS = new ClassValue<>() { + @Override + protected List> computeValue(@NotNull Class type) { + if (!ObservableSetting.class.isAssignableFrom(type)) + throw new AssertionError("Type: " + type); + + try { + var allFields = new ArrayList>(); + + for (Class current = type; + current != ObservableSetting.class; + current = current.getSuperclass()) { + final MethodHandles.Lookup lookup = MethodHandles.privateLookupIn(current, MethodHandles.lookup()); + + Field[] fields = current.getDeclaredFields(); + for (Field field : fields) { + int modifiers = field.getModifiers(); + if (Modifier.isTransient(modifiers) || Modifier.isStatic(modifiers)) + continue; + + allFields.add(ObservableField.of(lookup, field)); + } + } + + return allFields; + } catch (IllegalAccessException e) { + throw new ExceptionInInitializerError(e); + } + } + }; + + protected transient final ObservableHelper helper = new ObservableHelper(this); + protected transient final Map unknownFields = new HashMap<>(); + protected transient final DirtyTracker tracker = new DirtyTracker(); + + private boolean registered = false; + + protected final void register() { + if (registered) + return; + + registered = true; + + @SuppressWarnings("unchecked") + var fields = (List>) FIELDS.get(this.getClass()); + for (var field : fields) { + Observable observable = field.get(this); + tracker.track(observable); + observable.addListener(helper); + } + } + + @Override + public void addListener(InvalidationListener listener) { + helper.addListener(listener); + } + + @Override + public void removeListener(InvalidationListener listener) { + helper.removeListener(listener); + } + + private static sealed abstract class ObservableField { + + public static ObservableField of(MethodHandles.Lookup lookup, Field field) { + String name; + List alternateNames; + + SerializedName serializedName = field.getAnnotation(SerializedName.class); + if (serializedName == null) { + name = field.getName(); + alternateNames = List.of(); + } else { + name = serializedName.value(); + alternateNames = List.of(serializedName.alternate()); + } + + VarHandle varHandle; + try { + varHandle = lookup.unreflectVarHandle(field); + } catch (IllegalAccessException e) { + throw new IllegalArgumentException(e); + } + + if (ObservableList.class.isAssignableFrom(field.getType())) { + Type listType = TypeUtils.getSupertype(field.getGenericType(), field.getType(), List.class); + if (!(listType instanceof ParameterizedType)) + throw new IllegalArgumentException("Cannot resolve the list type of " + field.getName()); + return new CollectionField<>(name, alternateNames, varHandle, listType, listType); + } else if (ObservableSet.class.isAssignableFrom(field.getType())) { + Type setType = TypeUtils.getSupertype(field.getGenericType(), field.getType(), Set.class); + if (!(setType instanceof ParameterizedType)) + throw new IllegalArgumentException("Cannot resolve the set type of " + field.getName()); + + ParameterizedType listType = TypeUtils.newParameterizedTypeWithOwner( + null, + List.class, + ((ParameterizedType) setType).getActualTypeArguments()[0] + ); + return new CollectionField<>(name, alternateNames, varHandle, setType, listType); + } else if (ObservableMap.class.isAssignableFrom(field.getType())) { + Type mapType = TypeUtils.getSupertype(field.getGenericType(), field.getType(), Map.class); + if (!(mapType instanceof ParameterizedType)) + throw new IllegalArgumentException("Cannot resolve the map type of " + field.getName()); + return new MapField<>(name, alternateNames, varHandle, mapType); + } else if (Property.class.isAssignableFrom(field.getType())) { + Type propertyType = TypeUtils.getSupertype(field.getGenericType(), field.getType(), Property.class); + if (!(propertyType instanceof ParameterizedType)) + throw new IllegalArgumentException("Cannot resolve the element type of " + field.getName()); + Type elementType = ((ParameterizedType) propertyType).getActualTypeArguments()[0]; + return new PropertyField<>(name, alternateNames, varHandle, elementType); + } else { + throw new IllegalArgumentException("Field " + field.getName() + " is not a property or observable collection"); + } + } + + protected final String serializedName; + protected final List alternateNames; + protected final VarHandle varHandle; + + private ObservableField(String serializedName, List alternateNames, VarHandle varHandle) { + this.serializedName = serializedName; + this.alternateNames = alternateNames; + this.varHandle = varHandle; + } + + public String getSerializedName() { + return serializedName; + } + + public List getAlternateNames() { + return alternateNames; + } + + public Observable get(T value) { + return (Observable) varHandle.get(value); + } + + public abstract void serialize(JsonObject result, T value, JsonSerializationContext context); + + public abstract void deserialize(T value, JsonElement element, JsonDeserializationContext context); + + private static final class PropertyField extends ObservableField { + private final Type elementType; + + PropertyField(String serializedName, List alternate, VarHandle varHandle, Type elementType) { + super(serializedName, alternate, varHandle); + this.elementType = elementType; + } + + @Override + public void serialize(JsonObject result, T value, JsonSerializationContext context) { + Property property = (Property) get(value); + + if (property instanceof RawPreservingProperty rawPreserving) { + JsonElement rawJson = rawPreserving.getRawJson(); + if (rawJson != null) { + result.add(getSerializedName(), rawJson); + return; + } + } + + JsonElement serialized = context.serialize(property.getValue(), elementType); + if (serialized != null && !serialized.isJsonNull()) + result.add(getSerializedName(), serialized); + } + + @Override + @SuppressWarnings({"unchecked", "rawtypes"}) + public void deserialize(T value, JsonElement element, JsonDeserializationContext context) { + Property property = (Property) get(value); + + try { + property.setValue(context.deserialize(element, elementType)); + } catch (Throwable e) { + if (property instanceof RawPreservingProperty) { + ((RawPreservingProperty) property).setRawJson(element); + } else { + throw e; + } + } + } + } + + private static final class CollectionField extends ObservableField { + 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; + + CollectionField(String serializedName, List alternate, VarHandle varHandle, + Type collectionType, Type listType) { + super(serializedName, alternate, varHandle); + this.collectionType = collectionType; + this.listType = listType; + } + + @Override + public void serialize(JsonObject result, T value, JsonSerializationContext context) { + result.add(getSerializedName(), context.serialize(get(value), collectionType)); + } + + @SuppressWarnings({"unchecked"}) + @Override + public void deserialize(T value, JsonElement element, JsonDeserializationContext context) { + List deserialized = context.deserialize(element, listType); + Object fieldValue = get(value); + + if (fieldValue instanceof ListProperty) { + ((ListProperty) fieldValue).set(FXCollections.observableList((List) deserialized)); + } else if (fieldValue instanceof ObservableList) { + ((ObservableList) fieldValue).setAll(deserialized); + } else if (fieldValue instanceof SetProperty) { + ((SetProperty) fieldValue).set(FXCollections.observableSet(new HashSet<>(deserialized))); + } else if (fieldValue instanceof ObservableSet) { + ObservableSet set = (ObservableSet) fieldValue; + set.clear(); + set.addAll(deserialized); + } else { + throw new JsonParseException("Unsupported field type: " + fieldValue.getClass()); + } + } + } + + private static final class MapField extends ObservableField { + private final Type mapType; + + MapField(String serializedName, List alternate, VarHandle varHandle, Type mapType) { + super(serializedName, alternate, varHandle); + this.mapType = mapType; + } + + @Override + public void serialize(JsonObject result, T value, JsonSerializationContext context) { + result.add(getSerializedName(), context.serialize(get(value), mapType)); + } + + @SuppressWarnings({"unchecked"}) + @Override + public void deserialize(T config, JsonElement element, JsonDeserializationContext context) { + Map deserialized = context.deserialize(element, mapType); + ObservableMap map = (ObservableMap) varHandle.get(config); + if (map instanceof MapProperty) + ((MapProperty) map).set(FXCollections.observableMap(deserialized)); + else { + map.clear(); + map.putAll(deserialized); + } + } + } + } + + public static abstract class Adapter + implements JsonSerializer, JsonDeserializer { + + protected abstract T createInstance(); + + @Override + public JsonElement serialize(T setting, Type typeOfSrc, JsonSerializationContext context) { + if (setting == null) + return JsonNull.INSTANCE; + + @SuppressWarnings("unchecked") + var fields = (List>) FIELDS.get(setting.getClass()); + + JsonObject result = new JsonObject(); + for (var field : fields) { + Observable observable = field.get(setting); + if (setting.tracker.isDirty(observable)) { + field.serialize(result, setting, context); + } + } + setting.unknownFields.forEach(result::add); + return result; + } + + @Override + public T deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { + if (json == null || json.isJsonNull()) + return null; + + if (!json.isJsonObject()) + throw new JsonParseException("Config is not an object: " + json); + + T setting = createInstance(); + @SuppressWarnings("unchecked") + var fields = (List>) FIELDS.get(setting.getClass()); + + var values = new LinkedHashMap<>(json.getAsJsonObject().asMap()); + for (ObservableField field : fields) { + JsonElement value = values.remove(field.getSerializedName()); + if (value == null) { + for (String alternateName : field.getAlternateNames()) { + value = values.remove(alternateName); + if (value != null) + break; + } + } + + if (value != null) { + setting.tracker.markDirty(field.get(setting)); + field.deserialize(setting, value, context); + } + } + + setting.unknownFields.putAll(values); + return setting; + } + } +} diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/RawPreservingObjectProperty.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/RawPreservingObjectProperty.java index 8a1a92fe7..2c3b026f0 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/RawPreservingObjectProperty.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/RawPreservingObjectProperty.java @@ -22,6 +22,7 @@ import javafx.beans.property.SimpleObjectProperty; import org.jetbrains.annotations.Nullable; /// @author Glavo +/// @see ObservableSetting public class RawPreservingObjectProperty extends SimpleObjectProperty implements RawPreservingProperty { private JsonElement rawJson;