From 25780ede893aeb179cf29b2d2b4f14b470372ec9 Mon Sep 17 00:00:00 2001 From: ljacqu Date: Sun, 4 Sep 2016 15:32:58 +0200 Subject: [PATCH] #927 Use 0.1 version and adjust to changes from ConfigMe --- pom.xml | 2 +- .../fr/xephi/authme/initialization/Initializer.java | 2 +- src/main/java/fr/xephi/authme/settings/Settings.java | 2 +- .../authme/settings/SettingsMigrationService.java | 2 +- .../settings/properties/AuthMeSettingsRetriever.java | 6 +++--- .../authme/settings/ConfigFileConsistencyTest.java | 2 +- .../authme/settings/SettingsIntegrationTest.java | 7 ++++--- .../authme/settings/SettingsMigrationServiceTest.java | 2 +- .../java/fr/xephi/authme/settings/SettingsTest.java | 6 +++--- .../settings/TestSettingsMigrationServices.java | 11 +---------- 10 files changed, 17 insertions(+), 25 deletions(-) diff --git a/pom.xml b/pom.xml index 4dd41e51..2c660b64 100644 --- a/pom.xml +++ b/pom.xml @@ -865,7 +865,7 @@ com.github.authme configme - 0.1-SNAPSHOT + 0.1 diff --git a/src/main/java/fr/xephi/authme/initialization/Initializer.java b/src/main/java/fr/xephi/authme/initialization/Initializer.java index 13f7ae2b..7b7a4e06 100644 --- a/src/main/java/fr/xephi/authme/initialization/Initializer.java +++ b/src/main/java/fr/xephi/authme/initialization/Initializer.java @@ -1,6 +1,6 @@ package fr.xephi.authme.initialization; -import com.github.authme.configme.propertymap.PropertyEntry; +import com.github.authme.configme.knownproperties.PropertyEntry; import com.github.authme.configme.resource.PropertyResource; import com.github.authme.configme.resource.YamlFileResource; import fr.xephi.authme.AuthMe; diff --git a/src/main/java/fr/xephi/authme/settings/Settings.java b/src/main/java/fr/xephi/authme/settings/Settings.java index a3b4cf57..855c14df 100644 --- a/src/main/java/fr/xephi/authme/settings/Settings.java +++ b/src/main/java/fr/xephi/authme/settings/Settings.java @@ -1,8 +1,8 @@ package fr.xephi.authme.settings; import com.github.authme.configme.SettingsManager; +import com.github.authme.configme.knownproperties.PropertyEntry; import com.github.authme.configme.migration.MigrationService; -import com.github.authme.configme.propertymap.PropertyEntry; import com.github.authme.configme.resource.PropertyResource; import com.google.common.io.Files; import fr.xephi.authme.ConsoleLogger; diff --git a/src/main/java/fr/xephi/authme/settings/SettingsMigrationService.java b/src/main/java/fr/xephi/authme/settings/SettingsMigrationService.java index 73068a94..ce6877d2 100644 --- a/src/main/java/fr/xephi/authme/settings/SettingsMigrationService.java +++ b/src/main/java/fr/xephi/authme/settings/SettingsMigrationService.java @@ -1,8 +1,8 @@ package fr.xephi.authme.settings; +import com.github.authme.configme.knownproperties.PropertyEntry; import com.github.authme.configme.migration.PlainMigrationService; import com.github.authme.configme.properties.Property; -import com.github.authme.configme.propertymap.PropertyEntry; import com.github.authme.configme.resource.PropertyResource; import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.output.LogLevel; diff --git a/src/main/java/fr/xephi/authme/settings/properties/AuthMeSettingsRetriever.java b/src/main/java/fr/xephi/authme/settings/properties/AuthMeSettingsRetriever.java index 3fb8385f..54b3e6e5 100644 --- a/src/main/java/fr/xephi/authme/settings/properties/AuthMeSettingsRetriever.java +++ b/src/main/java/fr/xephi/authme/settings/properties/AuthMeSettingsRetriever.java @@ -1,9 +1,9 @@ package fr.xephi.authme.settings.properties; import com.github.authme.configme.SettingsHolder; +import com.github.authme.configme.knownproperties.PropertyEntry; +import com.github.authme.configme.knownproperties.PropertyFieldsCollector; import com.github.authme.configme.properties.Property; -import com.github.authme.configme.propertymap.PropertyEntry; -import com.github.authme.configme.propertymap.SettingsFieldRetriever; import java.util.List; @@ -22,7 +22,7 @@ public final class AuthMeSettingsRetriever { * @return list of all known properties */ public static List getAllPropertyFields() { - return SettingsFieldRetriever.getAllProperties( + return PropertyFieldsCollector.getAllProperties( DatabaseSettings.class, ConverterSettings.class, PluginSettings.class, RestrictionSettings.class, EmailSettings.class, HooksSettings.class, ProtectionSettings.class, PurgeSettings.class, SecuritySettings.class, diff --git a/src/test/java/fr/xephi/authme/settings/ConfigFileConsistencyTest.java b/src/test/java/fr/xephi/authme/settings/ConfigFileConsistencyTest.java index 7770fbfb..a495254a 100644 --- a/src/test/java/fr/xephi/authme/settings/ConfigFileConsistencyTest.java +++ b/src/test/java/fr/xephi/authme/settings/ConfigFileConsistencyTest.java @@ -1,9 +1,9 @@ package fr.xephi.authme.settings; +import com.github.authme.configme.knownproperties.PropertyEntry; import com.github.authme.configme.migration.MigrationService; import com.github.authme.configme.migration.PlainMigrationService; import com.github.authme.configme.properties.Property; -import com.github.authme.configme.propertymap.PropertyEntry; import com.github.authme.configme.resource.PropertyResource; import com.github.authme.configme.resource.YamlFileResource; import fr.xephi.authme.TestHelper; diff --git a/src/test/java/fr/xephi/authme/settings/SettingsIntegrationTest.java b/src/test/java/fr/xephi/authme/settings/SettingsIntegrationTest.java index 05ac665a..f29bcc49 100644 --- a/src/test/java/fr/xephi/authme/settings/SettingsIntegrationTest.java +++ b/src/test/java/fr/xephi/authme/settings/SettingsIntegrationTest.java @@ -1,9 +1,9 @@ package fr.xephi.authme.settings; +import com.github.authme.configme.knownproperties.PropertyEntry; +import com.github.authme.configme.knownproperties.PropertyFieldsCollector; import com.github.authme.configme.migration.PlainMigrationService; import com.github.authme.configme.properties.Property; -import com.github.authme.configme.propertymap.PropertyEntry; -import com.github.authme.configme.propertymap.SettingsFieldRetriever; import com.github.authme.configme.resource.PropertyResource; import com.github.authme.configme.resource.YamlFileResource; import com.google.common.collect.ImmutableMap; @@ -38,7 +38,8 @@ public class SettingsIntegrationTest { /** File name of the sample config missing certain {@link TestConfiguration} values. */ private static final String INCOMPLETE_FILE = TestHelper.PROJECT_ROOT + "settings/config-incomplete-sample.yml"; - private static List knownProperties = SettingsFieldRetriever.getAllProperties(TestConfiguration.class); + private static List knownProperties = + PropertyFieldsCollector.getAllProperties(TestConfiguration.class); @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); diff --git a/src/test/java/fr/xephi/authme/settings/SettingsMigrationServiceTest.java b/src/test/java/fr/xephi/authme/settings/SettingsMigrationServiceTest.java index df290d13..bc2284b8 100644 --- a/src/test/java/fr/xephi/authme/settings/SettingsMigrationServiceTest.java +++ b/src/test/java/fr/xephi/authme/settings/SettingsMigrationServiceTest.java @@ -1,6 +1,6 @@ package fr.xephi.authme.settings; -import com.github.authme.configme.propertymap.PropertyEntry; +import com.github.authme.configme.knownproperties.PropertyEntry; import com.github.authme.configme.resource.PropertyResource; import com.github.authme.configme.resource.YamlFileResource; import com.google.common.io.Files; diff --git a/src/test/java/fr/xephi/authme/settings/SettingsTest.java b/src/test/java/fr/xephi/authme/settings/SettingsTest.java index 963395fa..5f4bac9b 100644 --- a/src/test/java/fr/xephi/authme/settings/SettingsTest.java +++ b/src/test/java/fr/xephi/authme/settings/SettingsTest.java @@ -1,9 +1,9 @@ package fr.xephi.authme.settings; +import com.github.authme.configme.knownproperties.PropertyEntry; +import com.github.authme.configme.knownproperties.PropertyFieldsCollector; import com.github.authme.configme.migration.PlainMigrationService; import com.github.authme.configme.properties.Property; -import com.github.authme.configme.propertymap.PropertyEntry; -import com.github.authme.configme.propertymap.SettingsFieldRetriever; import com.github.authme.configme.resource.PropertyResource; import fr.xephi.authme.TestHelper; import fr.xephi.authme.settings.properties.RegistrationSettings; @@ -41,7 +41,7 @@ import static org.mockito.Mockito.when; public class SettingsTest { private static final List knownProperties = - SettingsFieldRetriever.getAllProperties(TestConfiguration.class); + PropertyFieldsCollector.getAllProperties(TestConfiguration.class); @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); diff --git a/src/test/java/fr/xephi/authme/settings/TestSettingsMigrationServices.java b/src/test/java/fr/xephi/authme/settings/TestSettingsMigrationServices.java index c7b64fb4..f14a4783 100644 --- a/src/test/java/fr/xephi/authme/settings/TestSettingsMigrationServices.java +++ b/src/test/java/fr/xephi/authme/settings/TestSettingsMigrationServices.java @@ -1,10 +1,6 @@ package fr.xephi.authme.settings; import com.github.authme.configme.migration.MigrationService; -import com.github.authme.configme.propertymap.PropertyEntry; -import com.github.authme.configme.resource.PropertyResource; - -import java.util.List; /** * Provides {@link MigrationService} implementations for testing. @@ -20,11 +16,6 @@ public final class TestSettingsMigrationServices { * @return test settings migration service */ public static MigrationService alwaysFulfilled() { - return new MigrationService() { - @Override - public boolean checkAndMigrate(PropertyResource propertyResource, List list) { - return false; - } - }; + return (propertyResource, knownProperties) -> false; } }