Fix GenericFilter parsing with server names

Author: AuroraLS3

Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/datatransfer/GenericFilter.java

@@ -21,6 +21,7 @@
 import com.djrapitops.plan.utilities.dev.Untrusted;
 import com.djrapitops.plan.utilities.java.CatchingParsers;
 import org.apache.commons.lang3.StringUtils;
+import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 
 import java.util.*;
@@ -58,10 +59,6 @@ public GenericFilter(@Untrusted URIQuery query) {
         playerUUID = query.get("player", CatchingParsers::parsePlayerUUID).orElse(null);
     }
 
-    public static GenericFilter of(@Untrusted URIQuery query) {
-        return new GenericFilter(query);
-    }
-
     public Long getAfter() {
         return after != null ? after : 0L;
     }
@@ -82,7 +79,7 @@ public boolean contains(ServerUUID serverUUID) {
         return serverUUIDs.isEmpty() || serverUUIDs.contains(serverUUID);
     }
 
-    public @Untrusted List<String> getServerIdentifiers() {
+    public @NonNull @Untrusted List<String> getServerIdentifiers() {
         return serverIdentifiers;
     }
 

Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/SessionsJSONResolver.java

@@ -108,10 +108,7 @@ public Optional<Response> resolve(Request request) {
     }
 
     private Response getResponse(Request request) {
-        GenericFilter filter = GenericFilter.of(request.getQuery());
-        if (!filter.didAllServerIdentifiersParse()) {
-            filter.setServerUUIDs(identifiers.getServerUUIDs(filter.getServerIdentifiers()));
-        }
+        GenericFilter filter = identifiers.genericFilter(request.getQuery());
 
         @Untrusted Optional<ETag> tag = Identifiers.getEtag(request);
         Long etag = tag.map(eTag -> eTag.parseAsLong()

Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/query/DataPointJSONResolver.java

@@ -55,12 +55,13 @@
 @Path("/v1/datapoint")
 public class DataPointJSONResolver implements Resolver {
 
+    private final Identifiers identifiers;
     private final DatapointStore datapointStore;
     private final Formatter<Long> httpLastModifiedFormatter;
 
-
     @Inject
-    public DataPointJSONResolver(DatapointStore datapointStore, Formatters formatters) {
+    public DataPointJSONResolver(Identifiers identifiers, DatapointStore datapointStore, Formatters formatters) {
+        this.identifiers = identifiers;
         this.datapointStore = datapointStore;
         this.httpLastModifiedFormatter = formatters.httpLastModifiedLong();
     }
@@ -71,7 +72,7 @@ public boolean canAccess(Request request) {
         if (user.isEmpty()) return false;
         DatapointType type = request.getQuery().get("type", DatapointType::find)
                 .orElseThrow(() -> new BadRequestException("type is required"));
-        GenericFilter filter = GenericFilter.of(request.getQuery());
+        GenericFilter filter = identifiers.genericFilter(request.getQuery());
 
         Optional<WebPermission> permission = datapointStore.getPermission(type, filter);
         if (permission.isEmpty()) return false;
@@ -108,7 +109,7 @@ public boolean canAccess(Request request) {
     public Optional<Response> resolve(Request request) {
         DatapointType type = request.getQuery().get("type", DatapointType::find)
                 .orElseThrow(() -> new BadRequestException("type is required"));
-        GenericFilter filter = GenericFilter.of(request.getQuery());
+        GenericFilter filter = identifiers.genericFilter(request.getQuery());
         @Untrusted Optional<ETag> tag = Identifiers.getEtag(request);
         Long etag = tag.map(eTag -> eTag.parseAsLong()
                         .orElseThrow(() -> new BadRequestException("If-Modified-Since should be a 64bit number")))

Plan/common/src/main/java/com/djrapitops/plan/identification/Identifiers.java

@@ -16,8 +16,10 @@
  */
 package com.djrapitops.plan.identification;
 
+import com.djrapitops.plan.delivery.domain.datatransfer.GenericFilter;
 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.URIQuery;
 import com.djrapitops.plan.delivery.webserver.resolver.ETag;
 import com.djrapitops.plan.storage.database.DBSystem;
 import com.djrapitops.plan.storage.database.queries.objects.ServerQueries;
@@ -153,4 +155,12 @@ public List<ServerUUID> getServerUUIDs(@Untrusted List<String> serverIdentifiers
         }
         return serverUUIDs;
     }
+
+    public GenericFilter genericFilter(@Untrusted URIQuery query) {
+        GenericFilter filter = new GenericFilter(query);
+        if (!filter.didAllServerIdentifiersParse()) {
+            filter.setServerUUIDs(getServerUUIDs(filter.getServerIdentifiers()));
+        }
+        return filter;
+    }
 }

Plan/react/dashboard/src/views/server/ServerOverview.jsx

@@ -34,7 +34,6 @@ const Last7DaysCard = ({data}) => {
     const {t} = useTranslation();
     const {identifier} = useParams();
 
-
     const {error} = useDatapointQuery(true, DatapointType.TPS_AVERAGE, {server: identifier, afterMillisAgo: MS_WEEK})
     const noData = error?.status === 404