Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#927 Use 0.1 version and adjust to changes from ConfigMe

Browse Source
This commit is contained in:
ljacqu 2016-09-04 15:32:58 +02:00
parent 09f403f357
commit 25780ede89
10 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -865,7 +865,7 @@
<dependency> <dependency>
<groupId>com.github.authme</groupId> <groupId>com.github.authme</groupId>
<artifactId>configme</artifactId> <artifactId>configme</artifactId>
<version>0.1-SNAPSHOT</version> <version>0.1</version>
</dependency> </dependency>
<!-- Unit Testing Libraries --> <!-- Unit Testing Libraries -->

2
src/main/java/fr/xephi/authme/initialization/Initializer.java
View File

@ -1,6 +1,6 @@
package fr.xephi.authme.initialization; 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.PropertyResource;
import com.github.authme.configme.resource.YamlFileResource; import com.github.authme.configme.resource.YamlFileResource;
import fr.xephi.authme.AuthMe; import fr.xephi.authme.AuthMe;

2
src/main/java/fr/xephi/authme/settings/Settings.java
View File

@ -1,8 +1,8 @@
package fr.xephi.authme.settings; package fr.xephi.authme.settings;
import com.github.authme.configme.SettingsManager; 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.migration.MigrationService;
import com.github.authme.configme.propertymap.PropertyEntry;
import com.github.authme.configme.resource.PropertyResource; import com.github.authme.configme.resource.PropertyResource;
import com.google.common.io.Files; import com.google.common.io.Files;
import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.ConsoleLogger;

2
src/main/java/fr/xephi/authme/settings/SettingsMigrationService.java
View File

@ -1,8 +1,8 @@
package fr.xephi.authme.settings; package fr.xephi.authme.settings;
import com.github.authme.configme.knownproperties.PropertyEntry;
import com.github.authme.configme.migration.PlainMigrationService; import com.github.authme.configme.migration.PlainMigrationService;
import com.github.authme.configme.properties.Property; 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.PropertyResource;
import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.output.LogLevel; import fr.xephi.authme.output.LogLevel;

6
src/main/java/fr/xephi/authme/settings/properties/AuthMeSettingsRetriever.java
View File

@ -1,9 +1,9 @@
package fr.xephi.authme.settings.properties; package fr.xephi.authme.settings.properties;
import com.github.authme.configme.SettingsHolder; 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.properties.Property;
import com.github.authme.configme.propertymap.PropertyEntry;
import com.github.authme.configme.propertymap.SettingsFieldRetriever;
import java.util.List; import java.util.List;
@ -22,7 +22,7 @@ public final class AuthMeSettingsRetriever {
* @return list of all known properties * @return list of all known properties
*/ */
public static List<PropertyEntry> getAllPropertyFields() { public static List<PropertyEntry> getAllPropertyFields() {
return SettingsFieldRetriever.getAllProperties( return PropertyFieldsCollector.getAllProperties(
DatabaseSettings.class, ConverterSettings.class, PluginSettings.class, DatabaseSettings.class, ConverterSettings.class, PluginSettings.class,
RestrictionSettings.class, EmailSettings.class, HooksSettings.class, RestrictionSettings.class, EmailSettings.class, HooksSettings.class,
ProtectionSettings.class, PurgeSettings.class, SecuritySettings.class, ProtectionSettings.class, PurgeSettings.class, SecuritySettings.class,

2
src/test/java/fr/xephi/authme/settings/ConfigFileConsistencyTest.java
View File

@ -1,9 +1,9 @@
package fr.xephi.authme.settings; 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.MigrationService;
import com.github.authme.configme.migration.PlainMigrationService; import com.github.authme.configme.migration.PlainMigrationService;
import com.github.authme.configme.properties.Property; 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.PropertyResource;
import com.github.authme.configme.resource.YamlFileResource; import com.github.authme.configme.resource.YamlFileResource;
import fr.xephi.authme.TestHelper; import fr.xephi.authme.TestHelper;

7
src/test/java/fr/xephi/authme/settings/SettingsIntegrationTest.java
View File

@ -1,9 +1,9 @@
package fr.xephi.authme.settings; 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.migration.PlainMigrationService;
import com.github.authme.configme.properties.Property; 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.PropertyResource;
import com.github.authme.configme.resource.YamlFileResource; import com.github.authme.configme.resource.YamlFileResource;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
@ -38,7 +38,8 @@ public class SettingsIntegrationTest {
/** File name of the sample config missing certain {@link TestConfiguration} values. */ /** 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 final String INCOMPLETE_FILE = TestHelper.PROJECT_ROOT + "settings/config-incomplete-sample.yml";
private static List<PropertyEntry> knownProperties = SettingsFieldRetriever.getAllProperties(TestConfiguration.class); private static List<PropertyEntry> knownProperties =
PropertyFieldsCollector.getAllProperties(TestConfiguration.class);
@Rule @Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder(); public TemporaryFolder temporaryFolder = new TemporaryFolder();

2
src/test/java/fr/xephi/authme/settings/SettingsMigrationServiceTest.java
View File

@ -1,6 +1,6 @@
package fr.xephi.authme.settings; 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.PropertyResource;
import com.github.authme.configme.resource.YamlFileResource; import com.github.authme.configme.resource.YamlFileResource;
import com.google.common.io.Files; import com.google.common.io.Files;

6
src/test/java/fr/xephi/authme/settings/SettingsTest.java
View File

@ -1,9 +1,9 @@
package fr.xephi.authme.settings; 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.migration.PlainMigrationService;
import com.github.authme.configme.properties.Property; 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.PropertyResource;
import fr.xephi.authme.TestHelper; import fr.xephi.authme.TestHelper;
import fr.xephi.authme.settings.properties.RegistrationSettings; import fr.xephi.authme.settings.properties.RegistrationSettings;
@ -41,7 +41,7 @@ import static org.mockito.Mockito.when;
public class SettingsTest { public class SettingsTest {
private static final List<PropertyEntry> knownProperties = private static final List<PropertyEntry> knownProperties =
SettingsFieldRetriever.getAllProperties(TestConfiguration.class); PropertyFieldsCollector.getAllProperties(TestConfiguration.class);
@Rule @Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder(); public TemporaryFolder temporaryFolder = new TemporaryFolder();

11
src/test/java/fr/xephi/authme/settings/TestSettingsMigrationServices.java
View File

@ -1,10 +1,6 @@
package fr.xephi.authme.settings; package fr.xephi.authme.settings;
import com.github.authme.configme.migration.MigrationService; 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. * Provides {@link MigrationService} implementations for testing.
@ -20,11 +16,6 @@ public final class TestSettingsMigrationServices {
* @return test settings migration service * @return test settings migration service
*/ */
public static MigrationService alwaysFulfilled() { public static MigrationService alwaysFulfilled() {
return new MigrationService() { return (propertyResource, knownProperties) -> false;
@Override
public boolean checkAndMigrate(PropertyResource propertyResource, List<PropertyEntry> list) {
return false;
}
};
} }
} }