Make getChannel optional.

src/com/dmdirc/MessageEncoder.java

@@ -63,9 +63,11 @@ public class MessageEncoder implements Encoder {
         String encoding = connection.getWindowModel().getConfigManager()
                 .getOption("general", "encoding");
 
-        if (target != null && parser.isValidChannelName(target) && connection.hasChannel(target)) {
-            final Channel channel = connection.getChannel(target);
-            encoding = channel.getConfigManager().getOption("general", "encoding");
+        if (target != null && parser.isValidChannelName(target)) {
+            encoding = connection.getChannel(target)
+                    .map(Channel::getConfigManager)
+                    .map(cm -> cm.getOption("general", "encoding"))
+                    .orElse(encoding);
         }
 
         try {

src/com/dmdirc/Server.java

@@ -495,8 +495,8 @@ public class Server extends FrameContainer implements Connection {
     }
 
     @Override
-    public Channel getChannel(final String channel) {
-        return channels.get(channel).orElse(null);
+    public Optional<Channel> getChannel(final String channel) {
+        return channels.get(channel);
     }
 
     @Override
@@ -628,9 +628,11 @@ public class Server extends FrameContainer implements Connection {
 
         backgroundChannels.remove(chan.getName());
 
-        if (hasChannel(chan.getName())) {
-            getChannel(chan.getName()).setChannelInfo(chan);
-            getChannel(chan.getName()).selfJoin();
+        final Optional<Channel> channel = getChannel(chan.getName());
+        if (channel.isPresent()) {
+            channel.get().setChannelInfo(chan);
+            channel.get().selfJoin();
+            return channel.get();
         } else {
             final ConfigProviderMigrator channelConfig = identityFactory.createMigratableConfig(
                     getProtocol(), getIrcd(), getNetwork(), getAddress(), chan.getName());
@@ -641,9 +643,8 @@ public class Server extends FrameContainer implements Connection {
 
             getTabCompleter().addEntry(TabCompletionType.CHANNEL, chan.getName());
             channels.add(newChan);
+            return newChan;
         }
-
-        return getChannel(chan.getName());
     }
 
     /**
@@ -761,7 +762,7 @@ public class Server extends FrameContainer implements Connection {
                                 + request.getName();
                     }
 
-                    if (!hasChannel(name) || !getChannel(name).isOnChannel()) {
+                    if (getChannel(name).map(Channel::isOnChannel).orElse(false)) {
                         if (!focus) {
                             backgroundChannels.add(name);
                         }

src/com/dmdirc/commandparser/commands/server/Message.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.commands.server;
 
+import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
@@ -79,8 +80,9 @@ public class Message extends Command implements IntelligentCommand,
 
             // If this is a known server or channel, and this is not a silent
             // invocation, use sendLine, else send it raw to the parser.
-            if (!args.isSilent() && connection.hasChannel(target)) {
-                connection.getChannel(target).sendLine(message);
+            final Optional<Channel> channel = connection.getChannel(target);
+            if (!args.isSilent() && channel.isPresent()) {
+                channel.get().sendLine(message);
             } else if (!args.isSilent() && connection.hasQuery(target)) {
                 connection.getQuery(target).sendLine(message, target);
             } else {

src/com/dmdirc/commandparser/parsers/CommandParser.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.parsers;
 
+import com.dmdirc.Channel;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
@@ -36,7 +37,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.events.UnknownCommandEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.interfaces.config.ReadOnlyConfigProvider;
 import com.dmdirc.util.EventUtils;
 import com.dmdirc.util.collections.RollingList;
 
@@ -74,7 +75,8 @@ public abstract class CommandParser implements Serializable {
      * @param commandManager Command manager to load plugins from
      * @param eventBus       The event bus to post events to.
      */
-    protected CommandParser(final AggregateConfigProvider configManager,
+    protected CommandParser(
+            final ReadOnlyConfigProvider configManager,
             final CommandController commandManager,
             final DMDircMBassador eventBus) {
         this.eventBus = eventBus;
@@ -195,9 +197,9 @@ public abstract class CommandParser implements Serializable {
         }
 
         if (someValid) {
-            for (String channel : parts) {
-                if (!server.isValidChannelName(channel)) {
-                    origin.addLine("commandError", "Invalid channel name: " + channel);
+            for (String channelName : parts) {
+                if (!server.isValidChannelName(channelName)) {
+                    origin.addLine("commandError", "Invalid channel name: " + channelName);
                     continue;
                 }
 
@@ -206,16 +208,16 @@ public abstract class CommandParser implements Serializable {
                         + args.getCommandName()
                         + (cargs.length > 1 ? ' ' + args.getArgumentsAsString(1) : "");
 
-                if (server.hasChannel(channel)) {
-                    server.getChannel(channel).getCommandParser().parseCommand(origin,
-                            newCommandString, false);
+                final Optional<Channel> channel = server.getChannel(channelName);
+                if (channel.isPresent()) {
+                    channel.get().getCommandParser().parseCommand(origin, newCommandString, false);
                 } else {
                     final Map.Entry<CommandInfo, Command> actCommand = commandManager.getCommand(
                             CommandType.TYPE_CHANNEL, command);
 
                     if (actCommand != null && actCommand.getValue() instanceof ExternalCommand) {
                         ((ExternalCommand) actCommand.getValue()).execute(
-                                origin, server, channel, silent,
+                                origin, server, channelName, silent,
                                 new CommandArguments(commandManager, newCommandString));
                     }
                 }

src/com/dmdirc/interfaces/Connection.java

@@ -192,7 +192,7 @@ public interface Connection {
      *
      * @return The appropriate channel object
      */
-    Channel getChannel(final String channel);
+    Optional<Channel> getChannel(final String channel);
 
     /**
      * Retrieves the possible channel prefixes in use on this server.

test/com/dmdirc/commandparser/parsers/CommandParserTest.java

@@ -78,7 +78,7 @@ public class CommandParserTest {
         when(connection.isValidChannelName("#channel1")).thenReturn(true);
         when(connection.isValidChannelName("#channel2")).thenReturn(true);
         when(connection.hasChannel("#channel1")).thenReturn(true);
-        when(connection.getChannel("#channel1")).thenReturn(channel);
+        when(connection.getChannel("#channel1")).thenReturn(Optional.of(channel));
 
         commandParser = new TestCommandParser(configProvider, commandController, eventBus);
         commandParser.registerCommand(command, commandInfo);