ineanto/nicko
1
0
Fork 0
Code Issues Pull requests Activity

feat(error): simplify error management regarding data-related operations

Browse source
This commit is contained in:
ineanto 2024-08-27 18:56:55 +02:00
parent df988dbf87
commit 5197fefdaf
Signed by: ineanto
GPG key ID: E511F9CAA2F9CE84
9 changed files with 24 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/xyz/ineanto/nicko/appearance/ActionResult.java
View file

@ -8,6 +8,10 @@ public class ActionResult {
return new ActionResult(); return new ActionResult();
} }
public static ActionResult error() {
return new ActionResult(null);
}
public static ActionResult error(String errorMessage) { public static ActionResult error(String errorMessage) {
return new ActionResult(errorMessage); return new ActionResult(errorMessage);
} }

2
src/main/java/xyz/ineanto/nicko/appearance/AppearanceManager.java
View file

@ -129,7 +129,7 @@ public class AppearanceManager {
reset(); reset();
return ActionResult.error(I18NDict.Error.MOJANG_NAME); return ActionResult.error(I18NDict.Error.MOJANG_NAME);
} catch (InterruptedException e) { } catch (InterruptedException e) {
return ActionResult.error(I18NDict.Error.GENERIC); return ActionResult.error("Unknown error");
} }
} }
return ActionResult.ok(); return ActionResult.ok();

3
src/main/java/xyz/ineanto/nicko/i18n/I18NDict.java
View file

