diff --git a/Plan/common/src/main/java/com/djrapitops/plan/data/store/keys/ServerKeys.java b/Plan/common/src/main/java/com/djrapitops/plan/data/store/keys/ServerKeys.java index 40009c56f..8f108e571 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/data/store/keys/ServerKeys.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/data/store/keys/ServerKeys.java @@ -25,7 +25,7 @@ import com.djrapitops.plan.data.store.Type; import com.djrapitops.plan.data.store.containers.PlayerContainer; import com.djrapitops.plan.data.store.objects.DateObj; import com.djrapitops.plan.data.time.WorldTimes; -import com.djrapitops.plan.extension.implementation.results.server.ExtensionServerData; +import com.djrapitops.plan.extension.implementation.results.ExtensionData; import java.util.List; import java.util.Map; @@ -64,5 +64,5 @@ public class ServerKeys { public static final Key> ALL_TIME_PEAK_PLAYERS = new Key<>(new Type>() {}, "all_time_peak_players"); public static final Key> RECENT_PEAK_PLAYERS = new Key<>(new Type>() {}, "recent_peak_players"); public static final Key> COMMAND_USAGE = new Key<>(new Type>() {}, "command_usage"); - public static final Key> EXTENSION_DATA = new Key<>(new Type>() {}, "extension_data"); + public static final Key> EXTENSION_DATA = new Key<>(new Type>() {}, "extension_data"); } \ No newline at end of file diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/server/ExtensionServerData.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionData.java similarity index 82% rename from Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/server/ExtensionServerData.java rename to Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionData.java index beb097772..50468b3ec 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/server/ExtensionServerData.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionData.java @@ -14,11 +14,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.extension.implementation.results.server; - -import com.djrapitops.plan.extension.implementation.results.ExtensionInformation; -import com.djrapitops.plan.extension.implementation.results.ExtensionTabData; -import com.djrapitops.plan.extension.implementation.results.ExtensionTableData; +package com.djrapitops.plan.extension.implementation.results; import java.util.*; @@ -27,7 +23,7 @@ import java.util.*; * * @author Rsl1122 */ -public class ExtensionServerData implements Comparable { +public class ExtensionData implements Comparable { private final int pluginID; @@ -35,7 +31,7 @@ public class ExtensionServerData implements Comparable { private Map tabs; - private ExtensionServerData(int pluginID) { + private ExtensionData(int pluginID) { this.pluginID = pluginID; tabs = new HashMap<>(); @@ -69,15 +65,15 @@ public class ExtensionServerData implements Comparable { } @Override - public int compareTo(ExtensionServerData o) { + public int compareTo(ExtensionData o) { return String.CASE_INSENSITIVE_ORDER.compare(this.extensionInformation.getPluginName(), o.extensionInformation.getPluginName()); } @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof ExtensionServerData)) return false; - ExtensionServerData that = (ExtensionServerData) o; + if (!(o instanceof ExtensionData)) return false; + ExtensionData that = (ExtensionData) o; return pluginID == that.pluginID && Objects.equals(extensionInformation, that.extensionInformation) && Objects.equals(tabs, that.tabs); @@ -90,10 +86,10 @@ public class ExtensionServerData implements Comparable { public static class Factory { - private final ExtensionServerData data; + private final ExtensionData data; public Factory(int pluginId) { - data = new ExtensionServerData(pluginId); + data = new ExtensionData(pluginId); } public Factory combine(Factory with) { @@ -127,7 +123,7 @@ public class ExtensionServerData implements Comparable { return Optional.ofNullable(data.tabs.get(tabName)); } - public ExtensionServerData build() { + public ExtensionData build() { return data; } } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/ExtensionPlayerData.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/ExtensionPlayerData.java deleted file mode 100644 index dba53f4a7..000000000 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/ExtensionPlayerData.java +++ /dev/null @@ -1,131 +0,0 @@ -/* - * This file is part of Player Analytics (Plan). - * - * Plan is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License v3 as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Plan is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Plan. If not, see . - */ -package com.djrapitops.plan.extension.implementation.results.player; - -import com.djrapitops.plan.extension.implementation.results.ExtensionInformation; -import com.djrapitops.plan.extension.implementation.results.ExtensionTabData; - -import java.util.*; - -/** - * Represents data of a single extension about a player. - * - * @author Rsl1122 - */ -public class ExtensionPlayerData implements Comparable { - - private final int pluginID; - - private ExtensionInformation extensionInformation; - - private List tabs; - - private ExtensionPlayerData(int pluginID) { - this.pluginID = pluginID; - - tabs = new ArrayList<>(); - } - - public int getPluginID() { - return pluginID; - } - - public ExtensionInformation getExtensionInformation() { - return extensionInformation; - } - - public boolean hasOnlyGenericTab() { - return tabs.size() == 1 && tabs.get(0).getTabInformation().getTabName().isEmpty(); - } - - public List getTabs() { - return tabs; - } - - @Override - public int compareTo(ExtensionPlayerData o) { - return String.CASE_INSENSITIVE_ORDER.compare(this.extensionInformation.getPluginName(), o.extensionInformation.getPluginName()); - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof ExtensionPlayerData)) return false; - ExtensionPlayerData that = (ExtensionPlayerData) o; - return pluginID == that.pluginID && - extensionInformation.equals(that.extensionInformation) && - tabs.equals(that.tabs); - } - - @Override - public int hashCode() { - return Objects.hash(pluginID, extensionInformation, tabs); - } - - public static class Factory { - - private final ExtensionPlayerData data; - - public Factory(int pluginId) { - data = new ExtensionPlayerData(pluginId); - } - - public Factory setInformation(ExtensionInformation information) { - if (information.getId() != data.pluginID) { - throw new IllegalArgumentException("ID mismatch, wanted id: " + data.pluginID + " but got " + information); - } - data.extensionInformation = information; - return this; - } - - public Factory addTab(ExtensionTabData tab) { - data.tabs.add(tab); - return this; - } - - public ExtensionPlayerData build() { - Collections.sort(data.tabs); - return data; - } - - public Factory combine(Factory with) { - if (with != null) { - for (ExtensionTabData tab : with.build().getTabs()) { - Optional found = getTab(tab.getTabInformation().getTabName()); - if (found.isPresent()) { - found.get().combine(tab); - } else { - addTab(tab); - } - } - } - return this; - } - - public Optional getTab(String tabName) { - for (ExtensionTabData tab : data.tabs) { - if (tabName.equals(tab.getTabInformation().getTabName())) { - return Optional.of(tab); - } - } - return Optional.empty(); - } - - - } - -} \ No newline at end of file diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateBooleansQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateBooleansQuery.java index 8a6aa5a8c..f91d35637 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateBooleansQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateBooleansQuery.java @@ -25,10 +25,10 @@ import com.djrapitops.plan.extension.icon.Color; import com.djrapitops.plan.extension.icon.Family; import com.djrapitops.plan.extension.icon.Icon; import com.djrapitops.plan.extension.implementation.TabInformation; +import com.djrapitops.plan.extension.implementation.results.ExtensionData; import com.djrapitops.plan.extension.implementation.results.ExtensionDescriptive; import com.djrapitops.plan.extension.implementation.results.ExtensionDoubleData; import com.djrapitops.plan.extension.implementation.results.ExtensionTabData; -import com.djrapitops.plan.extension.implementation.results.server.ExtensionServerData; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -54,7 +54,7 @@ import static com.djrapitops.plan.db.sql.parsing.Sql.*; * * @author Rsl1122 */ -public class ExtensionAggregateBooleansQuery implements Query> { +public class ExtensionAggregateBooleansQuery implements Query> { private final UUID serverUUID; @@ -63,7 +63,7 @@ public class ExtensionAggregateBooleansQuery implements Query executeQuery(SQLDB db) { + public Map executeQuery(SQLDB db) { String selectTrueBooleans = SELECT + ExtensionPlayerValueTable.PROVIDER_ID + ",COUNT(1) as positive" + @@ -106,7 +106,7 @@ public class ExtensionAggregateBooleansQuery implements Query>(sql, 1000) { + return db.query(new QueryStatement>(sql, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setBoolean(1, true); // selectTrueBooleans parameter @@ -115,8 +115,8 @@ public class ExtensionAggregateBooleansQuery implements Query processResults(ResultSet set) throws SQLException { - return extractTabDataByPluginID(set).toServerDataByPluginID(); + public Map processResults(ResultSet set) throws SQLException { + return extractTabDataByPluginID(set).toExtensionDataByPluginID(); } }); } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateDoublesQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateDoublesQuery.java index 8947a9bd5..8129fb157 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateDoublesQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateDoublesQuery.java @@ -25,10 +25,10 @@ import com.djrapitops.plan.extension.icon.Color; import com.djrapitops.plan.extension.icon.Family; import com.djrapitops.plan.extension.icon.Icon; import com.djrapitops.plan.extension.implementation.TabInformation; +import com.djrapitops.plan.extension.implementation.results.ExtensionData; import com.djrapitops.plan.extension.implementation.results.ExtensionDescriptive; import com.djrapitops.plan.extension.implementation.results.ExtensionDoubleData; import com.djrapitops.plan.extension.implementation.results.ExtensionTabData; -import com.djrapitops.plan.extension.implementation.results.server.ExtensionServerData; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -54,7 +54,7 @@ import static com.djrapitops.plan.db.sql.parsing.Sql.*; * * @author Rsl1122 */ -public class ExtensionAggregateDoublesQuery implements Query> { +public class ExtensionAggregateDoublesQuery implements Query> { private final UUID serverUUID; @@ -63,7 +63,7 @@ public class ExtensionAggregateDoublesQuery implements Query executeQuery(SQLDB db) { + public Map executeQuery(SQLDB db) { String selectDoubleAverage = SELECT + ExtensionPlayerValueTable.PROVIDER_ID + ",AVG(" + ExtensionPlayerValueTable.DOUBLE_VALUE + ") as average" + @@ -106,7 +106,7 @@ public class ExtensionAggregateDoublesQuery implements Query>(sql, 1000) { + return db.query(new QueryStatement>(sql, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -114,8 +114,8 @@ public class ExtensionAggregateDoublesQuery implements Query processResults(ResultSet set) throws SQLException { - return extractTabDataByPluginID(set).toServerDataByPluginID(); + public Map processResults(ResultSet set) throws SQLException { + return extractTabDataByPluginID(set).toExtensionDataByPluginID(); } }); } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateNumbersQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateNumbersQuery.java index 78a8831d6..1e7aadbff 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateNumbersQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateNumbersQuery.java @@ -26,10 +26,10 @@ import com.djrapitops.plan.extension.icon.Color; import com.djrapitops.plan.extension.icon.Family; import com.djrapitops.plan.extension.icon.Icon; import com.djrapitops.plan.extension.implementation.TabInformation; +import com.djrapitops.plan.extension.implementation.results.ExtensionData; import com.djrapitops.plan.extension.implementation.results.ExtensionDescriptive; import com.djrapitops.plan.extension.implementation.results.ExtensionNumberData; import com.djrapitops.plan.extension.implementation.results.ExtensionTabData; -import com.djrapitops.plan.extension.implementation.results.server.ExtensionServerData; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -55,7 +55,7 @@ import static com.djrapitops.plan.db.sql.parsing.Sql.*; * * @author Rsl1122 */ -public class ExtensionAggregateNumbersQuery implements Query> { +public class ExtensionAggregateNumbersQuery implements Query> { private final UUID serverUUID; @@ -64,7 +64,7 @@ public class ExtensionAggregateNumbersQuery implements Query executeQuery(SQLDB db) { + public Map executeQuery(SQLDB db) { String selectNumberAverage = SELECT + ExtensionPlayerValueTable.PROVIDER_ID + ",AVG(" + ExtensionPlayerValueTable.LONG_VALUE + ") as average" + @@ -110,7 +110,7 @@ public class ExtensionAggregateNumbersQuery implements Query>(sql, 1000) { + return db.query(new QueryStatement>(sql, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -120,8 +120,8 @@ public class ExtensionAggregateNumbersQuery implements Query processResults(ResultSet set) throws SQLException { - return extractTabDataByPluginID(set).toServerDataByPluginID(); + public Map processResults(ResultSet set) throws SQLException { + return extractTabDataByPluginID(set).toExtensionDataByPluginID(); } }); } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregatePercentagesQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregatePercentagesQuery.java index 866b65780..bc0844415 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregatePercentagesQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregatePercentagesQuery.java @@ -25,10 +25,10 @@ import com.djrapitops.plan.extension.icon.Color; import com.djrapitops.plan.extension.icon.Family; import com.djrapitops.plan.extension.icon.Icon; import com.djrapitops.plan.extension.implementation.TabInformation; +import com.djrapitops.plan.extension.implementation.results.ExtensionData; import com.djrapitops.plan.extension.implementation.results.ExtensionDescriptive; import com.djrapitops.plan.extension.implementation.results.ExtensionDoubleData; import com.djrapitops.plan.extension.implementation.results.ExtensionTabData; -import com.djrapitops.plan.extension.implementation.results.server.ExtensionServerData; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -54,7 +54,7 @@ import static com.djrapitops.plan.db.sql.parsing.Sql.*; * * @author Rsl1122 */ -public class ExtensionAggregatePercentagesQuery implements Query> { +public class ExtensionAggregatePercentagesQuery implements Query> { private final UUID serverUUID; @@ -63,7 +63,7 @@ public class ExtensionAggregatePercentagesQuery implements Query executeQuery(SQLDB db) { + public Map executeQuery(SQLDB db) { String selectPercentageAverage = SELECT + ExtensionPlayerValueTable.PROVIDER_ID + ",AVG(" + ExtensionPlayerValueTable.PERCENTAGE_VALUE + ") as average" + @@ -97,7 +97,7 @@ public class ExtensionAggregatePercentagesQuery implements Query>(sql, 1000) { + return db.query(new QueryStatement>(sql, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -105,8 +105,8 @@ public class ExtensionAggregatePercentagesQuery implements Query processResults(ResultSet set) throws SQLException { - return extractTabDataByPluginID(set).toServerDataByPluginID(); + public Map processResults(ResultSet set) throws SQLException { + return extractTabDataByPluginID(set).toExtensionDataByPluginID(); } }); } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerDataQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerDataQuery.java index 8b4e8dc40..c669a8dee 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerDataQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerDataQuery.java @@ -30,7 +30,6 @@ import com.djrapitops.plan.extension.icon.Family; import com.djrapitops.plan.extension.icon.Icon; import com.djrapitops.plan.extension.implementation.TabInformation; import com.djrapitops.plan.extension.implementation.results.*; -import com.djrapitops.plan.extension.implementation.results.player.ExtensionPlayerData; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -40,22 +39,22 @@ import java.util.*; import static com.djrapitops.plan.db.sql.parsing.Sql.*; /** - * Query all ExtensionPlayerData by Server UUIDs. + * Query all ExtensionData by Server UUIDs. *

- * Returns Map: Server UUID - List of ExtensionPlayerData. + * Returns Map: Server UUID - List of ExtensionData. *

* How it is done: * - Two queries are run, one that fetches all extensions and one that fetches all data of the player. * - Data query is sorted into a multi-map: PluginID - Tab Name - Tab Data * - (Tab Name can be empty.) - * - Multi-map is sorted into ExtensionPlayerData objects by PluginID, one per ID - * - This map is sorted into final Map: Server UUID - List of ExtensionPlayerData at the highest level. + * - Multi-map is sorted into ExtensionData objects by PluginID, one per ID + * - This map is sorted into final Map: Server UUID - List of ExtensionData at the highest level. *

* There are multiple data extraction methods to make extracting the value query easier. * * @author Rsl1122 */ -public class ExtensionPlayerDataQuery implements Query>> { +public class ExtensionPlayerDataQuery implements Query>> { private final UUID playerUUID; @@ -64,9 +63,9 @@ public class ExtensionPlayerDataQuery implements Query> executeQuery(SQLDB db) { + public Map> executeQuery(SQLDB db) { Map> extensionsByServerUUID = db.query(ExtensionInformationQueries.allExtensions()); - Map extensionDataByPluginID = db.query(fetchIncompletePlayerDataByPluginID()); + Map extensionDataByPluginID = db.query(fetchIncompletePlayerDataByPluginID()); combine(extensionDataByPluginID, db.query(new ExtensionPlayerTablesQuery(playerUUID))); combine(extensionDataByPluginID, db.query(new ExtensionPlayerGroupsQuery(playerUUID))); @@ -75,14 +74,14 @@ public class ExtensionPlayerDataQuery implements Query extensionDataByPluginID, - Map aggregates + Map extensionDataByPluginID, + Map aggregates ) { - for (Map.Entry entry : aggregates.entrySet()) { + for (Map.Entry entry : aggregates.entrySet()) { Integer pluginID = entry.getKey(); - ExtensionPlayerData.Factory data = entry.getValue(); + ExtensionData.Factory data = entry.getValue(); - ExtensionPlayerData.Factory found = extensionDataByPluginID.get(pluginID); + ExtensionData.Factory found = extensionDataByPluginID.get(pluginID); if (found == null) { extensionDataByPluginID.put(pluginID, data); } else { @@ -91,17 +90,17 @@ public class ExtensionPlayerDataQuery implements Query> flatMapByServerUUID(Map> extensionsByServerUUID, Map extensionDataByPluginID) { - Map> extensionDataByServerUUID = new HashMap<>(); + private Map> flatMapByServerUUID(Map> extensionsByServerUUID, Map extensionDataByPluginID) { + Map> extensionDataByServerUUID = new HashMap<>(); for (Map.Entry> entry : extensionsByServerUUID.entrySet()) { UUID serverUUID = entry.getKey(); for (ExtensionInformation extensionInformation : entry.getValue()) { - ExtensionPlayerData.Factory data = extensionDataByPluginID.get(extensionInformation.getId()); + ExtensionData.Factory data = extensionDataByPluginID.get(extensionInformation.getId()); if (data == null) { continue; } - List list = extensionDataByServerUUID.getOrDefault(serverUUID, new ArrayList<>()); + List list = extensionDataByServerUUID.getOrDefault(serverUUID, new ArrayList<>()); list.add(data.setInformation(extensionInformation).build()); extensionDataByServerUUID.put(serverUUID, list); } @@ -109,7 +108,7 @@ public class ExtensionPlayerDataQuery implements Query> fetchIncompletePlayerDataByPluginID() { + private Query> fetchIncompletePlayerDataByPluginID() { String sql = SELECT + "v1." + ExtensionPlayerValueTable.BOOLEAN_VALUE + " as boolean_value," + "v1." + ExtensionPlayerValueTable.DOUBLE_VALUE + " as double_value," + @@ -140,7 +139,7 @@ public class ExtensionPlayerDataQuery implements Query>(sql, 1000) { + return new QueryStatement>(sql, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, playerUUID.toString()); @@ -148,8 +147,8 @@ public class ExtensionPlayerDataQuery implements Query processResults(ResultSet set) throws SQLException { - return extractTabDataByPluginID(set).toPlayerDataByPluginID(); + public Map processResults(ResultSet set) throws SQLException { + return extractTabDataByPluginID(set).toExtensionDataByPluginID(); } }; } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerGroupsQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerGroupsQuery.java index 9aa623c15..c1d9ed269 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerGroupsQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerGroupsQuery.java @@ -25,10 +25,10 @@ import com.djrapitops.plan.extension.icon.Color; import com.djrapitops.plan.extension.icon.Family; import com.djrapitops.plan.extension.icon.Icon; import com.djrapitops.plan.extension.implementation.TabInformation; +import com.djrapitops.plan.extension.implementation.results.ExtensionData; import com.djrapitops.plan.extension.implementation.results.ExtensionDescriptive; import com.djrapitops.plan.extension.implementation.results.ExtensionStringData; import com.djrapitops.plan.extension.implementation.results.ExtensionTabData; -import com.djrapitops.plan.extension.implementation.results.player.ExtensionPlayerData; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -40,7 +40,7 @@ import java.util.UUID; import static com.djrapitops.plan.db.sql.parsing.Sql.*; /** - * Query player's Groups by Plugin ID inside ExtensionPlayerData objects. + * Query player's Groups by Plugin ID inside ExtensionData objects. *

* - Group names are represented as a String value, concatenated to a single one. * - String values are placed into Tabs they belong to @@ -49,7 +49,7 @@ import static com.djrapitops.plan.db.sql.parsing.Sql.*; * * @author Rsl1122 */ -public class ExtensionPlayerGroupsQuery implements Query> { +public class ExtensionPlayerGroupsQuery implements Query> { private final UUID playerUUID; @@ -58,11 +58,11 @@ public class ExtensionPlayerGroupsQuery implements Query executeQuery(SQLDB db) { + public Map executeQuery(SQLDB db) { return db.query(fetchGroupsByPluginID()); } - private Query> fetchGroupsByPluginID() { + private Query> fetchGroupsByPluginID() { String sql = SELECT + "v1." + ExtensionGroupsTable.GROUP_NAME + " as group_name," + "p1." + ExtensionProviderTable.PLUGIN_ID + " as plugin_id," + @@ -86,7 +86,7 @@ public class ExtensionPlayerGroupsQuery implements Query>(sql, 1000) { + return new QueryStatement>(sql, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, playerUUID.toString()); @@ -94,8 +94,8 @@ public class ExtensionPlayerGroupsQuery implements Query processResults(ResultSet set) throws SQLException { - return extractTabDataByPluginID(set).toPlayerDataByPluginID(); + public Map processResults(ResultSet set) throws SQLException { + return extractTabDataByPluginID(set).toExtensionDataByPluginID(); } }; } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerTablesQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerTablesQuery.java index 549010e12..c779cb200 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerTablesQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerTablesQuery.java @@ -27,7 +27,7 @@ import com.djrapitops.plan.extension.ElementOrder; import com.djrapitops.plan.extension.icon.Color; import com.djrapitops.plan.extension.icon.Family; import com.djrapitops.plan.extension.icon.Icon; -import com.djrapitops.plan.extension.implementation.results.player.ExtensionPlayerData; +import com.djrapitops.plan.extension.implementation.results.ExtensionData; import com.djrapitops.plan.extension.table.Table; import com.djrapitops.plan.extension.table.TableAccessor; @@ -41,20 +41,20 @@ import static com.djrapitops.plan.db.sql.parsing.Sql.*; /** * Query player tables from tableprovider table. *

- * Returns Map: PluginID - ExtensionPlayerData.Factory. + * Returns Map: PluginID - ExtensionData.Factory. *

* How it is done: * - TableProviders are queried and formed into Table.Factory objects sorted into a multi-map: PluginID - TableID - Table.Factory * - Table values are queried and merged into the above multimap * - Data query is sorted into a multi-map: PluginID - Tab Name - Tab Data * - (Tab Name can be empty.) - * - Multi-map is sorted into ExtensionPlayerData objects by PluginID, one per ID + * - Multi-map is sorted into ExtensionData objects by PluginID, one per ID *

* There are multiple data extraction methods to make extracting the value query easier. * * @author Rsl1122 */ -public class ExtensionPlayerTablesQuery implements Query> { +public class ExtensionPlayerTablesQuery implements Query> { private final UUID playerUUID; @@ -63,9 +63,9 @@ public class ExtensionPlayerTablesQuery implements Query executeQuery(SQLDB db) { + public Map executeQuery(SQLDB db) { QueriedTables tablesWithValues = db.query(placeValuesToTables(db.query(queryTableProviders()))); - return tablesWithValues.toQueriedTabs().toPlayerDataByPluginID(); + return tablesWithValues.toQueriedTabs().toExtensionDataByPluginID(); } private Query placeValuesToTables(QueriedTables tables) { diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerDataQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerDataQuery.java index 60c0f8006..5390837f5 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerDataQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerDataQuery.java @@ -27,7 +27,6 @@ import com.djrapitops.plan.extension.icon.Family; import com.djrapitops.plan.extension.icon.Icon; import com.djrapitops.plan.extension.implementation.TabInformation; import com.djrapitops.plan.extension.implementation.results.*; -import com.djrapitops.plan.extension.implementation.results.server.ExtensionServerData; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -53,7 +52,7 @@ import static com.djrapitops.plan.db.sql.parsing.Sql.*; * * @author Rsl1122 */ -public class ExtensionServerDataQuery implements Query> { +public class ExtensionServerDataQuery implements Query> { private final UUID serverUUID; @@ -62,9 +61,9 @@ public class ExtensionServerDataQuery implements Query } @Override - public List executeQuery(SQLDB db) { + public List executeQuery(SQLDB db) { List extensionsOfServer = db.query(ExtensionInformationQueries.extensionsOfServer(serverUUID)); - Map extensionDataByPluginID = db.query(fetchIncompleteServerDataByPluginID()); + Map extensionDataByPluginID = db.query(fetchIncompleteServerDataByPluginID()); combine(extensionDataByPluginID, db.query(new ExtensionAggregateBooleansQuery(serverUUID))); combine(extensionDataByPluginID, db.query(new ExtensionAggregateDoublesQuery(serverUUID))); @@ -76,14 +75,14 @@ public class ExtensionServerDataQuery implements Query } private void combine( - Map extensionDataByPluginID, - Map aggregates + Map extensionDataByPluginID, + Map aggregates ) { - for (Map.Entry entry : aggregates.entrySet()) { + for (Map.Entry entry : aggregates.entrySet()) { Integer pluginID = entry.getKey(); - ExtensionServerData.Factory data = entry.getValue(); + ExtensionData.Factory data = entry.getValue(); - ExtensionServerData.Factory found = extensionDataByPluginID.get(pluginID); + ExtensionData.Factory found = extensionDataByPluginID.get(pluginID); if (found == null) { extensionDataByPluginID.put(pluginID, data); } else { @@ -92,23 +91,23 @@ public class ExtensionServerDataQuery implements Query } } - private List combineWithExtensionInfo( + private List combineWithExtensionInfo( List extensionsOfServer, - Map extensionDataByPluginID + Map extensionDataByPluginID ) { - List extensionServerData = new ArrayList<>(); + List extensionData = new ArrayList<>(); for (ExtensionInformation extensionInformation : extensionsOfServer) { - ExtensionServerData.Factory data = extensionDataByPluginID.get(extensionInformation.getId()); + ExtensionData.Factory data = extensionDataByPluginID.get(extensionInformation.getId()); if (data == null) { continue; } - extensionServerData.add(data.setInformation(extensionInformation).build()); + extensionData.add(data.setInformation(extensionInformation).build()); } - return extensionServerData; + return extensionData; } - private Query> fetchIncompleteServerDataByPluginID() { + private Query> fetchIncompleteServerDataByPluginID() { String sql = SELECT + "v1." + ExtensionServerValueTable.BOOLEAN_VALUE + " as boolean_value," + "v1." + ExtensionServerValueTable.DOUBLE_VALUE + " as double_value," + @@ -140,7 +139,7 @@ public class ExtensionServerDataQuery implements Query WHERE + ExtensionPluginTable.SERVER_UUID + "=?" + AND + "p1." + ExtensionProviderTable.HIDDEN + "=?"; - return new QueryStatement>(sql, 1000) { + return new QueryStatement>(sql, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -148,8 +147,8 @@ public class ExtensionServerDataQuery implements Query } @Override - public Map processResults(ResultSet set) throws SQLException { - return extractTabDataByPluginID(set).toServerDataByPluginID(); + public Map processResults(ResultSet set) throws SQLException { + return extractTabDataByPluginID(set).toExtensionDataByPluginID(); } }; } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerTablesQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerTablesQuery.java index 930563e14..5f48873e3 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerTablesQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerTablesQuery.java @@ -24,7 +24,7 @@ import com.djrapitops.plan.extension.ElementOrder; import com.djrapitops.plan.extension.icon.Color; import com.djrapitops.plan.extension.icon.Family; import com.djrapitops.plan.extension.icon.Icon; -import com.djrapitops.plan.extension.implementation.results.server.ExtensionServerData; +import com.djrapitops.plan.extension.implementation.results.ExtensionData; import com.djrapitops.plan.extension.table.Table; import com.djrapitops.plan.extension.table.TableAccessor; @@ -51,7 +51,7 @@ import static com.djrapitops.plan.db.sql.parsing.Sql.*; * * @author Rsl1122 */ -public class ExtensionServerTablesQuery implements Query> { +public class ExtensionServerTablesQuery implements Query> { private final UUID serverUUID; @@ -60,9 +60,9 @@ public class ExtensionServerTablesQuery implements Query executeQuery(SQLDB db) { + public Map executeQuery(SQLDB db) { QueriedTables tablesWithValues = db.query(queryTableValues(db.query(queryTableProviders()))); - return tablesWithValues.toQueriedTabs().toServerDataByPluginID(); + return tablesWithValues.toQueriedTabs().toExtensionDataByPluginID(); } private Query queryTableValues(QueriedTables tables) { diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/QueriedTabData.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/QueriedTabData.java index 64174dc9b..d0be34828 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/QueriedTabData.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/QueriedTabData.java @@ -17,9 +17,8 @@ package com.djrapitops.plan.extension.implementation.storage.queries; import com.djrapitops.plan.extension.implementation.TabInformation; +import com.djrapitops.plan.extension.implementation.results.ExtensionData; import com.djrapitops.plan.extension.implementation.results.ExtensionTabData; -import com.djrapitops.plan.extension.implementation.results.player.ExtensionPlayerData; -import com.djrapitops.plan.extension.implementation.results.server.ExtensionServerData; import com.djrapitops.plan.utilities.java.ThrowingSupplier; import java.util.HashMap; @@ -51,32 +50,14 @@ public class QueriedTabData { return tab; } - public Map toServerDataByPluginID() { - Map dataByPluginID = new HashMap<>(); + public Map toExtensionDataByPluginID() { + Map dataByPluginID = new HashMap<>(); for (Map.Entry> entry : byPluginID.entrySet()) { Integer pluginID = entry.getKey(); - ExtensionServerData.Factory data = dataByPluginID.get(pluginID); + ExtensionData.Factory data = dataByPluginID.get(pluginID); if (data == null) { - data = new ExtensionServerData.Factory(pluginID); - } - - for (ExtensionTabData.Factory tabData : entry.getValue().values()) { - data.addTab(tabData.build()); - } - dataByPluginID.put(pluginID, data); - } - return dataByPluginID; - } - - public Map toPlayerDataByPluginID() { - Map dataByPluginID = new HashMap<>(); - for (Map.Entry> entry : byPluginID.entrySet()) { - Integer pluginID = entry.getKey(); - - ExtensionPlayerData.Factory data = dataByPluginID.get(pluginID); - if (data == null) { - data = new ExtensionPlayerData.Factory(pluginID); + data = new ExtensionData.Factory(pluginID); } for (ExtensionTabData.Factory tabData : entry.getValue().values()) { diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/NetworkPage.java b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/NetworkPage.java index d8e54ebec..d575cd7fb 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/NetworkPage.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/NetworkPage.java @@ -17,7 +17,7 @@ package com.djrapitops.plan.utilities.html.pages; import com.djrapitops.plan.api.exceptions.ParseException; -import com.djrapitops.plan.extension.implementation.results.server.ExtensionServerData; +import com.djrapitops.plan.extension.implementation.results.ExtensionData; import com.djrapitops.plan.extension.implementation.storage.queries.ExtensionServerDataQuery; import com.djrapitops.plan.system.database.DBSystem; import com.djrapitops.plan.system.file.PlanFiles; @@ -88,7 +88,7 @@ public class NetworkPage implements Page { placeholders.put("version", versionCheckSystem.getUpdateButton().orElse(versionCheckSystem.getCurrentVersionButton())); placeholders.put("updateModal", versionCheckSystem.getUpdateModal()); - List extensionData = dbSystem.getDatabase() + List extensionData = dbSystem.getDatabase() .query(new ExtensionServerDataQuery(serverUUID)); ServerPluginTabs pluginTabs = new ServerPluginTabs(extensionData, formatters); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PageFactory.java b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PageFactory.java index 0fc1fe04d..912cbf8b5 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PageFactory.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PageFactory.java @@ -21,7 +21,7 @@ import com.djrapitops.plan.data.store.containers.PlayerContainer; import com.djrapitops.plan.db.Database; import com.djrapitops.plan.db.access.queries.containers.ContainerFetchQueries; import com.djrapitops.plan.db.access.queries.objects.ServerQueries; -import com.djrapitops.plan.extension.implementation.results.player.ExtensionPlayerData; +import com.djrapitops.plan.extension.implementation.results.ExtensionData; import com.djrapitops.plan.extension.implementation.storage.queries.ExtensionPlayerDataQuery; import com.djrapitops.plan.system.database.DBSystem; import com.djrapitops.plan.system.file.PlanFiles; @@ -123,7 +123,7 @@ public class PageFactory { public PlayerPluginTab inspectPluginTabs(UUID playerUUID) { Database database = dbSystem.get().getDatabase(); - Map> extensionPlayerData = database.query(new ExtensionPlayerDataQuery(playerUUID)); + Map> extensionPlayerData = database.query(new ExtensionPlayerDataQuery(playerUUID)); if (extensionPlayerData.isEmpty()) { return new PlayerPluginTab("", Collections.emptyList(), formatters.get()); @@ -134,7 +134,7 @@ public class PageFactory { UUID serverUUID = entry.getKey(); String serverName = entry.getValue().getIdentifiableName(); - List ofServer = extensionPlayerData.get(serverUUID); + List ofServer = extensionPlayerData.get(serverUUID); if (ofServer == null) { continue; } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PlayerPluginTab.java b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PlayerPluginTab.java index 48b9fe9f0..8df7001bd 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PlayerPluginTab.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PlayerPluginTab.java @@ -19,11 +19,7 @@ package com.djrapitops.plan.utilities.html.pages; import com.djrapitops.plan.extension.ElementOrder; import com.djrapitops.plan.extension.FormatType; import com.djrapitops.plan.extension.implementation.TabInformation; -import com.djrapitops.plan.extension.implementation.results.ExtensionDescriptive; -import com.djrapitops.plan.extension.implementation.results.ExtensionInformation; -import com.djrapitops.plan.extension.implementation.results.ExtensionTabData; -import com.djrapitops.plan.extension.implementation.results.ExtensionTableData; -import com.djrapitops.plan.extension.implementation.results.player.ExtensionPlayerData; +import com.djrapitops.plan.extension.implementation.results.*; import com.djrapitops.plan.utilities.formatting.Formatter; import com.djrapitops.plan.utilities.formatting.Formatters; import com.djrapitops.plan.utilities.html.icon.Icon; @@ -40,7 +36,7 @@ import java.util.*; public class PlayerPluginTab implements Comparable { private String serverName; - private List playerData; + private List playerData; private Map> numberFormatters; @@ -59,7 +55,7 @@ public class PlayerPluginTab implements Comparable { public PlayerPluginTab( String serverName, - List playerData, + List playerData, Formatters formatters ) { this.serverName = serverName; @@ -104,7 +100,7 @@ public class PlayerPluginTab implements Comparable { StringBuilder tabBuilder = new StringBuilder(); - for (ExtensionPlayerData datum : playerData) { + for (ExtensionData datum : playerData) { ExtensionInformation extensionInformation = datum.getExtensionInformation(); boolean onlyGeneric = datum.hasOnlyGenericTab(); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/ServerPage.java b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/ServerPage.java index ee39261e9..7ccea8f73 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/ServerPage.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/ServerPage.java @@ -20,7 +20,7 @@ import com.djrapitops.plan.api.exceptions.ParseException; import com.djrapitops.plan.data.store.containers.DataContainer; import com.djrapitops.plan.data.store.containers.RawDataContainer; import com.djrapitops.plan.data.store.keys.AnalysisKeys; -import com.djrapitops.plan.extension.implementation.results.server.ExtensionServerData; +import com.djrapitops.plan.extension.implementation.results.ExtensionData; import com.djrapitops.plan.extension.implementation.storage.queries.ExtensionServerDataQuery; import com.djrapitops.plan.system.database.DBSystem; import com.djrapitops.plan.system.file.PlanFiles; @@ -122,7 +122,7 @@ public class ServerPage implements Page { placeholders.put("version", versionCheckSystem.getUpdateButton().orElse(versionCheckSystem.getCurrentVersionButton())); placeholders.put("updateModal", versionCheckSystem.getUpdateModal()); - List extensionData = dbSystem.getDatabase() + List extensionData = dbSystem.getDatabase() .query(new ExtensionServerDataQuery(server.getUuid())); ServerPluginTabs pluginTabs = new ServerPluginTabs(extensionData, formatters); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/ServerPluginTabs.java b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/ServerPluginTabs.java index c67176a96..3b8f77c86 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/ServerPluginTabs.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/ServerPluginTabs.java @@ -19,11 +19,7 @@ package com.djrapitops.plan.utilities.html.pages; import com.djrapitops.plan.extension.ElementOrder; import com.djrapitops.plan.extension.FormatType; import com.djrapitops.plan.extension.implementation.TabInformation; -import com.djrapitops.plan.extension.implementation.results.ExtensionDescriptive; -import com.djrapitops.plan.extension.implementation.results.ExtensionInformation; -import com.djrapitops.plan.extension.implementation.results.ExtensionTabData; -import com.djrapitops.plan.extension.implementation.results.ExtensionTableData; -import com.djrapitops.plan.extension.implementation.results.server.ExtensionServerData; +import com.djrapitops.plan.extension.implementation.results.*; import com.djrapitops.plan.utilities.formatting.Formatter; import com.djrapitops.plan.utilities.formatting.Formatters; import com.djrapitops.plan.utilities.html.icon.Icon; @@ -43,8 +39,8 @@ import java.util.stream.Collectors; */ public class ServerPluginTabs { - private List serverData; - private List extraTabServerData; + private List serverData; + private List extraTabServerData; private Map> numberFormatters; @@ -60,12 +56,12 @@ public class ServerPluginTabs { } public ServerPluginTabs( - List serverData, + List serverData, Formatters formatters ) { this.serverData = serverData; this.extraTabServerData = serverData.stream() - .filter(ExtensionServerData::doesNeedWiderSpace) + .filter(ExtensionData::doesNeedWiderSpace) .collect(Collectors.toList()); this.serverData.removeAll(extraTabServerData); @@ -113,7 +109,7 @@ public class ServerPluginTabs { private String generateExtraTabs() { StringBuilder tabBuilder = new StringBuilder(); - for (ExtensionServerData datum : extraTabServerData) { + for (ExtensionData datum : extraTabServerData) { ExtensionInformation extensionInformation = datum.getExtensionInformation(); boolean onlyGeneric = datum.hasOnlyGenericTab(); @@ -137,7 +133,7 @@ public class ServerPluginTabs { private String generateOverviewTab() { StringBuilder tabBuilder = new StringBuilder(); - for (ExtensionServerData datum : serverData) { + for (ExtensionData datum : serverData) { ExtensionInformation extensionInformation = datum.getExtensionInformation(); boolean onlyGeneric = datum.hasOnlyGenericTab(); diff --git a/Plan/common/src/test/java/com/djrapitops/plan/db/DatabaseTest.java b/Plan/common/src/test/java/com/djrapitops/plan/db/DatabaseTest.java index 294403092..5dd085e48 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/db/DatabaseTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/db/DatabaseTest.java @@ -55,12 +55,7 @@ import com.djrapitops.plan.extension.*; import com.djrapitops.plan.extension.annotation.*; import com.djrapitops.plan.extension.icon.Color; import com.djrapitops.plan.extension.icon.Icon; -import com.djrapitops.plan.extension.implementation.results.ExtensionBooleanData; -import com.djrapitops.plan.extension.implementation.results.ExtensionStringData; -import com.djrapitops.plan.extension.implementation.results.ExtensionTabData; -import com.djrapitops.plan.extension.implementation.results.ExtensionTableData; -import com.djrapitops.plan.extension.implementation.results.player.ExtensionPlayerData; -import com.djrapitops.plan.extension.implementation.results.server.ExtensionServerData; +import com.djrapitops.plan.extension.implementation.results.*; import com.djrapitops.plan.extension.implementation.storage.queries.ExtensionPlayerDataQuery; import com.djrapitops.plan.extension.implementation.storage.queries.ExtensionServerDataQuery; import com.djrapitops.plan.extension.implementation.storage.queries.ExtensionServerPlayerDataTableQuery; @@ -1151,12 +1146,12 @@ public interface DatabaseTest { extensionService.register(new PlayerExtension()); extensionService.updatePlayerValues(playerUUID, TestConstants.PLAYER_ONE_NAME, CallEvents.MANUAL); - Map> playerDataByServerUUID = db().query(new ExtensionPlayerDataQuery(playerUUID)); - List ofServer = playerDataByServerUUID.get(serverUUID()); + Map> playerDataByServerUUID = db().query(new ExtensionPlayerDataQuery(playerUUID)); + List ofServer = playerDataByServerUUID.get(serverUUID()); assertNotNull(ofServer); assertFalse(ofServer.isEmpty()); - ExtensionPlayerData extensionPlayerData = ofServer.get(0); + ExtensionData extensionPlayerData = ofServer.get(0); List tabs = extensionPlayerData.getTabs(); assertEquals(1, tabs.size()); // No tab defined, should contain 1 tab ExtensionTabData tabData = tabs.get(0); @@ -1201,11 +1196,11 @@ public interface DatabaseTest { extensionService.register(new ServerExtension()); extensionService.updateServerValues(CallEvents.SERVER_EXTENSION_REGISTER); - List ofServer = db().query(new ExtensionServerDataQuery(serverUUID())); + List ofServer = db().query(new ExtensionServerDataQuery(serverUUID())); assertFalse(ofServer.isEmpty()); - ExtensionServerData extensionServerData = ofServer.get(0); - List tabs = extensionServerData.getTabs(); + ExtensionData extensionData = ofServer.get(0); + List tabs = extensionData.getTabs(); assertEquals(1, tabs.size()); // No tab defined, should contain 1 tab ExtensionTabData tabData = tabs.get(0); @@ -1223,11 +1218,11 @@ public interface DatabaseTest { extensionService.register(new PlayerExtension()); extensionService.updatePlayerValues(playerUUID, TestConstants.PLAYER_ONE_NAME, CallEvents.MANUAL); - List ofServer = db().query(new ExtensionServerDataQuery(serverUUID())); + List ofServer = db().query(new ExtensionServerDataQuery(serverUUID())); assertFalse(ofServer.isEmpty()); - ExtensionServerData extensionServerData = ofServer.get(0); - List tabs = extensionServerData.getTabs(); + ExtensionData extensionData = ofServer.get(0); + List tabs = extensionData.getTabs(); assertEquals(1, tabs.size()); // No tab defined, should contain 1 tab ExtensionTabData tabData = tabs.get(0); @@ -1275,7 +1270,7 @@ public interface DatabaseTest { default void checkThatPlayerDataExists(boolean condition) { // TODO Add Group data to this test if (condition) { // Condition is true, conditional values exist - List ofServer = db().query(new ExtensionPlayerDataQuery(playerUUID)).get(serverUUID()); + List ofServer = db().query(new ExtensionPlayerDataQuery(playerUUID)).get(serverUUID()); assertTrue(ofServer != null && !ofServer.isEmpty() && !ofServer.get(0).getTabs().isEmpty(), "There was no data left"); ExtensionTabData tabData = ofServer.get(0).getTabs().get(0); @@ -1284,7 +1279,7 @@ public interface DatabaseTest { OptionalAssert.equals("unconditional", tabData.getString("unconditional").map(ExtensionStringData::getFormattedValue)); // Was not removed assertFalse(tabData.getString("reversedConditionalValue").isPresent(), "Value was not removed: reversedConditionalValue"); } else { // Condition is false, reversed conditional values exist - List ofServer = db().query(new ExtensionPlayerDataQuery(playerUUID)).get(serverUUID()); + List ofServer = db().query(new ExtensionPlayerDataQuery(playerUUID)).get(serverUUID()); assertTrue(ofServer != null && !ofServer.isEmpty() && !ofServer.get(0).getTabs().isEmpty(), "There was no data left"); ExtensionTabData tabData = ofServer.get(0).getTabs().get(0); OptionalAssert.equals("No", tabData.getBoolean("isCondition").map(ExtensionBooleanData::getFormattedValue)); @@ -1326,7 +1321,7 @@ public interface DatabaseTest { default void checkThatServerDataExists(boolean condition) { if (condition) { // Condition is true, conditional values exist - List ofServer = db().query(new ExtensionServerDataQuery(serverUUID())); + List ofServer = db().query(new ExtensionServerDataQuery(serverUUID())); assertTrue(ofServer != null && !ofServer.isEmpty() && !ofServer.get(0).getTabs().isEmpty(), "There was no data left"); ExtensionTabData tabData = ofServer.get(0).getTabs().get(0); @@ -1335,7 +1330,7 @@ public interface DatabaseTest { OptionalAssert.equals("unconditional", tabData.getString("unconditional").map(ExtensionStringData::getFormattedValue)); // Was not removed assertFalse(tabData.getString("reversedConditionalValue").isPresent(), "Value was not removed: reversedConditionalValue"); } else { // Condition is false, reversed conditional values exist - List ofServer = db().query(new ExtensionServerDataQuery(serverUUID())); + List ofServer = db().query(new ExtensionServerDataQuery(serverUUID())); assertTrue(ofServer != null && !ofServer.isEmpty() && !ofServer.get(0).getTabs().isEmpty(), "There was no data left"); ExtensionTabData tabData = ofServer.get(0).getTabs().get(0); OptionalAssert.equals("No", tabData.getBoolean("isCondition").map(ExtensionBooleanData::getFormattedValue)); @@ -1353,11 +1348,11 @@ public interface DatabaseTest { extensionService.updateServerValues(CallEvents.MANUAL); extensionService.updateServerValues(CallEvents.MANUAL); - List ofServer = db().query(new ExtensionServerDataQuery(serverUUID())); + List ofServer = db().query(new ExtensionServerDataQuery(serverUUID())); assertFalse(ofServer.isEmpty()); - ExtensionServerData extensionServerData = ofServer.get(0); - List tabs = extensionServerData.getTabs(); + ExtensionData extensionData = ofServer.get(0); + List tabs = extensionData.getTabs(); assertEquals(1, tabs.size()); // No tab defined, should contain 1 tab ExtensionTabData tabData = tabs.get(0); @@ -1384,12 +1379,12 @@ public interface DatabaseTest { extensionService.updatePlayerValues(playerUUID, TestConstants.PLAYER_ONE_NAME, CallEvents.MANUAL); extensionService.updatePlayerValues(playerUUID, TestConstants.PLAYER_ONE_NAME, CallEvents.MANUAL); - Map> ofPlayer = db().query(new ExtensionPlayerDataQuery(playerUUID)); + Map> ofPlayer = db().query(new ExtensionPlayerDataQuery(playerUUID)); assertFalse(ofPlayer.isEmpty()); - List ofServer = ofPlayer.get(serverUUID()); + List ofServer = ofPlayer.get(serverUUID()); assertEquals(1, ofServer.size()); - ExtensionPlayerData extensionServerData = ofServer.get(0); + ExtensionData extensionServerData = ofServer.get(0); List tabs = extensionServerData.getTabs(); assertEquals(1, tabs.size()); // No tab defined, should contain 1 tab ExtensionTabData tabData = tabs.get(0);