diff --git a/benchmark/pom.xml b/benchmark/pom.xml index 86379f1004..c188bb32ec 100644 --- a/benchmark/pom.xml +++ b/benchmark/pom.xml @@ -122,9 +122,9 @@ commons-lang3 - org.furyio + org.apache.fury fury-core - 0.4.1 + 0.5.0 org.msgpack diff --git a/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/along/AlongParseBinaryArrayMapping.java b/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/along/AlongParseBinaryArrayMapping.java index 6fb3bbd205..d30f6b1468 100644 --- a/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/along/AlongParseBinaryArrayMapping.java +++ b/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/along/AlongParseBinaryArrayMapping.java @@ -6,9 +6,9 @@ import com.alibaba.fastjson2.benchmark.along.vo.HarmDTO; import com.alibaba.fastjson2.benchmark.along.vo.SkillCategory; import com.alibaba.fastjson2.benchmark.along.vo.SkillFire_S2C_Msg; -import io.fury.Fury; -import io.fury.config.Language; import org.apache.commons.io.IOUtils; +import org.apache.fury.Fury; +import org.apache.fury.config.Language; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Mode; import org.openjdk.jmh.infra.Blackhole; diff --git a/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/along/AlongWriteBinaryArrayMapping.java b/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/along/AlongWriteBinaryArrayMapping.java index 43688ec558..e13ebdecbb 100644 --- a/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/along/AlongWriteBinaryArrayMapping.java +++ b/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/along/AlongWriteBinaryArrayMapping.java @@ -5,9 +5,9 @@ import com.alibaba.fastjson2.JSONReader; import com.alibaba.fastjson2.JSONWriter; import com.alibaba.fastjson2.benchmark.along.vo.SkillFire_S2C_Msg; -import io.fury.Fury; -import io.fury.config.Language; import org.apache.commons.io.IOUtils; +import org.apache.fury.Fury; +import org.apache.fury.config.Language; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Mode; import org.openjdk.jmh.infra.Blackhole; diff --git a/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayFuryCompatibleParse.java b/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayFuryCompatibleParse.java index 4c6147a43b..e8310d2a00 100644 --- a/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayFuryCompatibleParse.java +++ b/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayFuryCompatibleParse.java @@ -32,11 +32,11 @@ public class EishayFuryCompatibleParse { static byte[] jsonbBytes; static byte[] furyCompatibleBytes; - static io.fury.ThreadSafeFury furyCompatible = io.fury.Fury.builder() - .withLanguage(io.fury.config.Language.JAVA) + static org.apache.fury.ThreadSafeFury furyCompatible = org.apache.fury.Fury.builder() + .withLanguage(org.apache.fury.config.Language.JAVA) .withRefTracking(true) .requireClassRegistration(false) - .withCompatibleMode(io.fury.config.CompatibleMode.COMPATIBLE) + .withCompatibleMode(org.apache.fury.config.CompatibleMode.COMPATIBLE) .buildThreadSafeFury(); static { diff --git a/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayFuryCompatibleWrite.java b/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayFuryCompatibleWrite.java index 68a5ff1022..cae6d10459 100644 --- a/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayFuryCompatibleWrite.java +++ b/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayFuryCompatibleWrite.java @@ -2,9 +2,9 @@ import com.alibaba.fastjson2.*; import com.alibaba.fastjson2.benchmark.eishay.vo.MediaContent; -import io.fury.Fury; -import io.fury.ThreadSafeFury; import org.apache.commons.io.IOUtils; +import org.apache.fury.Fury; +import org.apache.fury.ThreadSafeFury; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Mode; import org.openjdk.jmh.infra.Blackhole; @@ -33,10 +33,10 @@ public class EishayFuryCompatibleWrite { ); static ThreadSafeFury furyCompatible = Fury.builder() - .withLanguage(io.fury.config.Language.JAVA) + .withLanguage(org.apache.fury.config.Language.JAVA) .withRefTracking(true) .requireClassRegistration(false) - .withCompatibleMode(io.fury.config.CompatibleMode.COMPATIBLE) + .withCompatibleMode(org.apache.fury.config.CompatibleMode.COMPATIBLE) .buildThreadSafeFury(); static { diff --git a/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayFuryParse.java b/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayFuryParse.java index 40646904f0..70c81cdd78 100644 --- a/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayFuryParse.java +++ b/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayFuryParse.java @@ -28,8 +28,8 @@ public class EishayFuryParse { static byte[] jsonbBytes; static byte[] furyBytes; - static io.fury.ThreadSafeFury fury = io.fury.Fury.builder() - .withLanguage(io.fury.config.Language.JAVA) + static org.apache.fury.ThreadSafeFury fury = org.apache.fury.Fury.builder() + .withLanguage(org.apache.fury.config.Language.JAVA) .requireClassRegistration(false) .withRefTracking(true) .buildThreadSafeFury(); diff --git a/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayFuryParseNoneCache.java b/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayFuryParseNoneCache.java index 188876befe..8ff0c9a7e9 100644 --- a/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayFuryParseNoneCache.java +++ b/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayFuryParseNoneCache.java @@ -36,8 +36,8 @@ public class EishayFuryParseNoneCache { static byte[][] furyBytes = new byte[COUNT][]; static int index; - static io.fury.ThreadSafeFury fury = io.fury.Fury.builder() - .withLanguage(io.fury.config.Language.JAVA) + static org.apache.fury.ThreadSafeFury fury = org.apache.fury.Fury.builder() + .withLanguage(org.apache.fury.config.Language.JAVA) .withRefTracking(true) .withClassLoader(classLoader) .buildThreadSafeFury(); diff --git a/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayFuryWrite.java b/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayFuryWrite.java index dc3a89f809..74392911f7 100644 --- a/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayFuryWrite.java +++ b/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayFuryWrite.java @@ -20,8 +20,8 @@ public class EishayFuryWrite { static MediaContent object; - static io.fury.ThreadSafeFury fury = io.fury.Fury.builder() - .withLanguage(io.fury.config.Language.JAVA) + static org.apache.fury.ThreadSafeFury fury = org.apache.fury.Fury.builder() + .withLanguage(org.apache.fury.config.Language.JAVA) .requireClassRegistration(false) .withRefTracking(true) .buildThreadSafeFury(); diff --git a/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayFuryWriteNoneCache.java b/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayFuryWriteNoneCache.java index fa3263e50c..87543b4776 100644 --- a/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayFuryWriteNoneCache.java +++ b/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayFuryWriteNoneCache.java @@ -23,8 +23,8 @@ public class EishayFuryWriteNoneCache { static final Object[] objects = new Object[classes.length]; static int index; - static io.fury.ThreadSafeFury fury = io.fury.Fury.builder() - .withLanguage(io.fury.config.Language.JAVA) + static org.apache.fury.ThreadSafeFury fury = org.apache.fury.Fury.builder() + .withLanguage(org.apache.fury.config.Language.JAVA) .withRefTracking(true) .buildThreadSafeFury(); diff --git a/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayParseBinaryArrayMapping.java b/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayParseBinaryArrayMapping.java index a9b503c26c..c8d2903730 100644 --- a/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayParseBinaryArrayMapping.java +++ b/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayParseBinaryArrayMapping.java @@ -11,9 +11,9 @@ import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; -import io.fury.Fury; -import io.fury.config.Language; import org.apache.commons.io.IOUtils; +import org.apache.fury.Fury; +import org.apache.fury.config.Language; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Mode; import org.openjdk.jmh.infra.Blackhole; diff --git a/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayWriteBinaryArrayMapping.java b/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayWriteBinaryArrayMapping.java index 45fe44025e..eebbe76cab 100644 --- a/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayWriteBinaryArrayMapping.java +++ b/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/EishayWriteBinaryArrayMapping.java @@ -9,9 +9,9 @@ import com.alibaba.fastjson2.benchmark.protobuf.MediaContentTransform; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.Output; -import io.fury.Fury; -import io.fury.config.Language; import org.apache.commons.io.IOUtils; +import org.apache.fury.Fury; +import org.apache.fury.config.Language; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Mode; import org.openjdk.jmh.infra.Blackhole; diff --git a/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/gen/EishayClassGen.java b/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/gen/EishayClassGen.java index 2a24aa9e8b..ffd0f00acc 100644 --- a/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/gen/EishayClassGen.java +++ b/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/eishay/gen/EishayClassGen.java @@ -289,8 +289,8 @@ public LinkedHashMap genCodes(int count) throws Exception { } public byte[][] genFuryBytes(int count) throws Exception { -// io.fury.ThreadSafeFury fury = io.fury.Fury.builder() -// .withLanguage(io.fury.Language.JAVA) +// org.apache.fury.ThreadSafeFury fury = org.apache.fury.Fury.builder() +// .withLanguage(org.apache.fury.Language.JAVA) // .withReferenceTracking(true) // .disableSecureMode() // .buildThreadSafeFury(); diff --git a/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/primitves/BigDecimal20.java b/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/primitves/BigDecimal20.java index 519712d795..ff60685b92 100644 --- a/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/primitves/BigDecimal20.java +++ b/benchmark/src/main/java/com/alibaba/fastjson2/benchmark/primitves/BigDecimal20.java @@ -35,11 +35,11 @@ public class BigDecimal20 { static byte[] hessianBytes; -// static io.fury.ThreadSafeFury furyCompatible = io.fury.Fury.builder() -// .withLanguage(io.fury.Language.JAVA) +// static org.apache.fury.ThreadSafeFury furyCompatible = org.apache.fury.Fury.builder() +// .withLanguage(org.apache.fury.Language.JAVA) // .withReferenceTracking(true) // .disableSecureMode() -// .withCompatibleMode(io.fury.serializers.CompatibleMode.COMPATIBLE) +// .withCompatibleMode(org.apache.fury.serializers.CompatibleMode.COMPATIBLE) // .buildThreadSafeFury(); // static byte[] furyCompatibleBytes; diff --git a/benchmark/src/test/java/com/alibaba/fastjson2/benchmark/KryoTest.java b/benchmark/src/test/java/com/alibaba/fastjson2/benchmark/KryoTest.java index 5ffa904d45..c8880ae0d5 100644 --- a/benchmark/src/test/java/com/alibaba/fastjson2/benchmark/KryoTest.java +++ b/benchmark/src/test/java/com/alibaba/fastjson2/benchmark/KryoTest.java @@ -14,11 +14,11 @@ public class KryoTest { Kryo kryo = new Kryo(); Output output = new Output(1024, -1); // -// static io.fury.ThreadSafeFury fury = io.fury.Fury.builder() -// .withLanguage(io.fury.Language.JAVA) +// static org.apache.fury.ThreadSafeFury fury = org.apache.fury.Fury.builder() +// .withLanguage(org.apache.fury.Language.JAVA) // .withReferenceTracking(true) // .disableSecureMode() -// .withCompatibleMode(io.fury.serializers.CompatibleMode.COMPATIBLE) +// .withCompatibleMode(org.apache.fury.serializers.CompatibleMode.COMPATIBLE) // .buildThreadSafeFury(); @Test diff --git a/benchmark/src/test/java/com/alibaba/fastjson2/benchmark/sonic/EishayFuryTest.java b/benchmark/src/test/java/com/alibaba/fastjson2/benchmark/sonic/EishayFuryTest.java index 7bd83b3f30..cd455c3122 100644 --- a/benchmark/src/test/java/com/alibaba/fastjson2/benchmark/sonic/EishayFuryTest.java +++ b/benchmark/src/test/java/com/alibaba/fastjson2/benchmark/sonic/EishayFuryTest.java @@ -39,11 +39,11 @@ public static void main(String[] args) throws Exception { MediaContent mediaContent = JSON.parseObject(str, MediaContent.class); // -// io.fury.ThreadSafeFury furyCompatible = io.fury.Fury.builder() -// .withLanguage(io.fury.Language.JAVA) +// org.apache.fury.ThreadSafeFury furyCompatible = org.apache.fury.Fury.builder() +// .withLanguage(org.apache.fury.Language.JAVA) // .withReferenceTracking(true) // .disableSecureMode() -// .withCompatibleMode(io.fury.serializers.CompatibleMode.COMPATIBLE) +// .withCompatibleMode(org.apache.fury.serializers.CompatibleMode.COMPATIBLE) // .buildThreadSafeFury(); // // byte[] furyBytes = furyCompatible.serialize(mediaContent);