Refactor config sections to proxied beans with Fluent API

Author: vLuckyyy

eternalcore-core/src/main/java/com/eternalcode/core/configuration/implementation/PluginConfiguration.java

@@ -2,23 +2,38 @@
 
 import com.eternalcode.core.configuration.AbstractConfigurationFile;
 import com.eternalcode.core.database.DatabaseConfig;
+import com.eternalcode.core.database.DatabaseSettings;
 import com.eternalcode.core.feature.afk.AfkConfig;
+import com.eternalcode.core.feature.afk.AfkSettings;
 import com.eternalcode.core.feature.automessage.AutoMessageConfig;
+import com.eternalcode.core.feature.automessage.AutoMessageSettings;
 import com.eternalcode.core.feature.butcher.ButcherConfig;
+import com.eternalcode.core.feature.butcher.ButcherSettings;
 import com.eternalcode.core.feature.chat.ChatConfig;
+import com.eternalcode.core.feature.chat.ChatSettings;
 import com.eternalcode.core.feature.helpop.HelpOpConfig;
+import com.eternalcode.core.feature.helpop.HelpOpSettings;
 import com.eternalcode.core.feature.home.HomesConfig;
+import com.eternalcode.core.feature.home.HomesSettings;
 import com.eternalcode.core.feature.jail.JailConfig;
+import com.eternalcode.core.feature.jail.JailSettings;
 import com.eternalcode.core.feature.lightning.LightningConfig;
-import com.eternalcode.core.feature.randomteleport.RandomTeleportSettingsImpl;
+import com.eternalcode.core.feature.lightning.LightningSettings;
+import com.eternalcode.core.feature.randomteleport.RandomTeleportConfig;
+import com.eternalcode.core.feature.randomteleport.RandomTeleportSettings;
 import com.eternalcode.core.feature.repair.RepairConfig;
+import com.eternalcode.core.feature.repair.RepairSettings;
 import com.eternalcode.core.feature.serverlinks.ServerLinksConfig;
+import com.eternalcode.core.feature.serverlinks.ServerLinksSettings;
 import com.eternalcode.core.feature.spawn.SpawnJoinConfig;
+import com.eternalcode.core.feature.spawn.SpawnJoinSettings;
 import com.eternalcode.core.feature.spawn.SpawnSettings;
 import com.eternalcode.core.feature.teleportrequest.TeleportRequestConfig;
+import com.eternalcode.core.feature.teleportrequest.TeleportRequestSettings;
 import com.eternalcode.core.feature.vanish.VanishConfig;
 import com.eternalcode.core.feature.vanish.VanishSettings;
 import com.eternalcode.core.feature.warp.WarpConfig;
+import com.eternalcode.core.feature.warp.WarpSettings;
 import com.eternalcode.core.injector.annotations.Bean;
 import com.eternalcode.core.injector.annotations.component.ConfigurationFile;
 import eu.okaeri.configs.OkaeriConfig;
@@ -41,28 +56,29 @@
     "# Source Code: https://github.com/EternalCodeTeam/EternalCore",
     "#",
 })
-
 @ConfigurationFile
 public class PluginConfiguration extends AbstractConfigurationFile {
 
     @Comment("# Whether the player should receive information about new plugin updates upon joining the server")
     public boolean shouldReceivePluginUpdates = true;
 
+    @Bean(proxied = DatabaseSettings.class)
     @Comment("")
     @Comment("# Database Configuration")
     @Comment("# Settings responsible for the database connection")
-    public DatabaseConfig database = new DatabaseConfig();
+    DatabaseConfig database = new DatabaseConfig();
 
+    @Bean(proxied = SpawnJoinSettings.class)
     @Comment("")
     @Comment("# Spawn & Join Configuration")
     @Comment("# Settings responsible for player spawn and join behavior")
-    public SpawnJoinConfig join = new SpawnJoinConfig();
+    SpawnJoinConfig join = new SpawnJoinConfig();
 
-    @Bean
+    @Bean(proxied = TeleportRequestSettings.class)
     @Comment("")
     @Comment("# Teleport Request Configuration")
     @Comment("# Settings for teleport requests between players")
-    public TeleportRequestConfig teleportAsk = new TeleportRequestConfig();
+    TeleportRequestConfig teleportAsk = new TeleportRequestConfig();
 
     @Bean
     @Comment("")
@@ -94,17 +110,17 @@ public Duration teleportationTimeToSpawn() {
         }
     }
 
