tiennm99/zfoo
1
0
Fork 0
mirror of https://github.com/tiennm99/zfoo.git synced 2026-05-18 19:26:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

del[protocol]: deprecate protocolId() method

Browse Source
This commit is contained in:
godotg
2023-09-03 15:28:50 +08:00
parent 7c1f3ffdc0
commit 0e591eaddb
7 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/src/main/java/com/zfoo/net/consumer/Consumer.java
+3 -3
View File
@@ -74,7 +74,7 @@ public class Consumer implements IConsumer {
@Override
public void send(IPacket packet, Object argument) {
try {
var loadBalancer = loadBalancer(ProtocolManager.moduleByProtocolId(ProtocolManager.protocolId(packet.getClass())));
var loadBalancer = loadBalancer(ProtocolManager.moduleByProtocol(packet.getClass()));
var session = loadBalancer.loadBalancer(packet, argument);
var taskExecutorHash = TaskBus.calTaskExecutorHash(argument);
NetContext.getRouter().send(session, packet, NoAnswerAttachment.valueOf(taskExecutorHash));
@@ -85,7 +85,7 @@ public class Consumer implements IConsumer {
@Override
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);
@@ -124,7 +124,7 @@ public class Consumer implements IConsumer {
@Override
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 asyncAnswer = NetContext.getRouter().asyncAsk(session, packet, answerClass, argument);
net/src/main/java/com/zfoo/net/consumer/balancer/AbstractConsumerLoadBalancer.java
+2 -2
View File
@@ -48,7 +48,7 @@ public abstract class AbstractConsumerLoadBalancer implements IConsumerLoadBalan
}
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) {
@@ -79,7 +79,7 @@ public abstract class AbstractConsumerLoadBalancer implements IConsumerLoadBalan
return false;
}
var module = ProtocolManager.moduleByProtocolId(ProtocolManager.protocolId(packet.getClass()));
var module = ProtocolManager.moduleByProtocol(packet.getClass());
return registerVO.getProviderConfig().getProviders().contains(module);
}
}
net/src/main/java/com/zfoo/net/consumer/balancer/ConsistentHashConsumerLoadBalancer.java
+1 -1
View File
@@ -79,7 +79,7 @@ public class ConsistentHashConsumerLoadBalancer extends AbstractConsumerLoadBala
lastClientSessionChangeId = currentClientSessionChangeId;
}
var module = ProtocolManager.moduleByProtocolId(ProtocolManager.protocolId(packet.getClass()));
var module = ProtocolManager.moduleByProtocol(packet.getClass());
var fastTreeMap = consistentHashMap.get(module.getId());
if (fastTreeMap == null) {
fastTreeMap = updateModuleToConsistentHash(module);
net/src/main/java/com/zfoo/net/consumer/balancer/RandomConsumerLoadBalancer.java
+1 -1
View File
@@ -38,7 +38,7 @@ public class RandomConsumerLoadBalancer extends AbstractConsumerLoadBalancer {
@Override
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);
if (sessions.isEmpty()) {
net/src/main/java/com/zfoo/net/packet/common/Error.java
+1 -1
View File
@@ -53,7 +53,7 @@ public class Error implements IPacket {
public static Error valueOf(IPacket packet, int errorCode, String errorMessage) {
Error response = new Error();
response.module = ProtocolManager.getProtocol(ProtocolManager.protocolId(packet.getClass())).module();
response.module = ProtocolManager.getProtocol(packet.getClass()).module();
response.errorCode = errorCode;
response.errorMessage = errorMessage;
return response;
net/src/main/java/com/zfoo/net/packet/common/Message.java
+1 -1
View File
@@ -47,7 +47,7 @@ public class Message implements IPacket {
public static Message valueOf(IPacket packet, int code, String 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.message = message;
return mess;
protocol/src/main/java/com/zfoo/protocol/ProtocolManager.java
+7
View File
@@ -75,9 +75,16 @@ public class ProtocolManager {
return protocols[protocolId];
}
public static IProtocolRegistration getProtocol(Class<?> protocolClass) {
return getProtocol(protocolId(protocolClass));
}
public static ProtocolModule moduleByProtocolId(short id) {
return modules[protocols[id].module()];
}
public static ProtocolModule moduleByProtocol(Class<?> clazz) {
return moduleByProtocolId(protocolId(clazz));
}
/**
* Find the module based on the module ID