From a54eea30b8f881f0c7a6948bb75f0fb5a716df35 Mon Sep 17 00:00:00 2001 From: Lo1nt Date: Thu, 11 Jan 2024 17:01:58 +0800 Subject: [PATCH] add dep fury --- all/pom.xml | 6 ++++++ .../com/alipay/sofa/rpc/codec/fury/FurySerializer.java | 9 +++------ .../codec/fury/serialize/SofaRequestFurySerializer.java | 6 +++--- .../codec/fury/serialize/SofaResponseFurySerializer.java | 6 +++--- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/all/pom.xml b/all/pom.xml index 880e138ff..c4ce304bb 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -73,6 +73,7 @@ 1.53.0 32.0.0-jre 2.12.1 + 0.4.1 @@ -434,6 +435,11 @@ asm ${asm.version} + + org.furyio + fury-core + ${fury.version} + diff --git a/codec/codec-sofa-fury/src/main/java/com/alipay/sofa/rpc/codec/fury/FurySerializer.java b/codec/codec-sofa-fury/src/main/java/com/alipay/sofa/rpc/codec/fury/FurySerializer.java index e1a61a6fd..16605d9d3 100644 --- a/codec/codec-sofa-fury/src/main/java/com/alipay/sofa/rpc/codec/fury/FurySerializer.java +++ b/codec/codec-sofa-fury/src/main/java/com/alipay/sofa/rpc/codec/fury/FurySerializer.java @@ -32,6 +32,7 @@ import com.alipay.sofa.rpc.transport.ByteArrayWrapperByteBuf; import io.fury.Fury; import io.fury.ThreadLocalFury; +import io.fury.ThreadSafeFury; import io.fury.config.Language; import io.fury.memory.MemoryBuffer; import io.fury.resolver.AllowListChecker; @@ -47,9 +48,9 @@ @Extension(value = "fury2", code = 22) public class FurySerializer extends AbstractSerializer { - private final ThreadLocalFury fury; + protected final ThreadSafeFury fury; - private final String checkerMode = SofaConfigs.getOrDefault(RpcConfigKeys.SERIALIZE_CHECKER_MODE); + private final String checkerMode = SofaConfigs.getOrDefault(RpcConfigKeys.SERIALIZE_CHECKER_MODE); public FurySerializer() { fury = new ThreadLocalFury(classLoader -> { @@ -175,8 +176,4 @@ public void decode(final AbstractByteBuf data, final Object template, final Map< } } - public ThreadLocalFury getFury() { - return fury; - } - } diff --git a/codec/codec-sofa-fury/src/main/java/com/alipay/sofa/rpc/codec/fury/serialize/SofaRequestFurySerializer.java b/codec/codec-sofa-fury/src/main/java/com/alipay/sofa/rpc/codec/fury/serialize/SofaRequestFurySerializer.java index 9122c0c18..eca26140e 100644 --- a/codec/codec-sofa-fury/src/main/java/com/alipay/sofa/rpc/codec/fury/serialize/SofaRequestFurySerializer.java +++ b/codec/codec-sofa-fury/src/main/java/com/alipay/sofa/rpc/codec/fury/serialize/SofaRequestFurySerializer.java @@ -23,7 +23,7 @@ import com.alipay.sofa.rpc.core.request.SofaRequest; import com.alipay.sofa.rpc.transport.AbstractByteBuf; import com.alipay.sofa.rpc.transport.ByteArrayWrapperByteBuf; -import io.fury.ThreadLocalFury; +import io.fury.ThreadSafeFury; import io.fury.memory.MemoryBuffer; import java.util.Map; @@ -34,9 +34,9 @@ */ public class SofaRequestFurySerializer implements CustomSerializer { - private final ThreadLocalFury fury; + private final ThreadSafeFury fury; - public SofaRequestFurySerializer(ThreadLocalFury fury) { + public SofaRequestFurySerializer(ThreadSafeFury fury) { this.fury = fury; } diff --git a/codec/codec-sofa-fury/src/main/java/com/alipay/sofa/rpc/codec/fury/serialize/SofaResponseFurySerializer.java b/codec/codec-sofa-fury/src/main/java/com/alipay/sofa/rpc/codec/fury/serialize/SofaResponseFurySerializer.java index 9a7402ab1..0ba157324 100644 --- a/codec/codec-sofa-fury/src/main/java/com/alipay/sofa/rpc/codec/fury/serialize/SofaResponseFurySerializer.java +++ b/codec/codec-sofa-fury/src/main/java/com/alipay/sofa/rpc/codec/fury/serialize/SofaResponseFurySerializer.java @@ -22,7 +22,7 @@ import com.alipay.sofa.rpc.core.response.SofaResponse; import com.alipay.sofa.rpc.transport.AbstractByteBuf; import com.alipay.sofa.rpc.transport.ByteArrayWrapperByteBuf; -import io.fury.ThreadLocalFury; +import io.fury.ThreadSafeFury; import io.fury.memory.MemoryBuffer; import java.util.Map; @@ -33,9 +33,9 @@ */ public class SofaResponseFurySerializer implements CustomSerializer { - private final ThreadLocalFury fury; + private final ThreadSafeFury fury; - public SofaResponseFurySerializer(ThreadLocalFury fury) { + public SofaResponseFurySerializer(ThreadSafeFury fury) { this.fury = fury; }