Additional Java cleanup

Author: mbax

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

@@ -928,6 +928,7 @@ interface WithManagement extends Client {
      * @param channelsAndKeys pairs of channel, key
      * @throws IllegalArgumentException if null or invalid
      */
+    @SuppressWarnings({"unchecked", "varargs"})
     void addKeyProtectedChannel(@NonNull Pair<String, String>... channelsAndKeys);
 
     /**

src/main/java/org/kitteh/irc/client/library/command/CapabilityRequestCommand.java

@@ -79,7 +79,7 @@ public CapabilityRequestCommand(@NonNull Client client) {
     public synchronized void execute() {
         StringBuilder builder = new StringBuilder(200);
         for (String request : this.requests) {
-            if ((builder.length() > 0) && ((request.length() + builder.length()) > 200)) {
+            if ((!builder.isEmpty()) && ((request.length() + builder.length()) > 200)) {
                 this.send(builder.toString());
                 builder.setLength(0);
             }

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

@@ -148,11 +148,11 @@ public synchronized void execute() {
             }
             StringBuilder builder = new StringBuilder(200);
             for (String request : this.targets) {
-                if ((builder.length() > 0) && ((request.length() + builder.length()) > 200)) {
+                if ((!builder.isEmpty()) && ((request.length() + builder.length()) > 200)) {
                     this.monitorCommand(this.action, builder.toString());
                     builder.setLength(0);
                 }
-                if (builder.length() > 0) {
+                if (!builder.isEmpty()) {
                     builder.append(',');
                 }
                 builder.append(request);

src/main/java/org/kitteh/irc/client/library/command/SetNameCommand.java

@@ -63,7 +63,7 @@ public void execute() {
         if (this.newName == null) {
             throw new IllegalStateException("New name not specified");
         }
-        if (!this.getClient().getCapabilityManager().getCapability(CapabilityManager.Defaults.SETNAME).isPresent()) {
+        if (this.getClient().getCapabilityManager().getCapability(CapabilityManager.Defaults.SETNAME).isEmpty()) {
             throw new IllegalStateException("Cannot send SETNAME when the capability is not negotiated");
         }
         this.sendCommandLine("SETNAME :" + this.newName);

src/main/java/org/kitteh/irc/client/library/defaults/DefaultClient.java

@@ -101,7 +101,6 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * Default implementation of {@link Client}.
@@ -338,6 +337,7 @@ public void addKeyProtectedChannel(@NonNull String channel, @NonNull String key)
         this.sendRawLine("JOIN " + channel + ' ' + key);
     }
 
+    @SuppressWarnings({"unchecked", "varargs"})
     @Override
     public void addKeyProtectedChannel(@NonNull Pair<String, String>... channelsAndKeys) {
         Sanity.nullCheck(channelsAndKeys, "Channel/key pairs");
@@ -383,7 +383,7 @@ public void addKeyProtectedChannel(@NonNull Pair<String, String>... channelsAndK
         return Sanity.nullCheck(channels, "Channels collection").stream()
                 .filter(Objects::nonNull)
                 .map(this.actorTracker::getTrackedChannel)
-                .flatMap(optional -> optional.map(Stream::of).orElseGet(Stream::empty))
+                .flatMap(Optional::stream)
                 .collect(Collectors.toSet());
     }
 
@@ -863,6 +863,7 @@ public boolean isSecureConnection() {
         return this.secure;
     }
 
+    @SuppressWarnings("UnnecessaryLabelOnBreakStatement")
     private void handleLine(final @NonNull String line) {
         if (line.isEmpty()) {
             this.actorTracker.reset();

src/main/java/org/kitteh/irc/client/library/defaults/element/DefaultChannel.java

@@ -185,7 +185,7 @@ public void setModeInfoTracking(@NonNull ChannelMode mode, boolean track) {
         Sanity.truthiness(mode.getType() == ChannelMode.Type.A_MASK, "Mode type must be A, found " + mode.getType());
         Sanity.truthiness((mode.getChar() == 'b') || (mode.getChar() == 'e') || (mode.getChar() == 'I') || (mode.getChar() == 'q'), "Only modes b, e, I, and q supported");
         Optional<Channel> channel = this.getClient().getActorTracker().getTrackedChannel(this.getName());
-        if (!channel.isPresent()) {
+        if (channel.isEmpty()) {
             throw new IllegalStateException("Not currently in channel " + this.getName());
         }
         this.getClient().getActorTracker().trackChannelMode(channel.get().getName(), mode, track);

src/main/java/org/kitteh/irc/client/library/defaults/element/isupport/DefaultISupportBot.java

@@ -24,7 +24,6 @@
 package org.kitteh.irc.client.library.defaults.element.isupport;
 
 import org.jspecify.annotations.NonNull;
-import org.jspecify.annotations.Nullable;
 import org.kitteh.irc.client.library.Client;
 import org.kitteh.irc.client.library.element.ISupportParameter;
 
@@ -38,10 +37,10 @@ public class DefaultISupportBot extends DefaultISupportParameterValueRequired im
      * Constructs the object.
      *
      * @param client client
-     * @param name parameter name
-     * @param value parameter value, if present
+     * @param name   parameter name
+     * @param value  parameter value, if present
      */
-    public DefaultISupportBot(@NonNull Client client, @NonNull String name, @Nullable String value) {
+    public DefaultISupportBot(@NonNull Client client, @NonNull String name, @NonNull String value) {
         super(client, name, value);
         this.mode = value.charAt(0);
     }

src/main/java/org/kitteh/irc/client/library/defaults/element/isupport/DefaultISupportChanLimit.java

@@ -24,7 +24,6 @@
 package org.kitteh.irc.client.library.defaults.element.isupport;
 
 import org.jspecify.annotations.NonNull;
-import org.jspecify.annotations.Nullable;
 import org.kitteh.irc.client.library.Client;
 import org.kitteh.irc.client.library.element.ISupportParameter;
 import org.kitteh.irc.client.library.exception.KittehServerISupportException;
@@ -46,7 +45,7 @@ public class DefaultISupportChanLimit extends DefaultISupportParameterValueRequi
      * @param name parameter name
      * @param value parameter value, if present
      */
-    public DefaultISupportChanLimit(@NonNull Client client, @NonNull String name, @Nullable String value) {
+    public DefaultISupportChanLimit(@NonNull Client client, @NonNull String name, @NonNull String value) {
         super(client, name, value);
         String[] pairs = value.split(",");
         Map<Character, Integer> limits = new HashMap<>();

src/main/java/org/kitteh/irc/client/library/defaults/element/mode/DefaultModeStatusList.java

@@ -118,6 +118,7 @@ public class DefaultModeStatusList<ModeType extends Mode> implements ModeStatusL
      * @param <ModeType> type of modes being listed
      * @return list
      */
+    @SafeVarargs
     public static @NonNull <ModeType extends Mode> DefaultModeStatusList<ModeType> of(@NonNull ModeStatus<ModeType>... statuses) {
         Sanity.nullCheck(statuses, "Statuses");
         Sanity.truthiness((statuses.length <= 1) || (Arrays.stream(statuses).map(ModeStatus::getClient).distinct().count() == 1), "Statuses must all be from one client");
@@ -158,12 +159,12 @@ public boolean containsMode(char mode) {
     @Override
     public @NonNull List<ModeStatus<ModeType>> getByMode(@NonNull ModeType mode) {
         Sanity.nullCheck(mode, "Mode");
-        return Collections.unmodifiableList(this.statuses.stream().filter(status -> status.getMode().equals(mode)).collect(Collectors.toList()));
+        return this.statuses.stream().filter(status -> status.getMode().equals(mode)).toList();
     }
 
     @Override
     public @NonNull List<ModeStatus<ModeType>> getByMode(char mode) {
-        return Collections.unmodifiableList(this.statuses.stream().filter(status -> status.getMode().getChar() == mode).collect(Collectors.toList()));
+        return this.statuses.stream().filter(status -> status.getMode().getChar() == mode).toList();
     }
 
     @Override

src/main/java/org/kitteh/irc/client/library/defaults/feature/DefaultAuthManager.java

@@ -35,7 +35,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * Default implementation of {@link AuthManager}.
@@ -56,7 +55,7 @@ public DefaultAuthManager(@NonNull Client client) {
     @Override
     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()).collect(Collectors.toList());
+        List<AuthProtocol> matching = this.protocols.stream().filter(p -> p.getClass() == protocol.getClass()).toList();
         Optional<AuthProtocol> removed = Optional.ofNullable(matching.isEmpty() ? null : matching.get(0));
         removed.ifPresent(this::removeProtocol);
         this.protocols.add(protocol);