From 92ef169b6d5fb3360ccf0a31aeca9820dfc82434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E6=98=BE=E4=BC=98?= <237809796@qq.com> Date: Thu, 4 Nov 2021 19:03:23 +0800 Subject: [PATCH] . --- src/com/zdemo/AbstractConsumer.java | 2 +- src/com/zdemo/IConsumer.java | 4 ---- src/com/zdemo/IType.java | 21 +++++++++++++++++++++ test/com/zdemo/test/HelloService.java | 6 +++--- 4 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 src/com/zdemo/IType.java diff --git a/src/com/zdemo/AbstractConsumer.java b/src/com/zdemo/AbstractConsumer.java index a15e4b7..661d165 100644 --- a/src/com/zdemo/AbstractConsumer.java +++ b/src/com/zdemo/AbstractConsumer.java @@ -61,7 +61,7 @@ public abstract class AbstractConsumer implements IConsumer { protected abstract void subscribe(String topic); public void subscribe(String topic, Consumer consumer) { - subscribe(topic, TYPE_TOKEN_STRING, consumer); + subscribe(topic, IType.STRING, consumer); } @Override diff --git a/src/com/zdemo/IConsumer.java b/src/com/zdemo/IConsumer.java index 4913e73..60126ca 100644 --- a/src/com/zdemo/IConsumer.java +++ b/src/com/zdemo/IConsumer.java @@ -5,10 +5,6 @@ import org.redkale.util.TypeToken; import java.util.function.Consumer; public interface IConsumer { - TypeToken TYPE_TOKEN_STRING = new TypeToken() { - }; - TypeToken TYPE_TOKEN_INT = new TypeToken() { - }; /** * 取消订阅 diff --git a/src/com/zdemo/IType.java b/src/com/zdemo/IType.java new file mode 100644 index 0000000..a8526f7 --- /dev/null +++ b/src/com/zdemo/IType.java @@ -0,0 +1,21 @@ +package com.zdemo; + +import org.redkale.util.TypeToken; + +import java.util.List; +import java.util.Map; + +public interface IType { + + TypeToken STRING = new TypeToken() { + }; + + TypeToken INT = new TypeToken() { + }; + + TypeToken> MAP = new TypeToken>() { + }; + + TypeToken>> LMAP = new TypeToken>>() { + }; +} diff --git a/test/com/zdemo/test/HelloService.java b/test/com/zdemo/test/HelloService.java index 2091cc9..9e46d6e 100644 --- a/test/com/zdemo/test/HelloService.java +++ b/test/com/zdemo/test/HelloService.java @@ -1,6 +1,6 @@ package com.zdemo.test; -import com.zdemo.IConsumer; +import com.zdemo.IType; import com.zdemo.zhub.RpcResult; import com.zdemo.zhub.ZHubClient; import org.redkale.net.http.RestMapping; @@ -91,12 +91,12 @@ public class HelloService implements Service { //System.out.println(x.getResult().get("v")); } - return zhub.rpc("x", v, IConsumer.TYPE_TOKEN_STRING); + return zhub.rpc("x", v, IType.STRING); } @RestMapping public RpcResult d(String v) { - RpcResult rpc = zhub.rpc("x", v, IConsumer.TYPE_TOKEN_STRING); + RpcResult rpc = zhub.rpc("x", v, IType.STRING); return rpc; }