GH-953 Move to okaeri-configs. (#954)

* Fix

* Fix unit test.

* Not needed anymore.

* Follow Mike's review.

* Fix incorrect representer mapping for empty collections

* Fix incorrect representer mapping for empty collections

* Fix language config item.

* old config

* config changes

* Fixes

* Revert "old config"

This reverts commit 59e1d95.

* Fixes

* Fixes

* Fixes after merge.

* Fixes after merge.

---------

Co-authored-by: Norbert Dejlich <[email protected]>
Co-authored-by: Rollczi <[email protected]>

Author: 3 people

buildSrc/src/main/kotlin/Versions.kt

@@ -14,7 +14,7 @@ object Versions {
     const val PAPERLIB = "1.0.8"
     const val ADVENTURE_TEXT_MINIMESSAGE = "4.23.0"
     const val ADVENTURE_PLATFORM = "4.4.0"
-    const val CDN_CONFIGS = "1.14.9"
+    const val OKAERI_CONFIGS = "5.0.5"
 
     const val MARIA_DB = "3.5.4"
     const val POSTGRESQL = "42.7.7"
@@ -43,11 +43,7 @@ object Versions {
     const val SPOTIFY_COMPLETABLE_FUTURES = "0.3.6"
 
     // tests
-    const val EXPRESSIBLE_JUNIT = "1.3.6"
-    const val GROOVY_ALL = "3.0.25"
-    const val JUNIT_JUPITER_API = "5.13.4"
-    const val JUNIT_JUPITER_PARAMS = "5.13.4"
-    const val JUNIT_JUPITER_ENGINE = "5.13.4"
+    const val JUNIT_BOM = "5.10.2"
     const val MOCKITO_CORE = "5.18.0"
 
 }

buildSrc/src/main/kotlin/eternalcode-java-test.gradle.kts

@@ -3,22 +3,17 @@ plugins {
 }
 
 dependencies {
-    testImplementation("dev.rollczi:litecommands-core:${Versions.LITE_COMMANDS}")
-    testImplementation("org.spigotmc:spigot-api:${Versions.SPIGOT_API}")
-    testImplementation("net.dzikoysk:cdn:${Versions.CDN_CONFIGS}")
-    testImplementation("org.panda-lang:expressible-junit:${Versions.EXPRESSIBLE_JUNIT}")
-    testImplementation("org.codehaus.groovy:groovy-all:${Versions.GROOVY_ALL}")
+    testImplementation(platform("org.junit:junit-bom:${Versions.JUNIT_BOM}"))
 
-    testImplementation("org.junit.jupiter:junit-jupiter-api:${Versions.JUNIT_JUPITER_API}")
-    testImplementation("org.junit.jupiter:junit-jupiter-params:${Versions.JUNIT_JUPITER_PARAMS}")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${Versions.JUNIT_JUPITER_ENGINE}")
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.junit.jupiter:junit-jupiter-params")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 
     testImplementation("org.mockito:mockito-core:${Versions.MOCKITO_CORE}")
-    testImplementation("net.kyori:adventure-platform-bukkit:${Versions.ADVENTURE_PLATFORM}")
     testImplementation("net.kyori:adventure-platform-facet:${Versions.ADVENTURE_PLATFORM}")
-    testImplementation("net.kyori:adventure-text-minimessage:${Versions.ADVENTURE_TEXT_MINIMESSAGE}")
+    testImplementation("org.spigotmc:spigot-api:${Versions.SPIGOT_API}")
 }
 
 tasks.getByName<Test>("test") {
     useJUnitPlatform()
-}
+}

buildSrc/src/main/kotlin/eternalcore-repositories.gradle.kts

@@ -10,4 +10,5 @@ repositories {
     maven { url = uri("https://repo.eternalcode.pl/releases/") }
     maven { url = uri("https://repo.extendedclip.com/content/repositories/placeholderapi/") }
     maven("https://repo.stellardrift.ca/repository/snapshots/")
+    maven("https://storehouse.okaeri.eu/repository/maven-public/")
 }

buildSrc/src/main/kotlin/eternalcore-shadow.gradle.kts

@@ -10,6 +10,7 @@ afterEvaluate {
     dependencies {
         extension.compileOnlyDependencies.forEach {
             compileOnlyApi(it)
+            testImplementation(it)
         }
     }
 }

eternalcore-core/build.gradle.kts

@@ -37,14 +37,15 @@ eternalShadow {
     )
 
     // configuration
-    library("net.dzikoysk:cdn:${Versions.CDN_CONFIGS}")
+    library("eu.okaeri:okaeri-configs-yaml-snakeyaml:${Versions.OKAERI_CONFIGS}")
+    library("eu.okaeri:okaeri-configs-serdes-commons:${Versions.OKAERI_CONFIGS}")
     libraryRelocate(
-        "net.dzikoysk.cdn"
+        "eu.okaeri",
     )
 
     // Multification
     library("com.eternalcode:multification-bukkit:${Versions.MULTIFICATION}")
-    library("com.eternalcode:multification-cdn:${Versions.MULTIFICATION}")
+    library("com.eternalcode:multification-okaeri:${Versions.MULTIFICATION}")
     libraryRelocate(
         "com.eternalcode.multification",
     )

eternalcore-core/src/main/java/com/eternalcode/core/EternalCore.java

@@ -1,7 +1,7 @@
 package com.eternalcode.core;
 
 import com.eternalcode.core.compatibility.CompatibilityService;
-import com.eternalcode.core.configuration.ReloadableConfig;
+import com.eternalcode.core.configuration.EternalConfigurationFile;
 import com.eternalcode.core.configuration.compatibility.ConfigurationCompatibilityV21_2;
 import com.eternalcode.core.injector.DependencyInjector;
 import com.eternalcode.core.injector.annotations.component.Component;
@@ -79,8 +79,9 @@ public EternalCore(Plugin plugin) {
             beanFactory.addCandidate(beanCandidate);
         }
 
-        beanFactory.initializeCandidates(ConfigurationCompatibilityV21_2.class); // TODO: Remove this when the cdn will be fixed
-        beanFactory.initializeCandidates(ReloadableConfig.class); // TODO: Remove this when the cdn will be fixed
+        // TODO: Remove this when we resolve problem with DI - classes with @Subscribe annotation should be loaded first or when event is called
+        beanFactory.initializeCandidates(ConfigurationCompatibilityV21_2.class);
+        beanFactory.initializeCandidates(EternalConfigurationFile.class);
         beanFactory.initializeCandidates();
 
         this.publisher = beanFactory.getDependency(Publisher.class);

eternalcore-core/src/main/java/com/eternalcode/core/bridge/litecommand/argument/messages/ENArgumentMessages.java

@@ -1,24 +1,23 @@
 package com.eternalcode.core.bridge.litecommand.argument.messages;
 
 import com.eternalcode.multification.notice.Notice;
+import eu.okaeri.configs.OkaeriConfig;
+import eu.okaeri.configs.annotation.Comment;
 import lombok.Getter;
 import lombok.experimental.Accessors;
-import net.dzikoysk.cdn.entity.Contextual;
-import net.dzikoysk.cdn.entity.Description;
 
 @Getter
 @Accessors(fluent = true)
-@Contextual
-public class ENArgumentMessages implements ArgumentMessages {
-    @Description("# {PERMISSIONS} - Required permission")
+public class ENArgumentMessages extends OkaeriConfig implements ArgumentMessages {
+    @Comment("# {PERMISSIONS} - Required permission")
     public Notice permissionMessage = Notice.chat("<red>✘ <dark_red>You don't have permission to perform this command! <red>({PERMISSIONS})");
 
-    @Description({" ", "# {USAGE} - Correct usage"})
+    @Comment({" ", "# {USAGE} - Correct usage"})
     public Notice usageMessage = Notice.chat("<gold>✘ <white>Correct usage: <gold>{USAGE}");
     public Notice usageMessageHead = Notice.chat("<green>► <white>Correct usage:");
     public Notice usageMessageEntry = Notice.chat("<green>► <white>{USAGE}");
 
-    @Description(" ")
+    @Comment(" ")
     public Notice missingPlayerName = Notice.chat("<red>✘ <dark_red>You must provide a player name!");
     public Notice offlinePlayer = Notice.chat("<red>✘ <dark_red>This player is currently offline!");
     public Notice onlyPlayer = Notice.chat("<red>✘ <dark_red>Command is only for players!");

eternalcore-core/src/main/java/com/eternalcode/core/bridge/litecommand/argument/messages/PLArgumentMessages.java

@@ -1,25 +1,24 @@
 package com.eternalcode.core.bridge.litecommand.argument.messages;
 
 import com.eternalcode.multification.notice.Notice;
+import eu.okaeri.configs.OkaeriConfig;
+import eu.okaeri.configs.annotation.Comment;
 import lombok.Getter;
 import lombok.experimental.Accessors;
-import net.dzikoysk.cdn.entity.Contextual;
-import net.dzikoysk.cdn.entity.Description;
 
 @Getter
 @Accessors(fluent = true)
-@Contextual
-public class PLArgumentMessages implements ArgumentMessages {
-    @Description("# {PERMISSIONS} - Wyświetla wymagane uprawnienia")
+public class PLArgumentMessages extends OkaeriConfig implements ArgumentMessages {
+    @Comment("# {PERMISSIONS} - Wyświetla wymagane uprawnienia")
     public Notice permissionMessage =
         Notice.chat("<red>✘ <dark_red>Nie masz uprawnień do tej komendy! <red>({PERMISSIONS})");
 
-    @Description({" ", "# {USAGE} - Wyświetla poprawne użycie komendy"})
+    @Comment({" ", "# {USAGE} - Wyświetla poprawne użycie komendy"})
     public Notice usageMessage = Notice.chat("<gold>✘ <white>Poprawne użycie: <gold>{USAGE}");
     public Notice usageMessageHead = Notice.chat("<gold>✘ <white>Poprawne użycie:");
     public Notice usageMessageEntry = Notice.chat("<gold>✘ <white>{USAGE}");
 
-    @Description(" ")
+    @Comment(" ")
     public Notice missingPlayerName = Notice.chat("<red>✘ <dark_red>Musisz podać nazwę gracza!");
     public Notice offlinePlayer = Notice.chat("<red>✘ <dark_red>Ten gracz jest obecnie offline!");
     public Notice onlyPlayer = Notice.chat("<red>✘ <dark_red>Ta komenda jest dostępna tylko dla graczy!");

eternalcore-core/src/main/java/com/eternalcode/core/bridge/litecommand/configurator/config/Command.java

@@ -1,14 +1,13 @@
 package com.eternalcode.core.bridge.litecommand.configurator.config;
 
-import net.dzikoysk.cdn.entity.Contextual;
+import java.io.Serializable;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-@Contextual
-public class Command {
+public class Command implements Serializable {
 
     public String name;
     public boolean enabled;

eternalcore-core/src/main/java/com/eternalcode/core/bridge/litecommand/configurator/config/CommandConfiguration.java

@@ -1,13 +1,11 @@
 package com.eternalcode.core.bridge.litecommand.configurator.config;
 
-import com.eternalcode.core.configuration.ReloadableConfig;
+import com.eternalcode.core.configuration.AbstractConfigurationFile;
 import com.eternalcode.core.feature.gamemode.GameModeArgumentSettings;
 import com.eternalcode.core.injector.annotations.Bean;
 import com.eternalcode.core.injector.annotations.component.ConfigurationFile;
-import net.dzikoysk.cdn.entity.Contextual;
-import net.dzikoysk.cdn.entity.Description;
-import net.dzikoysk.cdn.source.Resource;
-import net.dzikoysk.cdn.source.Source;
+import eu.okaeri.configs.OkaeriConfig;
+import eu.okaeri.configs.annotation.Comment;
 import org.bukkit.GameMode;
 
 import java.io.File;
@@ -18,15 +16,19 @@
 import java.util.Optional;
 
 @ConfigurationFile
-public class CommandConfiguration implements ReloadableConfig {
+public class CommandConfiguration extends AbstractConfigurationFile {
 
     @Bean
     public Argument argument = new Argument();
 
-    @Contextual
-    public static class Argument implements GameModeArgumentSettings {
+    @Override
+    public File getConfigFile(File dataFolder) {
+        return new File(dataFolder, "commands.yml");
+    }
+
+    public static class Argument extends OkaeriConfig implements GameModeArgumentSettings {
 
-        @Description("# List of aliases for gamemode argument")
+        @Comment("# List of aliases for gamemode argument")
         public Map<GameMode, List<String>> gameModeAliases = Map.of(
                 GameMode.SURVIVAL, List.of("survival", "0"),
                 GameMode.CREATIVE, List.of("creative", "1"),
@@ -53,7 +55,7 @@ public Collection<String> getAvailableAliases() {
 
     }
 
-    @Description("# List of shortcuts for gamemode command")
+    @Comment("# List of shortcuts for gamemode command")
     public Map<GameMode, List<String>> gameModeShortCuts = Map.of(
                 GameMode.SURVIVAL, Collections.singletonList("gms"),
                 GameMode.CREATIVE, Collections.singletonList("gmc"),
@@ -77,7 +79,7 @@ public GameMode getGameMode(String label) {
                 .orElse(null);
     }
 
-    @Description({
+    @Comment({
         "# This file allows you to configure commands.",
         "# You can change command name, aliases and permissions.",
         "# You can edit the commands as follows this template:",
@@ -107,9 +109,4 @@ public GameMode getGameMode(String label) {
             true)
     );
 
-    @Override
-    public Resource resource(File folder) {
-        return Source.of(folder, "commands.yml");
-    }
-
 }