Update to ConfigMe 1.2.0

pom.xml

@@ -643,7 +643,7 @@
         <dependency>
             <groupId>ch.jalu</groupId>
             <artifactId>configme</artifactId>
-            <version>1.1.0</version>
+            <version>1.2.0</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>

src/main/java/fr/xephi/authme/message/updater/MessageKeyConfigurationData.java

@@ -2,6 +2,7 @@ package fr.xephi.authme.message.updater;
 
 import ch.jalu.configme.configurationdata.ConfigurationDataImpl;
 import ch.jalu.configme.properties.Property;
+import ch.jalu.configme.properties.convertresult.PropertyValue;
 import ch.jalu.configme.resource.PropertyReader;
 import fr.xephi.authme.message.MessageKey;
 
@@ -23,9 +24,18 @@ public class MessageKeyConfigurationData extends ConfigurationDataImpl {
 
     @Override
     public void initializeValues(PropertyReader reader) {
-        getAllMessageProperties().stream()
+        for (Property<String> property : getAllMessageProperties()) {
-            .filter(prop -> prop.isPresent(reader))
+            PropertyValue<String> value = property.determineValue(reader);
-            .forEach(prop -> setValue(prop, prop.determineValue(reader)));
+            if (value.isValidInResource()) {
+                setValue(property, value.getValue());
+            }
+        }
+    }
+
+    @Override
+    public <T> T getValue(Property<T> property) {
+        // Override to silently return null if property is unknown
+        return (T) getValues().get(property.getPath());
     }
 
     @SuppressWarnings("unchecked")

src/main/java/fr/xephi/authme/message/updater/MessageMigraterPropertyReader.java

@@ -59,6 +59,11 @@ final class MessageMigraterPropertyReader implements PropertyReader {
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public Set<String> getChildKeys(String s) {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public Object getObject(String path) {
         if (path.isEmpty()) {

src/main/java/fr/xephi/authme/message/updater/MessageUpdater.java

@@ -4,6 +4,7 @@ import ch.jalu.configme.configurationdata.ConfigurationData;
 import ch.jalu.configme.configurationdata.PropertyListBuilder;
 import ch.jalu.configme.properties.Property;
 import ch.jalu.configme.properties.StringProperty;
+import ch.jalu.configme.properties.convertresult.ConvertErrorRecorder;
 import ch.jalu.configme.resource.PropertyReader;
 import ch.jalu.configme.resource.PropertyResource;
 import com.google.common.collect.ImmutableMap;
@@ -177,7 +178,7 @@ public class MessageUpdater {
         }
 
         @Override
-        protected String getFromReader(PropertyReader reader) {
+        protected String getFromReader(PropertyReader reader, ConvertErrorRecorder errorRecorder) {
             return reader.getString(getPath());
         }
     }

src/main/java/fr/xephi/authme/settings/EnumSetProperty.java

@@ -1,6 +1,7 @@
 package fr.xephi.authme.settings;
 
 import ch.jalu.configme.properties.BaseProperty;
+import ch.jalu.configme.properties.convertresult.ConvertErrorRecorder;
 import ch.jalu.configme.resource.PropertyReader;
 
 import java.util.Collection;
@@ -26,7 +27,7 @@ public class EnumSetProperty<E extends Enum<E>> extends BaseProperty<Set<E>> {
     }
 
     @Override
-    protected Set<E> getFromReader(PropertyReader reader) {
+    protected Set<E> getFromReader(PropertyReader reader, ConvertErrorRecorder errorRecorder) {
         Object entry = reader.getObject(getPath());
         if (entry instanceof Collection<?>) {
             return ((Collection<?>) entry).stream()

src/main/java/fr/xephi/authme/settings/SettingsMigrationService.java

@@ -3,6 +3,7 @@ package fr.xephi.authme.settings;
 import ch.jalu.configme.configurationdata.ConfigurationData;
 import ch.jalu.configme.migration.PlainMigrationService;
 import ch.jalu.configme.properties.Property;
+import ch.jalu.configme.properties.convertresult.PropertyValue;
 import ch.jalu.configme.resource.PropertyReader;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.initialization.DataFolder;
@@ -214,7 +215,7 @@ public class SettingsMigrationService extends PlainMigrationService {
                                                                   ConfigurationData configData) {
         final String oldPath = "Security.console.noConsoleSpam";
         final Property<LogLevel> newProperty = PluginSettings.LOG_LEVEL;
-        if (!newProperty.isPresent(reader) && reader.contains(oldPath)) {
+        if (!newProperty.isValidInResource(reader) && reader.contains(oldPath)) {
             logger.info("Moving '" + oldPath + "' to '" + newProperty.getPath() + "'");
             boolean oldValue = Optional.ofNullable(reader.getBoolean(oldPath)).orElse(false);
             LogLevel level = oldValue ? LogLevel.INFO : LogLevel.FINE;
@@ -252,17 +253,18 @@ public class SettingsMigrationService extends PlainMigrationService {
      */
     private static boolean convertToRegistrationType(PropertyReader reader, ConfigurationData configData) {
         String oldEmailRegisterPath = "settings.registration.enableEmailRegistrationSystem";
-        if (RegistrationSettings.REGISTRATION_TYPE.isPresent(reader) || !reader.contains(oldEmailRegisterPath)) {
+        if (RegistrationSettings.REGISTRATION_TYPE.isValidInResource(reader)
+            || !reader.contains(oldEmailRegisterPath)) {
             return false;
         }
 
-        boolean useEmail = newProperty(oldEmailRegisterPath, false).determineValue(reader);
+        boolean useEmail = newProperty(oldEmailRegisterPath, false).determineValue(reader).getValue();
         RegistrationType registrationType = useEmail ? RegistrationType.EMAIL : RegistrationType.PASSWORD;
 
         String useConfirmationPath = useEmail
             ? "settings.registration.doubleEmailCheck"
             : "settings.restrictions.enablePasswordConfirmation";
-        boolean hasConfirmation = newProperty(useConfirmationPath, false).determineValue(reader);
+        boolean hasConfirmation = newProperty(useConfirmationPath, false).determineValue(reader).getValue();
         RegisterSecondaryArgument secondaryArgument = hasConfirmation
             ? RegisterSecondaryArgument.CONFIRMATION
             : RegisterSecondaryArgument.NONE;
@@ -287,7 +289,7 @@ public class SettingsMigrationService extends PlainMigrationService {
         // We have two old settings replaced by only one: move the first non-empty one
         Property<String> oldUnloggedInGroup = newProperty("settings.security.unLoggedinGroup", "");
         Property<String> oldRegisteredGroup = newProperty("GroupOptions.RegisteredPlayerGroup", "");
-        if (!oldUnloggedInGroup.determineValue(reader).isEmpty()) {
+        if (!oldUnloggedInGroup.determineValue(reader).getValue().isEmpty()) {
             performedChanges = moveProperty(oldUnloggedInGroup, PluginSettings.REGISTERED_GROUP, reader, configData);
         } else {
             performedChanges = moveProperty(oldRegisteredGroup, PluginSettings.REGISTERED_GROUP, reader, configData);
@@ -311,13 +313,13 @@ public class SettingsMigrationService extends PlainMigrationService {
      */
     private static boolean moveDeprecatedHashAlgorithmIntoLegacySection(PropertyReader reader,
                                                                         ConfigurationData configData) {
-        HashAlgorithm currentHash = SecuritySettings.PASSWORD_HASH.determineValue(reader);
+        HashAlgorithm currentHash = SecuritySettings.PASSWORD_HASH.determineValue(reader).getValue();
         // Skip CUSTOM (has no class) and PLAINTEXT (is force-migrated later on in the startup process)
         if (currentHash != HashAlgorithm.CUSTOM && currentHash != HashAlgorithm.PLAINTEXT) {
             Class<?> encryptionClass = currentHash.getClazz();
             if (encryptionClass.isAnnotationPresent(Deprecated.class)) {
                 configData.setValue(SecuritySettings.PASSWORD_HASH, HashAlgorithm.SHA256);
-                Set<HashAlgorithm> legacyHashes = SecuritySettings.LEGACY_HASHES.determineValue(reader);
+                Set<HashAlgorithm> legacyHashes = SecuritySettings.LEGACY_HASHES.determineValue(reader).getValue();
                 legacyHashes.add(currentHash);
                 configData.setValue(SecuritySettings.LEGACY_HASHES, legacyHashes);
                 logger.warning("The hash algorithm '" + currentHash
@@ -352,9 +354,11 @@ public class SettingsMigrationService extends PlainMigrationService {
         Property<String> commandProperty = newProperty("settings.restrictions.otherAccountsCmd", "");
         Property<Integer> commandThresholdProperty = newProperty("settings.restrictions.otherAccountsCmdThreshold", 0);
 
-        if (commandProperty.isPresent(reader) && commandThresholdProperty.determineValue(reader) >= 2) {
+        PropertyValue<String> commandPropValue = commandProperty.determineValue(reader);
-            oldOtherAccountsCommand = commandProperty.determineValue(reader);
+        int commandThreshold = commandThresholdProperty.determineValue(reader).getValue();
-            oldOtherAccountsCommandThreshold = commandThresholdProperty.determineValue(reader);
+        if (commandPropValue.isValidInResource() && commandThreshold >= 2) {
+            oldOtherAccountsCommand = commandPropValue.getValue();
+            oldOtherAccountsCommandThreshold = commandThreshold;
         }
     }
 
@@ -372,12 +376,13 @@ public class SettingsMigrationService extends PlainMigrationService {
                                               Property<T> newProperty,
                                               PropertyReader reader,
                                               ConfigurationData configData) {
-        if (reader.contains(oldProperty.getPath())) {
+        PropertyValue<T> oldPropertyValue = oldProperty.determineValue(reader);
+        if (oldPropertyValue.isValidInResource()) {
             if (reader.contains(newProperty.getPath())) {
                 logger.info("Detected deprecated property " + oldProperty.getPath());
             } else {
                 logger.info("Renaming " + oldProperty.getPath() + " to " + newProperty.getPath());
-                configData.setValue(newProperty, oldProperty.determineValue(reader));
+                configData.setValue(newProperty, oldPropertyValue.getValue());
             }
             return true;
         }

src/main/java/fr/xephi/authme/settings/commandconfig/CommandMigrationService.java

@@ -31,7 +31,7 @@ class CommandMigrationService implements MigrationService {
 
     @Override
     public boolean checkAndMigrate(PropertyReader reader, ConfigurationData configurationData) {
-        final CommandConfig commandConfig = CommandSettingsHolder.COMMANDS.determineValue(reader);
+        final CommandConfig commandConfig = CommandSettingsHolder.COMMANDS.determineValue(reader).getValue();
         if (moveOtherAccountsConfig(commandConfig) || isAnyCommandMissing(reader)) {
             configurationData.setValue(CommandSettingsHolder.COMMANDS, commandConfig);
             return true;