From 58c42cf3005c7dcf65599bcc09d7b5143f9c6dfc Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Tue, 4 Oct 2016 21:49:14 +0200 Subject: [PATCH] Package cleanup - authme.cache to authme.data - Rename PlayerData to LimboPlayer to match with LimboCache - Move authme.converter to authme.datasource.converter - Split output package into output and message --- src/main/java/fr/xephi/authme/AuthMe.java | 14 ++-- src/main/java/fr/xephi/authme/api/API.java | 4 +- src/main/java/fr/xephi/authme/api/NewAPI.java | 4 +- .../xephi/authme/command/CommandService.java | 4 +- .../executable/authme/AccountsCommand.java | 4 +- .../authme/ChangePasswordAdminCommand.java | 6 +- .../executable/authme/ConverterCommand.java | 18 ++--- .../executable/authme/GetEmailCommand.java | 4 +- .../executable/authme/LastLoginCommand.java | 4 +- .../authme/PurgeLastPositionCommand.java | 4 +- .../authme/RegisterAdminCommand.java | 6 +- .../executable/authme/ReloadCommand.java | 2 +- .../executable/authme/SetEmailCommand.java | 6 +- .../authme/UnregisterAdminCommand.java | 2 +- .../executable/captcha/CaptchaCommand.java | 6 +- .../changepassword/ChangePasswordCommand.java | 4 +- .../executable/email/AddEmailCommand.java | 2 +- .../executable/email/RecoverEmailCommand.java | 6 +- .../executable/register/RegisterCommand.java | 2 +- .../unregister/UnregisterCommand.java | 4 +- .../{cache => data}/CaptchaManager.java | 2 +- .../{cache => data}/SessionManager.java | 2 +- .../{cache => data}/TempbanManager.java | 6 +- .../{cache => data}/auth/PlayerAuth.java | 2 +- .../{cache => data}/auth/PlayerCache.java | 2 +- .../backup/LimboPlayerStorage.java} | 46 +++++------ .../{cache => data}/limbo/LimboCache.java | 30 ++++---- .../limbo/LimboPlayer.java} | 7 +- .../authme/datasource/CacheDataSource.java | 6 +- .../xephi/authme/datasource/DataSource.java | 2 +- .../authme/datasource/DataSourceType.java | 6 +- .../fr/xephi/authme/datasource/FlatFile.java | 4 +- .../fr/xephi/authme/datasource/MySQL.java | 5 +- .../fr/xephi/authme/datasource/SQLite.java | 5 +- .../AbstractDataSourceConverter.java | 4 +- .../{ => datasource}/converter/Converter.java | 2 +- .../converter/CrazyLoginConverter.java | 4 +- .../converter/ForceFlatToSqlite.java | 2 +- .../converter/MySqlToSqlite.java | 2 +- .../converter/RakamakConverter.java | 4 +- .../converter/RoyalAuthConverter.java | 6 +- .../converter/SqliteToSql.java | 2 +- .../converter/vAuthConverter.java | 6 +- .../converter/xAuthConverter.java | 6 +- .../{GeoLiteAPI.java => GeoIpManager.java} | 6 +- .../authme/initialization/Initializer.java | 6 +- .../initialization/OnShutdownPlayerSaver.java | 14 ++-- .../listener/FailedVerificationException.java | 2 +- .../authme/listener/ListenerService.java | 2 +- .../xephi/authme/listener/OnJoinVerifier.java | 6 +- .../xephi/authme/listener/PlayerListener.java | 6 +- .../protocollib/InventoryPacketAdapter.java | 2 +- .../protocollib/ProtocolLibService.java | 2 +- .../protocollib/TabCompletePacketAdapter.java | 2 +- .../{output => message}/MessageKey.java | 2 +- .../authme/{output => message}/Messages.java | 2 +- .../authme/permission/AuthGroupHandler.java | 6 +- .../xephi/authme/process/ProcessService.java | 4 +- .../changepassword/AsyncChangePassword.java | 6 +- .../authme/process/email/AsyncAddEmail.java | 6 +- .../process/email/AsyncChangeEmail.java | 6 +- .../authme/process/join/AsynchronousJoin.java | 10 +-- .../process/login/AsynchronousLogin.java | 20 ++--- .../process/login/ProcessSyncPlayerLogin.java | 8 +- .../process/logout/AsynchronousLogout.java | 8 +- .../ProcessSynchronousPlayerLogout.java | 4 +- .../authme/process/quit/AsynchronousQuit.java | 6 +- .../quit/ProcessSyncronousPlayerQuit.java | 10 +-- .../process/register/AsyncRegister.java | 6 +- .../register/ProcessSyncEmailRegister.java | 2 +- .../register/ProcessSyncPasswordRegister.java | 4 +- .../unregister/AsynchronousUnregister.java | 8 +- .../xephi/authme/service/AntiBotService.java | 4 +- .../authme/service/MigrationService.java | 4 +- .../authme/service/TeleportationService.java | 8 +- .../authme/service/ValidationService.java | 8 +- .../fr/xephi/authme/settings/Settings.java | 4 +- .../fr/xephi/authme/task/MessageTask.java | 4 +- .../authme/task/PlayerDataTaskManager.java | 26 +++---- .../fr/xephi/authme/task/TimeoutTask.java | 2 +- .../authme/task/purge/PurgeExecutor.java | 2 +- .../xephi/authme/task/purge/PurgeService.java | 2 + .../java/fr/xephi/authme/util/FileUtils.java | 11 +++ .../fr/xephi/authme/util/StringUtils.java | 12 --- .../java/fr/xephi/authme/AuthMeMatchers.java | 2 +- .../java/fr/xephi/authme/api/NewAPITest.java | 4 +- .../authme/command/CommandServiceTest.java | 4 +- .../authme/AccountsCommandTest.java | 4 +- .../ChangePasswordAdminCommandTest.java | 6 +- .../authme/ConverterCommandTest.java | 4 +- .../authme/GetEmailCommandTest.java | 4 +- .../authme/LastLoginCommandTest.java | 4 +- .../authme/PurgeLastPositionCommandTest.java | 4 +- .../authme/RegisterAdminCommandTest.java | 6 +- .../executable/authme/ReloadCommandTest.java | 2 +- .../authme/SetEmailCommandTest.java | 6 +- .../authme/UnregisterAdminCommandTest.java | 2 +- .../captcha/CaptchaCommandTest.java | 6 +- .../ChangePasswordCommandTest.java | 4 +- .../executable/email/AddEmailCommandTest.java | 2 +- .../email/RecoverEmailCommandTest.java | 6 +- .../register/RegisterCommandTest.java | 2 +- .../unregister/UnregisterCommandTest.java | 4 +- .../{cache => data}/CaptchaManagerTest.java | 2 +- .../{cache => data}/SessionManagerTest.java | 2 +- .../{cache => data}/TempbanManagerTest.java | 8 +- .../backup/LimboPlayerStorageTest.java} | 30 ++++---- .../{cache => data}/limbo/LimboCacheTest.java | 76 +++++++++---------- .../AbstractDataSourceIntegrationTest.java | 2 +- .../AbstractResourceClosingTest.java | 2 +- .../datasource/FlatFileIntegrationTest.java | 6 +- .../datasource/MySqlIntegrationTest.java | 3 + .../datasource/MySqlResourceClosingTest.java | 3 + .../datasource/SQLiteIntegrationTest.java | 5 +- .../datasource/SQLiteResourceClosingTest.java | 3 + .../AbstractDataSourceConverterTest.java | 4 +- .../converter/CrazyLoginConverterTest.java | 6 +- .../converter/ForceFlatToSqliteTest.java | 4 +- .../xephi/authme/geoip/GeoIpManagerTest.java | 15 ++-- .../authme/listener/ListenerServiceTest.java | 2 +- .../authme/listener/OnJoinVerifierTest.java | 6 +- .../authme/listener/PlayerListenerTest.java | 6 +- .../{output => message}/MessageKeyTest.java | 2 +- .../MessagesFileConsistencyTest.java | 2 +- .../MessagesFileYamlCheckerTest.java | 2 +- .../MessagesIntegrationTest.java | 8 +- .../authme/process/ProcessServiceTest.java | 4 +- .../process/email/AsyncAddEmailTest.java | 6 +- .../process/email/AsyncChangeEmailTest.java | 6 +- .../process/login/AsynchronousLoginTest.java | 6 +- .../AsynchronousUnregisterTest.java | 8 +- .../authme/service/AntiBotServiceTest.java | 4 +- .../authme/service/MigrationServiceTest.java | 3 +- .../service/TeleportationServiceTest.java | 24 +++--- .../authme/service/ValidationServiceTest.java | 25 +++--- .../xephi/authme/settings/SettingsTest.java | 2 +- ...t.java => LimboPlayerTaskManagerTest.java} | 52 ++++++------- .../fr/xephi/authme/util/FileUtilsTest.java | 9 +++ .../fr/xephi/authme/util/PlayerUtilsTest.java | 2 +- .../fr/xephi/authme/util/StringUtilsTest.java | 10 --- .../tools/dependencygraph/DrawDependency.java | 2 +- .../tools/messages/MessageFileVerifier.java | 2 +- .../translation/ExportMessagesTask.java | 2 +- .../translation/ImportMessagesTask.java | 2 +- .../backup/sample-folder/data.json | 0 .../{ => datasource}/converter/crazylogin.db | 0 .../{output => message}/messages_default.yml | 0 .../{output => message}/messages_test.yml | 0 .../{output => message}/messages_test2.yml | 0 149 files changed, 491 insertions(+), 475 deletions(-) rename src/main/java/fr/xephi/authme/{cache => data}/CaptchaManager.java (99%) rename src/main/java/fr/xephi/authme/{cache => data}/SessionManager.java (98%) rename src/main/java/fr/xephi/authme/{cache => data}/TempbanManager.java (98%) rename src/main/java/fr/xephi/authme/{cache => data}/auth/PlayerAuth.java (99%) rename src/main/java/fr/xephi/authme/{cache => data}/auth/PlayerCache.java (98%) rename src/main/java/fr/xephi/authme/{cache/backup/PlayerDataStorage.java => data/backup/LimboPlayerStorage.java} (80%) rename src/main/java/fr/xephi/authme/{cache => data}/limbo/LimboCache.java (82%) rename src/main/java/fr/xephi/authme/{cache/limbo/PlayerData.java => data/limbo/LimboPlayer.java} (94%) rename src/main/java/fr/xephi/authme/{ => datasource}/converter/AbstractDataSourceConverter.java (97%) rename src/main/java/fr/xephi/authme/{ => datasource}/converter/Converter.java (85%) rename src/main/java/fr/xephi/authme/{ => datasource}/converter/CrazyLoginConverter.java (96%) rename src/main/java/fr/xephi/authme/{ => datasource}/converter/ForceFlatToSqlite.java (93%) rename src/main/java/fr/xephi/authme/{ => datasource}/converter/MySqlToSqlite.java (93%) rename src/main/java/fr/xephi/authme/{ => datasource}/converter/RakamakConverter.java (97%) rename src/main/java/fr/xephi/authme/{ => datasource}/converter/RoyalAuthConverter.java (92%) rename src/main/java/fr/xephi/authme/{ => datasource}/converter/SqliteToSql.java (93%) rename src/main/java/fr/xephi/authme/{ => datasource}/converter/vAuthConverter.java (94%) rename src/main/java/fr/xephi/authme/{ => datasource}/converter/xAuthConverter.java (97%) rename src/main/java/fr/xephi/authme/geoip/{GeoLiteAPI.java => GeoIpManager.java} (96%) rename src/main/java/fr/xephi/authme/{output => message}/MessageKey.java (99%) rename src/main/java/fr/xephi/authme/{output => message}/Messages.java (99%) rename src/test/java/fr/xephi/authme/{cache => data}/CaptchaManagerTest.java (99%) rename src/test/java/fr/xephi/authme/{cache => data}/SessionManagerTest.java (99%) rename src/test/java/fr/xephi/authme/{cache => data}/TempbanManagerTest.java (98%) rename src/test/java/fr/xephi/authme/{cache/backup/PlayerDataStorageTest.java => data/backup/LimboPlayerStorageTest.java} (82%) rename src/test/java/fr/xephi/authme/{cache => data}/limbo/LimboCacheTest.java (72%) rename src/test/java/fr/xephi/authme/{ => datasource}/converter/AbstractDataSourceConverterTest.java (98%) rename src/test/java/fr/xephi/authme/{ => datasource}/converter/CrazyLoginConverterTest.java (96%) rename src/test/java/fr/xephi/authme/{ => datasource}/converter/ForceFlatToSqliteTest.java (96%) rename src/test/java/fr/xephi/authme/{output => message}/MessageKeyTest.java (95%) rename src/test/java/fr/xephi/authme/{output => message}/MessagesFileConsistencyTest.java (98%) rename src/test/java/fr/xephi/authme/{output => message}/MessagesFileYamlCheckerTest.java (98%) rename src/test/java/fr/xephi/authme/{output => message}/MessagesIntegrationTest.java (97%) rename src/test/java/fr/xephi/authme/task/{PlayerDataTaskManagerTest.java => LimboPlayerTaskManagerTest.java} (80%) rename src/test/resources/fr/xephi/authme/{cache => data}/backup/sample-folder/data.json (100%) rename src/test/resources/fr/xephi/authme/{ => datasource}/converter/crazylogin.db (100%) rename src/test/resources/fr/xephi/authme/{output => message}/messages_default.yml (100%) rename src/test/resources/fr/xephi/authme/{output => message}/messages_test.yml (100%) rename src/test/resources/fr/xephi/authme/{output => message}/messages_test2.yml (100%) diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java index 9c94bc8e..eaee0347 100644 --- a/src/main/java/fr/xephi/authme/AuthMe.java +++ b/src/main/java/fr/xephi/authme/AuthMe.java @@ -5,8 +5,8 @@ import ch.jalu.injector.InjectorBuilder; import com.google.common.annotations.VisibleForTesting; import fr.xephi.authme.api.API; import fr.xephi.authme.api.NewAPI; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.command.CommandHandler; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.initialization.DataFolder; @@ -21,7 +21,7 @@ import fr.xephi.authme.listener.PlayerListener16; import fr.xephi.authme.listener.PlayerListener18; import fr.xephi.authme.listener.PlayerListener19; import fr.xephi.authme.listener.ServerListener; -import fr.xephi.authme.output.Messages; +import fr.xephi.authme.message.Messages; import fr.xephi.authme.permission.PermissionsManager; import fr.xephi.authme.permission.PermissionsSystemType; import fr.xephi.authme.security.crypts.SHA256; @@ -33,7 +33,7 @@ import fr.xephi.authme.settings.properties.SecuritySettings; import fr.xephi.authme.task.CleanupTask; import fr.xephi.authme.task.purge.PurgeService; import fr.xephi.authme.service.BukkitService; -import fr.xephi.authme.geoip.GeoLiteAPI; +import fr.xephi.authme.geoip.GeoIpManager; import fr.xephi.authme.service.MigrationService; import fr.xephi.authme.util.PlayerUtils; import org.bukkit.Server; @@ -74,7 +74,7 @@ public class AuthMe extends JavaPlugin { private DataSource database; private BukkitService bukkitService; private Injector injector; - private GeoLiteAPI geoLiteApi; + private GeoIpManager geoIpManager; private PlayerCache playerCache; /** @@ -248,7 +248,7 @@ public class AuthMe extends JavaPlugin { permsMan = injector.getSingleton(PermissionsManager.class); bukkitService = injector.getSingleton(BukkitService.class); commandHandler = injector.getSingleton(CommandHandler.class); - geoLiteApi = injector.getSingleton(GeoLiteAPI.class); + geoIpManager = injector.getSingleton(GeoIpManager.class); // Trigger construction of API classes; they will keep track of the singleton injector.getSingleton(NewAPI.class); @@ -374,7 +374,7 @@ public class AuthMe extends JavaPlugin { .replace("{SERVER}", server.getServerName()) .replace("{VERSION}", server.getBukkitVersion()) // TODO: We should cache info like this, maybe with a class that extends Player? - .replace("{COUNTRY}", geoLiteApi.getCountryName(ipAddress)); + .replace("{COUNTRY}", geoIpManager.getCountryName(ipAddress)); } diff --git a/src/main/java/fr/xephi/authme/api/API.java b/src/main/java/fr/xephi/authme/api/API.java index 8e16bd60..8073cf63 100644 --- a/src/main/java/fr/xephi/authme/api/API.java +++ b/src/main/java/fr/xephi/authme/api/API.java @@ -1,8 +1,8 @@ package fr.xephi.authme.api; import fr.xephi.authme.AuthMe; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.hooks.PluginHooks; import fr.xephi.authme.process.Management; diff --git a/src/main/java/fr/xephi/authme/api/NewAPI.java b/src/main/java/fr/xephi/authme/api/NewAPI.java index 5cee36e0..d42d765d 100644 --- a/src/main/java/fr/xephi/authme/api/NewAPI.java +++ b/src/main/java/fr/xephi/authme/api/NewAPI.java @@ -1,8 +1,8 @@ package fr.xephi.authme.api; import fr.xephi.authme.AuthMe; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.hooks.PluginHooks; import fr.xephi.authme.process.Management; diff --git a/src/main/java/fr/xephi/authme/command/CommandService.java b/src/main/java/fr/xephi/authme/command/CommandService.java index a01edfae..bb8bbeca 100644 --- a/src/main/java/fr/xephi/authme/command/CommandService.java +++ b/src/main/java/fr/xephi/authme/command/CommandService.java @@ -1,8 +1,8 @@ package fr.xephi.authme.command; import com.github.authme.configme.properties.Property; -import fr.xephi.authme.output.MessageKey; -import fr.xephi.authme.output.Messages; +import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.message.Messages; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.service.ValidationService; import org.bukkit.command.CommandSender; diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java index 5951bd80..f3248b56 100644 --- a/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java @@ -1,10 +1,10 @@ package fr.xephi.authme.command.executable.authme; -import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.command.CommandService; import fr.xephi.authme.command.ExecutableCommand; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.service.BukkitService; import org.bukkit.command.CommandSender; diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/ChangePasswordAdminCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/ChangePasswordAdminCommand.java index 3c0b2323..9842b9f8 100644 --- a/src/main/java/fr/xephi/authme/command/executable/authme/ChangePasswordAdminCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/authme/ChangePasswordAdminCommand.java @@ -1,12 +1,12 @@ package fr.xephi.authme.command.executable.authme; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.command.CommandService; import fr.xephi.authme.command.ExecutableCommand; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.security.PasswordSecurity; import fr.xephi.authme.security.crypts.HashedPassword; import fr.xephi.authme.service.BukkitService; diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/ConverterCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/ConverterCommand.java index 73a21a04..0cbadf2f 100644 --- a/src/main/java/fr/xephi/authme/command/executable/authme/ConverterCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/authme/ConverterCommand.java @@ -6,15 +6,15 @@ import com.google.common.collect.ImmutableMap; import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.command.CommandService; import fr.xephi.authme.command.ExecutableCommand; -import fr.xephi.authme.converter.Converter; -import fr.xephi.authme.converter.CrazyLoginConverter; -import fr.xephi.authme.converter.MySqlToSqlite; -import fr.xephi.authme.converter.RakamakConverter; -import fr.xephi.authme.converter.RoyalAuthConverter; -import fr.xephi.authme.converter.SqliteToSql; -import fr.xephi.authme.converter.vAuthConverter; -import fr.xephi.authme.converter.xAuthConverter; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.datasource.converter.Converter; +import fr.xephi.authme.datasource.converter.CrazyLoginConverter; +import fr.xephi.authme.datasource.converter.MySqlToSqlite; +import fr.xephi.authme.datasource.converter.RakamakConverter; +import fr.xephi.authme.datasource.converter.RoyalAuthConverter; +import fr.xephi.authme.datasource.converter.SqliteToSql; +import fr.xephi.authme.datasource.converter.vAuthConverter; +import fr.xephi.authme.datasource.converter.xAuthConverter; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.service.BukkitService; import org.bukkit.command.CommandSender; diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/GetEmailCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/GetEmailCommand.java index 07ee57d3..57ff497a 100644 --- a/src/main/java/fr/xephi/authme/command/executable/authme/GetEmailCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/authme/GetEmailCommand.java @@ -1,10 +1,10 @@ package fr.xephi.authme.command.executable.authme; -import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.command.CommandService; import fr.xephi.authme.command.ExecutableCommand; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import org.bukkit.command.CommandSender; import javax.inject.Inject; diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/LastLoginCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/LastLoginCommand.java index 376499fb..3c2b8cd5 100644 --- a/src/main/java/fr/xephi/authme/command/executable/authme/LastLoginCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/authme/LastLoginCommand.java @@ -1,10 +1,10 @@ package fr.xephi.authme.command.executable.authme; -import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.command.CommandService; import fr.xephi.authme.command.ExecutableCommand; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import org.bukkit.command.CommandSender; import javax.inject.Inject; diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/PurgeLastPositionCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/PurgeLastPositionCommand.java index ca6a0200..fa45367f 100644 --- a/src/main/java/fr/xephi/authme/command/executable/authme/PurgeLastPositionCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/authme/PurgeLastPositionCommand.java @@ -1,10 +1,10 @@ package fr.xephi.authme.command.executable.authme; -import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.command.CommandService; import fr.xephi.authme.command.ExecutableCommand; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import org.bukkit.command.CommandSender; import javax.inject.Inject; diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommand.java index 166d2d80..784e9f4f 100644 --- a/src/main/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommand.java @@ -1,12 +1,12 @@ package fr.xephi.authme.command.executable.authme; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.cache.limbo.LimboCache; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.data.limbo.LimboCache; import fr.xephi.authme.command.CommandService; import fr.xephi.authme.command.ExecutableCommand; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.security.PasswordSecurity; import fr.xephi.authme.security.crypts.HashedPassword; import fr.xephi.authme.service.BukkitService; diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java index e6b8009f..dc1ba638 100644 --- a/src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java @@ -8,7 +8,7 @@ import fr.xephi.authme.command.ExecutableCommand; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.initialization.Reloadable; import fr.xephi.authme.initialization.SettingsDependent; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.properties.DatabaseSettings; import org.bukkit.command.CommandSender; diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/SetEmailCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/SetEmailCommand.java index d3d6ea78..18eb29f5 100644 --- a/src/main/java/fr/xephi/authme/command/executable/authme/SetEmailCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/authme/SetEmailCommand.java @@ -1,11 +1,11 @@ package fr.xephi.authme.command.executable.authme; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.command.CommandService; import fr.xephi.authme.command.ExecutableCommand; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.service.BukkitService; import org.bukkit.command.CommandSender; diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/UnregisterAdminCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/UnregisterAdminCommand.java index 51e7c4d4..345351d9 100644 --- a/src/main/java/fr/xephi/authme/command/executable/authme/UnregisterAdminCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/authme/UnregisterAdminCommand.java @@ -3,7 +3,7 @@ package fr.xephi.authme.command.executable.authme; import fr.xephi.authme.command.CommandService; import fr.xephi.authme.command.ExecutableCommand; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.process.Management; import fr.xephi.authme.service.BukkitService; import org.bukkit.command.CommandSender; diff --git a/src/main/java/fr/xephi/authme/command/executable/captcha/CaptchaCommand.java b/src/main/java/fr/xephi/authme/command/executable/captcha/CaptchaCommand.java index 1577c7ad..178c6f05 100644 --- a/src/main/java/fr/xephi/authme/command/executable/captcha/CaptchaCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/captcha/CaptchaCommand.java @@ -1,10 +1,10 @@ package fr.xephi.authme.command.executable.captcha; -import fr.xephi.authme.cache.CaptchaManager; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.CaptchaManager; +import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.command.CommandService; import fr.xephi.authme.command.PlayerCommand; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import org.bukkit.entity.Player; import javax.inject.Inject; diff --git a/src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java b/src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java index 2d7c1204..bfcdbe77 100644 --- a/src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java @@ -1,9 +1,9 @@ package fr.xephi.authme.command.executable.changepassword; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.command.CommandService; import fr.xephi.authme.command.PlayerCommand; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.process.Management; import fr.xephi.authme.service.ValidationService; import fr.xephi.authme.service.ValidationService.ValidationResult; diff --git a/src/main/java/fr/xephi/authme/command/executable/email/AddEmailCommand.java b/src/main/java/fr/xephi/authme/command/executable/email/AddEmailCommand.java index 842d866d..85baa2d6 100644 --- a/src/main/java/fr/xephi/authme/command/executable/email/AddEmailCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/email/AddEmailCommand.java @@ -2,7 +2,7 @@ package fr.xephi.authme.command.executable.email; import fr.xephi.authme.command.CommandService; import fr.xephi.authme.command.PlayerCommand; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.process.Management; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java b/src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java index 1aeeb1d8..89138b41 100644 --- a/src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java @@ -1,13 +1,13 @@ package fr.xephi.authme.command.executable.email; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.command.CommandService; import fr.xephi.authme.command.PlayerCommand; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.mail.SendMailSSL; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.security.PasswordSecurity; import fr.xephi.authme.util.RandomStringUtils; import fr.xephi.authme.security.crypts.HashedPassword; diff --git a/src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java b/src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java index fbfcfb5f..f49ec2db 100644 --- a/src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java @@ -4,7 +4,7 @@ import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.command.CommandService; import fr.xephi.authme.command.PlayerCommand; import fr.xephi.authme.mail.SendMailSSL; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.process.Management; import fr.xephi.authme.security.HashAlgorithm; import fr.xephi.authme.util.RandomStringUtils; diff --git a/src/main/java/fr/xephi/authme/command/executable/unregister/UnregisterCommand.java b/src/main/java/fr/xephi/authme/command/executable/unregister/UnregisterCommand.java index 8526e4a1..c3aaf58a 100644 --- a/src/main/java/fr/xephi/authme/command/executable/unregister/UnregisterCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/unregister/UnregisterCommand.java @@ -1,9 +1,9 @@ package fr.xephi.authme.command.executable.unregister; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.command.CommandService; import fr.xephi.authme.command.PlayerCommand; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.process.Management; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/xephi/authme/cache/CaptchaManager.java b/src/main/java/fr/xephi/authme/data/CaptchaManager.java similarity index 99% rename from src/main/java/fr/xephi/authme/cache/CaptchaManager.java rename to src/main/java/fr/xephi/authme/data/CaptchaManager.java index d46d4891..36f33a3c 100644 --- a/src/main/java/fr/xephi/authme/cache/CaptchaManager.java +++ b/src/main/java/fr/xephi/authme/data/CaptchaManager.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.cache; +package fr.xephi.authme.data; import fr.xephi.authme.initialization.SettingsDependent; import fr.xephi.authme.util.RandomStringUtils; diff --git a/src/main/java/fr/xephi/authme/cache/SessionManager.java b/src/main/java/fr/xephi/authme/data/SessionManager.java similarity index 98% rename from src/main/java/fr/xephi/authme/cache/SessionManager.java rename to src/main/java/fr/xephi/authme/data/SessionManager.java index 33d3f9a6..f86f5421 100644 --- a/src/main/java/fr/xephi/authme/cache/SessionManager.java +++ b/src/main/java/fr/xephi/authme/data/SessionManager.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.cache; +package fr.xephi.authme.data; import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.initialization.HasCleanup; diff --git a/src/main/java/fr/xephi/authme/cache/TempbanManager.java b/src/main/java/fr/xephi/authme/data/TempbanManager.java similarity index 98% rename from src/main/java/fr/xephi/authme/cache/TempbanManager.java rename to src/main/java/fr/xephi/authme/data/TempbanManager.java index c0cb3920..e5d31ed1 100644 --- a/src/main/java/fr/xephi/authme/cache/TempbanManager.java +++ b/src/main/java/fr/xephi/authme/data/TempbanManager.java @@ -1,10 +1,10 @@ -package fr.xephi.authme.cache; +package fr.xephi.authme.data; import com.google.common.annotations.VisibleForTesting; import fr.xephi.authme.initialization.HasCleanup; import fr.xephi.authme.initialization.SettingsDependent; -import fr.xephi.authme.output.MessageKey; -import fr.xephi.authme.output.Messages; +import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.message.Messages; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.properties.SecuritySettings; import fr.xephi.authme.service.BukkitService; diff --git a/src/main/java/fr/xephi/authme/cache/auth/PlayerAuth.java b/src/main/java/fr/xephi/authme/data/auth/PlayerAuth.java similarity index 99% rename from src/main/java/fr/xephi/authme/cache/auth/PlayerAuth.java rename to src/main/java/fr/xephi/authme/data/auth/PlayerAuth.java index cdbe0c00..e4fd9230 100644 --- a/src/main/java/fr/xephi/authme/cache/auth/PlayerAuth.java +++ b/src/main/java/fr/xephi/authme/data/auth/PlayerAuth.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.cache.auth; +package fr.xephi.authme.data.auth; import fr.xephi.authme.security.crypts.HashedPassword; import org.bukkit.Location; diff --git a/src/main/java/fr/xephi/authme/cache/auth/PlayerCache.java b/src/main/java/fr/xephi/authme/data/auth/PlayerCache.java similarity index 98% rename from src/main/java/fr/xephi/authme/cache/auth/PlayerCache.java rename to src/main/java/fr/xephi/authme/data/auth/PlayerCache.java index b1352833..1ae08f8a 100644 --- a/src/main/java/fr/xephi/authme/cache/auth/PlayerCache.java +++ b/src/main/java/fr/xephi/authme/data/auth/PlayerCache.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.cache.auth; +package fr.xephi.authme.data.auth; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/fr/xephi/authme/cache/backup/PlayerDataStorage.java b/src/main/java/fr/xephi/authme/data/backup/LimboPlayerStorage.java similarity index 80% rename from src/main/java/fr/xephi/authme/cache/backup/PlayerDataStorage.java rename to src/main/java/fr/xephi/authme/data/backup/LimboPlayerStorage.java index 04015d84..1b227028 100644 --- a/src/main/java/fr/xephi/authme/cache/backup/PlayerDataStorage.java +++ b/src/main/java/fr/xephi/authme/data/backup/LimboPlayerStorage.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.cache.backup; +package fr.xephi.authme.data.backup; import com.google.common.io.Files; import com.google.gson.Gson; @@ -10,7 +10,7 @@ import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.cache.limbo.PlayerData; +import fr.xephi.authme.data.limbo.LimboPlayer; import fr.xephi.authme.initialization.DataFolder; import fr.xephi.authme.permission.PermissionsManager; import fr.xephi.authme.settings.SpawnLoader; @@ -30,7 +30,7 @@ import java.nio.charset.StandardCharsets; /** * Class used to store player's data (OP, flying, speed, position) to disk. */ -public class PlayerDataStorage { +public class LimboPlayerStorage { private final Gson gson; private final File cacheDir; @@ -39,8 +39,8 @@ public class PlayerDataStorage { private BukkitService bukkitService; @Inject - PlayerDataStorage(@DataFolder File dataFolder, PermissionsManager permsMan, - SpawnLoader spawnLoader, BukkitService bukkitService) { + LimboPlayerStorage(@DataFolder File dataFolder, PermissionsManager permsMan, + SpawnLoader spawnLoader, BukkitService bukkitService) { this.permissionsManager = permsMan; this.spawnLoader = spawnLoader; this.bukkitService = bukkitService; @@ -50,8 +50,8 @@ public class PlayerDataStorage { ConsoleLogger.warning("Failed to create userdata directory."); } gson = new GsonBuilder() - .registerTypeAdapter(PlayerData.class, new PlayerDataSerializer()) - .registerTypeAdapter(PlayerData.class, new PlayerDataDeserializer()) + .registerTypeAdapter(LimboPlayer.class, new LimboPlayerSerializer()) + .registerTypeAdapter(LimboPlayer.class, new LimboPlayerDeserializer()) .setPrettyPrinting() .create(); } @@ -63,7 +63,7 @@ public class PlayerDataStorage { * * @return PlayerData object if the data is exist, null otherwise. */ - public PlayerData readData(Player player) { + public LimboPlayer readData(Player player) { String id = PlayerUtils.getUUIDorName(player); File file = new File(cacheDir, id + File.separator + "data.json"); if (!file.exists()) { @@ -72,7 +72,7 @@ public class PlayerDataStorage { try { String str = Files.toString(file, StandardCharsets.UTF_8); - return gson.fromJson(str, PlayerData.class); + return gson.fromJson(str, LimboPlayer.class); } catch (IOException e) { ConsoleLogger.logException("Could not read player data on disk for '" + player.getName() + "'", e); return null; @@ -95,12 +95,12 @@ public class PlayerDataStorage { boolean canFly = player.getAllowFlight(); float walkSpeed = player.getWalkSpeed(); float flySpeed = player.getFlySpeed(); - PlayerData playerData = new PlayerData(location, operator, group, canFly, walkSpeed, flySpeed); + LimboPlayer limboPlayer = new LimboPlayer(location, operator, group, canFly, walkSpeed, flySpeed); try { File file = new File(cacheDir, id + File.separator + "data.json"); Files.createParentDirs(file); Files.touch(file); - Files.write(gson.toJson(playerData), file, StandardCharsets.UTF_8); + Files.write(gson.toJson(limboPlayer), file, StandardCharsets.UTF_8); } catch (IOException e) { ConsoleLogger.logException("Failed to write " + player.getName() + " data.", e); } @@ -136,10 +136,10 @@ public class PlayerDataStorage { return file.exists(); } - private class PlayerDataDeserializer implements JsonDeserializer { + private class LimboPlayerDeserializer implements JsonDeserializer { @Override - public PlayerData deserialize(JsonElement jsonElement, Type type, - JsonDeserializationContext context) { + public LimboPlayer deserialize(JsonElement jsonElement, Type type, + JsonDeserializationContext context) { JsonObject jsonObject = jsonElement.getAsJsonObject(); if (jsonObject == null) { return null; @@ -181,18 +181,18 @@ public class PlayerDataStorage { flySpeed = e.getAsFloat(); } - return new PlayerData(loc, operator, group, canFly, walkSpeed, flySpeed); + return new LimboPlayer(loc, operator, group, canFly, walkSpeed, flySpeed); } } - private class PlayerDataSerializer implements JsonSerializer { + private class LimboPlayerSerializer implements JsonSerializer { @Override - public JsonElement serialize(PlayerData playerData, Type type, + public JsonElement serialize(LimboPlayer limboPlayer, Type type, JsonSerializationContext context) { JsonObject obj = new JsonObject(); - obj.addProperty("group", playerData.getGroup()); + obj.addProperty("group", limboPlayer.getGroup()); - Location loc = playerData.getLocation(); + Location loc = limboPlayer.getLocation(); JsonObject obj2 = new JsonObject(); obj2.addProperty("world", loc.getWorld().getName()); obj2.addProperty("x", loc.getX()); @@ -202,10 +202,10 @@ public class PlayerDataStorage { obj2.addProperty("pitch", loc.getPitch()); obj.add("location", obj2); - obj.addProperty("operator", playerData.isOperator()); - obj.addProperty("can-fly", playerData.isCanFly()); - obj.addProperty("walk-speed", playerData.getWalkSpeed()); - obj.addProperty("fly-speed", playerData.getFlySpeed()); + obj.addProperty("operator", limboPlayer.isOperator()); + obj.addProperty("can-fly", limboPlayer.isCanFly()); + obj.addProperty("walk-speed", limboPlayer.getWalkSpeed()); + obj.addProperty("fly-speed", limboPlayer.getFlySpeed()); return obj; } } diff --git a/src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java b/src/main/java/fr/xephi/authme/data/limbo/LimboCache.java similarity index 82% rename from src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java rename to src/main/java/fr/xephi/authme/data/limbo/LimboCache.java index a49408b0..82e42fba 100644 --- a/src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java +++ b/src/main/java/fr/xephi/authme/data/limbo/LimboCache.java @@ -1,6 +1,6 @@ -package fr.xephi.authme.cache.limbo; +package fr.xephi.authme.data.limbo; -import fr.xephi.authme.cache.backup.PlayerDataStorage; +import fr.xephi.authme.data.backup.LimboPlayerStorage; import fr.xephi.authme.permission.PermissionsManager; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.SpawnLoader; @@ -16,24 +16,24 @@ import java.util.concurrent.ConcurrentHashMap; import static com.google.common.base.Preconditions.checkNotNull; /** - * Manages all {@link PlayerData} instances. + * Manages all {@link LimboPlayer} instances. */ public class LimboCache { - private final Map cache = new ConcurrentHashMap<>(); + private final Map cache = new ConcurrentHashMap<>(); - private PlayerDataStorage playerDataStorage; + private LimboPlayerStorage limboPlayerStorage; private Settings settings; private PermissionsManager permissionsManager; private SpawnLoader spawnLoader; @Inject LimboCache(Settings settings, PermissionsManager permissionsManager, - SpawnLoader spawnLoader, PlayerDataStorage playerDataStorage) { + SpawnLoader spawnLoader, LimboPlayerStorage limboPlayerStorage) { this.settings = settings; this.permissionsManager = permissionsManager; this.spawnLoader = spawnLoader; - this.playerDataStorage = playerDataStorage; + this.limboPlayerStorage = limboPlayerStorage; } /** @@ -53,8 +53,8 @@ public class LimboCache { playerGroup = permissionsManager.getPrimaryGroup(player); } - if (playerDataStorage.hasData(player)) { - PlayerData cache = playerDataStorage.readData(player); + if (limboPlayerStorage.hasData(player)) { + LimboPlayer cache = limboPlayerStorage.readData(player); if (cache != null) { location = cache.getLocation(); playerGroup = cache.getGroup(); @@ -64,10 +64,10 @@ public class LimboCache { flySpeed = cache.getFlySpeed(); } } else { - playerDataStorage.saveData(player); + limboPlayerStorage.saveData(player); } - cache.put(name, new PlayerData(location, operator, playerGroup, flyEnabled, walkSpeed, flySpeed)); + cache.put(name, new LimboPlayer(location, operator, playerGroup, flyEnabled, walkSpeed, flySpeed)); } /** @@ -78,7 +78,7 @@ public class LimboCache { public void restoreData(Player player) { String lowerName = player.getName().toLowerCase(); if (cache.containsKey(lowerName)) { - PlayerData data = cache.get(lowerName); + LimboPlayer data = cache.get(lowerName); player.setOp(data.isOperator()); player.setAllowFlight(data.isCanFly()); float walkSpeed = data.getWalkSpeed(); @@ -104,7 +104,7 @@ public class LimboCache { */ public void deletePlayerData(Player player) { removeFromCache(player); - playerDataStorage.removeData(player); + limboPlayerStorage.removeData(player); } /** @@ -114,7 +114,7 @@ public class LimboCache { */ public void removeFromCache(Player player) { String name = player.getName().toLowerCase(); - PlayerData cachedPlayer = cache.remove(name); + LimboPlayer cachedPlayer = cache.remove(name); if (cachedPlayer != null) { cachedPlayer.clearTasks(); } @@ -127,7 +127,7 @@ public class LimboCache { * * @return PlayerData */ - public PlayerData getPlayerData(String name) { + public LimboPlayer getPlayerData(String name) { checkNotNull(name); return cache.get(name.toLowerCase()); } diff --git a/src/main/java/fr/xephi/authme/cache/limbo/PlayerData.java b/src/main/java/fr/xephi/authme/data/limbo/LimboPlayer.java similarity index 94% rename from src/main/java/fr/xephi/authme/cache/limbo/PlayerData.java rename to src/main/java/fr/xephi/authme/data/limbo/LimboPlayer.java index 36e641fd..d0b761f1 100644 --- a/src/main/java/fr/xephi/authme/cache/limbo/PlayerData.java +++ b/src/main/java/fr/xephi/authme/data/limbo/LimboPlayer.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.cache.limbo; +package fr.xephi.authme.data.limbo; import org.bukkit.Location; import org.bukkit.scheduler.BukkitTask; @@ -7,7 +7,7 @@ import org.bukkit.scheduler.BukkitTask; * Represents a player which is not logged in and keeps track of certain states (like OP status, flying) * which may be revoked from the player until he has logged in or registered. */ -public class PlayerData { +public class LimboPlayer { private final boolean canFly; private final boolean operator; @@ -18,8 +18,7 @@ public class PlayerData { private BukkitTask timeoutTask = null; private BukkitTask messageTask = null; - public PlayerData(Location loc, boolean operator, - String group, boolean fly, float walkSpeed, float flySpeed) { + public LimboPlayer(Location loc, boolean operator, String group, boolean fly, float walkSpeed, float flySpeed) { this.loc = loc; this.operator = operator; this.group = group; diff --git a/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java b/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java index 7032733d..ebd9299e 100644 --- a/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java +++ b/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java @@ -9,8 +9,10 @@ import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.ThreadFactoryBuilder; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerCache; +import fr.xephi.authme.datasource.DataSource; +import fr.xephi.authme.datasource.DataSourceType; import fr.xephi.authme.security.crypts.HashedPassword; import java.util.ArrayList; diff --git a/src/main/java/fr/xephi/authme/datasource/DataSource.java b/src/main/java/fr/xephi/authme/datasource/DataSource.java index 98e29ada..c1c79a64 100644 --- a/src/main/java/fr/xephi/authme/datasource/DataSource.java +++ b/src/main/java/fr/xephi/authme/datasource/DataSource.java @@ -1,6 +1,6 @@ package fr.xephi.authme.datasource; -import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.initialization.Reloadable; import fr.xephi.authme.security.crypts.HashedPassword; diff --git a/src/main/java/fr/xephi/authme/datasource/DataSourceType.java b/src/main/java/fr/xephi/authme/datasource/DataSourceType.java index 133b492f..093e88ed 100644 --- a/src/main/java/fr/xephi/authme/datasource/DataSourceType.java +++ b/src/main/java/fr/xephi/authme/datasource/DataSourceType.java @@ -7,9 +7,9 @@ public enum DataSourceType { MYSQL, - @Deprecated - FILE, + SQLITE, - SQLITE + @Deprecated + FILE } diff --git a/src/main/java/fr/xephi/authme/datasource/FlatFile.java b/src/main/java/fr/xephi/authme/datasource/FlatFile.java index 779d3640..49b5442d 100644 --- a/src/main/java/fr/xephi/authme/datasource/FlatFile.java +++ b/src/main/java/fr/xephi/authme/datasource/FlatFile.java @@ -1,8 +1,8 @@ package fr.xephi.authme.datasource; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.security.crypts.HashedPassword; import java.io.BufferedReader; diff --git a/src/main/java/fr/xephi/authme/datasource/MySQL.java b/src/main/java/fr/xephi/authme/datasource/MySQL.java index 05f22d0c..9c613ec3 100644 --- a/src/main/java/fr/xephi/authme/datasource/MySQL.java +++ b/src/main/java/fr/xephi/authme/datasource/MySQL.java @@ -4,7 +4,10 @@ import com.google.common.annotations.VisibleForTesting; import com.zaxxer.hikari.HikariDataSource; import com.zaxxer.hikari.pool.HikariPool.PoolInitializationException; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.datasource.Columns; +import fr.xephi.authme.datasource.DataSource; +import fr.xephi.authme.datasource.DataSourceType; import fr.xephi.authme.security.HashAlgorithm; import fr.xephi.authme.security.crypts.HashedPassword; import fr.xephi.authme.security.crypts.XFBCRYPT; diff --git a/src/main/java/fr/xephi/authme/datasource/SQLite.java b/src/main/java/fr/xephi/authme/datasource/SQLite.java index 1e554671..d19c4aa2 100644 --- a/src/main/java/fr/xephi/authme/datasource/SQLite.java +++ b/src/main/java/fr/xephi/authme/datasource/SQLite.java @@ -2,7 +2,10 @@ package fr.xephi.authme.datasource; import com.google.common.annotations.VisibleForTesting; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.datasource.Columns; +import fr.xephi.authme.datasource.DataSource; +import fr.xephi.authme.datasource.DataSourceType; import fr.xephi.authme.security.crypts.HashedPassword; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.properties.DatabaseSettings; diff --git a/src/main/java/fr/xephi/authme/converter/AbstractDataSourceConverter.java b/src/main/java/fr/xephi/authme/datasource/converter/AbstractDataSourceConverter.java similarity index 97% rename from src/main/java/fr/xephi/authme/converter/AbstractDataSourceConverter.java rename to src/main/java/fr/xephi/authme/datasource/converter/AbstractDataSourceConverter.java index 083cfe2c..d2be7804 100644 --- a/src/main/java/fr/xephi/authme/converter/AbstractDataSourceConverter.java +++ b/src/main/java/fr/xephi/authme/datasource/converter/AbstractDataSourceConverter.java @@ -1,7 +1,7 @@ -package fr.xephi.authme.converter; +package fr.xephi.authme.datasource.converter; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.datasource.DataSourceType; import org.bukkit.command.CommandSender; diff --git a/src/main/java/fr/xephi/authme/converter/Converter.java b/src/main/java/fr/xephi/authme/datasource/converter/Converter.java similarity index 85% rename from src/main/java/fr/xephi/authme/converter/Converter.java rename to src/main/java/fr/xephi/authme/datasource/converter/Converter.java index 28f18fd9..7549bb48 100644 --- a/src/main/java/fr/xephi/authme/converter/Converter.java +++ b/src/main/java/fr/xephi/authme/datasource/converter/Converter.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.converter; +package fr.xephi.authme.datasource.converter; import org.bukkit.command.CommandSender; diff --git a/src/main/java/fr/xephi/authme/converter/CrazyLoginConverter.java b/src/main/java/fr/xephi/authme/datasource/converter/CrazyLoginConverter.java similarity index 96% rename from src/main/java/fr/xephi/authme/converter/CrazyLoginConverter.java rename to src/main/java/fr/xephi/authme/datasource/converter/CrazyLoginConverter.java index 50cb43c1..535c0eba 100644 --- a/src/main/java/fr/xephi/authme/converter/CrazyLoginConverter.java +++ b/src/main/java/fr/xephi/authme/datasource/converter/CrazyLoginConverter.java @@ -1,7 +1,7 @@ -package fr.xephi.authme.converter; +package fr.xephi.authme.datasource.converter; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.initialization.DataFolder; import fr.xephi.authme.settings.Settings; diff --git a/src/main/java/fr/xephi/authme/converter/ForceFlatToSqlite.java b/src/main/java/fr/xephi/authme/datasource/converter/ForceFlatToSqlite.java similarity index 93% rename from src/main/java/fr/xephi/authme/converter/ForceFlatToSqlite.java rename to src/main/java/fr/xephi/authme/datasource/converter/ForceFlatToSqlite.java index 321ef246..a52b216b 100644 --- a/src/main/java/fr/xephi/authme/converter/ForceFlatToSqlite.java +++ b/src/main/java/fr/xephi/authme/datasource/converter/ForceFlatToSqlite.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.converter; +package fr.xephi.authme.datasource.converter; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.datasource.FlatFile; diff --git a/src/main/java/fr/xephi/authme/converter/MySqlToSqlite.java b/src/main/java/fr/xephi/authme/datasource/converter/MySqlToSqlite.java similarity index 93% rename from src/main/java/fr/xephi/authme/converter/MySqlToSqlite.java rename to src/main/java/fr/xephi/authme/datasource/converter/MySqlToSqlite.java index 76e58f96..7b793e8b 100644 --- a/src/main/java/fr/xephi/authme/converter/MySqlToSqlite.java +++ b/src/main/java/fr/xephi/authme/datasource/converter/MySqlToSqlite.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.converter; +package fr.xephi.authme.datasource.converter; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.datasource.DataSourceType; diff --git a/src/main/java/fr/xephi/authme/converter/RakamakConverter.java b/src/main/java/fr/xephi/authme/datasource/converter/RakamakConverter.java similarity index 97% rename from src/main/java/fr/xephi/authme/converter/RakamakConverter.java rename to src/main/java/fr/xephi/authme/datasource/converter/RakamakConverter.java index 9cf6749f..eb9d904c 100644 --- a/src/main/java/fr/xephi/authme/converter/RakamakConverter.java +++ b/src/main/java/fr/xephi/authme/datasource/converter/RakamakConverter.java @@ -1,7 +1,7 @@ -package fr.xephi.authme.converter; +package fr.xephi.authme.datasource.converter; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.initialization.DataFolder; import fr.xephi.authme.security.PasswordSecurity; diff --git a/src/main/java/fr/xephi/authme/converter/RoyalAuthConverter.java b/src/main/java/fr/xephi/authme/datasource/converter/RoyalAuthConverter.java similarity index 92% rename from src/main/java/fr/xephi/authme/converter/RoyalAuthConverter.java rename to src/main/java/fr/xephi/authme/datasource/converter/RoyalAuthConverter.java index 49cde259..34b0d61c 100644 --- a/src/main/java/fr/xephi/authme/converter/RoyalAuthConverter.java +++ b/src/main/java/fr/xephi/authme/datasource/converter/RoyalAuthConverter.java @@ -1,8 +1,8 @@ -package fr.xephi.authme.converter; +package fr.xephi.authme.datasource.converter; import fr.xephi.authme.AuthMe; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.datasource.DataSource; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; @@ -12,7 +12,7 @@ import org.bukkit.configuration.file.YamlConfiguration; import javax.inject.Inject; import java.io.File; -import static fr.xephi.authme.util.StringUtils.makePath; +import static fr.xephi.authme.util.FileUtils.makePath; public class RoyalAuthConverter implements Converter { diff --git a/src/main/java/fr/xephi/authme/converter/SqliteToSql.java b/src/main/java/fr/xephi/authme/datasource/converter/SqliteToSql.java similarity index 93% rename from src/main/java/fr/xephi/authme/converter/SqliteToSql.java rename to src/main/java/fr/xephi/authme/datasource/converter/SqliteToSql.java index fafa7e27..ce45efed 100644 --- a/src/main/java/fr/xephi/authme/converter/SqliteToSql.java +++ b/src/main/java/fr/xephi/authme/datasource/converter/SqliteToSql.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.converter; +package fr.xephi.authme.datasource.converter; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.datasource.DataSourceType; diff --git a/src/main/java/fr/xephi/authme/converter/vAuthConverter.java b/src/main/java/fr/xephi/authme/datasource/converter/vAuthConverter.java similarity index 94% rename from src/main/java/fr/xephi/authme/converter/vAuthConverter.java rename to src/main/java/fr/xephi/authme/datasource/converter/vAuthConverter.java index 9c116f02..6d3de8b7 100644 --- a/src/main/java/fr/xephi/authme/converter/vAuthConverter.java +++ b/src/main/java/fr/xephi/authme/datasource/converter/vAuthConverter.java @@ -1,7 +1,7 @@ -package fr.xephi.authme.converter; +package fr.xephi.authme.datasource.converter; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.initialization.DataFolder; import org.bukkit.Bukkit; @@ -14,7 +14,7 @@ import java.io.IOException; import java.util.Scanner; import java.util.UUID; -import static fr.xephi.authme.util.StringUtils.makePath; +import static fr.xephi.authme.util.FileUtils.makePath; public class vAuthConverter implements Converter { diff --git a/src/main/java/fr/xephi/authme/converter/xAuthConverter.java b/src/main/java/fr/xephi/authme/datasource/converter/xAuthConverter.java similarity index 97% rename from src/main/java/fr/xephi/authme/converter/xAuthConverter.java rename to src/main/java/fr/xephi/authme/datasource/converter/xAuthConverter.java index 37dfc9fe..27fa6c2e 100644 --- a/src/main/java/fr/xephi/authme/converter/xAuthConverter.java +++ b/src/main/java/fr/xephi/authme/datasource/converter/xAuthConverter.java @@ -1,9 +1,9 @@ -package fr.xephi.authme.converter; +package fr.xephi.authme.datasource.converter; import de.luricos.bukkit.xAuth.database.DatabaseTables; import de.luricos.bukkit.xAuth.utils.xAuthLog; import de.luricos.bukkit.xAuth.xAuth; -import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.initialization.DataFolder; import fr.xephi.authme.util.CollectionUtils; @@ -19,7 +19,7 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import static fr.xephi.authme.util.StringUtils.makePath; +import static fr.xephi.authme.util.FileUtils.makePath; public class xAuthConverter implements Converter { diff --git a/src/main/java/fr/xephi/authme/geoip/GeoLiteAPI.java b/src/main/java/fr/xephi/authme/geoip/GeoIpManager.java similarity index 96% rename from src/main/java/fr/xephi/authme/geoip/GeoLiteAPI.java rename to src/main/java/fr/xephi/authme/geoip/GeoIpManager.java index 11f5e4f0..bd397a97 100644 --- a/src/main/java/fr/xephi/authme/geoip/GeoLiteAPI.java +++ b/src/main/java/fr/xephi/authme/geoip/GeoIpManager.java @@ -17,7 +17,7 @@ import java.net.URLConnection; import java.util.concurrent.TimeUnit; import java.util.zip.GZIPInputStream; -public class GeoLiteAPI { +public class GeoIpManager { private static final String LICENSE = "[LICENSE] This product uses data from the GeoLite API created by MaxMind, available at http://www.maxmind.com"; private static final String GEOIP_URL = @@ -28,14 +28,14 @@ public class GeoLiteAPI { private final File dataFile; @Inject - GeoLiteAPI(@DataFolder File dataFolder) { + GeoIpManager(@DataFolder File dataFolder) { this.dataFile = new File(dataFolder, "GeoIP.dat"); // Fires download of recent data or the initialization of the look up service isDataAvailable(); } @VisibleForTesting - GeoLiteAPI(@DataFolder File dataFolder, LookupService lookupService) { + GeoIpManager(@DataFolder File dataFolder, LookupService lookupService) { this.dataFile = dataFolder; this.lookupService = lookupService; } diff --git a/src/main/java/fr/xephi/authme/initialization/Initializer.java b/src/main/java/fr/xephi/authme/initialization/Initializer.java index 5a048678..a7bb4c28 100644 --- a/src/main/java/fr/xephi/authme/initialization/Initializer.java +++ b/src/main/java/fr/xephi/authme/initialization/Initializer.java @@ -5,7 +5,7 @@ import com.github.authme.configme.resource.PropertyResource; import com.github.authme.configme.resource.YamlFileResource; import fr.xephi.authme.AuthMe; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.datasource.CacheDataSource; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.datasource.DataSourceType; @@ -14,8 +14,8 @@ import fr.xephi.authme.datasource.MySQL; import fr.xephi.authme.datasource.SQLite; import fr.xephi.authme.output.ConsoleFilter; import fr.xephi.authme.output.Log4JFilter; -import fr.xephi.authme.output.MessageKey; -import fr.xephi.authme.output.Messages; +import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.message.Messages; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.SettingsMigrationService; import fr.xephi.authme.settings.properties.AuthMeSettingsRetriever; diff --git a/src/main/java/fr/xephi/authme/initialization/OnShutdownPlayerSaver.java b/src/main/java/fr/xephi/authme/initialization/OnShutdownPlayerSaver.java index 28a1134f..079fc76a 100644 --- a/src/main/java/fr/xephi/authme/initialization/OnShutdownPlayerSaver.java +++ b/src/main/java/fr/xephi/authme/initialization/OnShutdownPlayerSaver.java @@ -1,9 +1,9 @@ package fr.xephi.authme.initialization; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.cache.auth.PlayerCache; -import fr.xephi.authme.cache.backup.PlayerDataStorage; -import fr.xephi.authme.cache.limbo.LimboCache; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerCache; +import fr.xephi.authme.data.backup.LimboPlayerStorage; +import fr.xephi.authme.data.limbo.LimboCache; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.hooks.PluginHooks; import fr.xephi.authme.settings.Settings; @@ -32,7 +32,7 @@ public class OnShutdownPlayerSaver { @Inject private DataSource dataSource; @Inject - private PlayerDataStorage playerDataStorage; + private LimboPlayerStorage limboPlayerStorage; @Inject private SpawnLoader spawnLoader; @Inject @@ -77,8 +77,8 @@ public class OnShutdownPlayerSaver { } if (settings.getProperty(RestrictionSettings.TELEPORT_UNAUTHED_TO_SPAWN) && !settings.getProperty(RestrictionSettings.NO_TELEPORT)) { - if (!playerDataStorage.hasData(player)) { - playerDataStorage.saveData(player); + if (!limboPlayerStorage.hasData(player)) { + limboPlayerStorage.saveData(player); } } } diff --git a/src/main/java/fr/xephi/authme/listener/FailedVerificationException.java b/src/main/java/fr/xephi/authme/listener/FailedVerificationException.java index fcbaa1b6..0b887f92 100644 --- a/src/main/java/fr/xephi/authme/listener/FailedVerificationException.java +++ b/src/main/java/fr/xephi/authme/listener/FailedVerificationException.java @@ -1,6 +1,6 @@ package fr.xephi.authme.listener; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; /** * Exception thrown when a verification has failed. diff --git a/src/main/java/fr/xephi/authme/listener/ListenerService.java b/src/main/java/fr/xephi/authme/listener/ListenerService.java index 4db65530..279bfd6c 100644 --- a/src/main/java/fr/xephi/authme/listener/ListenerService.java +++ b/src/main/java/fr/xephi/authme/listener/ListenerService.java @@ -1,6 +1,6 @@ package fr.xephi.authme.listener; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.hooks.PluginHooks; import fr.xephi.authme.initialization.SettingsDependent; diff --git a/src/main/java/fr/xephi/authme/listener/OnJoinVerifier.java b/src/main/java/fr/xephi/authme/listener/OnJoinVerifier.java index b58f9bc9..93783346 100644 --- a/src/main/java/fr/xephi/authme/listener/OnJoinVerifier.java +++ b/src/main/java/fr/xephi/authme/listener/OnJoinVerifier.java @@ -1,11 +1,11 @@ package fr.xephi.authme.listener; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.initialization.Reloadable; -import fr.xephi.authme.output.MessageKey; -import fr.xephi.authme.output.Messages; +import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.message.Messages; import fr.xephi.authme.permission.PermissionsManager; import fr.xephi.authme.permission.PlayerStatePermission; import fr.xephi.authme.service.AntiBotService; diff --git a/src/main/java/fr/xephi/authme/listener/PlayerListener.java b/src/main/java/fr/xephi/authme/listener/PlayerListener.java index 20f33f09..b6484fb3 100644 --- a/src/main/java/fr/xephi/authme/listener/PlayerListener.java +++ b/src/main/java/fr/xephi/authme/listener/PlayerListener.java @@ -1,9 +1,9 @@ package fr.xephi.authme.listener; -import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.MessageKey; -import fr.xephi.authme.output.Messages; +import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.message.Messages; import fr.xephi.authme.process.Management; import fr.xephi.authme.service.AntiBotService; import fr.xephi.authme.settings.Settings; diff --git a/src/main/java/fr/xephi/authme/listener/protocollib/InventoryPacketAdapter.java b/src/main/java/fr/xephi/authme/listener/protocollib/InventoryPacketAdapter.java index 1813ae1d..c7abf96e 100644 --- a/src/main/java/fr/xephi/authme/listener/protocollib/InventoryPacketAdapter.java +++ b/src/main/java/fr/xephi/authme/listener/protocollib/InventoryPacketAdapter.java @@ -23,7 +23,7 @@ import com.comphenix.protocol.events.PacketAdapter; import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.events.PacketEvent; import fr.xephi.authme.AuthMe; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.auth.PlayerCache; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/fr/xephi/authme/listener/protocollib/ProtocolLibService.java b/src/main/java/fr/xephi/authme/listener/protocollib/ProtocolLibService.java index 3e10cde0..77a75ac0 100644 --- a/src/main/java/fr/xephi/authme/listener/protocollib/ProtocolLibService.java +++ b/src/main/java/fr/xephi/authme/listener/protocollib/ProtocolLibService.java @@ -3,7 +3,7 @@ package fr.xephi.authme.listener.protocollib; import ch.jalu.injector.annotations.NoFieldScan; import fr.xephi.authme.AuthMe; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.initialization.SettingsDependent; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.properties.RestrictionSettings; diff --git a/src/main/java/fr/xephi/authme/listener/protocollib/TabCompletePacketAdapter.java b/src/main/java/fr/xephi/authme/listener/protocollib/TabCompletePacketAdapter.java index 35058731..4476f80a 100644 --- a/src/main/java/fr/xephi/authme/listener/protocollib/TabCompletePacketAdapter.java +++ b/src/main/java/fr/xephi/authme/listener/protocollib/TabCompletePacketAdapter.java @@ -8,7 +8,7 @@ import com.comphenix.protocol.events.PacketEvent; import com.comphenix.protocol.reflect.FieldAccessException; import fr.xephi.authme.AuthMe; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.auth.PlayerCache; class TabCompletePacketAdapter extends PacketAdapter { diff --git a/src/main/java/fr/xephi/authme/output/MessageKey.java b/src/main/java/fr/xephi/authme/message/MessageKey.java similarity index 99% rename from src/main/java/fr/xephi/authme/output/MessageKey.java rename to src/main/java/fr/xephi/authme/message/MessageKey.java index c5a7cd36..f0575227 100644 --- a/src/main/java/fr/xephi/authme/output/MessageKey.java +++ b/src/main/java/fr/xephi/authme/message/MessageKey.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.output; +package fr.xephi.authme.message; /** * Keys for translatable messages managed by {@link Messages}. diff --git a/src/main/java/fr/xephi/authme/output/Messages.java b/src/main/java/fr/xephi/authme/message/Messages.java similarity index 99% rename from src/main/java/fr/xephi/authme/output/Messages.java rename to src/main/java/fr/xephi/authme/message/Messages.java index 5c076f1a..e17ee1a1 100644 --- a/src/main/java/fr/xephi/authme/output/Messages.java +++ b/src/main/java/fr/xephi/authme/message/Messages.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.output; +package fr.xephi.authme.message; import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.initialization.SettingsDependent; diff --git a/src/main/java/fr/xephi/authme/permission/AuthGroupHandler.java b/src/main/java/fr/xephi/authme/permission/AuthGroupHandler.java index 7d2136f0..fb4bff48 100644 --- a/src/main/java/fr/xephi/authme/permission/AuthGroupHandler.java +++ b/src/main/java/fr/xephi/authme/permission/AuthGroupHandler.java @@ -1,8 +1,8 @@ package fr.xephi.authme.permission; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.cache.limbo.LimboCache; -import fr.xephi.authme.cache.limbo.PlayerData; +import fr.xephi.authme.data.limbo.LimboCache; +import fr.xephi.authme.data.limbo.LimboPlayer; import fr.xephi.authme.initialization.Reloadable; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.properties.HooksSettings; @@ -72,7 +72,7 @@ public class AuthGroupHandler implements Reloadable { case LOGGED_IN: // Get the player data - PlayerData data = limboCache.getPlayerData(player.getName().toLowerCase()); + LimboPlayer data = limboCache.getPlayerData(player.getName().toLowerCase()); if (data == null) { return false; } diff --git a/src/main/java/fr/xephi/authme/process/ProcessService.java b/src/main/java/fr/xephi/authme/process/ProcessService.java index 239c73fd..575b8053 100644 --- a/src/main/java/fr/xephi/authme/process/ProcessService.java +++ b/src/main/java/fr/xephi/authme/process/ProcessService.java @@ -1,8 +1,8 @@ package fr.xephi.authme.process; import com.github.authme.configme.properties.Property; -import fr.xephi.authme.output.MessageKey; -import fr.xephi.authme.output.Messages; +import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.message.Messages; import fr.xephi.authme.permission.AuthGroupHandler; import fr.xephi.authme.permission.AuthGroupType; import fr.xephi.authme.permission.PermissionNode; diff --git a/src/main/java/fr/xephi/authme/process/changepassword/AsyncChangePassword.java b/src/main/java/fr/xephi/authme/process/changepassword/AsyncChangePassword.java index 3274c2f4..12471b0e 100644 --- a/src/main/java/fr/xephi/authme/process/changepassword/AsyncChangePassword.java +++ b/src/main/java/fr/xephi/authme/process/changepassword/AsyncChangePassword.java @@ -1,10 +1,10 @@ package fr.xephi.authme.process.changepassword; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.process.AsynchronousProcess; import fr.xephi.authme.process.ProcessService; import fr.xephi.authme.security.PasswordSecurity; diff --git a/src/main/java/fr/xephi/authme/process/email/AsyncAddEmail.java b/src/main/java/fr/xephi/authme/process/email/AsyncAddEmail.java index d61d39c2..5a8a8e90 100644 --- a/src/main/java/fr/xephi/authme/process/email/AsyncAddEmail.java +++ b/src/main/java/fr/xephi/authme/process/email/AsyncAddEmail.java @@ -1,10 +1,10 @@ package fr.xephi.authme.process.email; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.process.AsynchronousProcess; import fr.xephi.authme.process.ProcessService; import fr.xephi.authme.settings.properties.RegistrationSettings; diff --git a/src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java b/src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java index 3ca6a246..6bc83106 100644 --- a/src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java +++ b/src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java @@ -1,9 +1,9 @@ package fr.xephi.authme.process.email; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.process.AsynchronousProcess; import fr.xephi.authme.process.ProcessService; import fr.xephi.authme.settings.properties.RegistrationSettings; diff --git a/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java b/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java index b8dd5af0..de276248 100644 --- a/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java +++ b/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java @@ -2,14 +2,14 @@ package fr.xephi.authme.process.join; import fr.xephi.authme.AuthMe; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.cache.SessionManager; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.cache.auth.PlayerCache; -import fr.xephi.authme.cache.limbo.LimboCache; +import fr.xephi.authme.data.SessionManager; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerCache; +import fr.xephi.authme.data.limbo.LimboCache; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.events.ProtectInventoryEvent; import fr.xephi.authme.hooks.PluginHooks; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.permission.AuthGroupType; import fr.xephi.authme.permission.PlayerStatePermission; import fr.xephi.authme.process.AsynchronousProcess; diff --git a/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java b/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java index 3a8b7fc3..6fe3ac96 100644 --- a/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java +++ b/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java @@ -2,15 +2,15 @@ package fr.xephi.authme.process.login; import com.google.common.annotations.VisibleForTesting; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.cache.CaptchaManager; -import fr.xephi.authme.cache.TempbanManager; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.cache.auth.PlayerCache; -import fr.xephi.authme.cache.limbo.LimboCache; -import fr.xephi.authme.cache.limbo.PlayerData; +import fr.xephi.authme.data.CaptchaManager; +import fr.xephi.authme.data.TempbanManager; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerCache; +import fr.xephi.authme.data.limbo.LimboCache; +import fr.xephi.authme.data.limbo.LimboPlayer; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.events.AuthMeAsyncPreLoginEvent; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.permission.AdminPermission; import fr.xephi.authme.permission.PermissionsManager; import fr.xephi.authme.permission.PlayerPermission; @@ -241,9 +241,9 @@ public class AsynchronousLogin implements AsynchronousProcess { // task, we schedule it in the end // so that we can be sure, and have not to care if it might be // processed in other order. - PlayerData playerData = limboCache.getPlayerData(name); - if (playerData != null) { - playerData.clearTasks(); + LimboPlayer limboPlayer = limboCache.getPlayerData(name); + if (limboPlayer != null) { + limboPlayer.clearTasks(); } syncProcessManager.processSyncPlayerLogin(player); } else { diff --git a/src/main/java/fr/xephi/authme/process/login/ProcessSyncPlayerLogin.java b/src/main/java/fr/xephi/authme/process/login/ProcessSyncPlayerLogin.java index 4735ab57..a31f4d28 100644 --- a/src/main/java/fr/xephi/authme/process/login/ProcessSyncPlayerLogin.java +++ b/src/main/java/fr/xephi/authme/process/login/ProcessSyncPlayerLogin.java @@ -1,9 +1,9 @@ package fr.xephi.authme.process.login; import fr.xephi.authme.AuthMe; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.cache.limbo.LimboCache; -import fr.xephi.authme.cache.limbo.PlayerData; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.data.limbo.LimboCache; +import fr.xephi.authme.data.limbo.LimboPlayer; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.events.LoginEvent; import fr.xephi.authme.events.RestoreInventoryEvent; @@ -79,7 +79,7 @@ public class ProcessSyncPlayerLogin implements SynchronousProcess { public void processPlayerLogin(Player player) { final String name = player.getName().toLowerCase(); - final PlayerData limbo = limboCache.getPlayerData(name); + final LimboPlayer limbo = limboCache.getPlayerData(name); // Limbo contains the State of the Player before /login if (limbo != null) { limboCache.restoreData(player); diff --git a/src/main/java/fr/xephi/authme/process/logout/AsynchronousLogout.java b/src/main/java/fr/xephi/authme/process/logout/AsynchronousLogout.java index 34a5b493..7374d738 100644 --- a/src/main/java/fr/xephi/authme/process/logout/AsynchronousLogout.java +++ b/src/main/java/fr/xephi/authme/process/logout/AsynchronousLogout.java @@ -1,10 +1,10 @@ package fr.xephi.authme.process.logout; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.cache.auth.PlayerCache; -import fr.xephi.authme.cache.limbo.LimboCache; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerCache; +import fr.xephi.authme.data.limbo.LimboCache; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.process.AsynchronousProcess; import fr.xephi.authme.process.ProcessService; import fr.xephi.authme.process.SyncProcessManager; diff --git a/src/main/java/fr/xephi/authme/process/logout/ProcessSynchronousPlayerLogout.java b/src/main/java/fr/xephi/authme/process/logout/ProcessSynchronousPlayerLogout.java index cb3723cb..157e2a44 100644 --- a/src/main/java/fr/xephi/authme/process/logout/ProcessSynchronousPlayerLogout.java +++ b/src/main/java/fr/xephi/authme/process/logout/ProcessSynchronousPlayerLogout.java @@ -1,10 +1,10 @@ package fr.xephi.authme.process.logout; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.cache.SessionManager; +import fr.xephi.authme.data.SessionManager; import fr.xephi.authme.events.LogoutEvent; import fr.xephi.authme.listener.protocollib.ProtocolLibService; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.permission.AuthGroupType; import fr.xephi.authme.process.ProcessService; import fr.xephi.authme.process.SynchronousProcess; diff --git a/src/main/java/fr/xephi/authme/process/quit/AsynchronousQuit.java b/src/main/java/fr/xephi/authme/process/quit/AsynchronousQuit.java index ce3af43a..c8f63bbd 100644 --- a/src/main/java/fr/xephi/authme/process/quit/AsynchronousQuit.java +++ b/src/main/java/fr/xephi/authme/process/quit/AsynchronousQuit.java @@ -1,9 +1,9 @@ package fr.xephi.authme.process.quit; import fr.xephi.authme.AuthMe; -import fr.xephi.authme.cache.SessionManager; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.SessionManager; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.datasource.CacheDataSource; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.process.AsynchronousProcess; diff --git a/src/main/java/fr/xephi/authme/process/quit/ProcessSyncronousPlayerQuit.java b/src/main/java/fr/xephi/authme/process/quit/ProcessSyncronousPlayerQuit.java index 27f46071..73db67f8 100644 --- a/src/main/java/fr/xephi/authme/process/quit/ProcessSyncronousPlayerQuit.java +++ b/src/main/java/fr/xephi/authme/process/quit/ProcessSyncronousPlayerQuit.java @@ -1,7 +1,7 @@ package fr.xephi.authme.process.quit; -import fr.xephi.authme.cache.backup.PlayerDataStorage; -import fr.xephi.authme.cache.limbo.LimboCache; +import fr.xephi.authme.data.backup.LimboPlayerStorage; +import fr.xephi.authme.data.limbo.LimboCache; import fr.xephi.authme.process.SynchronousProcess; import org.bukkit.entity.Player; @@ -11,7 +11,7 @@ import javax.inject.Inject; public class ProcessSyncronousPlayerQuit implements SynchronousProcess { @Inject - private PlayerDataStorage playerDataStorage; + private LimboPlayerStorage limboPlayerStorage; @Inject private LimboCache limboCache; @@ -22,8 +22,8 @@ public class ProcessSyncronousPlayerQuit implements SynchronousProcess { limboCache.removeFromCache(player); } else { // Save player's data, so we could retrieve it later on player next join - if (!playerDataStorage.hasData(player)) { - playerDataStorage.saveData(player); + if (!limboPlayerStorage.hasData(player)) { + limboPlayerStorage.saveData(player); } } diff --git a/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java b/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java index 41b1d999..627a993b 100644 --- a/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java +++ b/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java @@ -1,10 +1,10 @@ package fr.xephi.authme.process.register; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.mail.SendMailSSL; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.permission.PermissionsManager; import fr.xephi.authme.process.AsynchronousProcess; import fr.xephi.authme.process.ProcessService; diff --git a/src/main/java/fr/xephi/authme/process/register/ProcessSyncEmailRegister.java b/src/main/java/fr/xephi/authme/process/register/ProcessSyncEmailRegister.java index 67e1478a..1ea42114 100644 --- a/src/main/java/fr/xephi/authme/process/register/ProcessSyncEmailRegister.java +++ b/src/main/java/fr/xephi/authme/process/register/ProcessSyncEmailRegister.java @@ -1,7 +1,7 @@ package fr.xephi.authme.process.register; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.permission.AuthGroupType; import fr.xephi.authme.process.ProcessService; import fr.xephi.authme.process.SynchronousProcess; diff --git a/src/main/java/fr/xephi/authme/process/register/ProcessSyncPasswordRegister.java b/src/main/java/fr/xephi/authme/process/register/ProcessSyncPasswordRegister.java index cbc37cbd..eb2e5f5c 100644 --- a/src/main/java/fr/xephi/authme/process/register/ProcessSyncPasswordRegister.java +++ b/src/main/java/fr/xephi/authme/process/register/ProcessSyncPasswordRegister.java @@ -1,8 +1,8 @@ package fr.xephi.authme.process.register; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.cache.limbo.LimboCache; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.data.limbo.LimboCache; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.permission.AuthGroupType; import fr.xephi.authme.process.ProcessService; import fr.xephi.authme.process.SynchronousProcess; diff --git a/src/main/java/fr/xephi/authme/process/unregister/AsynchronousUnregister.java b/src/main/java/fr/xephi/authme/process/unregister/AsynchronousUnregister.java index de859e9a..142ff606 100644 --- a/src/main/java/fr/xephi/authme/process/unregister/AsynchronousUnregister.java +++ b/src/main/java/fr/xephi/authme/process/unregister/AsynchronousUnregister.java @@ -1,11 +1,11 @@ package fr.xephi.authme.process.unregister; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.cache.auth.PlayerCache; -import fr.xephi.authme.cache.limbo.LimboCache; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerCache; +import fr.xephi.authme.data.limbo.LimboCache; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.permission.AuthGroupHandler; import fr.xephi.authme.permission.AuthGroupType; import fr.xephi.authme.process.AsynchronousProcess; diff --git a/src/main/java/fr/xephi/authme/service/AntiBotService.java b/src/main/java/fr/xephi/authme/service/AntiBotService.java index 561b5751..be1eb8da 100644 --- a/src/main/java/fr/xephi/authme/service/AntiBotService.java +++ b/src/main/java/fr/xephi/authme/service/AntiBotService.java @@ -1,8 +1,8 @@ package fr.xephi.authme.service; import fr.xephi.authme.initialization.SettingsDependent; -import fr.xephi.authme.output.MessageKey; -import fr.xephi.authme.output.Messages; +import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.message.Messages; import fr.xephi.authme.permission.AdminPermission; import fr.xephi.authme.permission.PermissionsManager; import fr.xephi.authme.settings.Settings; diff --git a/src/main/java/fr/xephi/authme/service/MigrationService.java b/src/main/java/fr/xephi/authme/service/MigrationService.java index f21bb853..3eaab887 100644 --- a/src/main/java/fr/xephi/authme/service/MigrationService.java +++ b/src/main/java/fr/xephi/authme/service/MigrationService.java @@ -1,8 +1,8 @@ package fr.xephi.authme.service; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.converter.ForceFlatToSqlite; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.datasource.converter.ForceFlatToSqlite; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.datasource.DataSourceType; import fr.xephi.authme.datasource.FlatFile; diff --git a/src/main/java/fr/xephi/authme/service/TeleportationService.java b/src/main/java/fr/xephi/authme/service/TeleportationService.java index 92f1c93a..9be5012f 100644 --- a/src/main/java/fr/xephi/authme/service/TeleportationService.java +++ b/src/main/java/fr/xephi/authme/service/TeleportationService.java @@ -1,8 +1,8 @@ package fr.xephi.authme.service; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.cache.auth.PlayerCache; -import fr.xephi.authme.cache.limbo.PlayerData; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerCache; +import fr.xephi.authme.data.limbo.LimboPlayer; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.events.AbstractTeleportEvent; import fr.xephi.authme.events.AuthMeTeleportEvent; @@ -101,7 +101,7 @@ public class TeleportationService implements Reloadable { * @param auth corresponding PlayerAuth object * @param limbo corresponding PlayerData object */ - public void teleportOnLogin(final Player player, PlayerAuth auth, PlayerData limbo) { + public void teleportOnLogin(final Player player, PlayerAuth auth, LimboPlayer limbo) { if (settings.getProperty(RestrictionSettings.NO_TELEPORT)) { return; } diff --git a/src/main/java/fr/xephi/authme/service/ValidationService.java b/src/main/java/fr/xephi/authme/service/ValidationService.java index 63227823..030657ce 100644 --- a/src/main/java/fr/xephi/authme/service/ValidationService.java +++ b/src/main/java/fr/xephi/authme/service/ValidationService.java @@ -2,9 +2,9 @@ package fr.xephi.authme.service; import com.github.authme.configme.properties.Property; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.geoip.GeoLiteAPI; +import fr.xephi.authme.geoip.GeoIpManager; import fr.xephi.authme.initialization.Reloadable; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.permission.PermissionsManager; import fr.xephi.authme.permission.PlayerStatePermission; import fr.xephi.authme.settings.Settings; @@ -36,7 +36,7 @@ public class ValidationService implements Reloadable { @Inject private PermissionsManager permissionsManager; @Inject - private GeoLiteAPI geoLiteApi; + private GeoIpManager geoIpManager; private Pattern passwordRegex; private Set unrestrictedNames; @@ -115,7 +115,7 @@ public class ValidationService implements Reloadable { return true; } - String countryCode = geoLiteApi.getCountryCode(hostAddress); + String countryCode = geoIpManager.getCountryCode(hostAddress); return validateWhitelistAndBlacklist(countryCode, ProtectionSettings.COUNTRIES_WHITELIST, ProtectionSettings.COUNTRIES_BLACKLIST); diff --git a/src/main/java/fr/xephi/authme/settings/Settings.java b/src/main/java/fr/xephi/authme/settings/Settings.java index fc3e929c..2f5a34cc 100644 --- a/src/main/java/fr/xephi/authme/settings/Settings.java +++ b/src/main/java/fr/xephi/authme/settings/Settings.java @@ -7,7 +7,7 @@ import com.github.authme.configme.resource.PropertyResource; import com.google.common.io.Files; import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.settings.properties.PluginSettings; -import fr.xephi.authme.util.StringUtils; +import fr.xephi.authme.util.FileUtils; import java.io.File; import java.io.IOException; @@ -120,7 +120,7 @@ public class Settings extends SettingsManager { } private static String buildMessagesFilePathFromCode(String language) { - return StringUtils.makePath("messages", "messages_" + language + ".yml"); + return FileUtils.makePath("messages", "messages_" + language + ".yml"); } /** diff --git a/src/main/java/fr/xephi/authme/task/MessageTask.java b/src/main/java/fr/xephi/authme/task/MessageTask.java index 1ae0aaed..7480e526 100644 --- a/src/main/java/fr/xephi/authme/task/MessageTask.java +++ b/src/main/java/fr/xephi/authme/task/MessageTask.java @@ -1,7 +1,7 @@ package fr.xephi.authme.task; -import fr.xephi.authme.cache.auth.PlayerCache; -import fr.xephi.authme.cache.limbo.LimboCache; +import fr.xephi.authme.data.auth.PlayerCache; +import fr.xephi.authme.data.limbo.LimboCache; import fr.xephi.authme.service.BukkitService; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitTask; diff --git a/src/main/java/fr/xephi/authme/task/PlayerDataTaskManager.java b/src/main/java/fr/xephi/authme/task/PlayerDataTaskManager.java index b5714145..af96adc4 100644 --- a/src/main/java/fr/xephi/authme/task/PlayerDataTaskManager.java +++ b/src/main/java/fr/xephi/authme/task/PlayerDataTaskManager.java @@ -1,11 +1,11 @@ package fr.xephi.authme.task; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.cache.auth.PlayerCache; -import fr.xephi.authme.cache.limbo.LimboCache; -import fr.xephi.authme.cache.limbo.PlayerData; -import fr.xephi.authme.output.MessageKey; -import fr.xephi.authme.output.Messages; +import fr.xephi.authme.data.auth.PlayerCache; +import fr.xephi.authme.data.limbo.LimboCache; +import fr.xephi.authme.data.limbo.LimboPlayer; +import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.message.Messages; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.properties.RegistrationSettings; import fr.xephi.authme.settings.properties.RestrictionSettings; @@ -52,14 +52,14 @@ public class PlayerDataTaskManager { final int interval = settings.getProperty(RegistrationSettings.MESSAGE_INTERVAL); final MessageKey key = getMessageKey(isRegistered); if (interval > 0) { - final PlayerData playerData = limboCache.getPlayerData(name); - if (playerData == null) { + final LimboPlayer limboPlayer = limboCache.getPlayerData(name); + if (limboPlayer == null) { ConsoleLogger.info("PlayerData for '" + name + "' is not available"); } else { - cancelTask(playerData.getMessageTask()); + cancelTask(limboPlayer.getMessageTask()); BukkitTask messageTask = bukkitService.runTask(new MessageTask(name, messages.retrieve(key), interval, bukkitService, limboCache, playerCache)); - playerData.setMessageTask(messageTask); + limboPlayer.setMessageTask(messageTask); } } } @@ -72,14 +72,14 @@ public class PlayerDataTaskManager { public void registerTimeoutTask(Player player) { final int timeout = settings.getProperty(RestrictionSettings.TIMEOUT) * TICKS_PER_SECOND; if (timeout > 0) { - final PlayerData playerData = limboCache.getPlayerData(player.getName()); - if (playerData == null) { + final LimboPlayer limboPlayer = limboCache.getPlayerData(player.getName()); + if (limboPlayer == null) { ConsoleLogger.info("PlayerData for '" + player.getName() + "' is not available"); } else { - cancelTask(playerData.getTimeoutTask()); + cancelTask(limboPlayer.getTimeoutTask()); String message = messages.retrieveSingle(MessageKey.LOGIN_TIMEOUT_ERROR); BukkitTask task = bukkitService.runTaskLater(new TimeoutTask(player, message, playerCache), timeout); - playerData.setTimeoutTask(task); + limboPlayer.setTimeoutTask(task); } } } diff --git a/src/main/java/fr/xephi/authme/task/TimeoutTask.java b/src/main/java/fr/xephi/authme/task/TimeoutTask.java index 8aa719cd..60aac741 100644 --- a/src/main/java/fr/xephi/authme/task/TimeoutTask.java +++ b/src/main/java/fr/xephi/authme/task/TimeoutTask.java @@ -1,6 +1,6 @@ package fr.xephi.authme.task; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.auth.PlayerCache; import org.bukkit.entity.Player; /** diff --git a/src/main/java/fr/xephi/authme/task/purge/PurgeExecutor.java b/src/main/java/fr/xephi/authme/task/purge/PurgeExecutor.java index dcadc49b..43476e75 100644 --- a/src/main/java/fr/xephi/authme/task/purge/PurgeExecutor.java +++ b/src/main/java/fr/xephi/authme/task/purge/PurgeExecutor.java @@ -16,7 +16,7 @@ import javax.inject.Inject; import java.io.File; import java.util.Collection; -import static fr.xephi.authme.util.StringUtils.makePath; +import static fr.xephi.authme.util.FileUtils.makePath; /** * Executes the purge operations. diff --git a/src/main/java/fr/xephi/authme/task/purge/PurgeService.java b/src/main/java/fr/xephi/authme/task/purge/PurgeService.java index 040d2a89..7a1d19fa 100644 --- a/src/main/java/fr/xephi/authme/task/purge/PurgeService.java +++ b/src/main/java/fr/xephi/authme/task/purge/PurgeService.java @@ -16,6 +16,8 @@ import java.util.Calendar; import java.util.Collection; import java.util.Set; +// TODO: move into services. -sgdc3 + /** * Initiates purge tasks. */ diff --git a/src/main/java/fr/xephi/authme/util/FileUtils.java b/src/main/java/fr/xephi/authme/util/FileUtils.java index faf557f4..831beafd 100644 --- a/src/main/java/fr/xephi/authme/util/FileUtils.java +++ b/src/main/java/fr/xephi/authme/util/FileUtils.java @@ -87,4 +87,15 @@ public final class FileUtils { } } } + + /** + * Construct a file path from the given elements, i.e. separate the given elements by the file separator. + * + * @param elements The elements to create a path with + * + * @return The created path + */ + public static String makePath(String... elements) { + return String.join(File.separator, elements); + } } diff --git a/src/main/java/fr/xephi/authme/util/StringUtils.java b/src/main/java/fr/xephi/authme/util/StringUtils.java index d26a281f..cc85fe33 100644 --- a/src/main/java/fr/xephi/authme/util/StringUtils.java +++ b/src/main/java/fr/xephi/authme/util/StringUtils.java @@ -78,16 +78,4 @@ public final class StringUtils { public static String formatException(Throwable th) { return "[" + th.getClass().getSimpleName() + "]: " + th.getMessage(); } - - /** - * Construct a file path from the given elements, i.e. separate the given elements by the file separator. - * - * @param elements The elements to create a path with - * - * @return The created path - */ - public static String makePath(String... elements) { - return String.join(File.separator, elements); - } - } diff --git a/src/test/java/fr/xephi/authme/AuthMeMatchers.java b/src/test/java/fr/xephi/authme/AuthMeMatchers.java index cb638222..c19696fa 100644 --- a/src/test/java/fr/xephi/authme/AuthMeMatchers.java +++ b/src/test/java/fr/xephi/authme/AuthMeMatchers.java @@ -1,6 +1,6 @@ package fr.xephi.authme; -import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.security.crypts.HashedPassword; import org.hamcrest.Description; import org.hamcrest.Matcher; diff --git a/src/test/java/fr/xephi/authme/api/NewAPITest.java b/src/test/java/fr/xephi/authme/api/NewAPITest.java index 7d915018..64e4c7c8 100644 --- a/src/test/java/fr/xephi/authme/api/NewAPITest.java +++ b/src/test/java/fr/xephi/authme/api/NewAPITest.java @@ -2,8 +2,8 @@ package fr.xephi.authme.api; import fr.xephi.authme.AuthMe; import fr.xephi.authme.ReflectionTestUtils; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.hooks.PluginHooks; import fr.xephi.authme.process.Management; diff --git a/src/test/java/fr/xephi/authme/command/CommandServiceTest.java b/src/test/java/fr/xephi/authme/command/CommandServiceTest.java index cbdfc8f0..dabc8a09 100644 --- a/src/test/java/fr/xephi/authme/command/CommandServiceTest.java +++ b/src/test/java/fr/xephi/authme/command/CommandServiceTest.java @@ -1,8 +1,8 @@ package fr.xephi.authme.command; import com.github.authme.configme.properties.Property; -import fr.xephi.authme.output.MessageKey; -import fr.xephi.authme.output.Messages; +import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.message.Messages; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.properties.SecuritySettings; import fr.xephi.authme.service.ValidationService; diff --git a/src/test/java/fr/xephi/authme/command/executable/authme/AccountsCommandTest.java b/src/test/java/fr/xephi/authme/command/executable/authme/AccountsCommandTest.java index 09405e07..9c645e4d 100644 --- a/src/test/java/fr/xephi/authme/command/executable/authme/AccountsCommandTest.java +++ b/src/test/java/fr/xephi/authme/command/executable/authme/AccountsCommandTest.java @@ -1,9 +1,9 @@ package fr.xephi.authme.command.executable.authme; -import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.command.CommandService; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.service.BukkitService; import org.bukkit.command.CommandSender; import org.junit.Test; diff --git a/src/test/java/fr/xephi/authme/command/executable/authme/ChangePasswordAdminCommandTest.java b/src/test/java/fr/xephi/authme/command/executable/authme/ChangePasswordAdminCommandTest.java index 14df46d9..af8f4e96 100644 --- a/src/test/java/fr/xephi/authme/command/executable/authme/ChangePasswordAdminCommandTest.java +++ b/src/test/java/fr/xephi/authme/command/executable/authme/ChangePasswordAdminCommandTest.java @@ -1,11 +1,11 @@ package fr.xephi.authme.command.executable.authme; import fr.xephi.authme.TestHelper; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.command.CommandService; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.security.PasswordSecurity; import fr.xephi.authme.security.crypts.HashedPassword; import fr.xephi.authme.service.BukkitService; diff --git a/src/test/java/fr/xephi/authme/command/executable/authme/ConverterCommandTest.java b/src/test/java/fr/xephi/authme/command/executable/authme/ConverterCommandTest.java index e5035c45..32cc6489 100644 --- a/src/test/java/fr/xephi/authme/command/executable/authme/ConverterCommandTest.java +++ b/src/test/java/fr/xephi/authme/command/executable/authme/ConverterCommandTest.java @@ -3,8 +3,8 @@ package fr.xephi.authme.command.executable.authme; import ch.jalu.injector.Injector; import fr.xephi.authme.TestHelper; import fr.xephi.authme.command.CommandService; -import fr.xephi.authme.converter.Converter; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.datasource.converter.Converter; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.service.BukkitService; import fr.xephi.authme.util.StringUtils; import org.bukkit.command.CommandSender; diff --git a/src/test/java/fr/xephi/authme/command/executable/authme/GetEmailCommandTest.java b/src/test/java/fr/xephi/authme/command/executable/authme/GetEmailCommandTest.java index 6afdc329..f7d32260 100644 --- a/src/test/java/fr/xephi/authme/command/executable/authme/GetEmailCommandTest.java +++ b/src/test/java/fr/xephi/authme/command/executable/authme/GetEmailCommandTest.java @@ -1,9 +1,9 @@ package fr.xephi.authme.command.executable.authme; -import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.command.CommandService; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import org.bukkit.command.CommandSender; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/test/java/fr/xephi/authme/command/executable/authme/LastLoginCommandTest.java b/src/test/java/fr/xephi/authme/command/executable/authme/LastLoginCommandTest.java index d42996ee..8ff1baff 100644 --- a/src/test/java/fr/xephi/authme/command/executable/authme/LastLoginCommandTest.java +++ b/src/test/java/fr/xephi/authme/command/executable/authme/LastLoginCommandTest.java @@ -1,9 +1,9 @@ package fr.xephi.authme.command.executable.authme; -import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.command.CommandService; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import org.bukkit.command.CommandSender; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/test/java/fr/xephi/authme/command/executable/authme/PurgeLastPositionCommandTest.java b/src/test/java/fr/xephi/authme/command/executable/authme/PurgeLastPositionCommandTest.java index e3a79db8..54a31734 100644 --- a/src/test/java/fr/xephi/authme/command/executable/authme/PurgeLastPositionCommandTest.java +++ b/src/test/java/fr/xephi/authme/command/executable/authme/PurgeLastPositionCommandTest.java @@ -1,9 +1,9 @@ package fr.xephi.authme.command.executable.authme; -import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.command.CommandService; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import org.bukkit.command.CommandSender; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/test/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommandTest.java b/src/test/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommandTest.java index 49ea28ac..508010cf 100644 --- a/src/test/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommandTest.java +++ b/src/test/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommandTest.java @@ -1,11 +1,11 @@ package fr.xephi.authme.command.executable.authme; import fr.xephi.authme.TestHelper; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.cache.limbo.LimboCache; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.data.limbo.LimboCache; import fr.xephi.authme.command.CommandService; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.security.PasswordSecurity; import fr.xephi.authme.security.crypts.HashedPassword; import fr.xephi.authme.service.BukkitService; diff --git a/src/test/java/fr/xephi/authme/command/executable/authme/ReloadCommandTest.java b/src/test/java/fr/xephi/authme/command/executable/authme/ReloadCommandTest.java index 5eb7dcc6..07424e15 100644 --- a/src/test/java/fr/xephi/authme/command/executable/authme/ReloadCommandTest.java +++ b/src/test/java/fr/xephi/authme/command/executable/authme/ReloadCommandTest.java @@ -9,7 +9,7 @@ import fr.xephi.authme.datasource.DataSourceType; import fr.xephi.authme.initialization.Reloadable; import fr.xephi.authme.initialization.SettingsDependent; import fr.xephi.authme.output.LogLevel; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.properties.DatabaseSettings; import fr.xephi.authme.settings.properties.PluginSettings; diff --git a/src/test/java/fr/xephi/authme/command/executable/authme/SetEmailCommandTest.java b/src/test/java/fr/xephi/authme/command/executable/authme/SetEmailCommandTest.java index 70530282..033bd881 100644 --- a/src/test/java/fr/xephi/authme/command/executable/authme/SetEmailCommandTest.java +++ b/src/test/java/fr/xephi/authme/command/executable/authme/SetEmailCommandTest.java @@ -1,10 +1,10 @@ package fr.xephi.authme.command.executable.authme; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.command.CommandService; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.service.BukkitService; import org.bukkit.command.CommandSender; import org.junit.Test; diff --git a/src/test/java/fr/xephi/authme/command/executable/authme/UnregisterAdminCommandTest.java b/src/test/java/fr/xephi/authme/command/executable/authme/UnregisterAdminCommandTest.java index e9cfbbab..fd2e3688 100644 --- a/src/test/java/fr/xephi/authme/command/executable/authme/UnregisterAdminCommandTest.java +++ b/src/test/java/fr/xephi/authme/command/executable/authme/UnregisterAdminCommandTest.java @@ -2,7 +2,7 @@ package fr.xephi.authme.command.executable.authme; import fr.xephi.authme.command.CommandService; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.process.Management; import fr.xephi.authme.service.BukkitService; import org.bukkit.command.CommandSender; diff --git a/src/test/java/fr/xephi/authme/command/executable/captcha/CaptchaCommandTest.java b/src/test/java/fr/xephi/authme/command/executable/captcha/CaptchaCommandTest.java index 5de45e61..cfdc51dc 100644 --- a/src/test/java/fr/xephi/authme/command/executable/captcha/CaptchaCommandTest.java +++ b/src/test/java/fr/xephi/authme/command/executable/captcha/CaptchaCommandTest.java @@ -1,9 +1,9 @@ package fr.xephi.authme.command.executable.captcha; -import fr.xephi.authme.cache.CaptchaManager; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.CaptchaManager; +import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.command.CommandService; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import org.bukkit.entity.Player; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/test/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommandTest.java b/src/test/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommandTest.java index a3d5a8ae..7ca0510b 100644 --- a/src/test/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommandTest.java +++ b/src/test/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommandTest.java @@ -1,8 +1,8 @@ package fr.xephi.authme.command.executable.changepassword; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.command.CommandService; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.process.Management; import fr.xephi.authme.settings.properties.RestrictionSettings; import fr.xephi.authme.settings.properties.SecuritySettings; diff --git a/src/test/java/fr/xephi/authme/command/executable/email/AddEmailCommandTest.java b/src/test/java/fr/xephi/authme/command/executable/email/AddEmailCommandTest.java index 143ac5fe..985ce815 100644 --- a/src/test/java/fr/xephi/authme/command/executable/email/AddEmailCommandTest.java +++ b/src/test/java/fr/xephi/authme/command/executable/email/AddEmailCommandTest.java @@ -1,7 +1,7 @@ package fr.xephi.authme.command.executable.email; import fr.xephi.authme.command.CommandService; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.process.Management; import org.bukkit.command.BlockCommandSender; import org.bukkit.command.CommandSender; diff --git a/src/test/java/fr/xephi/authme/command/executable/email/RecoverEmailCommandTest.java b/src/test/java/fr/xephi/authme/command/executable/email/RecoverEmailCommandTest.java index cb615d91..8a3dfcf4 100644 --- a/src/test/java/fr/xephi/authme/command/executable/email/RecoverEmailCommandTest.java +++ b/src/test/java/fr/xephi/authme/command/executable/email/RecoverEmailCommandTest.java @@ -1,12 +1,12 @@ package fr.xephi.authme.command.executable.email; import fr.xephi.authme.TestHelper; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.command.CommandService; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.mail.SendMailSSL; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.security.PasswordSecurity; import fr.xephi.authme.security.crypts.HashedPassword; import fr.xephi.authme.service.RecoveryCodeService; diff --git a/src/test/java/fr/xephi/authme/command/executable/register/RegisterCommandTest.java b/src/test/java/fr/xephi/authme/command/executable/register/RegisterCommandTest.java index ca1a1ae6..a4dfe8f7 100644 --- a/src/test/java/fr/xephi/authme/command/executable/register/RegisterCommandTest.java +++ b/src/test/java/fr/xephi/authme/command/executable/register/RegisterCommandTest.java @@ -3,7 +3,7 @@ package fr.xephi.authme.command.executable.register; import fr.xephi.authme.TestHelper; import fr.xephi.authme.command.CommandService; import fr.xephi.authme.mail.SendMailSSL; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.process.Management; import fr.xephi.authme.security.HashAlgorithm; import fr.xephi.authme.settings.properties.EmailSettings; diff --git a/src/test/java/fr/xephi/authme/command/executable/unregister/UnregisterCommandTest.java b/src/test/java/fr/xephi/authme/command/executable/unregister/UnregisterCommandTest.java index 33bbf4c6..336b1742 100644 --- a/src/test/java/fr/xephi/authme/command/executable/unregister/UnregisterCommandTest.java +++ b/src/test/java/fr/xephi/authme/command/executable/unregister/UnregisterCommandTest.java @@ -1,8 +1,8 @@ package fr.xephi.authme.command.executable.unregister; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.command.CommandService; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.process.Management; import org.bukkit.entity.Player; import org.junit.Test; diff --git a/src/test/java/fr/xephi/authme/cache/CaptchaManagerTest.java b/src/test/java/fr/xephi/authme/data/CaptchaManagerTest.java similarity index 99% rename from src/test/java/fr/xephi/authme/cache/CaptchaManagerTest.java rename to src/test/java/fr/xephi/authme/data/CaptchaManagerTest.java index bb293ef9..92be450d 100644 --- a/src/test/java/fr/xephi/authme/cache/CaptchaManagerTest.java +++ b/src/test/java/fr/xephi/authme/data/CaptchaManagerTest.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.cache; +package fr.xephi.authme.data; import fr.xephi.authme.ReflectionTestUtils; import fr.xephi.authme.settings.Settings; diff --git a/src/test/java/fr/xephi/authme/cache/SessionManagerTest.java b/src/test/java/fr/xephi/authme/data/SessionManagerTest.java similarity index 99% rename from src/test/java/fr/xephi/authme/cache/SessionManagerTest.java rename to src/test/java/fr/xephi/authme/data/SessionManagerTest.java index 80f9a409..f778dd16 100644 --- a/src/test/java/fr/xephi/authme/cache/SessionManagerTest.java +++ b/src/test/java/fr/xephi/authme/data/SessionManagerTest.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.cache; +package fr.xephi.authme.data; import fr.xephi.authme.ReflectionTestUtils; import fr.xephi.authme.settings.Settings; diff --git a/src/test/java/fr/xephi/authme/cache/TempbanManagerTest.java b/src/test/java/fr/xephi/authme/data/TempbanManagerTest.java similarity index 98% rename from src/test/java/fr/xephi/authme/cache/TempbanManagerTest.java rename to src/test/java/fr/xephi/authme/data/TempbanManagerTest.java index bd4cfc04..70aa11c7 100644 --- a/src/test/java/fr/xephi/authme/cache/TempbanManagerTest.java +++ b/src/test/java/fr/xephi/authme/data/TempbanManagerTest.java @@ -1,10 +1,10 @@ -package fr.xephi.authme.cache; +package fr.xephi.authme.data; import fr.xephi.authme.ReflectionTestUtils; import fr.xephi.authme.TestHelper; -import fr.xephi.authme.cache.TempbanManager.TimedCounter; -import fr.xephi.authme.output.MessageKey; -import fr.xephi.authme.output.Messages; +import fr.xephi.authme.data.TempbanManager.TimedCounter; +import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.message.Messages; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.properties.SecuritySettings; import fr.xephi.authme.service.BukkitService; diff --git a/src/test/java/fr/xephi/authme/cache/backup/PlayerDataStorageTest.java b/src/test/java/fr/xephi/authme/data/backup/LimboPlayerStorageTest.java similarity index 82% rename from src/test/java/fr/xephi/authme/cache/backup/PlayerDataStorageTest.java rename to src/test/java/fr/xephi/authme/data/backup/LimboPlayerStorageTest.java index 288f4771..f9c5880c 100644 --- a/src/test/java/fr/xephi/authme/cache/backup/PlayerDataStorageTest.java +++ b/src/test/java/fr/xephi/authme/data/backup/LimboPlayerStorageTest.java @@ -1,15 +1,15 @@ -package fr.xephi.authme.cache.backup; +package fr.xephi.authme.data.backup; import ch.jalu.injector.testing.BeforeInjecting; import ch.jalu.injector.testing.DelayedInjectionRunner; import ch.jalu.injector.testing.InjectDelayed; import fr.xephi.authme.TestHelper; -import fr.xephi.authme.cache.limbo.PlayerData; +import fr.xephi.authme.data.limbo.LimboPlayer; import fr.xephi.authme.initialization.DataFolder; import fr.xephi.authme.permission.PermissionsManager; import fr.xephi.authme.settings.SpawnLoader; import fr.xephi.authme.service.BukkitService; -import fr.xephi.authme.util.StringUtils; +import fr.xephi.authme.util.FileUtils; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Player; @@ -32,16 +32,16 @@ import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; /** - * Test for {@link PlayerDataStorage}. + * Test for {@link LimboPlayerStorage}. */ @RunWith(DelayedInjectionRunner.class) -public class PlayerDataStorageTest { +public class LimboPlayerStorageTest { private static final UUID SAMPLE_UUID = UUID.nameUUIDFromBytes("PlayerDataStorageTest".getBytes()); - private static final String SOURCE_FOLDER = TestHelper.PROJECT_ROOT + "cache/backup/"; + private static final String SOURCE_FOLDER = TestHelper.PROJECT_ROOT + "data/backup/"; @InjectDelayed - private PlayerDataStorage playerDataStorage; + private LimboPlayerStorage limboPlayerStorage; @Mock private SpawnLoader spawnLoader; @@ -61,11 +61,11 @@ public class PlayerDataStorageTest { @BeforeInjecting public void copyTestFiles() throws IOException { dataFolder = temporaryFolder.newFolder(); - File playerFolder = new File(dataFolder, StringUtils.makePath("playerdata", SAMPLE_UUID.toString())); + File playerFolder = new File(dataFolder, FileUtils.makePath("playerdata", SAMPLE_UUID.toString())); if (!playerFolder.mkdirs()) { throw new IllegalStateException("Cannot create '" + playerFolder.getAbsolutePath() + "'"); } - Files.copy(TestHelper.getJarPath(StringUtils.makePath(SOURCE_FOLDER, "sample-folder", "data.json")), + Files.copy(TestHelper.getJarPath(FileUtils.makePath(SOURCE_FOLDER, "sample-folder", "data.json")), new File(playerFolder, "data.json").toPath()); } @@ -78,7 +78,7 @@ public class PlayerDataStorageTest { given(bukkitService.getWorld("nether")).willReturn(world); // when - PlayerData data = playerDataStorage.readData(player); + LimboPlayer data = limboPlayerStorage.readData(player); // then assertThat(data, not(nullValue())); @@ -103,7 +103,7 @@ public class PlayerDataStorageTest { given(player.getUniqueId()).willReturn(UUID.nameUUIDFromBytes("other-player".getBytes())); // when - PlayerData data = playerDataStorage.readData(player); + LimboPlayer data = limboPlayerStorage.readData(player); // then assertThat(data, nullValue()); @@ -118,8 +118,8 @@ public class PlayerDataStorageTest { given(player2.getUniqueId()).willReturn(UUID.nameUUIDFromBytes("not-stored".getBytes())); // when / then - assertThat(playerDataStorage.hasData(player1), equalTo(true)); - assertThat(playerDataStorage.hasData(player2), equalTo(false)); + assertThat(limboPlayerStorage.hasData(player1), equalTo(true)); + assertThat(limboPlayerStorage.hasData(player2), equalTo(false)); } @Test @@ -140,10 +140,10 @@ public class PlayerDataStorageTest { given(spawnLoader.getPlayerLocationOrSpawn(player)).willReturn(location); // when - playerDataStorage.saveData(player); + limboPlayerStorage.saveData(player); // then - File playerFile = new File(dataFolder, StringUtils.makePath("playerdata", uuid.toString(), "data.json")); + File playerFile = new File(dataFolder, FileUtils.makePath("playerdata", uuid.toString(), "data.json")); assertThat(playerFile.exists(), equalTo(true)); // TODO ljacqu 20160711: Check contents of file } diff --git a/src/test/java/fr/xephi/authme/cache/limbo/LimboCacheTest.java b/src/test/java/fr/xephi/authme/data/limbo/LimboCacheTest.java similarity index 72% rename from src/test/java/fr/xephi/authme/cache/limbo/LimboCacheTest.java rename to src/test/java/fr/xephi/authme/data/limbo/LimboCacheTest.java index 60059630..54f40865 100644 --- a/src/test/java/fr/xephi/authme/cache/limbo/LimboCacheTest.java +++ b/src/test/java/fr/xephi/authme/data/limbo/LimboCacheTest.java @@ -1,7 +1,7 @@ -package fr.xephi.authme.cache.limbo; +package fr.xephi.authme.data.limbo; import fr.xephi.authme.ReflectionTestUtils; -import fr.xephi.authme.cache.backup.PlayerDataStorage; +import fr.xephi.authme.data.backup.LimboPlayerStorage; import fr.xephi.authme.permission.PermissionsManager; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.SpawnLoader; @@ -44,7 +44,7 @@ public class LimboCacheTest { private SpawnLoader spawnLoader; @Mock - private PlayerDataStorage playerDataStorage; + private LimboPlayerStorage limboPlayerStorage; @Test public void shouldAddPlayerData() { @@ -63,13 +63,13 @@ public class LimboCacheTest { given(permissionsManager.hasGroupSupport()).willReturn(true); String group = "test-group"; given(permissionsManager.getPrimaryGroup(player)).willReturn(group); - given(playerDataStorage.hasData(player)).willReturn(false); + given(limboPlayerStorage.hasData(player)).willReturn(false); // when limboCache.addPlayerData(player); // then - PlayerData limboPlayer = limboCache.getPlayerData(name); + LimboPlayer limboPlayer = limboCache.getPlayerData(name); assertThat(limboPlayer.getLocation(), equalTo(location)); assertThat(limboPlayer.isOperator(), equalTo(true)); assertThat(limboPlayer.getWalkSpeed(), equalTo(walkSpeed)); @@ -84,22 +84,22 @@ public class LimboCacheTest { String name = "player01"; Player player = mock(Player.class); given(player.getName()).willReturn(name); - given(playerDataStorage.hasData(player)).willReturn(true); - PlayerData playerData = mock(PlayerData.class); - given(playerDataStorage.readData(player)).willReturn(playerData); + given(limboPlayerStorage.hasData(player)).willReturn(true); + LimboPlayer limboPlayer = mock(LimboPlayer.class); + given(limboPlayerStorage.readData(player)).willReturn(limboPlayer); float walkSpeed = 2.4f; - given(playerData.getWalkSpeed()).willReturn(walkSpeed); - given(playerData.isCanFly()).willReturn(true); + given(limboPlayer.getWalkSpeed()).willReturn(walkSpeed); + given(limboPlayer.isCanFly()).willReturn(true); float flySpeed = 1.0f; - given(playerData.getFlySpeed()).willReturn(flySpeed); + given(limboPlayer.getFlySpeed()).willReturn(flySpeed); String group = "primary-group"; - given(playerData.getGroup()).willReturn(group); + given(limboPlayer.getGroup()).willReturn(group); // when limboCache.addPlayerData(player); // then - PlayerData result = limboCache.getPlayerData(name); + LimboPlayer result = limboCache.getPlayerData(name); assertThat(result.getWalkSpeed(), equalTo(walkSpeed)); assertThat(result.isCanFly(), equalTo(true)); assertThat(result.getFlySpeed(), equalTo(flySpeed)); @@ -112,16 +112,16 @@ public class LimboCacheTest { String name = "Champ"; Player player = mock(Player.class); given(player.getName()).willReturn(name); - PlayerData playerData = mock(PlayerData.class); - given(playerData.isOperator()).willReturn(true); + LimboPlayer limboPlayer = mock(LimboPlayer.class); + given(limboPlayer.isOperator()).willReturn(true); float walkSpeed = 2.4f; - given(playerData.getWalkSpeed()).willReturn(walkSpeed); - given(playerData.isCanFly()).willReturn(true); + given(limboPlayer.getWalkSpeed()).willReturn(walkSpeed); + given(limboPlayer.isCanFly()).willReturn(true); float flySpeed = 1.0f; - given(playerData.getFlySpeed()).willReturn(flySpeed); + given(limboPlayer.getFlySpeed()).willReturn(flySpeed); String group = "primary-group"; - given(playerData.getGroup()).willReturn(group); - getCache().put(name.toLowerCase(), playerData); + given(limboPlayer.getGroup()).willReturn(group); + getCache().put(name.toLowerCase(), limboPlayer); given(settings.getProperty(PluginSettings.ENABLE_PERMISSION_CHECK)).willReturn(true); given(permissionsManager.hasGroupSupport()).willReturn(true); @@ -134,7 +134,7 @@ public class LimboCacheTest { verify(player).setAllowFlight(true); verify(player).setFlySpeed(flySpeed); verify(permissionsManager).setGroup(player, group); - verify(playerData).clearTasks(); + verify(limboPlayer).clearTasks(); } @Test @@ -143,14 +143,14 @@ public class LimboCacheTest { String name = "Champ"; Player player = mock(Player.class); given(player.getName()).willReturn(name); - PlayerData playerData = mock(PlayerData.class); - given(playerData.isOperator()).willReturn(true); - given(playerData.getWalkSpeed()).willReturn(0f); - given(playerData.isCanFly()).willReturn(true); - given(playerData.getFlySpeed()).willReturn(0f); + LimboPlayer limboPlayer = mock(LimboPlayer.class); + given(limboPlayer.isOperator()).willReturn(true); + given(limboPlayer.getWalkSpeed()).willReturn(0f); + given(limboPlayer.isCanFly()).willReturn(true); + given(limboPlayer.getFlySpeed()).willReturn(0f); String group = "primary-group"; - given(playerData.getGroup()).willReturn(group); - getCache().put(name.toLowerCase(), playerData); + given(limboPlayer.getGroup()).willReturn(group); + getCache().put(name.toLowerCase(), limboPlayer); given(settings.getProperty(PluginSettings.ENABLE_PERMISSION_CHECK)).willReturn(true); given(permissionsManager.hasGroupSupport()).willReturn(true); @@ -180,9 +180,9 @@ public class LimboCacheTest { @Test public void shouldRemoveAndClearTasks() { // given - PlayerData playerData = mock(PlayerData.class); + LimboPlayer limboPlayer = mock(LimboPlayer.class); String name = "abcdef"; - getCache().put(name, playerData); + getCache().put(name, limboPlayer); Player player = mock(Player.class); given(player.getName()).willReturn(name); @@ -191,16 +191,16 @@ public class LimboCacheTest { // then assertThat(getCache(), anEmptyMap()); - verify(playerData).clearTasks(); + verify(limboPlayer).clearTasks(); } @Test public void shouldDeleteFromCacheAndStorage() { // given - PlayerData playerData = mock(PlayerData.class); + LimboPlayer limboPlayer = mock(LimboPlayer.class); String name = "SomeName"; - getCache().put(name.toLowerCase(), playerData); - getCache().put("othername", mock(PlayerData.class)); + getCache().put(name.toLowerCase(), limboPlayer); + getCache().put("othername", mock(LimboPlayer.class)); Player player = mock(Player.class); given(player.getName()).willReturn(name); @@ -209,22 +209,22 @@ public class LimboCacheTest { // then assertThat(getCache(), aMapWithSize(1)); - verify(playerData).clearTasks(); - verify(playerDataStorage).removeData(player); + verify(limboPlayer).clearTasks(); + verify(limboPlayerStorage).removeData(player); } @Test public void shouldReturnIfHasData() { // given String name = "tester"; - getCache().put(name, mock(PlayerData.class)); + getCache().put(name, mock(LimboPlayer.class)); // when / then assertThat(limboCache.hasPlayerData(name), equalTo(true)); assertThat(limboCache.hasPlayerData("someone_else"), equalTo(false)); } - private Map getCache() { + private Map getCache() { return ReflectionTestUtils.getFieldValue(LimboCache.class, limboCache, "cache"); } } diff --git a/src/test/java/fr/xephi/authme/datasource/AbstractDataSourceIntegrationTest.java b/src/test/java/fr/xephi/authme/datasource/AbstractDataSourceIntegrationTest.java index 6399221c..3c8523bb 100644 --- a/src/test/java/fr/xephi/authme/datasource/AbstractDataSourceIntegrationTest.java +++ b/src/test/java/fr/xephi/authme/datasource/AbstractDataSourceIntegrationTest.java @@ -1,6 +1,6 @@ package fr.xephi.authme.datasource; -import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.security.crypts.HashedPassword; import org.junit.Test; diff --git a/src/test/java/fr/xephi/authme/datasource/AbstractResourceClosingTest.java b/src/test/java/fr/xephi/authme/datasource/AbstractResourceClosingTest.java index ee6bdd04..c8aeb796 100644 --- a/src/test/java/fr/xephi/authme/datasource/AbstractResourceClosingTest.java +++ b/src/test/java/fr/xephi/authme/datasource/AbstractResourceClosingTest.java @@ -6,7 +6,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import fr.xephi.authme.TestHelper; -import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.security.HashAlgorithm; import fr.xephi.authme.security.crypts.HashedPassword; import fr.xephi.authme.settings.Settings; diff --git a/src/test/java/fr/xephi/authme/datasource/FlatFileIntegrationTest.java b/src/test/java/fr/xephi/authme/datasource/FlatFileIntegrationTest.java index 853cbd78..7ce72f15 100644 --- a/src/test/java/fr/xephi/authme/datasource/FlatFileIntegrationTest.java +++ b/src/test/java/fr/xephi/authme/datasource/FlatFileIntegrationTest.java @@ -2,7 +2,9 @@ package fr.xephi.authme.datasource; import com.google.common.io.Files; import fr.xephi.authme.TestHelper; -import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.datasource.DataSource; +import fr.xephi.authme.datasource.FlatFile; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -23,7 +25,7 @@ import static org.junit.Assert.assertThat; /** * Integration test for the deprecated {@link FlatFile} datasource. The flatfile datasource is no longer used. - * Essentially, the only time we use it is in {@link fr.xephi.authme.converter.ForceFlatToSqlite}, + * Essentially, the only time we use it is in {@link fr.xephi.authme.datasource.converter.ForceFlatToSqlite}, * which requires {@link FlatFile#getAllAuths()}. */ public class FlatFileIntegrationTest { diff --git a/src/test/java/fr/xephi/authme/datasource/MySqlIntegrationTest.java b/src/test/java/fr/xephi/authme/datasource/MySqlIntegrationTest.java index 93d8a399..5484bd5e 100644 --- a/src/test/java/fr/xephi/authme/datasource/MySqlIntegrationTest.java +++ b/src/test/java/fr/xephi/authme/datasource/MySqlIntegrationTest.java @@ -4,6 +4,9 @@ import com.github.authme.configme.properties.Property; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; import fr.xephi.authme.TestHelper; +import fr.xephi.authme.datasource.AbstractDataSourceIntegrationTest; +import fr.xephi.authme.datasource.DataSource; +import fr.xephi.authme.datasource.MySQL; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.properties.DatabaseSettings; import org.junit.After; diff --git a/src/test/java/fr/xephi/authme/datasource/MySqlResourceClosingTest.java b/src/test/java/fr/xephi/authme/datasource/MySqlResourceClosingTest.java index 7dccb08b..f943cac4 100644 --- a/src/test/java/fr/xephi/authme/datasource/MySqlResourceClosingTest.java +++ b/src/test/java/fr/xephi/authme/datasource/MySqlResourceClosingTest.java @@ -1,6 +1,9 @@ package fr.xephi.authme.datasource; import com.zaxxer.hikari.HikariDataSource; +import fr.xephi.authme.datasource.AbstractResourceClosingTest; +import fr.xephi.authme.datasource.DataSource; +import fr.xephi.authme.datasource.MySQL; import fr.xephi.authme.security.HashAlgorithm; import fr.xephi.authme.settings.Settings; diff --git a/src/test/java/fr/xephi/authme/datasource/SQLiteIntegrationTest.java b/src/test/java/fr/xephi/authme/datasource/SQLiteIntegrationTest.java index 4836b198..9398e4ed 100644 --- a/src/test/java/fr/xephi/authme/datasource/SQLiteIntegrationTest.java +++ b/src/test/java/fr/xephi/authme/datasource/SQLiteIntegrationTest.java @@ -2,7 +2,10 @@ package fr.xephi.authme.datasource; import com.github.authme.configme.properties.Property; import fr.xephi.authme.TestHelper; -import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.datasource.AbstractDataSourceIntegrationTest; +import fr.xephi.authme.datasource.DataSource; +import fr.xephi.authme.datasource.SQLite; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.properties.DatabaseSettings; import org.junit.After; diff --git a/src/test/java/fr/xephi/authme/datasource/SQLiteResourceClosingTest.java b/src/test/java/fr/xephi/authme/datasource/SQLiteResourceClosingTest.java index 9eac9463..efc6dbef 100644 --- a/src/test/java/fr/xephi/authme/datasource/SQLiteResourceClosingTest.java +++ b/src/test/java/fr/xephi/authme/datasource/SQLiteResourceClosingTest.java @@ -1,5 +1,8 @@ package fr.xephi.authme.datasource; +import fr.xephi.authme.datasource.AbstractResourceClosingTest; +import fr.xephi.authme.datasource.DataSource; +import fr.xephi.authme.datasource.SQLite; import fr.xephi.authme.security.HashAlgorithm; import fr.xephi.authme.settings.Settings; diff --git a/src/test/java/fr/xephi/authme/converter/AbstractDataSourceConverterTest.java b/src/test/java/fr/xephi/authme/datasource/converter/AbstractDataSourceConverterTest.java similarity index 98% rename from src/test/java/fr/xephi/authme/converter/AbstractDataSourceConverterTest.java rename to src/test/java/fr/xephi/authme/datasource/converter/AbstractDataSourceConverterTest.java index b8378c1e..897f36e9 100644 --- a/src/test/java/fr/xephi/authme/converter/AbstractDataSourceConverterTest.java +++ b/src/test/java/fr/xephi/authme/datasource/converter/AbstractDataSourceConverterTest.java @@ -1,7 +1,7 @@ -package fr.xephi.authme.converter; +package fr.xephi.authme.datasource.converter; import fr.xephi.authme.TestHelper; -import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.datasource.DataSourceType; import org.bukkit.command.CommandSender; diff --git a/src/test/java/fr/xephi/authme/converter/CrazyLoginConverterTest.java b/src/test/java/fr/xephi/authme/datasource/converter/CrazyLoginConverterTest.java similarity index 96% rename from src/test/java/fr/xephi/authme/converter/CrazyLoginConverterTest.java rename to src/test/java/fr/xephi/authme/datasource/converter/CrazyLoginConverterTest.java index 0049a028..e24953b9 100644 --- a/src/test/java/fr/xephi/authme/converter/CrazyLoginConverterTest.java +++ b/src/test/java/fr/xephi/authme/datasource/converter/CrazyLoginConverterTest.java @@ -1,9 +1,9 @@ -package fr.xephi.authme.converter; +package fr.xephi.authme.datasource.converter; import ch.jalu.injector.testing.DelayedInjectionRunner; import ch.jalu.injector.testing.InjectDelayed; import fr.xephi.authme.TestHelper; -import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.initialization.DataFolder; import fr.xephi.authme.settings.Settings; @@ -45,7 +45,7 @@ public class CrazyLoginConverterTest { private Settings settings; @DataFolder - private File dataFolder = TestHelper.getJarFile(TestHelper.PROJECT_ROOT + "converter/"); + private File dataFolder = TestHelper.getJarFile(TestHelper.PROJECT_ROOT + "/datasource/converter/"); @BeforeClass public static void initializeLogger() { diff --git a/src/test/java/fr/xephi/authme/converter/ForceFlatToSqliteTest.java b/src/test/java/fr/xephi/authme/datasource/converter/ForceFlatToSqliteTest.java similarity index 96% rename from src/test/java/fr/xephi/authme/converter/ForceFlatToSqliteTest.java rename to src/test/java/fr/xephi/authme/datasource/converter/ForceFlatToSqliteTest.java index 273d5530..3ec28a7b 100644 --- a/src/test/java/fr/xephi/authme/converter/ForceFlatToSqliteTest.java +++ b/src/test/java/fr/xephi/authme/datasource/converter/ForceFlatToSqliteTest.java @@ -1,8 +1,8 @@ -package fr.xephi.authme.converter; +package fr.xephi.authme.datasource.converter; import com.google.common.io.Files; import fr.xephi.authme.TestHelper; -import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.datasource.DataSourceType; import fr.xephi.authme.datasource.FlatFile; diff --git a/src/test/java/fr/xephi/authme/geoip/GeoIpManagerTest.java b/src/test/java/fr/xephi/authme/geoip/GeoIpManagerTest.java index 547cf3e7..a4d459ca 100644 --- a/src/test/java/fr/xephi/authme/geoip/GeoIpManagerTest.java +++ b/src/test/java/fr/xephi/authme/geoip/GeoIpManagerTest.java @@ -2,7 +2,6 @@ package fr.xephi.authme.geoip; import com.maxmind.geoip.Country; import com.maxmind.geoip.LookupService; -import fr.xephi.authme.geoip.GeoLiteAPI; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -23,12 +22,12 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; /** - * Test for {@link GeoLiteAPI}. + * Test for {@link GeoIpManager}. */ @RunWith(MockitoJUnitRunner.class) public class GeoIpManagerTest { - private GeoLiteAPI geoLiteApi; + private GeoIpManager geoIpManager; private File dataFolder; @Mock private LookupService lookupService; @@ -39,7 +38,7 @@ public class GeoIpManagerTest { @Before public void initializeGeoLiteApi() throws IOException { dataFolder = temporaryFolder.newFolder(); - geoLiteApi = new GeoLiteAPI(dataFolder, lookupService); + geoIpManager = new GeoIpManager(dataFolder, lookupService); } @Test @@ -52,7 +51,7 @@ public class GeoIpManagerTest { given(lookupService.getCountry(ip)).willReturn(country); // when - String result = geoLiteApi.getCountryCode(ip); + String result = geoIpManager.getCountryCode(ip); // then assertThat(result, equalTo(countryCode)); @@ -65,7 +64,7 @@ public class GeoIpManagerTest { String ip = "127.0.0.1"; // when - String result = geoLiteApi.getCountryCode(ip); + String result = geoIpManager.getCountryCode(ip); // then assertThat(result, equalTo("--")); @@ -82,7 +81,7 @@ public class GeoIpManagerTest { given(lookupService.getCountry(ip)).willReturn(country); // when - String result = geoLiteApi.getCountryName(ip); + String result = geoIpManager.getCountryName(ip); // then assertThat(result, equalTo(countryName)); @@ -95,7 +94,7 @@ public class GeoIpManagerTest { String ip = "127.0.0.1"; // when - String result = geoLiteApi.getCountryName(ip); + String result = geoIpManager.getCountryName(ip); // then assertThat(result, equalTo("N/A")); diff --git a/src/test/java/fr/xephi/authme/listener/ListenerServiceTest.java b/src/test/java/fr/xephi/authme/listener/ListenerServiceTest.java index 7ff0202f..bc999c53 100644 --- a/src/test/java/fr/xephi/authme/listener/ListenerServiceTest.java +++ b/src/test/java/fr/xephi/authme/listener/ListenerServiceTest.java @@ -3,7 +3,7 @@ package fr.xephi.authme.listener; import ch.jalu.injector.testing.BeforeInjecting; import ch.jalu.injector.testing.DelayedInjectionRunner; import ch.jalu.injector.testing.InjectDelayed; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.hooks.PluginHooks; import fr.xephi.authme.settings.Settings; diff --git a/src/test/java/fr/xephi/authme/listener/OnJoinVerifierTest.java b/src/test/java/fr/xephi/authme/listener/OnJoinVerifierTest.java index db6da711..92522eb5 100644 --- a/src/test/java/fr/xephi/authme/listener/OnJoinVerifierTest.java +++ b/src/test/java/fr/xephi/authme/listener/OnJoinVerifierTest.java @@ -1,10 +1,10 @@ package fr.xephi.authme.listener; import fr.xephi.authme.TestHelper; -import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.MessageKey; -import fr.xephi.authme.output.Messages; +import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.message.Messages; import fr.xephi.authme.permission.PermissionsManager; import fr.xephi.authme.permission.PlayerStatePermission; import fr.xephi.authme.service.AntiBotService; diff --git a/src/test/java/fr/xephi/authme/listener/PlayerListenerTest.java b/src/test/java/fr/xephi/authme/listener/PlayerListenerTest.java index d269726c..74f9d508 100644 --- a/src/test/java/fr/xephi/authme/listener/PlayerListenerTest.java +++ b/src/test/java/fr/xephi/authme/listener/PlayerListenerTest.java @@ -1,10 +1,10 @@ package fr.xephi.authme.listener; import fr.xephi.authme.service.AntiBotService; -import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.MessageKey; -import fr.xephi.authme.output.Messages; +import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.message.Messages; import fr.xephi.authme.process.Management; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.SpawnLoader; diff --git a/src/test/java/fr/xephi/authme/output/MessageKeyTest.java b/src/test/java/fr/xephi/authme/message/MessageKeyTest.java similarity index 95% rename from src/test/java/fr/xephi/authme/output/MessageKeyTest.java rename to src/test/java/fr/xephi/authme/message/MessageKeyTest.java index dda5eeb9..3eb9f96e 100644 --- a/src/test/java/fr/xephi/authme/output/MessageKeyTest.java +++ b/src/test/java/fr/xephi/authme/message/MessageKeyTest.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.output; +package fr.xephi.authme.message; import fr.xephi.authme.util.StringUtils; import org.junit.Test; diff --git a/src/test/java/fr/xephi/authme/output/MessagesFileConsistencyTest.java b/src/test/java/fr/xephi/authme/message/MessagesFileConsistencyTest.java similarity index 98% rename from src/test/java/fr/xephi/authme/output/MessagesFileConsistencyTest.java rename to src/test/java/fr/xephi/authme/message/MessagesFileConsistencyTest.java index 5cbf36a7..9e16994d 100644 --- a/src/test/java/fr/xephi/authme/output/MessagesFileConsistencyTest.java +++ b/src/test/java/fr/xephi/authme/message/MessagesFileConsistencyTest.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.output; +package fr.xephi.authme.message; import fr.xephi.authme.TestHelper; import fr.xephi.authme.util.StringUtils; diff --git a/src/test/java/fr/xephi/authme/output/MessagesFileYamlCheckerTest.java b/src/test/java/fr/xephi/authme/message/MessagesFileYamlCheckerTest.java similarity index 98% rename from src/test/java/fr/xephi/authme/output/MessagesFileYamlCheckerTest.java rename to src/test/java/fr/xephi/authme/message/MessagesFileYamlCheckerTest.java index 4f76882f..ebb04fc2 100644 --- a/src/test/java/fr/xephi/authme/output/MessagesFileYamlCheckerTest.java +++ b/src/test/java/fr/xephi/authme/message/MessagesFileYamlCheckerTest.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.output; +package fr.xephi.authme.message; import fr.xephi.authme.TestHelper; import fr.xephi.authme.util.StringUtils; diff --git a/src/test/java/fr/xephi/authme/output/MessagesIntegrationTest.java b/src/test/java/fr/xephi/authme/message/MessagesIntegrationTest.java similarity index 97% rename from src/test/java/fr/xephi/authme/output/MessagesIntegrationTest.java rename to src/test/java/fr/xephi/authme/message/MessagesIntegrationTest.java index ba8f03fb..a7a4af31 100644 --- a/src/test/java/fr/xephi/authme/output/MessagesIntegrationTest.java +++ b/src/test/java/fr/xephi/authme/message/MessagesIntegrationTest.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.output; +package fr.xephi.authme.message; import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.TestHelper; @@ -33,8 +33,8 @@ import static org.mockito.Mockito.verify; */ public class MessagesIntegrationTest { - private static final String YML_TEST_FILE = TestHelper.PROJECT_ROOT + "output/messages_test.yml"; - private static final String YML_DEFAULT_TEST_FILE = TestHelper.PROJECT_ROOT + "output/messages_default.yml"; + private static final String YML_TEST_FILE = TestHelper.PROJECT_ROOT + "message/messages_test.yml"; + private static final String YML_DEFAULT_TEST_FILE = TestHelper.PROJECT_ROOT + "message/messages_default.yml"; private Messages messages; @BeforeClass @@ -256,7 +256,7 @@ public class MessagesIntegrationTest { assumeThat(messages.retrieveSingle(key), equalTo("§cWrong password!")); Settings settings = mock(Settings.class); given(settings.getMessagesFile()).willReturn(TestHelper.getJarFile( - TestHelper.PROJECT_ROOT + "output/messages_test2.yml")); + TestHelper.PROJECT_ROOT + "message/messages_test2.yml")); // when messages.reload(settings); diff --git a/src/test/java/fr/xephi/authme/process/ProcessServiceTest.java b/src/test/java/fr/xephi/authme/process/ProcessServiceTest.java index 3e6ed852..0c71cd51 100644 --- a/src/test/java/fr/xephi/authme/process/ProcessServiceTest.java +++ b/src/test/java/fr/xephi/authme/process/ProcessServiceTest.java @@ -1,7 +1,7 @@ package fr.xephi.authme.process; -import fr.xephi.authme.output.MessageKey; -import fr.xephi.authme.output.Messages; +import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.message.Messages; import fr.xephi.authme.permission.AuthGroupHandler; import fr.xephi.authme.permission.AuthGroupType; import fr.xephi.authme.permission.PermissionNode; diff --git a/src/test/java/fr/xephi/authme/process/email/AsyncAddEmailTest.java b/src/test/java/fr/xephi/authme/process/email/AsyncAddEmailTest.java index 4d013bd3..e14c69f5 100644 --- a/src/test/java/fr/xephi/authme/process/email/AsyncAddEmailTest.java +++ b/src/test/java/fr/xephi/authme/process/email/AsyncAddEmailTest.java @@ -1,10 +1,10 @@ package fr.xephi.authme.process.email; import fr.xephi.authme.TestHelper; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.process.ProcessService; import fr.xephi.authme.settings.properties.RegistrationSettings; import org.bukkit.entity.Player; diff --git a/src/test/java/fr/xephi/authme/process/email/AsyncChangeEmailTest.java b/src/test/java/fr/xephi/authme/process/email/AsyncChangeEmailTest.java index 7b9dbfdb..ea18f86b 100644 --- a/src/test/java/fr/xephi/authme/process/email/AsyncChangeEmailTest.java +++ b/src/test/java/fr/xephi/authme/process/email/AsyncChangeEmailTest.java @@ -1,9 +1,9 @@ package fr.xephi.authme.process.email; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.process.ProcessService; import fr.xephi.authme.settings.properties.RegistrationSettings; import org.bukkit.entity.Player; diff --git a/src/test/java/fr/xephi/authme/process/login/AsynchronousLoginTest.java b/src/test/java/fr/xephi/authme/process/login/AsynchronousLoginTest.java index b3dd38cf..0644687c 100644 --- a/src/test/java/fr/xephi/authme/process/login/AsynchronousLoginTest.java +++ b/src/test/java/fr/xephi/authme/process/login/AsynchronousLoginTest.java @@ -1,11 +1,11 @@ package fr.xephi.authme.process.login; import fr.xephi.authme.TestHelper; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.events.AuthMeAsyncPreLoginEvent; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.permission.PermissionsManager; import fr.xephi.authme.permission.PlayerStatePermission; import fr.xephi.authme.process.ProcessService; diff --git a/src/test/java/fr/xephi/authme/process/unregister/AsynchronousUnregisterTest.java b/src/test/java/fr/xephi/authme/process/unregister/AsynchronousUnregisterTest.java index 24724768..a3abe4b8 100644 --- a/src/test/java/fr/xephi/authme/process/unregister/AsynchronousUnregisterTest.java +++ b/src/test/java/fr/xephi/authme/process/unregister/AsynchronousUnregisterTest.java @@ -1,11 +1,11 @@ package fr.xephi.authme.process.unregister; import fr.xephi.authme.TestHelper; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.cache.auth.PlayerCache; -import fr.xephi.authme.cache.limbo.LimboCache; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerCache; +import fr.xephi.authme.data.limbo.LimboCache; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.permission.AuthGroupHandler; import fr.xephi.authme.permission.AuthGroupType; import fr.xephi.authme.process.ProcessService; diff --git a/src/test/java/fr/xephi/authme/service/AntiBotServiceTest.java b/src/test/java/fr/xephi/authme/service/AntiBotServiceTest.java index ffe06b82..7ecba73f 100644 --- a/src/test/java/fr/xephi/authme/service/AntiBotServiceTest.java +++ b/src/test/java/fr/xephi/authme/service/AntiBotServiceTest.java @@ -4,8 +4,8 @@ import ch.jalu.injector.testing.BeforeInjecting; import ch.jalu.injector.testing.DelayedInjectionRunner; import ch.jalu.injector.testing.InjectDelayed; import fr.xephi.authme.ReflectionTestUtils; -import fr.xephi.authme.output.MessageKey; -import fr.xephi.authme.output.Messages; +import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.message.Messages; import fr.xephi.authme.permission.AdminPermission; import fr.xephi.authme.permission.PermissionsManager; import fr.xephi.authme.settings.Settings; diff --git a/src/test/java/fr/xephi/authme/service/MigrationServiceTest.java b/src/test/java/fr/xephi/authme/service/MigrationServiceTest.java index aad9343d..7283a468 100644 --- a/src/test/java/fr/xephi/authme/service/MigrationServiceTest.java +++ b/src/test/java/fr/xephi/authme/service/MigrationServiceTest.java @@ -1,12 +1,11 @@ package fr.xephi.authme.service; import fr.xephi.authme.TestHelper; -import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.security.HashAlgorithm; import fr.xephi.authme.security.crypts.HashedPassword; import fr.xephi.authme.security.crypts.SHA256; -import fr.xephi.authme.service.MigrationService; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.properties.SecuritySettings; import org.junit.BeforeClass; diff --git a/src/test/java/fr/xephi/authme/service/TeleportationServiceTest.java b/src/test/java/fr/xephi/authme/service/TeleportationServiceTest.java index 0a218a84..30af5b0b 100644 --- a/src/test/java/fr/xephi/authme/service/TeleportationServiceTest.java +++ b/src/test/java/fr/xephi/authme/service/TeleportationServiceTest.java @@ -1,12 +1,10 @@ package fr.xephi.authme.service; -import fr.xephi.authme.cache.auth.PlayerAuth; -import fr.xephi.authme.cache.auth.PlayerCache; -import fr.xephi.authme.cache.limbo.PlayerData; +import fr.xephi.authme.data.auth.PlayerAuth; +import fr.xephi.authme.data.auth.PlayerCache; +import fr.xephi.authme.data.limbo.LimboPlayer; import fr.xephi.authme.events.FirstSpawnTeleportEvent; import fr.xephi.authme.events.SpawnTeleportEvent; -import fr.xephi.authme.service.BukkitService; -import fr.xephi.authme.service.TeleportationService; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.SpawnLoader; import fr.xephi.authme.settings.properties.RestrictionSettings; @@ -237,7 +235,7 @@ public class TeleportationServiceTest { given(settings.getProperty(RestrictionSettings.NO_TELEPORT)).willReturn(true); Player player = mock(Player.class); PlayerAuth auth = mock(PlayerAuth.class); - PlayerData limbo = mock(PlayerData.class); + LimboPlayer limbo = mock(LimboPlayer.class); // when teleportationService.teleportOnLogin(player, auth, limbo); @@ -255,7 +253,7 @@ public class TeleportationServiceTest { Location spawn = mockLocation(); given(spawnLoader.getSpawnLocation(player)).willReturn(spawn); PlayerAuth auth = mock(PlayerAuth.class); - PlayerData limbo = mock(PlayerData.class); + LimboPlayer limbo = mock(LimboPlayer.class); Location limboLocation = mockLocation(); given(limboLocation.getWorld().getName()).willReturn("forced1"); given(limbo.getLocation()).willReturn(limboLocation); @@ -279,7 +277,7 @@ public class TeleportationServiceTest { Location spawn = mockLocation(); given(spawnLoader.getSpawnLocation(player)).willReturn(spawn); PlayerAuth auth = mock(PlayerAuth.class); - PlayerData limbo = mock(PlayerData.class); + LimboPlayer limbo = mock(LimboPlayer.class); Location limboLocation = mockLocation(); given(limboLocation.getWorld().getName()).willReturn("Forced1"); // different case given(limbo.getLocation()).willReturn(limboLocation); @@ -306,7 +304,7 @@ public class TeleportationServiceTest { Player player = mock(Player.class); given(player.isOnline()).willReturn(true); - PlayerData limbo = mock(PlayerData.class); + LimboPlayer limbo = mock(LimboPlayer.class); Location limboLocation = mockLocation(); given(limbo.getLocation()).willReturn(limboLocation); @@ -335,7 +333,7 @@ public class TeleportationServiceTest { given(player.isOnline()).willReturn(true); World world = mock(World.class); given(player.getWorld()).willReturn(world); - PlayerData limbo = mock(PlayerData.class); + LimboPlayer limbo = mock(LimboPlayer.class); Location limboLocation = mockLocation(); given(limbo.getLocation()).willReturn(limboLocation); @@ -363,7 +361,7 @@ public class TeleportationServiceTest { given(player.isOnline()).willReturn(true); World world = mock(World.class); given(player.getWorld()).willReturn(world); - PlayerData limbo = mock(PlayerData.class); + LimboPlayer limbo = mock(LimboPlayer.class); Location location = mockLocation(); given(limbo.getLocation()).willReturn(location); @@ -388,7 +386,7 @@ public class TeleportationServiceTest { given(player.isOnline()).willReturn(true); World world = mock(World.class); given(player.getWorld()).willReturn(world); - PlayerData limbo = mock(PlayerData.class); + LimboPlayer limbo = mock(LimboPlayer.class); Location location = mockLocation(); given(limbo.getLocation()).willReturn(location); @@ -409,7 +407,7 @@ public class TeleportationServiceTest { PlayerAuth auth = PlayerAuth.builder().name("bobby").build(); Player player = mock(Player.class); - PlayerData limbo = mock(PlayerData.class); + LimboPlayer limbo = mock(LimboPlayer.class); // when teleportationService.teleportOnLogin(player, auth, limbo); diff --git a/src/test/java/fr/xephi/authme/service/ValidationServiceTest.java b/src/test/java/fr/xephi/authme/service/ValidationServiceTest.java index 2a85b131..1a1cbbe4 100644 --- a/src/test/java/fr/xephi/authme/service/ValidationServiceTest.java +++ b/src/test/java/fr/xephi/authme/service/ValidationServiceTest.java @@ -5,11 +5,10 @@ import ch.jalu.injector.testing.DelayedInjectionRunner; import ch.jalu.injector.testing.InjectDelayed; import com.google.common.base.Strings; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.geoip.GeoLiteAPI; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.geoip.GeoIpManager; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.permission.PermissionsManager; import fr.xephi.authme.permission.PlayerStatePermission; -import fr.xephi.authme.service.ValidationService; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.properties.EmailSettings; import fr.xephi.authme.settings.properties.ProtectionSettings; @@ -46,7 +45,7 @@ public class ValidationServiceTest { @Mock private PermissionsManager permissionsManager; @Mock - private GeoLiteAPI geoLiteApi; + private GeoIpManager geoIpManager; @BeforeInjecting public void createService() { @@ -267,7 +266,7 @@ public class ValidationServiceTest { // then assertThat(result, equalTo(true)); - verifyZeroInteractions(geoLiteApi); + verifyZeroInteractions(geoIpManager); } @Test @@ -276,14 +275,14 @@ public class ValidationServiceTest { given(settings.getProperty(ProtectionSettings.COUNTRIES_WHITELIST)).willReturn(asList("ch", "it")); given(settings.getProperty(ProtectionSettings.COUNTRIES_BLACKLIST)).willReturn(Collections.emptyList()); String ip = "127.0.0.1"; - given(geoLiteApi.getCountryCode(ip)).willReturn("CH"); + given(geoIpManager.getCountryCode(ip)).willReturn("CH"); // when boolean result = validationService.isCountryAdmitted(ip); // then assertThat(result, equalTo(true)); - verify(geoLiteApi).getCountryCode(ip); + verify(geoIpManager).getCountryCode(ip); } @Test @@ -292,14 +291,14 @@ public class ValidationServiceTest { given(settings.getProperty(ProtectionSettings.COUNTRIES_WHITELIST)).willReturn(asList("ch", "it")); given(settings.getProperty(ProtectionSettings.COUNTRIES_BLACKLIST)).willReturn(Collections.emptyList()); String ip = "123.45.67.89"; - given(geoLiteApi.getCountryCode(ip)).willReturn("BR"); + given(geoIpManager.getCountryCode(ip)).willReturn("BR"); // when boolean result = validationService.isCountryAdmitted(ip); // then assertThat(result, equalTo(false)); - verify(geoLiteApi).getCountryCode(ip); + verify(geoIpManager).getCountryCode(ip); } @Test @@ -308,14 +307,14 @@ public class ValidationServiceTest { given(settings.getProperty(ProtectionSettings.COUNTRIES_WHITELIST)).willReturn(Collections.emptyList()); given(settings.getProperty(ProtectionSettings.COUNTRIES_BLACKLIST)).willReturn(asList("ch", "it")); String ip = "127.0.0.1"; - given(geoLiteApi.getCountryCode(ip)).willReturn("BR"); + given(geoIpManager.getCountryCode(ip)).willReturn("BR"); // when boolean result = validationService.isCountryAdmitted(ip); // then assertThat(result, equalTo(true)); - verify(geoLiteApi).getCountryCode(ip); + verify(geoIpManager).getCountryCode(ip); } @Test @@ -324,14 +323,14 @@ public class ValidationServiceTest { given(settings.getProperty(ProtectionSettings.COUNTRIES_WHITELIST)).willReturn(Collections.emptyList()); given(settings.getProperty(ProtectionSettings.COUNTRIES_BLACKLIST)).willReturn(asList("ch", "it")); String ip = "123.45.67.89"; - given(geoLiteApi.getCountryCode(ip)).willReturn("IT"); + given(geoIpManager.getCountryCode(ip)).willReturn("IT"); // when boolean result = validationService.isCountryAdmitted(ip); // then assertThat(result, equalTo(false)); - verify(geoLiteApi).getCountryCode(ip); + verify(geoIpManager).getCountryCode(ip); } private static void assertErrorEquals(ValidationResult validationResult, MessageKey messageKey, String... args) { diff --git a/src/test/java/fr/xephi/authme/settings/SettingsTest.java b/src/test/java/fr/xephi/authme/settings/SettingsTest.java index 3cde1f2d..1e85a742 100644 --- a/src/test/java/fr/xephi/authme/settings/SettingsTest.java +++ b/src/test/java/fr/xephi/authme/settings/SettingsTest.java @@ -22,7 +22,7 @@ import java.util.Collections; import java.util.List; import static fr.xephi.authme.settings.properties.PluginSettings.MESSAGES_LANGUAGE; -import static fr.xephi.authme.util.StringUtils.makePath; +import static fr.xephi.authme.util.FileUtils.makePath; import static org.hamcrest.Matchers.arrayContaining; import static org.hamcrest.Matchers.arrayWithSize; import static org.hamcrest.Matchers.endsWith; diff --git a/src/test/java/fr/xephi/authme/task/PlayerDataTaskManagerTest.java b/src/test/java/fr/xephi/authme/task/LimboPlayerTaskManagerTest.java similarity index 80% rename from src/test/java/fr/xephi/authme/task/PlayerDataTaskManagerTest.java rename to src/test/java/fr/xephi/authme/task/LimboPlayerTaskManagerTest.java index 93b552ca..dbff584e 100644 --- a/src/test/java/fr/xephi/authme/task/PlayerDataTaskManagerTest.java +++ b/src/test/java/fr/xephi/authme/task/LimboPlayerTaskManagerTest.java @@ -1,11 +1,11 @@ package fr.xephi.authme.task; import fr.xephi.authme.TestHelper; -import fr.xephi.authme.cache.auth.PlayerCache; -import fr.xephi.authme.cache.limbo.LimboCache; -import fr.xephi.authme.cache.limbo.PlayerData; -import fr.xephi.authme.output.MessageKey; -import fr.xephi.authme.output.Messages; +import fr.xephi.authme.data.auth.PlayerCache; +import fr.xephi.authme.data.limbo.LimboCache; +import fr.xephi.authme.data.limbo.LimboPlayer; +import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.message.Messages; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.properties.RegistrationSettings; import fr.xephi.authme.settings.properties.RestrictionSettings; @@ -31,7 +31,7 @@ import static org.mockito.Mockito.verifyZeroInteractions; * Test for {@link PlayerDataTaskManager}. */ @RunWith(MockitoJUnitRunner.class) -public class PlayerDataTaskManagerTest { +public class LimboPlayerTaskManagerTest { @InjectMocks private PlayerDataTaskManager playerDataTaskManager; @@ -60,8 +60,8 @@ public class PlayerDataTaskManagerTest { public void shouldRegisterMessageTask() { // given String name = "bobby"; - PlayerData playerData = mock(PlayerData.class); - given(limboCache.getPlayerData(name)).willReturn(playerData); + LimboPlayer limboPlayer = mock(LimboPlayer.class); + given(limboCache.getPlayerData(name)).willReturn(limboPlayer); MessageKey key = MessageKey.REGISTER_EMAIL_MESSAGE; given(messages.retrieve(key)).willReturn(new String[]{"Please register!"}); BukkitTask bukkiTask = mock(BukkitTask.class); @@ -73,7 +73,7 @@ public class PlayerDataTaskManagerTest { playerDataTaskManager.registerMessageTask(name, false); // then - verify(playerData).setMessageTask(bukkiTask); + verify(limboPlayer).setMessageTask(bukkiTask); verify(messages).retrieve(key); } @@ -97,8 +97,8 @@ public class PlayerDataTaskManagerTest { public void shouldNotScheduleTaskForZeroAsInterval() { // given String name = "Tester1"; - PlayerData playerData = mock(PlayerData.class); - given(limboCache.getPlayerData(name)).willReturn(playerData); + LimboPlayer limboPlayer = mock(LimboPlayer.class); + given(limboCache.getPlayerData(name)).willReturn(limboPlayer); BukkitTask bukkiTask = mock(BukkitTask.class); given(bukkitService.runTask(any(MessageTask.class))).willReturn(bukkiTask); given(settings.getProperty(RegistrationSettings.MESSAGE_INTERVAL)).willReturn(0); @@ -107,18 +107,18 @@ public class PlayerDataTaskManagerTest { playerDataTaskManager.registerMessageTask(name, true); // then - verifyZeroInteractions(playerData, bukkitService); + verifyZeroInteractions(limboPlayer, bukkitService); } @Test public void shouldCancelExistingMessageTask() { // given - PlayerData playerData = mock(PlayerData.class); + LimboPlayer limboPlayer = mock(LimboPlayer.class); BukkitTask existingMessageTask = mock(BukkitTask.class); - given(playerData.getMessageTask()).willReturn(existingMessageTask); + given(limboPlayer.getMessageTask()).willReturn(existingMessageTask); String name = "bobby"; - given(limboCache.getPlayerData(name)).willReturn(playerData); + given(limboCache.getPlayerData(name)).willReturn(limboPlayer); given(messages.retrieve(MessageKey.REGISTER_EMAIL_MESSAGE)) .willReturn(new String[]{"Please register", "Use /register"}); @@ -131,7 +131,7 @@ public class PlayerDataTaskManagerTest { playerDataTaskManager.registerMessageTask(name, false); // then - verify(playerData).setMessageTask(bukkiTask); + verify(limboPlayer).setMessageTask(bukkiTask); verify(messages).retrieve(MessageKey.REGISTER_EMAIL_MESSAGE); verify(existingMessageTask).cancel(); } @@ -142,8 +142,8 @@ public class PlayerDataTaskManagerTest { String name = "l33tPlayer"; Player player = mock(Player.class); given(player.getName()).willReturn(name); - PlayerData playerData = mock(PlayerData.class); - given(limboCache.getPlayerData(name)).willReturn(playerData); + LimboPlayer limboPlayer = mock(LimboPlayer.class); + given(limboCache.getPlayerData(name)).willReturn(limboPlayer); given(settings.getProperty(RestrictionSettings.TIMEOUT)).willReturn(30); BukkitTask bukkitTask = mock(BukkitTask.class); given(bukkitService.runTaskLater(any(TimeoutTask.class), anyLong())).willReturn(bukkitTask); @@ -152,7 +152,7 @@ public class PlayerDataTaskManagerTest { playerDataTaskManager.registerTimeoutTask(player); // then - verify(playerData).setTimeoutTask(bukkitTask); + verify(limboPlayer).setTimeoutTask(bukkitTask); verify(bukkitService).runTaskLater(any(TimeoutTask.class), eq(600L)); // 30 * TICKS_PER_SECOND verify(messages).retrieveSingle(MessageKey.LOGIN_TIMEOUT_ERROR); } @@ -179,15 +179,15 @@ public class PlayerDataTaskManagerTest { String name = "snail"; Player player = mock(Player.class); given(player.getName()).willReturn(name); - PlayerData playerData = mock(PlayerData.class); - given(limboCache.getPlayerData(name)).willReturn(playerData); + LimboPlayer limboPlayer = mock(LimboPlayer.class); + given(limboCache.getPlayerData(name)).willReturn(limboPlayer); given(settings.getProperty(RestrictionSettings.TIMEOUT)).willReturn(0); // when playerDataTaskManager.registerTimeoutTask(player); // then - verifyZeroInteractions(playerData, bukkitService); + verifyZeroInteractions(limboPlayer, bukkitService); } @Test @@ -196,10 +196,10 @@ public class PlayerDataTaskManagerTest { String name = "l33tPlayer"; Player player = mock(Player.class); given(player.getName()).willReturn(name); - PlayerData playerData = mock(PlayerData.class); + LimboPlayer limboPlayer = mock(LimboPlayer.class); BukkitTask existingTask = mock(BukkitTask.class); - given(playerData.getTimeoutTask()).willReturn(existingTask); - given(limboCache.getPlayerData(name)).willReturn(playerData); + given(limboPlayer.getTimeoutTask()).willReturn(existingTask); + given(limboCache.getPlayerData(name)).willReturn(limboPlayer); given(settings.getProperty(RestrictionSettings.TIMEOUT)).willReturn(18); BukkitTask bukkitTask = mock(BukkitTask.class); given(bukkitService.runTaskLater(any(TimeoutTask.class), anyLong())).willReturn(bukkitTask); @@ -209,7 +209,7 @@ public class PlayerDataTaskManagerTest { // then verify(existingTask).cancel(); - verify(playerData).setTimeoutTask(bukkitTask); + verify(limboPlayer).setTimeoutTask(bukkitTask); verify(bukkitService).runTaskLater(any(TimeoutTask.class), eq(360L)); // 18 * TICKS_PER_SECOND verify(messages).retrieveSingle(MessageKey.LOGIN_TIMEOUT_ERROR); } diff --git a/src/test/java/fr/xephi/authme/util/FileUtilsTest.java b/src/test/java/fr/xephi/authme/util/FileUtilsTest.java index 41059eff..f36acf75 100644 --- a/src/test/java/fr/xephi/authme/util/FileUtilsTest.java +++ b/src/test/java/fr/xephi/authme/util/FileUtilsTest.java @@ -119,6 +119,15 @@ public class FileUtilsTest { // Nothing happens } + @Test + public void shouldConstructPath() { + // given/when + String result = FileUtils.makePath("path", "to", "test-file.txt"); + + // then + assertThat(result, equalTo("path" + File.separator + "to" + File.separator + "test-file.txt")); + } + private static void createFiles(File... files) throws IOException { for (File file : files) { boolean result = file.getParentFile().mkdirs() & file.createNewFile(); diff --git a/src/test/java/fr/xephi/authme/util/PlayerUtilsTest.java b/src/test/java/fr/xephi/authme/util/PlayerUtilsTest.java index 444d0c49..14933a04 100644 --- a/src/test/java/fr/xephi/authme/util/PlayerUtilsTest.java +++ b/src/test/java/fr/xephi/authme/util/PlayerUtilsTest.java @@ -15,7 +15,7 @@ import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; /** - * Test for {@link Utils}. + * Test for {@link PlayerUtils}. */ public class PlayerUtilsTest { diff --git a/src/test/java/fr/xephi/authme/util/StringUtilsTest.java b/src/test/java/fr/xephi/authme/util/StringUtilsTest.java index 72826b4c..1be95d0d 100644 --- a/src/test/java/fr/xephi/authme/util/StringUtilsTest.java +++ b/src/test/java/fr/xephi/authme/util/StringUtilsTest.java @@ -3,7 +3,6 @@ package fr.xephi.authme.util; import fr.xephi.authme.TestHelper; import org.junit.Test; -import java.io.File; import java.net.MalformedURLException; import static org.hamcrest.Matchers.equalTo; @@ -91,15 +90,6 @@ public class StringUtilsTest { assertThat(StringUtils.getDifference("test", "something"), greaterThan(0.88)); } - @Test - public void shouldConstructPath() { - // given/when - String result = StringUtils.makePath("path", "to", "test-file.txt"); - - // then - assertThat(result, equalTo("path" + File.separator + "to" + File.separator + "test-file.txt")); - } - @Test public void shouldHaveHiddenConstructor() { TestHelper.validateHasOnlyPrivateEmptyConstructor(StringUtils.class); diff --git a/src/test/java/tools/dependencygraph/DrawDependency.java b/src/test/java/tools/dependencygraph/DrawDependency.java index 6515f52d..6b2c9c8a 100644 --- a/src/test/java/tools/dependencygraph/DrawDependency.java +++ b/src/test/java/tools/dependencygraph/DrawDependency.java @@ -8,7 +8,7 @@ import com.google.common.collect.Multimap; import fr.xephi.authme.ClassCollector; import fr.xephi.authme.TestHelper; import fr.xephi.authme.command.ExecutableCommand; -import fr.xephi.authme.converter.Converter; +import fr.xephi.authme.datasource.converter.Converter; import fr.xephi.authme.initialization.DataFolder; import fr.xephi.authme.process.AsynchronousProcess; import fr.xephi.authme.process.SynchronousProcess; diff --git a/src/test/java/tools/messages/MessageFileVerifier.java b/src/test/java/tools/messages/MessageFileVerifier.java index 8207091b..f0be6bb4 100644 --- a/src/test/java/tools/messages/MessageFileVerifier.java +++ b/src/test/java/tools/messages/MessageFileVerifier.java @@ -5,7 +5,7 @@ import com.google.common.base.Predicate; import com.google.common.collect.HashMultimap; import com.google.common.collect.Iterables; import com.google.common.collect.Multimap; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; import tools.utils.FileUtils; diff --git a/src/test/java/tools/messages/translation/ExportMessagesTask.java b/src/test/java/tools/messages/translation/ExportMessagesTask.java index 672dac39..7ea2a419 100644 --- a/src/test/java/tools/messages/translation/ExportMessagesTask.java +++ b/src/test/java/tools/messages/translation/ExportMessagesTask.java @@ -2,7 +2,7 @@ package tools.messages.translation; import com.google.common.io.CharStreams; import com.google.gson.Gson; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.util.StringUtils; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/src/test/java/tools/messages/translation/ImportMessagesTask.java b/src/test/java/tools/messages/translation/ImportMessagesTask.java index 0685667d..c70caaa3 100644 --- a/src/test/java/tools/messages/translation/ImportMessagesTask.java +++ b/src/test/java/tools/messages/translation/ImportMessagesTask.java @@ -2,7 +2,7 @@ package tools.messages.translation; import com.google.common.io.Resources; import com.google.gson.Gson; -import fr.xephi.authme.output.MessageKey; +import fr.xephi.authme.message.MessageKey; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; import tools.messages.MessageFileVerifier; diff --git a/src/test/resources/fr/xephi/authme/cache/backup/sample-folder/data.json b/src/test/resources/fr/xephi/authme/data/backup/sample-folder/data.json similarity index 100% rename from src/test/resources/fr/xephi/authme/cache/backup/sample-folder/data.json rename to src/test/resources/fr/xephi/authme/data/backup/sample-folder/data.json diff --git a/src/test/resources/fr/xephi/authme/converter/crazylogin.db b/src/test/resources/fr/xephi/authme/datasource/converter/crazylogin.db similarity index 100% rename from src/test/resources/fr/xephi/authme/converter/crazylogin.db rename to src/test/resources/fr/xephi/authme/datasource/converter/crazylogin.db diff --git a/src/test/resources/fr/xephi/authme/output/messages_default.yml b/src/test/resources/fr/xephi/authme/message/messages_default.yml similarity index 100% rename from src/test/resources/fr/xephi/authme/output/messages_default.yml rename to src/test/resources/fr/xephi/authme/message/messages_default.yml diff --git a/src/test/resources/fr/xephi/authme/output/messages_test.yml b/src/test/resources/fr/xephi/authme/message/messages_test.yml similarity index 100% rename from src/test/resources/fr/xephi/authme/output/messages_test.yml rename to src/test/resources/fr/xephi/authme/message/messages_test.yml diff --git a/src/test/resources/fr/xephi/authme/output/messages_test2.yml b/src/test/resources/fr/xephi/authme/message/messages_test2.yml similarity index 100% rename from src/test/resources/fr/xephi/authme/output/messages_test2.yml rename to src/test/resources/fr/xephi/authme/message/messages_test2.yml