refactor(injector): simplify component processor registration

Author: imDMK

playtime-core/src/main/java/com/github/imdmk/playtime/core/PlayTimeCore.java

@@ -44,7 +44,7 @@ final class PlayTimeCore {
         this.publisher = new LocalPublisher(injector);
 
         ComponentManager componentManager = new ComponentManager(injector, BASE_PACKAGE)
-                .addProcessors(ComponentProcessors.defaults(plugin))
+                .addProcessors(ComponentProcessors.defaults())
                 .addPostProcessor((instance, context) -> this.publisher.subscribe(instance));
 
         componentManager.scanAll();

playtime-core/src/main/java/com/github/imdmk/playtime/core/database/DatabaseManager.java

@@ -0,0 +1,12 @@
+package com.github.imdmk.playtime.core.database;
+
+import com.j256.ormlite.support.ConnectionSource;
+
+import java.sql.SQLException;
+
+public interface DatabaseManager {
+
+    void start() throws SQLException;
+
+    ConnectionSource getConnectionSource();
+}

…ime/core/database/DatabaseBootstrap.java …e/core/database/DatabaseManagerImpl.javaplaytime-core/src/main/java/com/github/imdmk/playtime/core/database/DatabaseBootstrap.java renamed to playtime-core/src/main/java/com/github/imdmk/playtime/core/database/DatabaseManagerImpl.java playtime-core/src/main/java/com/github/imdmk/playtime/core/database/DatabaseBootstrap.java renamed to playtime-core/src/main/java/com/github/imdmk/playtime/core/database/DatabaseManagerImpl.java

@@ -14,15 +14,15 @@
 import java.sql.SQLException;
 
 @Database
-public final class DatabaseBootstrap {
+public final class DatabaseManagerImpl implements DatabaseManager {
 
     private final File dataFolder;
     private final DatabaseConfig config;
 
     private final DataSourceConnector dataConnector;
 
     @Inject
-    public DatabaseBootstrap(
+    public DatabaseManagerImpl(
             File dataFolder,
             PluginLogger logger,
             DatabaseConfig config
@@ -35,16 +35,14 @@ public DatabaseBootstrap(
         this.dataConnector = new DataSourceConnector(logger, factory, configurer);
     }
 
-    public void start() {
-        try {
-            dataConnector.connect(config, dataFolder);
-        } catch (SQLException e) {
-            throw new RuntimeException(e);
-        }
+    @Override
+    public void start() throws SQLException {
+        dataConnector.connect(config, dataFolder);
     }
 
+    @Override
     @Nullable
-    public ConnectionSource getConnection() {
+    public ConnectionSource getConnectionSource() {
         return dataConnector.getConnectionSource();
     }
 

playtime-core/src/main/java/com/github/imdmk/playtime/core/database/repository/ormlite/OrmLiteRepository.java

@@ -1,6 +1,6 @@
 package com.github.imdmk.playtime.core.database.repository.ormlite;
 
-import com.github.imdmk.playtime.core.database.DatabaseBootstrap;
+import com.github.imdmk.playtime.core.database.DatabaseManager;
 import com.github.imdmk.playtime.core.database.repository.RepositoryBootstrap;
 import com.github.imdmk.playtime.core.database.repository.RepositoryInitializationException;
 import com.github.imdmk.playtime.core.platform.logger.PluginLogger;
@@ -29,17 +29,17 @@ public abstract class OrmLiteRepository<T, ID>
     protected final TaskScheduler scheduler;
     protected volatile Dao<T, ID> dao;
 
-    private final DatabaseBootstrap databaseBootstrap;
+    private final DatabaseManager databaseManager;
 
     @Inject
     protected OrmLiteRepository(
             PluginLogger logger,
             TaskScheduler scheduler,
-            DatabaseBootstrap databaseBootstrap
+            DatabaseManager databaseManager
     ) {
         this.logger = logger;
         this.scheduler = scheduler;
-        this.databaseBootstrap = databaseBootstrap;
+        this.databaseManager = databaseManager;
         configureOrmLiteLogger();
     }
 
@@ -51,7 +51,7 @@ protected List<Class<?>> entitySubClasses() {
 
     @Override
     public void start() throws RepositoryInitializationException {
-        ConnectionSource connection = databaseBootstrap.getConnection();
+        ConnectionSource connection = databaseManager.getConnectionSource();
         if (connection == null) {
             throw new IllegalStateException("DatabaseBootstrap not started before repository initialization");
         }

playtime-core/src/main/java/com/github/imdmk/playtime/core/feature/playtime/PlayTimeListener.java

@@ -1,15 +1,13 @@
 package com.github.imdmk.playtime.core.feature.playtime;
 
 import com.github.imdmk.playtime.api.PlayTime;
-import com.github.imdmk.playtime.core.injector.annotations.Controller;
+import com.github.imdmk.playtime.core.injector.annotations.PluginListener;
 import com.github.imdmk.playtime.core.injector.subscriber.Subscribe;
 import com.github.imdmk.playtime.core.injector.subscriber.event.PlayTimeShutdownEvent;
 import com.github.imdmk.playtime.core.platform.logger.PluginLogger;
 import com.github.imdmk.playtime.core.platform.playtime.PlayTimeAdapter;
 import org.bukkit.Server;
-import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.server.ServerLoadEvent;
@@ -18,8 +16,8 @@
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 
-@Controller
-final class PlayTimeListener implements Listener {
+@PluginListener
+final class PlayTimeListener implements org.bukkit.event.Listener {
 
     private final Server server;
     private final PluginLogger logger;

playtime-core/src/main/java/com/github/imdmk/playtime/core/feature/playtime/placeholder/PlayTimePlaceholder.java

@@ -2,7 +2,7 @@
 
 import com.github.imdmk.playtime.core.feature.playtime.PlayTimeUser;
 import com.github.imdmk.playtime.core.feature.playtime.PlayTimeUserService;
-import com.github.imdmk.playtime.core.injector.annotations.placeholderapi.Placeholder;
+import com.github.imdmk.playtime.core.injector.annotations.placeholder.Placeholder;
 import com.github.imdmk.playtime.core.platform.placeholder.PluginPlaceholder;
 import com.github.imdmk.playtime.core.time.DurationService;
 import org.bukkit.entity.Player;

playtime-core/src/main/java/com/github/imdmk/playtime/core/feature/playtime/repository/PlayTimeUserRepositoryOrmLite.java

@@ -1,6 +1,6 @@
 package com.github.imdmk.playtime.core.feature.playtime.repository;
 
-import com.github.imdmk.playtime.core.database.DatabaseBootstrap;
+import com.github.imdmk.playtime.core.database.DatabaseManager;
 import com.github.imdmk.playtime.core.database.repository.ormlite.OrmLiteRepository;
 import com.github.imdmk.playtime.core.feature.playtime.PlayTimeUser;
 import com.github.imdmk.playtime.core.injector.annotations.Repository;
@@ -24,9 +24,9 @@ final class PlayTimeUserRepositoryOrmLite
     PlayTimeUserRepositoryOrmLite(
             PluginLogger logger,
             TaskScheduler taskScheduler,
-            DatabaseBootstrap databaseBootstrap
+            DatabaseManager databaseManager
     ) {
-        super(logger, taskScheduler, databaseBootstrap);
+        super(logger, taskScheduler, databaseManager);
     }
 
     @Override

playtime-core/src/main/java/com/github/imdmk/playtime/core/feature/playtime/top/gui/PlayTimeTopGui.java

@@ -1,7 +1,7 @@
 package com.github.imdmk.playtime.core.feature.playtime.top.gui;
 
 import com.github.imdmk.playtime.core.feature.playtime.PlayTimeUser;
-import com.github.imdmk.playtime.core.injector.annotations.Gui;
+import com.github.imdmk.playtime.core.injector.annotations.gui.Gui;
 import com.github.imdmk.playtime.core.platform.adventure.AdventureFormatter;
 import com.github.imdmk.playtime.core.platform.adventure.AdventurePlaceholders;
 import com.github.imdmk.playtime.core.platform.gui.GuiType;

…ore/injector/annotations/Controller.java …injector/annotations/PluginListener.javaplaytime-core/src/main/java/com/github/imdmk/playtime/core/injector/annotations/Controller.java renamed to playtime-core/src/main/java/com/github/imdmk/playtime/core/injector/annotations/PluginListener.java playtime-core/src/main/java/com/github/imdmk/playtime/core/injector/annotations/Controller.java renamed to playtime-core/src/main/java/com/github/imdmk/playtime/core/injector/annotations/PluginListener.java

@@ -9,7 +9,7 @@
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
-public @interface Controller {
+public @interface PluginListener {
 
     ComponentPriority priority() default ComponentPriority.HIGHEST;
 

…ytime/core/injector/annotations/Gui.java …e/core/injector/annotations/gui/Gui.javaplaytime-core/src/main/java/com/github/imdmk/playtime/core/injector/annotations/Gui.java renamed to playtime-core/src/main/java/com/github/imdmk/playtime/core/injector/annotations/gui/Gui.java playtime-core/src/main/java/com/github/imdmk/playtime/core/injector/annotations/Gui.java renamed to playtime-core/src/main/java/com/github/imdmk/playtime/core/injector/annotations/gui/Gui.java

@@ -1,4 +1,4 @@
-package com.github.imdmk.playtime.core.injector.annotations;
+package com.github.imdmk.playtime.core.injector.annotations.gui;
 
 import com.github.imdmk.playtime.core.injector.ComponentPriority;