From 7480aa9d63238db6941f88e9b5984696da871dd3 Mon Sep 17 00:00:00 2001 From: Risto Lahtela <24460436+Rsl1122@users.noreply.github.com> Date: Sun, 31 Jan 2021 10:55:08 +0200 Subject: [PATCH] Rename things for better understanding fetchQueryPreviewPlayersOnline -> fetchViewPreviewGraphData FilterQuery -> SpecifiedFilterInformation ExtensionQueryPlayerDataTableQuery -> ExtensionQueryResultTableDataQuery ExtensionServerPlayerDataTableQuery -> ExtensionServerTableDataQuery --- .../plan/delivery/rendering/json/JSONFactory.java | 6 +++--- .../resolver/json/FiltersJSONResolver.java | 2 +- .../webserver/resolver/json/QueryJSONResolver.java | 8 ++++---- ...ava => ExtensionQueryResultTableDataQuery.java} | 4 ++-- ...ery.java => ExtensionServerTableDataQuery.java} | 4 ++-- .../storage/database/queries/filter/Filter.java | 6 +++--- .../database/queries/filter/QueryFilters.java | 14 +++++++------- ...rQuery.java => SpecifiedFilterInformation.java} | 8 ++++---- .../filter/filters/ActivityIndexFilter.java | 4 ++-- .../queries/filter/filters/AllPlayersFilter.java | 4 ++-- .../queries/filter/filters/BannedFilter.java | 4 ++-- .../queries/filter/filters/DateRangeFilter.java | 8 ++++---- .../queries/filter/filters/MultiOptionFilter.java | 4 ++-- .../queries/filter/filters/OperatorsFilter.java | 4 ++-- .../filters/PlayedBetweenDateRangeFilter.java | 6 +++--- .../queries/filter/filters/PluginGroupsFilter.java | 4 ++-- .../filters/RegisteredBetweenDateRangeFilter.java | 6 +++--- .../database/queries/objects/TPSQueries.java | 2 +- .../database/queries/ExtensionsDatabaseTest.java | 4 ++-- 19 files changed, 51 insertions(+), 51 deletions(-) rename Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/{ExtensionQueryPlayerDataTableQuery.java => ExtensionQueryResultTableDataQuery.java} (98%) rename Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/{ExtensionServerPlayerDataTableQuery.java => ExtensionServerTableDataQuery.java} (98%) rename Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/{FilterQuery.java => SpecifiedFilterInformation.java} (82%) diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/JSONFactory.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/JSONFactory.java index a69c4646f..4efd960eb 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/JSONFactory.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/JSONFactory.java @@ -24,7 +24,7 @@ import com.djrapitops.plan.delivery.formatting.Formatter; import com.djrapitops.plan.delivery.formatting.Formatters; import com.djrapitops.plan.delivery.rendering.json.graphs.Graphs; import com.djrapitops.plan.extension.implementation.results.ExtensionTabData; -import com.djrapitops.plan.extension.implementation.storage.queries.ExtensionServerPlayerDataTableQuery; +import com.djrapitops.plan.extension.implementation.storage.queries.ExtensionServerTableDataQuery; import com.djrapitops.plan.gathering.cache.SessionCache; import com.djrapitops.plan.gathering.domain.Ping; import com.djrapitops.plan.gathering.domain.PlayerKill; @@ -91,7 +91,7 @@ public class JSONFactory { return new PlayersTableJSONCreator( database.query(new ServerTablePlayersQuery(serverUUID, System.currentTimeMillis(), playtimeThreshold, xMostRecentPlayers)), - database.query(new ExtensionServerPlayerDataTableQuery(serverUUID, xMostRecentPlayers)), + database.query(new ExtensionServerTableDataQuery(serverUUID, xMostRecentPlayers)), openPlayerLinksInNewTab, formatters, locale ).toJSONMap(); @@ -105,7 +105,7 @@ public class JSONFactory { Database database = dbSystem.getDatabase(); UUID mainServerUUID = database.query(ServerQueries.fetchProxyServerInformation()).map(Server::getUuid).orElse(serverInfo.getServerUUID()); - Map pluginData = database.query(new ExtensionServerPlayerDataTableQuery(mainServerUUID, xMostRecentPlayers)); + Map pluginData = database.query(new ExtensionServerTableDataQuery(mainServerUUID, xMostRecentPlayers)); return new PlayersTableJSONCreator( database.query(new NetworkTablePlayersQuery(System.currentTimeMillis(), playtimeThreshold, xMostRecentPlayers)), diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/FiltersJSONResolver.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/FiltersJSONResolver.java index 5e0b82461..2ebe2b085 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/FiltersJSONResolver.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/FiltersJSONResolver.java @@ -80,7 +80,7 @@ public class FiltersJSONResolver implements Resolver { } private Response getResponse() { - List> data = dbSystem.getDatabase().query(TPSQueries.fetchQueryPreviewPlayersOnline(serverInfo.getServerUUID())); + List> data = dbSystem.getDatabase().query(TPSQueries.fetchViewPreviewGraphData(serverInfo.getServerUUID())); Long earliestStart = dbSystem.getDatabase().query(SessionQueries.earliestSessionStart()); data.add(0, new DateObj<>(earliestStart, 1)); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/QueryJSONResolver.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/QueryJSONResolver.java index 028fdad28..1bfcc5dca 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/QueryJSONResolver.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/QueryJSONResolver.java @@ -27,7 +27,7 @@ import com.djrapitops.plan.delivery.web.resolver.Response; import com.djrapitops.plan.delivery.web.resolver.exception.BadRequestException; import com.djrapitops.plan.delivery.web.resolver.request.Request; import com.djrapitops.plan.delivery.web.resolver.request.WebUser; -import com.djrapitops.plan.extension.implementation.storage.queries.ExtensionQueryPlayerDataTableQuery; +import com.djrapitops.plan.extension.implementation.storage.queries.ExtensionQueryResultTableDataQuery; import com.djrapitops.plan.settings.config.PlanConfig; import com.djrapitops.plan.settings.config.paths.DisplaySettings; import com.djrapitops.plan.settings.config.paths.TimeSettings; @@ -36,8 +36,8 @@ import com.djrapitops.plan.storage.database.DBSystem; import com.djrapitops.plan.storage.database.Database; import com.djrapitops.plan.storage.database.queries.analysis.NetworkActivityIndexQueries; import com.djrapitops.plan.storage.database.queries.filter.Filter; -import com.djrapitops.plan.storage.database.queries.filter.FilterQuery; import com.djrapitops.plan.storage.database.queries.filter.QueryFilters; +import com.djrapitops.plan.storage.database.queries.filter.SpecifiedFilterInformation; import com.djrapitops.plan.storage.database.queries.objects.GeoInfoQueries; import com.djrapitops.plan.storage.database.queries.objects.SessionQueries; import com.djrapitops.plan.storage.database.queries.objects.playertable.QueryTablePlayersQuery; @@ -118,7 +118,7 @@ public class QueryJSONResolver implements Resolver { try { q = URLDecoder.decode(q, "UTF-8"); - List queries = FilterQuery.parse(q); + List queries = SpecifiedFilterInformation.parse(q); Filter.Result result = filters.apply(queries); List resultPath = result.getInverseResultPath(); Collections.reverse(resultPath); @@ -198,7 +198,7 @@ public class QueryJSONResolver implements Resolver { Database database = dbSystem.getDatabase(); return new PlayersTableJSONCreator( database.query(new QueryTablePlayersQuery(playerUUIDs, after, before, config.get(TimeSettings.ACTIVE_PLAY_THRESHOLD))), - database.query(new ExtensionQueryPlayerDataTableQuery(playerUUIDs)), + database.query(new ExtensionQueryResultTableDataQuery(playerUUIDs)), config.get(DisplaySettings.OPEN_PLAYER_LINKS_IN_NEW_TAB), formatters, locale ).toJSONMap(); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionQueryPlayerDataTableQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionQueryResultTableDataQuery.java similarity index 98% rename from Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionQueryPlayerDataTableQuery.java rename to Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionQueryResultTableDataQuery.java index d0dc266cd..311ef6a9e 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionQueryPlayerDataTableQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionQueryResultTableDataQuery.java @@ -46,11 +46,11 @@ import static com.djrapitops.plan.storage.database.sql.building.Sql.*; * * @author Rsl1122 */ -public class ExtensionQueryPlayerDataTableQuery implements Query> { +public class ExtensionQueryResultTableDataQuery implements Query> { private final Collection playerUUIDs; - public ExtensionQueryPlayerDataTableQuery(Collection playerUUIDs) { + public ExtensionQueryResultTableDataQuery(Collection playerUUIDs) { this.playerUUIDs = playerUUIDs; } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerPlayerDataTableQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerTableDataQuery.java similarity index 98% rename from Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerPlayerDataTableQuery.java rename to Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerTableDataQuery.java index 5392c2d4f..f49a1a612 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerPlayerDataTableQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerTableDataQuery.java @@ -43,12 +43,12 @@ import static com.djrapitops.plan.storage.database.sql.building.Sql.*; * * @author Rsl1122 */ -public class ExtensionServerPlayerDataTableQuery implements Query> { +public class ExtensionServerTableDataQuery implements Query> { private final UUID serverUUID; private final int xMostRecentPlayers; - public ExtensionServerPlayerDataTableQuery(UUID serverUUID, int xMostRecentPlayers) { + public ExtensionServerTableDataQuery(UUID serverUUID, int xMostRecentPlayers) { this.serverUUID = serverUUID; this.xMostRecentPlayers = xMostRecentPlayers; } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/Filter.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/Filter.java index 9925e74ee..a24adc368 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/Filter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/Filter.java @@ -41,9 +41,9 @@ public interface Filter { * @throws IllegalArgumentException If the arguments are not valid. * @throws CompleteSetException If the arguments produce a complete set. */ - Set getMatchingUUIDs(FilterQuery query); + Set getMatchingUUIDs(SpecifiedFilterInformation query); - default Result apply(FilterQuery query) { + default Result apply(SpecifiedFilterInformation query) { return new Result(null, getKind(), getMatchingUUIDs(query)); } @@ -61,7 +61,7 @@ public interface Filter { this.currentUUIDs = currentUUIDs; } - public Result apply(Filter filter, FilterQuery query) { + public Result apply(Filter filter, SpecifiedFilterInformation query) { Set got = filter.getMatchingUUIDs(query); currentUUIDs.retainAll(got); return new Result(this, filter.getKind(), currentUUIDs); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/QueryFilters.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/QueryFilters.java index 4c25e687c..c65ed4ba4 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/QueryFilters.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/QueryFilters.java @@ -78,26 +78,26 @@ public class QueryFilters { * @return the result object or null if none of the filterQueries could be applied. * @throws BadRequestException If the request kind is not supported or if filter was given bad options. */ - public Filter.Result apply(List filterQueries) { + public Filter.Result apply(List filterQueries) { prepareFilters(); Filter.Result current = null; if (filterQueries.isEmpty()) return allPlayersFilter.apply(null); - for (FilterQuery filterQuery : filterQueries) { - current = apply(current, filterQuery); + for (SpecifiedFilterInformation specifiedFilterInformation : filterQueries) { + current = apply(current, specifiedFilterInformation); if (current != null && current.isEmpty()) break; } return current; } - private Filter.Result apply(Filter.Result current, FilterQuery filterQuery) { - String kind = filterQuery.getKind(); + private Filter.Result apply(Filter.Result current, SpecifiedFilterInformation specifiedFilterInformation) { + String kind = specifiedFilterInformation.getKind(); Filter filter = getFilter(kind).orElseThrow(() -> new BadRequestException("Filter kind not supported: '" + kind + "'")); - current = getResult(current, filter, filterQuery); + current = getResult(current, filter, specifiedFilterInformation); return current; } - private Filter.Result getResult(Filter.Result current, Filter filter, FilterQuery query) { + private Filter.Result getResult(Filter.Result current, Filter filter, SpecifiedFilterInformation query) { try { return current == null ? filter.apply(query) : current.apply(filter, query); } catch (IllegalArgumentException badOptions) { diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/FilterQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/SpecifiedFilterInformation.java similarity index 82% rename from Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/FilterQuery.java rename to Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/SpecifiedFilterInformation.java index a3df8885e..1df13b2f8 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/FilterQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/SpecifiedFilterInformation.java @@ -27,18 +27,18 @@ import java.util.*; * * @author Rsl1122 */ -public class FilterQuery { +public class SpecifiedFilterInformation { private final String kind; private final Map parameters; - public FilterQuery(String kind, Map parameters) { + public SpecifiedFilterInformation(String kind, Map parameters) { this.kind = kind; this.parameters = parameters; } - public static List parse(String json) throws IOException { - return new Gson().getAdapter(new TypeToken>() {}).fromJson(json); + public static List parse(String json) throws IOException { + return new Gson().getAdapter(new TypeToken>() {}).fromJson(json); } public String getKind() { diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/ActivityIndexFilter.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/ActivityIndexFilter.java index 16e649ea8..ffffd70e5 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/ActivityIndexFilter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/ActivityIndexFilter.java @@ -23,7 +23,7 @@ import com.djrapitops.plan.settings.locale.Locale; import com.djrapitops.plan.storage.database.DBSystem; import com.djrapitops.plan.storage.database.queries.analysis.NetworkActivityIndexQueries; import com.djrapitops.plan.storage.database.queries.filter.CompleteSetException; -import com.djrapitops.plan.storage.database.queries.filter.FilterQuery; +import com.djrapitops.plan.storage.database.queries.filter.SpecifiedFilterInformation; import javax.inject.Inject; import javax.inject.Singleton; @@ -63,7 +63,7 @@ public class ActivityIndexFilter extends MultiOptionFilter { } @Override - public Set getMatchingUUIDs(FilterQuery query) { + public Set getMatchingUUIDs(SpecifiedFilterInformation query) { List selected = getSelected(query); String[] options = getOptionsArray(); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/AllPlayersFilter.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/AllPlayersFilter.java index d1e00ab7c..0866968e4 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/AllPlayersFilter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/AllPlayersFilter.java @@ -18,7 +18,7 @@ package com.djrapitops.plan.storage.database.queries.filter.filters; import com.djrapitops.plan.storage.database.DBSystem; import com.djrapitops.plan.storage.database.queries.filter.Filter; -import com.djrapitops.plan.storage.database.queries.filter.FilterQuery; +import com.djrapitops.plan.storage.database.queries.filter.SpecifiedFilterInformation; import com.djrapitops.plan.storage.database.queries.objects.UserIdentifierQueries; import javax.inject.Inject; @@ -52,7 +52,7 @@ public class AllPlayersFilter implements Filter { } @Override - public Set getMatchingUUIDs(FilterQuery query) { + public Set getMatchingUUIDs(SpecifiedFilterInformation query) { return dbSystem.getDatabase().query(UserIdentifierQueries.fetchAllPlayerUUIDs()); } } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/BannedFilter.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/BannedFilter.java index 0c15b7210..e7cecb527 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/BannedFilter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/BannedFilter.java @@ -20,7 +20,7 @@ import com.djrapitops.plan.settings.locale.Locale; import com.djrapitops.plan.settings.locale.lang.FilterLang; import com.djrapitops.plan.storage.database.DBSystem; import com.djrapitops.plan.storage.database.queries.filter.CompleteSetException; -import com.djrapitops.plan.storage.database.queries.filter.FilterQuery; +import com.djrapitops.plan.storage.database.queries.filter.SpecifiedFilterInformation; import com.djrapitops.plan.storage.database.queries.objects.UserInfoQueries; import javax.inject.Inject; @@ -57,7 +57,7 @@ public class BannedFilter extends MultiOptionFilter { } @Override - public Set getMatchingUUIDs(FilterQuery query) { + public Set getMatchingUUIDs(SpecifiedFilterInformation query) { List selected = getSelected(query); Set uuids = new HashSet<>(); String[] options = getOptionsArray(); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/DateRangeFilter.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/DateRangeFilter.java index b347870a1..9a0afb0b8 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/DateRangeFilter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/DateRangeFilter.java @@ -18,7 +18,7 @@ package com.djrapitops.plan.storage.database.queries.filter.filters; import com.djrapitops.plan.storage.database.DBSystem; import com.djrapitops.plan.storage.database.queries.filter.Filter; -import com.djrapitops.plan.storage.database.queries.filter.FilterQuery; +import com.djrapitops.plan.storage.database.queries.filter.SpecifiedFilterInformation; import com.djrapitops.plan.storage.database.queries.objects.BaseUserQueries; import com.djrapitops.plan.utilities.java.Maps; import org.apache.commons.lang3.StringUtils; @@ -60,15 +60,15 @@ public abstract class DateRangeFilter implements Filter { .build(); } - protected long getAfter(FilterQuery query) { + protected long getAfter(SpecifiedFilterInformation query) { return getTime(query, "afterDate", "afterTime"); } - protected long getBefore(FilterQuery query) { + protected long getBefore(SpecifiedFilterInformation query) { return getTime(query, "beforeDate", "beforeTime"); } - private long getTime(FilterQuery query, String dateKey, String timeKey) { + private long getTime(SpecifiedFilterInformation query, String dateKey, String timeKey) { String date = query.get(dateKey).orElseThrow(IllegalArgumentException::new); String time = query.get(timeKey).orElseThrow(IllegalArgumentException::new); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/MultiOptionFilter.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/MultiOptionFilter.java index a82f9935b..d18bf9369 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/MultiOptionFilter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/MultiOptionFilter.java @@ -18,7 +18,7 @@ package com.djrapitops.plan.storage.database.queries.filter.filters; import com.djrapitops.plan.storage.database.queries.filter.CompleteSetException; import com.djrapitops.plan.storage.database.queries.filter.Filter; -import com.djrapitops.plan.storage.database.queries.filter.FilterQuery; +import com.djrapitops.plan.storage.database.queries.filter.SpecifiedFilterInformation; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; @@ -31,7 +31,7 @@ public abstract class MultiOptionFilter implements Filter { return new String[]{"selected"}; } - protected List getSelected(FilterQuery query) { + protected List getSelected(SpecifiedFilterInformation query) { String selectedJSON = query.get("selected").orElseThrow(IllegalArgumentException::new); List selected = new Gson().fromJson(selectedJSON, new TypeToken>() {}.getType()); if (selected.isEmpty()) throw new CompleteSetException(); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/OperatorsFilter.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/OperatorsFilter.java index 3050e9d58..9f98dfe61 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/OperatorsFilter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/OperatorsFilter.java @@ -20,7 +20,7 @@ import com.djrapitops.plan.settings.locale.Locale; import com.djrapitops.plan.settings.locale.lang.FilterLang; import com.djrapitops.plan.storage.database.DBSystem; import com.djrapitops.plan.storage.database.queries.filter.CompleteSetException; -import com.djrapitops.plan.storage.database.queries.filter.FilterQuery; +import com.djrapitops.plan.storage.database.queries.filter.SpecifiedFilterInformation; import com.djrapitops.plan.storage.database.queries.objects.UserInfoQueries; import javax.inject.Inject; @@ -57,7 +57,7 @@ public class OperatorsFilter extends MultiOptionFilter { } @Override - public Set getMatchingUUIDs(FilterQuery query) { + public Set getMatchingUUIDs(SpecifiedFilterInformation query) { List selected = getSelected(query); Set uuids = new HashSet<>(); String[] options = getOptionsArray(); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/PlayedBetweenDateRangeFilter.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/PlayedBetweenDateRangeFilter.java index 71426a13f..7721a109a 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/PlayedBetweenDateRangeFilter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/PlayedBetweenDateRangeFilter.java @@ -17,7 +17,7 @@ package com.djrapitops.plan.storage.database.queries.filter.filters; import com.djrapitops.plan.storage.database.DBSystem; -import com.djrapitops.plan.storage.database.queries.filter.FilterQuery; +import com.djrapitops.plan.storage.database.queries.filter.SpecifiedFilterInformation; import com.djrapitops.plan.storage.database.queries.objects.SessionQueries; import javax.inject.Inject; @@ -28,7 +28,7 @@ import java.util.UUID; @Singleton public class PlayedBetweenDateRangeFilter extends DateRangeFilter { - private DBSystem dbSystem; + private final DBSystem dbSystem; @Inject public PlayedBetweenDateRangeFilter(DBSystem dbSystem) { @@ -42,7 +42,7 @@ public class PlayedBetweenDateRangeFilter extends DateRangeFilter { } @Override - public Set getMatchingUUIDs(FilterQuery query) { + public Set getMatchingUUIDs(SpecifiedFilterInformation query) { long after = getAfter(query); long before = getBefore(query); return dbSystem.getDatabase().query(SessionQueries.uuidsOfPlayedBetween(after, before)); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/PluginGroupsFilter.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/PluginGroupsFilter.java index 53bf9cf2a..b8478054e 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/PluginGroupsFilter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/PluginGroupsFilter.java @@ -19,7 +19,7 @@ package com.djrapitops.plan.storage.database.queries.filter.filters; import com.djrapitops.plan.extension.implementation.storage.queries.ExtensionUUIDsInGroupQuery; import com.djrapitops.plan.storage.database.DBSystem; import com.djrapitops.plan.storage.database.queries.QueryAllStatement; -import com.djrapitops.plan.storage.database.queries.filter.FilterQuery; +import com.djrapitops.plan.storage.database.queries.filter.SpecifiedFilterInformation; import com.djrapitops.plan.storage.database.sql.tables.ExtensionGroupsTable; import com.djrapitops.plan.storage.database.sql.tables.ExtensionPluginTable; import com.djrapitops.plan.storage.database.sql.tables.ExtensionProviderTable; @@ -66,7 +66,7 @@ public class PluginGroupsFilter extends MultiOptionFilter { } @Override - public Set getMatchingUUIDs(FilterQuery query) { + public Set getMatchingUUIDs(SpecifiedFilterInformation query) { return dbSystem.getDatabase().query( new ExtensionUUIDsInGroupQuery(pluginName, groupProvider, getSelected(query)) ); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/RegisteredBetweenDateRangeFilter.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/RegisteredBetweenDateRangeFilter.java index 7b613f46c..913c2d1e1 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/RegisteredBetweenDateRangeFilter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/RegisteredBetweenDateRangeFilter.java @@ -17,7 +17,7 @@ package com.djrapitops.plan.storage.database.queries.filter.filters; import com.djrapitops.plan.storage.database.DBSystem; -import com.djrapitops.plan.storage.database.queries.filter.FilterQuery; +import com.djrapitops.plan.storage.database.queries.filter.SpecifiedFilterInformation; import com.djrapitops.plan.storage.database.queries.objects.BaseUserQueries; import javax.inject.Inject; @@ -28,7 +28,7 @@ import java.util.UUID; @Singleton public class RegisteredBetweenDateRangeFilter extends DateRangeFilter { - private DBSystem dbSystem; + private final DBSystem dbSystem; @Inject public RegisteredBetweenDateRangeFilter(DBSystem dbSystem) { @@ -42,7 +42,7 @@ public class RegisteredBetweenDateRangeFilter extends DateRangeFilter { } @Override - public Set getMatchingUUIDs(FilterQuery query) { + public Set getMatchingUUIDs(SpecifiedFilterInformation query) { long after = getAfter(query); long before = getBefore(query); return dbSystem.getDatabase().query(BaseUserQueries.uuidsOfRegisteredBetween(after, before)); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/TPSQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/TPSQueries.java index 8855a0a06..9b6dbf09f 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/TPSQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/TPSQueries.java @@ -154,7 +154,7 @@ public class TPSQueries { }; } - public static Query>> fetchQueryPreviewPlayersOnline(UUID serverUUID) { + public static Query>> fetchViewPreviewGraphData(UUID serverUUID) { String sql = SELECT + min(DATE) + " as " + DATE + ',' + max(PLAYERS_ONLINE) + " as " + PLAYERS_ONLINE + FROM + TABLE_NAME + diff --git a/Plan/common/src/test/java/com/djrapitops/plan/storage/database/queries/ExtensionsDatabaseTest.java b/Plan/common/src/test/java/com/djrapitops/plan/storage/database/queries/ExtensionsDatabaseTest.java index 1f84e8dbf..3f819f4e8 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/storage/database/queries/ExtensionsDatabaseTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/storage/database/queries/ExtensionsDatabaseTest.java @@ -27,7 +27,7 @@ import com.djrapitops.plan.extension.icon.Icon; 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; +import com.djrapitops.plan.extension.implementation.storage.queries.ExtensionServerTableDataQuery; import com.djrapitops.plan.extension.implementation.storage.transactions.results.RemoveUnsatisfiedConditionalPlayerResultsTransaction; import com.djrapitops.plan.extension.implementation.storage.transactions.results.RemoveUnsatisfiedConditionalServerResultsTransaction; import com.djrapitops.plan.extension.table.Table; @@ -116,7 +116,7 @@ public interface ExtensionsDatabaseTest extends DatabaseTestPreparer { execute(DataStoreQueries.storeSession(session)); - Map result = db().query(new ExtensionServerPlayerDataTableQuery(serverUUID(), 50)); + Map result = db().query(new ExtensionServerTableDataQuery(serverUUID(), 50)); assertEquals(1, result.size()); ExtensionTabData playerData = result.get(playerUUID); assertNotNull(playerData);