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

Update ConfigMe and Mockito version

Browse Source
This commit is contained in:
ljacqu 2016-12-23 23:22:05 +01:00
parent 92f71d47c2
commit 5f8a19223f
39 changed files with 127 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pom.xml
View File

@ -304,8 +304,8 @@
<shadedPattern>fr.xephi.authme.libs.jalu.injector</shadedPattern> <shadedPattern>fr.xephi.authme.libs.jalu.injector</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>com.github.authme.configme</pattern> <pattern>ch.jalu.configme</pattern>
<shadedPattern>fr.xephi.authme.libs.authme.configme</shadedPattern> <shadedPattern>fr.xephi.authme.libs.jalu.configme</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>com.zaxxer.hikari</pattern> <pattern>com.zaxxer.hikari</pattern>
@ -900,9 +900,9 @@
<!-- ConfigMe --> <!-- ConfigMe -->
<dependency> <dependency>
<groupId>com.github.authme</groupId> <groupId>ch.jalu</groupId>
<artifactId>configme</artifactId> <artifactId>configme</artifactId>
<version>0.2.1</version> <version>0.3</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
<exclusions> <exclusions>
@ -933,7 +933,7 @@
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId> <artifactId>mockito-core</artifactId>
<scope>test</scope> <scope>test</scope>
<version>2.2.27</version> <version>2.4.1</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>hamcrest-core</artifactId> <artifactId>hamcrest-core</artifactId>

6
src/main/java/fr/xephi/authme/initialization/SettingsProvider.java
View File

@ -1,8 +1,8 @@
package fr.xephi.authme.initialization; package fr.xephi.authme.initialization;
import com.github.authme.configme.knownproperties.ConfigurationData; import ch.jalu.configme.configurationdata.ConfigurationData;
import com.github.authme.configme.resource.PropertyResource; import ch.jalu.configme.resource.PropertyResource;
import com.github.authme.configme.resource.YamlFileResource; import ch.jalu.configme.resource.YamlFileResource;
import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.settings.SettingsMigrationService; import fr.xephi.authme.settings.SettingsMigrationService;
import fr.xephi.authme.settings.properties.AuthMeSettingsRetriever; import fr.xephi.authme.settings.properties.AuthMeSettingsRetriever;

2
src/main/java/fr/xephi/authme/service/CommonService.java
View File

@ -1,6 +1,6 @@
package fr.xephi.authme.service; package fr.xephi.authme.service;
import com.github.authme.configme.properties.Property; import ch.jalu.configme.properties.Property;
import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.message.MessageKey;
import fr.xephi.authme.message.Messages; import fr.xephi.authme.message.Messages;
import fr.xephi.authme.permission.AuthGroupHandler; import fr.xephi.authme.permission.AuthGroupHandler;

10
src/main/java/fr/xephi/authme/service/MessageUpdater.java
View File

@ -1,10 +1,10 @@
package fr.xephi.authme.service; package fr.xephi.authme.service;
import com.github.authme.configme.SettingsManager; import ch.jalu.configme.SettingsManager;
import com.github.authme.configme.knownproperties.ConfigurationData; import ch.jalu.configme.configurationdata.ConfigurationData;
import com.github.authme.configme.properties.Property; import ch.jalu.configme.properties.Property;
import com.github.authme.configme.properties.StringProperty; import ch.jalu.configme.properties.StringProperty;
import com.github.authme.configme.resource.YamlFileResource; import ch.jalu.configme.resource.YamlFileResource;
import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.message.MessageKey;
import fr.xephi.authme.util.FileUtils; import fr.xephi.authme.util.FileUtils;

2
src/main/java/fr/xephi/authme/service/ValidationService.java
View File

@ -1,6 +1,6 @@
package fr.xephi.authme.service; package fr.xephi.authme.service;
import com.github.authme.configme.properties.Property; import ch.jalu.configme.properties.Property;
import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.datasource.DataSource;
import fr.xephi.authme.initialization.Reloadable; import fr.xephi.authme.initialization.Reloadable;
import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.message.MessageKey;

4
src/main/java/fr/xephi/authme/settings/EnumSetProperty.java
View File

