Cannot be null

mbax · mbax · commit 8d6a4a1c99c1 · 2020-09-02T00:36:56.000-04:00
diff --git a/src/main/java/org/kitteh/irc/client/library/defaults/DefaultBuilder.java b/src/main/java/org/kitteh/irc/client/library/defaults/DefaultBuilder.java
@@ -90,7 +90,7 @@ private class BindImpl implements Bind {
     private class ServerImpl implements Server {
         @Override
         public @NonNull Server address(@NonNull HostWithPort hostWithPort) {
-            DefaultBuilder.this.serverHostWithPort = Sanity.nullCheck(hostWithPort, "Host with port cannot be null");
+            DefaultBuilder.this.serverHostWithPort = Sanity.nullCheck(hostWithPort, "Host with port");
             return this;
         }
 
@@ -302,7 +302,7 @@ private class ManagementImpl implements Management {
 
         @Override
         public @NonNull Management networkHandler(@NonNull NetworkHandler networkHandler) {
-            DefaultBuilder.this.networkHandler = Sanity.nullCheck(networkHandler, "Network handler cannot be null");
+            DefaultBuilder.this.networkHandler = Sanity.nullCheck(networkHandler, "Network handler");
             return this;
         }
 
diff --git a/src/main/java/org/kitteh/irc/client/library/defaults/DefaultClient.java b/src/main/java/org/kitteh/irc/client/library/defaults/DefaultClient.java
@@ -344,11 +344,11 @@ public void addKeyProtectedChannel(@NonNull String channel, @NonNull String key)
 
     @Override
     public void addKeyProtectedChannel(@NonNull Pair<String, String>... channelsAndKeys) {
-        Sanity.nullCheck(channelsAndKeys, "Channel/key pairs cannot be null");
+        Sanity.nullCheck(channelsAndKeys, "Channel/key pairs");
         Sanity.truthiness(channelsAndKeys.length > 0, "Channel/key pairs cannot be empty array");
         for (Pair<String, String> channelAndKey : channelsAndKeys) {
             String channelName = channelAndKey.getLeft();
-            Sanity.nullCheck(channelName, "Channel/key pairs cannot contain null channel name");
+            Sanity.nullCheck(channelName, "Channel/key pair channel name");
             Sanity.truthiness(this.serverInfo.isValidChannel(channelName), "Channel/key pairs cannot contain invalid channel name " + channelName);
         }
         for (Pair<String, String> channelAndKey : channelsAndKeys) {
@@ -374,7 +374,7 @@ public void addKeyProtectedChannel(@NonNull Pair<String, String>... channelsAndK
 
     @Override
     public @NonNull Optional<Channel> getChannel(@NonNull String name) {
-        return this.actorTracker.getTrackedChannel(Sanity.nullCheck(name, "Channel name cannot be null"));
+        return this.actorTracker.getTrackedChannel(Sanity.nullCheck(name, "Channel name"));
     }
 
     @Override
@@ -384,7 +384,7 @@ public void addKeyProtectedChannel(@NonNull Pair<String, String>... channelsAndK
 
     @Override
     public @NonNull Set<Channel> getChannels(@NonNull Collection<String> channels) {
-        return Sanity.nullCheck(channels, "Channels collection cannot be null").stream()
+        return Sanity.nullCheck(channels, "Channels collection").stream()
                 .filter(Objects::nonNull)
                 .map(this.actorTracker::getTrackedChannel)
                 .flatMap(optional -> optional.map(Stream::of).orElseGet(Stream::empty))
@@ -658,7 +658,7 @@ public void setMessageSendingQueueSupplier(@NonNull Function<Client.WithManageme
 
     @Override
     public void setNetworkHandler(@NonNull NetworkHandler networkHandler) {
-        this.networkHandler = Sanity.nullCheck(networkHandler, "Network handler cannot be null");
+        this.networkHandler = Sanity.nullCheck(networkHandler, "Network handler");
     }
 
     @Override
diff --git a/src/main/java/org/kitteh/irc/client/library/defaults/feature/DefaultServerInfo.java b/src/main/java/org/kitteh/irc/client/library/defaults/feature/DefaultServerInfo.java
@@ -182,7 +182,7 @@ public void setVersion(@NonNull String version) {
     // Util stuffs
     @Override
     public boolean isValidChannel(@NonNull String name) {
-        Sanity.nullCheck(name, "Channel name cannot be null");
+        Sanity.nullCheck(name, "Channel name");
         int channelLengthLimit = this.getChannelLengthLimit();
         return (name.length() > 1) && ((channelLengthLimit < 0) || (name.length() <= channelLengthLimit)) && this.getChannelPrefixes().contains(name.charAt(0)) && this.channelPattern.matcher(name).matches();
     }
diff --git a/src/main/java/org/kitteh/irc/client/library/defaults/feature/network/NettyConnection.java b/src/main/java/org/kitteh/irc/client/library/defaults/feature/network/NettyConnection.java
@@ -101,9 +101,9 @@ public final class NettyConnection implements ClientConnection {
      */
     public NettyConnection(final Client.@NonNull WithManagement client, @NonNull ChannelFuture channelFuture, @NonNull Consumer<Client.WithManagement> shutdownHook) {
         this.client = Sanity.nullCheck(client, "Client");
-        this.channelFuture = Sanity.nullCheck(channelFuture, "Channel future cannot be null");
+        this.channelFuture = Sanity.nullCheck(channelFuture, "Channel future");
         this.channel = channelFuture.channel();
-        this.shutdownHook = Sanity.nullCheck(shutdownHook, "Shutdown hook cannot be null");
+        this.shutdownHook = Sanity.nullCheck(shutdownHook, "Shutdown hook");
 
         channelFuture.addListener(future -> {
             NettyConnection.this.channelFuture = null;
diff --git a/src/main/java/org/kitteh/irc/client/library/event/abstractbase/ClientReceiveServerMessageEventBase.java b/src/main/java/org/kitteh/irc/client/library/event/abstractbase/ClientReceiveServerMessageEventBase.java
@@ -55,7 +55,7 @@ public class ClientReceiveServerMessageEventBase extends ActorEventBase<Actor> i
      * @param parameters parameters
      */
     public ClientReceiveServerMessageEventBase(@NonNull Client client, @NonNull ServerMessage serverMessage, @NonNull Actor server, @NonNull String command, @NonNull List<String> parameters) {
-        super(client, Sanity.nullCheck(serverMessage, "Server message cannot be null"), server);
+        super(client, Sanity.nullCheck(serverMessage, "Server message"), server);
         this.parameters = Collections.unmodifiableList(new ArrayList<>(Sanity.nullCheck(parameters, "Parameters")));
         this.message = serverMessage;
         this.command = Sanity.nullCheck(command, "Command");
diff --git a/src/main/java/org/kitteh/irc/client/library/event/abstractbase/ServerMessageEventBase.java b/src/main/java/org/kitteh/irc/client/library/event/abstractbase/ServerMessageEventBase.java
@@ -47,7 +47,7 @@ public abstract class ServerMessageEventBase extends ClientEventBase implements
      */
     protected ServerMessageEventBase(@NonNull Client client, @NonNull ServerMessage sourceMessage) {
         super(client);
-        this.sourceMessage = Sanity.nullCheck(sourceMessage, "Original message cannot be null");
+        this.sourceMessage = Sanity.nullCheck(sourceMessage, "Original message");
     }
 
     @Override
diff --git a/src/main/java/org/kitteh/irc/client/library/event/abstractbase/ServerMultipleMessageEventBase.java b/src/main/java/org/kitteh/irc/client/library/event/abstractbase/ServerMultipleMessageEventBase.java
@@ -51,7 +51,7 @@ public abstract class ServerMultipleMessageEventBase extends ClientEventBase imp
      */
     protected ServerMultipleMessageEventBase(@NonNull Client client, @NonNull List<ServerMessage> sourceMessages) {
         super(client);
-        this.sourceMessages = Collections.unmodifiableList(new ArrayList<>(Sanity.nullCheck(sourceMessages, "Original messages cannot be null")));
+        this.sourceMessages = Collections.unmodifiableList(new ArrayList<>(Sanity.nullCheck(sourceMessages, "Original messages")));
     }
 
     @Override
diff --git a/src/main/java/org/kitteh/irc/client/library/event/abstractbase/UserInfoChangeEventBase.java b/src/main/java/org/kitteh/irc/client/library/event/abstractbase/UserInfoChangeEventBase.java
@@ -55,7 +55,7 @@ public class UserInfoChangeEventBase<Type> extends ActorEventBase<User> implemen
      */
     protected UserInfoChangeEventBase(@NonNull Client client, @NonNull ServerMessage sourceMessage, @NonNull User oldUser, @NonNull User newUser, @NonNull Function<User, Type> changedInfoGetter) {
         super(client, sourceMessage, oldUser);
-        this.newUser = Sanity.nullCheck(newUser, "New user cannot be null");
+        this.newUser = Sanity.nullCheck(newUser, "New user");
         this.change = new Change<>(changedInfoGetter.apply(oldUser), changedInfoGetter.apply(newUser));
     }
 
diff --git a/src/main/java/org/kitteh/irc/client/library/event/capabilities/CapabilitiesAcknowledgedEvent.java b/src/main/java/org/kitteh/irc/client/library/event/capabilities/CapabilitiesAcknowledgedEvent.java
@@ -55,7 +55,7 @@ public class CapabilitiesAcknowledgedEvent extends CapabilityNegotiationResponse
      */
     public CapabilitiesAcknowledgedEvent(@NonNull Client client, @NonNull ServerMessage sourceMessage, boolean negotiating, @NonNull List<CapabilityState> acknowledgedCapabilities) {
         super(client, sourceMessage, negotiating);
-        Sanity.nullCheck(acknowledgedCapabilities, "Capabilities list cannot be null");
+        Sanity.nullCheck(acknowledgedCapabilities, "Capabilities list");
         this.acknowledgedCapabilities = Collections.unmodifiableList(acknowledgedCapabilities);
     }
 
diff --git a/src/main/java/org/kitteh/irc/client/library/event/capabilities/CapabilitiesDeletedSupportedEvent.java b/src/main/java/org/kitteh/irc/client/library/event/capabilities/CapabilitiesDeletedSupportedEvent.java
@@ -56,7 +56,7 @@ public class CapabilitiesDeletedSupportedEvent extends CapabilityNegotiationResp
      */
     public CapabilitiesDeletedSupportedEvent(@NonNull Client client, @NonNull ServerMessage sourceMessage, boolean negotiating, @NonNull List<CapabilityState> deletedCapabilities) {
         super(client, sourceMessage, negotiating);
-        Sanity.nullCheck(deletedCapabilities, "Capabilities list cannot be null");
+        Sanity.nullCheck(deletedCapabilities, "Capabilities list");
         this.deletedCapabilities = Collections.unmodifiableList(new ArrayList<>(deletedCapabilities));
     }
 
diff --git a/src/main/java/org/kitteh/irc/client/library/event/capabilities/CapabilitiesListEvent.java b/src/main/java/org/kitteh/irc/client/library/event/capabilities/CapabilitiesListEvent.java
@@ -55,7 +55,7 @@ public class CapabilitiesListEvent extends ServerMultipleMessageEventBase {
      */
     public CapabilitiesListEvent(@NonNull Client client, @NonNull List<ServerMessage> sourceMessages, @NonNull List<CapabilityState> capabilities) {
         super(client, sourceMessages);
-        Sanity.nullCheck(capabilities, "Capabilities list cannot be null");
+        Sanity.nullCheck(capabilities, "Capabilities list");
         this.capabilities = Collections.unmodifiableList(new ArrayList<>(capabilities));
     }
 
diff --git a/src/main/java/org/kitteh/irc/client/library/event/capabilities/CapabilitiesNewSupportedEvent.java b/src/main/java/org/kitteh/irc/client/library/event/capabilities/CapabilitiesNewSupportedEvent.java
@@ -56,7 +56,7 @@ public class CapabilitiesNewSupportedEvent extends CapabilityNegotiationResponse
      */
     public CapabilitiesNewSupportedEvent(@NonNull Client client, @NonNull ServerMessage sourceMessage, boolean negotiating, @NonNull List<CapabilityState> newCapabilities) {
         super(client, sourceMessage, negotiating);
-        Sanity.nullCheck(newCapabilities, "Capabilities list cannot be null");
+        Sanity.nullCheck(newCapabilities, "Capabilities list");
         this.newCapabilities = Collections.unmodifiableList(new ArrayList<>(newCapabilities));
     }
 
diff --git a/src/main/java/org/kitteh/irc/client/library/event/capabilities/CapabilitiesRejectedEvent.java b/src/main/java/org/kitteh/irc/client/library/event/capabilities/CapabilitiesRejectedEvent.java
@@ -55,7 +55,7 @@ public class CapabilitiesRejectedEvent extends CapabilityNegotiationResponseEven
      */
     public CapabilitiesRejectedEvent(@NonNull Client client, @NonNull ServerMessage sourceMessage, boolean negotiating, @NonNull List<CapabilityState> rejectedCapabilitiesRequest) {
         super(client, sourceMessage, negotiating);
-        Sanity.nullCheck(rejectedCapabilitiesRequest, "Capabilities list cannot be null");
+        Sanity.nullCheck(rejectedCapabilitiesRequest, "Capabilities list");
         this.rejectedCapabilitiesRequest = Collections.unmodifiableList(rejectedCapabilitiesRequest);
     }
 
diff --git a/src/main/java/org/kitteh/irc/client/library/event/capabilities/CapabilitiesSupportedListEvent.java b/src/main/java/org/kitteh/irc/client/library/event/capabilities/CapabilitiesSupportedListEvent.java
@@ -61,7 +61,7 @@ public class CapabilitiesSupportedListEvent extends ServerMultipleMessageEventBa
     public CapabilitiesSupportedListEvent(@NonNull Client client, @NonNull List<ServerMessage> sourceMessages, boolean negotiating, @NonNull List<CapabilityState> supportedCapabilities) {
         super(client, sourceMessages);
         this.negotiating = negotiating;
-        Sanity.nullCheck(supportedCapabilities, "Capabilities list cannot be null");
+        Sanity.nullCheck(supportedCapabilities, "Capabilities list");
         this.supportedCapabilities = Collections.unmodifiableList(new ArrayList<>(supportedCapabilities));
     }
 
diff --git a/src/main/java/org/kitteh/irc/client/library/event/channel/ChannelModeEvent.java b/src/main/java/org/kitteh/irc/client/library/event/channel/ChannelModeEvent.java
@@ -51,7 +51,7 @@ public class ChannelModeEvent extends ActorChannelEventBase<Actor> {
      */
     public ChannelModeEvent(@NonNull Client client, @NonNull ServerMessage sourceMessage, @NonNull Actor actor, @NonNull Channel channel, @NonNull ModeStatusList<ChannelMode> statusList) {
         super(client, sourceMessage, actor, channel);
-        this.statusList = Sanity.nullCheck(statusList, "Status list cannot be null");
+        this.statusList = Sanity.nullCheck(statusList, "Status list");
     }
 
     /**
diff --git a/src/main/java/org/kitteh/irc/client/library/event/client/NickRejectedEvent.java b/src/main/java/org/kitteh/irc/client/library/event/client/NickRejectedEvent.java
@@ -47,8 +47,8 @@ public class NickRejectedEvent extends ServerMessageEventBase {
      */
     public NickRejectedEvent(@NonNull Client client, @NonNull ServerMessage sourceMessage, @NonNull String attemptedNick, @NonNull String newNick) {
         super(client, sourceMessage);
-        this.attemptedNick = Sanity.nullCheck(attemptedNick, "Attempted nick cannot be null");
-        this.newNick = Sanity.nullCheck(newNick, "New nick cannot be null");
+        this.attemptedNick = Sanity.nullCheck(attemptedNick, "Attempted nick");
+        this.newNick = Sanity.nullCheck(newNick, "New nick");
     }
 
     /**
diff --git a/src/main/java/org/kitteh/irc/client/library/event/user/MonitoredNickListFullEvent.java b/src/main/java/org/kitteh/irc/client/library/event/user/MonitoredNickListFullEvent.java
@@ -52,7 +52,7 @@ public class MonitoredNickListFullEvent extends ServerMessageEventBase {
     public MonitoredNickListFullEvent(@NonNull Client client, @NonNull ServerMessage sourceMessage, int limit, @NonNull List<String> rejectedNicks) {
         super(client, sourceMessage);
         this.limit = limit;
-        this.rejectedNicks = Collections.unmodifiableList(new ArrayList<>(Sanity.nullCheck(rejectedNicks, "Rejected nicks cannot be null")));
+        this.rejectedNicks = Collections.unmodifiableList(new ArrayList<>(Sanity.nullCheck(rejectedNicks, "Rejected nicks")));
     }
 
     /**
diff --git a/src/main/java/org/kitteh/irc/client/library/event/user/UserModeEvent.java b/src/main/java/org/kitteh/irc/client/library/event/user/UserModeEvent.java
@@ -51,7 +51,7 @@ public class UserModeEvent extends ActorEventBase<Actor> {
      */
     public UserModeEvent(@NonNull Client client, @NonNull ServerMessage sourceMessage, @NonNull Actor actor, @NonNull String target, @NonNull ModeStatusList<UserMode> statusList) {
         super(client, sourceMessage, actor);
-        this.statusList = Sanity.nullCheck(statusList, "Status list cannot be null");
+        this.statusList = Sanity.nullCheck(statusList, "Status list");
         this.target = Sanity.nullCheck(target, "Target");
     }
 
diff --git a/src/main/java/org/kitteh/irc/client/library/event/user/WhoisEvent.java b/src/main/java/org/kitteh/irc/client/library/event/user/WhoisEvent.java
@@ -44,7 +44,7 @@ public class WhoisEvent extends ClientEventBase {
      */
     public WhoisEvent(@NonNull Client client, @NonNull WhoisData whoisData) {
         super(client);
-        this.whoisData = Sanity.nullCheck(whoisData, "Whois data cannot be null");
+        this.whoisData = Sanity.nullCheck(whoisData, "Whois data");
     }
 
     /**
diff --git a/src/main/java/org/kitteh/irc/client/library/feature/auth/AbstractSaslProtocol.java b/src/main/java/org/kitteh/irc/client/library/feature/auth/AbstractSaslProtocol.java
@@ -145,7 +145,7 @@ private void finish() {
      */
     protected AbstractSaslProtocol(@NonNull Client client, @NonNull String saslType) {
         super(client);
-        this.saslType = Sanity.nullCheck(saslType, "SASL type cannot be null");
+        this.saslType = Sanity.nullCheck(saslType, "SASL type");
     }
 
     @Override
diff --git a/src/main/java/org/kitteh/irc/client/library/feature/auth/SaslEcdsaNist256PChallenge.java b/src/main/java/org/kitteh/irc/client/library/feature/auth/SaslEcdsaNist256PChallenge.java
@@ -123,7 +123,7 @@ public void authenticate(ClientReceiveCommandEvent event) {
      */
     public SaslEcdsaNist256PChallenge(@NonNull Client client, @NonNull String accountName, @NonNull ECPrivateKey privateKey) {
         super(client, "ECDSA-NIST256P-CHALLENGE", accountName);
-        this.privateKey = Sanity.nullCheck(privateKey, "Private key cannot be null");
+        this.privateKey = Sanity.nullCheck(privateKey, "Private key");
     }
 
     @Override
@@ -151,7 +151,7 @@ protected void toString(final ToStringer stringer) {
      * @see #getPrivateKey(String)
      */
     public static @NonNull String base64Encode(@NonNull ECPrivateKey privateKey) {
-        Sanity.nullCheck(privateKey, "Private key cannot be null");
+        Sanity.nullCheck(privateKey, "Private key");
         return Base64.getEncoder().encodeToString(privateKey.getEncoded());
     }
 
@@ -164,7 +164,7 @@ protected void toString(final ToStringer stringer) {
      * @see #getPublicKey(String)
      */
     public static @NonNull String base64Encode(@NonNull ECPublicKey publicKey) {
-        Sanity.nullCheck(publicKey, "Public key cannot be null");
+        Sanity.nullCheck(publicKey, "Public key");
         return Base64.getEncoder().encodeToString(publicKey.getEncoded());
     }
 
@@ -179,7 +179,7 @@ protected void toString(final ToStringer stringer) {
      * @see #base64Encode(ECPrivateKey)
      */
     public static @NonNull ECPrivateKey getPrivateKey(@NonNull String base64Encoded) throws NoSuchAlgorithmException, InvalidKeySpecException {
-        Sanity.nullCheck(base64Encoded, "Base64 encoded string cannot be null");
+        Sanity.nullCheck(base64Encoded, "Base64 encoded string");
         KeyFactory keyFactory = KeyFactory.getInstance("EC");
         PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(Base64.getDecoder().decode(base64Encoded));
         return (ECPrivateKey) keyFactory.generatePrivate(keySpec);
@@ -196,7 +196,7 @@ protected void toString(final ToStringer stringer) {
      * @see #base64Encode(ECPublicKey)
      */
     public static @NonNull ECPublicKey getPublicKey(@NonNull String base64Encoded) throws NoSuchAlgorithmException, InvalidKeySpecException {
-        Sanity.nullCheck(base64Encoded, "Base64 encoded string cannot be null");
+        Sanity.nullCheck(base64Encoded, "Base64 encoded string");
         KeyFactory keyFactory = KeyFactory.getInstance("EC");
         X509EncodedKeySpec keySpec = new X509EncodedKeySpec(Base64.getDecoder().decode(base64Encoded));
         return (ECPublicKey) keyFactory.generatePublic(keySpec);
@@ -214,7 +214,7 @@ protected void toString(final ToStringer stringer) {
      * @throws IllegalArgumentException if publicKey is null
      */
     public static @NonNull String getCompressedBase64PublicKey(@NonNull ECPublicKey publicKey) {
-        Sanity.nullCheck(publicKey, "Public key cannot be null");
+        Sanity.nullCheck(publicKey, "Public key");
         ECPoint ecPoint = publicKey.getW();
         byte[] xBytes = ecPoint.getAffineX().toByteArray();
         int overflow = xBytes.length - 32;
@@ -239,8 +239,8 @@ protected void toString(final ToStringer stringer) {
      * @throws IllegalArgumentException if either parameter is null
      */
     public static @NonNull String sign(@NonNull ECPrivateKey privateKey, @NonNull String base64Challenge) throws SignatureException, NoSuchAlgorithmException, InvalidKeyException {
-        Sanity.nullCheck(privateKey, "Private key cannot be null");
-        Sanity.nullCheck(base64Challenge, "Base64 encoded challenge cannot be null");
+        Sanity.nullCheck(privateKey, "Private key");
+        Sanity.nullCheck(base64Challenge, "Base64 encoded challenge");
         Signature signature = Signature.getInstance("NONEwithECDSA");
         signature.initSign(privateKey);
         signature.update(Base64.getDecoder().decode(base64Challenge));
@@ -274,8 +274,8 @@ protected void toString(final ToStringer stringer) {
      * @throws IllegalArgumentException if any parameter is null
      */
     public static boolean verify(@NonNull ECPublicKey publicKey, @NonNull String base64Challenge, @NonNull String signature) throws SignatureException, NoSuchAlgorithmException, InvalidKeyException {
-        Sanity.nullCheck(publicKey, "Public key cannot be null");
-        Sanity.nullCheck(base64Challenge, "Base64 encoded challenge cannot be null");
+        Sanity.nullCheck(publicKey, "Public key");
+        Sanity.nullCheck(base64Challenge, "Base64 encoded challenge");
         Sanity.nullCheck(signature, "Signature");
         Signature ver = Signature.getInstance("NONEwithECDSA");
         ver.initVerify(publicKey);
diff --git a/src/main/java/org/kitteh/irc/client/library/util/Change.java b/src/main/java/org/kitteh/irc/client/library/util/Change.java
@@ -41,8 +41,8 @@ public class Change<Type> {
      * @param newData the new data following the change taking place
      */
     public Change(@NonNull Type oldData, @NonNull Type newData) {
-        this.oldData = Sanity.nullCheck(oldData, "old data cannot be null");
-        this.newData = Sanity.nullCheck(newData, "new data cannot be null");
+        this.oldData = Sanity.nullCheck(oldData, "old data");
+        this.newData = Sanity.nullCheck(newData, "new data");
     }
 
     /**
diff --git a/src/main/java/org/kitteh/irc/client/library/util/Sanity.java b/src/main/java/org/kitteh/irc/client/library/util/Sanity.java
@@ -100,7 +100,7 @@ public static void truthiness(boolean bool, @NonNull String failMessage) {
      * @throws IllegalArgumentException if found
      */
     public static @NonNull String safeMessageCheck(@Nullable String message, @NonNull String name) {
-        Sanity.nullCheck(message, name + " cannot be null");
+        Sanity.nullCheck(message, name);
         for (char ch : message.toCharArray()) {
             if ((ch == '\n') || (ch == '\r') || (ch == '\0')) {
                 throw new IllegalArgumentException(name + " cannot contain CR, LF, or NUL");
diff --git a/src/main/java/org/kitteh/irc/client/library/util/StringUtil.java b/src/main/java/org/kitteh/irc/client/library/util/StringUtil.java
@@ -102,7 +102,7 @@ private StringUtil() {
      */
     public static @NonNull String makeRainbow(@NonNull String message, @NonNull Format[] colorOrder) {
         Sanity.safeMessageCheck(message);
-        Sanity.nullCheck(colorOrder, "Color order cannot be null");
+        Sanity.nullCheck(colorOrder, "Color order");
         for (Format format : colorOrder) {
             if (!format.isColor()) {
                 throw new IllegalArgumentException("Color order must contain only colors");

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ private class BindImpl implements Bind {`
`90`	`90`	`private class ServerImpl implements Server {`
`91`	`91`	`@Override`
`92`	`92`	`public @NonNull Server address(@NonNull HostWithPort hostWithPort) {`
`93`		`- DefaultBuilder.this.serverHostWithPort = Sanity.nullCheck(hostWithPort, "Host with port cannot be null");`
	`93`	`+ DefaultBuilder.this.serverHostWithPort = Sanity.nullCheck(hostWithPort, "Host with port");`
`94`	`94`	`return this;`
`95`	`95`	`}`
`96`	`96`
`@@ -302,7 +302,7 @@ private class ManagementImpl implements Management {`
`302`	`302`
`303`	`303`	`@Override`
`304`	`304`	`public @NonNull Management networkHandler(@NonNull NetworkHandler networkHandler) {`
`305`		`- DefaultBuilder.this.networkHandler = Sanity.nullCheck(networkHandler, "Network handler cannot be null");`
	`305`	`+ DefaultBuilder.this.networkHandler = Sanity.nullCheck(networkHandler, "Network handler");`
`306`	`306`	`return this;`
`307`	`307`	`}`
`308`	`308`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ public void setVersion(@NonNull String version) {`
`182`	`182`	`// Util stuffs`
`183`	`183`	`@Override`
`184`	`184`	`public boolean isValidChannel(@NonNull String name) {`
`185`		`- Sanity.nullCheck(name, "Channel name cannot be null");`
	`185`	`+ Sanity.nullCheck(name, "Channel name");`
`186`	`186`	`int channelLengthLimit = this.getChannelLengthLimit();`
`187`	`187`	`return (name.length() > 1) && ((channelLengthLimit < 0) \|\| (name.length() <= channelLengthLimit)) && this.getChannelPrefixes().contains(name.charAt(0)) && this.channelPattern.matcher(name).matches();`
`188`	`188`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public abstract class ServerMessageEventBase extends ClientEventBase implements`
`47`	`47`	`*/`
`48`	`48`	`protected ServerMessageEventBase(@NonNull Client client, @NonNull ServerMessage sourceMessage) {`
`49`	`49`	`super(client);`
`50`		`- this.sourceMessage = Sanity.nullCheck(sourceMessage, "Original message cannot be null");`
	`50`	`+ this.sourceMessage = Sanity.nullCheck(sourceMessage, "Original message");`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public abstract class ServerMultipleMessageEventBase extends ClientEventBase imp`
`51`	`51`	`*/`
`52`	`52`	`protected ServerMultipleMessageEventBase(@NonNull Client client, @NonNull List<ServerMessage> sourceMessages) {`
`53`	`53`	`super(client);`
`54`		`- this.sourceMessages = Collections.unmodifiableList(new ArrayList<>(Sanity.nullCheck(sourceMessages, "Original messages cannot be null")));`
	`54`	`+ this.sourceMessages = Collections.unmodifiableList(new ArrayList<>(Sanity.nullCheck(sourceMessages, "Original messages")));`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public class UserInfoChangeEventBase<Type> extends ActorEventBase<User> implemen`
`55`	`55`	`*/`
`56`	`56`	`protected UserInfoChangeEventBase(@NonNull Client client, @NonNull ServerMessage sourceMessage, @NonNull User oldUser, @NonNull User newUser, @NonNull Function<User, Type> changedInfoGetter) {`
`57`	`57`	`super(client, sourceMessage, oldUser);`
`58`		`- this.newUser = Sanity.nullCheck(newUser, "New user cannot be null");`
	`58`	`+ this.newUser = Sanity.nullCheck(newUser, "New user");`
`59`	`59`	`this.change = new Change<>(changedInfoGetter.apply(oldUser), changedInfoGetter.apply(newUser));`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public class CapabilitiesAcknowledgedEvent extends CapabilityNegotiationResponse`
`55`	`55`	`*/`
`56`	`56`	`public CapabilitiesAcknowledgedEvent(@NonNull Client client, @NonNull ServerMessage sourceMessage, boolean negotiating, @NonNull List<CapabilityState> acknowledgedCapabilities) {`
`57`	`57`	`super(client, sourceMessage, negotiating);`
`58`		`- Sanity.nullCheck(acknowledgedCapabilities, "Capabilities list cannot be null");`
	`58`	`+ Sanity.nullCheck(acknowledgedCapabilities, "Capabilities list");`
`59`	`59`	`this.acknowledgedCapabilities = Collections.unmodifiableList(acknowledgedCapabilities);`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public class CapabilitiesDeletedSupportedEvent extends CapabilityNegotiationResp`
`56`	`56`	`*/`
`57`	`57`	`public CapabilitiesDeletedSupportedEvent(@NonNull Client client, @NonNull ServerMessage sourceMessage, boolean negotiating, @NonNull List<CapabilityState> deletedCapabilities) {`
`58`	`58`	`super(client, sourceMessage, negotiating);`
`59`		`- Sanity.nullCheck(deletedCapabilities, "Capabilities list cannot be null");`
	`59`	`+ Sanity.nullCheck(deletedCapabilities, "Capabilities list");`
`60`	`60`	`this.deletedCapabilities = Collections.unmodifiableList(new ArrayList<>(deletedCapabilities));`
`61`	`61`	`}`
`62`	`62`