Merge branch 'master' into reconnect_fix

Author: WillSewell

.travis.yml

@@ -1,6 +1,9 @@
 language: java
 sudo: false
 jdk:
-  - oraclejdk8
+  - openjdk8
+  - openjdk9
+  - openjdk10
+  - openjdk11
 script:
   - ./gradlew test

CHANGELOG.md

@@ -2,12 +2,16 @@
 
 This Changelog is no longer being updated. For any further changes please see the Releases section on this Github repository - https://github.com/pusher/pusher-websocket-java/releases
 
+## Version 2.0.0
+* The onEvent handler now gets called with one parameter, called the PusherEvent. This PusherEvent has all the same information available as was available before with the 3 parameters, but now is accessible by calling getChannelName(), getData() or getEventName() on the PusherEvent object you receive. In addition, for presence channel client events, you can now retrieve an authenticated User ID by calling getUserId() on the PusherEvent object. To read more on Authenticated users, see the README or our docs [here](https://pusher.com/docs/channels/using_channels/events#user-id-in-client-events).
+
+
 ## Version 1.4.0
 * Update the dependency to use pusher/java-websocket fork and remove dependency on clojars.org repository.
 
 ## Version 1.3.0
 * Add retry logic when the connection is lost
-* Accept 201 status code from auth endpoints 
+* Accept 201 status code from auth endpoints
 
 ## Version 1.2.2
 

README.md

@@ -22,8 +22,8 @@ apply plugin: 'signing'
 
 group = "com.pusher"
 version = "1.8.2-SNAPSHOT"
-sourceCompatibility = "1.6"
-targetCompatibility = "1.6"
+sourceCompatibility = "1.8"
+targetCompatibility = "1.8"
 
 ext.sharedManifest = manifest {
 	attributes(
@@ -127,60 +127,62 @@ artifacts {
 	archives jar, fatJar, sourcesJar, javadocJar
 }
 
-task createPublishTarget << {
-	uploadArchives { repositories { mavenDeployer {
-		beforeDeployment {
-			MavenDeployment deployment -> signing.signPom(deployment)
-		}
-		repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-			authentication(
-				userName: getProperty("maven.username"),
-				password: getProperty("maven.password")
-			)
-		}
-		snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-			authentication(
-				userName: getProperty("maven.username"),
-				password: getProperty("maven.password")
-			)
-		}
-		pom.project {
-			name 'Pusher Java Client Library'
-			packaging 'jar'
-			artifactId 'pusher-java-client'
-			description 'This is a Java client library for Pusher, targeted at core Java and Android.'
-			url 'http://github.com/pusher/pusher-websocket-java'
-			scm {
-				connection 'scm:git:git@github.com:pusher/pusher-websocket-java'
-				developerConnection 'scm:git:git@github.com:pusher/pusher-websocket-java'
-				url 'http://github.com/pusher/pusher-websocket-java'
-			}
-			licenses {
-				license {
-					name 'MIT'
-					url 'https://raw.github.com/pusher/pusher-websocket-java/master/LICENCE.txt'
-					distribution 'https://raw.github.com/pusher/pusher-websocket-java/mvn-repo/'
-				}
+task createPublishTarget {
+	doLast {
+		uploadArchives { repositories { mavenDeployer {
+			beforeDeployment {
+				MavenDeployment deployment -> signing.signPom(deployment)
 			}
-			organization {
-				name 'Pusher'
-				url 'http://pusher.com'
+			repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
+				authentication(
+					userName: getProperty("maven.username"),
+					password: getProperty("maven.password")
+				)
 			}
-			issueManagement {
-				system 'GitHub'
-				url 'https://github.com/pusher/pusher-websocket-java/issues'
+			snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
+				authentication(
+					userName: getProperty("maven.username"),
+					password: getProperty("maven.password")
+				)
 			}
-			developers {
-				developer {
-					id 'mike'
-					name 'Mike Pye'
-					email 'mike@pusher.com'
+			pom.project {
+				name 'Pusher Java Client Library'
+				packaging 'jar'
+				artifactId 'pusher-java-client'
+				description 'This is a Java client library for Pusher, targeted at core Java and Android.'
+				url 'http://github.com/pusher/pusher-websocket-java'
+				scm {
+					connection 'scm:git:git@github.com:pusher/pusher-websocket-java'
+					developerConnection 'scm:git:git@github.com:pusher/pusher-websocket-java'
+					url 'http://github.com/pusher/pusher-websocket-java'
+				}
+				licenses {
+					license {
+						name 'MIT'
+						url 'https://raw.github.com/pusher/pusher-websocket-java/master/LICENCE.txt'
+						distribution 'https://raw.github.com/pusher/pusher-websocket-java/mvn-repo/'
+					}
+				}
+				organization {
+					name 'Pusher'
+					url 'http://pusher.com'
+				}
+				issueManagement {
+					system 'GitHub'
+					url 'https://github.com/pusher/pusher-websocket-java/issues'
+				}
+				developers {
+					developer {
+						id 'mike'
+						name 'Mike Pye'
+						email 'mike@pusher.com'
+					}
 				}
 			}
-		}
-	}}}
+		}}}
+	}
 }
 
-task wrapper(type: Wrapper) {
-	gradleVersion = '4.4.1'
+wrapper {
+	gradleVersion = '5.5.1'
 }

build.gradle

@@ -1,6 +1,5 @@
-#Wed Feb 21 14:42:32 GMT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ 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=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

gradle/wrapper/gradle-wrapper.properties

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ 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=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

gradlew

@@ -0,0 +1,45 @@
+package com.pusher.client.channel;
+
+import java.util.Map;
+
+public class PusherEvent {
+    private Map<String, Object> eventData;
+
+    public PusherEvent(Map<String, Object> eventData) {
+        this.eventData = eventData;
+    }
+
+    /**
+     * getProperty returns the value associated with the key, or null.
+     * It is recommended that you use the specialized getters in this class instead.
+     *
+     * @param key The key you wish to get.
+     * @return
+     *      The object can be casted as follows:
+     *      - JSON strings - java.lang.String
+     *      - JSON number - java.lang.Double
+     *      - JSON boolean - java.lang.Boolean
+     *      - JSON array - java.util.ArrayList
+     *      - JSON object - java.util.Map
+     *      - JSON null - null
+     */
+    public Object getProperty(String key) {
+        return eventData.get(key);
+    }
+
+    /**
+     * Returns the userId associated with this event.
+     *
+     * @return
+     *      The userID string: https://pusher.com/docs/channels/using_channels/events#user-id-in-client-events,
+     *      or null if the event is not a client event on a presence channel.
+     */
+    public String getUserId() { return (String)eventData.get("user_id"); }
+    public String getChannelName() { return (String)eventData.get("channel"); }
+    public String getEventName() { return (String)eventData.get("event"); }
+    public String getData() { return (String)eventData.get("data"); }
+
+    public String toString() {
+        return eventData.toString();
+    }
+}

gradlew.bat

@@ -0,0 +1,20 @@
+package com.pusher.client.channel;
+
+import java.lang.reflect.Type;
+import java.util.Map;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+
+public class PusherEventDeserializer implements JsonDeserializer<PusherEvent> {
+    private final Gson GSON = new Gson();
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public PusherEvent deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        return new PusherEvent(GSON.fromJson(json, Map.class));
+    }
+}