From 68dc4f37350dbc9ea3602c3ddc4ed24c55677d65 Mon Sep 17 00:00:00 2001 From: godotg Date: Sun, 10 Sep 2023 13:24:28 +0800 Subject: [PATCH] del[net]: delete SignalOnlyAttachment --- .../com/zfoo/net/packet/PacketService.java | 18 +++++++++++------- .../router/attachment/GatewayAttachment.java | 7 ------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/net/src/main/java/com/zfoo/net/packet/PacketService.java b/net/src/main/java/com/zfoo/net/packet/PacketService.java index 5cbc1cc4..f7a0da92 100644 --- a/net/src/main/java/com/zfoo/net/packet/PacketService.java +++ b/net/src/main/java/com/zfoo/net/packet/PacketService.java @@ -13,7 +13,7 @@ package com.zfoo.net.packet; import com.zfoo.net.NetContext; -import com.zfoo.net.router.attachment.SignalOnlyAttachment; +import com.zfoo.net.router.attachment.SignalAttachment; import com.zfoo.net.router.route.PacketBus; import com.zfoo.protocol.ProtocolManager; import com.zfoo.protocol.buffer.ByteBufUtils; @@ -71,12 +71,16 @@ public class PacketService implements IPacketService { public static final String NET_COMMON_MODULE = "common"; - private final Predicate netGenerateProtocolFilter = registration - -> ProtocolManager.moduleByModuleId(registration.module()).getName().matches(NET_COMMON_MODULE) - || registration.protocolConstructor().getDeclaringClass() == SignalOnlyAttachment.class - || registration.protocolConstructor().getDeclaringClass().getSimpleName().endsWith(NET_REQUEST_SUFFIX) - || registration.protocolConstructor().getDeclaringClass().getSimpleName().endsWith(NET_RESPONSE_SUFFIX) - || registration.protocolConstructor().getDeclaringClass().getSimpleName().endsWith(NET_NOTICE_SUFFIX); + private final Predicate netGenerateProtocolFilter = it -> { + var clazz = it.protocolConstructor().getDeclaringClass(); + var className = clazz.getSimpleName(); + var module = ProtocolManager.moduleByModuleId(it.module()); + return clazz == SignalAttachment.class + || className.endsWith(NET_REQUEST_SUFFIX) + || className.endsWith(NET_RESPONSE_SUFFIX) + || className.endsWith(NET_NOTICE_SUFFIX) + || module.getName().matches(NET_COMMON_MODULE); + }; public PacketService() { diff --git a/net/src/main/java/com/zfoo/net/router/attachment/GatewayAttachment.java b/net/src/main/java/com/zfoo/net/router/attachment/GatewayAttachment.java index 4e1bf4ce..3dffe543 100644 --- a/net/src/main/java/com/zfoo/net/router/attachment/GatewayAttachment.java +++ b/net/src/main/java/com/zfoo/net/router/attachment/GatewayAttachment.java @@ -128,11 +128,4 @@ public class GatewayAttachment { this.signalAttachment = signalAttachment; } - public SignalOnlyAttachment getSignalOnlyAttachment() { - return signalOnlyAttachment; - } - - public void setSignalOnlyAttachment(SignalOnlyAttachment signalOnlyAttachment) { - this.signalOnlyAttachment = signalOnlyAttachment; - } }