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

#1128 Rename converter classes to start with uppercase letter

Browse Source
This commit is contained in:
ljacqu 2017-03-17 19:28:40 +01:00
parent 6bd0b7c4e0
commit 8f197bbebf
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/fr/xephi/authme/command/executable/authme/ConverterCommand.java
View File

@ -10,8 +10,8 @@ import fr.xephi.authme.datasource.converter.MySqlToSqlite;
import fr.xephi.authme.datasource.converter.RakamakConverter; import fr.xephi.authme.datasource.converter.RakamakConverter;
import fr.xephi.authme.datasource.converter.RoyalAuthConverter; import fr.xephi.authme.datasource.converter.RoyalAuthConverter;
import fr.xephi.authme.datasource.converter.SqliteToSql; import fr.xephi.authme.datasource.converter.SqliteToSql;
import fr.xephi.authme.datasource.converter.vAuthConverter; import fr.xephi.authme.datasource.converter.VAuthConverter;
import fr.xephi.authme.datasource.converter.xAuthConverter; import fr.xephi.authme.datasource.converter.XAuthConverter;
import fr.xephi.authme.initialization.factory.Factory; import fr.xephi.authme.initialization.factory.Factory;
import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.message.MessageKey;
import fr.xephi.authme.service.BukkitService; import fr.xephi.authme.service.BukkitService;
@ -78,11 +78,11 @@ public class ConverterCommand implements ExecutableCommand {
*/ */
private static Map<String, Class<? extends Converter>> getConverters() { private static Map<String, Class<? extends Converter>> getConverters() {
return ImmutableMap.<String, Class<? extends Converter>>builder() return ImmutableMap.<String, Class<? extends Converter>>builder()
.put("xauth", xAuthConverter.class) .put("xauth", XAuthConverter.class)
.put("crazylogin", CrazyLoginConverter.class) .put("crazylogin", CrazyLoginConverter.class)
.put("rakamak", RakamakConverter.class) .put("rakamak", RakamakConverter.class)
.put("royalauth", RoyalAuthConverter.class) .put("royalauth", RoyalAuthConverter.class)
.put("vauth", vAuthConverter.class) .put("vauth", VAuthConverter.class)
.put("sqlitetosql", SqliteToSql.class) .put("sqlitetosql", SqliteToSql.class)
.put("mysqltosqlite", MySqlToSqlite.class) .put("mysqltosqlite", MySqlToSqlite.class)
.build(); .build();

4
src/main/java/fr/xephi/authme/datasource/converter/vAuthConverter.java → src/main/java/fr/xephi/authme/datasource/converter/VAuthConverter.java
View File

@ -16,13 +16,13 @@ import java.util.UUID;
import static fr.xephi.authme.util.FileUtils.makePath; import static fr.xephi.authme.util.FileUtils.makePath;
public class vAuthConverter implements Converter { public class VAuthConverter implements Converter {
private final DataSource dataSource; private final DataSource dataSource;
private final File vAuthPasswordsFile; private final File vAuthPasswordsFile;
@Inject @Inject
vAuthConverter(@DataFolder File dataFolder, DataSource dataSource) { VAuthConverter(@DataFolder File dataFolder, DataSource dataSource) {
vAuthPasswordsFile = new File(dataFolder.getParent(), makePath("vAuth", "passwords.yml")); vAuthPasswordsFile = new File(dataFolder.getParent(), makePath("vAuth", "passwords.yml"));
this.dataSource = dataSource; this.dataSource = dataSource;
} }

4
src/main/java/fr/xephi/authme/datasource/converter/xAuthConverter.java → src/main/java/fr/xephi/authme/datasource/converter/XAuthConverter.java
View File

@ -21,7 +21,7 @@ import java.util.List;
import static fr.xephi.authme.util.FileUtils.makePath; import static fr.xephi.authme.util.FileUtils.makePath;
public class xAuthConverter implements Converter { public class XAuthConverter implements Converter {
@Inject @Inject
@DataFolder @DataFolder
@ -31,7 +31,7 @@ public class xAuthConverter implements Converter {
@Inject @Inject
private PluginManager pluginManager; private PluginManager pluginManager;
xAuthConverter() { XAuthConverter() {
} }
@Override @Override

2
src/main/java/fr/xephi/authme/security/HashAlgorithm.java
View File

@ -35,7 +35,7 @@ public enum HashAlgorithm {
WBB4(fr.xephi.authme.security.crypts.Wbb4.class), WBB4(fr.xephi.authme.security.crypts.Wbb4.class),
WHIRLPOOL(fr.xephi.authme.security.crypts.Whirlpool.class), WHIRLPOOL(fr.xephi.authme.security.crypts.Whirlpool.class),
WORDPRESS(fr.xephi.authme.security.crypts.Wordpress.class), WORDPRESS(fr.xephi.authme.security.crypts.Wordpress.class),
XAUTH(fr.xephi.authme.security.crypts.Xauth.class), XAUTH(fr.xephi.authme.security.crypts.XAuth.class),
XFBCRYPT(fr.xephi.authme.security.crypts.XfBCrypt.class), XFBCRYPT(fr.xephi.authme.security.crypts.XfBCrypt.class),
CUSTOM(null); CUSTOM(null);

2
src/main/java/fr/xephi/authme/security/crypts/Xauth.java → src/main/java/fr/xephi/authme/security/crypts/XAuth.java
View File

@ -4,7 +4,7 @@ import fr.xephi.authme.security.crypts.description.Recommendation;
import fr.xephi.authme.security.crypts.description.Usage; import fr.xephi.authme.security.crypts.description.Usage;
@Recommendation(Usage.RECOMMENDED) @Recommendation(Usage.RECOMMENDED)
public class Xauth extends HexSaltedMethod { public class XAuth extends HexSaltedMethod {
private static String getWhirlpool(String message) { private static String getWhirlpool(String message) {
Whirlpool w = new Whirlpool(); Whirlpool w = new Whirlpool();

8
src/test/java/fr/xephi/authme/security/crypts/XauthTest.java → src/test/java/fr/xephi/authme/security/crypts/XAuthTest.java
View File

@ -1,12 +1,12 @@
package fr.xephi.authme.security.crypts; package fr.xephi.authme.security.crypts;
/** /**
* Test for {@link Xauth}. * Test for {@link XAuth}.
*/ */
public class XauthTest extends AbstractEncryptionMethodTest { public class XAuthTest extends AbstractEncryptionMethodTest {
public XauthTest() { public XAuthTest() {
super(new Xauth(), super(new XAuth(),
"e54d4916577410d26d2f6e9362445463dab9ffdff9a67ed3b74d3f2312bc8fab84f653fcb88ad8338793ef8a6d0a1162105e46ec24f0dcb52355c634e3e6439f45444b09c715", // password "e54d4916577410d26d2f6e9362445463dab9ffdff9a67ed3b74d3f2312bc8fab84f653fcb88ad8338793ef8a6d0a1162105e46ec24f0dcb52355c634e3e6439f45444b09c715", // password
"d54489a4fd4732ee03d56810ab92944096e3d49335266adeecfbc12567abb3ff744761b33a1fcc4d04739e377775c788e4baace3caf35c7b9176b82b1fe3472e4cbdc5a43214", // PassWord1 "d54489a4fd4732ee03d56810ab92944096e3d49335266adeecfbc12567abb3ff744761b33a1fcc4d04739e377775c788e4baace3caf35c7b9176b82b1fe3472e4cbdc5a43214", // PassWord1
"ce6404c1092fb5abf0a72f9c4327bfe8f4cdc4b8dc90ee6ca35c42b8ae9481b89c2559bb60b99ff2b57a102cfced40b8e2f5ef481400c9e6f79445017fc763b1cc27f4c2df36", // &^%te$t?Pw@_ "ce6404c1092fb5abf0a72f9c4327bfe8f4cdc4b8dc90ee6ca35c42b8ae9481b89c2559bb60b99ff2b57a102cfced40b8e2f5ef481400c9e6f79445017fc763b1cc27f4c2df36", // &^%te$t?Pw@_