Separate ModeStatus(List) to interface/impl

Author: mbax

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

@@ -26,12 +26,13 @@
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.kitteh.irc.client.library.Client;
+import org.kitteh.irc.client.library.defaults.element.mode.DefaultModeStatus;
+import org.kitteh.irc.client.library.defaults.element.mode.DefaultModeStatusList;
 import org.kitteh.irc.client.library.element.ISupportParameter;
 import org.kitteh.irc.client.library.element.User;
 import org.kitteh.irc.client.library.element.mode.ChannelMode;
 import org.kitteh.irc.client.library.element.mode.ChannelUserMode;
 import org.kitteh.irc.client.library.element.mode.ModeStatus;
-import org.kitteh.irc.client.library.element.mode.ModeStatusList;
 import org.kitteh.irc.client.library.util.Sanity;
 import org.kitteh.irc.client.library.util.ToStringer;
 
@@ -105,9 +106,9 @@ public ChannelModeCommand(@NonNull Client client, @NonNull String channel) {
         Sanity.truthiness(mode.getClient() == this.getClient(), "Mode comes from a different Client");
         if (parameter != null) {
             Sanity.safeMessageCheck(parameter, "Parameter");
-            this.changes.add(new ModeStatus<>(add, mode, parameter));
+            this.changes.add(new DefaultModeStatus<>(add, mode, parameter));
         } else {
-            this.changes.add(new ModeStatus<>(add, mode));
+            this.changes.add(new DefaultModeStatus<>(add, mode));
         }
         return this;
     }
@@ -143,7 +144,7 @@ public synchronized void execute() {
     }
 
     private void send(@NonNull List<ModeStatus<ChannelMode>> queue) {
-        this.getClient().sendRawLine("MODE " + this.getChannel() + ' ' + ModeStatusList.of(new ArrayList<>(queue)).getStatusString());
+        this.getClient().sendRawLine("MODE " + this.getChannel() + ' ' + DefaultModeStatusList.of(new ArrayList<>(queue)).getAsString());
         queue.clear();
     }
 

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

@@ -26,8 +26,9 @@
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.kitteh.irc.client.library.Client;
+import org.kitteh.irc.client.library.defaults.element.mode.DefaultModeStatus;
+import org.kitteh.irc.client.library.defaults.element.mode.DefaultModeStatusList;
 import org.kitteh.irc.client.library.element.mode.ModeStatus;
-import org.kitteh.irc.client.library.element.mode.ModeStatusList;
 import org.kitteh.irc.client.library.element.mode.UserMode;
 import org.kitteh.irc.client.library.util.Sanity;
 import org.kitteh.irc.client.library.util.ToStringer;
@@ -82,9 +83,9 @@ public UserModeCommand(@NonNull Client client) {
         Sanity.truthiness(mode.getClient() == this.getClient(), "Mode comes from a different Client");
         if (parameter != null) {
             Sanity.safeMessageCheck(parameter, "Parameter");
-            this.changes.add(new ModeStatus<>(add, mode, parameter));
+            this.changes.add(new DefaultModeStatus<>(add, mode, parameter));
         } else {
-            this.changes.add(new ModeStatus<>(add, mode));
+            this.changes.add(new DefaultModeStatus<>(add, mode));
         }
         return this;
     }
@@ -95,7 +96,7 @@ public synchronized void execute() {
             this.getClient().sendRawLine("MODE " + this.getClient().getNick());
             return;
         }
-        this.getClient().sendRawLine("MODE " + this.getClient().getNick() + ' ' + ModeStatusList.of(new ArrayList<>(this.changes)).getStatusString());
+        this.getClient().sendRawLine("MODE " + this.getClient().getNick() + ' ' + DefaultModeStatusList.of(new ArrayList<>(this.changes)).getAsString());
     }
 
     @Override

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

@@ -36,6 +36,8 @@
 import org.kitteh.irc.client.library.command.WallopsCommand;
 import org.kitteh.irc.client.library.command.WhoisCommand;
 import org.kitteh.irc.client.library.defaults.element.DefaultServerMessage;
+import org.kitteh.irc.client.library.defaults.element.mode.DefaultModeStatusList;
+import org.kitteh.irc.client.library.defaults.feature.SimpleDefaultMessageMap;
 import org.kitteh.irc.client.library.element.Actor;
 import org.kitteh.irc.client.library.element.Channel;
 import org.kitteh.irc.client.library.element.MessageTag;
