Force Global Receiver to share same name as type to match behavior with other SSE clients

mythz · mythz · commit 68e345f22fbb · 2017-03-06T21:53:35.000-05:00
diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/sse/ServerEventsClient.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/sse/ServerEventsClient.java
@@ -224,7 +224,8 @@ public void execute(ServerEventsClient client, ServerEventMessage msg) {
 
                         Class requestType = args[0];
 
-                        if (target.equals(requestType.getSimpleName())) {
+                        if (target.equals(requestType.getSimpleName()) &&
+                            mi.getName().toLowerCase().equals(target.toLowerCase())) {
                             Object request = !Utils.isNullOrEmpty(msg.getJson())
                                 ? JsonUtils.fromJson(msg.getJson(), requestType)
                                 : requestType.newInstance();
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/sse/ServerEventsClient.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/sse/ServerEventsClient.java
@@ -224,7 +224,8 @@ public void execute(ServerEventsClient client, ServerEventMessage msg) {
 
                         Class requestType = args[0];
 
-                        if (target.equals(requestType.getSimpleName())) {
+                        if (target.equals(requestType.getSimpleName()) &&
+                            mi.getName().toLowerCase().equals(target.toLowerCase())) {
                             Object request = !Utils.isNullOrEmpty(msg.getJson())
                                 ? JsonUtils.fromJson(msg.getJson(), requestType)
                                 : requestType.newInstance();
diff --git a/src/AndroidClient/client/src/test/java/net/servicestack/client/ServerEventClientTests.java b/src/AndroidClient/client/src/test/java/net/servicestack/client/ServerEventClientTests.java
@@ -480,7 +480,7 @@ public void test_Does_send_message_to_global_receiver() throws Exception {
                 Thread.sleep(100);
             }
 
-            CustomType foo = TestGlobalReceiver.FooMethodReceived;
+            CustomType foo = TestGlobalReceiver.CustomTypeReceived;
             assertNotNull(foo);
             assertEquals(1, foo.getId().intValue());
             assertEquals("Foo", foo.getName());
diff --git a/src/AndroidClient/client/src/test/java/net/servicestack/client/TestGlobalReceiver.java b/src/AndroidClient/client/src/test/java/net/servicestack/client/TestGlobalReceiver.java
@@ -10,18 +10,18 @@
  */
 
 public class TestGlobalReceiver extends ServerEventReceiver {
-    public static CustomType FooMethodReceived;
+    public static CustomType CustomTypeReceived;
     public static CustomType NoSuchMethodReceived;
     public static String NoSuchMethodSelector;
-    public static SetterType AnyNamedSetterReceived;
+    public static SetterType SetterTypeReceived;
 
-    public void setAnyNamedSetter(SetterType value) {
-        AnyNamedSetterReceived = value;
+    public void setterType(SetterType value) {
+        SetterTypeReceived = value;
     }
 
-    public void anyNamedMethod(CustomType request)
+    public void customType(CustomType request)
     {
-        FooMethodReceived = request;
+        CustomTypeReceived = request;
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -480,7 +480,7 @@ public void test_Does_send_message_to_global_receiver() throws Exception {`
`480`	`480`	`Thread.sleep(100);`
`481`	`481`	`}`
`482`	`482`
`483`		`- CustomType foo = TestGlobalReceiver.FooMethodReceived;`
	`483`	`+ CustomType foo = TestGlobalReceiver.CustomTypeReceived;`
`484`	`484`	`assertNotNull(foo);`
`485`	`485`	`assertEquals(1, foo.getId().intValue());`
`486`	`486`	`assertEquals("Foo", foo.getName());`