diff --git a/src/com/zdemo/zhub/Rpc.java b/src/com/zdemo/zhub/Rpc.java index 0eff756..d251223 100644 --- a/src/com/zdemo/zhub/Rpc.java +++ b/src/com/zdemo/zhub/Rpc.java @@ -2,6 +2,7 @@ package com.zdemo.zhub; import org.redkale.convert.ConvertColumn; import org.redkale.convert.json.JsonConvert; +import org.redkale.service.RetResult; public class Rpc { private String ruk; // request unique key: @@ -13,7 +14,7 @@ public class Rpc { public Rpc() { } - public Rpc(String appname, String ruk, String topic, Object value) { + protected Rpc(String appname, String ruk, String topic, Object value) { this.ruk = appname + "::" + ruk; this.topic = topic; this.value = (T) JsonConvert.root().convertTo(value); @@ -57,12 +58,14 @@ public class Rpc { return ruk.split("::")[0]; } + @Deprecated(since = "2023.04.15") public RpcResult buildResp() { RpcResult response = new RpcResult<>(); response.setRuk(ruk); return response; } + @Deprecated(since = "2023.04.15") public RpcResult buildResp(int retcode, String retinfo) { RpcResult response = new RpcResult<>(); response.setRuk(ruk); @@ -71,6 +74,7 @@ public class Rpc { return response; } + @Deprecated(since = "2023.04.15") public RpcResult buildError(String retinfo) { RpcResult response = new RpcResult<>(); response.setRuk(ruk); @@ -79,10 +83,50 @@ public class Rpc { return response; } + @Deprecated(since = "2023.04.15") public RpcResult buildResp(R result) { RpcResult response = new RpcResult<>(); response.setRuk(ruk); response.setResult(result); return response; } + + public RpcResult render() { + RpcResult response = new RpcResult<>(); + response.setRuk(ruk); + return response; + } + + public RpcResult render(RetResult result) { + RpcResult resp = new RpcResult<>(); + resp.setRuk(ruk); + resp.setRetcode(result.getRetcode()); + resp.setRetinfo(result.getRetinfo()); + resp.setResult(result.getResult()); + return resp; + } + + public RpcResult render(R result) { + RpcResult response = new RpcResult<>(); + response.setRuk(ruk); + response.setResult(result); + return response; + } + + public RpcResult retError(String retinfo) { + RpcResult response = new RpcResult<>(); + response.setRuk(ruk); + response.setRetcode(100); + response.setRetinfo(retinfo); + return response; + } + + public RpcResult retError(int retcode, String retinfo) { + RpcResult response = new RpcResult<>(); + response.setRuk(ruk); + response.setRetcode(retcode); + response.setRetinfo(retinfo); + return response; + } + } diff --git a/src/com/zdemo/zhub/ZHubClient.java b/src/com/zdemo/zhub/ZHubClient.java index ca7b1fb..9a30e65 100644 --- a/src/com/zdemo/zhub/ZHubClient.java +++ b/src/com/zdemo/zhub/ZHubClient.java @@ -504,6 +504,7 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer send("timer", name); } + @Deprecated public void reloadTimer() { send("cmd", "reload-timer"); }