diff --git a/src/org/redkale/net/http/WebSocketNode.java b/src/org/redkale/net/http/WebSocketNode.java index 79d9dd3d7..2b472e0f3 100644 --- a/src/org/redkale/net/http/WebSocketNode.java +++ b/src/org/redkale/net/http/WebSocketNode.java @@ -33,7 +33,7 @@ public abstract class WebSocketNode { @Resource(name = Application.RESNAME_SERVER_ADDR) protected InetSocketAddress localSncpAddress; //为SncpServer的服务address - @DynRemote + @RpcRemote protected WebSocketNode remoteNode; //存放所有用户分布在节点上的队列信息,Set 为 sncpnode 的集合 @@ -58,16 +58,16 @@ public abstract class WebSocketNode { }); } - protected abstract List getOnlineRemoteAddresses(@DynTargetAddress InetSocketAddress targetAddress, Serializable groupid); + protected abstract List getOnlineRemoteAddresses(@RpcTargetAddress InetSocketAddress targetAddress, Serializable groupid); - protected abstract int sendMessage(@DynTargetAddress InetSocketAddress targetAddress, Serializable groupid, boolean recent, Serializable message, boolean last); + protected abstract int sendMessage(@RpcTargetAddress InetSocketAddress targetAddress, Serializable groupid, boolean recent, Serializable message, boolean last); protected abstract void connect(Serializable groupid, InetSocketAddress addr); protected abstract void disconnect(Serializable groupid, InetSocketAddress addr); //-------------------------------------------------------------------------------- - protected List remoteOnlineRemoteAddresses(@DynTargetAddress InetSocketAddress targetAddress, Serializable groupid) { + protected List remoteOnlineRemoteAddresses(@RpcTargetAddress InetSocketAddress targetAddress, Serializable groupid) { if (remoteNode == null) return null; try { return remoteNode.getOnlineRemoteAddresses(targetAddress, groupid); diff --git a/src/org/redkale/net/sncp/Sncp.java b/src/org/redkale/net/sncp/Sncp.java index e9b0279e9..f23e8d2f6 100644 --- a/src/org/redkale/net/sncp/Sncp.java +++ b/src/org/redkale/net/sncp/Sncp.java @@ -749,7 +749,7 @@ public abstract class Sncp { for (Field field : loop.getDeclaredFields()) { int mod = field.getModifiers(); if (Modifier.isFinal(mod) || Modifier.isStatic(mod)) continue; - if (field.getAnnotation(DynRemote.class) == null) continue; + if (field.getAnnotation(RpcRemote.class) == null) continue; if (!field.getType().isAssignableFrom(newClazz)) continue; field.setAccessible(true); if (remoteTransport == null) { diff --git a/src/org/redkale/net/sncp/SncpClient.java b/src/org/redkale/net/sncp/SncpClient.java index 4c168d179..3f2142338 100644 --- a/src/org/redkale/net/sncp/SncpClient.java +++ b/src/org/redkale/net/sncp/SncpClient.java @@ -69,9 +69,9 @@ public final class SncpClient { for (int i = 0; i < anns.length; i++) { if (anns[i].length > 0) { for (Annotation ann : anns[i]) { - if (ann.annotationType() == DynTargetAddress.class && SocketAddress.class.isAssignableFrom(params[i])) { + if (ann.annotationType() == RpcTargetAddress.class && SocketAddress.class.isAssignableFrom(params[i])) { targetAddrIndex = i; - } else if (ann.annotationType() == DynSourceAddress.class && SocketAddress.class.isAssignableFrom(params[i])) { + } else if (ann.annotationType() == RpcSourceAddress.class && SocketAddress.class.isAssignableFrom(params[i])) { sourceAddrIndex = i; } } diff --git a/src/org/redkale/service/DynRemote.java b/src/org/redkale/service/RpcRemote.java similarity index 90% rename from src/org/redkale/service/DynRemote.java rename to src/org/redkale/service/RpcRemote.java index c673b6881..e17424972 100644 --- a/src/org/redkale/service/DynRemote.java +++ b/src/org/redkale/service/RpcRemote.java @@ -19,6 +19,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; @Documented @Target({FIELD}) @Retention(RUNTIME) -public @interface DynRemote { +public @interface RpcRemote { } diff --git a/src/org/redkale/service/DynSourceAddress.java b/src/org/redkale/service/RpcSourceAddress.java similarity index 91% rename from src/org/redkale/service/DynSourceAddress.java rename to src/org/redkale/service/RpcSourceAddress.java index d5b6fcd42..294abce3f 100644 --- a/src/org/redkale/service/DynSourceAddress.java +++ b/src/org/redkale/service/RpcSourceAddress.java @@ -20,6 +20,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; @Documented @Target({PARAMETER}) @Retention(RUNTIME) -public @interface DynSourceAddress { +public @interface RpcSourceAddress { } diff --git a/src/org/redkale/service/DynTargetAddress.java b/src/org/redkale/service/RpcTargetAddress.java similarity index 91% rename from src/org/redkale/service/DynTargetAddress.java rename to src/org/redkale/service/RpcTargetAddress.java index 1edaa0ba2..b46dddaed 100644 --- a/src/org/redkale/service/DynTargetAddress.java +++ b/src/org/redkale/service/RpcTargetAddress.java @@ -20,6 +20,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; @Documented @Target({PARAMETER}) @Retention(RUNTIME) -public @interface DynTargetAddress { +public @interface RpcTargetAddress { } diff --git a/src/org/redkale/service/WebSocketNodeService.java b/src/org/redkale/service/WebSocketNodeService.java index e074eeeb9..a322c3368 100644 --- a/src/org/redkale/service/WebSocketNodeService.java +++ b/src/org/redkale/service/WebSocketNodeService.java @@ -34,7 +34,7 @@ public class WebSocketNodeService extends WebSocketNode implements Service { } @Override - public List getOnlineRemoteAddresses(@DynTargetAddress InetSocketAddress targetAddress, Serializable groupid) { + public List getOnlineRemoteAddresses(@RpcTargetAddress InetSocketAddress targetAddress, Serializable groupid) { if (localSncpAddress == null || !localSncpAddress.equals(targetAddress)) return remoteOnlineRemoteAddresses(targetAddress, groupid); final Set engineids = localNodes.get(groupid); if (engineids == null || engineids.isEmpty()) return null; @@ -49,7 +49,7 @@ public class WebSocketNodeService extends WebSocketNode implements Service { } @Override - public int sendMessage(@DynTargetAddress InetSocketAddress addr, Serializable groupid, boolean recent, Serializable message, boolean last) { + public int sendMessage(@RpcTargetAddress InetSocketAddress addr, Serializable groupid, boolean recent, Serializable message, boolean last) { final Set engineids = localNodes.get(groupid); if (engineids == null || engineids.isEmpty()) return RETCODE_GROUP_EMPTY; int code = RETCODE_GROUP_EMPTY;