From 079c7ecc815bcce72acea93fe947988fb6e17267 Mon Sep 17 00:00:00 2001 From: Logan Fick Date: Wed, 5 Jun 2019 13:05:53 -0400 Subject: [PATCH] Fixed number related argument checks being too strict. --- src/main/java/dev/logal/logalbot/audio/TrackScheduler.java | 2 +- .../java/dev/logal/logalbot/commands/CommandResponse.java | 4 ++-- .../dev/logal/logalbot/utils/ReactionCallbackManager.java | 2 +- src/main/java/dev/logal/logalbot/utils/Scheduler.java | 6 +++--- src/main/java/dev/logal/logalbot/utils/StringUtil.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/dev/logal/logalbot/audio/TrackScheduler.java b/src/main/java/dev/logal/logalbot/audio/TrackScheduler.java index 34510c6..8531f67 100644 --- a/src/main/java/dev/logal/logalbot/audio/TrackScheduler.java +++ b/src/main/java/dev/logal/logalbot/audio/TrackScheduler.java @@ -80,7 +80,7 @@ public final class TrackScheduler extends AudioEventAdapter { } public final void removeFromQueue(final int index) { - Checks.positive(index, "Index"); + Checks.notNegative(index, "Index"); logger.info("Track '" + queue.remove(index).getTrack().getInfo().title + "' has been removed from the queue in " + this.guild.getName() + " (" + this.guild.getId() + ")."); diff --git a/src/main/java/dev/logal/logalbot/commands/CommandResponse.java b/src/main/java/dev/logal/logalbot/commands/CommandResponse.java index e9e82d2..4495167 100644 --- a/src/main/java/dev/logal/logalbot/commands/CommandResponse.java +++ b/src/main/java/dev/logal/logalbot/commands/CommandResponse.java @@ -59,7 +59,7 @@ public final class CommandResponse { } public final CommandResponse setDeletionDelay(final long delay, final TimeUnit unit) { - Checks.positive(delay, "Delay"); + Checks.notNegative(delay, "Delay"); Checks.notNull(unit, "Unit"); this.deletionDelay = delay; @@ -83,7 +83,7 @@ public final class CommandResponse { } public final CommandResponse setReactionCallbackExpireDelay(final long delay, final TimeUnit unit) { - Checks.positive(delay, "Delay"); + Checks.notNegative(delay, "Delay"); Checks.notNull(unit, "Unit"); this.expireDelay = delay; diff --git a/src/main/java/dev/logal/logalbot/utils/ReactionCallbackManager.java b/src/main/java/dev/logal/logalbot/utils/ReactionCallbackManager.java index fb06b5e..28f8a39 100644 --- a/src/main/java/dev/logal/logalbot/utils/ReactionCallbackManager.java +++ b/src/main/java/dev/logal/logalbot/utils/ReactionCallbackManager.java @@ -72,7 +72,7 @@ public final class ReactionCallbackManager { public static final void executeCallback(final long messageID, final TextChannel channel, final Member reactor, final String emoji) { - Checks.positive(messageID, "Message ID"); + Checks.notNegative(messageID, "Message ID"); Checks.notNull(channel, "Channel"); Checks.notNull(reactor, "Reactor"); Checks.notEmpty(emoji, "Emoji"); diff --git a/src/main/java/dev/logal/logalbot/utils/Scheduler.java b/src/main/java/dev/logal/logalbot/utils/Scheduler.java index b487f11..2bb94de 100644 --- a/src/main/java/dev/logal/logalbot/utils/Scheduler.java +++ b/src/main/java/dev/logal/logalbot/utils/Scheduler.java @@ -30,7 +30,7 @@ public final class Scheduler { public static final ScheduledFuture schedule(final Runnable runnable, final long delay, final TimeUnit unit) { Checks.notNull(runnable, "Runnable"); - Checks.positive(delay, "Delay"); + Checks.notNegative(delay, "Delay"); Checks.notNull(unit, "Unit"); return pool.schedule(runnable, delay, unit); @@ -39,8 +39,8 @@ public final class Scheduler { public static final ScheduledFuture scheduleRepeating(final Runnable runnable, final long initialDelay, final long period, final TimeUnit unit) { Checks.notNull(runnable, "Runnable"); - Checks.positive(initialDelay, "Initial delay"); - Checks.positive(period, "Period"); + Checks.notNegative(initialDelay, "Initial delay"); + Checks.notNegative(period, "Period"); Checks.notNull(unit, "Unit"); return pool.scheduleAtFixedRate(runnable, initialDelay, period, unit); diff --git a/src/main/java/dev/logal/logalbot/utils/StringUtil.java b/src/main/java/dev/logal/logalbot/utils/StringUtil.java index dfd2bf0..d8b69b8 100644 --- a/src/main/java/dev/logal/logalbot/utils/StringUtil.java +++ b/src/main/java/dev/logal/logalbot/utils/StringUtil.java @@ -81,7 +81,7 @@ public final class StringUtil { } public static final String formatTime(final long milliseconds) { - Checks.positive(milliseconds, "Milliseconds"); + Checks.notNegative(milliseconds, "Milliseconds"); final long second = (milliseconds / 1000) % 60; final long minute = (milliseconds / (1000 * 60)) % 60;