diff --git a/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java b/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java index 141b4fc0..50c61351 100644 --- a/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java +++ b/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java @@ -138,16 +138,6 @@ public class CacheDataSource implements DataSource { return result; } - @Override - public Set autoPurgeDatabase(long until) { - Set cleared = source.autoPurgeDatabase(until); - for (String name : cleared) { - cachedAuths.invalidate(name); - } - - return cleared; - } - @Override public Set getRecordsToPurge(long until) { return source.getRecordsToPurge(until); diff --git a/src/main/java/fr/xephi/authme/datasource/DataSource.java b/src/main/java/fr/xephi/authme/datasource/DataSource.java index c0415858..67484172 100644 --- a/src/main/java/fr/xephi/authme/datasource/DataSource.java +++ b/src/main/java/fr/xephi/authme/datasource/DataSource.java @@ -69,15 +69,6 @@ public interface DataSource extends Reloadable { */ boolean updatePassword(String user, HashedPassword password); - /** - * Purge all records in the database whose last login was longer ago than - * the given time if they do not have the bypass permission. - * - * @param until The minimum last login - * @return The account names that have been removed - */ - Set autoPurgeDatabase(long until); - /** * Get all records in the database whose last login was before the given time. * diff --git a/src/main/java/fr/xephi/authme/datasource/FlatFile.java b/src/main/java/fr/xephi/authme/datasource/FlatFile.java index 1c4e8fba..5464e0cb 100644 --- a/src/main/java/fr/xephi/authme/datasource/FlatFile.java +++ b/src/main/java/fr/xephi/authme/datasource/FlatFile.java @@ -229,40 +229,6 @@ public class FlatFile implements DataSource { return true; } - @Override - public Set autoPurgeDatabase(long until) { - BufferedReader br = null; - BufferedWriter bw = null; - ArrayList lines = new ArrayList<>(); - Set cleared = new HashSet<>(); - try { - br = new BufferedReader(new FileReader(source)); - String line; - while ((line = br.readLine()) != null) { - String[] args = line.split(":"); - if (args.length >= 4) { - if (Long.parseLong(args[3]) >= until) { - lines.add(line); - continue; - } - } - cleared.add(args[0]); - } - bw = new BufferedWriter(new FileWriter(source)); - for (String l : lines) { - bw.write(l + "\n"); - } - } catch (IOException ex) { - ConsoleLogger.showError(ex.getMessage()); - return cleared; - } finally { - silentClose(br); - silentClose(bw); - } - - return cleared; - } - @Override public Set getRecordsToPurge(long until) { BufferedReader br = null; diff --git a/src/main/java/fr/xephi/authme/datasource/MySQL.java b/src/main/java/fr/xephi/authme/datasource/MySQL.java index ac96714d..02aa66e3 100644 --- a/src/main/java/fr/xephi/authme/datasource/MySQL.java +++ b/src/main/java/fr/xephi/authme/datasource/MySQL.java @@ -612,29 +612,6 @@ public class MySQL implements DataSource { return false; } - @Override - public Set autoPurgeDatabase(long until) { - Set list = new HashSet<>(); - String select = "SELECT " + col.NAME + " FROM " + tableName + " WHERE " + col.LAST_LOGIN + " getRecordsToPurge(long until) { Set list = new HashSet<>(); diff --git a/src/main/java/fr/xephi/authme/datasource/SQLite.java b/src/main/java/fr/xephi/authme/datasource/SQLite.java index f5cac059..7a0a5c8d 100644 --- a/src/main/java/fr/xephi/authme/datasource/SQLite.java +++ b/src/main/java/fr/xephi/authme/datasource/SQLite.java @@ -292,28 +292,6 @@ public class SQLite implements DataSource { return false; } - @Override - public Set autoPurgeDatabase(long until) { - Set list = new HashSet<>(); - String select = "SELECT " + col.NAME + " FROM " + tableName + " WHERE " + col.LAST_LOGIN + " getRecordsToPurge(long until) { Set list = new HashSet<>();