From f7fbb3d57391b23fe7ba96e7c862f5533eb9313d Mon Sep 17 00:00:00 2001
From: nikky <git@nikky.moe>
Date: Sat, 13 Mar 2021 17:52:25 +0100
Subject: [PATCH] fix serialization conflict

---
 voodoo/src/main/kotlin/voodoo/pack/FileEntry.kt | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/voodoo/src/main/kotlin/voodoo/pack/FileEntry.kt b/voodoo/src/main/kotlin/voodoo/pack/FileEntry.kt
index bcabbc66..eb5d2fc1 100644
--- a/voodoo/src/main/kotlin/voodoo/pack/FileEntry.kt
+++ b/voodoo/src/main/kotlin/voodoo/pack/FileEntry.kt
@@ -16,9 +16,7 @@ import voodoo.data.flat.FlatEntry
 @Serializable
 sealed class FileEntry(
 ) {
-    companion object {
-        private val logger = KotlinLogging.logger{}
-    }
+    private val logger = KotlinLogging.logger{}
 
     interface Common {
         val applyOverrides: List<String>
@@ -158,8 +156,6 @@ sealed class FileEntry(
         override var validMcVersions: Set<String> = CommonComponent.DEFAULT.validMcVersions,
         override var invalidMcVersions: Set<String> = CommonComponent.DEFAULT.invalidMcVersions,
     ) : Common, FileEntry() {
-        @JsonSchema.StringEnum(["curse"])
-        private val type = "curse"
         override fun id() = id.takeUnless { it.isNullOrBlank() } ?: curse_projectName?.substringAfterLast('/')
         override fun applyOverride(override: EntryOverride): Curse {
             return when (override) {
@@ -222,8 +218,6 @@ sealed class FileEntry(
         override var validMcVersions: Set<String> = CommonComponent.DEFAULT.validMcVersions,
         override var invalidMcVersions: Set<String> = CommonComponent.DEFAULT.invalidMcVersions,
     ) : Common, FileEntry() {
-        @JsonSchema.StringEnum(["direct"])
-        private val type = "direct"
         override fun id() = id.takeUnless { it.isNullOrBlank() }  ?: direct_url.split(":|&|=".toRegex()).joinToString("_")
         override fun applyOverride(override: EntryOverride): Direct {
             return when (override) {
@@ -280,8 +274,6 @@ sealed class FileEntry(
         override var validMcVersions: Set<String> = CommonComponent.DEFAULT.validMcVersions,
         override var invalidMcVersions: Set<String> = CommonComponent.DEFAULT.invalidMcVersions,
     ) : Common, FileEntry() {
-        @JsonSchema.StringEnum(["jenkins"])
-        private val type = "jenkins"
         override fun id() = id.takeUnless { it.isNullOrBlank() }  ?: jenkins_job
         override fun applyOverride(override: EntryOverride): Jenkins {
             return when (override) {
@@ -339,8 +331,6 @@ sealed class FileEntry(
         override var validMcVersions: Set<String> = CommonComponent.DEFAULT.validMcVersions,
         override var invalidMcVersions: Set<String> = CommonComponent.DEFAULT.invalidMcVersions,
     ) : Common, FileEntry() {
-        @JsonSchema.StringEnum(["local"])
-        private val type = "local"
         override fun id() = id.takeUnless { it.isNullOrBlank() } ?: local_fileSrc
         override fun applyOverride(override: EntryOverride): Local {
             return when (override) {