Move invite handling into a separate class.

src/com/dmdirc/InviteManagerImpl.java

@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2006-2015 DMDirc Developers
+ *
+ * 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 com.dmdirc;
+
+import com.dmdirc.events.ServerInviteExpiredEvent;
+import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.InviteManager;
+import com.dmdirc.parser.common.ChannelJoinRequest;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+/**
+ * Manages invites on a {@link Connection}.
+ */
+public class InviteManagerImpl implements InviteManager {
+
+    /** A list of outstanding invites. */
+    private final List<Invite> invites = new CopyOnWriteArrayList<>();
+
+    /** The connection this manager works on. */
+    private final Connection connection;
+
+    public InviteManagerImpl(final Connection connection) {
+        this.connection = connection;
+    }
+
+    @Override
+    public void addInvite(final Invite invite) {
+        invites.stream()
+                .filter(oldInvite -> oldInvite.getChannel().equals(invite.getChannel()))
+                .forEach(this::removeInvite);
+
+        invites.add(invite);
+    }
+
+    @Override
+    public void acceptInvites(final Invite... invites) {
+        final ChannelJoinRequest[] requests = new ChannelJoinRequest[invites.length];
+
+        for (int i = 0; i < invites.length; i++) {
+            requests[i] = new ChannelJoinRequest(invites[i].getChannel());
+        }
+
+        connection.getGroupChatManager().join(requests);
+    }
+
+    @Override
+    public void acceptInvites() {
+        acceptInvites(invites.toArray(new Invite[invites.size()]));
+    }
+
+    @Override
+    public void removeInvites(final String channel) {
+        new ArrayList<>(invites).stream().filter(invite -> invite.getChannel().equals(channel))
+                .forEach(this::removeInvite);
+    }
+
+    @Override
+    public void removeInvites() {
+        new ArrayList<>(invites).forEach(this::removeInvite);
+    }
+
+    @Override
+    public void removeInvite(final Invite invite) {
+        invites.remove(invite);
+        connection.getWindowModel().getEventBus().publishAsync(
+                new ServerInviteExpiredEvent(connection, invite));
+    }
+
+    @Override
+    public List<Invite> getInvites() {
+        return Collections.unmodifiableList(invites);
+    }
+
+}

src/com/dmdirc/Server.java

@@ -30,7 +30,6 @@ import com.dmdirc.events.ServerConnectErrorEvent;
 import com.dmdirc.events.ServerConnectedEvent;
 import com.dmdirc.events.ServerConnectingEvent;
 import com.dmdirc.events.ServerDisconnectedEvent;
-import com.dmdirc.events.ServerInviteExpiredEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChatManager;
 import com.dmdirc.interfaces.InviteManager;
@@ -40,7 +39,6 @@ import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProviderMigrator;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.parser.common.DefaultStringConverter;
 import com.dmdirc.parser.common.IgnoreList;
 import com.dmdirc.parser.common.ParserError;
@@ -97,7 +95,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
  * The Server class represents the client's view of a server. It maintains a list of all channels,
  * queries, etc, and handles parser callbacks pertaining to the server.
  */
