Some refactoring

Refactor ServerPulseVelocity to integrate Velocity-specific services and configurations, enhance logging, and implement metrics retrieval

Author: renvins

velocity/src/main/java/it/renvins/serverpulse/velocity/ServerPulseVelocity.java

@@ -9,11 +9,26 @@
 import com.velocitypowered.api.plugin.Plugin;
 import com.velocitypowered.api.plugin.annotation.DataDirectory;
 import com.velocitypowered.api.proxy.ProxyServer;
+import it.renvins.serverpulse.api.ServerPulseProvider;
+import it.renvins.serverpulse.api.metrics.IDiskRetriever;
+import it.renvins.serverpulse.api.metrics.IPingRetriever;
 import it.renvins.serverpulse.api.service.IDatabaseService;
 import it.renvins.serverpulse.api.service.IMetricsService;
 import it.renvins.serverpulse.common.DatabaseService;
 import it.renvins.serverpulse.common.MetricsService;
 import it.renvins.serverpulse.common.config.DatabaseConfiguration;
+import it.renvins.serverpulse.common.config.MetricsConfiguration;
+import it.renvins.serverpulse.common.logger.PulseLogger;
+import it.renvins.serverpulse.common.metrics.DiskRetriever;
+import it.renvins.serverpulse.common.platform.Platform;
+import it.renvins.serverpulse.common.scheduler.TaskScheduler;
+import it.renvins.serverpulse.velocity.config.VelocityConfiguration;
+import it.renvins.serverpulse.velocity.config.VelocityDatabaseConfiguration;
+import it.renvins.serverpulse.velocity.config.VelocityMetricsConfiguration;
+import it.renvins.serverpulse.velocity.logger.VelocityLogger;
+import it.renvins.serverpulse.velocity.metrics.VelocityPingRetriever;
+import it.renvins.serverpulse.velocity.platform.VelocityPlatform;
+import it.renvins.serverpulse.velocity.scheduler.VelocityTaskScheduler;
 import lombok.Getter;
 import org.slf4j.Logger;
 
@@ -22,25 +37,55 @@
 public class ServerPulseVelocity {
 
     @Getter private final ProxyServer server;
-    private final Logger logger;
     private final Path dataDirectory;
+    private final PulseLogger logger;
+
+    private final VelocityConfiguration config;
+
+    private final IDiskRetriever diskRetriever;
+    private final IPingRetriever pingRetriever;
 
     private IDatabaseService databaseService;
     private IMetricsService metricsService;
 
     @Inject
-    public ServerPulseVelocity(ProxyServer server, Logger logger, @DataDirectory Path dataDirectory) {
+    public ServerPulseVelocity(ProxyServer server, @DataDirectory Path dataDirectory, Logger logger) {
         this.server = server;
-        this.logger = logger;
         this.dataDirectory = dataDirectory;
+
+        this.logger = new VelocityLogger(logger);
+        this.config = new VelocityConfiguration(logger, dataDirectory, "config.yml");
+
+        this.diskRetriever = new DiskRetriever(dataDirectory.toFile());
+        this.pingRetriever = new VelocityPingRetriever(this);
     }
 
     @Subscribe
     public void onProxyInitialization() {
-        this.databaseService = new DatabaseService();
-        this.metricsService = new MetricsService();
-    }
+        logger.info("Loading configuration file...");
+        config.load();
+
+        if(!config.getConfig().getBoolean("metrics.enabled")) {
+            logger.error("Shutting down the plugin because metrics are disabled!");
+            server.shutdown();
+
+            return;
+        }
+        databaseService.load();
+        if (server.isShuttingDown()) {
+            return;
+        }
+
+        DatabaseConfiguration dbConfig = new VelocityDatabaseConfiguration(config);
+        MetricsConfiguration metricsConfig = new VelocityMetricsConfiguration(config);
+
+        Platform platform = new VelocityPlatform(this);
+        TaskScheduler scheduler = new VelocityTaskScheduler(this);
+
+        this.databaseService = new DatabaseService(logger, platform, dbConfig, scheduler);
+        this.metricsService = new MetricsService(logger, platform, metricsConfig, scheduler);
 
-    private void loadConfig() {
+        metricsService.load();
+        ServerPulseProvider.register(new ServerPulseVelocityAPI(databaseService, metricsService, diskRetriever, pingRetriever));
     }
 }

velocity/src/main/java/it/renvins/serverpulse/velocity/ServerPulseVelocityAPI.java

@@ -6,31 +6,33 @@
 import it.renvins.serverpulse.api.metrics.ITPSRetriever;
 import it.renvins.serverpulse.api.service.IDatabaseService;
 import it.renvins.serverpulse.api.service.IMetricsService;
+import lombok.RequiredArgsConstructor;
 
+@RequiredArgsConstructor
 public class ServerPulseVelocityAPI implements ServerPulseAPI {
 
+    private final IDatabaseService databaseService;
+    private final IMetricsService metricsService;
+    private final IDiskRetriever diskRetriever;
+    private final IPingRetriever pingRetriever;
+
     @Override
     public IDatabaseService getDatabaseService() {
-        return null;
+        return databaseService;
     }
 
     @Override
     public IMetricsService getMetricsService() {
-        return null;
-    }
-
-    @Override
-    public ITPSRetriever getTPSRetriever() {
-        return null;
+        return metricsService;
     }
 
     @Override
     public IDiskRetriever getDiskRetriever() {
-        return null;
+        return diskRetriever;
     }
 
     @Override
     public IPingRetriever getPingRetriever() {
-        return null;
+        return pingRetriever;
     }
 }

velocity/src/main/java/it/renvins/serverpulse/velocity/config/VelocityConfiguration.java

@@ -52,6 +52,8 @@ private boolean copyDefaultsFromResource() {
             if (in != null) {
                 Files.copy(in, config.getConfigurationFile().toPath());
                 return true;
+            } else {
+                return false;
             }
         } catch (IOException e) {
             logger.error("Failed to copy default configuration file: " + name, e);

velocity/src/main/java/it/renvins/serverpulse/velocity/logger/VelocityLogger.java

@@ -15,10 +15,15 @@ public void info(String message) {
     }
 
     @Override
-    public void warn(String message) {
+    public void warning(String message) {
         logger.warn(message);
     }
 
+    @Override
+    public void error(String message) {
+        logger.error(message);
+    }
+
     @Override
     public void error(String message, Throwable throwable) {
         logger.error(message, throwable);