@@ -62,7 +64,6 @@
 import org.kitteh.irc.client.library.feature.ServerInfo;
 import org.kitteh.irc.client.library.feature.defaultmessage.DefaultMessageMap;
 import org.kitteh.irc.client.library.feature.defaultmessage.DefaultMessageType;
-import org.kitteh.irc.client.library.defaults.feature.SimpleDefaultMessageMap;
 import org.kitteh.irc.client.library.feature.network.ClientConnection;
 import org.kitteh.irc.client.library.feature.network.NetworkHandler;
 import org.kitteh.irc.client.library.feature.network.ProxyType;
@@ -460,7 +461,7 @@ public void addKeyProtectedChannel(@NonNull Pair<String, String>... channelsAndK
 
     @Override
     public @NonNull Optional<ModeStatusList<UserMode>> getUserModes() {
-        return (this.userModes == null) ? Optional.empty() : Optional.of(ModeStatusList.of(this.userModes.values()));
+        return (this.userModes == null) ? Optional.empty() : Optional.of(DefaultModeStatusList.of(this.userModes.values()));
     }
 
     @Override
@@ -820,7 +821,7 @@ public void setServerAddress(@NonNull HostWithPort address) {
 
     @Override
     public void setUserModes(@NonNull ModeStatusList<UserMode> userModes) {
-        this.userModes = new HashMap<>(userModes.getStatuses().stream().collect(Collectors.toMap(modeStatus -> modeStatus.getMode().getChar(), Function.identity())));
+        this.userModes = new HashMap<>(userModes.getAll().stream().collect(Collectors.toMap(modeStatus -> modeStatus.getMode().getChar(), Function.identity())));
     }
 
     @Override
@@ -837,7 +838,7 @@ public void updateUserModes(@NonNull ModeStatusList<UserMode> userModes) {
         if (this.userModes == null) {
             this.userModes = new HashMap<>();
         }
-        for (ModeStatus<UserMode> status : userModes.getStatuses()) {
+        for (ModeStatus<UserMode> status : userModes.getAll()) {
             if (status.isSetting()) {
                 this.userModes.put(status.getMode().getChar(), status);
             } else {

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

@@ -0,0 +1,94 @@
+/*
+ * * Copyright (C) 2013-2019 Matt Baxter https://kitteh.org
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package org.kitteh.irc.client.library.defaults.element.mode;
+
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.kitteh.irc.client.library.Client;
+import org.kitteh.irc.client.library.element.ClientLinked;
+import org.kitteh.irc.client.library.element.mode.Mode;
+import org.kitteh.irc.client.library.element.mode.ModeStatus;
+import org.kitteh.irc.client.library.util.Sanity;
+import org.kitteh.irc.client.library.util.ToStringer;
+
+import java.util.Optional;
+
+/**
+ * A particular default status of a mode.
+ */
+public class DefaultModeStatus<ModeType extends Mode> implements ModeStatus<ModeType> {
+    private final ModeType mode;
+    private final @Nullable String parameter;
+    private final boolean setting;
+
+    /**
+     * Creates a status without a parameter.
+     *
+     * @param setting true for setting mode, false for removing
+     * @param mode mode to set
+     */
+    public DefaultModeStatus(boolean setting, @NonNull ModeType mode) {
+        this.mode = Sanity.nullCheck(mode, "Mode cannot be null");
+        this.parameter = null;
+        this.setting = setting;
+    }
+
+    /**
+     * Creates a status.
+     *
+     * @param setting true for setting mode, false for removing
+     * @param mode mode to set
+     * @param parameter parameter
+     */
+    public DefaultModeStatus(boolean setting, @NonNull ModeType mode, @NonNull String parameter) {
+        this.mode = Sanity.nullCheck(mode, "Mode cannot be null");
+        this.parameter = Sanity.safeMessageCheck(parameter, "Parameter");
+        this.setting = setting;
+    }
+
+    @Override
+    public @NonNull Client getClient() {
+        return this.getMode().getClient();
+    }
+
+    @Override
+    public @NonNull ModeType getMode() {
+        return this.mode;
+    }
+
+    @Override
+    public @NonNull Optional<String> getParameter() {
+        return Optional.ofNullable(this.parameter);
+    }
+
+    @Override
+    public boolean isSetting() {
+        return this.setting;
+    }
+
+    @Override
+    public @NonNull String toString() {
+        return new ToStringer(this).add("client", this.getClient()).add("mode", this.mode).add("setting", this.setting).add("parameter", this.parameter).toString();
+    }
+}