mirror of
https://github.com/tiennm99/zfoo.git
synced 2026-10-14 08:18:50 +00:00
del[protocol]: deprecate protocolId() method
This commit is contained in:
1 parent
7c1f3ffdc0
commit
0e591eaddb
7 files changed
+16
-9
No files matched your search
@@ -74,7 +74,7 @@ public class Consumer implements IConsumer {
|
|||||||
@Override
|
@Override
|
||||||
public void send(IPacket packet, Object argument) {
|
public void send(IPacket packet, Object argument) {
|
||||||
try {
|
try {
|
||||||
var loadBalancer = loadBalancer(ProtocolManager.moduleByProtocolId(ProtocolManager.protocolId(packet.getClass())));
|
var loadBalancer = loadBalancer(ProtocolManager.moduleByProtocol(packet.getClass()));
|
||||||
var session = loadBalancer.loadBalancer(packet, argument);
|
var session = loadBalancer.loadBalancer(packet, argument);
|
||||||
var taskExecutorHash = TaskBus.calTaskExecutorHash(argument);
|
var taskExecutorHash = TaskBus.calTaskExecutorHash(argument);
|
||||||
NetContext.getRouter().send(session, packet, NoAnswerAttachment.valueOf(taskExecutorHash));
|
NetContext.getRouter().send(session, packet, NoAnswerAttachment.valueOf(taskExecutorHash));
|
||||||
@@ -85,7 +85,7 @@ public class Consumer implements IConsumer {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public <T extends IPacket> SyncAnswer<T> syncAsk(IPacket packet, Class<T> answerClass, Object argument) throws Exception {
|
public <T extends IPacket> SyncAnswer<T> syncAsk(IPacket packet, Class<T> answerClass, Object argument) throws Exception {
|
||||||
var loadBalancer = loadBalancer(ProtocolManager.moduleByProtocolId(ProtocolManager.protocolId(packet.getClass())));
|
var loadBalancer = loadBalancer(ProtocolManager.moduleByProtocol(packet.getClass()));
|
||||||
var session = loadBalancer.loadBalancer(packet, argument);
|
var session = loadBalancer.loadBalancer(packet, argument);
|
||||||
|
|
||||||
|
|
||||||
@@ -124,7 +124,7 @@ public class Consumer implements IConsumer {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public <T extends IPacket> AsyncAnswer<T> asyncAsk(IPacket packet, Class<T> answerClass, Object argument) {
|
public <T extends IPacket> AsyncAnswer<T> asyncAsk(IPacket packet, Class<T> answerClass, Object argument) {
|
||||||
var loadBalancer = loadBalancer(ProtocolManager.moduleByProtocolId(ProtocolManager.protocolId(packet.getClass())));
|
var loadBalancer = loadBalancer(ProtocolManager.moduleByProtocol(packet.getClass()));
|
||||||
var session = loadBalancer.loadBalancer(packet, argument);
|
var session = loadBalancer.loadBalancer(packet, argument);
|
||||||
var asyncAnswer = NetContext.getRouter().asyncAsk(session, packet, answerClass, argument);
|
var asyncAnswer = NetContext.getRouter().asyncAsk(session, packet, answerClass, argument);
|
||||||
|
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ public abstract class AbstractConsumerLoadBalancer implements IConsumerLoadBalan
|
|||||||
}
|
}
|
||||||
|
|
||||||
public List<Session> getSessionsByPacket(IPacket packet) {
|
public List<Session> getSessionsByPacket(IPacket packet) {
|
||||||
return getSessionsByModule(ProtocolManager.moduleByProtocolId(ProtocolManager.protocolId(packet.getClass())));
|
return getSessionsByModule(ProtocolManager.moduleByProtocol(packet.getClass()));
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<Session> getSessionsByModule(ProtocolModule module) {
|
public List<Session> getSessionsByModule(ProtocolModule module) {
|
||||||
@@ -79,7 +79,7 @@ public abstract class AbstractConsumerLoadBalancer implements IConsumerLoadBalan
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
var module = ProtocolManager.moduleByProtocolId(ProtocolManager.protocolId(packet.getClass()));
|
var module = ProtocolManager.moduleByProtocol(packet.getClass());
|
||||||
return registerVO.getProviderConfig().getProviders().contains(module);
|
return registerVO.getProviderConfig().getProviders().contains(module);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+1
-1
@@ -79,7 +79,7 @@ public class ConsistentHashConsumerLoadBalancer extends AbstractConsumerLoadBala
|
|||||||
lastClientSessionChangeId = currentClientSessionChangeId;
|
lastClientSessionChangeId = currentClientSessionChangeId;
|
||||||
}
|
}
|
||||||
|
|
||||||
var module = ProtocolManager.moduleByProtocolId(ProtocolManager.protocolId(packet.getClass()));
|
var module = ProtocolManager.moduleByProtocol(packet.getClass());
|
||||||
var fastTreeMap = consistentHashMap.get(module.getId());
|
var fastTreeMap = consistentHashMap.get(module.getId());
|
||||||
if (fastTreeMap == null) {
|
if (fastTreeMap == null) {
|
||||||
fastTreeMap = updateModuleToConsistentHash(module);
|
fastTreeMap = updateModuleToConsistentHash(module);
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ public class RandomConsumerLoadBalancer extends AbstractConsumerLoadBalancer {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Session loadBalancer(IPacket packet, Object argument) {
|
public Session loadBalancer(IPacket packet, Object argument) {
|
||||||
var module = ProtocolManager.moduleByProtocolId(ProtocolManager.protocolId(packet.getClass()));
|
var module = ProtocolManager.moduleByProtocol(packet.getClass());
|
||||||
var sessions = getSessionsByModule(module);
|
var sessions = getSessionsByModule(module);
|
||||||
|
|
||||||
if (sessions.isEmpty()) {
|
if (sessions.isEmpty()) {
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ public class Error implements IPacket {
|
|||||||
|
|
||||||
public static Error valueOf(IPacket packet, int errorCode, String errorMessage) {
|
public static Error valueOf(IPacket packet, int errorCode, String errorMessage) {
|
||||||
Error response = new Error();
|
Error response = new Error();
|
||||||
response.module = ProtocolManager.getProtocol(ProtocolManager.protocolId(packet.getClass())).module();
|
response.module = ProtocolManager.getProtocol(packet.getClass()).module();
|
||||||
response.errorCode = errorCode;
|
response.errorCode = errorCode;
|
||||||
response.errorMessage = errorMessage;
|
response.errorMessage = errorMessage;
|
||||||
return response;
|
return response;
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ public class Message implements IPacket {
|
|||||||
|
|
||||||
public static Message valueOf(IPacket packet, int code, String message) {
|
public static Message valueOf(IPacket packet, int code, String message) {
|
||||||
var mess = new Message();
|
var mess = new Message();
|
||||||
mess.module = ProtocolManager.moduleByProtocolId(ProtocolManager.protocolId(packet.getClass())).getId();
|
mess.module = ProtocolManager.moduleByProtocol(packet.getClass()).getId();
|
||||||
mess.code = code;
|
mess.code = code;
|
||||||
mess.message = message;
|
mess.message = message;
|
||||||
return mess;
|
return mess;
|
||||||
|
|||||||
@@ -75,9 +75,16 @@ public class ProtocolManager {
|
|||||||
return protocols[protocolId];
|
return protocols[protocolId];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static IProtocolRegistration getProtocol(Class<?> protocolClass) {
|
||||||
|
return getProtocol(protocolId(protocolClass));
|
||||||
|
}
|
||||||
|
|
||||||
public static ProtocolModule moduleByProtocolId(short id) {
|
public static ProtocolModule moduleByProtocolId(short id) {
|
||||||
return modules[protocols[id].module()];
|
return modules[protocols[id].module()];
|
||||||
}
|
}
|
||||||
|
public static ProtocolModule moduleByProtocol(Class<?> clazz) {
|
||||||
|
return moduleByProtocolId(protocolId(clazz));
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Find the module based on the module ID
|
* Find the module based on the module ID
|
||||||
|
|||||||
Reference in new issue
Block a user