Support invoking receivers with no arguments

mythz · mythz · commit 9aea349e9b14 · 2017-03-21T02:37:41.000-04:00
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
@@ -238,11 +238,23 @@ public void execute(ServerEventsClient client, ServerEventMessage msg) {
                         if (!Modifier.isPublic(mi.getModifiers()) || Modifier.isStatic(mi.getModifiers()))
                             continue;
                         Class[] args = mi.getParameterTypes();
-                        if (args.length != 1)
+                        if (args.length > 1)
                             continue;
                         if ("equals".equals(mi.getName()))
                             continue;
 
+                        String actionName = mi.getName();
+                        if (!target.equalsIgnoreCase(actionName) && actionName.startsWith("set"))
+                            actionName = actionName.substring(3); //= "set".length()
+
+                        if (args.length == 0){
+                            if (target.equalsIgnoreCase(actionName)) {
+                                mi.invoke(receiver, null);
+                                return;
+                            }
+                            continue;
+                        }
+
                         Class requestType = args[0];
 
                         if (target.equals(requestType.getSimpleName()) &&
@@ -254,10 +266,6 @@ public void execute(ServerEventsClient client, ServerEventMessage msg) {
                             return;
                         }
 
-                        String actionName = mi.getName();
-                        if (!target.equalsIgnoreCase(actionName) && actionName.startsWith("set"))
-                            actionName = actionName.substring(3); //= "set".length()
-
                         if (target.equalsIgnoreCase(actionName)) {
                             Object request = !Utils.isNullOrEmpty(msg.getJson())
                                 ? JsonUtils.fromJson(msg.getJson(), requestType)
diff --git a/src/AndroidClient/client/src/test/java/net/servicestack/client/TestJavaScriptReceiver.java b/src/AndroidClient/client/src/test/java/net/servicestack/client/TestJavaScriptReceiver.java
@@ -31,9 +31,9 @@ public void announce(String message)
         AnnounceInstance = message;
     }
 
-    public void toggle(String message)
+    public void toggle()
     {
-        ToggleReceived = message;
+        ToggleReceived = "";
         ToggleRequestReceived = super.getRequest();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,9 @@ public void announce(String message)`
`31`	`31`	`AnnounceInstance = message;`
`32`	`32`	`}`
`33`	`33`
`34`		`- public void toggle(String message)`
	`34`	`+ public void toggle()`
`35`	`35`	`{`
`36`		`- ToggleReceived = message;`
	`36`	`+ ToggleReceived = "";`
`37`	`37`	`ToggleRequestReceived = super.getRequest();`
`38`	`38`	`}`
`39`	`39`