Skip to content

Fix PusherEvent user id wrong key. Change userId to user_id #350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Keith-wright merged 2 commits into from
Oct 5, 2026
Merged

Fix PusherEvent user id wrong key. Change userId to user_id #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0c3eda
Fix PusherEvent user id wrong key. Change userId to user_id
josephmangmang Nov 10, 2022
ddff081
Skip user_id when it is null in PusherEvent constructor
Keith-wright Oct 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/main/java/com/pusher/client/channel/PusherEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ public String toString() {
public PusherEvent(String event, String channel, String userId, String data) {
jsonObject.addProperty("event", event);
jsonObject.addProperty("channel", channel);
jsonObject.addProperty("userId", userId);
if (userId != null) {
jsonObject.addProperty("user_id", userId);
}
jsonObject.addProperty("data", data);
}

Expand Down
14 changes: 14 additions & 0 deletions src/test/java/com/pusher/client/channel/PusherEventTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.pusher.client.channel;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;

import org.junit.Before;
import org.junit.Test;
Expand Down Expand Up @@ -45,6 +46,19 @@ public void testUserIdIsExtracted() {
);
assertEquals("my-user-id", e.getUserId());
}

@Test
public void testUserIdIsSetByConstructor() {
final PusherEvent e = new PusherEvent("my-event", "my-channel", "my-user-id", "{}");
assertEquals("my-user-id", e.getUserId());
}

@Test
public void testNullUserIdFromConstructorIsNull() {
final PusherEvent e = new PusherEvent("my-event", "my-channel", null, "{}");
assertNull(e.getUserId());
}

@Test
public void testErrorData() {
final PusherEvent e = PusherEvent.fromJson(
Expand Down
Loading