From 86c4da43a5c6e951e5730606c3735317580767d4 Mon Sep 17 00:00:00 2001 From: Risto Lahtela <24460436+Rsl1122@users.noreply.github.com> Date: Sun, 31 Jan 2021 10:58:19 +0200 Subject: [PATCH] Replaced uncaught exceptions with BadRequestExceptions These two errors could have caused confusion in the future --- .../database/queries/filter/filters/DateRangeFilter.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 9a0afb0b8..10a1655fd 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 @@ -16,6 +16,7 @@ */ package com.djrapitops.plan.storage.database.queries.filter.filters; +import com.djrapitops.plan.delivery.web.resolver.exception.BadRequestException; import com.djrapitops.plan.storage.database.DBSystem; import com.djrapitops.plan.storage.database.queries.filter.Filter; import com.djrapitops.plan.storage.database.queries.filter.SpecifiedFilterInformation; @@ -69,8 +70,8 @@ public abstract class DateRangeFilter implements Filter { } 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); + String date = query.get(dateKey).orElseThrow(() -> new BadRequestException("'" + dateKey + "' not specified in parameters for " + getKind())); + String time = query.get(timeKey).orElseThrow(() -> new BadRequestException("'" + timeKey + "' not specified in parameters for " + getKind())); try { return dateFormat.parse(date + ' ' + time).getTime();