Just some code cleanup

Author: mbax

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

@@ -149,7 +149,7 @@ enum SecurityType {
                 /**
                  * TLS disabled.
                  */
-                INSECURE;
+                INSECURE
             }
 
             /**

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

@@ -125,7 +125,7 @@ public synchronized void execute() {
             parameterModesPerLine = modes.get().getInteger();
         }
         if (parameterModesPerLine < 1) {
-            parameterModesPerLine = PARAMETER_MODES_PER_LINE;
+            parameterModesPerLine = ChannelModeCommand.PARAMETER_MODES_PER_LINE;
         }
         List<ModeStatus<ChannelMode>> queue = new ArrayList<>();
         int currentParamModes = 0;

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

@@ -39,7 +39,7 @@
  */
 public abstract class Command<C extends Command<C>> implements ClientLinked {
     public class Tags {
-        private List<MessageTag> tags = new ArrayList<>();
+        private final List<MessageTag> tags = new ArrayList<>();
 
         public Tags add(@NonNull MessageTag tag) {
             this.tags.add(Sanity.nullCheck(tag, "Tag"));

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

@@ -248,19 +248,19 @@ private class WebIrcImpl implements WebIrc, WebIrc.Hostname, WebIrc.Gateway, Web
     private class ManagementImpl implements Management {
         @Override
         public @NonNull Management actorTracker(@Nullable Function<Client.WithManagement, ? extends ActorTracker> supplier) {
-            DefaultBuilder.this.actorTracker = (supplier != null) ? supplier : DEFAULT_ACTOR_TRACKER;
+            DefaultBuilder.this.actorTracker = (supplier != null) ? supplier : DefaultBuilder.DEFAULT_ACTOR_TRACKER;
             return this;
         }
 
         @Override
         public @NonNull Management authManager(@Nullable Function<Client.WithManagement, ? extends AuthManager> supplier) {
-            DefaultBuilder.this.authManager = (supplier != null) ? supplier : DEFAULT_AUTH_MANAGER;
+            DefaultBuilder.this.authManager = (supplier != null) ? supplier : DefaultBuilder.DEFAULT_AUTH_MANAGER;
             return this;
         }
 
         @Override
         public @NonNull Management capabilityManager(@Nullable Function<Client.WithManagement, ? extends CapabilityManager.WithManagement> supplier) {
-            DefaultBuilder.this.capabilityManager = (supplier != null) ? supplier : DEFAULT_CAPABILITY_MANAGER;
+            DefaultBuilder.this.capabilityManager = (supplier != null) ? supplier : DefaultBuilder.DEFAULT_CAPABILITY_MANAGER;
             return this;
         }
 
@@ -272,19 +272,19 @@ private class ManagementImpl implements Management {
 
         @Override
         public @NonNull Management eventManager(@Nullable Function<Client.WithManagement, ? extends EventManager> supplier) {
-            DefaultBuilder.this.eventManager = (supplier != null) ? supplier : DEFAULT_EVENT_MANAGER;
+            DefaultBuilder.this.eventManager = (supplier != null) ? supplier : DefaultBuilder.DEFAULT_EVENT_MANAGER;
             return this;
         }
 
         @Override
         public @NonNull Management eventListeners(@Nullable List<EventListenerSupplier> listenerSuppliers) {
-            DefaultBuilder.this.eventListeners = (listenerSuppliers != null) ? listenerSuppliers : DEFAULT_EVENT_LISTENERS;
+            DefaultBuilder.this.eventListeners = (listenerSuppliers != null) ? listenerSuppliers : DefaultBuilder.DEFAULT_EVENT_LISTENERS;
             return this;
         }
 
         @Override
         public @NonNull Management iSupportManager(@Nullable Function<Client.WithManagement, ? extends ISupportManager> supplier) {
-            DefaultBuilder.this.iSupportManager = (supplier != null) ? supplier : DEFAULT_ISUPPORT_MANAGER;
+            DefaultBuilder.this.iSupportManager = (supplier != null) ? supplier : DefaultBuilder.DEFAULT_ISUPPORT_MANAGER;
             return this;
         }
 
@@ -296,7 +296,7 @@ private class ManagementImpl implements Management {
 
         @Override
         public @NonNull Management messageTagManager(@Nullable Function<Client.WithManagement, ? extends MessageTagManager> supplier) {
-            DefaultBuilder.this.messageTagManager = (supplier != null) ? supplier : DEFAULT_MESSAGE_TAG_MANAGER;
+            DefaultBuilder.this.messageTagManager = (supplier != null) ? supplier : DefaultBuilder.DEFAULT_MESSAGE_TAG_MANAGER;
             return this;
         }
 
@@ -308,7 +308,7 @@ private class ManagementImpl implements Management {
 
         @Override
         public @NonNull Management serverInfo(@Nullable Function<Client.WithManagement, ? extends ServerInfo.WithManagement> supplier) {
-            DefaultBuilder.this.serverInfo = (supplier != null) ? supplier : DEFAULT_SERVER_INFO;
+            DefaultBuilder.this.serverInfo = (supplier != null) ? supplier : DefaultBuilder.DEFAULT_SERVER_INFO;
             return this;
         }
 
@@ -342,7 +342,7 @@ private class ManagementImpl implements Management {
     private @Nullable String bindHost;
     private int bindPort;
 
-    private HostWithPort serverHostWithPort = HostWithPort.of(DEFAULT_SERVER_HOST, DEFAULT_SERVER_PORT);
+    private HostWithPort serverHostWithPort = HostWithPort.of(DefaultBuilder.DEFAULT_SERVER_HOST, DefaultBuilder.DEFAULT_SERVER_PORT);
     private @Nullable String serverPassword = null;
     private boolean secure = true;
     private @Nullable Path secureKeyCertChain = null;
@@ -371,17 +371,17 @@ private class ManagementImpl implements Management {
     private @Nullable String webircGateway = null;
 
     // Management
-    private Function<Client.WithManagement, ? extends ActorTracker> actorTracker = DEFAULT_ACTOR_TRACKER;
-    private Function<Client.WithManagement, ? extends AuthManager> authManager = DEFAULT_AUTH_MANAGER;
-    private Function<Client.WithManagement, ? extends CapabilityManager.WithManagement> capabilityManager = DEFAULT_CAPABILITY_MANAGER;
+    private Function<Client.WithManagement, ? extends ActorTracker> actorTracker = DefaultBuilder.DEFAULT_ACTOR_TRACKER;
+    private Function<Client.WithManagement, ? extends AuthManager> authManager = DefaultBuilder.DEFAULT_AUTH_MANAGER;
+    private Function<Client.WithManagement, ? extends CapabilityManager.WithManagement> capabilityManager = DefaultBuilder.DEFAULT_CAPABILITY_MANAGER;
     private @Nullable DefaultMessageMap defaultMessageMap = null;
-    private Function<Client.WithManagement, ? extends EventManager> eventManager = DEFAULT_EVENT_MANAGER;
-    private List<EventListenerSupplier> eventListeners = DEFAULT_EVENT_LISTENERS;
-    private Function<Client.WithManagement, ? extends ISupportManager> iSupportManager = DEFAULT_ISUPPORT_MANAGER;
-    private Function<Client.WithManagement, ? extends MessageSendingQueue> messageSendingQueue = DEFAULT_MESSAGE_SENDING_QUEUE;
-    private Function<Client.WithManagement, ? extends MessageTagManager> messageTagManager = DEFAULT_MESSAGE_TAG_MANAGER;
+    private Function<Client.WithManagement, ? extends EventManager> eventManager = DefaultBuilder.DEFAULT_EVENT_MANAGER;
+    private List<EventListenerSupplier> eventListeners = DefaultBuilder.DEFAULT_EVENT_LISTENERS;
+    private Function<Client.WithManagement, ? extends ISupportManager> iSupportManager = DefaultBuilder.DEFAULT_ISUPPORT_MANAGER;
+    private Function<Client.WithManagement, ? extends MessageSendingQueue> messageSendingQueue = DefaultBuilder.DEFAULT_MESSAGE_SENDING_QUEUE;
+    private Function<Client.WithManagement, ? extends MessageTagManager> messageTagManager = DefaultBuilder.DEFAULT_MESSAGE_TAG_MANAGER;
     private NetworkHandler networkHandler = NettyNetworkHandler.getInstance();
-    private Function<Client.WithManagement, ? extends ServerInfo.WithManagement> serverInfo = DEFAULT_SERVER_INFO;
+    private Function<Client.WithManagement, ? extends ServerInfo.WithManagement> serverInfo = DefaultBuilder.DEFAULT_SERVER_INFO;
     private @Nullable StsStorageManager stsStorageManager = null;
 
     @Override

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

@@ -40,7 +40,7 @@ public class DefaultISupportMaxList extends DefaultISupportParameterValueRequire
     /**
      * Default implementation of {@link MaxList.LimitData}.
      */
-    public class DefaultLimitData implements MaxList.LimitData {
+    public static class DefaultLimitData implements MaxList.LimitData {
         private final int limit;
         private final Set<Character> modes;
 

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

@@ -54,7 +54,7 @@ public class DefaultISupportPrefix extends DefaultISupportParameterValueRequired
      */
     public DefaultISupportPrefix(@NonNull Client client, @NonNull String name, @Nullable String value) {
         super(client, name, value);
-        Matcher matcher = PATTERN.matcher(value);
+        Matcher matcher = DefaultISupportPrefix.PATTERN.matcher(value);
         if (!matcher.find()) {
             throw new KittehServerISupportException(name, "Data does not match expected pattern");
         }

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

@@ -62,7 +62,7 @@ public class DefaultModeStatusList<ModeType extends Mode> implements ModeStatusL
         Map<Character, ChannelMode> modes = new HashMap<>();
         client.getServerInfo().getChannelModes().forEach(mode -> modes.put(mode.getChar(), mode));
         client.getServerInfo().getChannelUserModes().forEach(mode -> modes.put(mode.getChar(), mode));
-        return from(string, modes);
+        return DefaultModeStatusList.from(string, modes);
     }
 
     /**
@@ -73,7 +73,7 @@ public class DefaultModeStatusList<ModeType extends Mode> implements ModeStatusL
      * @return list
      */
     public static @NonNull DefaultModeStatusList<UserMode> fromUser(@NonNull Client client, @NonNull String string) {
-        return from(string, client.getServerInfo().getUserModes().stream().collect(Collectors.toMap(UserMode::getChar, Function.identity())));
+        return DefaultModeStatusList.from(string, client.getServerInfo().getUserModes().stream().collect(Collectors.toMap(UserMode::getChar, Function.identity())));
     }
 
     private static <ModeType extends Mode> @NonNull DefaultModeStatusList<ModeType> from(@NonNull String string, @NonNull Map<Character, ModeType> modes) {

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

@@ -466,14 +466,14 @@ public DefaultActorTracker(Client.@NonNull WithManagement client) {
         } else if (this.client.getServerInfo().isValidChannel(name)) {
             return new IrcChannel(name).snapshot();
         }
-        if (name.isEmpty() || SERVER_PATTERN.matcher(name).matches()) {
+        if (name.isEmpty() || DefaultActorTracker.SERVER_PATTERN.matcher(name).matches()) {
             return new IrcServer(name).snapshot();
         }
         return new IrcActor(name).snapshot();
     }
 
     private IrcUser getUserByName(@NonNull String name) {
-        Matcher nickMatcher = NICK_PATTERN.matcher(name);
+        Matcher nickMatcher = DefaultActorTracker.NICK_PATTERN.matcher(name);
         if (nickMatcher.matches()) {
             String nick = nickMatcher.group(1);
             IrcUser user = this.trackedUsers.get(nick);

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

@@ -144,7 +144,7 @@ public DefaultMessageTagManager(Client.WithManagement client) {
     private @NonNull String getTagValue(@NonNull String tag) {
         StringBuilder builder = new StringBuilder(tag.length());
         int currentIndex = 0;
-        Matcher matcher = TAG_ESCAPE.matcher(tag);
+        Matcher matcher = DefaultMessageTagManager.TAG_ESCAPE.matcher(tag);
         while (matcher.find()) {
             if (matcher.start() > currentIndex) {
                 builder.append(tag, currentIndex, matcher.start());

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

@@ -91,7 +91,7 @@ public void dispatch(MessagePublication publication, Object message, Iterable li
         }
     }
 
-    private final class FilterProcessorWrapper {
+    private static final class FilterProcessorWrapper {
         private final Annotation[] annotations;
         private final FilterProcessor filterProcessor;