Skip to content

Commit 2bc2331

Browse files
committed
added not-null checks for fail-fast
1 parent a64651a commit 2bc2331

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

application/src/main/java/org/togetherjava/tjbot/commands/moderation/BanCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public BanCommand(@NotNull ModerationActionsStore actionsStore) {
6161

6262
hasRequiredRole = Pattern.compile(Config.getInstance().getHeavyModerationRolePattern())
6363
.asMatchPredicate();
64-
this.actionsStore = actionsStore;
64+
this.actionsStore = Objects.requireNonNull(actionsStore);
6565
}
6666

6767
private static RestAction<InteractionHook> handleAlreadyBanned(@NotNull Guild.Ban ban,

application/src/main/java/org/togetherjava/tjbot/commands/moderation/KickCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public KickCommand(@NotNull ModerationActionsStore actionsStore) {
5151

5252
hasRequiredRole = Pattern.compile(Config.getInstance().getSoftModerationRolePattern())
5353
.asMatchPredicate();
54-
this.actionsStore = actionsStore;
54+
this.actionsStore = Objects.requireNonNull(actionsStore);
5555
}
5656

5757
private static void handleAbsentTarget(@NotNull Interaction event) {

application/src/main/java/org/togetherjava/tjbot/commands/moderation/ModerationActionsStore.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import java.time.Instant;
1111
import java.util.List;
12+
import java.util.Objects;
1213
import java.util.Optional;
1314

1415
/**
@@ -36,7 +37,7 @@ public final class ModerationActionsStore {
3637
* @param database the database to write and retrieve actions from
3738
*/
3839
public ModerationActionsStore(@NotNull Database database) {
39-
this.database = database;
40+
this.database = Objects.requireNonNull(database);
4041
}
4142

4243
/**
@@ -50,6 +51,8 @@ public ModerationActionsStore(@NotNull Database database) {
5051
*/
5152
public @NotNull List<ActionRecord> getActionsByTypeAscending(long guildId,
5253
@NotNull ModerationUtils.Action actionType) {
54+
Objects.requireNonNull(actionType);
55+
5356
return getActionsFromGuildAscending(guildId,
5457
ModerationActions.MODERATION_ACTIONS.ACTION_TYPE.eq(actionType.name()));
5558
}
@@ -118,6 +121,9 @@ public ModerationActionsStore(@NotNull Database database) {
118121
public int addAction(long guildId, long authorId, long targetId,
119122
@NotNull ModerationUtils.Action actionType, @Nullable Instant actionExpiresAt,
120123
@NotNull String reason) {
124+
Objects.requireNonNull(actionType);
125+
Objects.requireNonNull(reason);
126+
121127
return database.writeAndProvide(context -> {
122128
ModerationActionsRecord actionRecord =
123129
context.newRecord(ModerationActions.MODERATION_ACTIONS)
@@ -135,6 +141,8 @@ public int addAction(long guildId, long authorId, long targetId,
135141

136142
private @NotNull List<ActionRecord> getActionsFromGuildAscending(long guildId,
137143
@NotNull Condition condition) {
144+
Objects.requireNonNull(condition);
145+
138146
return database.read(context -> context.selectFrom(ModerationActions.MODERATION_ACTIONS)
139147
.where(ModerationActions.MODERATION_ACTIONS.GUILD_ID.eq(guildId).and(condition))
140148
.orderBy(ModerationActions.MODERATION_ACTIONS.ISSUED_AT.asc())

application/src/main/java/org/togetherjava/tjbot/commands/moderation/UnbanCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public UnbanCommand(@NotNull ModerationActionsStore actionsStore) {
4646

4747
hasRequiredRole = Pattern.compile(Config.getInstance().getHeavyModerationRolePattern())
4848
.asMatchPredicate();
49-
this.actionsStore = actionsStore;
49+
this.actionsStore = Objects.requireNonNull(actionsStore);
5050
}
5151

5252
private void unban(@NotNull User target, @NotNull Member author, @NotNull String reason,

0 commit comments

Comments
 (0)