GH-1147 Make UserManager use UserRepository

buildSrc/src/main/kotlin/Versions.kt

@@ -48,5 +48,7 @@ object Versions {
     // tests
     const val JUNIT_BOM = "5.13.4"
     const val MOCKITO_CORE = "5.19.0"
+    const val TEST_CONTAINERS = "1.21.3"
+    const val MYSQL_CONNECTOR = "8.0.33"
 
 }

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

@@ -10,6 +10,9 @@ dependencies {
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 
+    testImplementation("org.testcontainers:junit-jupiter:${Versions.TEST_CONTAINERS}")
+    testImplementation("org.testcontainers:mysql:${Versions.TEST_CONTAINERS}")
+    testImplementation("mysql:mysql-connector-java:${Versions.MYSQL_CONNECTOR}")
     testImplementation("org.mockito:mockito-core:${Versions.MOCKITO_CORE}")
     testImplementation("net.kyori:adventure-platform-facet:${Versions.ADVENTURE_PLATFORM}")
     testImplementation("org.spigotmc:spigot-api:${Versions.SPIGOT_API}")

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

@@ -41,6 +41,8 @@
 import com.eternalcode.core.injector.annotations.component.ConfigurationFile;
 import com.eternalcode.core.translation.TranslationConfig;
 import com.eternalcode.core.translation.TranslationSettings;
+import com.eternalcode.core.user.database.UserRepositoryConfig;
+import com.eternalcode.core.user.database.UserRepositorySettings;
 import eu.okaeri.configs.OkaeriConfig;
 import eu.okaeri.configs.annotation.Comment;
 import eu.okaeri.configs.annotation.Header;
@@ -79,6 +81,12 @@ public class PluginConfiguration extends AbstractConfigurationFile {
     @Comment("# Settings responsible for the database connection")
     DatabaseConfig database = new DatabaseConfig();
 
+    @Bean(proxied = UserRepositorySettings.class)
+    @Comment("")
+    @Comment("# User Repository Configuration")
+    @Comment("# Settings for managing user data storage and retrieval")
+    UserRepositoryConfig userRepository = new UserRepositoryConfig();
+
     @Bean(proxied = SpawnJoinSettings.class)
     @Comment("")
     @Comment("# Spawn & Join Configuration")

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

@@ -50,6 +50,10 @@ protected <T> CompletableFuture<List<T>> selectAll(Class<T> type) {
         return this.action(type, Dao::queryForAll);
     }
 
+    protected <T> CompletableFuture<List<T>> selectBatch(Class<T> type, int offset, int limit) {
+        return this.action(type, dao -> dao.queryBuilder().offset((long) offset).limit((long) limit).query());
+    }
+
     protected <T, ID, R> CompletableFuture<R> action(
         Class<T> type,
         ThrowingFunction<Dao<T, ID>, R, SQLException> action

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

@@ -13,7 +13,7 @@ public class DatabaseConfig extends OkaeriConfig implements DatabaseSettings {
     @Comment({"Type of the database driver (e.g., SQLITE, H2, MYSQL, MARIADB, POSTGRESQL).", "Determines the "
         + "database type "
         + "to be used."})
-    public DatabaseDriverType databaseType = DatabaseDriverType.SQLITE;
+    public DatabaseDriverType databaseType = DatabaseDriverType.MYSQL;
 
     @Comment({"Hostname of the database server.", "For local databases, this is usually 'localhost'."})
     public String hostname = "localhost";

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

@@ -8,7 +8,9 @@ public enum DatabaseDriverType {
     MARIADB(MARIADB_DRIVER, MARIADB_JDBC_URL),
     POSTGRESQL(POSTGRESQL_DRIVER, POSTGRESQL_JDBC_URL),
     H2(H2_DRIVER, H2_JDBC_URL),
-    SQLITE(SQLITE_DRIVER, SQLITE_JDBC_URL);
+    SQLITE(SQLITE_DRIVER, SQLITE_JDBC_URL),
+
+    H2_TEST(H2_DRIVER, "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;MODE=MYSQL");
 
     private final String driver;
     private final String urlFormat;

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

@@ -67,6 +67,7 @@ public void connect() {
                     settings.database(),
                     String.valueOf(settings.ssl())
                 );
+                case H2_TEST -> type.formatUrl();
             };
 
             this.dataSource.setJdbcUrl(jdbcUrl);

eternalcore-core/src/main/java/com/eternalcode/core/feature/fullserverbypass/FullServerBypassController.java

@@ -5,8 +5,6 @@
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.injector.annotations.component.Controller;
 import com.eternalcode.core.translation.TranslationManager;
-import com.eternalcode.core.user.User;
-import com.eternalcode.core.user.UserManager;
 import com.eternalcode.commons.adventure.AdventureUtil;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
@@ -16,8 +14,6 @@
 import org.bukkit.event.player.PlayerLoginEvent;
 import panda.utilities.text.Joiner;
 
-import java.util.Optional;
-
 @PermissionDocs(
     name = "Bypass Full Server",
     description = "This feature allows you to bypass the full server, example for vip rank.",
@@ -29,13 +25,11 @@ class FullServerBypassController implements Listener {
     static final String SLOT_BYPASS = "eternalcore.slot.bypass";
 
     private final TranslationManager translationManager;
-    private final UserManager userManager;
     private final MiniMessage miniMessage;
 
     @Inject
-    FullServerBypassController(TranslationManager translationManager, UserManager userManager, MiniMessage miniMessage) {
+    FullServerBypassController(TranslationManager translationManager, MiniMessage miniMessage) {
         this.translationManager = translationManager;
-        this.userManager = userManager;
         this.miniMessage = miniMessage;
     }
 
@@ -50,26 +44,16 @@ void onLogin(PlayerLoginEvent event) {
                 return;
             }
 
-            String serverFullMessage = this.getServerFullMessage(player);
+            String serverFullMessage = this.getServerFullMessage();
             Component serverFullMessageComponent = this.miniMessage.deserialize(serverFullMessage);
 
             event.disallow(PlayerLoginEvent.Result.KICK_FULL, AdventureUtil.SECTION_SERIALIZER.serialize(serverFullMessageComponent));
         }
     }
 
-    private String getServerFullMessage(Player player) {
-        Optional<User> userOption = this.userManager.getUser(player.getUniqueId());
-
-        if (userOption.isEmpty()) {
-            return Joiner.on("\n")
-                .join(this.translationManager.getMessages().player().fullServerSlots())
-                .toString();
-        }
-
-        User user = userOption.get();
-
+    private String getServerFullMessage() {
         return Joiner.on("\n")
-            .join(this.translationManager.getMessages(user.getUniqueId()).player().fullServerSlots())
+            .join(this.translationManager.getMessages().player().fullServerSlots())
             .toString();
     }
 }

eternalcore-core/src/main/java/com/eternalcode/core/feature/msg/MsgServiceImpl.java

@@ -16,6 +16,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
+import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
 @Service
@@ -27,6 +28,7 @@ class MsgServiceImpl implements MsgService {
     private final MsgPresenter presenter;
     private final EventCaller eventCaller;
     private final MsgToggleService msgToggleService;
+    private final Server server;
 
     private final Cache<UUID, UUID> replies = CacheBuilder.newBuilder()
         .expireAfterWrite(Duration.ofHours(1))
@@ -40,7 +42,7 @@ class MsgServiceImpl implements MsgService {
         IgnoreService ignoreService,
         UserManager userManager,
         EventCaller eventCaller,
-        MsgToggleService msgToggleService
+        MsgToggleService msgToggleService, Server server
     ) {
         this.noticeService = noticeService;
         this.ignoreService = ignoreService;
@@ -49,15 +51,10 @@ class MsgServiceImpl implements MsgService {
         this.msgToggleService = msgToggleService;
 
         this.presenter = new MsgPresenter(noticeService);
+        this.server = server;
     }
 
     void privateMessage(User sender, User target, String message) {
-        if (target.getClientSettings().isOffline()) {
-            this.noticeService.player(sender.getUniqueId(), translation -> translation.argument().offlinePlayer());
-
-            return;
-        }
-
         UUID uniqueId = target.getUniqueId();
 
         this.msgToggleService.getState(uniqueId).thenAccept(msgState -> {
@@ -89,17 +86,14 @@ void reply(User sender, String message) {
             return;
         }
 
-        Optional<User> targetOption = this.userManager.getUser(uuid);
-
-        if (targetOption.isEmpty()) {
+        Player target = this.server.getPlayer(uuid);
+        if (target == null) {
             this.noticeService.player(sender.getUniqueId(), translation -> translation.argument().offlinePlayer());
 
             return;
         }
 
-        User target = targetOption.get();
-
-        this.privateMessage(sender, target, message);
+        this.privateMessage(sender, toUser(target), message);
     }
 
     @Override
@@ -119,12 +113,18 @@ public boolean isSpy(UUID player) {
 
     @Override
     public void reply(Player sender, String message) {
-        this.reply(this.userManager.getOrCreate(sender.getUniqueId(), sender.getName()), message);
+        this.reply(toUser(sender), message);
     }
 
     @Override
     public void sendMessage(Player sender, Player target, String message) {
-        User user = this.userManager.getOrCreate(target.getUniqueId(), target.getName());
-        this.privateMessage(this.userManager.getOrCreate(sender.getUniqueId(), sender.getName()), user, message);
+        User user = toUser(target);
+        this.privateMessage(toUser(sender), user, message);
+    }
+
+    private User toUser(Player target) {
+        return this.userManager.getOrCreate(target.getUniqueId(), target.getName());
     }
+
+
 }

eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/UserArgument.java

@@ -8,16 +8,21 @@
 import com.eternalcode.core.user.UserManager;
 import dev.rollczi.litecommands.argument.Argument;
 import dev.rollczi.litecommands.argument.parser.ParseResult;
+import static dev.rollczi.litecommands.argument.parser.ParseResult.failure;
+import static dev.rollczi.litecommands.argument.parser.ParseResult.success;
 import dev.rollczi.litecommands.invocation.Invocation;
 import dev.rollczi.litecommands.suggestion.SuggestionContext;
 import dev.rollczi.litecommands.suggestion.SuggestionResult;
+import java.util.regex.Pattern;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.HumanEntity;
 
 @LiteArgument(type = User.class)
 class UserArgument extends AbstractViewerArgument<User> {
 
+    private static final Pattern USERNAME_PATTERN = Pattern.compile("^[a-zA-Z0-9_]{1,16}$");
+
     private final Server server;
     private final UserManager userManager;
 
@@ -28,18 +33,22 @@ class UserArgument extends AbstractViewerArgument<User> {
         this.userManager = userManager;
     }
 
+    @Override
+    public ParseResult<User> parse(Invocation<CommandSender> invocation, String argument, Translation translation) {
+        return ParseResult.completableFuture(this.userManager.getUser(argument), maybeUser -> maybeUser.map(user -> success(user))
+            .orElse(failure(translation.argument().offlinePlayer())));
+    }
+
+    @Override
+    protected boolean match(Invocation<CommandSender> invocation, Argument<User> context, String argument) {
+        return USERNAME_PATTERN.matcher(argument).matches();
+    }
+
     @Override
     public SuggestionResult suggest(Invocation<CommandSender> invocation, Argument<User> argument, SuggestionContext context) {
         return this.server.getOnlinePlayers().stream()
             .map(HumanEntity::getName)
             .collect(SuggestionResult.collector());
     }
 
-    @Override
-    public ParseResult<User> parse(Invocation<CommandSender> invocation, String argument, Translation translation) {
-        return this.userManager.getUser(argument)
-            .map(ParseResult::success)
-            .orElseGet(() -> ParseResult.failure(translation.argument().offlinePlayer()));
-    }
-
 }

eternalcore-core/src/main/java/com/eternalcode/core/user/LoadUserController.java

@@ -27,7 +27,7 @@ void onReload(ServerLoadEvent event) {
         }
 
         for (Player player : this.server.getOnlinePlayers()) {
-            this.userManager.create(player.getUniqueId(), player.getName());
+            this.userManager.getOrCreate(player.getUniqueId(), player.getName());
         }
      }
 

eternalcore-core/src/main/java/com/eternalcode/core/user/PrepareUserController.java

@@ -2,52 +2,25 @@
 
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.injector.annotations.component.Controller;
-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.PlayerKickEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
 
 @Controller
 class PrepareUserController implements Listener {
 
     private final UserManager userManager;
-    private final Server server;
 
     @Inject
-    PrepareUserController(UserManager userManager, Server server) {
+    PrepareUserController(UserManager userManager) {
         this.userManager = userManager;
-        this.server = server;
     }
 
     @EventHandler
     void onJoin(PlayerJoinEvent event) {
         Player player = event.getPlayer();
-        User user = this.userManager.getOrCreate(player.getUniqueId(), player.getName());
-        UserClientBukkitSettings clientSettings = new UserClientBukkitSettings(this.server, user.getUniqueId());
-
-        user.setClientSettings(clientSettings);
-    }
-
-    @EventHandler
-    void onQuit(PlayerQuitEvent event) {
-        Player player = event.getPlayer();
-
-        User user = this.userManager.getUser(player.getUniqueId())
-            .orElseThrow(() -> new IllegalStateException("User not found"));
-
-        user.setClientSettings(UserClientSettings.NONE);
+        this.userManager.getOrCreate(player.getUniqueId(), player.getName());
     }
 
-    @EventHandler
-    void onKick(PlayerKickEvent event) {
-        Player player = event.getPlayer();
-
-        User user = this.userManager.getUser(player.getUniqueId())
-            .orElseThrow(() -> new IllegalStateException("User not found"));
-
-        user.setClientSettings(UserClientSettings.NONE);
-    }
 }

eternalcore-core/src/main/java/com/eternalcode/core/user/User.java

@@ -7,12 +7,11 @@
 
 public class User implements Viewer {
 
-    private UserClientSettings userClientSettings = UserClientSettings.NONE;
 
     private final String name;
     private final UUID uuid;
 
-    User(UUID uuid, String name) {
+    public User(UUID uuid, String name) {
         this.name = name;
         this.uuid = uuid;
     }
@@ -32,14 +31,6 @@ public boolean isConsole() {
         return false;
     }
 
-    public UserClientSettings getClientSettings() {
-        return this.userClientSettings;
-    }
-
-    public void setClientSettings(UserClientSettings userClientSettings) {
-        this.userClientSettings = userClientSettings;
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) {