lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Redkale
2016-08-30 14:22:11 +08:00
parent 90361edba1
commit 1421b83e49
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/org/redkale/net/http/WebSocketNode.java
View File

@@ -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<InetSocketAddress> 为 sncpnode 的集合
@@ -58,16 +58,16 @@ public abstract class WebSocketNode {
});
}
protected abstract List<String> getOnlineRemoteAddresses(@DynTargetAddress InetSocketAddress targetAddress, Serializable groupid);
protected abstract List<String> 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<String> remoteOnlineRemoteAddresses(@DynTargetAddress InetSocketAddress targetAddress, Serializable groupid) {
protected List<String> remoteOnlineRemoteAddresses(@RpcTargetAddress InetSocketAddress targetAddress, Serializable groupid) {
if (remoteNode == null) return null;
try {
return remoteNode.getOnlineRemoteAddresses(targetAddress, groupid);

2
src/org/redkale/net/sncp/Sncp.java
View File

@@ -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) {

4
src/org/redkale/net/sncp/SncpClient.java
View File

@@ -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;
}
}

2
src/org/redkale/service/DynRemote.java → src/org/redkale/service/RpcRemote.java
View File

@@ -19,6 +19,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
@Documented
@Target({FIELD})
@Retention(RUNTIME)
public @interface DynRemote {
public @interface RpcRemote {
}

2
src/org/redkale/service/DynSourceAddress.java → src/org/redkale/service/RpcSourceAddress.java
View File

@@ -20,6 +20,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
@Documented
@Target({PARAMETER})
@Retention(RUNTIME)
public @interface DynSourceAddress {
public @interface RpcSourceAddress {
}

2
src/org/redkale/service/DynTargetAddress.java → src/org/redkale/service/RpcTargetAddress.java
View File

@@ -20,6 +20,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
@Documented
@Target({PARAMETER})
@Retention(RUNTIME)
public @interface DynTargetAddress {
public @interface RpcTargetAddress {
}

4
src/org/redkale/service/WebSocketNodeService.java
View File

@@ -34,7 +34,7 @@ public class WebSocketNodeService extends WebSocketNode implements Service {
}
@Override
public List<String> getOnlineRemoteAddresses(@DynTargetAddress InetSocketAddress targetAddress, Serializable groupid) {
public List<String> getOnlineRemoteAddresses(@RpcTargetAddress InetSocketAddress targetAddress, Serializable groupid) {
if (localSncpAddress == null || !localSncpAddress.equals(targetAddress)) return remoteOnlineRemoteAddresses(targetAddress, groupid);
final Set<String> 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<String> engineids = localNodes.get(groupid);
if (engineids == null || engineids.isEmpty()) return RETCODE_GROUP_EMPTY;
int code = RETCODE_GROUP_EMPTY;