From 0e591eaddb969aaea26eaed73deb3dcf2bdacca5 Mon Sep 17 00:00:00 2001 From: godotg Date: Sun, 3 Sep 2023 15:28:50 +0800 Subject: [PATCH] del[protocol]: deprecate protocolId() method --- net/src/main/java/com/zfoo/net/consumer/Consumer.java | 6 +++--- .../consumer/balancer/AbstractConsumerLoadBalancer.java | 4 ++-- .../balancer/ConsistentHashConsumerLoadBalancer.java | 2 +- .../net/consumer/balancer/RandomConsumerLoadBalancer.java | 2 +- net/src/main/java/com/zfoo/net/packet/common/Error.java | 2 +- net/src/main/java/com/zfoo/net/packet/common/Message.java | 2 +- .../src/main/java/com/zfoo/protocol/ProtocolManager.java | 7 +++++++ 7 files changed, 16 insertions(+), 9 deletions(-) diff --git a/net/src/main/java/com/zfoo/net/consumer/Consumer.java b/net/src/main/java/com/zfoo/net/consumer/Consumer.java index fbb17f6e..912dbf3b 100644 --- a/net/src/main/java/com/zfoo/net/consumer/Consumer.java +++ b/net/src/main/java/com/zfoo/net/consumer/Consumer.java @@ -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 SyncAnswer syncAsk(IPacket packet, Class 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 AsyncAnswer asyncAsk(IPacket packet, Class 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); diff --git a/net/src/main/java/com/zfoo/net/consumer/balancer/AbstractConsumerLoadBalancer.java b/net/src/main/java/com/zfoo/net/consumer/balancer/AbstractConsumerLoadBalancer.java index 4c462b4e..ba19d257 100644 --- a/net/src/main/java/com/zfoo/net/consumer/balancer/AbstractConsumerLoadBalancer.java +++ b/net/src/main/java/com/zfoo/net/consumer/balancer/AbstractConsumerLoadBalancer.java @@ -48,7 +48,7 @@ public abstract class AbstractConsumerLoadBalancer implements IConsumerLoadBalan } public List getSessionsByPacket(IPacket packet) { - return getSessionsByModule(ProtocolManager.moduleByProtocolId(ProtocolManager.protocolId(packet.getClass()))); + return getSessionsByModule(ProtocolManager.moduleByProtocol(packet.getClass())); } public List 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); } } diff --git a/net/src/main/java/com/zfoo/net/consumer/balancer/ConsistentHashConsumerLoadBalancer.java b/net/src/main/java/com/zfoo/net/consumer/balancer/ConsistentHashConsumerLoadBalancer.java index 5a6ff2ea..09b237a5 100644 --- a/net/src/main/java/com/zfoo/net/consumer/balancer/ConsistentHashConsumerLoadBalancer.java +++ b/net/src/main/java/com/zfoo/net/consumer/balancer/ConsistentHashConsumerLoadBalancer.java @@ -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); diff --git a/net/src/main/java/com/zfoo/net/consumer/balancer/RandomConsumerLoadBalancer.java b/net/src/main/java/com/zfoo/net/consumer/balancer/RandomConsumerLoadBalancer.java index 5e52c11a..113a554d 100644 --- a/net/src/main/java/com/zfoo/net/consumer/balancer/RandomConsumerLoadBalancer.java +++ b/net/src/main/java/com/zfoo/net/consumer/balancer/RandomConsumerLoadBalancer.java @@ -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()) { diff --git a/net/src/main/java/com/zfoo/net/packet/common/Error.java b/net/src/main/java/com/zfoo/net/packet/common/Error.java index 94d3925a..15f9c781 100644 --- a/net/src/main/java/com/zfoo/net/packet/common/Error.java +++ b/net/src/main/java/com/zfoo/net/packet/common/Error.java @@ -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; diff --git a/net/src/main/java/com/zfoo/net/packet/common/Message.java b/net/src/main/java/com/zfoo/net/packet/common/Message.java index a1a06ffa..978dab15 100644 --- a/net/src/main/java/com/zfoo/net/packet/common/Message.java +++ b/net/src/main/java/com/zfoo/net/packet/common/Message.java @@ -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; diff --git a/protocol/src/main/java/com/zfoo/protocol/ProtocolManager.java b/protocol/src/main/java/com/zfoo/protocol/ProtocolManager.java index 64ed5ba9..015a37ef 100644 --- a/protocol/src/main/java/com/zfoo/protocol/ProtocolManager.java +++ b/protocol/src/main/java/com/zfoo/protocol/ProtocolManager.java @@ -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