removeUserData methods now have no return value. No Exception -> success.

This commit is contained in:
Rsl1122 2017-09-02 17:33:49 +03:00
parent 003c366fc7
commit 1f31f472bd
8 changed files with 29 additions and 34 deletions

View File

@ -85,11 +85,8 @@ public class ManageRemoveCommand extends SubCommand {
sender.sendMessage(Locale.get(Msg.MANAGE_INFO_START).parse()); sender.sendMessage(Locale.get(Msg.MANAGE_INFO_START).parse());
try { try {
// TODO Clear active session of user & start new one // TODO Clear active session of user & start new one
if (plugin.getDB().removeAccount(uuid)) { plugin.getDB().removeAccount(uuid);
sender.sendMessage(Locale.get(Msg.MANAGE_INFO_REMOVE_SUCCESS).parse(playerName, plugin.getDB().getConfigName())); sender.sendMessage(Locale.get(Msg.MANAGE_INFO_REMOVE_SUCCESS).parse(playerName, plugin.getDB().getConfigName()));
} else {
sender.sendMessage(Locale.get(Msg.MANAGE_INFO_FAIL).toString());
}
} catch (SQLException e) { } catch (SQLException e) {
Log.toLog(this.getClass().getName(), e); Log.toLog(this.getClass().getName(), e);
sender.sendMessage(Locale.get(Msg.MANAGE_INFO_FAIL).toString()); sender.sendMessage(Locale.get(Msg.MANAGE_INFO_FAIL).toString());

View File

@ -185,10 +185,9 @@ public abstract class Database {
* Removes all data related to an account from the database. * Removes all data related to an account from the database.
* *
* @param uuid UUID of the account. * @param uuid UUID of the account.
* @return Success of the removal.
* @throws SQLException If a database error occurs. * @throws SQLException If a database error occurs.
*/ */
public abstract boolean removeAccount(UUID uuid) throws SQLException; public abstract void removeAccount(UUID uuid) throws SQLException;
/** /**
* Used to clear all data from the database. * Used to clear all data from the database.

View File

@ -200,9 +200,9 @@ public abstract class SQLDB extends Database {
} }
} }
public boolean removeAccount(UUID uuid) throws SQLException { public void removeAccount(UUID uuid) throws SQLException {
if (uuid == null) { if (uuid == null) {
return false; return;
} }
try { try {
@ -215,15 +215,8 @@ public abstract class SQLDB extends Database {
} }
UserIDTable table = (UserIDTable) t; UserIDTable table = (UserIDTable) t;
if (!table.removeUser(uuid)) { table.removeUser(uuid);
throw new IllegalStateException("Removal Failed");
}
} }
return true;
} catch (Exception e) {
Log.toLog(this.getClass().getName(), e);
return false;
} finally { } finally {
Benchmark.stop("Database", "Remove Account"); Benchmark.stop("Database", "Remove Account");
setAvailable(); setAvailable();

View File

@ -1,7 +1,6 @@
package main.java.com.djrapitops.plan.database.tables; package main.java.com.djrapitops.plan.database.tables;
import com.djrapitops.plugin.utilities.Verify; import com.djrapitops.plugin.utilities.Verify;
import main.java.com.djrapitops.plan.Log;
import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.Plan;
import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException; import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException;
import main.java.com.djrapitops.plan.data.PlayerKill; import main.java.com.djrapitops.plan.data.PlayerKill;
@ -56,7 +55,7 @@ public class KillsTable extends UserIDTable {
} }
@Override @Override
public boolean removeUser(UUID uuid) { public void removeUser(UUID uuid) throws SQLException{
PreparedStatement statement = null; PreparedStatement statement = null;
try { try {
statement = prepareStatement("DELETE FROM " + tableName + statement = prepareStatement("DELETE FROM " + tableName +
@ -67,10 +66,6 @@ public class KillsTable extends UserIDTable {
statement.execute(); statement.execute();
commit(statement.getConnection()); commit(statement.getConnection());
return true;
} catch (SQLException ex) {
Log.toLog(this.getClass().getName(), ex);
return false;
} finally { } finally {
close(statement); close(statement);
} }

View File

@ -1,6 +1,5 @@
package main.java.com.djrapitops.plan.database.tables; package main.java.com.djrapitops.plan.database.tables;
import main.java.com.djrapitops.plan.Log;
import main.java.com.djrapitops.plan.database.databases.SQLDB; import main.java.com.djrapitops.plan.database.databases.SQLDB;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
@ -23,7 +22,7 @@ public abstract class UserIDTable extends Table {
usersTable = db.getUsersTable(); usersTable = db.getUsersTable();
} }
public boolean removeUser(UUID uuid) { public void removeUser(UUID uuid) throws SQLException {
PreparedStatement statement = null; PreparedStatement statement = null;
try { try {
statement = prepareStatement("DELETE FROM " + tableName + statement = prepareStatement("DELETE FROM " + tableName +
@ -32,10 +31,6 @@ public abstract class UserIDTable extends Table {
statement.execute(); statement.execute();
commit(statement.getConnection()); commit(statement.getConnection());
return true;
} catch (SQLException ex) {
Log.toLog(this.getClass().getName(), ex);
return false;
} finally { } finally {
close(statement); close(statement);
} }

View File

@ -77,7 +77,7 @@ public class UsersTable extends UserIDTable {
* @return if the removal was successful. * @return if the removal was successful.
*/ */
@Override @Override
public boolean removeUser(UUID uuid) { public void removeUser(UUID uuid) throws SQLException {
PreparedStatement statement = null; PreparedStatement statement = null;
try { try {
statement = prepareStatement("DELETE FROM " + tableName + " WHERE (" + columnUUID + "=?)"); statement = prepareStatement("DELETE FROM " + tableName + " WHERE (" + columnUUID + "=?)");
@ -85,9 +85,6 @@ public class UsersTable extends UserIDTable {
statement.execute(); statement.execute();
commit(statement.getConnection()); commit(statement.getConnection());
return true;
} catch (SQLException ex) {
return false;
} finally { } finally {
close(statement); close(statement);
} }

View File

@ -210,7 +210,6 @@ public class WorldTimesTable extends UserIDTable {
try { try {
String worldIDColumn = worldTable + "." + worldTable.getColumnID(); String worldIDColumn = worldTable + "." + worldTable.getColumnID();
String worldNameColumn = worldTable + "." + worldTable.getColumnWorldName() + " as world_name"; String worldNameColumn = worldTable + "." + worldTable.getColumnWorldName() + " as world_name";
String sessionIDColumn = sessionsTable + "." + sessionsTable.getColumnID();
statement = prepareStatement("SELECT " + statement = prepareStatement("SELECT " +
"SUM(" + columnSurvival + ") as survival, " + "SUM(" + columnSurvival + ") as survival, " +
"SUM(" + columnCreative + ") as creative, " + "SUM(" + columnCreative + ") as creative, " +

View File

@ -0,0 +1,20 @@
package main.java.com.djrapitops.plan.database.tables;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
/**
* //TODO Class Javadoc Comment
*
* @author Rsl1122
*/
public class ActionsTest {
@Test
public void getUnknownActionsEnum() {
Actions action = Actions.getById(Integer.MIN_VALUE);
assertEquals(Actions.UNKNOWN, action);
}
}