fix profile saving

src/main/java/de/bixilon/minosoft/config/profile/ProfileManager.kt

@@ -13,7 +13,9 @@
 
 package de.bixilon.minosoft.config.profile
 
+import com.fasterxml.jackson.databind.InjectableValues
 import com.fasterxml.jackson.databind.JavaType
+import com.fasterxml.jackson.databind.ObjectMapper
 import de.bixilon.kutil.collections.map.bi.AbstractMutableBiMap
 import de.bixilon.kutil.concurrent.pool.DefaultThreadPool
 import de.bixilon.kutil.exception.ExceptionUtil.tryCatch
@@ -40,6 +42,7 @@ import java.util.concurrent.locks.ReentrantLock
 
 
 interface ProfileManager<T : Profile> {
+    val mapper: ObjectMapper
     val namespace: ResourceLocation
     val latestVersion: Int
     val saveLock: ReentrantLock
@@ -68,13 +71,19 @@ interface ProfileManager<T : Profile> {
     fun migrate(from: Int, data: MutableMap<String, Any?>) = Unit
 
 
-    fun load(name: String, data: MutableMap<String, Any?>?): T {
+    fun updateValue(profile: T, data: MutableMap<String, Any?>?) {
-        val profile = if (data == null) {
+        profile.reloading = true
-            createProfile(name)
+        val injectable = InjectableValues.Std()
-        } else {
+        injectable.addValue(profileClass, profile)
-            Jackson.MAPPER.convertValue(data, jacksonProfileType) as T
+        mapper.injectableValues = injectable
-        }
+        mapper.updateValue(profile, data)
         profile.saved = true
+        profile.reloading = false
+    }
+
+    fun load(name: String, data: MutableMap<String, Any?>?): T {
+        val profile = createProfile()
+        updateValue(profile, data)
         profiles[name] = profile
         return profile
     }
@@ -248,9 +257,7 @@ interface ProfileManager<T : Profile> {
             }
             try {
                 val data = readAndMigrate(path.path).second
-                val dataString = Jackson.MAPPER.writeValueAsString(data)
+                updateValue(profile, data)
-                profile.reloading = true
-                Jackson.MAPPER.readerForUpdating(profile).readValue<T>(dataString)
             } catch (exception: Exception) {
                 exception.printStackTrace()
                 exception.crash()

src/main/java/de/bixilon/minosoft/config/profile/delegate/AbstractDelegate.kt

@@ -30,4 +30,11 @@ interface AbstractDelegate<T> : TextFormattable {
     override fun toText(): Any? {
         return get()
     }
+
+    fun queueSave() {
+        if (profile.reloading) {
+            return
+        }
+        profile.saved = false
+    }
 }

src/main/java/de/bixilon/minosoft/config/profile/delegate/SimpleDelegate.kt

@@ -16,6 +16,7 @@ package de.bixilon.minosoft.config.profile.delegate
 import de.bixilon.kutil.observer.DataObserver
 import de.bixilon.minosoft.config.profile.profiles.Profile
 import de.bixilon.minosoft.util.KUtil.minosoft
+import kotlin.reflect.KProperty
 
 open class SimpleDelegate<T>(
     override val profile: Profile,
@@ -32,6 +33,11 @@ open class SimpleDelegate<T>(
         this.value = value
     }
 
+    override fun setValue(thisRef: Any, property: KProperty<*>, value: T) {
+        super.setValue(thisRef, property, value)
+        queueSave()
+    }
+
     override fun validate(value: T) {
         verify?.invoke(value)
     }

src/main/java/de/bixilon/minosoft/config/profile/delegate/types/list/ListDelegate.kt

@@ -17,6 +17,7 @@ import de.bixilon.kutil.observer.list.ListObserver
 import de.bixilon.minosoft.config.profile.delegate.AbstractDelegate
 import de.bixilon.minosoft.config.profile.profiles.Profile
 import de.bixilon.minosoft.util.KUtil.minosoft
+import kotlin.reflect.KProperty
 
 class ListDelegate<V>(
     override val profile: Profile,
@@ -26,11 +27,20 @@ class ListDelegate<V>(
     override val name = minosoft(name)
     override val description = minosoft("$name.description")
 
+    init {
+        value.addObserver { queueSave() }
+    }
+
     override fun get() = value
     override fun set(value: MutableList<V>) {
         validate(value)
         this.value.unsafe = value
     }
 
+    override fun setValue(thisRef: Any, property: KProperty<*>, value: MutableList<V>) {
+        super.setValue(thisRef, property, value)
+        queueSave()
+    }
+
     override fun validate(value: MutableList<V>) = Unit
 }

src/main/java/de/bixilon/minosoft/config/profile/delegate/types/map/MapDelegate.kt

@@ -17,6 +17,7 @@ import de.bixilon.kutil.observer.map.MapObserver
 import de.bixilon.minosoft.config.profile.delegate.AbstractDelegate
 import de.bixilon.minosoft.config.profile.profiles.Profile
 import de.bixilon.minosoft.util.KUtil.minosoft
+import kotlin.reflect.KProperty
 
 open class MapDelegate<K, V>(
     override val profile: Profile,
@@ -26,11 +27,20 @@ open class MapDelegate<K, V>(
     override val name = minosoft(name)
     override val description = minosoft("$name.description")
 
+    init {
+        value.addObserver { queueSave() }
+    }
+
     override fun get() = value
     override fun set(value: MutableMap<K, V>) {
         validate(value)
         this.value.unsafe = value
     }
 
+    override fun setValue(thisRef: Any, property: KProperty<*>, value: MutableMap<K, V>) {
+        super.setValue(thisRef, property, value)
+        queueSave()
+    }
+
     override fun validate(value: MutableMap<K, V>) = Unit
 }

src/main/java/de/bixilon/minosoft/config/profile/delegate/types/set/SetDelegate.kt

@@ -17,6 +17,7 @@ import de.bixilon.kutil.observer.set.SetObserver
 import de.bixilon.minosoft.config.profile.delegate.AbstractDelegate
 import de.bixilon.minosoft.config.profile.profiles.Profile
 import de.bixilon.minosoft.util.KUtil.minosoft
+import kotlin.reflect.KProperty
 
 class SetDelegate<V>(
     override val profile: Profile,
@@ -26,11 +27,20 @@ class SetDelegate<V>(
     override val name = minosoft(name)
     override val description = minosoft("$name.description")
 
+    init {
+        value.addObserver { queueSave() }
+    }
+
     override fun get() = value
     override fun set(value: MutableSet<V>) {
         validate(value)
         this.value.unsafe = value
     }
 
+    override fun setValue(thisRef: Any, property: KProperty<*>, value: MutableSet<V>) {
+        super.setValue(thisRef, property, value)
+        queueSave()
+    }
+
     override fun validate(value: MutableSet<V>) = Unit
 }

src/main/java/de/bixilon/minosoft/config/profile/profiles/account/AccountProfileManager.kt

@@ -27,6 +27,7 @@ import org.kordamp.ikonli.fontawesome5.FontAwesomeSolid
 import java.util.concurrent.locks.ReentrantLock
 
 object AccountProfileManager : ProfileManager<AccountProfile> {
+    override val mapper = Jackson.MAPPER.copy()
     override val namespace = "minosoft:account".toResourceLocation()
     override val latestVersion get() = 1
     override val saveLock = ReentrantLock()

src/main/java/de/bixilon/minosoft/config/profile/profiles/audio/AudioProfileManager.kt

@@ -28,6 +28,7 @@ import org.kordamp.ikonli.fontawesome5.FontAwesomeSolid
 import java.util.concurrent.locks.ReentrantLock
 
 object AudioProfileManager : ProfileManager<AudioProfile> {
+    override val mapper = Jackson.MAPPER.copy()
     override val namespace = "minosoft:audio".toResourceLocation()
     override val latestVersion get() = 1
     override val saveLock = ReentrantLock()

src/main/java/de/bixilon/minosoft/config/profile/profiles/block/BlockProfileManager.kt

@@ -27,6 +27,7 @@ import org.kordamp.ikonli.fontawesome5.FontAwesomeSolid
 import java.util.concurrent.locks.ReentrantLock
 
 object BlockProfileManager : ProfileManager<BlockProfile> {
+    override val mapper = Jackson.MAPPER.copy()
     override val namespace = "minosoft:block".toResourceLocation()
     override val latestVersion get() = 1
     override val saveLock = ReentrantLock()

src/main/java/de/bixilon/minosoft/config/profile/profiles/connection/ConnectionProfileManager.kt

@@ -27,6 +27,7 @@ import org.kordamp.ikonli.fontawesome5.FontAwesomeSolid
 import java.util.concurrent.locks.ReentrantLock
 
 object ConnectionProfileManager : ProfileManager<ConnectionProfile> {
+    override val mapper = Jackson.MAPPER.copy()
     override val namespace = "minosoft:connection".toResourceLocation()
     override val latestVersion get() = 1
     override val saveLock = ReentrantLock()

src/main/java/de/bixilon/minosoft/config/profile/profiles/controls/ControlsProfileManager.kt

@@ -27,6 +27,7 @@ import org.kordamp.ikonli.fontawesome5.FontAwesomeSolid
 import java.util.concurrent.locks.ReentrantLock
 
 object ControlsProfileManager : ProfileManager<ControlsProfile> {
+    override val mapper = Jackson.MAPPER.copy()
     override val namespace = "minosoft:controls".toResourceLocation()
     override val latestVersion get() = 1
     override val saveLock = ReentrantLock()

src/main/java/de/bixilon/minosoft/config/profile/profiles/entity/EntityProfileManager.kt

@@ -27,6 +27,7 @@ import org.kordamp.ikonli.fontawesome5.FontAwesomeSolid
 import java.util.concurrent.locks.ReentrantLock
 
 object EntityProfileManager : ProfileManager<EntityProfile> {
+    override val mapper = Jackson.MAPPER.copy()
     override val namespace = "minosoft:entity".toResourceLocation()
     override val latestVersion get() = 1
     override val saveLock = ReentrantLock()

src/main/java/de/bixilon/minosoft/config/profile/profiles/eros/ErosProfileManager.kt

@@ -27,6 +27,7 @@ import org.kordamp.ikonli.fontawesome5.FontAwesomeSolid
 import java.util.concurrent.locks.ReentrantLock
 
 object ErosProfileManager : ProfileManager<ErosProfile> {
+    override val mapper = Jackson.MAPPER.copy()
     override val namespace = "minosoft:eros".toResourceLocation()
     override val latestVersion get() = 1
     override val saveLock = ReentrantLock()

src/main/java/de/bixilon/minosoft/config/profile/profiles/eros/server/ServerC.kt

@@ -13,7 +13,6 @@
 
 package de.bixilon.minosoft.config.profile.profiles.eros.server
 
-import com.fasterxml.jackson.annotation.JsonInclude
 import de.bixilon.minosoft.config.profile.delegate.types.list.ListDelegate
 import de.bixilon.minosoft.config.profile.profiles.eros.ErosProfile
 import de.bixilon.minosoft.config.profile.profiles.eros.server.entries.ErosServer
@@ -24,6 +23,5 @@ class ServerC(profile: ErosProfile) {
     val modify = ModifyC(profile)
     val list = ListC(profile)
 
-    @get:JsonInclude(JsonInclude.Include.NON_EMPTY)
     var entries: MutableList<ErosServer> by ListDelegate(profile, mutableListOf(), "")
 }

src/main/java/de/bixilon/minosoft/config/profile/profiles/eros/server/entries/ErosServer.kt

@@ -13,6 +13,7 @@
 
 package de.bixilon.minosoft.config.profile.profiles.eros.server.entries
 
+import com.fasterxml.jackson.annotation.JacksonInject
 import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.annotation.JsonProperty
@@ -31,13 +32,14 @@ import de.bixilon.minosoft.data.registries.versions.Versions
 import de.bixilon.minosoft.data.text.ChatComponent
 
 class ErosServer(
-    profile: ErosProfile,
+    @JacksonInject profile: ErosProfile,
     address: String,
     name: ChatComponent = ChatComponent.of(address),
     forcedVersion: Any? = null, // must be version
     profiles: MutableMap<ResourceLocation, String> = mutableMapOf(),
     queryVersion: Boolean = true,
 ) : AbstractServer {
+
     init {
         check(forcedVersion == null || forcedVersion is Version)
     }

src/main/java/de/bixilon/minosoft/config/profile/profiles/gui/GUIProfileManager.kt

@@ -27,6 +27,7 @@ import org.kordamp.ikonli.fontawesome5.FontAwesomeSolid
 import java.util.concurrent.locks.ReentrantLock
 
 object GUIProfileManager : ProfileManager<GUIProfile> {
+    override val mapper = Jackson.MAPPER.copy()
     override val namespace = "minosoft:gui".toResourceLocation()
     override val latestVersion get() = 1
     override val saveLock = ReentrantLock()

src/main/java/de/bixilon/minosoft/config/profile/profiles/other/OtherProfileManager.kt

@@ -27,6 +27,7 @@ import org.kordamp.ikonli.fontawesome5.FontAwesomeSolid
 import java.util.concurrent.locks.ReentrantLock
 
 object OtherProfileManager : ProfileManager<OtherProfile> {
+    override val mapper = Jackson.MAPPER.copy()
     override val namespace = "minosoft:other".toResourceLocation()
     override val latestVersion get() = 2
     override val saveLock = ReentrantLock()

src/main/java/de/bixilon/minosoft/config/profile/profiles/particle/ParticleProfileManager.kt

@@ -27,6 +27,7 @@ import org.kordamp.ikonli.fontawesome5.FontAwesomeSolid
 import java.util.concurrent.locks.ReentrantLock
 
 object ParticleProfileManager : ProfileManager<ParticleProfile> {
+    override val mapper = Jackson.MAPPER.copy()
     override val namespace = "minosoft:particle".toResourceLocation()
     override val latestVersion get() = 1
     override val saveLock = ReentrantLock()

src/main/java/de/bixilon/minosoft/config/profile/profiles/rendering/RenderingProfileManager.kt

@@ -27,6 +27,7 @@ import org.kordamp.ikonli.fontawesome5.FontAwesomeSolid
 import java.util.concurrent.locks.ReentrantLock
 
 object RenderingProfileManager : ProfileManager<RenderingProfile> {
+    override val mapper = Jackson.MAPPER.copy()
     override val namespace = "minosoft:rendering".toResourceLocation()
     override val latestVersion get() = 1
     override val saveLock = ReentrantLock()

src/main/java/de/bixilon/minosoft/config/profile/profiles/resources/ResourcesProfileManager.kt

@@ -27,6 +27,7 @@ import org.kordamp.ikonli.fontawesome5.FontAwesomeSolid
 import java.util.concurrent.locks.ReentrantLock
 
 object ResourcesProfileManager : ProfileManager<ResourcesProfile> {
+    override val mapper = Jackson.MAPPER.copy()
     override val namespace = "minosoft:resources".toResourceLocation()
     override val latestVersion get() = 1
     override val saveLock = ReentrantLock()