Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-10-04 09:27:27 +02:00
Code Issues Projects Releases Wiki Activity

Renamed some OptionalFetchQueries to start with fetch

Browse Source
This commit is contained in:
Rsl1122 2019-01-26 11:28:39 +02:00
parent dcde2e559f
commit 35e967e2eb
12 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plan/common/src/main/java/com/djrapitops/plan/command/commands/AnalyzeCommand.java
View File

@ -125,7 +125,7 @@ public class AnalyzeCommand extends CommandNode {
private void sendWebUserNotificationIfNecessary(Sender sender) {
if (webServer.isAuthRequired() &&
CommandUtils.isPlayer(sender) &&
!dbSystem.getDatabase().query(OptionalFetchQueries.webUser(sender.getName())).isPresent()) {
!dbSystem.getDatabase().query(OptionalFetchQueries.fetchWebUser(sender.getName())).isPresent()) {
sender.sendMessage("§e" + locale.getString(CommandLang.NO_WEB_USER_NOTIFY));
}
}
@ -133,7 +133,7 @@ public class AnalyzeCommand extends CommandNode {
private Optional<Server> getServer(String[] args) {
if (args.length >= 1 && connectionSystem.isServerAvailable()) {
String serverIdentifier = getGivenIdentifier(args);
return dbSystem.getDatabase().query(OptionalFetchQueries.matchingServerIdentifier(serverIdentifier))
return dbSystem.getDatabase().query(OptionalFetchQueries.fetchMatchingServerIdentifier(serverIdentifier))
.filter(server -> !server.isProxy());
}
return Optional.empty();

2
Plan/common/src/main/java/com/djrapitops/plan/command/commands/InspectCommand.java
View File

@ -119,7 +119,7 @@ public class InspectCommand extends CommandNode {
private void checkWebUserAndNotify(Sender sender) {
if (CommandUtils.isPlayer(sender) && webServer.isAuthRequired()) {
boolean senderHasWebUser = dbSystem.getDatabase().query(OptionalFetchQueries.webUser(sender.getName())).isPresent();
boolean senderHasWebUser = dbSystem.getDatabase().query(OptionalFetchQueries.fetchWebUser(sender.getName())).isPresent();
if (!senderHasWebUser) {
sender.sendMessage("§e" + locale.getString(CommandLang.NO_WEB_USER_NOTIFY));

2
Plan/common/src/main/java/com/djrapitops/plan/command/commands/RegisterCommand.java
View File

@ -148,7 +148,7 @@ public class RegisterCommand extends CommandNode {
String userName = webUser.getName();
try {
Database database = dbSystem.getDatabase();
boolean userExists = database.query(OptionalFetchQueries.webUser(userName)).isPresent();
boolean userExists = database.query(OptionalFetchQueries.fetchWebUser(userName)).isPresent();
if (userExists) {
sender.sendMessage(locale.getString(CommandLang.FAIL_WEB_USER_EXISTS));
return;

2
Plan/common/src/main/java/com/djrapitops/plan/command/commands/manage/ManageUninstalledCommand.java
View File

@ -103,7 +103,7 @@ public class ManageUninstalledCommand extends CommandNode {
private Optional<Server> getServer(String[] args) {
if (args.length >= 1) {
String serverIdentifier = getGivenIdentifier(args);
return dbSystem.getDatabase().query(OptionalFetchQueries.matchingServerIdentifier(serverIdentifier))
return dbSystem.getDatabase().query(OptionalFetchQueries.fetchMatchingServerIdentifier(serverIdentifier))
.filter(Server::isNotProxy);
}
return Optional.empty();

2
Plan/common/src/main/java/com/djrapitops/plan/command/commands/webuser/WebCheckCommand.java
View File

@ -79,7 +79,7 @@ public class WebCheckCommand extends CommandNode {
processing.submitNonCritical(() -> {
try {
Database db = dbSystem.getDatabase();
Optional<WebUser> found = db.query(OptionalFetchQueries.webUser(user));
Optional<WebUser> found = db.query(OptionalFetchQueries.fetchWebUser(user));
if (!found.isPresent()) {
sender.sendMessage(locale.getString(CommandLang.FAIL_WEB_USER_NOT_EXISTS));
return;

2
Plan/common/src/main/java/com/djrapitops/plan/command/commands/webuser/WebDeleteCommand.java
View File

@ -79,7 +79,7 @@ public class WebDeleteCommand extends CommandNode {
processing.submitNonCritical(() -> {
try {
Database db = dbSystem.getDatabase();
Optional<WebUser> found = db.query(OptionalFetchQueries.webUser(user));
Optional<WebUser> found = db.query(OptionalFetchQueries.fetchWebUser(user));
if (!found.isPresent()) {
sender.sendMessage("§c[Plan] User Doesn't exist.");
return;

9
Plan/common/src/main/java/com/djrapitops/plan/db/sql/queries/OptionalFetchQueries.java
View File

@ -42,7 +42,7 @@ public class OptionalFetchQueries {
/* Static method class */
}
public static Query<Optional<Server>> matchingServerIdentifier(String identifier) {
public static Query<Optional<Server>> fetchMatchingServerIdentifier(String identifier) {
String sql = "SELECT * FROM " + ServerTable.TABLE_NAME +
" WHERE (" + ServerTable.SERVER_ID + "=?" +
" OR LOWER(" + ServerTable.NAME + ") LIKE LOWER(?)" +
@ -74,8 +74,8 @@ public class OptionalFetchQueries {
};
}
public static Query<Optional<Server>> proxyServerInformation() {
return db -> db.query(matchingServerIdentifier("BungeeCord"));
public static Query<Optional<Server>> fetchProxyServerInformation() {
return db -> db.query(fetchMatchingServerIdentifier("BungeeCord"));
}
public static Query<Optional<String>> playerUserName(UUID playerUUID) {
@ -98,7 +98,7 @@ public class OptionalFetchQueries {
};
}
public static Query<Optional<WebUser>> webUser(String called) {
public static Query<Optional<WebUser>> fetchWebUser(String called) {
String sql = "SELECT * FROM " + SecurityTable.TABLE_NAME +
" WHERE " + SecurityTable.USERNAME + "=? LIMIT 1";
return new QueryStatement<Optional<WebUser>>(sql) {
@ -118,5 +118,4 @@ public class OptionalFetchQueries {
}
};
}
}

2
Plan/common/src/main/java/com/djrapitops/plan/db/sql/queries/containers/NetworkContainerQuery.java
View File

@ -48,7 +48,7 @@ public class NetworkContainerQuery implements Query<NetworkContainer> {
private static Query<ServerContainer> getBungeeServerContainer() {
return db -> {
Optional<Server> proxyInformation = db.query(OptionalFetchQueries.proxyServerInformation());
Optional<Server> proxyInformation = db.query(OptionalFetchQueries.fetchProxyServerInformation());
if (!proxyInformation.isPresent()) {
return new ServerContainer();
}

4
Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLFetchOps.java
View File

@ -89,7 +89,7 @@ public class SQLFetchOps extends SQLOps implements FetchOperations {
@Override
public WebUser getWebUser(String username) {
return db.query(OptionalFetchQueries.webUser(username)).orElse(null);
return db.query(OptionalFetchQueries.fetchWebUser(username)).orElse(null);
}
@Override
@ -139,7 +139,7 @@ public class SQLFetchOps extends SQLOps implements FetchOperations {
@Override
public Optional<Server> getBungeeInformation() {
return db.query(OptionalFetchQueries.proxyServerInformation());
return db.query(OptionalFetchQueries.fetchProxyServerInformation());
}
@Override

2
Plan/common/src/main/java/com/djrapitops/plan/system/webserver/auth/BasicAuthentication.java
View File

@ -56,7 +56,7 @@ public class BasicAuthentication implements Authentication {
String passwordRaw = userInfo[1];
try {
WebUser webUser = database.query(OptionalFetchQueries.webUser(user))
WebUser webUser = database.query(OptionalFetchQueries.fetchWebUser(user))
.orElseThrow(() -> new WebUserAuthException(FailReason.USER_DOES_NOT_EXIST, user));
boolean correctPass = PassEncryptUtil.verifyPassword(passwordRaw, webUser.getSaltedPassHash());

4
Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java
View File

@ -310,7 +310,7 @@ public abstract class CommonDBTest {
db.getSecurityTable().addNewUser(expected);
commitTest();
Optional<WebUser> found = db.query(OptionalFetchQueries.webUser("Test"));
Optional<WebUser> found = db.query(OptionalFetchQueries.fetchWebUser("Test"));
assertTrue(found.isPresent());
assertEquals(expected, found.get());
}
@ -325,7 +325,7 @@ public abstract class CommonDBTest {
public void webUserIsRemoved() throws DBInitException {
webUserIsRegistered();
db.getSecurityTable().removeUser("Test");
assertFalse(db.query(OptionalFetchQueries.webUser("Test")).isPresent());
assertFalse(db.query(OptionalFetchQueries.fetchWebUser("Test")).isPresent());
}
@Test

4
Plan/common/src/test/java/com/djrapitops/plan/db/SQLiteTest.java
View File

@ -57,7 +57,7 @@ public class SQLiteTest extends CommonDBTest {
public void testServerTableBungeeSave() throws DBInitException {
ServerTable serverTable = db.getServerTable();
Optional<Server> bungeeInfo = db.query(OptionalFetchQueries.proxyServerInformation());
Optional<Server> bungeeInfo = db.query(OptionalFetchQueries.fetchProxyServerInformation());
assertFalse(bungeeInfo.isPresent());
UUID bungeeUUID = UUID.randomUUID();
@ -68,7 +68,7 @@ public class SQLiteTest extends CommonDBTest {
bungeeCord.setId(2);
bungeeInfo = db.query(OptionalFetchQueries.proxyServerInformation());
bungeeInfo = db.query(OptionalFetchQueries.fetchProxyServerInformation());
assertTrue(bungeeInfo.isPresent());
assertEquals(bungeeCord, bungeeInfo.get());