Java 21 migrations

mbax · mbax · commit 6384e2fcbcbc · 2025-07-21T21:21:31.000-04:00
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
@@ -966,7 +966,7 @@ private void sendLineEvent(@NonNull ClientReceiveServerMessageEvent event) {
         KittehServerMessageException exception = null;
         onThroughToTheOtherSide:
         if (CapabilityManager.Defaults.BATCH.equalsIgnoreCase(event.getCommand())) {
-            if (parameters.isEmpty() || (parameters.get(0).length() < 2)) {
+            if (parameters.isEmpty() || (parameters.getFirst().length() < 2)) {
                 exception = new KittehServerMessageException(event.getServerMessage(), "Server sent a BATCH without sufficient information: Missing name and type.");
                 // Tried to run, tried to hide,
                 break onThroughToTheOtherSide;
diff --git a/src/main/java/org/kitteh/irc/client/library/defaults/feature/DefaultAuthManager.java b/src/main/java/org/kitteh/irc/client/library/defaults/feature/DefaultAuthManager.java
@@ -56,7 +56,7 @@ public DefaultAuthManager(@NonNull Client client) {
     public synchronized @NonNull Optional<AuthProtocol> addProtocol(@NonNull AuthProtocol protocol) {
         Sanity.nullCheck(protocol, "Protocol");
         List<AuthProtocol> matching = this.protocols.stream().filter(p -> p.getClass() == protocol.getClass()).toList();
-        Optional<AuthProtocol> removed = Optional.ofNullable(matching.isEmpty() ? null : matching.get(0));
+        Optional<AuthProtocol> removed = Optional.ofNullable(matching.isEmpty() ? null : matching.getFirst());
         removed.ifPresent(this::removeProtocol);
         this.protocols.add(protocol);
         if (protocol instanceof EventListening) {
diff --git a/src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultAccountListener.java b/src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultAccountListener.java
@@ -55,7 +55,7 @@ public void account(ClientReceiveCommandEvent event) {
             this.trackException(event, "ACCOUNT message from something other than a user");
             return;
         }
-        String accountParameter = event.getParameters().get(0);
+        String accountParameter = event.getParameters().getFirst();
         String accountName = "*".equals(accountParameter) ? null : accountParameter;
         this.fire(new UserAccountStatusEvent(this.getClient(), event.getSource(), (User) event.getActor(), accountName));
         this.getTracker().setUserAccount(((User) event.getActor()).getNick(), accountName);
diff --git a/src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultInviteListener.java b/src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultInviteListener.java
@@ -59,6 +59,6 @@ public void invite(ClientReceiveCommandEvent event) {
         if (this.getClient().getNick().equalsIgnoreCase(event.getParameters().get(0)) && this.getClient().getIntendedChannels().contains(channel.getName())) {
             this.getClient().sendRawLine("JOIN " + channel.getName());
         }
-        this.fire(new ChannelInviteEvent(this.getClient(), event.getSource(), channel, event.getActor(), event.getParameters().get(0)));
+        this.fire(new ChannelInviteEvent(this.getClient(), event.getSource(), channel, event.getActor(), event.getParameters().getFirst()));
     }
 }
diff --git a/src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultJoinListener.java b/src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultJoinListener.java
@@ -56,7 +56,7 @@ public void join(ClientReceiveCommandEvent event) {
             this.trackException(event, "JOIN message too short");
             return;
         }
-        String channelName = event.getParameters().get(0);
+        String channelName = event.getParameters().getFirst();
         if (!this.getClient().getServerInfo().isValidChannel(channelName)) {
             this.trackException(event, "JOIN message sent for invalid channel name");
             return;
diff --git a/src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultModeListener.java b/src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultModeListener.java
@@ -85,7 +85,7 @@ public void mode(ClientReceiveCommandEvent event) {
             this.trackException(event, "MODE message too short");
             return;
         }
-        MessageTargetInfo messageTargetInfo = this.getTypeByTarget(event.getParameters().get(0));
+        MessageTargetInfo messageTargetInfo = this.getTypeByTarget(event.getParameters().getFirst());
         if (messageTargetInfo instanceof MessageTargetInfo.Private) {
             ModeStatusList<UserMode> statusList;
             try {
@@ -94,7 +94,7 @@ public void mode(ClientReceiveCommandEvent event) {
                 this.trackException(event, e.getMessage());
                 return;
             }
-            this.fire(new UserModeEvent(this.getClient(), event.getSource(), event.getActor(), event.getParameters().get(0), statusList));
+            this.fire(new UserModeEvent(this.getClient(), event.getSource(), event.getActor(), event.getParameters().getFirst(), statusList));
             this.getClient().updateUserModes(statusList);
         } else if (messageTargetInfo instanceof MessageTargetInfo.ChannelInfo) {
             Channel channel = ((MessageTargetInfo.ChannelInfo) messageTargetInfo).getChannel();
diff --git a/src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultNickListener.java b/src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultNickListener.java
@@ -58,7 +58,7 @@ public void nick(ClientReceiveCommandEvent event) {
             return;
         }
         boolean isSelf = ((User) event.getActor()).getNick().equals(this.getClient().getNick());
-        String newNick = event.getParameters().get(0);
+        String newNick = event.getParameters().getFirst();
         Optional<User> user = this.getTracker().getTrackedUser(((User) event.getActor()).getNick());
         if (user.isEmpty()) {
             if (isSelf) {
diff --git a/src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultNoticeListener.java b/src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultNoticeListener.java
@@ -76,18 +76,21 @@ public void notice(ClientReceiveCommandEvent event) {
             final MessageTargetInfo messageTargetInfo = this.getTypeByTarget(event.getParameters().get(0));
             User user = (User) event.getActor();
             if (messageTargetInfo instanceof MessageTargetInfo.Private) {
-                this.fire(new PrivateCtcpReplyEvent(this.getClient(), event.getSource(), user, event.getParameters().get(0), ctcpMessage));
+                this.fire(new PrivateCtcpReplyEvent(this.getClient(), event.getSource(), user, event.getParameters().getFirst(), ctcpMessage));
             }
             return;
         }
         User user = (User) event.getActor();
         MessageTargetInfo messageTargetInfo = this.getTypeByTarget(event.getParameters().get(0));
-        if (messageTargetInfo instanceof MessageTargetInfo.Private) {
-            this.fire(new PrivateNoticeEvent(this.getClient(), event.getSource(), user, event.getParameters().get(0), message));
-        } else if (messageTargetInfo instanceof MessageTargetInfo.ChannelInfo channelInfo) {
-            this.fire(new ChannelNoticeEvent(this.getClient(), event.getSource(), user, channelInfo.getChannel(), message));
-        } else if (messageTargetInfo instanceof MessageTargetInfo.TargetedChannel channelInfo) {
-            this.fire(new ChannelTargetedNoticeEvent(this.getClient(), event.getSource(), user, channelInfo.getChannel(), channelInfo.getPrefix(), message));
+        switch (messageTargetInfo) {
+            case MessageTargetInfo.Private p ->
+                    this.fire(new PrivateNoticeEvent(this.getClient(), event.getSource(), user, event.getParameters().getFirst(), message));
+            case MessageTargetInfo.ChannelInfo channelInfo ->
+                    this.fire(new ChannelNoticeEvent(this.getClient(), event.getSource(), user, channelInfo.getChannel(), message));
+            case MessageTargetInfo.TargetedChannel channelInfo ->
+                    this.fire(new ChannelTargetedNoticeEvent(this.getClient(), event.getSource(), user, channelInfo.getChannel(), channelInfo.getPrefix(), message));
+            default -> {
+            }
         }
     }
 }
diff --git a/src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultPartListener.java b/src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultPartListener.java
@@ -53,7 +53,7 @@ public void part(ClientReceiveCommandEvent event) {
             this.trackException(event, "PART message too short");
             return;
         }
-        Channel channel = this.getTracker().getChannel(event.getParameters().get(0)).orElse(null);
+        Channel channel = this.getTracker().getChannel(event.getParameters().getFirst()).orElse(null);
         if (channel == null) {
             this.trackException(event, "PART message sent for invalid channel name");
             return;
diff --git a/src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultPrivmsgListener.java b/src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultPrivmsgListener.java
@@ -80,7 +80,7 @@ public void privmsg(ClientReceiveCommandEvent event) {
                 if (ctcpMessage.startsWith("PING ")) {
                     reply = ctcpMessage;
                 }
-                PrivateCtcpQueryEvent ctcpEvent = new PrivateCtcpQueryEvent(this.getClient(), event.getSource(), user, event.getParameters().get(0), ctcpMessage, reply);
+                PrivateCtcpQueryEvent ctcpEvent = new PrivateCtcpQueryEvent(this.getClient(), event.getSource(), user, event.getParameters().getFirst(), ctcpMessage, reply);
                 this.fire(ctcpEvent);
                 Optional<String> replyMessage = ctcpEvent.getReply();
                 if (ctcpEvent.isToClient()) {
@@ -95,12 +95,15 @@ public void privmsg(ClientReceiveCommandEvent event) {
         }
         User user = (User) event.getActor();
         MessageTargetInfo messageTargetInfo = this.getTypeByTarget(event.getParameters().get(0));
-        if (messageTargetInfo instanceof MessageTargetInfo.Private) {
-            this.fire(new PrivateMessageEvent(this.getClient(), event.getSource(), user, event.getParameters().get(0), event.getParameters().get(1)));
-        } else if (messageTargetInfo instanceof MessageTargetInfo.ChannelInfo channelInfo) {
-            this.fire(new ChannelMessageEvent(this.getClient(), event.getSource(), user, channelInfo.getChannel(), event.getParameters().get(1)));
-        } else if (messageTargetInfo instanceof MessageTargetInfo.TargetedChannel channelInfo) {
-            this.fire(new ChannelTargetedMessageEvent(this.getClient(), event.getSource(), user, channelInfo.getChannel(), channelInfo.getPrefix(), event.getParameters().get(1)));
+        switch (messageTargetInfo) {
+            case MessageTargetInfo.Private p ->
+                    this.fire(new PrivateMessageEvent(this.getClient(), event.getSource(), user, event.getParameters().get(0), event.getParameters().get(1)));
+            case MessageTargetInfo.ChannelInfo channelInfo ->
+                    this.fire(new ChannelMessageEvent(this.getClient(), event.getSource(), user, channelInfo.getChannel(), event.getParameters().get(1)));
+            case MessageTargetInfo.TargetedChannel channelInfo ->
+                    this.fire(new ChannelTargetedMessageEvent(this.getClient(), event.getSource(), user, channelInfo.getChannel(), channelInfo.getPrefix(), event.getParameters().get(1)));
+            default -> {
+            }
         }
     }
 }
diff --git a/src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultQuitListener.java b/src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultQuitListener.java
@@ -48,7 +48,7 @@ public DefaultQuitListener(Client.@NonNull WithManagement client) {
     @Handler(priority = Integer.MAX_VALUE - 1)
     public void quit(ClientReceiveCommandEvent event) {
         if (event.getActor() instanceof User) {
-            this.fire(new UserQuitEvent(this.getClient(), event.getSource(), (User) event.getActor(), (event.getParameters().isEmpty()) ? "" : event.getParameters().get(0)));
+            this.fire(new UserQuitEvent(this.getClient(), event.getSource(), (User) event.getActor(), (event.getParameters().isEmpty()) ? "" : event.getParameters().getFirst()));
             this.getTracker().trackUserQuit(((User) event.getActor()).getNick());
         } else {
             this.trackException(event, "QUIT message sent for non-user");
diff --git a/src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultSetNameListener.java b/src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultSetNameListener.java
@@ -68,7 +68,7 @@ public void setname(ClientReceiveCommandEvent event) {
 
         User oldUser = optUser.get();
 
-        String newRealName = event.getParameters().get(0);
+        String newRealName = event.getParameters().getFirst();
         this.getTracker().trackUserRealnameChange(user.getNick(), newRealName);
         this.fire(new UserRealnameChangeEvent(this.getClient(), event.getSource(), oldUser, this.getTracker().getTrackedUser(user.getNick()).get()));
     }
diff --git a/src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultTagmsgListener.java b/src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultTagmsgListener.java
@@ -52,13 +52,16 @@ public void tagmsg(ClientReceiveCommandEvent event) {
             this.trackException(event, "TAGMSG message too short");
             return;
         }
-        MessageTargetInfo messageTargetInfo = this.getTypeByTarget(event.getParameters().get(0));
-        if (messageTargetInfo instanceof MessageTargetInfo.Private) {
-            this.fire(new PrivateTagMessageEvent(this.getClient(), event.getSource(), event.getActor(), event.getParameters().get(0)));
-        } else if (messageTargetInfo instanceof MessageTargetInfo.ChannelInfo channelInfo) {
-            this.fire(new ChannelTagMessageEvent(this.getClient(), event.getSource(), event.getActor(), channelInfo.getChannel()));
-        } else if (messageTargetInfo instanceof MessageTargetInfo.TargetedChannel channelInfo) {
-            this.fire(new ChannelTargetedTagMessageEvent(this.getClient(), event.getSource(), event.getActor(), channelInfo.getChannel(), channelInfo.getPrefix()));
+        MessageTargetInfo messageTargetInfo = this.getTypeByTarget(event.getParameters().getFirst());
+        switch (messageTargetInfo) {
+            case MessageTargetInfo.Private p ->
+                    this.fire(new PrivateTagMessageEvent(this.getClient(), event.getSource(), event.getActor(), event.getParameters().getFirst()));
+            case MessageTargetInfo.ChannelInfo channelInfo ->
+                    this.fire(new ChannelTagMessageEvent(this.getClient(), event.getSource(), event.getActor(), channelInfo.getChannel()));
+            case MessageTargetInfo.TargetedChannel channelInfo ->
+                    this.fire(new ChannelTargetedTagMessageEvent(this.getClient(), event.getSource(), event.getActor(), channelInfo.getChannel(), channelInfo.getPrefix()));
+            default -> {
+            }
         }
     }
 }
diff --git a/src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultUserModeListener.java b/src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultUserModeListener.java
@@ -54,7 +54,7 @@ public void umode(ClientReceiveNumericEvent event) {
             return;
         }
 
-        if (!this.getClient().getServerInfo().getCaseMapping().areEqualIgnoringCase(event.getParameters().get(0), this.getClient().getNick())) {
+        if (!this.getClient().getServerInfo().getCaseMapping().areEqualIgnoringCase(event.getParameters().getFirst(), this.getClient().getNick())) {
             this.trackException(event, "UMODE response for another user");
             return;
         }
diff --git a/src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultWallopsListener.java b/src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultWallopsListener.java
@@ -50,6 +50,6 @@ public void wallops(ClientReceiveCommandEvent event) {
             this.trackException(event, "WALLOPS message too short");
             return;
         }
-        this.fire(new WallopsEvent(this.getClient(), event.getSource(), event.getActor(), event.getParameters().get(0)));
+        this.fire(new WallopsEvent(this.getClient(), event.getSource(), event.getActor(), event.getParameters().getFirst()));
     }
 }
diff --git a/src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultWelcomeListener.java b/src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultWelcomeListener.java
@@ -46,7 +46,7 @@ public DefaultWelcomeListener(Client.@NonNull WithManagement client) {
     @Handler(priority = Integer.MAX_VALUE - 1)
     public void welcome(ClientReceiveNumericEvent event) {
         if (!event.getParameters().isEmpty()) {
-            this.getClient().setCurrentNick(event.getParameters().get(0));
+            this.getClient().setCurrentNick(event.getParameters().getFirst());
         } else {
             this.trackException(event, "Nickname missing from welcome message; can't confirm");
         }
diff --git a/src/main/java/org/kitteh/irc/client/library/element/ISupportParameter.java b/src/main/java/org/kitteh/irc/client/library/element/ISupportParameter.java
@@ -194,7 +194,7 @@ default boolean isAllowed(@NonNull String tag) {
             if (list.isEmpty()) {
                 return true;
             }
-            if (list.get(0).equals("*")) {
+            if (list.getFirst().equals("*")) {
                 if (list.size() == 1) {
                     return false;
                 }
diff --git a/src/main/java/org/kitteh/irc/client/library/feature/CaseMapping.java b/src/main/java/org/kitteh/irc/client/library/feature/CaseMapping.java
@@ -28,9 +28,7 @@
 import org.jspecify.annotations.Nullable;
 import org.kitteh.irc.client.library.util.Sanity;
 
-import java.util.HashMap;
 import java.util.Locale;
-import java.util.Map;
 import java.util.Optional;
 
 /**
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
@@ -97,10 +97,10 @@ private class Listener extends AbstractSaslProtocol.Listener {
         public void authenticate(ClientReceiveCommandEvent event) {
             if (!event.getParameters().isEmpty()) {
                 String base64;
-                if ("+".equals(event.getParameters().get(0))) {
+                if ("+".equals(event.getParameters().getFirst())) {
                     base64 = Base64.getEncoder().encodeToString(SaslEcdsaNist256PChallenge.this.getAuthLine().getBytes());
                 } else {
-                    String challenge = event.getParameters().get(0);
+                    String challenge = event.getParameters().getFirst();
                     try {
                         base64 = SaslEcdsaNist256PChallenge.sign(SaslEcdsaNist256PChallenge.this.privateKey, challenge);
                     } catch (Exception e) {
diff --git a/src/main/java/org/kitteh/irc/client/library/feature/twitch/TwitchListener.java b/src/main/java/org/kitteh/irc/client/library/feature/twitch/TwitchListener.java
@@ -125,7 +125,7 @@ public void whisper(ClientReceiveCommandEvent event) {
     }
 
     private @NonNull Channel getChannel(ClientReceiveCommandEvent event) {
-        Optional<Channel> channel = this.client.getChannel(event.getParameters().get(0));
+        Optional<Channel> channel = this.client.getChannel(event.getParameters().getFirst());
         if (channel.isEmpty()) {
             throw new KittehServerMessageException(event.getServerMessage(), "Invalid channel name");
         }
diff --git a/src/test/java/org/kitteh/irc/client/library/defaults/DefaultEventListenerTest.java b/src/test/java/org/kitteh/irc/client/library/defaults/DefaultEventListenerTest.java
@@ -221,7 +221,7 @@ public void testMOTD() {
         this.fireLine(":irc.network 372 Kitteh :-   Hello                         ");
         this.fireLine(":irc.network 372 Kitteh");
         this.fireLine(":irc.network 376 Kitteh :End of /MOTD command.             ");
-        Mockito.verify(this.serverInfo, Mockito.times(1)).setMotd(Mockito.argThat(o -> (o != null) && (o.size() == 1) && o.get(0).contains("Hello")));
+        Mockito.verify(this.serverInfo, Mockito.times(1)).setMotd(Mockito.argThat(o -> (o != null) && (o.size() == 1) && o.getFirst().contains("Hello")));
         Mockito.verify(this.exceptionListener, Mockito.times(1)).queue(Mockito.argThat(this.exception(KittehServerMessageException.class, "MOTD message too short")));
     }
 
diff --git a/src/test/java/org/kitteh/irc/client/library/defaults/feature/ChghostTest.java b/src/test/java/org/kitteh/irc/client/library/defaults/feature/ChghostTest.java
@@ -41,8 +41,8 @@ public void testChghostWithInvalidActorThrowsException() {
         Mockito.when(actorMock.getClient()).thenReturn(clientMock);
         sut.chghost(new ClientReceiveCommandEvent(clientMock, Mockito.mock(ServerMessage.class), actorMock, "CHGHOST", Arrays.asList("foo", "bar")));
         Assertions.assertEquals(1, exceptions.size(), "No exception fired");
-        Assertions.assertEquals(KittehServerMessageException.class, exceptions.get(0).getClass(), "Wrong exception type");
-        MatcherAssert.assertThat("Wrong exception fired", exceptions.get(0).getMessage(), CoreMatchers.containsString("Invalid actor for CHGHOST message"));
+        Assertions.assertEquals(KittehServerMessageException.class, exceptions.getFirst().getClass(), "Wrong exception type");
+        MatcherAssert.assertThat("Wrong exception fired", exceptions.getFirst().getMessage(), CoreMatchers.containsString("Invalid actor for CHGHOST message"));
     }
 
     /**
@@ -57,8 +57,8 @@ public void testChghostWithTooManyParameters() {
         Mockito.when(actorMock.getClient()).thenReturn(clientMock);
         sut.chghost(new ClientReceiveCommandEvent(clientMock, Mockito.mock(ServerMessage.class), actorMock, "CHGHOST", Arrays.asList("foo", "bar", "kitten")));
         Assertions.assertEquals(1, exceptions.size(), "No exception fired");
-        Assertions.assertEquals(KittehServerMessageException.class, exceptions.get(0).getClass(), "Wrong exception type");
-        MatcherAssert.assertThat("Wrong exception fired", exceptions.get(0).getMessage(), CoreMatchers.containsString("Invalid number of parameters for CHGHOST message"));
+        Assertions.assertEquals(KittehServerMessageException.class, exceptions.getFirst().getClass(), "Wrong exception type");
+        MatcherAssert.assertThat("Wrong exception fired", exceptions.getFirst().getMessage(), CoreMatchers.containsString("Invalid number of parameters for CHGHOST message"));
     }
 
     /**
@@ -73,8 +73,8 @@ public void testChghostWithTooFewParameters() {
         Mockito.when(actorMock.getClient()).thenReturn(clientMock);
         sut.chghost(new ClientReceiveCommandEvent(clientMock, Mockito.mock(ServerMessage.class), actorMock, "CHGHOST", Collections.singletonList("foo")));
         Assertions.assertEquals(1, exceptions.size(), "No exception fired");
-        Assertions.assertEquals(KittehServerMessageException.class, exceptions.get(0).getClass(), "Wrong exception type");
-        MatcherAssert.assertThat("Wrong exception fired", exceptions.get(0).getMessage(), CoreMatchers.containsString("Invalid number of parameters for CHGHOST message"));
+        Assertions.assertEquals(KittehServerMessageException.class, exceptions.getFirst().getClass(), "Wrong exception type");
+        MatcherAssert.assertThat("Wrong exception fired", exceptions.getFirst().getMessage(), CoreMatchers.containsString("Invalid number of parameters for CHGHOST message"));
     }
 
     /**
diff --git a/src/test/java/org/kitteh/irc/client/library/defaults/feature/MessageTagTest.java b/src/test/java/org/kitteh/irc/client/library/defaults/feature/MessageTagTest.java
diff --git a/src/test/java/org/kitteh/irc/client/library/defaults/feature/sts/StsPropertiesStorageManagerTest.java b/src/test/java/org/kitteh/irc/client/library/defaults/feature/sts/StsPropertiesStorageManagerTest.java
diff --git a/src/test/java/org/kitteh/irc/client/library/util/CutterTest.java b/src/test/java/org/kitteh/irc/client/library/util/CutterTest.java

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public void account(ClientReceiveCommandEvent event) {`
`55`	`55`	`this.trackException(event, "ACCOUNT message from something other than a user");`
`56`	`56`	`return;`
`57`	`57`	`}`
`58`		`- String accountParameter = event.getParameters().get(0);`
	`58`	`+ String accountParameter = event.getParameters().getFirst();`
`59`	`59`	`String accountName = "*".equals(accountParameter) ? null : accountParameter;`
`60`	`60`	`this.fire(new UserAccountStatusEvent(this.getClient(), event.getSource(), (User) event.getActor(), accountName));`
`61`	`61`	`this.getTracker().setUserAccount(((User) event.getActor()).getNick(), accountName);`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,6 @@ public void invite(ClientReceiveCommandEvent event) {`
`59`	`59`	`if (this.getClient().getNick().equalsIgnoreCase(event.getParameters().get(0)) && this.getClient().getIntendedChannels().contains(channel.getName())) {`
`60`	`60`	`this.getClient().sendRawLine("JOIN " + channel.getName());`
`61`	`61`	`}`
`62`		`- this.fire(new ChannelInviteEvent(this.getClient(), event.getSource(), channel, event.getActor(), event.getParameters().get(0)));`
	`62`	`+ this.fire(new ChannelInviteEvent(this.getClient(), event.getSource(), channel, event.getActor(), event.getParameters().getFirst()));`
`63`	`63`	`}`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public void join(ClientReceiveCommandEvent event) {`
`56`	`56`	`this.trackException(event, "JOIN message too short");`
`57`	`57`	`return;`
`58`	`58`	`}`
`59`		`- String channelName = event.getParameters().get(0);`
	`59`	`+ String channelName = event.getParameters().getFirst();`
`60`	`60`	`if (!this.getClient().getServerInfo().isValidChannel(channelName)) {`
`61`	`61`	`this.trackException(event, "JOIN message sent for invalid channel name");`
`62`	`62`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public void nick(ClientReceiveCommandEvent event) {`
`58`	`58`	`return;`
`59`	`59`	`}`
`60`	`60`	`boolean isSelf = ((User) event.getActor()).getNick().equals(this.getClient().getNick());`
`61`		`- String newNick = event.getParameters().get(0);`
	`61`	`+ String newNick = event.getParameters().getFirst();`
`62`	`62`	`Optional<User> user = this.getTracker().getTrackedUser(((User) event.getActor()).getNick());`
`63`	`63`	`if (user.isEmpty()) {`
`64`	`64`	`if (isSelf) {`
Original file line number	Diff line number	Diff line change
`@@ -76,18 +76,21 @@ public void notice(ClientReceiveCommandEvent event) {`
`76`	`76`	`final MessageTargetInfo messageTargetInfo = this.getTypeByTarget(event.getParameters().get(0));`
`77`	`77`	`User user = (User) event.getActor();`
`78`	`78`	`if (messageTargetInfo instanceof MessageTargetInfo.Private) {`
`79`		`- this.fire(new PrivateCtcpReplyEvent(this.getClient(), event.getSource(), user, event.getParameters().get(0), ctcpMessage));`
	`79`	`+ this.fire(new PrivateCtcpReplyEvent(this.getClient(), event.getSource(), user, event.getParameters().getFirst(), ctcpMessage));`
`80`	`80`	`}`
`81`	`81`	`return;`
`82`	`82`	`}`
`83`	`83`	`User user = (User) event.getActor();`
`84`	`84`	`MessageTargetInfo messageTargetInfo = this.getTypeByTarget(event.getParameters().get(0));`
`85`		`- if (messageTargetInfo instanceof MessageTargetInfo.Private) {`
`86`		`- this.fire(new PrivateNoticeEvent(this.getClient(), event.getSource(), user, event.getParameters().get(0), message));`
`87`		`- } else if (messageTargetInfo instanceof MessageTargetInfo.ChannelInfo channelInfo) {`
`88`		`- this.fire(new ChannelNoticeEvent(this.getClient(), event.getSource(), user, channelInfo.getChannel(), message));`
`89`		`- } else if (messageTargetInfo instanceof MessageTargetInfo.TargetedChannel channelInfo) {`
`90`		`- this.fire(new ChannelTargetedNoticeEvent(this.getClient(), event.getSource(), user, channelInfo.getChannel(), channelInfo.getPrefix(), message));`
	`85`	`+ switch (messageTargetInfo) {`
	`86`	`+ case MessageTargetInfo.Private p ->`
	`87`	`+ this.fire(new PrivateNoticeEvent(this.getClient(), event.getSource(), user, event.getParameters().getFirst(), message));`
	`88`	`+ case MessageTargetInfo.ChannelInfo channelInfo ->`
	`89`	`+ this.fire(new ChannelNoticeEvent(this.getClient(), event.getSource(), user, channelInfo.getChannel(), message));`
	`90`	`+ case MessageTargetInfo.TargetedChannel channelInfo ->`
	`91`	`+ this.fire(new ChannelTargetedNoticeEvent(this.getClient(), event.getSource(), user, channelInfo.getChannel(), channelInfo.getPrefix(), message));`
	`92`	`+ default -> {`
	`93`	`+ }`
`91`	`94`	`}`
`92`	`95`	`}`
`93`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public void part(ClientReceiveCommandEvent event) {`
`53`	`53`	`this.trackException(event, "PART message too short");`
`54`	`54`	`return;`
`55`	`55`	`}`
`56`		`- Channel channel = this.getTracker().getChannel(event.getParameters().get(0)).orElse(null);`
	`56`	`+ Channel channel = this.getTracker().getChannel(event.getParameters().getFirst()).orElse(null);`
`57`	`57`	`if (channel == null) {`
`58`	`58`	`this.trackException(event, "PART message sent for invalid channel name");`
`59`	`59`	`return;`