Skip to content

Commit 17dc99d

Browse files
mbaxmbax
committed
Update Sanity to auto-add 'cannot be null'
1 parent 7f27aee commit 17dc99d

File tree

67 files changed

+139
-147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+139
-147
lines changed

‎src/main/java/org/kitteh/irc/client/library/Client.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@
9292
* An individual IRC connection, see {@link #builder()} to create one.
9393
*/
9494
public interface Client extends ClientLinked {
95-
96-
9795
/**
9896
* Builds {@link Client}s. Create a builder with {@link Client#builder()}.
9997
* <p>
@@ -1222,7 +1220,7 @@ default boolean isUser(@Nullable User user) {
12221220
* @throws IllegalArgumentException for null parameters
12231221
*/
12241222
default void sendCtcpMessage(@NonNull MessageReceiver target, @NonNull String message) {
1225-
Sanity.nullCheck(target, "Target cannot be null");
1223+
Sanity.nullCheck(target, "Target");
12261224
this.sendCtcpMessage(target.getMessagingName(), message);
12271225
}
12281226

@@ -1247,7 +1245,7 @@ default void sendCtcpMessage(@NonNull MessageReceiver target, @NonNull String me
12471245
* @throws IllegalArgumentException for null parameters
12481246
*/
12491247
default void sendCtcpReply(@NonNull MessageReceiver target, @NonNull String message) {
1250-
Sanity.nullCheck(target, "Target cannot be null");
1248+
Sanity.nullCheck(target, "Target");
12511249
this.sendCtcpMessage(target.getMessagingName(), message);
12521250
}
12531251

@@ -1268,7 +1266,7 @@ default void sendCtcpReply(@NonNull MessageReceiver target, @NonNull String mess
12681266
* @throws IllegalArgumentException for null parameters
12691267
*/
12701268
default void sendMessage(@NonNull MessageReceiver target, @NonNull String message) {
1271-
Sanity.nullCheck(target, "Target cannot be null");
1269+
Sanity.nullCheck(target, "Target");
12721270
this.sendMessage(target.getMessagingName(), message);
12731271
}
12741272

@@ -1289,7 +1287,7 @@ default void sendMessage(@NonNull MessageReceiver target, @NonNull String messag
12891287
* @throws IllegalArgumentException for null parameters
12901288
*/
12911289
default void sendNotice(@NonNull MessageReceiver target, @NonNull String message) {
1292-
Sanity.nullCheck(target, "Target cannot be null");
1290+
Sanity.nullCheck(target, "Target");
12931291
this.sendNotice(target.getMessagingName(), message);
12941292
}
12951293

@@ -1350,7 +1348,7 @@ default void sendMultiLineMessage(@NonNull MessageReceiver target, @NonNull Stri
13501348
* @throws IllegalArgumentException for null parameters
13511349
*/
13521350
default void sendMultiLineMessage(@NonNull MessageReceiver target, @NonNull String message, @NonNull Cutter cutter) {
1353-
Sanity.nullCheck(target, "Target cannot be null");
1351+
Sanity.nullCheck(target, "Target");
13541352
this.sendMultiLineMessage(target.getMessagingName(), message, cutter);
13551353
}
13561354

@@ -1411,7 +1409,7 @@ default void sendMultiLineNotice(@NonNull MessageReceiver target, @NonNull Strin
14111409
* @throws IllegalArgumentException for null parameters
14121410
*/
14131411
default void sendMultiLineNotice(@NonNull MessageReceiver target, @NonNull String message, @NonNull Cutter cutter) {
1414-
Sanity.nullCheck(target, "Target cannot be null");
1412+
Sanity.nullCheck(target, "Target");
14151413
this.sendMultiLineNotice(target.getMessagingName(), message, cutter);
14161414
}
14171415

‎src/main/java/org/kitteh/irc/client/library/command/ChannelModeCommand.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public ChannelModeCommand(@NonNull Client client, @NonNull String channel) {
8282
* different client or parameter is null
8383
*/
8484
public @NonNull ChannelModeCommand add(ModeStatus.Action action, @NonNull ChannelMode mode, @NonNull String parameter) {
85-
return this.addChange(action, mode, Sanity.nullCheck(parameter, "Parameter cannot be null"));
85+
return this.addChange(action, mode, Sanity.nullCheck(parameter, "Parameter"));
8686
}
8787

8888
/**
@@ -96,13 +96,13 @@ public ChannelModeCommand(@NonNull Client client, @NonNull String channel) {
9696
* user comes from a different client or parameter is null
9797
*/
9898
public @NonNull ChannelModeCommand add(ModeStatus.Action action, @NonNull ChannelUserMode mode, @NonNull User parameter) {
99-
Sanity.nullCheck(parameter, "User cannot be null");
99+
Sanity.nullCheck(parameter, "User");
100100
Sanity.truthiness(parameter.getClient() == this.getClient(), "User comes from a different Client");
101101
return this.addChange(action, mode, parameter.getNick());
102102
}
103103

104104
private synchronized @NonNull ChannelModeCommand addChange(ModeStatus.Action action, @NonNull ChannelMode mode, @Nullable String parameter) {
105-
Sanity.nullCheck(mode, "Mode cannot be null");
105+
Sanity.nullCheck(mode, "Mode");
106106
Sanity.truthiness(mode.getClient() == this.getClient(), "Mode comes from a different Client");
107107
if (parameter != null) {
108108
Sanity.safeMessageCheck(parameter, "Parameter");

‎src/main/java/org/kitteh/irc/client/library/command/Command.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,18 @@ public class Tags {
4242
private List<MessageTag> tags = new ArrayList<>();
4343

4444
public Tags add(@NonNull MessageTag tag) {
45-
this.tags.add(Sanity.nullCheck(tag, "Tag cannot be null"));
45+
this.tags.add(Sanity.nullCheck(tag, "Tag"));
4646
return this;
4747
}
4848

4949
public Tags add(@NonNull String name) {
50-
this.tags.add(new MessageTagManager.DefaultMessageTag(Sanity.nullCheck(name, "Name cannot be null"), null));
50+
this.tags.add(new MessageTagManager.DefaultMessageTag(Sanity.nullCheck(name, "Name"), null));
5151
return this;
5252
}
5353

5454
public Tags add(@NonNull String name, @NonNull String value) {
55-
Sanity.nullCheck(name, "Name cannot be null");
56-
Sanity.nullCheck(value, "Value cannot be null");
55+
Sanity.nullCheck(name, "Name");
56+
Sanity.nullCheck(value, "Value");
5757
this.tags.add(new MessageTagManager.DefaultMessageTag(name, value));
5858
return this;
5959
}
@@ -78,7 +78,7 @@ public C then() {
7878
* @throws IllegalArgumentException if client is null
7979
*/
8080
protected Command(@NonNull Client client) {
81-
this.client = Sanity.nullCheck(client, "Client cannot be null");
81+
this.client = Sanity.nullCheck(client, "Client");
8282
}
8383

8484
/**

‎src/main/java/org/kitteh/irc/client/library/command/KickCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public KickCommand(@NonNull Client client, @NonNull String channel) {
7373
* @throws IllegalArgumentException if target is null or from a different Client
7474
*/
7575
public @NonNull KickCommand target(@NonNull User target) {
76-
Sanity.nullCheck(target, "Target cannot be null");
76+
Sanity.nullCheck(target, "Target");
7777
Sanity.truthiness(target.getClient() == this.getClient(), "User comes from a different client");
7878
this.target(target.getNick());
7979
return this;

‎src/main/java/org/kitteh/irc/client/library/command/MessageCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public MessageCommand(@NonNull Client client) {
6161
}
6262

6363
public @NonNull MessageCommand target(@NonNull MessageReceiver target) {
64-
this.target = Sanity.nullCheck(target, "Target cannot be null").getMessagingName();
64+
this.target = Sanity.nullCheck(target, "Target").getMessagingName();
6565
return this;
6666
}
6767

‎src/main/java/org/kitteh/irc/client/library/command/MonitorCommand.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public MonitorCommand(@NonNull Client client) {
9999
* @throws IllegalArgumentException for null action
100100
*/
101101
public @NonNull MonitorCommand action(@NonNull Action action) {
102-
this.action = Sanity.nullCheck(action, "Action cannot be null");
102+
this.action = Sanity.nullCheck(action, "Action");
103103
return this;
104104
}
105105

@@ -113,7 +113,7 @@ public MonitorCommand(@NonNull Client client) {
113113
* null target
114114
*/
115115
public @NonNull MonitorCommand target(@NonNull String... targets) {
116-
return this.target(Arrays.asList(Sanity.nullCheck(targets, "Targets cannot be null")));
116+
return this.target(Arrays.asList(Sanity.nullCheck(targets, "Targets")));
117117
}
118118

119119
/**
@@ -126,7 +126,7 @@ public MonitorCommand(@NonNull Client client) {
126126
* null target
127127
*/
128128
public synchronized @NonNull MonitorCommand target(@NonNull Collection<String> targets) {
129-
Sanity.nullCheck(targets, "Targets cannot be null");
129+
Sanity.nullCheck(targets, "Targets");
130130
Set<String> targetSet = new LinkedHashSet<>();
131131
for (String target : targets) {
132132
Sanity.safeMessageCheck(target, "target");

‎src/main/java/org/kitteh/irc/client/library/command/NoticeCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public NoticeCommand(@NonNull Client client) {
6161
}
6262

6363
public @NonNull NoticeCommand target(@NonNull MessageReceiver target) {
64-
this.target = Sanity.nullCheck(target, "Target cannot be null").getMessagingName();
64+
this.target = Sanity.nullCheck(target, "Target").getMessagingName();
6565
return this;
6666
}
6767

‎src/main/java/org/kitteh/irc/client/library/command/TagMessageCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public TagMessageCommand(@NonNull Client client) {
5959
}
6060

6161
public @NonNull TagMessageCommand target(@NonNull MessageReceiver target) {
62-
this.target = Sanity.nullCheck(target, "Target cannot be null").getMessagingName();
62+
this.target = Sanity.nullCheck(target, "Target").getMessagingName();
6363
return this;
6464
}
6565

‎src/main/java/org/kitteh/irc/client/library/command/UserModeCommand.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,11 @@ public UserModeCommand(@NonNull Client client) {
7575
* different client or parameter is null
7676
*/
7777
public @NonNull UserModeCommand add(ModeStatus.Action action, @NonNull UserMode mode, @NonNull String parameter) {
78-
return this.addChange(action, mode, Sanity.nullCheck(parameter, "Parameter cannot be null"));
78+
return this.addChange(action, mode, Sanity.nullCheck(parameter, "Parameter"));
7979
}
8080

8181
private synchronized @NonNull UserModeCommand addChange(ModeStatus.Action action, @NonNull UserMode mode, @Nullable String parameter) {
82-
Sanity.nullCheck(mode, "Mode cannot be null");
82+
Sanity.nullCheck(mode, "Mode");
8383
Sanity.truthiness(mode.getClient() == this.getClient(), "Mode comes from a different Client");
8484
if (parameter != null) {
8585
Sanity.safeMessageCheck(parameter, "Parameter");

‎src/main/java/org/kitteh/irc/client/library/defaults/DefaultBuilder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ private class ServerImpl implements Server {
9696

9797
@Override
9898
public @NonNull Server host(@NonNull String host) {
99-
DefaultBuilder.this.serverHostWithPort = DefaultBuilder.this.serverHostWithPort.withHost(Sanity.nullCheck(host, "Host cannot be null"));
99+
DefaultBuilder.this.serverHostWithPort = DefaultBuilder.this.serverHostWithPort.withHost(Sanity.nullCheck(host, "Host"));
100100
return this;
101101
}
102102

@@ -281,7 +281,7 @@ private class ManagementImpl implements Management {
281281

282282
@Override
283283
public @NonNull Management messageSendingQueueSupplier(@Nullable Function<Client.WithManagement, ? extends MessageSendingQueue> supplier) {
284-
DefaultBuilder.this.messageSendingQueue = Sanity.nullCheck(supplier, "Supplier cannot be null");
284+
DefaultBuilder.this.messageSendingQueue = Sanity.nullCheck(supplier, "Supplier");
285285
return this;
286286
}
287287

0 commit comments

Comments
 (0)