From 200af9c4c400755f2aabda9c309c8e8b04a073b1 Mon Sep 17 00:00:00 2001 From: ljacqu Date: Tue, 19 Jan 2016 09:20:55 +0100 Subject: [PATCH] Move new configs outside of 'custom' package - Create properties package for storing the config properties - Move NewSetting class to main settings pkg --- src/main/java/fr/xephi/authme/AuthMe.java | 2 +- .../fr/xephi/authme/command/CommandService.java | 2 +- .../authme/ChangePasswordAdminCommand.java | 4 ++-- .../executable/authme/RegisterAdminCommand.java | 2 +- .../executable/captcha/CaptchaCommand.java | 2 +- .../changepassword/ChangePasswordCommand.java | 4 ++-- .../settings/{custom => }/NewSetting.java | 3 ++- .../{custom => properties}/BackupSettings.java | 2 +- .../ConverterSettings.java | 2 +- .../DatabaseSettings.java | 2 +- .../{custom => properties}/EmailSettings.java | 2 +- .../{custom => properties}/HooksSettings.java | 2 +- .../{custom => properties}/PluginSettings.java | 2 +- .../ProtectionSettings.java | 2 +- .../{custom => properties}/PurgeSettings.java | 2 +- .../RegistrationSettings.java | 2 +- .../RestrictionSettings.java | 2 +- .../SecuritySettings.java | 2 +- .../SettingsFieldRetriever.java | 17 ++++++++++++----- .../authme/command/CommandServiceTest.java | 4 ++-- .../executable/captcha/CaptchaCommandTest.java | 2 +- .../ChangePasswordCommandTest.java | 4 ++-- .../{custom => }/ConfigFileConsistencyTest.java | 4 +++- .../{custom => }/NewSettingIntegrationTest.java | 4 +++- .../settings/{custom => }/NewSettingTest.java | 4 +++- .../SettingsClassConsistencyTest.java | 4 ++-- .../TestConfiguration.java | 8 ++++++-- 27 files changed, 55 insertions(+), 37 deletions(-) rename src/main/java/fr/xephi/authme/settings/{custom => }/NewSetting.java (98%) rename src/main/java/fr/xephi/authme/settings/{custom => properties}/BackupSettings.java (95%) rename src/main/java/fr/xephi/authme/settings/{custom => properties}/ConverterSettings.java (96%) rename src/main/java/fr/xephi/authme/settings/{custom => properties}/DatabaseSettings.java (99%) rename src/main/java/fr/xephi/authme/settings/{custom => properties}/EmailSettings.java (98%) rename src/main/java/fr/xephi/authme/settings/{custom => properties}/HooksSettings.java (98%) rename src/main/java/fr/xephi/authme/settings/{custom => properties}/PluginSettings.java (98%) rename src/main/java/fr/xephi/authme/settings/{custom => properties}/ProtectionSettings.java (97%) rename src/main/java/fr/xephi/authme/settings/{custom => properties}/PurgeSettings.java (98%) rename src/main/java/fr/xephi/authme/settings/{custom => properties}/RegistrationSettings.java (99%) rename src/main/java/fr/xephi/authme/settings/{custom => properties}/RestrictionSettings.java (99%) rename src/main/java/fr/xephi/authme/settings/{custom => properties}/SecuritySettings.java (99%) rename src/main/java/fr/xephi/authme/settings/{custom => properties}/SettingsFieldRetriever.java (80%) rename src/test/java/fr/xephi/authme/settings/{custom => }/ConfigFileConsistencyTest.java (95%) rename src/test/java/fr/xephi/authme/settings/{custom => }/NewSettingIntegrationTest.java (97%) rename src/test/java/fr/xephi/authme/settings/{custom => }/NewSettingTest.java (96%) rename src/test/java/fr/xephi/authme/settings/{custom => properties}/SettingsClassConsistencyTest.java (98%) rename src/test/java/fr/xephi/authme/settings/{custom => properties}/TestConfiguration.java (91%) diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java index 1b39b344..936e9542 100644 --- a/src/main/java/fr/xephi/authme/AuthMe.java +++ b/src/main/java/fr/xephi/authme/AuthMe.java @@ -48,7 +48,7 @@ import fr.xephi.authme.security.crypts.HashedPassword; import fr.xephi.authme.settings.OtherAccounts; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.Spawn; -import fr.xephi.authme.settings.custom.NewSetting; +import fr.xephi.authme.settings.NewSetting; import fr.xephi.authme.util.GeoLiteAPI; import fr.xephi.authme.util.StringUtils; import fr.xephi.authme.util.Utils; diff --git a/src/main/java/fr/xephi/authme/command/CommandService.java b/src/main/java/fr/xephi/authme/command/CommandService.java index 8dd1da59..99d6bdb2 100644 --- a/src/main/java/fr/xephi/authme/command/CommandService.java +++ b/src/main/java/fr/xephi/authme/command/CommandService.java @@ -8,7 +8,7 @@ import fr.xephi.authme.output.Messages; import fr.xephi.authme.permission.PermissionsManager; import fr.xephi.authme.process.Management; import fr.xephi.authme.security.PasswordSecurity; -import fr.xephi.authme.settings.custom.NewSetting; +import fr.xephi.authme.settings.NewSetting; import fr.xephi.authme.settings.domain.Property; 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 a1b27f16..cb6bddcf 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 @@ -8,8 +8,8 @@ import fr.xephi.authme.command.ExecutableCommand; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.output.MessageKey; import fr.xephi.authme.security.crypts.HashedPassword; -import fr.xephi.authme.settings.custom.RestrictionSettings; -import fr.xephi.authme.settings.custom.SecuritySettings; +import fr.xephi.authme.settings.properties.RestrictionSettings; +import fr.xephi.authme.settings.properties.SecuritySettings; import org.bukkit.command.CommandSender; import java.util.List; 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 107f8c7a..7b929952 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 @@ -7,7 +7,7 @@ import fr.xephi.authme.command.ExecutableCommand; import fr.xephi.authme.output.MessageKey; import fr.xephi.authme.security.crypts.HashedPassword; import fr.xephi.authme.settings.Settings; -import fr.xephi.authme.settings.custom.SecuritySettings; +import fr.xephi.authme.settings.properties.SecuritySettings; import org.bukkit.Bukkit; 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 79f963f0..8c5a0764 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 @@ -6,7 +6,7 @@ import fr.xephi.authme.command.CommandService; import fr.xephi.authme.command.PlayerCommand; import fr.xephi.authme.output.MessageKey; import fr.xephi.authme.security.RandomString; -import fr.xephi.authme.settings.custom.SecuritySettings; +import fr.xephi.authme.settings.properties.SecuritySettings; import fr.xephi.authme.util.Wrapper; import org.bukkit.entity.Player; 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 a3b7f445..d27ff298 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 @@ -5,8 +5,8 @@ import fr.xephi.authme.cache.auth.PlayerCache; import fr.xephi.authme.command.CommandService; import fr.xephi.authme.command.PlayerCommand; import fr.xephi.authme.output.MessageKey; -import fr.xephi.authme.settings.custom.RestrictionSettings; -import fr.xephi.authme.settings.custom.SecuritySettings; +import fr.xephi.authme.settings.properties.RestrictionSettings; +import fr.xephi.authme.settings.properties.SecuritySettings; import fr.xephi.authme.task.ChangePasswordTask; import fr.xephi.authme.util.Wrapper; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/xephi/authme/settings/custom/NewSetting.java b/src/main/java/fr/xephi/authme/settings/NewSetting.java similarity index 98% rename from src/main/java/fr/xephi/authme/settings/custom/NewSetting.java rename to src/main/java/fr/xephi/authme/settings/NewSetting.java index 6f9abdc4..34d16f34 100644 --- a/src/main/java/fr/xephi/authme/settings/custom/NewSetting.java +++ b/src/main/java/fr/xephi/authme/settings/NewSetting.java @@ -1,8 +1,9 @@ -package fr.xephi.authme.settings.custom; +package fr.xephi.authme.settings; import com.google.common.annotations.VisibleForTesting; import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.settings.domain.Property; +import fr.xephi.authme.settings.properties.SettingsFieldRetriever; import fr.xephi.authme.settings.propertymap.PropertyMap; import fr.xephi.authme.util.CollectionUtils; import fr.xephi.authme.util.StringUtils; diff --git a/src/main/java/fr/xephi/authme/settings/custom/BackupSettings.java b/src/main/java/fr/xephi/authme/settings/properties/BackupSettings.java similarity index 95% rename from src/main/java/fr/xephi/authme/settings/custom/BackupSettings.java rename to src/main/java/fr/xephi/authme/settings/properties/BackupSettings.java index f2e78931..32c439db 100644 --- a/src/main/java/fr/xephi/authme/settings/custom/BackupSettings.java +++ b/src/main/java/fr/xephi/authme/settings/properties/BackupSettings.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.settings.custom; +package fr.xephi.authme.settings.properties; import fr.xephi.authme.settings.domain.Comment; import fr.xephi.authme.settings.domain.Property; diff --git a/src/main/java/fr/xephi/authme/settings/custom/ConverterSettings.java b/src/main/java/fr/xephi/authme/settings/properties/ConverterSettings.java similarity index 96% rename from src/main/java/fr/xephi/authme/settings/custom/ConverterSettings.java rename to src/main/java/fr/xephi/authme/settings/properties/ConverterSettings.java index f32cf748..9dc4ad60 100644 --- a/src/main/java/fr/xephi/authme/settings/custom/ConverterSettings.java +++ b/src/main/java/fr/xephi/authme/settings/properties/ConverterSettings.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.settings.custom; +package fr.xephi.authme.settings.properties; import fr.xephi.authme.settings.domain.Comment; import fr.xephi.authme.settings.domain.Property; diff --git a/src/main/java/fr/xephi/authme/settings/custom/DatabaseSettings.java b/src/main/java/fr/xephi/authme/settings/properties/DatabaseSettings.java similarity index 99% rename from src/main/java/fr/xephi/authme/settings/custom/DatabaseSettings.java rename to src/main/java/fr/xephi/authme/settings/properties/DatabaseSettings.java index 84f0b708..49ddc597 100644 --- a/src/main/java/fr/xephi/authme/settings/custom/DatabaseSettings.java +++ b/src/main/java/fr/xephi/authme/settings/properties/DatabaseSettings.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.settings.custom; +package fr.xephi.authme.settings.properties; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.settings.domain.Comment; diff --git a/src/main/java/fr/xephi/authme/settings/custom/EmailSettings.java b/src/main/java/fr/xephi/authme/settings/properties/EmailSettings.java similarity index 98% rename from src/main/java/fr/xephi/authme/settings/custom/EmailSettings.java rename to src/main/java/fr/xephi/authme/settings/properties/EmailSettings.java index 68314365..7b7ee3ce 100644 --- a/src/main/java/fr/xephi/authme/settings/custom/EmailSettings.java +++ b/src/main/java/fr/xephi/authme/settings/properties/EmailSettings.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.settings.custom; +package fr.xephi.authme.settings.properties; import fr.xephi.authme.settings.domain.Comment; import fr.xephi.authme.settings.domain.Property; diff --git a/src/main/java/fr/xephi/authme/settings/custom/HooksSettings.java b/src/main/java/fr/xephi/authme/settings/properties/HooksSettings.java similarity index 98% rename from src/main/java/fr/xephi/authme/settings/custom/HooksSettings.java rename to src/main/java/fr/xephi/authme/settings/properties/HooksSettings.java index af0458ac..b20d2868 100644 --- a/src/main/java/fr/xephi/authme/settings/custom/HooksSettings.java +++ b/src/main/java/fr/xephi/authme/settings/properties/HooksSettings.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.settings.custom; +package fr.xephi.authme.settings.properties; import fr.xephi.authme.settings.domain.Comment; import fr.xephi.authme.settings.domain.Property; diff --git a/src/main/java/fr/xephi/authme/settings/custom/PluginSettings.java b/src/main/java/fr/xephi/authme/settings/properties/PluginSettings.java similarity index 98% rename from src/main/java/fr/xephi/authme/settings/custom/PluginSettings.java rename to src/main/java/fr/xephi/authme/settings/properties/PluginSettings.java index e35076db..6fea29fb 100644 --- a/src/main/java/fr/xephi/authme/settings/custom/PluginSettings.java +++ b/src/main/java/fr/xephi/authme/settings/properties/PluginSettings.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.settings.custom; +package fr.xephi.authme.settings.properties; import fr.xephi.authme.settings.domain.Comment; import fr.xephi.authme.settings.domain.Property; diff --git a/src/main/java/fr/xephi/authme/settings/custom/ProtectionSettings.java b/src/main/java/fr/xephi/authme/settings/properties/ProtectionSettings.java similarity index 97% rename from src/main/java/fr/xephi/authme/settings/custom/ProtectionSettings.java rename to src/main/java/fr/xephi/authme/settings/properties/ProtectionSettings.java index 2582c277..f5a51215 100644 --- a/src/main/java/fr/xephi/authme/settings/custom/ProtectionSettings.java +++ b/src/main/java/fr/xephi/authme/settings/properties/ProtectionSettings.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.settings.custom; +package fr.xephi.authme.settings.properties; import fr.xephi.authme.settings.domain.Comment; import fr.xephi.authme.settings.domain.Property; diff --git a/src/main/java/fr/xephi/authme/settings/custom/PurgeSettings.java b/src/main/java/fr/xephi/authme/settings/properties/PurgeSettings.java similarity index 98% rename from src/main/java/fr/xephi/authme/settings/custom/PurgeSettings.java rename to src/main/java/fr/xephi/authme/settings/properties/PurgeSettings.java index 5fcc139d..b4de9abf 100644 --- a/src/main/java/fr/xephi/authme/settings/custom/PurgeSettings.java +++ b/src/main/java/fr/xephi/authme/settings/properties/PurgeSettings.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.settings.custom; +package fr.xephi.authme.settings.properties; import fr.xephi.authme.settings.domain.Comment; import fr.xephi.authme.settings.domain.Property; diff --git a/src/main/java/fr/xephi/authme/settings/custom/RegistrationSettings.java b/src/main/java/fr/xephi/authme/settings/properties/RegistrationSettings.java similarity index 99% rename from src/main/java/fr/xephi/authme/settings/custom/RegistrationSettings.java rename to src/main/java/fr/xephi/authme/settings/properties/RegistrationSettings.java index 7e830145..129e4ab9 100644 --- a/src/main/java/fr/xephi/authme/settings/custom/RegistrationSettings.java +++ b/src/main/java/fr/xephi/authme/settings/properties/RegistrationSettings.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.settings.custom; +package fr.xephi.authme.settings.properties; import fr.xephi.authme.settings.domain.Comment; import fr.xephi.authme.settings.domain.Property; diff --git a/src/main/java/fr/xephi/authme/settings/custom/RestrictionSettings.java b/src/main/java/fr/xephi/authme/settings/properties/RestrictionSettings.java similarity index 99% rename from src/main/java/fr/xephi/authme/settings/custom/RestrictionSettings.java rename to src/main/java/fr/xephi/authme/settings/properties/RestrictionSettings.java index 32b68586..a14285fd 100644 --- a/src/main/java/fr/xephi/authme/settings/custom/RestrictionSettings.java +++ b/src/main/java/fr/xephi/authme/settings/properties/RestrictionSettings.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.settings.custom; +package fr.xephi.authme.settings.properties; import fr.xephi.authme.settings.domain.Comment; import fr.xephi.authme.settings.domain.Property; diff --git a/src/main/java/fr/xephi/authme/settings/custom/SecuritySettings.java b/src/main/java/fr/xephi/authme/settings/properties/SecuritySettings.java similarity index 99% rename from src/main/java/fr/xephi/authme/settings/custom/SecuritySettings.java rename to src/main/java/fr/xephi/authme/settings/properties/SecuritySettings.java index 94e33258..955e35c1 100644 --- a/src/main/java/fr/xephi/authme/settings/custom/SecuritySettings.java +++ b/src/main/java/fr/xephi/authme/settings/properties/SecuritySettings.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.settings.custom; +package fr.xephi.authme.settings.properties; import fr.xephi.authme.security.HashAlgorithm; import fr.xephi.authme.settings.domain.Comment; diff --git a/src/main/java/fr/xephi/authme/settings/custom/SettingsFieldRetriever.java b/src/main/java/fr/xephi/authme/settings/properties/SettingsFieldRetriever.java similarity index 80% rename from src/main/java/fr/xephi/authme/settings/custom/SettingsFieldRetriever.java rename to src/main/java/fr/xephi/authme/settings/properties/SettingsFieldRetriever.java index 74b722e8..cedd358e 100644 --- a/src/main/java/fr/xephi/authme/settings/custom/SettingsFieldRetriever.java +++ b/src/main/java/fr/xephi/authme/settings/properties/SettingsFieldRetriever.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.settings.custom; +package fr.xephi.authme.settings.properties; import fr.xephi.authme.settings.domain.Comment; import fr.xephi.authme.settings.domain.Property; @@ -12,9 +12,10 @@ import java.util.Arrays; import java.util.List; /** - * Utility class responsible for the retrieval of all {@link Property} fields via reflections. + * Utility class responsible for retrieving all {@link Property} fields + * from {@link SettingsClass} implementations via reflection. */ -final class SettingsFieldRetriever { +public final class SettingsFieldRetriever { /** The classes to scan for properties. */ private static final List> CONFIGURATION_CLASSES = Arrays.asList( @@ -37,7 +38,7 @@ final class SettingsFieldRetriever { for (Class clazz : CONFIGURATION_CLASSES) { Field[] declaredFields = clazz.getDeclaredFields(); for (Field field : declaredFields) { - Property property = getFieldIfRelevant(field); + Property property = getPropertyField(field); if (property != null) { properties.put(property, getCommentsForField(field)); } @@ -53,7 +54,13 @@ final class SettingsFieldRetriever { return new String[0]; } - private static Property getFieldIfRelevant(Field field) { + /** + * Return the given field's value if it is a static {@link Property}. + * + * @param field The field's value to return + * @return The property the field defines, or null if not applicable + */ + private static Property getPropertyField(Field field) { field.setAccessible(true); if (field.isAccessible() && Property.class.equals(field.getType()) && Modifier.isStatic(field.getModifiers())) { try { diff --git a/src/test/java/fr/xephi/authme/command/CommandServiceTest.java b/src/test/java/fr/xephi/authme/command/CommandServiceTest.java index e3e67e3e..03419698 100644 --- a/src/test/java/fr/xephi/authme/command/CommandServiceTest.java +++ b/src/test/java/fr/xephi/authme/command/CommandServiceTest.java @@ -8,8 +8,8 @@ import fr.xephi.authme.output.Messages; import fr.xephi.authme.permission.PermissionsManager; import fr.xephi.authme.process.Management; import fr.xephi.authme.security.PasswordSecurity; -import fr.xephi.authme.settings.custom.NewSetting; -import fr.xephi.authme.settings.custom.SecuritySettings; +import fr.xephi.authme.settings.NewSetting; +import fr.xephi.authme.settings.properties.SecuritySettings; import fr.xephi.authme.settings.domain.Property; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; 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 c33b13ef..b3b54a1c 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 @@ -5,7 +5,7 @@ import fr.xephi.authme.command.CommandService; import fr.xephi.authme.command.ExecutableCommand; import fr.xephi.authme.output.MessageKey; import fr.xephi.authme.output.Messages; -import fr.xephi.authme.settings.custom.SecuritySettings; +import fr.xephi.authme.settings.properties.SecuritySettings; import fr.xephi.authme.util.WrapperMock; import org.bukkit.command.BlockCommandSender; import org.bukkit.command.CommandSender; 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 d00a4e37..3936e506 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 @@ -4,8 +4,8 @@ import fr.xephi.authme.ReflectionTestUtils; import fr.xephi.authme.cache.auth.PlayerCache; import fr.xephi.authme.command.CommandService; import fr.xephi.authme.output.MessageKey; -import fr.xephi.authme.settings.custom.RestrictionSettings; -import fr.xephi.authme.settings.custom.SecuritySettings; +import fr.xephi.authme.settings.properties.RestrictionSettings; +import fr.xephi.authme.settings.properties.SecuritySettings; import fr.xephi.authme.task.ChangePasswordTask; import fr.xephi.authme.util.WrapperMock; import org.bukkit.Server; diff --git a/src/test/java/fr/xephi/authme/settings/custom/ConfigFileConsistencyTest.java b/src/test/java/fr/xephi/authme/settings/ConfigFileConsistencyTest.java similarity index 95% rename from src/test/java/fr/xephi/authme/settings/custom/ConfigFileConsistencyTest.java rename to src/test/java/fr/xephi/authme/settings/ConfigFileConsistencyTest.java index d012a50a..affb95ad 100644 --- a/src/test/java/fr/xephi/authme/settings/custom/ConfigFileConsistencyTest.java +++ b/src/test/java/fr/xephi/authme/settings/ConfigFileConsistencyTest.java @@ -1,7 +1,9 @@ -package fr.xephi.authme.settings.custom; +package fr.xephi.authme.settings; import fr.xephi.authme.ReflectionTestUtils; +import fr.xephi.authme.settings.NewSetting; import fr.xephi.authme.settings.domain.Property; +import fr.xephi.authme.settings.properties.SettingsFieldRetriever; import fr.xephi.authme.settings.propertymap.PropertyMap; import fr.xephi.authme.util.StringUtils; import org.bukkit.configuration.MemorySection; diff --git a/src/test/java/fr/xephi/authme/settings/custom/NewSettingIntegrationTest.java b/src/test/java/fr/xephi/authme/settings/NewSettingIntegrationTest.java similarity index 97% rename from src/test/java/fr/xephi/authme/settings/custom/NewSettingIntegrationTest.java rename to src/test/java/fr/xephi/authme/settings/NewSettingIntegrationTest.java index 73b80b02..92a31cc1 100644 --- a/src/test/java/fr/xephi/authme/settings/custom/NewSettingIntegrationTest.java +++ b/src/test/java/fr/xephi/authme/settings/NewSettingIntegrationTest.java @@ -1,8 +1,10 @@ -package fr.xephi.authme.settings.custom; +package fr.xephi.authme.settings; import com.google.common.collect.ImmutableMap; import fr.xephi.authme.ReflectionTestUtils; +import fr.xephi.authme.settings.NewSetting; import fr.xephi.authme.settings.domain.Property; +import fr.xephi.authme.settings.properties.TestConfiguration; import fr.xephi.authme.settings.propertymap.PropertyMap; import org.bukkit.configuration.file.YamlConfiguration; import org.junit.BeforeClass; diff --git a/src/test/java/fr/xephi/authme/settings/custom/NewSettingTest.java b/src/test/java/fr/xephi/authme/settings/NewSettingTest.java similarity index 96% rename from src/test/java/fr/xephi/authme/settings/custom/NewSettingTest.java rename to src/test/java/fr/xephi/authme/settings/NewSettingTest.java index 64e213ae..549be6f3 100644 --- a/src/test/java/fr/xephi/authme/settings/custom/NewSettingTest.java +++ b/src/test/java/fr/xephi/authme/settings/NewSettingTest.java @@ -1,6 +1,8 @@ -package fr.xephi.authme.settings.custom; +package fr.xephi.authme.settings; +import fr.xephi.authme.settings.NewSetting; import fr.xephi.authme.settings.domain.Property; +import fr.xephi.authme.settings.properties.TestConfiguration; import org.bukkit.configuration.file.YamlConfiguration; import org.junit.Test; import org.mockito.invocation.InvocationOnMock; diff --git a/src/test/java/fr/xephi/authme/settings/custom/SettingsClassConsistencyTest.java b/src/test/java/fr/xephi/authme/settings/properties/SettingsClassConsistencyTest.java similarity index 98% rename from src/test/java/fr/xephi/authme/settings/custom/SettingsClassConsistencyTest.java rename to src/test/java/fr/xephi/authme/settings/properties/SettingsClassConsistencyTest.java index a6b67763..07510334 100644 --- a/src/test/java/fr/xephi/authme/settings/custom/SettingsClassConsistencyTest.java +++ b/src/test/java/fr/xephi/authme/settings/properties/SettingsClassConsistencyTest.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.settings.custom; +package fr.xephi.authme.settings.properties; import fr.xephi.authme.ReflectionTestUtils; import fr.xephi.authme.settings.domain.Property; @@ -25,7 +25,7 @@ import static org.junit.Assert.fail; */ public class SettingsClassConsistencyTest { - private static final String SETTINGS_FOLDER = "src/main/java/fr/xephi/authme/settings/custom"; + private static final String SETTINGS_FOLDER = "src/main/java/fr/xephi/authme/settings/properties"; private static List> classes; @BeforeClass diff --git a/src/test/java/fr/xephi/authme/settings/custom/TestConfiguration.java b/src/test/java/fr/xephi/authme/settings/properties/TestConfiguration.java similarity index 91% rename from src/test/java/fr/xephi/authme/settings/custom/TestConfiguration.java rename to src/test/java/fr/xephi/authme/settings/properties/TestConfiguration.java index 5f43262c..449627f2 100644 --- a/src/test/java/fr/xephi/authme/settings/custom/TestConfiguration.java +++ b/src/test/java/fr/xephi/authme/settings/properties/TestConfiguration.java @@ -1,4 +1,4 @@ -package fr.xephi.authme.settings.custom; +package fr.xephi.authme.settings.properties; import fr.xephi.authme.settings.domain.Property; import fr.xephi.authme.settings.domain.PropertyType; @@ -11,7 +11,7 @@ import static fr.xephi.authme.settings.domain.Property.newProperty; /** * Sample properties for testing purposes. */ -class TestConfiguration implements SettingsClass { +public final class TestConfiguration implements SettingsClass { public static final Property DURATION_IN_SECONDS = newProperty("test.duration", 4); @@ -43,4 +43,8 @@ class TestConfiguration implements SettingsClass { public static final Property> COOL_OPTIONS = newProperty(PropertyType.STRING_LIST, "features.cool.options", "Sparks", "Sprinkles"); + + private TestConfiguration() { + } + }