-    @Bean
+    @Bean(proxied = RandomTeleportSettings.class)
     @Comment("")
     @Comment("# Random Teleport Configuration")
     @Comment("# Settings for random teleportation feature")
-    public RandomTeleportSettingsImpl randomTeleport = new RandomTeleportSettingsImpl();
+    RandomTeleportConfig randomTeleport = new RandomTeleportConfig();
 
-    @Bean
+    @Bean(proxied = HomesSettings.class)
     @Comment("")
     @Comment("# Homes Configuration")
     @Comment("# Settings for player home management")
-    public HomesConfig homes = new HomesConfig();
+    HomesConfig homes = new HomesConfig();
 
     @Comment("")
     @Comment("# Sound Configuration")
@@ -132,21 +148,23 @@ public static class Sounds extends OkaeriConfig {
         public float afterChatMessagePitch = 1F;
     }
 
-    @Bean
+    @Bean(proxied = ChatSettings.class)
     @Comment("")
     @Comment("# Chat Configuration")
     @Comment("# Settings for chat management and formatting")
-    public ChatConfig chat = new ChatConfig();
+    ChatConfig chat = new ChatConfig();
 
+    @Bean(proxied = HelpOpSettings.class)
     @Comment("")
     @Comment("# HelpOp Configuration")
     @Comment("# Settings for the help operator system")
-    public HelpOpConfig helpOp = new HelpOpConfig();
+    HelpOpConfig helpOp = new HelpOpConfig();
 
+    @Bean(proxied = RepairSettings.class)
     @Comment("")
     @Comment("# Repair Configuration")
     @Comment("# Settings for item repair functionality")
-    public RepairConfig repair = new RepairConfig();
+    RepairConfig repair = new RepairConfig();
 
     @Comment("")
     @Comment("# Format Configuration")
@@ -158,11 +176,11 @@ public static class Format extends OkaeriConfig {
         public String separator = "<gray>,</gray> ";
     }
 
-    @Bean
+    @Bean(proxied = AfkSettings.class)
     @Comment("")
     @Comment("# AFK Configuration")
     @Comment("# Settings for Away From Keyboard detection and management")
-    public AfkConfig afk = new AfkConfig();
+    AfkConfig afk = new AfkConfig();
 
     @Comment("")
     @Comment("# Items Configuration")
@@ -184,35 +202,37 @@ public static class Items extends OkaeriConfig {
         public boolean dropOnFullInventory = true;
     }
 
+    @Bean(proxied = WarpSettings.class)
     @Comment("")
     @Comment("# Warp Configuration")
     @Comment("# Settings for warp points management")
-    public WarpConfig warp = new WarpConfig();
+    WarpConfig warp = new WarpConfig();
 
+    @Bean(proxied = ButcherSettings.class)
     @Comment("")
     @Comment("# Butcher Configuration")
     @Comment("# Settings for entity removal functionality")
-    public ButcherConfig butcher = new ButcherConfig();
+    ButcherConfig butcher = new ButcherConfig();
 
-    @Bean
+    @Bean(proxied = AutoMessageSettings.class)
     @Comment("")
     @Comment("# Auto Message Configuration")
     @Comment("# Settings for automatic message broadcasting")
-    public AutoMessageConfig autoMessage = new AutoMessageConfig();
+    AutoMessageConfig autoMessage = new AutoMessageConfig();
 
-    @Bean
+    @Bean(proxied = JailSettings.class)
     @Comment("")
     @Comment("# Jail Configuration")
     @Comment("# Settings for player jail system")