@ -4,13 +4,10 @@ public class I18NDict {
public static class Error { public static class Error {
public static final String ERROR_KEY = "error."; public static final String ERROR_KEY = "error.";
public static final String GENERIC = ERROR_KEY + "generic";
public static final String PERMISSION = ERROR_KEY + "permission"; public static final String PERMISSION = ERROR_KEY + "permission";
public static final String CACHE = ERROR_KEY + "cache"; public static final String CACHE = ERROR_KEY + "cache";
public static final String MOJANG_NAME = ERROR_KEY + "mojang_name"; public static final String MOJANG_NAME = ERROR_KEY + "mojang_name";
public static final String MOJANG_SKIN = ERROR_KEY + "mojang_skin"; public static final String MOJANG_SKIN = ERROR_KEY + "mojang_skin";
public static final String DATABASE = ERROR_KEY + "database";
public static final String JSON = ERROR_KEY + "json";
} }
public static class Event { public static class Event {

8
src/main/java/xyz/ineanto/nicko/storage/PlayerDataStore.java
View file

@ -77,12 +77,12 @@ public class PlayerDataStore {
} }
public ActionResult saveData(Player player) { public ActionResult saveData(Player player) {
if (storage.isError()) return ActionResult.error(I18NDict.Error.DATABASE); if (storage.isError()) return ActionResult.error();
if (cache.isError()) return ActionResult.error(I18NDict.Error.CACHE); if (cache.isError()) return ActionResult.error();
if (!cache.isCached(player.getUniqueId())) return ActionResult.error(I18NDict.Error.CACHE); if (!cache.isCached(player.getUniqueId())) return ActionResult.error();
final Optional<NickoProfile> cachedProfile = cache.retrieve(player.getUniqueId()); final Optional<NickoProfile> cachedProfile = cache.retrieve(player.getUniqueId());
if (cachedProfile.isEmpty()) return ActionResult.error(I18NDict.Error.CACHE); if (cachedProfile.isEmpty()) return ActionResult.error();
cache.delete(player.getUniqueId()); cache.delete(player.getUniqueId());
return storage.store(player.getUniqueId(), cachedProfile.get()); return storage.store(player.getUniqueId(), cachedProfile.get());

7
src/main/java/xyz/ineanto/nicko/storage/json/JSONStorage.java
View file

@ -5,7 +5,6 @@ import com.google.gson.GsonBuilder;
import xyz.ineanto.nicko.NickoBukkit; import xyz.ineanto.nicko.NickoBukkit;
import xyz.ineanto.nicko.appearance.ActionResult; import xyz.ineanto.nicko.appearance.ActionResult;
import xyz.ineanto.nicko.profile.NickoProfile; import xyz.ineanto.nicko.profile.NickoProfile;
import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.ineanto.nicko.storage.Storage; import xyz.ineanto.nicko.storage.Storage;
import xyz.ineanto.nicko.storage.StorageProvider; import xyz.ineanto.nicko.storage.StorageProvider;
@ -42,12 +41,12 @@ public class JSONStorage extends Storage {
} }
} catch (IOException e) { } catch (IOException e) {
logger.warning("Could not write to file."); logger.warning("Could not write to file.");
return ActionResult.error(I18NDict.Error.JSON); return ActionResult.error();
} }
} }
} catch (IOException e) { } catch (IOException e) {
logger.warning("Could not create file."); logger.warning("Could not create file.");
return ActionResult.error(I18NDict.Error.JSON); return ActionResult.error();
} }
return ActionResult.ok(); return ActionResult.ok();
@ -81,7 +80,7 @@ public class JSONStorage extends Storage {
if (file.delete() || !file.exists()) { if (file.delete() || !file.exists()) {
return ActionResult.ok(); return ActionResult.ok();
} }
return ActionResult.error(I18NDict.Error.JSON); return ActionResult.error();
} }
private boolean checkFileExists(File file) throws IOException { private boolean checkFileExists(File file) throws IOException {

11
src/main/java/xyz/ineanto/nicko/storage/mariadb/MariaDBStorage.java
View file

@ -2,7 +2,6 @@ package xyz.ineanto.nicko.storage.mariadb;
import xyz.ineanto.nicko.appearance.ActionResult; import xyz.ineanto.nicko.appearance.ActionResult;
import xyz.ineanto.nicko.config.Configuration; import xyz.ineanto.nicko.config.Configuration;
import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.ineanto.nicko.i18n.Locale; import xyz.ineanto.nicko.i18n.Locale;
import xyz.ineanto.nicko.profile.NickoProfile; import xyz.ineanto.nicko.profile.NickoProfile;
import xyz.ineanto.nicko.storage.Storage; import xyz.ineanto.nicko.storage.Storage;
@ -36,7 +35,7 @@ public class MariaDBStorage extends Storage {
@Override @Override
public ActionResult store(UUID uuid, NickoProfile profile) { public ActionResult store(UUID uuid, NickoProfile profile) {
final Connection connection = getProvider().getConnection(); final Connection connection = getProvider().getConnection();
if (connection == null) return ActionResult.error(I18NDict.Error.DATABASE); if (connection == null) return ActionResult.error();
try { try {
final PreparedStatement statement = isStored(uuid) ? final PreparedStatement statement = isStored(uuid) ?
@ -45,7 +44,7 @@ public class MariaDBStorage extends Storage {
return ActionResult.ok(); return ActionResult.ok();
} catch (SQLException e) { } catch (SQLException e) {
logger.warning("Couldn't send SQL Request: " + e.getMessage()); logger.warning("Couldn't send SQL Request: " + e.getMessage());
return ActionResult.error(I18NDict.Error.DATABASE); return ActionResult.error();
} }
} }
@ -103,17 +102,17 @@ public class MariaDBStorage extends Storage {
@Override @Override
public ActionResult delete(UUID uuid) { public ActionResult delete(UUID uuid) {
final Connection connection = getProvider().getConnection(); final Connection connection = getProvider().getConnection();
if (connection == null) return ActionResult.error(I18NDict.Error.DATABASE); if (connection == null) return ActionResult.error();
try { try {
final String sql = "DELETE FROM nicko.DATA WHERE uuid = ?"; final String sql = "DELETE FROM nicko.DATA WHERE uuid = ?";
final PreparedStatement statement = connection.prepareStatement(sql); final PreparedStatement statement = connection.prepareStatement(sql);
statement.setString(1, uuid.toString()); statement.setString(1, uuid.toString());
int rows = statement.executeUpdate(); int rows = statement.executeUpdate();
return (rows == 1 ? ActionResult.ok() : ActionResult.error(I18NDict.Error.DATABASE)); return (rows == 1 ? ActionResult.ok() : ActionResult.error());
} catch (SQLException e) { } catch (SQLException e) {
logger.warning("Couldn't delete profile: " + e.getMessage()); logger.warning("Couldn't delete profile: " + e.getMessage());
return ActionResult.error(I18NDict.Error.DATABASE); return ActionResult.error();
} }
} }

11
src/main/java/xyz/ineanto/nicko/storage/mysql/MySQLStorage.java
View file

@ -2,7 +2,6 @@ package xyz.ineanto.nicko.storage.mysql;
import xyz.ineanto.nicko.appearance.ActionResult; import xyz.ineanto.nicko.appearance.ActionResult;
import xyz.ineanto.nicko.config.Configuration; import xyz.ineanto.nicko.config.Configuration;
import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.ineanto.nicko.i18n.Locale; import xyz.ineanto.nicko.i18n.Locale;
import xyz.ineanto.nicko.profile.NickoProfile; import xyz.ineanto.nicko.profile.NickoProfile;
import xyz.ineanto.nicko.storage.Storage; import xyz.ineanto.nicko.storage.Storage;
@ -36,7 +35,7 @@ public class MySQLStorage extends Storage {
@Override @Override
public ActionResult store(UUID uuid, NickoProfile profile) { public ActionResult store(UUID uuid, NickoProfile profile) {
final Connection connection = getProvider().getConnection(); final Connection connection = getProvider().getConnection();
if (connection == null) return ActionResult.error(I18NDict.Error.DATABASE); if (connection == null) return ActionResult.error();
try { try {
final PreparedStatement statement = isStored(uuid) ? final PreparedStatement statement = isStored(uuid) ?
@ -45,7 +44,7 @@ public class MySQLStorage extends Storage {
return ActionResult.ok(); return ActionResult.ok();
} catch (SQLException e) { } catch (SQLException e) {
logger.warning("Couldn't send SQL Request: " + e.getMessage()); logger.warning("Couldn't send SQL Request: " + e.getMessage());
return ActionResult.error(I18NDict.Error.DATABASE); return ActionResult.error();
} }
} }
@ -103,17 +102,17 @@ public class MySQLStorage extends Storage {
@Override @Override
public ActionResult delete(UUID uuid) { public ActionResult delete(UUID uuid) {
final Connection connection = getProvider().getConnection(); final Connection connection = getProvider().getConnection();
if (connection == null) return ActionResult.error(I18NDict.Error.DATABASE); if (connection == null) return ActionResult.error();
try { try {
final String sql = "DELETE FROM nicko.DATA WHERE uuid = ?"; final String sql = "DELETE FROM nicko.DATA WHERE uuid = ?";
final PreparedStatement statement = connection.prepareStatement(sql); final PreparedStatement statement = connection.prepareStatement(sql);
statement.setString(1, uuid.toString()); statement.setString(1, uuid.toString());
int rows = statement.executeUpdate(); int rows = statement.executeUpdate();
return (rows == 1 ? ActionResult.ok() : ActionResult.error(I18NDict.Error.DATABASE)); return (rows == 1 ? ActionResult.ok() : ActionResult.error());
} catch (SQLException e) { } catch (SQLException e) {
logger.warning("Couldn't delete profile: " + e.getMessage()); logger.warning("Couldn't delete profile: " + e.getMessage());
return ActionResult.error(I18NDict.Error.DATABASE); return ActionResult.error();
} }
} }

5
src/main/resources/en.yml
View file

@ -1,17 +1,14 @@
# Nicko ${version} - Language File: # Nicko ${version} - Language File:
# Specifies the configuration version, don't change. # Specifies the configuration version, don't change.
version: "1.1.3" version: "1.1.4"
error: error:
generic: "An unknown error occurred."
permission: "§cYou do not have the required permission." permission: "§cYou do not have the required permission."
invalid_username: "§cThis is not a valid Minecraft username." invalid_username: "§cThis is not a valid Minecraft username."
mojang_name: "There is no Minecraft account with this name." mojang_name: "There is no Minecraft account with this name."
mojang_skin: "This Minecraft account has no skin." mojang_skin: "This Minecraft account has no skin."
cache: "Unable to get skin from the cache." cache: "Unable to get skin from the cache."
sql: "SQL Error"
json: "JSON Error"
event: event:
settings: settings:

5
src/main/resources/fr.yml
View file

@ -1,17 +1,14 @@
# Nicko ${version} - Fichier de langue: # Nicko ${version} - Fichier de langue:
# Précise la version de la configuration, ne pas changer. # Précise la version de la configuration, ne pas changer.
version: "1.1.3" version: "1.1.4"
error: error:
generic: "Une erreur inconnue c'est produite."
permission: "§cVous ne possédez pas la permission." permission: "§cVous ne possédez pas la permission."
invalid_username: "§cLe pseudo n'est pas un pseudo Minecraft valide." invalid_username: "§cLe pseudo n'est pas un pseudo Minecraft valide."
mojang_name: "Compte Minecraft inexistant" mojang_name: "Compte Minecraft inexistant"
mojang_skin: "Skin Minecraft invalide" mojang_skin: "Skin Minecraft invalide"
cache: "Erreur du cache" cache: "Erreur du cache"
database: "Erreur SQL"
json: "Erreur JSON"
event: event:
settings: settings: