Fix some build warnings.

channelwho/test/com/dmdirc/addons/channelwho/ConnectionHandlerTest.java

 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyLong;
 import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
     @Mock private WindowModel windowModel;
     @Mock private DMDircMBassador eventBus;
     @Mock private ScheduledExecutorService scheduledExecutorService;
-    @Mock private ScheduledFuture scheduledFuture;
+    @Mock private ScheduledFuture<?> scheduledFuture;
     @Mock private ConnectionManager connectionManager;
     @Mock private Connection connection;
     @Mock private GroupChat groupChat;
 
     @Before
     public void setUp() throws Exception {
-        when(scheduledExecutorService.scheduleAtFixedRate(any(Runnable.class), anyLong(), anyLong(),
-                any())).thenReturn(scheduledFuture);
+        doReturn(scheduledFuture).when(
+                scheduledExecutorService.scheduleAtFixedRate(
+                        any(Runnable.class), anyLong(), anyLong(), any()));
         when(windowModel.getEventBus()).thenReturn(eventBus);
         when(connection.getWindowModel()).thenReturn(windowModel);
         when(config.getBinder()).thenReturn(configBinder);
         instance.load();
         verify(configBinder).bind(instance, ConnectionHandler.class);
         verify(eventBus).subscribe(instance);
-        verify(scheduledExecutorService).scheduleAtFixedRate(any(Runnable.class), eq(5l), eq(5l),
+        verify(scheduledExecutorService).scheduleAtFixedRate(any(Runnable.class), eq(5L), eq(5L),
                 eq(TimeUnit.MILLISECONDS));
     }
 
     public void testHandleWhoInterval() throws Exception {
         instance.handleWhoInterval(10);
         verify(scheduledFuture).cancel(false);
-        verify(scheduledExecutorService).scheduleAtFixedRate(any(Runnable.class), eq(5l), eq(5l),
+        verify(scheduledExecutorService).scheduleAtFixedRate(any(Runnable.class), eq(5L), eq(5L),
                 eq(TimeUnit.MILLISECONDS));
-        verify(scheduledExecutorService).scheduleAtFixedRate(any(Runnable.class), eq(10l), eq(10l),
+        verify(scheduledExecutorService).scheduleAtFixedRate(any(Runnable.class), eq(10L), eq(10L),
                 eq(TimeUnit.MILLISECONDS));
     }
 
 
     @Test
     public void testHandleAwayEvent_WithReason() throws Exception {
-        when(channelUserAwayEvent.getReason()).thenReturn(Optional.ofNullable("reason"));
+        when(channelUserAwayEvent.getReason()).thenReturn(Optional.of("reason"));
         instance.load();
         instance.handleAwayEvent(channelUserAwayEvent);
         verify(channelUserAwayEvent, never())

redirect/src/com/dmdirc/addons/redirect/FakeWriteableFrameContainer.java

     }
 
     @Override
+    @Deprecated
     public void addLine(final String type, final Date timestamp, final Object... args) {
         addLine(type, args);
     }
 
     @Override
+    @Deprecated
     public void addLine(final String type, final Object... args) {
         sendLine(Formatter.formatMessage(getConfigManager(), type, args));
     }
 
     @Override
+    @Deprecated
     public void addLine(final String line, final Date timestamp) {
         addLine(line);
     }

ui_swing/test/com/dmdirc/addons/ui_swing/components/GenericTableModelTest.java

 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertSame;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.verify;