From 19adcdcceb292a7abea56de6b2d1808d27d4dd07 Mon Sep 17 00:00:00 2001 From: ljacqu Date: Sat, 5 Mar 2016 16:03:00 +0100 Subject: [PATCH] Move managers to the cache package - Not entirely accurate name but not really worth to have a separate package for managers --- src/main/java/fr/xephi/authme/AuthMe.java | 2 +- .../java/fr/xephi/authme/{manager => cache}/CaptchaManager.java | 2 +- .../fr/xephi/authme/{manager => cache}/IpAddressManager.java | 2 +- src/main/java/fr/xephi/authme/command/CommandService.java | 2 +- src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java | 2 +- src/main/java/fr/xephi/authme/process/ProcessService.java | 2 +- src/test/java/fr/xephi/authme/command/CommandServiceTest.java | 2 +- src/test/java/fr/xephi/authme/manager/CaptchaManagerTest.java | 1 + src/test/java/fr/xephi/authme/manager/IpAddressManagerTest.java | 1 + 9 files changed, 9 insertions(+), 7 deletions(-) rename src/main/java/fr/xephi/authme/{manager => cache}/CaptchaManager.java (98%) rename src/main/java/fr/xephi/authme/{manager => cache}/IpAddressManager.java (98%) diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java index ceca76be9..bdac0cecd 100644 --- a/src/main/java/fr/xephi/authme/AuthMe.java +++ b/src/main/java/fr/xephi/authme/AuthMe.java @@ -33,7 +33,7 @@ import fr.xephi.authme.listener.AuthMeServerListener; import fr.xephi.authme.listener.AuthMeTabCompletePacketAdapter; import fr.xephi.authme.listener.AuthMeTablistPacketAdapter; import fr.xephi.authme.mail.SendMailSSL; -import fr.xephi.authme.manager.IpAddressManager; +import fr.xephi.authme.cache.IpAddressManager; import fr.xephi.authme.output.ConsoleFilter; import fr.xephi.authme.output.Log4JFilter; import fr.xephi.authme.output.MessageKey; diff --git a/src/main/java/fr/xephi/authme/manager/CaptchaManager.java b/src/main/java/fr/xephi/authme/cache/CaptchaManager.java similarity index 98% rename from src/main/java/fr/xephi/authme/manager/CaptchaManager.java rename to src/main/java/fr/xephi/authme/cache/CaptchaManager.java index e89e9d497..342ad7c3d 100644 --- a/src/main/java/fr/xephi/authme/manager/CaptchaManager.java +++ b/src/main/java/fr/xephi/authme/cache/CaptchaManager.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.manager; +package fr.xephi.authme.cache; import fr.xephi.authme.security.RandomString; import fr.xephi.authme.settings.NewSetting; diff --git a/src/main/java/fr/xephi/authme/manager/IpAddressManager.java b/src/main/java/fr/xephi/authme/cache/IpAddressManager.java similarity index 98% rename from src/main/java/fr/xephi/authme/manager/IpAddressManager.java rename to src/main/java/fr/xephi/authme/cache/IpAddressManager.java index 951e3c8ff..40b9cf865 100644 --- a/src/main/java/fr/xephi/authme/manager/IpAddressManager.java +++ b/src/main/java/fr/xephi/authme/cache/IpAddressManager.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.manager; +package fr.xephi.authme.cache; import com.google.common.base.Charsets; import com.google.common.io.Resources; diff --git a/src/main/java/fr/xephi/authme/command/CommandService.java b/src/main/java/fr/xephi/authme/command/CommandService.java index 7c348ced0..ab03ceedc 100644 --- a/src/main/java/fr/xephi/authme/command/CommandService.java +++ b/src/main/java/fr/xephi/authme/command/CommandService.java @@ -3,7 +3,7 @@ package fr.xephi.authme.command; import fr.xephi.authme.AuthMe; import fr.xephi.authme.command.help.HelpProvider; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.manager.IpAddressManager; +import fr.xephi.authme.cache.IpAddressManager; import fr.xephi.authme.output.MessageKey; import fr.xephi.authme.output.Messages; import fr.xephi.authme.permission.PermissionsManager; diff --git a/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java b/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java index e29743558..72f39b807 100644 --- a/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java +++ b/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java @@ -7,7 +7,7 @@ import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.cache.auth.PlayerAuth; import fr.xephi.authme.cache.auth.PlayerCache; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.manager.IpAddressManager; +import fr.xephi.authme.cache.IpAddressManager; import fr.xephi.authme.security.crypts.HashedPassword; import org.bukkit.entity.Player; import org.bukkit.plugin.messaging.PluginMessageListener; diff --git a/src/main/java/fr/xephi/authme/process/ProcessService.java b/src/main/java/fr/xephi/authme/process/ProcessService.java index 621cdf8fa..66e45d9b3 100644 --- a/src/main/java/fr/xephi/authme/process/ProcessService.java +++ b/src/main/java/fr/xephi/authme/process/ProcessService.java @@ -1,7 +1,7 @@ package fr.xephi.authme.process; import fr.xephi.authme.AuthMe; -import fr.xephi.authme.manager.IpAddressManager; +import fr.xephi.authme.cache.IpAddressManager; import fr.xephi.authme.output.MessageKey; import fr.xephi.authme.output.Messages; import fr.xephi.authme.settings.NewSetting; diff --git a/src/test/java/fr/xephi/authme/command/CommandServiceTest.java b/src/test/java/fr/xephi/authme/command/CommandServiceTest.java index 72d949d5a..d237c452b 100644 --- a/src/test/java/fr/xephi/authme/command/CommandServiceTest.java +++ b/src/test/java/fr/xephi/authme/command/CommandServiceTest.java @@ -3,7 +3,7 @@ package fr.xephi.authme.command; import fr.xephi.authme.AuthMe; import fr.xephi.authme.command.help.HelpProvider; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.manager.IpAddressManager; +import fr.xephi.authme.cache.IpAddressManager; import fr.xephi.authme.output.MessageKey; import fr.xephi.authme.output.Messages; import fr.xephi.authme.permission.PermissionsManager; diff --git a/src/test/java/fr/xephi/authme/manager/CaptchaManagerTest.java b/src/test/java/fr/xephi/authme/manager/CaptchaManagerTest.java index 62fee9bb7..2f9d241f6 100644 --- a/src/test/java/fr/xephi/authme/manager/CaptchaManagerTest.java +++ b/src/test/java/fr/xephi/authme/manager/CaptchaManagerTest.java @@ -1,5 +1,6 @@ package fr.xephi.authme.manager; +import fr.xephi.authme.cache.CaptchaManager; import fr.xephi.authme.settings.NewSetting; import fr.xephi.authme.settings.properties.SecuritySettings; import org.junit.Test; diff --git a/src/test/java/fr/xephi/authme/manager/IpAddressManagerTest.java b/src/test/java/fr/xephi/authme/manager/IpAddressManagerTest.java index b5a1d7435..9dc97fc9e 100644 --- a/src/test/java/fr/xephi/authme/manager/IpAddressManagerTest.java +++ b/src/test/java/fr/xephi/authme/manager/IpAddressManagerTest.java @@ -1,5 +1,6 @@ package fr.xephi.authme.manager; +import fr.xephi.authme.cache.IpAddressManager; import fr.xephi.authme.settings.NewSetting; import fr.xephi.authme.settings.properties.HooksSettings; import org.bukkit.entity.Player;