@ -1,7 +1,7 @@
package fr.xephi.authme.settings; package fr.xephi.authme.settings;
import com.github.authme.configme.SettingsManager; import ch.jalu.configme.SettingsManager;
import com.github.authme.configme.properties.StringListProperty; import ch.jalu.configme.properties.StringListProperty;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;

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

@ -1,9 +1,9 @@
package fr.xephi.authme.settings; package fr.xephi.authme.settings;
import com.github.authme.configme.SettingsManager; import ch.jalu.configme.SettingsManager;
import com.github.authme.configme.knownproperties.ConfigurationData; import ch.jalu.configme.configurationdata.ConfigurationData;
import com.github.authme.configme.migration.MigrationService; import ch.jalu.configme.migration.MigrationService;
import com.github.authme.configme.resource.PropertyResource; import ch.jalu.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;

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

@ -1,16 +1,16 @@
package fr.xephi.authme.settings; package fr.xephi.authme.settings;
import com.github.authme.configme.migration.PlainMigrationService; import ch.jalu.configme.migration.PlainMigrationService;
import com.github.authme.configme.properties.Property; import ch.jalu.configme.properties.Property;
import com.github.authme.configme.properties.StringListProperty; import ch.jalu.configme.properties.StringListProperty;
import com.github.authme.configme.resource.PropertyResource; import ch.jalu.configme.resource.PropertyResource;
import com.google.common.base.Objects; import com.google.common.base.Objects;
import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.initialization.DataFolder; import fr.xephi.authme.initialization.DataFolder;
import fr.xephi.authme.output.LogLevel; import fr.xephi.authme.output.LogLevel;
import fr.xephi.authme.settings.properties.PluginSettings; import fr.xephi.authme.settings.properties.PluginSettings;
import fr.xephi.authme.settings.properties.RegistrationSettings;
import fr.xephi.authme.settings.properties.RegistrationArgumentType; import fr.xephi.authme.settings.properties.RegistrationArgumentType;
import fr.xephi.authme.settings.properties.RegistrationSettings;
import fr.xephi.authme.settings.properties.SecuritySettings; import fr.xephi.authme.settings.properties.SecuritySettings;
import javax.inject.Inject; import javax.inject.Inject;
@ -20,8 +20,8 @@ import java.io.IOException;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import static com.github.authme.configme.properties.PropertyInitializer.newListProperty; import static ch.jalu.configme.properties.PropertyInitializer.newListProperty;
import static com.github.authme.configme.properties.PropertyInitializer.newProperty; import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
import static fr.xephi.authme.settings.properties.RegistrationSettings.DELAY_JOIN_MESSAGE; import static fr.xephi.authme.settings.properties.RegistrationSettings.DELAY_JOIN_MESSAGE;
import static fr.xephi.authme.settings.properties.RegistrationSettings.REMOVE_JOIN_MESSAGE; import static fr.xephi.authme.settings.properties.RegistrationSettings.REMOVE_JOIN_MESSAGE;
import static fr.xephi.authme.settings.properties.RegistrationSettings.REMOVE_LEAVE_MESSAGE; import static fr.xephi.authme.settings.properties.RegistrationSettings.REMOVE_LEAVE_MESSAGE;
@ -100,8 +100,7 @@ public class SettingsMigrationService extends PlainMigrationService {
} }
private List<String> getStringList(PropertyResource resource, String path) { private List<String> getStringList(PropertyResource resource, String path) {
List<String> entries = new StringListProperty(path).getFromResource(resource); return new StringListProperty(path).getValue(resource);
return entries == null ? Collections.emptyList() : entries;
} }
public List<String> getOnLoginCommands() { public List<String> getOnLoginCommands() {

4
src/main/java/fr/xephi/authme/settings/commandconfig/CommandManager.java
View File

@ -1,7 +1,7 @@
package fr.xephi.authme.settings.commandconfig; package fr.xephi.authme.settings.commandconfig;
import com.github.authme.configme.SettingsManager; import ch.jalu.configme.SettingsManager;
import com.github.authme.configme.resource.YamlFileResource; import ch.jalu.configme.resource.YamlFileResource;
import fr.xephi.authme.initialization.DataFolder; import fr.xephi.authme.initialization.DataFolder;
import fr.xephi.authme.initialization.Reloadable; import fr.xephi.authme.initialization.Reloadable;
import fr.xephi.authme.service.BukkitService; import fr.xephi.authme.service.BukkitService;

6
src/main/java/fr/xephi/authme/settings/commandconfig/CommandMigrationService.java
View File

@ -1,8 +1,8 @@
package fr.xephi.authme.settings.commandconfig; package fr.xephi.authme.settings.commandconfig;
import com.github.authme.configme.migration.MigrationService; import ch.jalu.configme.migration.MigrationService;
import com.github.authme.configme.properties.Property; import ch.jalu.configme.properties.Property;
import com.github.authme.configme.resource.PropertyResource; import ch.jalu.configme.resource.PropertyResource;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.settings.SettingsMigrationService; import fr.xephi.authme.settings.SettingsMigrationService;

8
src/main/java/fr/xephi/authme/settings/commandconfig/CommandSettingsHolder.java
View File

@ -1,9 +1,9 @@
package fr.xephi.authme.settings.commandconfig; package fr.xephi.authme.settings.commandconfig;
import com.github.authme.configme.SectionComments; import ch.jalu.configme.SectionComments;
import com.github.authme.configme.SettingsHolder; import ch.jalu.configme.SettingsHolder;
import com.github.authme.configme.beanmapper.BeanProperty; import ch.jalu.configme.properties.BeanProperty;
import com.github.authme.configme.properties.Property; import ch.jalu.configme.properties.Property;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;

8
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 ch.jalu.configme.SettingsHolder;
import com.github.authme.configme.knownproperties.ConfigurationData; import ch.jalu.configme.configurationdata.ConfigurationData;
import com.github.authme.configme.knownproperties.ConfigurationDataBuilder; import ch.jalu.configme.configurationdata.ConfigurationDataBuilder;
import com.github.authme.configme.properties.Property; import ch.jalu.configme.properties.Property;
/** /**
* Utility class responsible for retrieving all {@link Property} fields from {@link SettingsHolder} classes. * Utility class responsible for retrieving all {@link Property} fields from {@link SettingsHolder} classes.

8
src/main/java/fr/xephi/authme/settings/properties/BackupSettings.java
View File

@ -1,10 +1,10 @@
package fr.xephi.authme.settings.properties; package fr.xephi.authme.settings.properties;
import com.github.authme.configme.Comment; import ch.jalu.configme.Comment;
import com.github.authme.configme.SettingsHolder; import ch.jalu.configme.SettingsHolder;
import com.github.authme.configme.properties.Property; import ch.jalu.configme.properties.Property;
import static com.github.authme.configme.properties.PropertyInitializer.newProperty; import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
public class BackupSettings implements SettingsHolder { public class BackupSettings implements SettingsHolder {

8
src/main/java/fr/xephi/authme/settings/properties/ConverterSettings.java
View File

@ -1,10 +1,10 @@
package fr.xephi.authme.settings.properties; package fr.xephi.authme.settings.properties;
import com.github.authme.configme.Comment; import ch.jalu.configme.Comment;
import com.github.authme.configme.SettingsHolder; import ch.jalu.configme.SettingsHolder;
import com.github.authme.configme.properties.Property; import ch.jalu.configme.properties.Property;
import static com.github.authme.configme.properties.PropertyInitializer.newProperty; import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
public class ConverterSettings implements SettingsHolder { public class ConverterSettings implements SettingsHolder {

8
src/main/java/fr/xephi/authme/settings/properties/DatabaseSettings.java
View File

@ -1,11 +1,11 @@
package fr.xephi.authme.settings.properties; package fr.xephi.authme.settings.properties;
import com.github.authme.configme.Comment; import ch.jalu.configme.Comment;
import com.github.authme.configme.SettingsHolder; import ch.jalu.configme.SettingsHolder;
import com.github.authme.configme.properties.Property; import ch.jalu.configme.properties.Property;
import fr.xephi.authme.datasource.DataSourceType; import fr.xephi.authme.datasource.DataSourceType;
import static com.github.authme.configme.properties.PropertyInitializer.newProperty; import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
public class DatabaseSettings implements SettingsHolder { public class DatabaseSettings implements SettingsHolder {

10
src/main/java/fr/xephi/authme/settings/properties/EmailSettings.java
View File

@ -1,13 +1,13 @@
package fr.xephi.authme.settings.properties; package fr.xephi.authme.settings.properties;
import com.github.authme.configme.Comment; import ch.jalu.configme.Comment;
import com.github.authme.configme.SettingsHolder; import ch.jalu.configme.SettingsHolder;
import com.github.authme.configme.properties.Property; import ch.jalu.configme.properties.Property;
import java.util.List; import java.util.List;
import static com.github.authme.configme.properties.PropertyInitializer.newListProperty; import static ch.jalu.configme.properties.PropertyInitializer.newListProperty;
import static com.github.authme.configme.properties.PropertyInitializer.newProperty; import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
public class EmailSettings implements SettingsHolder { public class EmailSettings implements SettingsHolder {

10
src/main/java/fr/xephi/authme/settings/properties/HooksSettings.java
View File

@ -1,13 +1,13 @@
package fr.xephi.authme.settings.properties; package fr.xephi.authme.settings.properties;
import com.github.authme.configme.Comment; import ch.jalu.configme.Comment;
import com.github.authme.configme.SettingsHolder; import ch.jalu.configme.SettingsHolder;
import com.github.authme.configme.properties.Property; import ch.jalu.configme.properties.Property;
import java.util.List; import java.util.List;
import static com.github.authme.configme.properties.PropertyInitializer.newListProperty; import static ch.jalu.configme.properties.PropertyInitializer.newListProperty;
import static com.github.authme.configme.properties.PropertyInitializer.newProperty; import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
public class HooksSettings implements SettingsHolder { public class HooksSettings implements SettingsHolder {

8
src/main/java/fr/xephi/authme/settings/properties/PluginSettings.java
View File

@ -1,11 +1,11 @@
package fr.xephi.authme.settings.properties; package fr.xephi.authme.settings.properties;
import com.github.authme.configme.Comment; import ch.jalu.configme.Comment;
import com.github.authme.configme.SettingsHolder; import ch.jalu.configme.SettingsHolder;
import com.github.authme.configme.properties.Property; import ch.jalu.configme.properties.Property;
import fr.xephi.authme.output.LogLevel; import fr.xephi.authme.output.LogLevel;
import static com.github.authme.configme.properties.PropertyInitializer.newProperty; import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
public class PluginSettings implements SettingsHolder { public class PluginSettings implements SettingsHolder {

10
src/main/java/fr/xephi/authme/settings/properties/ProtectionSettings.java
View File

@ -1,13 +1,13 @@
package fr.xephi.authme.settings.properties; package fr.xephi.authme.settings.properties;
import com.github.authme.configme.Comment; import ch.jalu.configme.Comment;
import com.github.authme.configme.SettingsHolder; import ch.jalu.configme.SettingsHolder;
import com.github.authme.configme.properties.Property; import ch.jalu.configme.properties.Property;
import java.util.List; import java.util.List;
import static com.github.authme.configme.properties.PropertyInitializer.newListProperty; import static ch.jalu.configme.properties.PropertyInitializer.newListProperty;
import static com.github.authme.configme.properties.PropertyInitializer.newProperty; import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
public class ProtectionSettings implements SettingsHolder { public class ProtectionSettings implements SettingsHolder {

8
src/main/java/fr/xephi/authme/settings/properties/PurgeSettings.java
View File

@ -1,10 +1,10 @@
package fr.xephi.authme.settings.properties; package fr.xephi.authme.settings.properties;
import com.github.authme.configme.Comment; import ch.jalu.configme.Comment;
import com.github.authme.configme.SettingsHolder; import ch.jalu.configme.SettingsHolder;
import com.github.authme.configme.properties.Property; import ch.jalu.configme.properties.Property;
import static com.github.authme.configme.properties.PropertyInitializer.newProperty; import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
public class PurgeSettings implements SettingsHolder { public class PurgeSettings implements SettingsHolder {

8
src/main/java/fr/xephi/authme/settings/properties/RegistrationSettings.java
View File

@ -1,10 +1,10 @@
package fr.xephi.authme.settings.properties; package fr.xephi.authme.settings.properties;
import com.github.authme.configme.Comment; import ch.jalu.configme.Comment;
import com.github.authme.configme.SettingsHolder; import ch.jalu.configme.SettingsHolder;
import com.github.authme.configme.properties.Property; import ch.jalu.configme.properties.Property;
import static com.github.authme.configme.properties.PropertyInitializer.newProperty; import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
public class RegistrationSettings implements SettingsHolder { public class RegistrationSettings implements SettingsHolder {

12
src/main/java/fr/xephi/authme/settings/properties/RestrictionSettings.java
View File

@ -1,14 +1,14 @@
package fr.xephi.authme.settings.properties; package fr.xephi.authme.settings.properties;
import com.github.authme.configme.Comment; import ch.jalu.configme.Comment;
import com.github.authme.configme.SettingsHolder; import ch.jalu.configme.SettingsHolder;
import com.github.authme.configme.properties.Property; import ch.jalu.configme.properties.Property;
import java.util.List; import java.util.List;
import static com.github.authme.configme.properties.PropertyInitializer.newListProperty; import static ch.jalu.configme.properties.PropertyInitializer.newListProperty;
import static com.github.authme.configme.properties.PropertyInitializer.newLowercaseListProperty; import static ch.jalu.configme.properties.PropertyInitializer.newLowercaseListProperty;
import static com.github.authme.configme.properties.PropertyInitializer.newProperty; import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
public class RestrictionSettings implements SettingsHolder { public class RestrictionSettings implements SettingsHolder {

10
src/main/java/fr/xephi/authme/settings/properties/SecuritySettings.java
View File

@ -1,15 +1,15 @@
package fr.xephi.authme.settings.properties; package fr.xephi.authme.settings.properties;
import com.github.authme.configme.Comment; import ch.jalu.configme.Comment;
import com.github.authme.configme.SettingsHolder; import ch.jalu.configme.SettingsHolder;
import com.github.authme.configme.properties.Property; import ch.jalu.configme.properties.Property;
import fr.xephi.authme.security.HashAlgorithm; import fr.xephi.authme.security.HashAlgorithm;
import fr.xephi.authme.settings.EnumSetProperty; import fr.xephi.authme.settings.EnumSetProperty;
import java.util.List; import java.util.List;
import static com.github.authme.configme.properties.PropertyInitializer.newLowercaseListProperty; import static ch.jalu.configme.properties.PropertyInitializer.newLowercaseListProperty;
import static com.github.authme.configme.properties.PropertyInitializer.newProperty; import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
public class SecuritySettings implements SettingsHolder { public class SecuritySettings implements SettingsHolder {

2
src/test/java/fr/xephi/authme/AuthMeInitializationTest.java
View File

@ -1,8 +1,8 @@
package fr.xephi.authme; package fr.xephi.authme;
import ch.jalu.configme.resource.PropertyResource;
import ch.jalu.injector.Injector; import ch.jalu.injector.Injector;
import ch.jalu.injector.InjectorBuilder; import ch.jalu.injector.InjectorBuilder;
import com.github.authme.configme.resource.PropertyResource;
import com.google.common.io.Files; import com.google.common.io.Files;
import fr.xephi.authme.api.NewAPI; import fr.xephi.authme.api.NewAPI;
import fr.xephi.authme.command.CommandHandler; import fr.xephi.authme.command.CommandHandler;

2
src/test/java/fr/xephi/authme/datasource/AbstractResourceClosingTest.java
View File

@ -1,6 +1,6 @@
package fr.xephi.authme.datasource; package fr.xephi.authme.datasource;
import com.github.authme.configme.properties.Property; import ch.jalu.configme.properties.Property;
import com.google.common.base.Objects; import com.google.common.base.Objects;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;

2
src/test/java/fr/xephi/authme/datasource/MySqlIntegrationTest.java
View File

@ -1,6 +1,6 @@
package fr.xephi.authme.datasource; package fr.xephi.authme.datasource;
import com.github.authme.configme.properties.Property; import ch.jalu.configme.properties.Property;
import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource; import com.zaxxer.hikari.HikariDataSource;
import fr.xephi.authme.TestHelper; import fr.xephi.authme.TestHelper;

2
src/test/java/fr/xephi/authme/datasource/SQLiteIntegrationTest.java
View File

@ -1,6 +1,6 @@
package fr.xephi.authme.datasource; package fr.xephi.authme.datasource;
import com.github.authme.configme.properties.Property; import ch.jalu.configme.properties.Property;
import fr.xephi.authme.TestHelper; import fr.xephi.authme.TestHelper;
import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.data.auth.PlayerAuth;
import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.Settings;

4
src/test/java/fr/xephi/authme/settings/SettingsConsistencyTest.java
View File

@ -1,7 +1,7 @@
package fr.xephi.authme.settings; package fr.xephi.authme.settings;
import com.github.authme.configme.knownproperties.ConfigurationData; import ch.jalu.configme.configurationdata.ConfigurationData;
import com.github.authme.configme.properties.Property; import ch.jalu.configme.properties.Property;
import fr.xephi.authme.settings.properties.AuthMeSettingsRetriever; import fr.xephi.authme.settings.properties.AuthMeSettingsRetriever;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;

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

@ -1,11 +1,11 @@
package fr.xephi.authme.settings; package fr.xephi.authme.settings;
import com.github.authme.configme.knownproperties.ConfigurationData; import ch.jalu.configme.configurationdata.ConfigurationData;
import com.github.authme.configme.knownproperties.ConfigurationDataBuilder; import ch.jalu.configme.configurationdata.ConfigurationDataBuilder;
import com.github.authme.configme.migration.PlainMigrationService; import ch.jalu.configme.migration.PlainMigrationService;
import com.github.authme.configme.properties.Property; import ch.jalu.configme.properties.Property;
import com.github.authme.configme.resource.PropertyResource; import ch.jalu.configme.resource.PropertyResource;
import com.github.authme.configme.resource.YamlFileResource; import ch.jalu.configme.resource.YamlFileResource;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.io.Files; import com.google.common.io.Files;
import fr.xephi.authme.TestHelper; import fr.xephi.authme.TestHelper;

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

@ -1,7 +1,7 @@
package fr.xephi.authme.settings; package fr.xephi.authme.settings;
import com.github.authme.configme.resource.PropertyResource; import ch.jalu.configme.resource.PropertyResource;
import com.github.authme.configme.resource.YamlFileResource; import ch.jalu.configme.resource.YamlFileResource;
import com.google.common.io.Files; import com.google.common.io.Files;
import fr.xephi.authme.TestHelper; import fr.xephi.authme.TestHelper;
import fr.xephi.authme.output.LogLevel; import fr.xephi.authme.output.LogLevel;

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

@ -1,8 +1,8 @@
package fr.xephi.authme.settings; package fr.xephi.authme.settings;
import com.github.authme.configme.knownproperties.ConfigurationData; import ch.jalu.configme.configurationdata.ConfigurationData;
import com.github.authme.configme.knownproperties.ConfigurationDataBuilder; import ch.jalu.configme.configurationdata.ConfigurationDataBuilder;
import com.github.authme.configme.resource.PropertyResource; import ch.jalu.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;
import fr.xephi.authme.settings.properties.TestConfiguration; import fr.xephi.authme.settings.properties.TestConfiguration;

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

@ -1,8 +1,8 @@
package fr.xephi.authme.settings.commandconfig; package fr.xephi.authme.settings.commandconfig;
import com.github.authme.configme.knownproperties.ConfigurationDataBuilder; import ch.jalu.configme.configurationdata.ConfigurationDataBuilder;
import com.github.authme.configme.resource.PropertyResource; import ch.jalu.configme.resource.PropertyResource;
import com.github.authme.configme.resource.YamlFileResource; import ch.jalu.configme.resource.YamlFileResource;
import fr.xephi.authme.TestHelper; import fr.xephi.authme.TestHelper;
import fr.xephi.authme.settings.SettingsMigrationService; import fr.xephi.authme.settings.SettingsMigrationService;
import org.junit.BeforeClass; import org.junit.BeforeClass;

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

@ -1,8 +1,8 @@
package fr.xephi.authme.settings.commandconfig; package fr.xephi.authme.settings.commandconfig;
import com.github.authme.configme.knownproperties.ConfigurationDataBuilder; import ch.jalu.configme.configurationdata.ConfigurationDataBuilder;
import com.github.authme.configme.resource.PropertyResource; import ch.jalu.configme.resource.PropertyResource;
import com.github.authme.configme.resource.YamlFileResource; import ch.jalu.configme.resource.YamlFileResource;
import fr.xephi.authme.TestHelper; import fr.xephi.authme.TestHelper;
import fr.xephi.authme.settings.SettingsMigrationService; import fr.xephi.authme.settings.SettingsMigrationService;
import org.junit.Before; import org.junit.Before;

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

@ -1,6 +1,6 @@
package fr.xephi.authme.settings.properties; package fr.xephi.authme.settings.properties;
import com.github.authme.configme.knownproperties.ConfigurationData; import ch.jalu.configme.configurationdata.ConfigurationData;
import fr.xephi.authme.TestHelper; import fr.xephi.authme.TestHelper;
import org.junit.Test; import org.junit.Test;

4
src/test/java/fr/xephi/authme/settings/properties/SettingsClassConsistencyTest.java
View File

@ -1,7 +1,7 @@
package fr.xephi.authme.settings.properties; package fr.xephi.authme.settings.properties;
import com.github.authme.configme.SettingsHolder; import ch.jalu.configme.SettingsHolder;
import com.github.authme.configme.properties.Property; import ch.jalu.configme.properties.Property;
import fr.xephi.authme.ClassCollector; import fr.xephi.authme.ClassCollector;
import fr.xephi.authme.ReflectionTestUtils; import fr.xephi.authme.ReflectionTestUtils;
import fr.xephi.authme.TestHelper; import fr.xephi.authme.TestHelper;

8
src/test/java/fr/xephi/authme/settings/properties/TestConfiguration.java
View File

@ -1,12 +1,12 @@
package fr.xephi.authme.settings.properties; package fr.xephi.authme.settings.properties;
import com.github.authme.configme.SettingsHolder; import ch.jalu.configme.SettingsHolder;
import com.github.authme.configme.properties.Property; import ch.jalu.configme.properties.Property;
import java.util.List; import java.util.List;
import static com.github.authme.configme.properties.PropertyInitializer.newListProperty; import static ch.jalu.configme.properties.PropertyInitializer.newListProperty;
import static com.github.authme.configme.properties.PropertyInitializer.newProperty; import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
/** /**
* Sample properties for testing purposes. * Sample properties for testing purposes.

4
src/test/java/tools/docs/config/UpdateConfigPageTask.java
View File

@ -1,7 +1,7 @@
package tools.docs.config; package tools.docs.config;
import com.github.authme.configme.SettingsManager; import ch.jalu.configme.SettingsManager;
import com.github.authme.configme.resource.YamlFileResource; import ch.jalu.configme.resource.YamlFileResource;
import fr.xephi.authme.settings.properties.AuthMeSettingsRetriever; import fr.xephi.authme.settings.properties.AuthMeSettingsRetriever;
import fr.xephi.authme.util.FileUtils; import fr.xephi.authme.util.FileUtils;
import tools.utils.AutoToolTask; import tools.utils.AutoToolTask;

2
src/test/java/tools/docs/hashmethods/EncryptionMethodInfoGatherer.java
View File

@ -1,8 +1,8 @@
package tools.docs.hashmethods; package tools.docs.hashmethods;
import ch.jalu.configme.properties.Property;
import ch.jalu.injector.Injector; import ch.jalu.injector.Injector;
import ch.jalu.injector.InjectorBuilder; import ch.jalu.injector.InjectorBuilder;
import com.github.authme.configme.properties.Property;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import fr.xephi.authme.security.HashAlgorithm; import fr.xephi.authme.security.HashAlgorithm;
import fr.xephi.authme.security.crypts.EncryptionMethod; import fr.xephi.authme.security.crypts.EncryptionMethod;

4
src/test/java/tools/filegeneration/GenerateCommandsYml.java
View File

@ -1,7 +1,7 @@
package tools.filegeneration; package tools.filegeneration;
import com.github.authme.configme.SettingsManager; import ch.jalu.configme.SettingsManager;
import com.github.authme.configme.resource.YamlFileResource; import ch.jalu.configme.resource.YamlFileResource;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import fr.xephi.authme.settings.commandconfig.Command; import fr.xephi.authme.settings.commandconfig.Command;
import fr.xephi.authme.settings.commandconfig.CommandConfig; import fr.xephi.authme.settings.commandconfig.CommandConfig;