-public class Server extends FrameContainer implements Connection, InviteManager {
+public class Server extends FrameContainer implements Connection {
 
     private static final Logger LOG = LoggerFactory.getLogger(Server.class);
     /** The name of the general domain. */
@@ -106,7 +104,7 @@ public class Server extends FrameContainer implements Connection, InviteManager
     /** Manager of group chats. */
     private final GroupChatManagerImpl groupChatManager;
     /** Manager of invites. */
-    private final InviteManager inviteManager = this;
+    private final InviteManager inviteManager;
     /** Open query windows on the server. */
     private final Map<String, Query> queries = new ConcurrentSkipListMap<>();
     /** The user manager to retrieve users from. */
@@ -148,8 +146,6 @@ public class Server extends FrameContainer implements Connection, InviteManager
     private Optional<String> awayMessage;
     /** Our event handler. */
     private final ServerEventHandler eventHandler;
-    /** A list of outstanding invites. */
-    private final List<Invite> invites = new ArrayList<>();
     /** Our ignore list. */
     private final IgnoreList ignoreList = new IgnoreList();
     /** Our string convertor. */
@@ -221,6 +217,7 @@ public class Server extends FrameContainer implements Connection, InviteManager
         this.messageEncoderFactory = messageEncoderFactory;
         this.userManager = userManager;
         this.groupChatManager = groupChatManagerFactory.create(this, executorService);
+        this.inviteManager = new InviteManagerImpl(this);
 
         awayMessage = Optional.empty();
         eventHandler = new ServerEventHandler(this, groupChatManager, eventBus);
@@ -349,7 +346,7 @@ public class Server extends FrameContainer implements Connection, InviteManager
             doCallbacks();
 
             updateAwayState(Optional.empty());
-            removeInvites();
+            inviteManager.removeInvites();
 
             newParser.connect();
             if (newParser instanceof ThreadedParser) {
@@ -412,7 +409,7 @@ public class Server extends FrameContainer implements Connection, InviteManager
                 if (parser.isPresent()) {
                     myState.transition(ServerState.DISCONNECTING);
 
-                    removeInvites();
+                    inviteManager.removeInvites();
                     updateIcon();
 
                     parser.get().disconnect(reason);
@@ -756,7 +753,7 @@ public class Server extends FrameContainer implements Connection, InviteManager
 
         groupChatManager.closeAll();
         closeQueries();
-        removeInvites();
+        inviteManager.removeInvites();
 
         super.close();
     }
@@ -882,7 +879,7 @@ public class Server extends FrameContainer implements Connection, InviteManager
                 closeQueries();
             }
 
-            removeInvites();
+            inviteManager.removeInvites();
             updateAwayState(Optional.empty());
 
             if (getConfigManager().getOptionBool(DOMAIN_GENERAL,
@@ -1015,59 +1012,6 @@ public class Server extends FrameContainer implements Connection, InviteManager
         return identityFactory.createNetworkConfig(getNetwork());
     }
 
-    @Override
-    public void addInvite(final Invite invite) {
-        synchronized (invites) {
-            new ArrayList<>(invites).stream()
-                    .filter(oldInvite -> oldInvite.getChannel().equals(invite.getChannel()))
-                    .forEach(this::removeInvite);
-
-            invites.add(invite);
-        }
-    }
-
-    @Override
-    public void acceptInvites(final Invite... invites) {
-        final ChannelJoinRequest[] requests = new ChannelJoinRequest[invites.length];
-
-        for (int i = 0; i < invites.length; i++) {
-            requests[i] = new ChannelJoinRequest(invites[i].getChannel());
-        }
-
-        getGroupChatManager().join(requests);
-    }
-
-    @Override
-    public void acceptInvites() {
-        synchronized (invites) {
-            acceptInvites(invites.toArray(new Invite[invites.size()]));
-        }
-    }
-
-    @Override
-    public void removeInvites(final String channel) {
-        new ArrayList<>(invites).stream().filter(invite -> invite.getChannel().equals(channel))
-                .forEach(this::removeInvite);
-    }
-
-    @Override
-    public void removeInvites() {
-        new ArrayList<>(invites).forEach(this::removeInvite);
-    }
-
-    @Override
-    public void removeInvite(final Invite invite) {
-        synchronized (invites) {
-            invites.remove(invite);
-            getEventBus().publishAsync(new ServerInviteExpiredEvent(this, invite));
-        }
-    }
-
-    @Override
-    public List<Invite> getInvites() {
-        return Collections.unmodifiableList(invites);
-    }
-
     @Override
     public void updateAwayState(final Optional<String> message) {
         checkNotNull(message);

src/com/dmdirc/ServerEventHandler.java

@@ -500,7 +500,8 @@ public class ServerEventHandler extends EventHandler implements
             final String channel) {
         checkParser(parser);
 
-        owner.getInviteManager().addInvite(new Invite(owner, channel, owner.getUser(userHost)));
+        owner.getInviteManager().addInvite(
+                new Invite(owner.getInviteManager(), channel, owner.getUser(userHost)));
         final ServerInviteReceivedEvent event = new ServerInviteReceivedEvent(owner,
                 owner.getUser(userHost), channel);
         final String format = EventUtils.postDisplayable(eventBus, event, "inviteReceived");

test/com/dmdirc/InviteManagerImplTest.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2006-2015 DMDirc Developers
+ *
+ * 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 com.dmdirc;
+
+import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.User;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class InviteManagerImplTest {
+
+    @Mock private Connection connection;
+    @Mock private FrameContainer frameContainer;
+    @Mock private DMDircMBassador eventBus;
+    @Mock private User user;
+
+    private InviteManagerImpl inviteManager;
+
+    @Before
+    public void setup() {
+        inviteManager = new InviteManagerImpl(connection);
+
+        when(connection.getWindowModel()).thenReturn(frameContainer);
+        when(frameContainer.getEventBus()).thenReturn(eventBus);
+    }
+
+    @Test
+    public void testDuplicateInviteRemoval() {
+        inviteManager.addInvite(new Invite(inviteManager, "#chan1", user));
+        inviteManager.addInvite(new Invite(inviteManager, "#chan1", user));
+
+        assertEquals(1, inviteManager.getInvites().size());
+    }
+
+    @Test
+    public void testRemoveInvites() {
+        inviteManager.addInvite(new Invite(inviteManager, "#chan1", user));
+        inviteManager.addInvite(new Invite(inviteManager, "#chan2", user));
+
+        inviteManager.removeInvites("#chan1");
+        assertEquals(1, inviteManager.getInvites().size());
+
+        inviteManager.removeInvites("#chan2");
+        assertEquals(0, inviteManager.getInvites().size());
+    }
+
+}

test/com/dmdirc/ServerTest.java

@@ -22,95 +22,12 @@
 
 package com.dmdirc;
 
-import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.parsers.CommandParser;
-import com.dmdirc.config.ConfigBinder;
-import com.dmdirc.config.profiles.Profile;
-import com.dmdirc.interfaces.User;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProviderMigrator;
-import com.dmdirc.interfaces.config.IdentityFactory;
-import com.dmdirc.ui.input.TabCompleter;
-import com.dmdirc.ui.input.TabCompleterFactory;
-import com.dmdirc.ui.messages.BackBuffer;
-import com.dmdirc.ui.messages.BackBufferFactory;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
-import com.dmdirc.util.URLBuilder;
-
-import java.net.URI;
-import java.util.concurrent.ScheduledExecutorService;
-
-import org.junit.Before;
 import org.junit.Test;
-import org.mockito.Matchers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.when;
 
 public class ServerTest {
 
-    @Mock private Profile profile;
-    @Mock private AggregateConfigProvider configManager;
-    @Mock private ConfigBinder configBinder;
-    @Mock private ConfigProvider userConfig;
-    @Mock private ConfigProviderMigrator configMigrator;
-    @Mock private CommandParser commandParser;
-    @Mock private ParserFactory parserFactory;
-    @Mock private IdentityFactory identityFactory;
-    @Mock private TabCompleterFactory tabCompleterFactory;
-    @Mock private TabCompleter tabCompleter;
-    @Mock private MessageSinkManager messageSinkManager;
-    @Mock private GroupChatManagerImplFactory groupChatManagerImplFactory;
-    @Mock private GroupChatManagerImpl groupChatManager;
-    @Mock private QueryFactory queryFactory;
-    @Mock private URLBuilder urlBuilder;
-    @Mock private DMDircMBassador eventBus;
-    @Mock private ScheduledExecutorService executorService;
-    @Mock private MessageEncoderFactory messageEncoderFactory;
-    @Mock private BackBufferFactory backBufferFactory;
-    @Mock private BackBuffer backBuffer;
-    @Mock private UserManager userManager;
-    @Mock private User user;
-
-    private Server server;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-        when(configManager.getOptionInt(anyString(), anyString())).thenReturn(Integer.MAX_VALUE);
-        when(configManager.getBinder()).thenReturn(configBinder);
-        when(configMigrator.getConfigProvider()).thenReturn(configManager);
-        when(tabCompleterFactory.getTabCompleter(eq(configManager),
-                Matchers.<CommandType>anyVararg())).thenReturn(tabCompleter);
-        when(backBufferFactory.getBackBuffer(any())).thenReturn(backBuffer);
-        when(groupChatManagerImplFactory.create(any(), any())).thenReturn(groupChatManager);
-
-        server = new Server(
-                configMigrator,
-                commandParser,
-                parserFactory,
-                tabCompleterFactory,
-                identityFactory,
-                messageSinkManager,
-                queryFactory,
-                urlBuilder,
-                eventBus,
-                messageEncoderFactory,
-                userConfig,
-                groupChatManagerImplFactory,
-                executorService,
-                new URI("irc-test://255.255.255.255"),
-                profile,
-                backBufferFactory,
-                userManager);
-    }
-
     @Test
     public void testGetNetworkFromServerName() {
         final String[][] tests = {
@@ -128,24 +45,4 @@ public class ServerTest {
         }
     }
 
-    @Test
-    public void testDuplicateInviteRemoval() {
-        server.addInvite(new Invite(server, "#chan1", user));
-        server.addInvite(new Invite(server, "#chan1", user));
-
-        assertEquals(1, server.getInvites().size());
-    }
-
-    @Test
-    public void testRemoveInvites() {
-        server.addInvite(new Invite(server, "#chan1", user));
-        server.addInvite(new Invite(server, "#chan2", user));
-
-        server.removeInvites("#chan1");
-        assertEquals(1, server.getInvites().size());
-
-        server.removeInvites("#chan2");
-        assertEquals(0, server.getInvites().size());
-    }
-
 }