-    public JailConfig jail = new JailConfig();
+    JailConfig jail = new JailConfig();
 
-    @Bean
+    @Bean(proxied = LightningSettings.class)
     @Comment("")
     @Comment("# Lightning Configuration")
     @Comment("# Settings for lightning strike effects")
-    public LightningConfig lightning = new LightningConfig();
+    LightningConfig lightning = new LightningConfig();
 
-    @Bean
+    @Bean(proxied = ServerLinksSettings.class)
     @Comment("")
     @Comment("# Server Links Configuration")
     @Comment("# Settings for server link management")

eternalcore-core/src/main/java/com/eternalcode/core/database/DatabaseConfig.java

@@ -2,8 +2,12 @@
 
 import eu.okaeri.configs.OkaeriConfig;
 import eu.okaeri.configs.annotation.Comment;
+import lombok.Getter;
+import lombok.experimental.Accessors;
 
 @SuppressWarnings({"FieldMayBeFinal", "FieldCanBeLocal"})
+@Getter
+@Accessors(fluent = true)
 public class DatabaseConfig extends OkaeriConfig implements DatabaseSettings {
 
     @Comment({"Type of the database driver (e.g., SQLITE, H2, MYSQL, MARIADB, POSTGRESQL).", "Determines the "
@@ -38,49 +42,4 @@ public class DatabaseConfig extends OkaeriConfig implements DatabaseSettings {
 
     @Comment("Connection timeout in milliseconds. This is the maximum time to wait for a connection from the pool.")
     public int timeout = 30000;
-
-    @Override
-    public DatabaseDriverType getDriverType() {
-        return this.databaseType;
-    }
-
-    @Override
-    public String getHostname() {
-        return this.hostname;
-    }
-
-    @Override
-    public int getPort() {
-        return this.port;
-    }
-
-    @Override
-    public String getDatabase() {
-        return this.database;
-    }
-
-    @Override
-    public String getUsername() {
-        return this.username;
-    }
-
-    @Override
-    public String getPassword() {
-        return this.password;
-    }
-
-    @Override
-    public boolean isSSL() {
-        return this.ssl;
-    }
-
-    @Override
-    public int poolSize() {
-        return this.poolSize;
-    }
-
-    @Override
-    public int timeout() {
-        return this.timeout;
-    }
 }

eternalcore-core/src/main/java/com/eternalcode/core/database/DatabaseManager.java

@@ -41,31 +41,31 @@ public void connect() {
 
             this.dataSource.setMaximumPoolSize(settings.poolSize());
             this.dataSource.setConnectionTimeout(settings.timeout());
-            this.dataSource.setUsername(settings.getUsername());
-            this.dataSource.setPassword(settings.getPassword());
+            this.dataSource.setUsername(settings.username());
+            this.dataSource.setPassword(settings.password());
 
-            DatabaseDriverType type = settings.getDriverType();
+            DatabaseDriverType type = settings.databaseType();
             this.dataSource.setDriverClassName(type.getDriver());
 
             String jdbcUrl = switch (type) {
                 case H2, SQLITE -> type.formatUrl(dataFolder);
                 case POSTGRESQL -> type.formatUrl(
-                    settings.getHostname(),
-                    settings.getPort(),
-                    settings.getDatabase(),
-                    DatabaseConnectionDriverConstant.sslParamForPostgreSQL(settings.isSSL())
+                    settings.hostname(),
+                    settings.port(),
+                    settings.database(),
+                    DatabaseConnectionDriverConstant.sslParamForPostgreSQL(settings.ssl())
                 );
                 case MYSQL -> type.formatUrl(
-                    settings.getHostname(),
-                    settings.getPort(),
-                    settings.getDatabase(),
-                    DatabaseConnectionDriverConstant.sslParamForMySQL(settings.isSSL())
+                    settings.hostname(),
+                    settings.port(),
+                    settings.database(),
+                    DatabaseConnectionDriverConstant.sslParamForMySQL(settings.ssl())
                 );
                 case MARIADB -> type.formatUrl(
-                    settings.getHostname(),
-                    settings.getPort(),
-                    settings.getDatabase(),
-                    String.valueOf(settings.isSSL())
+                    settings.hostname(),
+                    settings.port(),
+                    settings.database(),
+                    String.valueOf(settings.ssl())
                 );
             };
 

eternalcore-core/src/main/java/com/eternalcode/core/database/DatabaseManagerSetup.java

@@ -12,8 +12,8 @@
 class DatabaseManagerSetup {
 
     @Bean
-    DatabaseManager databaseManager(PluginConfiguration pluginConfiguration, Logger logger, File dataFolder) {
-        DatabaseManager databaseManager = new DatabaseManager(logger, dataFolder, pluginConfiguration.database);
+    DatabaseManager databaseManager(DatabaseSettings databaseSettings, Logger logger, File dataFolder) {
+        DatabaseManager databaseManager = new DatabaseManager(logger, dataFolder, databaseSettings);
 
         databaseManager.connect();
         return databaseManager;

eternalcore-core/src/main/java/com/eternalcode/core/database/DatabaseSettings.java

@@ -2,19 +2,19 @@
 
 public interface DatabaseSettings {
 
-    DatabaseDriverType getDriverType();
+    DatabaseDriverType databaseType();
 
-    String getHostname();
+    String hostname();
 
-    int getPort();
+    int port();
 
-    String getDatabase();
+    String database();
 
-    String getUsername();
+    String username();
 
-    String getPassword();
+    String password();
 
-    boolean isSSL();
+    boolean ssl();
 
     int poolSize();
 

eternalcore-core/src/main/java/com/eternalcode/core/feature/afk/AfkCommand.java

@@ -3,9 +3,7 @@
 import static com.eternalcode.core.feature.afk.AfkCommand.AFK_BYPASS_PERMISSION;
 
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
-
 import com.eternalcode.annotations.scan.permission.PermissionDocs;
-import com.eternalcode.core.configuration.implementation.PluginConfiguration;
 import com.eternalcode.core.delay.Delay;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
@@ -30,16 +28,16 @@ class AfkCommand {
     static final String AFK_BYPASS_PERMISSION = "eternalcore.afk.bypass";
 
     private final NoticeService noticeService;
-    private final PluginConfiguration pluginConfiguration;
+    private final AfkSettings afkSettings;
     private final AfkService afkService;
     private final Delay<UUID> delay;
 
     @Inject
-    AfkCommand(NoticeService noticeService, PluginConfiguration pluginConfiguration, AfkService afkService) {
+    AfkCommand(NoticeService noticeService, AfkSettings afkSettings, AfkService afkService) {
         this.noticeService = noticeService;
-        this.pluginConfiguration = pluginConfiguration;
+        this.afkSettings = afkSettings;
         this.afkService = afkService;
-        this.delay = new Delay<>(() -> this.pluginConfiguration.afk.getAfkDelay());
+        this.delay = new Delay<>(() -> this.afkSettings.afkCommandDelay());
     }
 
     @Execute
@@ -66,6 +64,6 @@ void execute(@Context Player player) {
         }
 
         this.afkService.switchAfk(uuid, AfkReason.COMMAND);
-        this.delay.markDelay(uuid, this.pluginConfiguration.afk.getAfkDelay());
+        this.delay.markDelay(uuid, this.afkSettings.afkCommandDelay());
     }
 }

eternalcore-core/src/main/java/com/eternalcode/core/feature/afk/AfkConfig.java

@@ -30,14 +30,4 @@ public class AfkConfig extends OkaeriConfig implements AfkSettings {
 
     @Comment("# Should a player be kicked from the game when marked as AFK?")
     public boolean kickOnAfk = false;
-
-    @Override
-    public Duration getAfkDelay() {
-        return this.afkCommandDelay;
-    }
-
-    @Override
-    public Duration getAfkInactivityTime() {
-        return this.afkInactivityTime;
-    }
 }