Rename getOptionalConnection() to getConnection().

src/com/dmdirc/Channel.java

@@ -548,7 +548,7 @@ public class Channel extends MessageTarget implements GroupChat {
     }
 
     @Override
-    public Optional<Connection> getOptionalConnection() {
+    public Optional<Connection> getConnection() {
         return Optional.of(server);
     }
 

src/com/dmdirc/ChannelEventHandler.java

@@ -114,7 +114,7 @@ public class ChannelEventHandler extends EventHandler implements
     @Nonnull
     @Override
     protected Connection getConnection() {
-        return owner.getOptionalConnection().get();
+        return owner.getConnection().get();
     }
 
     /**

src/com/dmdirc/CustomWindow.java

@@ -65,8 +65,8 @@ public class CustomWindow extends FrameContainer {
     }
 
     @Override
-    public Optional<Connection> getOptionalConnection() {
-        return getParent().flatMap(FrameContainer::getOptionalConnection);
+    public Optional<Connection> getConnection() {
+        return getParent().flatMap(FrameContainer::getConnection);
     }
 
 }

src/com/dmdirc/FrameContainer.java

@@ -349,7 +349,7 @@ public abstract class FrameContainer {
      *
      * @return the associated connection.
      */
-    public abstract Optional<Connection> getOptionalConnection();
+    public abstract Optional<Connection> getConnection();
 
     /**
      * Sets the icon to be used by this frame container and fires a {@link FrameIconChangedEvent}.

src/com/dmdirc/GlobalWindow.java

@@ -64,7 +64,7 @@ public class GlobalWindow extends FrameContainer {
     }
 
     @Override
-    public Optional<Connection> getOptionalConnection() {
+    public Optional<Connection> getConnection() {
         return Optional.empty();
     }
 

src/com/dmdirc/Query.java

@@ -285,7 +285,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
     }
 
     @Override
-    public Optional<Connection> getOptionalConnection() {
+    public Optional<Connection> getConnection() {
         return Optional.of(server);
     }
 

src/com/dmdirc/Raw.java

@@ -112,7 +112,7 @@ public class Raw extends FrameContainer implements DataInListener, DataOutListen
     }
 
     @Override
-    public Optional<Connection> getOptionalConnection() {
+    public Optional<Connection> getConnection() {
         return Optional.of(server);
     }
 

src/com/dmdirc/Server.java

@@ -1038,7 +1038,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
     }
 
     @Override
-    public Optional<Connection> getOptionalConnection() {
+    public Optional<Connection> getConnection() {
         return Optional.of(this);
     }
 

src/com/dmdirc/actions/ActionSubstitutor.java

@@ -279,7 +279,7 @@ public class ActionSubstitutor {
 
         if (hasFrameContainer() && serverMatcher.matches()) {
             final Optional<Connection> connection =
-                    ((FrameContainer) args[0]).getOptionalConnection();
+                    ((FrameContainer) args[0]).getConnection();
 
             if (connection.isPresent()) {
                 try {
@@ -311,7 +311,7 @@ public class ActionSubstitutor {
     protected String checkConnection(final ActionComponentChain chain,
             final Object[] args, final Object argument) {
         if ((chain.requiresConnection() && args[0] instanceof FrameContainer
-                && ((FrameContainer) args[0]).getOptionalConnection().get().getState()
+                && ((FrameContainer) args[0]).getConnection().get().getState()
                 == ServerState.CONNECTED) || !chain.requiresConnection()) {
             final Object res = chain.get(argument);
             return res == null ? ERR_NULL_CHAIN : res.toString();

src/com/dmdirc/actions/CoreActionComponent.java

@@ -730,7 +730,7 @@ public enum CoreActionComponent implements ActionComponent {
     WINDOW_SERVER {
         @Override
         public Object get(final Object arg) {
-            return ((Window) arg).getContainer().getOptionalConnection().orElse(null);
+            return ((Window) arg).getContainer().getConnection().orElse(null);
         }
 
         @Override

src/com/dmdirc/commandparser/commands/channel/Mode.java

@@ -74,7 +74,7 @@ public class Mode extends Command implements IntelligentCommand,
         if (args.getArguments().length == 0) {
             sendLine(origin, args.isSilent(), "channelModeDiscovered", cChannel.getModes(), cChannel);
         } else {
-            channel.getOptionalConnection().get().getParser().sendRawMessage("MODE "
+            channel.getConnection().get().getParser().sendRawMessage("MODE "
                     + cChannel + " " + args.getArgumentsAsString());
         }
     }

src/com/dmdirc/commandparser/commands/channel/Names.java

@@ -67,7 +67,7 @@ public class Names extends Command implements IntelligentCommand,
     public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Channel channel = ((ChannelCommandContext) context).getChannel();
-        channel.getOptionalConnection().get().getParser().sendRawMessage("NAMES "
+        channel.getConnection().get().getParser().sendRawMessage("NAMES "
                 + channel.getChannelInfo().getName());
     }
 

src/com/dmdirc/commandparser/commands/channel/ShowTopic.java

@@ -71,7 +71,7 @@ public class ShowTopic extends Command implements ExternalCommand {
             if (cChannel.getTopic().isEmpty()) {
                 sendLine(origin, args.isSilent(), "channelNoTopic", cChannel);
             } else {
-                final String[] parts = channel.getOptionalConnection().get().parseHostmask(
+                final String[] parts = channel.getConnection().get().parseHostmask(
                         cChannel.getTopicSetter());
 
                 sendLine(origin, args.isSilent(), "channelTopicDiscovered",

src/com/dmdirc/commandparser/commands/chat/Me.java

@@ -78,7 +78,7 @@ public class Me extends Command implements ValidatingCommand {
     public ValidationResponse validateArguments(
             final FrameContainer origin,
             final CommandArguments arguments) {
-        final Optional<Connection> connection = origin.getOptionalConnection();
+        final Optional<Connection> connection = origin.getConnection();
         final Optional<Parser> parser = connection.flatMap(c -> Optional.ofNullable(c.getParser()));
 
         if (!parser.isPresent()) {

src/com/dmdirc/commandparser/commands/context/ChatCommandContext.java

@@ -49,7 +49,7 @@ public class ChatCommandContext extends ServerCommandContext {
             final CommandInfo commandInfo, final MessageTarget chat) {
         super(source, commandInfo,
                 Optional.ofNullable(source)
-                        .flatMap(FrameContainer::getOptionalConnection)
+                        .flatMap(FrameContainer::getConnection)
                         .orElse(null));
         this.chat = chat;
     }

src/com/dmdirc/commandparser/commands/global/Echo.java

@@ -43,7 +43,6 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
-import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -141,7 +140,7 @@ public class Echo extends Command implements IntelligentCommand {
                 && context.getPreviousArgs().get(0).equals("--ts"))) {
 
             final Collection<FrameContainer> windowList = new ArrayList<>();
-            final Optional<Connection> connection = context.getWindow().getOptionalConnection();
+            final Optional<Connection> connection = context.getWindow().getConnection();
 
             //Active window's Children
             windowList.addAll(context.getWindow().getChildren());

src/com/dmdirc/commandparser/commands/global/OpenWindow.java

@@ -94,7 +94,7 @@ public class OpenWindow extends Command implements IntelligentCommand {
         FrameContainer parent = null;
 
         if (args.getArguments().length > 0 && "--server".equals(args.getArguments()[0])) {
-            final Optional<Connection> connection = origin.getOptionalConnection();
+            final Optional<Connection> connection = origin.getConnection();
             if (!connection.isPresent()) {
                 sendLine(origin, args.isSilent(), FORMAT_ERROR,
                         "This window doesn't have an associated server.");

src/com/dmdirc/commandparser/commands/global/SetCommand.java

@@ -114,7 +114,7 @@ public class SetCommand extends Command implements IntelligentCommand {
 
         ConfigProvider identity = identityController.getUserSettings();
         AggregateConfigProvider manager = identityController.getGlobalConfiguration();
-        final Optional<Connection> connection = origin.getOptionalConnection();
+        final Optional<Connection> connection = origin.getConnection();
 
         if (res.hasFlag(serverFlag)) {
             if (!connection.isPresent()) {

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

@@ -185,7 +185,7 @@ public class Ignore extends Command implements IntelligentCommand {
             targets.include(TabCompletionType.CHANNEL_NICK);
             targets.include(TabCompletionType.QUERY_NICK);
         } else if (arg == 1 && "--remove".equals(context.getPreviousArgs().get(0))) {
-            final IgnoreList ignoreList = context.getWindow().getOptionalConnection()
+            final IgnoreList ignoreList = context.getWindow().getConnection()
                     .get().getIgnoreList();
             if (ignoreList.canConvert()) {
                 targets.addAll(ignoreList.getSimpleList().stream().collect(Collectors.toList()));

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

@@ -119,7 +119,7 @@ public class JoinChannelCommand extends Command implements IntelligentCommand {
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {
         final FrameContainer source = context.getWindow();
-        final Connection connection = source.getOptionalConnection().get();
+        final Connection connection = source.getConnection().get();
         final List<String> results = checkSource(source, true, true);
 
         final AdditionalTabTargets targets = new AdditionalTabTargets().excludeAll();

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

@@ -116,7 +116,7 @@ public class Message extends Command implements IntelligentCommand,
     public int getLineCount(final FrameContainer origin, final CommandArguments arguments) {
         if (arguments.getArguments().length >= 2) {
             final String target = arguments.getArguments()[0];
-            return origin.getOptionalConnection().get().getWindowModel().getNumLines(
+            return origin.getConnection().get().getWindowModel().getNumLines(
                     "PRIVMSG " + target + " :" + arguments.getArgumentsAsString(1));
         } else {
             return 1;

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

@@ -109,7 +109,7 @@ public class OpenQuery extends Command implements IntelligentCommand,
     public int getLineCount(final FrameContainer origin, final CommandArguments arguments) {
         if (arguments.getArguments().length >= 2) {
             final String target = arguments.getArguments()[0];
-            return origin.getOptionalConnection().get().getWindowModel().getNumLines("PRIVMSG "
+            return origin.getConnection().get().getWindowModel().getNumLines("PRIVMSG "
                     + target + " :" + arguments.getArgumentsAsString(1));
         } else {
             return 1;

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

@@ -179,7 +179,7 @@ public abstract class CommandParser implements Serializable {
         final boolean silent = args.isSilent();
         final String command = args.getCommandName();
         final String[] cargs = args.getArguments();
-        final Optional<Connection> connection = origin.getOptionalConnection();
+        final Optional<Connection> connection = origin.getConnection();
 
         if (cargs.length == 0
                 || !parseChannel

src/com/dmdirc/interfaces/Chat.java

@@ -36,7 +36,7 @@ public interface Chat {
      *
      * @return This chat's connection.
      */
-    Optional<Connection> getOptionalConnection();
+    Optional<Connection> getConnection();
 
     /**
      * Sends an action to the chat. If an action is too long to be sent, an error will be displayed.

src/com/dmdirc/ui/messages/BackBuffer.java

@@ -49,7 +49,7 @@ public class BackBuffer {
             final ColourManagerFactory colourManagerFactory,
             final EventFormatter formatter) {
         this.styliser = new Styliser(
-                owner.getOptionalConnection().orElse(null),
+                owner.getConnection().orElse(null),
                 owner.getConfigManager(),
                 colourManagerFactory.getColourManager(owner.getConfigManager()),
                 owner.getEventBus());

src/com/dmdirc/ui/messages/sink/AllMessageSink.java

@@ -51,7 +51,7 @@ public class AllMessageSink implements MessageSink {
             final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
-        source.getOptionalConnection().get().addLineToAll(messageType, date, args);
+        source.getConnection().get().addLineToAll(messageType, date, args);
     }
 
 }

src/com/dmdirc/ui/messages/sink/ChannelMessageSink.java

@@ -58,7 +58,7 @@ public class ChannelMessageSink implements MessageSink {
         final String user = String.format(patternMatches[0], args);
         boolean found = false;
 
-        final Connection connection = source.getOptionalConnection().get();
+        final Connection connection = source.getConnection().get();
         for (String channelName : connection.getChannels()) {
             final Channel channel = connection.getChannel(channelName);
             if (channel.getChannelInfo().getChannelClient(user) != null) {

src/com/dmdirc/ui/messages/sink/CommonChannelsMessageSink.java

@@ -57,7 +57,7 @@ public class CommonChannelsMessageSink implements MessageSink {
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
         final String user = String.format(patternMatches[0], args);
-        final Connection connection = source.getOptionalConnection().get();
+        final Connection connection = source.getConnection().get();
         boolean found = false;
 
         for (String channelName : connection.getChannels()) {

src/com/dmdirc/ui/messages/sink/CustomWindowMessageSink.java

@@ -24,7 +24,6 @@ package com.dmdirc.ui.messages.sink;
 
 import com.dmdirc.CustomWindow;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.util.URLBuilder;
@@ -71,7 +70,7 @@ public class CustomWindowMessageSink implements MessageSink {
             final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
-        final FrameContainer connectionContainer = source.getOptionalConnection()
+        final FrameContainer connectionContainer = source.getConnection()
                 .get().getWindowModel();
         FrameContainer targetWindow = windowManager
                 .findCustomWindow(connectionContainer, patternMatches[0]);

src/com/dmdirc/ui/messages/sink/LastCommandMessageSink.java

@@ -66,7 +66,7 @@ public class LastCommandMessageSink implements MessageSink {
 
         final Collection<FrameContainer> containers = new ArrayList<>();
 
-        final FrameContainer connectionContainer = source.getOptionalConnection()
+        final FrameContainer connectionContainer = source.getConnection()
                 .get().getWindowModel();
         containers.add(connectionContainer);
         containers.addAll(connectionContainer.getChildren());

src/com/dmdirc/ui/messages/sink/ServerMessageSink.java

@@ -23,7 +23,6 @@
 package com.dmdirc.ui.messages.sink;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 
 import java.util.Date;
 import java.util.regex.Pattern;
@@ -52,7 +51,7 @@ public class ServerMessageSink implements MessageSink {
             final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
-        source.getOptionalConnection().get().getWindowModel().addLine(messageType, date, args);
+        source.getConnection().get().getWindowModel().addLine(messageType, date, args);
     }
 
 }

test/com/dmdirc/actions/ActionSubstitutorTest.java

@@ -75,7 +75,7 @@ public class ActionSubstitutorTest {
 
         final ChannelClientInfo clientInfo = mock(ChannelClientInfo.class);
 
-        when(channel.getOptionalConnection()).thenReturn(Optional.of(server));
+        when(channel.getConnection()).thenReturn(Optional.of(server));
         when(channel.getConfigManager()).thenReturn(manager);
         when(server.getState()).thenReturn(ServerState.DISCONNECTED);
         when(server.getAwayMessage()).thenReturn("foo");

test/com/dmdirc/commandparser/commands/channel/BanTest.java

@@ -77,7 +77,7 @@ public class BanTest {
         when(channelInfo.getChannelClient("user")).thenReturn(ccInfo);
         when(ccInfo.getClient()).thenReturn(clientInfo);
         when(clientInfo.getHostname()).thenReturn("my.host.name");
-        when(container.getOptionalConnection()).thenReturn(Optional.empty());
+        when(container.getConnection()).thenReturn(Optional.empty());
 
         command.execute(container, new CommandArguments(controller, "/ban user"),
                 new ChannelCommandContext(null, Ban.INFO, channel));
@@ -94,7 +94,7 @@ public class BanTest {
         final Channel channel = mock(Channel.class);
 
         when(channel.getChannelInfo()).thenReturn(channelInfo);
-        when(container.getOptionalConnection()).thenReturn(Optional.empty());
+        when(container.getConnection()).thenReturn(Optional.empty());
 
         command.execute(container, new CommandArguments(controller, "/ban *!*@my.host.name"),
                 new ChannelCommandContext(null, Ban.INFO, channel));

test/com/dmdirc/commandparser/commands/channel/KickReasonTest.java

@@ -65,7 +65,7 @@ public class KickReasonTest {
         final FrameContainer tiw = mock(FrameContainer.class);
         final Channel channel = mock(Channel.class);
 
-        when(tiw.getOptionalConnection()).thenReturn(Optional.empty());
+        when(tiw.getConnection()).thenReturn(Optional.empty());
 
         command.execute(tiw, new CommandArguments(controller, "/kick"),
                 new ChannelCommandContext(null, KickReason.INFO, channel));
@@ -81,7 +81,7 @@ public class KickReasonTest {
 
         when(channel.getChannelInfo()).thenReturn(channelInfo);
         when(channelInfo.getChannelClient(anyString())).thenReturn(null);
-        when(tiw.getOptionalConnection()).thenReturn(Optional.empty());
+        when(tiw.getConnection()).thenReturn(Optional.empty());
 
         command.execute(tiw, new CommandArguments(controller, "/kick user1"),
                 new ChannelCommandContext(null, KickReason.INFO, channel));
@@ -98,7 +98,7 @@ public class KickReasonTest {
 
         when(channel.getChannelInfo()).thenReturn(channelInfo);
         when(channelInfo.getChannelClient("user1")).thenReturn(cci);
-        when(tiw.getOptionalConnection()).thenReturn(Optional.empty());
+        when(tiw.getConnection()).thenReturn(Optional.empty());
 
         command.execute(tiw, new CommandArguments(controller, "/kick user1 reason here"),
                 new ChannelCommandContext(null, KickReason.INFO, channel));
@@ -118,7 +118,7 @@ public class KickReasonTest {
         when(channel.getChannelInfo()).thenReturn(channelInfo);
         when(channelInfo.getChannelClient("user1")).thenReturn(cci);
         when(manager.getOption("general", "kickmessage")).thenReturn("reason here");
-        when(tiw.getOptionalConnection()).thenReturn(Optional.empty());
+        when(tiw.getConnection()).thenReturn(Optional.empty());
 
         command.execute(tiw, new CommandArguments(controller, "/kick user1"),
                 new ChannelCommandContext(null, KickReason.INFO, channel));

test/com/dmdirc/commandparser/commands/channel/ModeTest.java

@@ -56,7 +56,7 @@ public class ModeTest {
 
     @Before
     public void setUp() throws InvalidIdentityFileException {
-        when(channel.getOptionalConnection()).thenReturn(Optional.of(server));
+        when(channel.getConnection()).thenReturn(Optional.of(server));
         when(server.getParser()).thenReturn(parser);
         when(channel.getChannelInfo()).thenReturn(channelinfo);
         when(channelinfo.getModes()).thenReturn("my mode string!");

test/com/dmdirc/commandparser/commands/channel/NamesTest.java

@@ -55,7 +55,7 @@ public class NamesTest {
 
     @Before
     public void setUp() throws InvalidIdentityFileException {
-        when(channel.getOptionalConnection()).thenReturn(Optional.of(server));
+        when(channel.getConnection()).thenReturn(Optional.of(server));
         when(server.getParser()).thenReturn(parser);
         when(channel.getChannelInfo()).thenReturn(channelinfo);
         when(channelinfo.getName()).thenReturn("#chan");

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

@@ -74,7 +74,7 @@ public class CommandParserTest {
 
         when(configProvider.getOptionInt("general", "commandhistory")).thenReturn(10);
 
-        when(container.getOptionalConnection()).thenReturn(Optional.of(connection));
+        when(container.getConnection()).thenReturn(Optional.of(connection));
         when(connection.isValidChannelName("#channel1")).thenReturn(true);
         when(connection.isValidChannelName("#channel2")).thenReturn(true);
         when(connection.hasChannel("#channel1")).thenReturn(true);
@@ -191,7 +191,7 @@ public class CommandParserTest {
 
     @Test
     public void testParseChannelCommandWithArguments() {
-        when(container.getOptionalConnection()).thenReturn(Optional.of(connection));
+        when(container.getConnection()).thenReturn(Optional.of(connection));
         commandParser.parseCommand(container, "/channel #channel1 this is a test");
 
         assertNull(channelCommandParser.nonCommandLine);
@@ -203,7 +203,7 @@ public class CommandParserTest {
 
     @Test
     public void testParseChannelCommandWithoutArguments() {
-        when(container.getOptionalConnection()).thenReturn(Optional.of(connection));
+        when(container.getConnection()).thenReturn(Optional.of(connection));
         commandParser.parseCommand(container, "/channel #channel1");
 
         assertNull(channelCommandParser.nonCommandLine);
@@ -215,7 +215,7 @@ public class CommandParserTest {
 
     @Test
     public void testParseSilencedChannelCommandWithArguments() {
-        when(container.getOptionalConnection()).thenReturn(Optional.of(connection));
+        when(container.getConnection()).thenReturn(Optional.of(connection));
         commandParser.parseCommand(container, "/.channel #channel1 this is a test");
 
         assertNull(channelCommandParser.nonCommandLine);
@@ -227,7 +227,7 @@ public class CommandParserTest {
 
     @Test
     public void testParseSilencedChannelCommandWithoutArguments() {
-        when(container.getOptionalConnection()).thenReturn(Optional.of(connection));
+        when(container.getConnection()).thenReturn(Optional.of(connection));
         commandParser.parseCommand(container, "/.channel #channel1");
 
         assertNull(channelCommandParser.nonCommandLine);

test/com/dmdirc/harness/TestWritableFrameContainer.java

@@ -69,7 +69,7 @@ public class TestWritableFrameContainer extends FrameContainer {
     }
 
     @Override
-    public Optional<Connection> getOptionalConnection() {
+    public Optional<Connection> getConnection() {
         return Optional.empty();
     }