Merge pull request #138 from pusher/emitchel-feature/trigger-fix

Removing the requirement to trigger with JSON objects as data (same as the Swift library)

Author: zmarkan

.gitignore

@@ -12,4 +12,5 @@ build
 .idea
 
 *.iml
-gradle.properties
+gradle.properties
+local.properties

build.gradle

@@ -21,7 +21,7 @@ apply plugin: 'org.ajoberstar.github-pages'
 apply plugin: 'signing'
 
 group = "com.pusher"
-version = "1.4.0"
+version = "2.0.0-SNAPSHOT"
 sourceCompatibility = "1.6"
 targetCompatibility = "1.6"
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Nov 15 11:59:30 GMT 2016
+#Fri Feb 24 10:18:34 GMT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

src/main/java/com/pusher/client/channel/impl/PrivateChannelImpl.java

@@ -52,12 +52,11 @@ public void trigger(final String eventName, final String data) {
         }
 
         try {
-            final Map userData = GSON.fromJson(data, Map.class);
 
             final Map<Object, Object> jsonPayload = new LinkedHashMap<Object, Object>();
             jsonPayload.put("event", eventName);
             jsonPayload.put("channel", name);
-            jsonPayload.put("data", userData);
+            jsonPayload.put("data", data);
 
             final String jsonMessage = GSON.toJson(jsonPayload);
             connection.sendMessage(jsonMessage);

src/test/java/com/pusher/client/channel/impl/PrivateChannelImplTest.java

@@ -110,7 +110,7 @@ public void testTriggerWithValidEventSendsMessage() {
         verify(mockConnection)
         .sendMessage(
                 "{\"event\":\"client-myEvent\",\"channel\":\"" + getChannelName()
-                + "\",\"data\":{\"fish\":\"chips\"}}");
+                + "\",\"data\":\"{\\\"fish\\\":\\\"chips\\\"}\"}");
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -129,20 +129,16 @@ public void testTriggerWithInvalidEventNameThrowsException() {
         ((PrivateChannelImpl)channel).trigger("myEvent", "{\"fish\":\"chips\"}");
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void testTriggerWithInvalidJSONThrowsException() {
-        when(mockConnection.getState()).thenReturn(ConnectionState.CONNECTED);
-        channel.updateState(ChannelState.SUBSCRIBED);
-
-        ((PrivateChannelImpl)channel).trigger("client-myEvent", "{\"fish\":malformed");
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testTriggerWithJSONStringInsteadOfObjectThrowsException() {
+    @Test
+    public void testTriggerWithString() {
         when(mockConnection.getState()).thenReturn(ConnectionState.CONNECTED);
         channel.updateState(ChannelState.SUBSCRIBED);
 
         ((PrivateChannelImpl)channel).trigger("client-myEvent", "string");
+
+        verify(mockConnection).sendMessage(
+                "{\"event\":\"client-myEvent\",\"channel\":\"" + getChannelName()
+                        + "\",\"data\":\"string\"}");
     }
 
     @Test(expected = IllegalStateException.class)