Merge remote-tracking branch 'origin/develop' into develop

Author: dayyeeet

controller-runtime/src/main/kotlin/app/simplecloud/controller/runtime/YamlDirectoryRepository.kt

@@ -2,12 +2,16 @@ package app.simplecloud.controller.runtime
 
 import kotlinx.coroutines.*
 import org.apache.logging.log4j.LogManager
+import org.spongepowered.configurate.ConfigurationNode
 import org.spongepowered.configurate.ConfigurationOptions
 import org.spongepowered.configurate.kotlin.objectMapperFactory
 import org.spongepowered.configurate.loader.ParsingException
+import org.spongepowered.configurate.serialize.SerializationException
+import org.spongepowered.configurate.serialize.TypeSerializer
 import org.spongepowered.configurate.yaml.NodeStyle
 import org.spongepowered.configurate.yaml.YamlConfigurationLoader
 import java.io.File
+import java.lang.reflect.Type
 import java.nio.file.*
 
 
@@ -75,7 +79,9 @@ abstract class YamlDirectoryRepository<E, I>(
     protected fun save(fileName: String, entity: E) {
         val file = directory.resolve(fileName).toFile()
         val loader = getOrCreateLoader(file)
-        val node = loader.createNode(ConfigurationOptions.defaults())
+        val node = loader.createNode(ConfigurationOptions.defaults().serializers {
+            it.register(Enum::class.java, GenericEnumSerializer)
+        })
         node.set(clazz, entity)
         loader.save(node)
         entities[file] = entity
@@ -89,6 +95,7 @@ abstract class YamlDirectoryRepository<E, I>(
                 .defaultOptions { options ->
                     options.serializers { builder ->
                         builder.registerAnnotatedObjects(objectMapperFactory())
+                        builder.register(Enum::class.java, GenericEnumSerializer)
                     }
                 }.build()
         }
@@ -120,11 +127,12 @@ abstract class YamlDirectoryRepository<E, I>(
                                 watcherEvents.onCreate(entity)
                             }
                         }
+
                         StandardWatchEventKinds.ENTRY_MODIFY -> {
-                                val entity = load(resolvedPath.toFile())
-                                if (entity != null) {
-                                    watcherEvents.onModify(entity)
-                                }
+                            val entity = load(resolvedPath.toFile())
+                            if (entity != null) {
+                                watcherEvents.onModify(entity)
+                            }
                         }
 
                         StandardWatchEventKinds.ENTRY_DELETE -> {
@@ -164,4 +172,25 @@ abstract class YamlDirectoryRepository<E, I>(
         }
     }
 
+    private object GenericEnumSerializer : TypeSerializer<Enum<*>> {
+        override fun deserialize(type: Type, node: ConfigurationNode): Enum<*> {
+            val value = node.string ?: throw SerializationException("No value present in node")
+
+            if (type !is Class<*> || !type.isEnum) {
+                throw SerializationException("Type is not an enum class")
+            }
+
+            @Suppress("UNCHECKED_CAST")
+            return try {
+                java.lang.Enum.valueOf(type as Class<out Enum<*>>, value)
+            } catch (e: IllegalArgumentException) {
+                throw SerializationException("Invalid enum constant")
+            }
+        }
+
+        override fun serialize(type: Type, obj: Enum<*>?, node: ConfigurationNode) {
+            node.set(obj?.name)
+        }
+    }
+
 }