Merge branch 'master' of https://github.com/DMDirc/Parser

build.gradle

@@ -79,7 +79,11 @@ subprojects {
         repositories {
             maven {
                 name 'snapshots'
-                url 'http://artifactory.dmdirc.com/artifactory/repo'
+                url 'http://artifactory.dmdirc.com/artifactory/snapshots'
+                credentials {
+                    username System.getenv('ARTIFACTORY_USER')
+                    password System.getenv('ARTIFACTORY_PASSWORD')
+                }
             }
         }
     }
@@ -92,19 +96,19 @@ subprojects {
     dependencies {
         compile group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'
         compile group: 'com.squareup.dagger', name: 'dagger-compiler', version: '1.2.5'
-        compile group: 'com.google.auto.value', name: 'auto-value', version: '1.2'
+        compile group: 'com.google.auto.value', name: 'auto-value', version: '1.3'
 
         compile group: 'org.slf4j', name: 'slf4j-api', version:'1.7.21'
         compile group: 'com.squareup.dagger', name: 'dagger', version: '1.2.5'
         compile group: 'com.google.guava', name:'guava', version: '19.0'
 
-        compile group: 'net.engio', name: 'mbassador', version: '1.2.4.2'
+        compile group: 'net.engio', name: 'mbassador', version: '1.3.0'
         compile group: 'de.odysseus.juel', name: 'juel-api', version: '2.2.7'
         compile group: 'de.odysseus.juel', name: 'juel-impl', version: '2.2.7'
         compile group: 'de.odysseus.juel', name: 'juel-spi', version: '2.2.7'
 
         testCompile group: 'junit', name: 'junit', version: '4.12'
-        testCompile group: 'org.mockito', name: 'mockito-core', version: '1.10.19'
+        testCompile group: 'org.mockito', name: 'mockito-core', version: '2.2.7'
     }
 
     task publishSnapshot(dependsOn: 'publishMavenJavaPublicationToSnapshotsRepository') << {
@@ -126,7 +130,7 @@ subprojects {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.13'
+    gradleVersion = '3.1'
 }
 
 def find(name) {

circle.yml

@@ -18,3 +18,10 @@ dependencies:
 test:
   override:
     - ./gradlew test jacocoTestReport coveralls
+
+deployment:
+  snapshots:
+    branch: master
+    owner: DMDirc
+    commands:
+      - ./gradlew publishSnapshot

common/src/main/java/com/dmdirc/parser/interfaces/ClientInfo.java

@@ -82,7 +82,7 @@ public interface ClientInfo {
      *
      * @return int with the count of known channels
      */
-    public List<ChannelClientInfo> getChannelClients();
+    List<ChannelClientInfo> getChannelClients();
 
     /**
      * Get the away state of a user.

common/src/main/java/com/dmdirc/parser/interfaces/ProtocolDescription.java

@@ -32,13 +32,6 @@ import java.net.URI;
  */
 public interface ProtocolDescription {
 
-    /**
-     * Retrieves the default port to use for this protocol if none is specified.
-     *
-     * @return This protocol's default port
-     */
-    int getDefaultPort();
-
     /**
      * Parses the specified hostmask into an array containing a nickname,
      * username and hostname, in that order.

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu May 05 16:42:15 BST 2016
+#Thu Oct 27 18:07:37 BST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip

gradlew

@@ -6,12 +6,30 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -161,4 +161,9 @@ function splitJvmOpts() {
 eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
 JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+  cd "$(dirname "$0")"
+fi
+
 exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

gradlew.bat

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

irc/src/main/java/com/dmdirc/parser/irc/IRCParser.java

@@ -1532,11 +1532,7 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
 
         for (ChannelJoinRequest channel : channels) {
             // Make sure we have a list to put stuff in.
-            StringBuffer list = joinMap.get(channel.getPassword());
-            if (list == null) {
-                list = new StringBuffer();
-                joinMap.put(channel.getPassword(), list);
-            }
+            StringBuffer list = joinMap.computeIfAbsent(channel.getPassword(), k -> new StringBuffer());
 
             // Add the channel to the list. If the name is invalid and
             // autoprefix is off we will just skip this channel.

irc/src/main/java/com/dmdirc/parser/irc/IRCProtocolDescription.java

@@ -33,11 +33,6 @@ import java.net.URI;
  */
 public class IRCProtocolDescription implements ProtocolDescription {
 
-    @Override
-    public int getDefaultPort() {
-        return 6667;
-    }
-
     @Override
     public String[] parseHostmask(final String hostmask) {
         return IRCClientInfo.parseHostFull(hostmask);

irc/src/main/java/com/dmdirc/parser/irc/events/IRCDataInEvent.java

@@ -23,7 +23,6 @@
 package com.dmdirc.parser.irc.events;
 
 import com.dmdirc.parser.events.DataInEvent;
-import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.IRCReader.ReadLine;
 

irc/src/main/java/com/dmdirc/parser/irc/processors/ProcessJoin.java

@@ -26,7 +26,6 @@ import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.parser.common.QueuePriority;
 import com.dmdirc.parser.events.ChannelJoinEvent;
 import com.dmdirc.parser.events.ChannelSelfJoinEvent;
-import com.dmdirc.parser.events.DataOutEvent;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.irc.CapabilityState;
@@ -39,7 +38,6 @@ import com.dmdirc.parser.irc.PrefixModeManager;
 import com.dmdirc.parser.irc.ProcessorNotFoundException;
 import com.dmdirc.parser.irc.events.IRCDataOutEvent;
 import net.engio.mbassy.listener.Handler;
-import net.engio.mbassy.listener.Invoke;
 
 import java.time.LocalDateTime;
 import java.util.Arrays;

irc/src/main/java/com/dmdirc/parser/irc/processors/ProcessMessage.java

@@ -53,7 +53,6 @@ import com.dmdirc.parser.irc.ProcessorNotFoundException;
 import com.dmdirc.parser.irc.TimestampedIRCProcessor;
 
 import java.time.LocalDateTime;
-import java.util.Date;
 import java.util.regex.PatternSyntaxException;
 
 import javax.inject.Inject;

irc/src/test/java/com/dmdirc/parser/irc/IRCReaderTest.java

@@ -24,20 +24,27 @@ package com.dmdirc.parser.irc;
 
 import com.dmdirc.parser.interfaces.Encoder;
 import com.dmdirc.parser.irc.IRCReader.ReadLine;
-
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
 import java.util.Date;
-
 import org.junit.Assert;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.isNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 public class IRCReaderTest {
 
@@ -71,8 +78,8 @@ public class IRCReaderTest {
         final InputStream stream = new ByteArrayInputStream("te t :foo\r\n".getBytes());
         final Encoder encoder = mock(Encoder.class);
 
-        when(encoder.encode((String) isNull(), (String) isNull(),
-                (byte[]) anyObject(), anyInt(), eq(3)))
+        when(encoder.encode(isNull(), isNull(),
+                any(), anyInt(), eq(3)))
                 .thenReturn("encoded");
 
         final IRCReader reader = new IRCReader(stream, encoder);
@@ -88,9 +95,7 @@ public class IRCReaderTest {
         final InputStream stream = new ByteArrayInputStream("foo bar  baz  :qux  baz\r\n".getBytes());
         final Encoder encoder = mock(Encoder.class);
 
-        when(encoder.encode((String) isNull(), (String) isNull(),
-                (byte[]) anyObject(), eq(15), eq(8)))
-                .thenReturn("qux  baz");
+        when(encoder.encode(isNull(), isNull(), any(), eq(15), eq(8))).thenReturn("qux  baz");
 
         final IRCReader reader = new IRCReader(stream, encoder);
         final ReadLine line = reader.readLine();
@@ -106,8 +111,7 @@ public class IRCReaderTest {
 
         new IRCReader(stream, encoder).readLine();
 
-        verify(encoder).encode(eq("src"), anyString(),
-                (byte[]) anyObject(), anyInt(), anyInt());
+        verify(encoder).encode(eq("src"), isNull(), any(), anyInt(), anyInt());
     }
 
     /** Verifies that no source is passed if the source is empty. */
@@ -118,8 +122,7 @@ public class IRCReaderTest {
 
         new IRCReader(stream, encoder).readLine();
 
-        verify(encoder).encode((String) isNull(), anyString(),
-                (byte[]) anyObject(), anyInt(), anyInt());
+        verify(encoder).encode(isNull(), isNull(), any(), anyInt(), anyInt());
     }
 
     /** Verifies that a destination is extracted properly. */
@@ -130,8 +133,7 @@ public class IRCReaderTest {
 
         new IRCReader(stream, encoder).readLine();
 
-        verify(encoder).encode(anyString(), eq("y"), (byte[]) anyObject(),
-                anyInt(), anyInt());
+        verify(encoder).encode(anyString(), eq("y"), any(), anyInt(), anyInt());
     }
 
     /** Verifies that no destination is extracted if there's no source. */
@@ -142,8 +144,7 @@ public class IRCReaderTest {
 
         new IRCReader(stream, encoder).readLine();
 
-        verify(encoder).encode(anyString(), (String) isNull(),
-                (byte[]) anyObject(), anyInt(), anyInt());
+        verify(encoder).encode(isNull(), isNull(), any(), anyInt(), anyInt());
     }
 
     /** Verifies that no destination is extracted if there are too few args. */
@@ -154,8 +155,7 @@ public class IRCReaderTest {
 
         new IRCReader(stream, encoder).readLine();
 
-        verify(encoder).encode(anyString(), (String) isNull(),
-                (byte[]) anyObject(), anyInt(), anyInt());
+        verify(encoder).encode(anyString(), isNull(), any(), anyInt(), anyInt());
     }
 
     /** Verifies that a numeric's destination is extracted properly. */
@@ -166,7 +166,7 @@ public class IRCReaderTest {
 
         new IRCReader(stream, encoder).readLine();
 
-        verify(encoder).encode(anyString(), eq("y"), (byte[]) anyObject(), anyInt(), anyInt());
+        verify(encoder).encode(anyString(), eq("y"), any(), anyInt(), anyInt());
     }
 
     /** Verifies that the close call is proxied to the stream. */
@@ -190,8 +190,7 @@ public class IRCReaderTest {
                 (int) '1', (int) ' ', 0xF6, (int) ' ', (int) 'y', (int) ' ', (int) 'z', (int) ' ',
                 (int) ':', (int) 'x', (int) '\r', (int) '\n');
 
-        when(encoder.encode(anyString(), anyString(),
-                (byte[]) any(), anyInt(), anyInt())).thenReturn("x");
+        when(encoder.encode(anyString(), anyString(), any(), anyInt(), anyInt())).thenReturn("x");
 
         final ReadLine line = new IRCReader(stream, encoder, Charset.forName("UTF-8")).readLine();
 

irc/src/test/java/com/dmdirc/parser/irc/processors/Process001Test.java

@@ -36,10 +36,10 @@ import org.mockito.runners.MockitoJUnitRunner;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeFalse;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -129,7 +129,7 @@ public class Process001Test {
         when(localClient.getNickname()).thenAnswer(invocation -> nickname.toString());
         doAnswer(invocation -> {
             nickname.setLength(0);
-            nickname.append(invocation.getArgumentAt(0, String.class));
+            nickname.append(invocation.<String>getArgument(0));
             return null;
         }).when(localClient).setUserBits(anyString(), eq(true), anyBoolean());
     }

xmpp/src/main/java/com/dmdirc/parser/xmpp/XmppProtocolDescription.java

@@ -31,11 +31,6 @@ import java.net.URI;
  */
 public class XmppProtocolDescription implements ProtocolDescription {
 
-    @Override
-    public int getDefaultPort() {
-        return 5222;
-    }
-
     @Override
     public String[] parseHostmask(final String hostmask) {
         final String[] parts = hostmask.split("/");