Some light Java cleanup / migration

Author: mbax

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

@@ -93,7 +93,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -180,7 +179,7 @@ protected void processElement(@NonNull String element) {
     private int pingPurrCount;
 
     private final HashMap<String, BatchReferenceTag> batchHold = new HashMap<>();
-    private InputProcessor processor;
+    private final InputProcessor processor;
     private ServerInfo.WithManagement serverInfo;
 
     private String goalNick;
@@ -201,9 +200,9 @@ protected void processElement(@NonNull String element) {
     private MessageTagManager messageTagManager;
     private ActorTracker actorTracker;
 
-    private Listener<Exception> exceptionListener;
-    private Listener<String> inputListener;
-    private Listener<String> outputListener;
+    private final Listener<Exception> exceptionListener;
+    private final Listener<String> inputListener;
+    private final Listener<String> outputListener;
 
     private DefaultMessageMap defaultMessageMap;
 
@@ -212,32 +211,32 @@ protected void processElement(@NonNull String element) {
 
     private final ClientCommands commands = new ClientCommands();
 
-    private MessageSendingQueue messageSendingImmediate;
+    private final MessageSendingQueue messageSendingImmediate;
     private MessageSendingQueue messageSendingScheduled;
     private final Object messageSendingLock = new Object();
     private boolean isSending = false;
     private String lastSentUser;
 
-    private String name;
-    private InetSocketAddress bindAddress;
+    private final String name;
+    private final InetSocketAddress bindAddress;
     private HostWithPort serverAddress;
-    private HostWithPort proxyAddress;
-    private ProxyType proxyType;
-    private String serverPassword;
-    private String userString;
-    private String realName;
-    private boolean secure;
-    private Path secureKeyCertChain;
-    private Path secureKey;
-    private String secureKeyPassword;
-    private TrustManagerFactory secureTrustManagerFactory;
-    private StsStorageManager stsStorageManager;
-    private String webircHost;
-    private InetAddress webircIP;
-    private String webircPassword;
-    private String webircGateway;
+    private final HostWithPort proxyAddress;
+    private final ProxyType proxyType;
+    private final String serverPassword;
+    private final String userString;
+    private final String realName;
+    private final boolean secure;
+    private final Path secureKeyCertChain;
+    private final Path secureKey;
+    private final String secureKeyPassword;
+    private final TrustManagerFactory secureTrustManagerFactory;
+    private final StsStorageManager stsStorageManager;
+    private final String webircHost;
+    private final InetAddress webircIP;
+    private final String webircPassword;
+    private final String webircGateway;
     private Function<Client.WithManagement, ? extends MessageSendingQueue> messageSendingQueueSupplier;
-    private Function<Client.WithManagement, ? extends ServerInfo.WithManagement> serverInfoSupplier;
+    private final Function<Client.WithManagement, ? extends ServerInfo.WithManagement> serverInfoSupplier;
 
     /**
      * Creates a new default client.
@@ -739,7 +738,7 @@ public boolean isConnectionAlive() {
 
     @Override
     public @NonNull Set<String> getIntendedChannels() {
-        return Collections.unmodifiableSet(new HashSet<>(this.channelsIntended));
+        return Set.copyOf(this.channelsIntended);
     }
 
     @Override

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

@@ -64,8 +64,7 @@ public DefaultCapabilityState(@NonNull Client client, @NonNull String capability
 
     @Override
     public boolean equals(Object o) {
-        if (o instanceof DefaultCapabilityState) {
-            DefaultCapabilityState state = (DefaultCapabilityState) o;
+        if (o instanceof DefaultCapabilityState state) {
             return state.name.equals(this.name) && (state.disable == this.disable);
         }
         return false;

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

@@ -30,8 +30,6 @@
 import org.kitteh.irc.client.library.util.Sanity;
 import org.kitteh.irc.client.library.util.ToStringer;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -100,7 +98,7 @@ public DefaultServerMessage(@NonNull String message, @NonNull List<MessageTag> t
         Sanity.nullCheck(message, "Message");
         Sanity.nullCheck(tags, "Tags");
         this.message = message;
-        this.tags = Collections.unmodifiableList(new ArrayList<>(tags));
+        this.tags = List.copyOf(tags);
     }
 
     @Override

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

@@ -235,7 +235,7 @@ public DefaultWhoisData(@NonNull Client client, @Nullable String account, @NonNu
                             @Nullable String operatorInformation, @Nullable Long idleTime, @Nullable Long signOnTime, @Nullable String awayMessage) {
         this.client = client;
         this.account = account;
-        this.channels = Collections.unmodifiableSet(new HashSet<>(channels));
+        this.channels = Set.copyOf(channels);
         this.name = nick + '!' + userString + '@' + host;
         this.nick = nick;
         this.userString = userString;

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

@@ -53,21 +53,12 @@ public DefaultISupportChanModes(@NonNull Client client, @NonNull String name, @N
         List<ChannelMode> modesList = new ArrayList<>();
         for (int typeId = 0; (typeId < modes.length) && (typeId < 4); typeId++) {
             for (char mode : modes[typeId].toCharArray()) {
-                ChannelMode.Type type;
-                switch (typeId) {
-                    case 0:
-                        type = ChannelMode.Type.A_MASK;
-                        break;
-                    case 1:
-                        type = ChannelMode.Type.B_PARAMETER_ALWAYS;
-                        break;
-                    case 2:
-                        type = ChannelMode.Type.C_PARAMETER_ON_SET;
-                        break;
-                    case 3:
-                    default:
-                        type = ChannelMode.Type.D_PARAMETER_NEVER;
-                }
+                ChannelMode.Type type = switch (typeId) {
+                    case 0 -> ChannelMode.Type.A_MASK;
+                    case 1 -> ChannelMode.Type.B_PARAMETER_ALWAYS;
+                    case 2 -> ChannelMode.Type.C_PARAMETER_ON_SET;
+                    default -> ChannelMode.Type.D_PARAMETER_NEVER;
+                };
                 modesList.add(new DefaultChannelMode(client, mode, type));
             }
         }

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

@@ -29,7 +29,6 @@
 import org.kitteh.irc.client.library.defaults.element.DefaultISupportParameter;
 import org.kitteh.irc.client.library.element.ISupportParameter;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -48,7 +47,7 @@ public class DefaultISupportClientTagDeny extends DefaultISupportParameter imple
      */
     public DefaultISupportClientTagDeny(@NonNull Client client, @NonNull String name, @Nullable String value) {
         super(client, name, value);
-        this.list = (value == null || value.isEmpty()) ? Collections.emptyList() : Collections.unmodifiableList(Arrays.asList(value.split(",")));
+        this.list = (value == null || value.isEmpty()) ? Collections.emptyList() : List.of(value.split(","));
     }
 
     @Override

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

@@ -31,8 +31,6 @@
 import org.kitteh.irc.client.library.util.CIKeyMap;
 import org.kitteh.irc.client.library.util.Pair;
 
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.OptionalInt;
 import java.util.Set;
 
@@ -62,7 +60,7 @@ public DefaultISupportTargMax(@NonNull Client client, @NonNull String name, @Nul
 
     @Override
     public @NonNull Set<Pair<String, OptionalInt>> getEntries() {
-        return Collections.unmodifiableSet(new HashSet<>(this.map.values()));
+        return Set.copyOf(this.map.values());
     }
 
     @Override

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

@@ -50,10 +50,9 @@ public DefaultChannelMode(@NonNull Client client, char mode, @NonNull Type type)
 
     @Override
     public boolean equals(Object o) {
-        if (!(o instanceof DefaultChannelMode)) {
+        if (!(o instanceof DefaultChannelMode other)) {
             return false;
         }
-        DefaultChannelMode other = (DefaultChannelMode) o;
         return (other.getType() == this.getType()) && (other.getClient().equals(this.getClient())) && (other.getChar() == this.getChar());
     }
 

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

@@ -50,10 +50,9 @@ public DefaultChannelUserMode(@NonNull Client client, char mode, char prefix) {
 
     @Override
     public boolean equals(Object o) {
-        if (!(o instanceof DefaultChannelUserMode)) {
+        if (!(o instanceof DefaultChannelUserMode other)) {
             return false;
         }
-        DefaultChannelUserMode other = (DefaultChannelUserMode) o;
         return (other.getNickPrefix() == this.getNickPrefix()) && (other.getType() == this.getType()) && (other.getClient().equals(this.getClient())) && (other.getChar() == this.getChar());
     }
 

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

@@ -45,10 +45,9 @@ public DefaultUserMode(@NonNull Client client, char mode) {
 
     @Override
     public boolean equals(Object o) {
-        if (!(o instanceof DefaultUserMode)) {
+        if (!(o instanceof DefaultUserMode other)) {
             return false;
         }
-        DefaultUserMode other = (DefaultUserMode) o;
         return (other.getClient().equals(this.getClient())) && (other.getChar() == this.getChar());
     }