Close #449 Rename NewSetting class to Settings :)

src/test/java/fr/xephi/authme/AntiBotTest.java

@@ -4,7 +4,7 @@ import fr.xephi.authme.output.MessageKey;
 import fr.xephi.authme.output.Messages;
 import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.permission.PlayerStatePermission;
-import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.ProtectionSettings;
 import fr.xephi.authme.util.BukkitService;
 import org.bukkit.entity.Player;
@@ -41,7 +41,7 @@ import static org.mockito.Mockito.verify;
 public class AntiBotTest {
 
     @Mock
-    private NewSetting settings;
+    private Settings settings;
     @Mock
     private Messages messages;
     @Mock

src/test/java/fr/xephi/authme/AuthMeInitializationTest.java

@@ -12,7 +12,7 @@ import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.process.Management;
 import fr.xephi.authme.process.login.ProcessSyncPlayerLogin;
 import fr.xephi.authme.security.PasswordSecurity;
-import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.task.purge.PurgeService;
 import org.bukkit.Bukkit;
 import org.bukkit.Server;
@@ -92,7 +92,7 @@ public class AuthMeInitializationTest {
     @Test
     public void shouldInitializeAllServices() {
         // given
-        NewSetting settings = new NewSetting(settingsFile, dataFolder, getAllPropertyFields(), alwaysFulfilled());
+        Settings settings = new Settings(settingsFile, dataFolder, getAllPropertyFields(), alwaysFulfilled());
 
         // TODO ljacqu 20160619: At some point setting the "plugin" field should no longer be necessary
         // We only require it right now because of usages of AuthMe#getInstance()
@@ -104,7 +104,7 @@ public class AuthMeInitializationTest {
         injector.register(PluginManager.class, pluginManager);
 
         injector.register(AuthMe.class, authMe);
-        injector.register(NewSetting.class, settings);
+        injector.register(Settings.class, settings);
         injector.register(DataSource.class, mock(DataSource.class));
 
         // when

src/test/java/fr/xephi/authme/ConsoleLoggerTest.java

@@ -1,7 +1,7 @@
 package fr.xephi.authme;
 
 import fr.xephi.authme.output.LogLevel;
-import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.PluginSettings;
 import fr.xephi.authme.settings.properties.SecuritySettings;
 import fr.xephi.authme.util.StringUtils;
@@ -45,7 +45,7 @@ public class ConsoleLoggerTest {
     private Logger logger;
 
     @Mock
-    private NewSetting settings;
+    private Settings settings;
 
     @Rule
     public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -144,8 +144,8 @@ public class ConsoleLoggerTest {
         TestHelper.validateHasOnlyPrivateEmptyConstructor(ConsoleLogger.class);
     }
 
-    private static NewSetting newSettings(boolean logToFile, LogLevel logLevel) {
-        NewSetting settings = mock(NewSetting.class);
+    private static Settings newSettings(boolean logToFile, LogLevel logLevel) {
+        Settings settings = mock(Settings.class);
         given(settings.getProperty(SecuritySettings.USE_LOGGING)).willReturn(logToFile);
         given(settings.getProperty(PluginSettings.LOG_LEVEL)).willReturn(logLevel);
         return settings;

src/test/java/fr/xephi/authme/cache/CaptchaManagerTest.java

@@ -1,7 +1,7 @@
 package fr.xephi.authme.cache;
 
 import fr.xephi.authme.ReflectionTestUtils;
-import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.SecuritySettings;
 import org.junit.Test;
 
@@ -21,7 +21,7 @@ public class CaptchaManagerTest {
     @Test
     public void shouldAddCounts() {
         // given
-        NewSetting settings = mockSettings(3, 4);
+        Settings settings = mockSettings(3, 4);
         CaptchaManager manager = new CaptchaManager(settings);
         String player = "tester";
 
@@ -41,7 +41,7 @@ public class CaptchaManagerTest {
     public void shouldCreateAndCheckCaptcha() {
         // given
         String player = "Miner";
-        NewSetting settings = mockSettings(1, 4);
+        Settings settings = mockSettings(1, 4);
         CaptchaManager manager = new CaptchaManager(settings);
         String captchaCode = manager.getCaptchaCodeOrGenerateNew(player);
 
@@ -66,7 +66,7 @@ public class CaptchaManagerTest {
     public void shouldHaveSameCodeAfterGeneration() {
         // given
         String player = "Tester";
-        NewSetting settings = mockSettings(1, 5);
+        Settings settings = mockSettings(1, 5);
         CaptchaManager manager = new CaptchaManager(settings);
 
         // when
@@ -88,7 +88,7 @@ public class CaptchaManagerTest {
     public void shouldIncreaseAndResetCount() {
         // given
         String player = "plaYer";
-        NewSetting settings = mockSettings(2, 3);
+        Settings settings = mockSettings(2, 3);
         CaptchaManager manager = new CaptchaManager(settings);
 
         // when
@@ -111,7 +111,7 @@ public class CaptchaManagerTest {
     public void shouldNotIncreaseCountForDisabledCaptcha() {
         // given
         String player = "someone_";
-        NewSetting settings = mockSettings(1, 3);
+        Settings settings = mockSettings(1, 3);
         given(settings.getProperty(SecuritySettings.USE_CAPTCHA)).willReturn(false);
         CaptchaManager manager = new CaptchaManager(settings);
 
@@ -127,7 +127,7 @@ public class CaptchaManagerTest {
     public void shouldNotCheckCountIfCaptchaIsDisabled() {
         // given
         String player = "Robert001";
-        NewSetting settings = mockSettings(1, 5);
+        Settings settings = mockSettings(1, 5);
         CaptchaManager manager = new CaptchaManager(settings);
         given(settings.getProperty(SecuritySettings.USE_CAPTCHA)).willReturn(false);
 
@@ -144,8 +144,8 @@ public class CaptchaManagerTest {
         assertThat(result, equalTo(false));
     }
 
-    private static NewSetting mockSettings(int maxTries, int captchaLength) {
-        NewSetting settings = mock(NewSetting.class);
+    private static Settings mockSettings(int maxTries, int captchaLength) {
+        Settings settings = mock(Settings.class);
         given(settings.getProperty(SecuritySettings.USE_CAPTCHA)).willReturn(true);
         given(settings.getProperty(SecuritySettings.MAX_LOGIN_TRIES_BEFORE_CAPTCHA)).willReturn(maxTries);
         given(settings.getProperty(SecuritySettings.CAPTCHA_LENGTH)).willReturn(captchaLength);

src/test/java/fr/xephi/authme/cache/SessionManagerTest.java

@@ -1,7 +1,7 @@
 package fr.xephi.authme.cache;
 
 import fr.xephi.authme.ReflectionTestUtils;
-import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.PluginSettings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -24,7 +24,7 @@ public class SessionManagerTest {
     @Test
     public void shouldHaveSession() {
         // given
-        NewSetting settings = mockSettings(true, 10);
+        Settings settings = mockSettings(true, 10);
         SessionManager manager = new SessionManager(settings);
         String player = "playah";
 
@@ -38,7 +38,7 @@ public class SessionManagerTest {
     @Test
     public void shouldNotHaveSession() {
         // given
-        NewSetting settings = mockSettings(true, 10);
+        Settings settings = mockSettings(true, 10);
         SessionManager manager = new SessionManager(settings);
         String player = "playah";
 
@@ -49,7 +49,7 @@ public class SessionManagerTest {
     @Test
     public void shouldNotAddSessionBecauseDisabled() {
         // given
-        NewSetting settings = mockSettings(false, 10);
+        Settings settings = mockSettings(false, 10);
         SessionManager manager = new SessionManager(settings);
         String player = "playah";
 
@@ -63,7 +63,7 @@ public class SessionManagerTest {
     @Test
     public void shouldNotAddSessionBecauseTimeoutIsZero() {
         // given
-        NewSetting settings = mockSettings(true, 0);
+        Settings settings = mockSettings(true, 0);
         SessionManager manager = new SessionManager(settings);
         String player = "playah";
 
@@ -77,7 +77,7 @@ public class SessionManagerTest {
     @Test
     public void shouldRemoveSession() {
         // given
-        NewSetting settings = mockSettings(true, 10);
+        Settings settings = mockSettings(true, 10);
         String player = "user";
         SessionManager manager = new SessionManager(settings);
         manager.addSession(player);
@@ -93,7 +93,7 @@ public class SessionManagerTest {
     public void shouldDenySessionIfTimeoutHasExpired() {
         // given
         int timeout = 20;
-        NewSetting settings = mockSettings(true, timeout);
+        Settings settings = mockSettings(true, timeout);
         String player = "patrick";
         SessionManager manager = new SessionManager(settings);
         Map<String, Long> sessions = getSessionsMap(manager);
@@ -110,7 +110,7 @@ public class SessionManagerTest {
     @Test
     public void shouldClearAllSessionsAfterDisable() {
         // given
-        NewSetting settings = mockSettings(true, 10);
+        Settings settings = mockSettings(true, 10);
         SessionManager manager = new SessionManager(settings);
         manager.addSession("player01");
         manager.addSession("player02");
@@ -129,8 +129,8 @@ public class SessionManagerTest {
     }
 
 
-    private static NewSetting mockSettings(boolean isEnabled, int sessionTimeout) {
-        NewSetting settings = mock(NewSetting.class);
+    private static Settings mockSettings(boolean isEnabled, int sessionTimeout) {
+        Settings settings = mock(Settings.class);
         given(settings.getProperty(PluginSettings.SESSIONS_ENABLED)).willReturn(isEnabled);
         given(settings.getProperty(PluginSettings.SESSIONS_TIMEOUT)).willReturn(sessionTimeout);
         return settings;

src/test/java/fr/xephi/authme/cache/TempbanManagerTest.java

@@ -4,7 +4,7 @@ import fr.xephi.authme.ReflectionTestUtils;
 import fr.xephi.authme.TestHelper;
 import fr.xephi.authme.output.MessageKey;
 import fr.xephi.authme.output.Messages;
-import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.SecuritySettings;
 import fr.xephi.authme.util.BukkitService;
 import org.bukkit.entity.Player;
@@ -44,7 +44,7 @@ public class TempbanManagerTest {
     @Test
     public void shouldAddCounts() {
         // given
-        NewSetting settings = mockSettings(3, 60);
+        Settings settings = mockSettings(3, 60);
         TempbanManager manager = new TempbanManager(bukkitService, messages, settings);
         String address = "192.168.1.1";
 
@@ -64,7 +64,7 @@ public class TempbanManagerTest {
     public void shouldIncreaseAndResetCount() {
         // given
         String address = "192.168.1.2";
-        NewSetting settings = mockSettings(3, 60);
+        Settings settings = mockSettings(3, 60);
         TempbanManager manager = new TempbanManager(bukkitService, messages, settings);
 
         // when
@@ -88,7 +88,7 @@ public class TempbanManagerTest {
     public void shouldNotIncreaseCountForDisabledTempban() {
         // given
         String address = "192.168.1.3";
-        NewSetting settings = mockSettings(1, 5);
+        Settings settings = mockSettings(1, 5);
         given(settings.getProperty(SecuritySettings.TEMPBAN_ON_MAX_LOGINS)).willReturn(false);
         TempbanManager manager = new TempbanManager(bukkitService, messages, settings);
 
@@ -104,7 +104,7 @@ public class TempbanManagerTest {
     public void shouldNotCheckCountIfTempbanIsDisabled() {
         // given
         String address = "192.168.1.4";
-        NewSetting settings = mockSettings(1, 5);
+        Settings settings = mockSettings(1, 5);
         TempbanManager manager = new TempbanManager(bukkitService, messages, settings);
         given(settings.getProperty(SecuritySettings.TEMPBAN_ON_MAX_LOGINS)).willReturn(false);
 
@@ -124,7 +124,7 @@ public class TempbanManagerTest {
     @Test
     public void shouldNotIssueBanIfDisabled() {
         // given
-        NewSetting settings = mockSettings(0, 0);
+        Settings settings = mockSettings(0, 0);
         given(settings.getProperty(SecuritySettings.TEMPBAN_ON_MAX_LOGINS)).willReturn(false);
         Player player = mock(Player.class);
         TempbanManager manager = new TempbanManager(bukkitService, messages, settings);
@@ -144,7 +144,7 @@ public class TempbanManagerTest {
         TestHelper.mockPlayerIp(player, ip);
         String banReason = "IP ban too many logins";
         given(messages.retrieveSingle(MessageKey.TEMPBAN_MAX_LOGINS)).willReturn(banReason);
-        NewSetting settings = mockSettings(2, 100);
+        Settings settings = mockSettings(2, 100);
         TempbanManager manager = new TempbanManager(bukkitService, messages, settings);
 
         // when
@@ -171,7 +171,7 @@ public class TempbanManagerTest {
         TestHelper.mockPlayerIp(player, ip);
         String banReason = "kick msg";
         given(messages.retrieveSingle(MessageKey.TEMPBAN_MAX_LOGINS)).willReturn(banReason);
-        NewSetting settings = mockSettings(10, 60);
+        Settings settings = mockSettings(10, 60);
         TempbanManager manager = new TempbanManager(bukkitService, messages, settings);
         manager.increaseCount(ip);
         manager.increaseCount(ip);
@@ -186,8 +186,8 @@ public class TempbanManagerTest {
         assertHasCount(manager, ip, null);
     }
 
-    private static NewSetting mockSettings(int maxTries, int tempbanLength) {
-        NewSetting settings = mock(NewSetting.class);
+    private static Settings mockSettings(int maxTries, int tempbanLength) {
+        Settings settings = mock(Settings.class);
         given(settings.getProperty(SecuritySettings.TEMPBAN_ON_MAX_LOGINS)).willReturn(true);
         given(settings.getProperty(SecuritySettings.MAX_LOGIN_TEMPBAN)).willReturn(maxTries);
         given(settings.getProperty(SecuritySettings.TEMPBAN_LENGTH)).willReturn(tempbanLength);

src/test/java/fr/xephi/authme/cache/limbo/LimboCacheTest.java

@@ -3,7 +3,7 @@ package fr.xephi.authme.cache.limbo;
 import fr.xephi.authme.ReflectionTestUtils;
 import fr.xephi.authme.cache.backup.PlayerDataStorage;
 import fr.xephi.authme.permission.PermissionsManager;
-import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.SpawnLoader;
 import fr.xephi.authme.settings.properties.PluginSettings;
 import org.bukkit.Location;
@@ -35,7 +35,7 @@ public class LimboCacheTest {
     private LimboCache limboCache;
 
     @Mock
-    private NewSetting settings;
+    private Settings settings;
 
     @Mock
     private PermissionsManager permissionsManager;

src/test/java/fr/xephi/authme/command/CommandServiceTest.java

@@ -2,7 +2,7 @@ package fr.xephi.authme.command;
 
 import fr.xephi.authme.output.MessageKey;
 import fr.xephi.authme.output.Messages;
-import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.domain.Property;
 import fr.xephi.authme.settings.properties.SecuritySettings;
 import fr.xephi.authme.util.ValidationService;
@@ -31,7 +31,7 @@ public class CommandServiceTest {
     @Mock
     private Messages messages;
     @Mock
-    private NewSetting settings;
+    private Settings settings;
     @Mock
     private ValidationService validationService;
 
@@ -91,7 +91,7 @@ public class CommandServiceTest {
     @Test
     public void shouldReturnSettings() {
         // given/when
-        NewSetting result = commandService.getSettings();
+        Settings result = commandService.getSettings();
 
         // then
         assertThat(result, equalTo(settings));

src/test/java/fr/xephi/authme/command/executable/authme/ReloadCommandTest.java

@@ -10,7 +10,7 @@ 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.settings.NewSetting;
+import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.DatabaseSettings;
 import fr.xephi.authme.settings.properties.PluginSettings;
 import fr.xephi.authme.settings.properties.SecuritySettings;
@@ -53,7 +53,7 @@ public class ReloadCommandTest {
     private Injector injector;
 
     @Mock
-    private NewSetting settings;
+    private Settings settings;
 
     @Mock
     private DataSource dataSource;

src/test/java/fr/xephi/authme/command/help/HelpProviderTest.java

@@ -6,7 +6,7 @@ import fr.xephi.authme.command.FoundResultStatus;
 import fr.xephi.authme.command.TestCommandsUtil;
 import fr.xephi.authme.permission.AdminPermission;
 import fr.xephi.authme.permission.PermissionsManager;
-import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.PluginSettings;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
@@ -57,7 +57,7 @@ public class HelpProviderTest {
     @Before
     public void setUpHelpProvider() {
         permissionsManager = mock(PermissionsManager.class);
-        NewSetting settings = mock(NewSetting.class);
+        Settings settings = mock(Settings.class);
         given(settings.getProperty(PluginSettings.HELP_HEADER)).willReturn(HELP_HEADER);
         helpProvider = new HelpProvider(permissionsManager, settings);
         sender = mock(CommandSender.class);

src/test/java/fr/xephi/authme/converter/CrazyLoginConverterTest.java

@@ -6,7 +6,7 @@ import fr.xephi.authme.TestHelper;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.initialization.DataFolder;
-import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.ConverterSettings;
 import org.bukkit.command.CommandSender;
 import org.junit.BeforeClass;
@@ -42,7 +42,7 @@ public class CrazyLoginConverterTest {
     private DataSource dataSource;
 
     @Mock
-    private NewSetting settings;
+    private Settings settings;
 
     @DataFolder
     private File dataFolder = TestHelper.getJarFile(TestHelper.PROJECT_ROOT + "converter/");

src/test/java/fr/xephi/authme/datasource/AbstractResourceClosingTest.java

@@ -8,7 +8,7 @@ import fr.xephi.authme.TestHelper;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.security.HashAlgorithm;
 import fr.xephi.authme.security.crypts.HashedPassword;
-import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.domain.Property;
 import fr.xephi.authme.settings.properties.SecuritySettings;
 import org.junit.Before;
@@ -72,7 +72,7 @@ public abstract class AbstractResourceClosingTest {
     private static final Map<String, HashAlgorithm[]> CUSTOM_ALGORITHMS = getCustomAlgorithmList();
 
     /** Mock of a settings instance. */
-    private static NewSetting settings;
+    private static Settings settings;
 
     /** The datasource to test. */
     private DataSource dataSource;
@@ -101,7 +101,7 @@ public abstract class AbstractResourceClosingTest {
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @BeforeClass
     public static void initializeSettings() throws IOException, ClassNotFoundException {
-        settings = mock(NewSetting.class);
+        settings = mock(Settings.class);
         given(settings.getProperty(any(Property.class))).willAnswer(new Answer() {
             @Override
             public Object answer(InvocationOnMock invocation) {
@@ -152,7 +152,7 @@ public abstract class AbstractResourceClosingTest {
     }
 
     /* Create a DataSource instance with the given mock settings and mock connection. */
-    protected abstract DataSource createDataSource(NewSetting settings, Connection connection) throws Exception;
+    protected abstract DataSource createDataSource(Settings settings, Connection connection) throws Exception;
 
     /* Get all methods of the DataSource interface, minus the ones in the ignored list. */
     private static List<Method> getDataSourceMethods() {

src/test/java/fr/xephi/authme/datasource/MySqlIntegrationTest.java

@@ -3,7 +3,7 @@ package fr.xephi.authme.datasource;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 import fr.xephi.authme.TestHelper;
-import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.domain.Property;
 import fr.xephi.authme.settings.properties.DatabaseSettings;
 import org.junit.After;
@@ -29,7 +29,7 @@ import static org.mockito.Mockito.when;
 public class MySqlIntegrationTest extends AbstractDataSourceIntegrationTest {
 
     /** Mock of a settings instance. */
-    private static NewSetting settings;
+    private static Settings settings;
     /** SQL statement to execute before running a test. */
     private static String sqlInitialize;
     /** Connection to the H2 test database. */
@@ -44,7 +44,7 @@ public class MySqlIntegrationTest extends AbstractDataSourceIntegrationTest {
         // Check that we have an H2 driver
         Class.forName("org.h2.jdbcx.JdbcDataSource");
 
-        settings = mock(NewSetting.class);
+        settings = mock(Settings.class);
         when(settings.getProperty(any(Property.class))).thenAnswer(new Answer() {
             @Override
             public Object answer(InvocationOnMock invocation) throws Throwable {

src/test/java/fr/xephi/authme/datasource/MySqlResourceClosingTest.java

@@ -2,7 +2,7 @@ package fr.xephi.authme.datasource;
 
 import com.zaxxer.hikari.HikariDataSource;
 import fr.xephi.authme.security.HashAlgorithm;
-import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.Settings;
 
 import java.lang.reflect.Method;
 import java.sql.Connection;
@@ -20,7 +20,7 @@ public class MySqlResourceClosingTest extends AbstractResourceClosingTest {
     }
 
     @Override
-    protected DataSource createDataSource(NewSetting settings, Connection connection) throws Exception {
+    protected DataSource createDataSource(Settings settings, Connection connection) throws Exception {
         HikariDataSource hikariDataSource = mock(HikariDataSource.class);
         given(hikariDataSource.getConnection()).willReturn(connection);
         return new MySQL(settings, hikariDataSource);

src/test/java/fr/xephi/authme/datasource/SQLiteIntegrationTest.java

@@ -2,7 +2,7 @@ package fr.xephi.authme.datasource;
 
 import fr.xephi.authme.TestHelper;
 import fr.xephi.authme.cache.auth.PlayerAuth;
-import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.domain.Property;
 import fr.xephi.authme.settings.properties.DatabaseSettings;
 import org.junit.After;
@@ -32,7 +32,7 @@ import static org.mockito.Mockito.when;
 public class SQLiteIntegrationTest extends AbstractDataSourceIntegrationTest {
 
     /** Mock of a settings instance. */
-    private static NewSetting settings;
+    private static Settings settings;
     /** Collection of SQL statements to execute for initialization of a test. */
     private static String[] sqlInitialize;
     /** Connection to the SQLite test database. */
@@ -47,7 +47,7 @@ public class SQLiteIntegrationTest extends AbstractDataSourceIntegrationTest {
         // Check that we have an implementation for SQLite
         Class.forName("org.sqlite.JDBC");
 
-        settings = mock(NewSetting.class);
+        settings = mock(Settings.class);
         when(settings.getProperty(any(Property.class))).thenAnswer(new Answer() {
             @Override
             public Object answer(InvocationOnMock invocation) throws Throwable {

src/test/java/fr/xephi/authme/datasource/SQLiteResourceClosingTest.java

@@ -1,7 +1,7 @@
 package fr.xephi.authme.datasource;
 
 import fr.xephi.authme.security.HashAlgorithm;
-import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.Settings;
 
 import java.lang.reflect.Method;
 import java.sql.Connection;
@@ -16,7 +16,7 @@ public class SQLiteResourceClosingTest extends AbstractResourceClosingTest {
     }
 
     @Override
-    protected DataSource createDataSource(NewSetting settings, Connection connection) throws Exception {
+    protected DataSource createDataSource(Settings settings, Connection connection) throws Exception {
         return new SQLite(settings, connection);
     }
 

src/test/java/fr/xephi/authme/listener/ListenerServiceTest.java

@@ -6,7 +6,7 @@ import ch.jalu.injector.testing.InjectDelayed;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.hooks.PluginHooks;
-import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.RegistrationSettings;
 import fr.xephi.authme.util.ValidationService;
 import org.bukkit.entity.Entity;
@@ -35,7 +35,7 @@ public class ListenerServiceTest {
     private ListenerService listenerService;
 
     @Mock
-    private NewSetting settings;
+    private Settings settings;
 
     @Mock
     private DataSource dataSource;

src/test/java/fr/xephi/authme/listener/OnJoinVerifierTest.java

@@ -8,7 +8,7 @@ import fr.xephi.authme.output.MessageKey;
 import fr.xephi.authme.output.Messages;
 import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.permission.PlayerStatePermission;
-import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.RegistrationSettings;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
 import fr.xephi.authme.util.BukkitService;
@@ -53,7 +53,7 @@ public class OnJoinVerifierTest {
     private OnJoinVerifier onJoinVerifier;
 
     @Mock
-    private NewSetting settings;
+    private Settings settings;
     @Mock
     private DataSource dataSource;
     @Mock

src/test/java/fr/xephi/authme/output/MessagesIntegrationTest.java

@@ -2,7 +2,7 @@ package fr.xephi.authme.output;
 
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.TestHelper;
-import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.Settings;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.junit.Before;
@@ -53,7 +53,7 @@ public class MessagesIntegrationTest {
     @Before
     public void setUpMessages() {
         File testFile = TestHelper.getJarFile(YML_TEST_FILE);
-        NewSetting settings = mock(NewSetting.class);
+        Settings settings = mock(Settings.class);
         given(settings.getMessagesFile()).willReturn(testFile);
         given(settings.getDefaultMessagesFile()).willReturn(YML_DEFAULT_TEST_FILE);
         messages = new Messages(settings);
@@ -235,7 +235,7 @@ public class MessagesIntegrationTest {
     @Test
     public void shouldAllowNullAsDefaultFile() {
         // given
-        NewSetting settings = mock(NewSetting.class);
+        Settings settings = mock(Settings.class);
         given(settings.getMessagesFile()).willReturn(TestHelper.getJarFile(YML_TEST_FILE));
         Messages testMessages = new Messages(settings);
         // Key not present in test file
@@ -254,7 +254,7 @@ public class MessagesIntegrationTest {
         MessageKey key = MessageKey.WRONG_PASSWORD;
         // assumption: message comes back as defined in messages_test.yml
         assumeThat(messages.retrieveSingle(key), equalTo("§cWrong password!"));
-        NewSetting settings = mock(NewSetting.class);
+        Settings settings = mock(Settings.class);
         given(settings.getMessagesFile()).willReturn(TestHelper.getJarFile(
             TestHelper.PROJECT_ROOT + "output/messages_test2.yml"));
 

src/test/java/fr/xephi/authme/process/ProcessServiceTest.java

@@ -7,7 +7,7 @@ import fr.xephi.authme.permission.AuthGroupType;
 import fr.xephi.authme.permission.PermissionNode;
 import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.permission.PlayerPermission;
-import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.SecuritySettings;
 import fr.xephi.authme.util.ValidationService;
 import org.bukkit.command.CommandSender;
@@ -37,7 +37,7 @@ public class ProcessServiceTest {
     private ValidationService validationService;
 
     @Mock
-    private NewSetting settings;
+    private Settings settings;
 
     @Mock
     private Messages messages;
@@ -64,7 +64,7 @@ public class ProcessServiceTest {
     @Test
     public void shouldReturnSettings() {
         // given/when
-        NewSetting result = processService.getSettings();
+        Settings result = processService.getSettings();
 
         // then
         assertThat(result, equalTo(settings));

src/test/java/fr/xephi/authme/security/HashAlgorithmIntegrationTest.java

@@ -4,7 +4,7 @@ import ch.jalu.injector.Injector;
 import ch.jalu.injector.InjectorBuilder;
 import fr.xephi.authme.security.crypts.EncryptionMethod;
 import fr.xephi.authme.security.crypts.HashedPassword;
-import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.HooksSettings;
 import fr.xephi.authme.settings.properties.SecuritySettings;
 import fr.xephi.authme.util.StringUtils;
@@ -29,11 +29,11 @@ public class HashAlgorithmIntegrationTest {
 
     @BeforeClass
     public static void setUpConfigAndInjector() {
-        NewSetting settings = mock(NewSetting.class);
+        Settings settings = mock(Settings.class);
         given(settings.getProperty(HooksSettings.BCRYPT_LOG2_ROUND)).willReturn(8);
         given(settings.getProperty(SecuritySettings.DOUBLE_MD5_SALT_LENGTH)).willReturn(16);
         injector = new InjectorBuilder().addDefaultHandlers("fr.xephi.authme").create();
-        injector.register(NewSetting.class, settings);
+        injector.register(Settings.class, settings);
     }
 
     @Test

src/test/java/fr/xephi/authme/security/PasswordSecurityTest.java

@@ -9,7 +9,7 @@ import fr.xephi.authme.events.PasswordEncryptionEvent;
 import fr.xephi.authme.security.crypts.EncryptionMethod;
 import fr.xephi.authme.security.crypts.HashedPassword;
 import fr.xephi.authme.security.crypts.JOOMLA;
-import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.HooksSettings;
 import fr.xephi.authme.settings.properties.SecuritySettings;
 import org.bukkit.event.Event;
@@ -45,7 +45,7 @@ public class PasswordSecurityTest {
     private Injector injector;
 
     @Mock
-    private NewSetting settings;
+    private Settings settings;
 
     @Mock
     private PluginManager pluginManager;
@@ -81,7 +81,7 @@ public class PasswordSecurityTest {
             }
         }).when(pluginManager).callEvent(any(Event.class));
         injector = new InjectorBuilder().addDefaultHandlers("!! impossible package !!").create();
-        injector.register(NewSetting.class, settings);
+        injector.register(Settings.class, settings);
         injector.register(DataSource.class, dataSource);
         injector.register(PluginManager.class, pluginManager);
     }

src/test/java/fr/xephi/authme/security/crypts/BcryptTest.java

@@ -1,7 +1,7 @@
 package fr.xephi.authme.security.crypts;
 
 import fr.xephi.authme.TestHelper;
-import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.HooksSettings;
 import org.junit.BeforeClass;
 
@@ -27,8 +27,8 @@ public class BcryptTest extends AbstractEncryptionMethodTest {
         );
     }
 
-    private static NewSetting mockSettings() {
-        NewSetting settings = mock(NewSetting.class);
+    private static Settings mockSettings() {
+        Settings settings = mock(Settings.class);
         given(settings.getProperty(HooksSettings.BCRYPT_LOG2_ROUND)).willReturn(8);
         return settings;
     }

src/test/java/fr/xephi/authme/security/crypts/SALTED2MD5Test.java

@@ -1,6 +1,6 @@
 package fr.xephi.authme.security.crypts;
 
-import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.SecuritySettings;
 
 import static org.mockito.BDDMockito.given;
@@ -19,8 +19,8 @@ public class SALTED2MD5Test extends AbstractEncryptionMethodTest {
             new HashedPassword("ad25606eae5b760c8a2469d65578ac39", "04eee598")); // âË_3(íù*)
     }
 
-    private static NewSetting mockSettings() {
-        NewSetting settings = mock(NewSetting.class);
+    private static Settings mockSettings() {
+        Settings settings = mock(Settings.class);
         given(settings.getProperty(SecuritySettings.DOUBLE_MD5_SALT_LENGTH)).willReturn(8);
         return settings;
     }

src/test/java/fr/xephi/authme/settings/ConfigFileConsistencyTest.java

@@ -23,7 +23,7 @@ import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 
 /**
- * Test for {@link NewSetting} and the project's config.yml,
+ * Test for {@link Settings} and the project's config.yml,
  * verifying that no settings are missing from the file.
  */
 public class ConfigFileConsistencyTest {

src/test/java/fr/xephi/authme/settings/SettingsIntegrationTest.java

@@ -27,9 +27,9 @@ import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;
 
 /**
- * Integration test for {@link NewSetting}.
+ * Integration test for {@link Settings}.
  */
-public class NewSettingIntegrationTest {
+public class SettingsIntegrationTest {
 
     /** File name of the sample config including all {@link TestConfiguration} values. */
     private static final String COMPLETE_FILE = TestHelper.PROJECT_ROOT + "settings/config-sample-values.yml";
@@ -63,7 +63,7 @@ public class NewSettingIntegrationTest {
         File newFile = temporaryFolder.newFile();
 
         // when / then
-        NewSetting settings = new NewSetting(configuration, newFile, testPluginFolder, propertyMap,
+        Settings settings = new Settings(configuration, newFile, testPluginFolder, propertyMap,
             checkAllPropertiesPresent());
         Map<Property<?>, Object> expectedValues = ImmutableMap.<Property<?>, Object>builder()
             .put(TestConfiguration.DURATION_IN_SECONDS, 22)
@@ -90,13 +90,13 @@ public class NewSettingIntegrationTest {
         File file = copyFileFromResources(INCOMPLETE_FILE);
         YamlConfiguration configuration = YamlConfiguration.loadConfiguration(file);
         // Expectation: File is rewritten to since it does not have all configurations
-        new NewSetting(configuration, file, testPluginFolder, propertyMap, checkAllPropertiesPresent());
+        new Settings(configuration, file, testPluginFolder, propertyMap, checkAllPropertiesPresent());
 
         // Load the settings again -> checks that what we wrote can be loaded again
         configuration = YamlConfiguration.loadConfiguration(file);
 
         // then
-        NewSetting settings = new NewSetting(configuration, file, testPluginFolder, propertyMap,
+        Settings settings = new Settings(configuration, file, testPluginFolder, propertyMap,
             checkAllPropertiesPresent());
         Map<Property<?>, Object> expectedValues = ImmutableMap.<Property<?>, Object>builder()
             .put(TestConfiguration.DURATION_IN_SECONDS, 22)
@@ -133,14 +133,14 @@ public class NewSettingIntegrationTest {
         }
 
         // when
-        new NewSetting(configuration, file, testPluginFolder, propertyMap, checkAllPropertiesPresent());
+        new Settings(configuration, file, testPluginFolder, propertyMap, checkAllPropertiesPresent());
         // reload the file as settings should have been rewritten
         configuration = YamlConfiguration.loadConfiguration(file);
 
         // then
         // assert that we won't rewrite the settings again! One rewrite should produce a valid, complete configuration
         File unusedFile = new File("config-difficult-values.unused.yml");
-        NewSetting settings = new NewSetting(configuration, unusedFile, testPluginFolder, propertyMap,
+        Settings settings = new Settings(configuration, unusedFile, testPluginFolder, propertyMap,
             checkAllPropertiesPresent());
         assertThat(unusedFile.exists(), equalTo(false));
         assertThat(configuration.contains(TestConfiguration.DUST_LEVEL.getPath()), equalTo(true));
@@ -171,7 +171,7 @@ public class NewSettingIntegrationTest {
         // given
         YamlConfiguration configuration = YamlConfiguration.loadConfiguration(temporaryFolder.newFile());
         File fullConfigFile = copyFileFromResources(COMPLETE_FILE);
-        NewSetting settings = new NewSetting(configuration, fullConfigFile, testPluginFolder, propertyMap,
+        Settings settings = new Settings(configuration, fullConfigFile, testPluginFolder, propertyMap,
             TestSettingsMigrationServices.alwaysFulfilled());
 
         // when

src/test/java/fr/xephi/authme/settings/SettingsTest.java

@@ -38,9 +38,9 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 /**
- * Unit tests for {@link NewSetting}.
+ * Unit tests for {@link Settings}.
  */
-public class NewSettingTest {
+public class SettingsTest {
 
     @Rule
     public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -71,7 +71,7 @@ public class NewSettingTest {
         setReturnValue(configuration, TestConfiguration.SYSTEM_NAME, "myTestSys");
 
         // when / then
-        NewSetting settings = new NewSetting(configuration, null, null, null, null);
+        Settings settings = new Settings(configuration, null, null, null, null);
 
         assertThat(settings.getProperty(TestConfiguration.VERSION_NUMBER), equalTo(20));
         assertThat(settings.getProperty(TestConfiguration.SKIP_BORING_FEATURES), equalTo(true));
@@ -87,7 +87,7 @@ public class NewSettingTest {
     public void shouldReturnDefaultFile() throws IOException {
         // given
         YamlConfiguration configuration = mock(YamlConfiguration.class);
-        NewSetting settings = new NewSetting(configuration, null, null, null, null);
+        Settings settings = new Settings(configuration, null, null, null, null);
 
         // when
         String defaultFile = settings.getDefaultMessagesFile();
@@ -103,7 +103,7 @@ public class NewSettingTest {
     public void shouldSetProperty() {
         // given
         YamlConfiguration configuration = mock(YamlConfiguration.class);
-        NewSetting settings = new NewSetting(configuration, null, null, null, null);
+        Settings settings = new Settings(configuration, null, null, null, null);
 
         // when
         settings.setProperty(TestConfiguration.DUST_LEVEL, -4);
@@ -123,7 +123,7 @@ public class NewSettingTest {
         YamlConfiguration configuration = mock(YamlConfiguration.class);
         given(configuration.contains(anyString())).willReturn(true);
         setReturnValue(configuration, MESSAGES_LANGUAGE, languageCode);
-        NewSetting settings = new NewSetting(configuration, null, testPluginFolder,
+        Settings settings = new Settings(configuration, null, testPluginFolder,
             TestConfiguration.generatePropertyMap(), TestSettingsMigrationServices.alwaysFulfilled());
 
         // when
@@ -140,7 +140,7 @@ public class NewSettingTest {
         YamlConfiguration configuration = mock(YamlConfiguration.class);
         given(configuration.contains(anyString())).willReturn(true);
         setReturnValue(configuration, MESSAGES_LANGUAGE, "doesntexist");
-        NewSetting settings = new NewSetting(configuration, null, testPluginFolder,
+        Settings settings = new Settings(configuration, null, testPluginFolder,
             TestConfiguration.generatePropertyMap(), TestSettingsMigrationServices.alwaysFulfilled());
 
         // when
@@ -161,7 +161,7 @@ public class NewSettingTest {
 
         YamlConfiguration configuration = mock(YamlConfiguration.class);
         setReturnValue(configuration, RegistrationSettings.USE_WELCOME_MESSAGE, true);
-        NewSetting settings = new NewSetting(configuration, null, testPluginFolder,
+        Settings settings = new Settings(configuration, null, testPluginFolder,
             TestConfiguration.generatePropertyMap(), TestSettingsMigrationServices.alwaysFulfilled());
 
         // when
@@ -182,7 +182,7 @@ public class NewSettingTest {
         Files.write(emailFile.toPath(), emailMessage.getBytes());
 
         YamlConfiguration configuration = mock(YamlConfiguration.class);
-        NewSetting settings = new NewSetting(configuration, null, testPluginFolder,
+        Settings settings = new Settings(configuration, null, testPluginFolder,
             TestConfiguration.generatePropertyMap(), TestSettingsMigrationServices.alwaysFulfilled());
 
         // when
@@ -207,7 +207,7 @@ public class NewSettingTest {
         }
     }
 
-    private static void assertDefaultValue(Property<?> property, NewSetting setting) {
+    private static void assertDefaultValue(Property<?> property, Settings setting) {
         assertThat(property.getPath() + " has default value",
             setting.getProperty(property).equals(property.getDefaultValue()), equalTo(true));
     }

src/test/java/fr/xephi/authme/settings/SpawnLoaderTest.java

@@ -36,7 +36,7 @@ public class SpawnLoaderTest {
     private SpawnLoader spawnLoader;
 
     @Mock
-    private NewSetting settings;
+    private Settings settings;
 
     @Mock
     private DataSource dataSource;

src/test/java/fr/xephi/authme/task/PlayerDataTaskManagerTest.java

@@ -6,7 +6,7 @@ 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.settings.NewSetting;
+import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.RegistrationSettings;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
 import fr.xephi.authme.util.BukkitService;
@@ -40,7 +40,7 @@ public class PlayerDataTaskManagerTest {
     private Messages messages;
 
     @Mock
-    private NewSetting settings;
+    private Settings settings;
 
     @Mock
     private BukkitService bukkitService;

src/test/java/fr/xephi/authme/task/purge/PurgeServiceTest.java

@@ -4,7 +4,7 @@ import fr.xephi.authme.ReflectionTestUtils;
 import fr.xephi.authme.TestHelper;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.permission.PermissionsManager;
-import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.PurgeSettings;
 import fr.xephi.authme.util.BukkitService;
 import org.bukkit.OfflinePlayer;
@@ -57,7 +57,7 @@ public class PurgeServiceTest {
     @Mock
     private DataSource dataSource;
     @Mock
-    private NewSetting settings;
+    private Settings settings;
     @Mock
     private PermissionsManager permissionsManager;
     @Mock

src/test/java/fr/xephi/authme/util/MigrationServiceTest.java

@@ -6,7 +6,7 @@ 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.settings.NewSetting;
+import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.SecuritySettings;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -36,7 +36,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
 public class MigrationServiceTest {
 
     @Mock
-    private NewSetting settings;
+    private Settings settings;
 
     @Mock
     private DataSource dataSource;

src/test/java/fr/xephi/authme/util/TeleportationServiceTest.java

@@ -5,7 +5,7 @@ import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.cache.limbo.PlayerData;
 import fr.xephi.authme.events.FirstSpawnTeleportEvent;
 import fr.xephi.authme.events.SpawnTeleportEvent;
-import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.SpawnLoader;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
 import org.bukkit.Location;
@@ -46,7 +46,7 @@ public class TeleportationServiceTest {
     private TeleportationService teleportationService;
 
     @Mock
-    private NewSetting settings;
+    private Settings settings;
 
     @Mock
     private BukkitService bukkitService;

src/test/java/fr/xephi/authme/util/ValidationServiceTest.java

@@ -8,7 +8,7 @@ import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.output.MessageKey;
 import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.permission.PlayerStatePermission;
-import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.EmailSettings;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
 import fr.xephi.authme.settings.properties.SecuritySettings;
@@ -35,7 +35,7 @@ public class ValidationServiceTest {
     @InjectDelayed
     private ValidationService validationService;
     @Mock
-    private NewSetting settings;
+    private Settings settings;
     @Mock
     private DataSource dataSource;
     @Mock