Skip to content

Commit 68e345f

Browse files
committed
Force Global Receiver to share same name as type to match behavior with other SSE clients
1 parent ecd6827 commit 68e345f

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

src/AndroidClient/android/src/main/java/net/servicestack/client/sse/ServerEventsClient.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,8 @@ public void execute(ServerEventsClient client, ServerEventMessage msg) {
224224

225225
Class requestType = args[0];
226226

227-
if (target.equals(requestType.getSimpleName())) {
227+
if (target.equals(requestType.getSimpleName()) &&
228+
mi.getName().toLowerCase().equals(target.toLowerCase())) {
228229
Object request = !Utils.isNullOrEmpty(msg.getJson())
229230
? JsonUtils.fromJson(msg.getJson(), requestType)
230231
: requestType.newInstance();

src/AndroidClient/client/src/main/java/net/servicestack/client/sse/ServerEventsClient.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,8 @@ public void execute(ServerEventsClient client, ServerEventMessage msg) {
224224

225225
Class requestType = args[0];
226226

227-
if (target.equals(requestType.getSimpleName())) {
227+
if (target.equals(requestType.getSimpleName()) &&
228+
mi.getName().toLowerCase().equals(target.toLowerCase())) {
228229
Object request = !Utils.isNullOrEmpty(msg.getJson())
229230
? JsonUtils.fromJson(msg.getJson(), requestType)
230231
: requestType.newInstance();

src/AndroidClient/client/src/test/java/net/servicestack/client/ServerEventClientTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ public void test_Does_send_message_to_global_receiver() throws Exception {
480480
Thread.sleep(100);
481481
}
482482

483-
CustomType foo = TestGlobalReceiver.FooMethodReceived;
483+
CustomType foo = TestGlobalReceiver.CustomTypeReceived;
484484
assertNotNull(foo);
485485
assertEquals(1, foo.getId().intValue());
486486
assertEquals("Foo", foo.getName());

src/AndroidClient/client/src/test/java/net/servicestack/client/TestGlobalReceiver.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
*/
1111

1212
public class TestGlobalReceiver extends ServerEventReceiver {
13-
public static CustomType FooMethodReceived;
13+
public static CustomType CustomTypeReceived;
1414
public static CustomType NoSuchMethodReceived;
1515
public static String NoSuchMethodSelector;
16-
public static SetterType AnyNamedSetterReceived;
16+
public static SetterType SetterTypeReceived;
1717

18-
public void setAnyNamedSetter(SetterType value) {
19-
AnyNamedSetterReceived = value;
18+
public void setterType(SetterType value) {
19+
SetterTypeReceived = value;
2020
}
2121

22-
public void anyNamedMethod(CustomType request)
22+
public void customType(CustomType request)
2323
{
24-
FooMethodReceived = request;
24+
CustomTypeReceived = request;
2525
}
2626

2727
@Override

0 commit comments

Comments
 (0)