diff --git a/dledger/pom.xml b/dledger/pom.xml index bb519545..26d32ad8 100644 --- a/dledger/pom.xml +++ b/dledger/pom.xml @@ -30,6 +30,17 @@ org.apache.rocketmq rocketmq-remoting + + + com.alibaba + fastjson + + + + + com.alibaba.fastjson2 + fastjson2 + 2.0.59 org.slf4j diff --git a/dledger/src/main/java/io/openmessaging/storage/dledger/DLedgerEntryPusher.java b/dledger/src/main/java/io/openmessaging/storage/dledger/DLedgerEntryPusher.java index 5682fd57..0c715659 100644 --- a/dledger/src/main/java/io/openmessaging/storage/dledger/DLedgerEntryPusher.java +++ b/dledger/src/main/java/io/openmessaging/storage/dledger/DLedgerEntryPusher.java @@ -16,7 +16,7 @@ package io.openmessaging.storage.dledger; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import io.openmessaging.storage.dledger.common.Closure; import io.openmessaging.storage.dledger.common.ShutdownAbleThread; import io.openmessaging.storage.dledger.common.Status; diff --git a/dledger/src/main/java/io/openmessaging/storage/dledger/DLedgerLeaderElector.java b/dledger/src/main/java/io/openmessaging/storage/dledger/DLedgerLeaderElector.java index e23bff61..e99eb429 100644 --- a/dledger/src/main/java/io/openmessaging/storage/dledger/DLedgerLeaderElector.java +++ b/dledger/src/main/java/io/openmessaging/storage/dledger/DLedgerLeaderElector.java @@ -16,7 +16,7 @@ package io.openmessaging.storage.dledger; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import io.openmessaging.storage.dledger.common.ShutdownAbleThread; import io.openmessaging.storage.dledger.protocol.DLedgerResponseCode; import io.openmessaging.storage.dledger.protocol.HeartBeatRequest; diff --git a/dledger/src/main/java/io/openmessaging/storage/dledger/DLedgerRpcNettyService.java b/dledger/src/main/java/io/openmessaging/storage/dledger/DLedgerRpcNettyService.java index c53fda36..1e93f363 100644 --- a/dledger/src/main/java/io/openmessaging/storage/dledger/DLedgerRpcNettyService.java +++ b/dledger/src/main/java/io/openmessaging/storage/dledger/DLedgerRpcNettyService.java @@ -16,7 +16,7 @@ package io.openmessaging.storage.dledger; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import io.netty.channel.ChannelHandlerContext; import io.openmessaging.storage.dledger.common.NamedThreadFactory; import io.openmessaging.storage.dledger.protocol.AppendEntryRequest; diff --git a/dledger/src/main/java/io/openmessaging/storage/dledger/client/DLedgerClientRpcNettyService.java b/dledger/src/main/java/io/openmessaging/storage/dledger/client/DLedgerClientRpcNettyService.java index 57d2a703..1664acaa 100644 --- a/dledger/src/main/java/io/openmessaging/storage/dledger/client/DLedgerClientRpcNettyService.java +++ b/dledger/src/main/java/io/openmessaging/storage/dledger/client/DLedgerClientRpcNettyService.java @@ -16,7 +16,7 @@ package io.openmessaging.storage.dledger.client; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import io.openmessaging.storage.dledger.protocol.AppendEntryRequest; import io.openmessaging.storage.dledger.protocol.AppendEntryResponse; import io.openmessaging.storage.dledger.protocol.DLedgerRequestCode; diff --git a/dledger/src/main/java/io/openmessaging/storage/dledger/snapshot/file/FileSnapshotReader.java b/dledger/src/main/java/io/openmessaging/storage/dledger/snapshot/file/FileSnapshotReader.java index cd4427c5..69fec25b 100644 --- a/dledger/src/main/java/io/openmessaging/storage/dledger/snapshot/file/FileSnapshotReader.java +++ b/dledger/src/main/java/io/openmessaging/storage/dledger/snapshot/file/FileSnapshotReader.java @@ -16,7 +16,7 @@ package io.openmessaging.storage.dledger.snapshot.file; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import io.openmessaging.storage.dledger.snapshot.DownloadSnapshot; import io.openmessaging.storage.dledger.snapshot.SnapshotManager; import io.openmessaging.storage.dledger.snapshot.SnapshotMeta; diff --git a/dledger/src/main/java/io/openmessaging/storage/dledger/snapshot/file/FileSnapshotWriter.java b/dledger/src/main/java/io/openmessaging/storage/dledger/snapshot/file/FileSnapshotWriter.java index 5009cdd3..20302bd0 100644 --- a/dledger/src/main/java/io/openmessaging/storage/dledger/snapshot/file/FileSnapshotWriter.java +++ b/dledger/src/main/java/io/openmessaging/storage/dledger/snapshot/file/FileSnapshotWriter.java @@ -16,7 +16,7 @@ package io.openmessaging.storage.dledger.snapshot.file; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import io.openmessaging.storage.dledger.snapshot.SnapshotManager; import io.openmessaging.storage.dledger.snapshot.SnapshotMeta; import io.openmessaging.storage.dledger.snapshot.SnapshotStatus; diff --git a/dledger/src/test/java/io/openmessaging/storage/dledger/snapshot/SnapshotManagerTest.java b/dledger/src/test/java/io/openmessaging/storage/dledger/snapshot/SnapshotManagerTest.java index f570d12d..4dd72205 100644 --- a/dledger/src/test/java/io/openmessaging/storage/dledger/snapshot/SnapshotManagerTest.java +++ b/dledger/src/test/java/io/openmessaging/storage/dledger/snapshot/SnapshotManagerTest.java @@ -1,6 +1,6 @@ package io.openmessaging.storage.dledger.snapshot; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import io.openmessaging.storage.dledger.DLedgerConfig; import io.openmessaging.storage.dledger.DLedgerServer; import io.openmessaging.storage.dledger.MemberState; diff --git a/dledger/src/test/java/io/openmessaging/storage/dledger/snapshot/SnapshotReaderTest.java b/dledger/src/test/java/io/openmessaging/storage/dledger/snapshot/SnapshotReaderTest.java index f538351b..2081019a 100644 --- a/dledger/src/test/java/io/openmessaging/storage/dledger/snapshot/SnapshotReaderTest.java +++ b/dledger/src/test/java/io/openmessaging/storage/dledger/snapshot/SnapshotReaderTest.java @@ -1,6 +1,6 @@ package io.openmessaging.storage.dledger.snapshot; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import io.openmessaging.storage.dledger.snapshot.file.FileSnapshotReader; import io.openmessaging.storage.dledger.util.FileTestUtil; import io.openmessaging.storage.dledger.utils.IOUtils; @@ -9,7 +9,6 @@ import java.io.File; import java.io.IOException; -import java.util.UUID; public class SnapshotReaderTest { diff --git a/dledger/src/test/java/io/openmessaging/storage/dledger/snapshot/SnapshotStoreTest.java b/dledger/src/test/java/io/openmessaging/storage/dledger/snapshot/SnapshotStoreTest.java index 51d61704..12f5b7ac 100644 --- a/dledger/src/test/java/io/openmessaging/storage/dledger/snapshot/SnapshotStoreTest.java +++ b/dledger/src/test/java/io/openmessaging/storage/dledger/snapshot/SnapshotStoreTest.java @@ -1,6 +1,5 @@ package io.openmessaging.storage.dledger.snapshot; -import com.alibaba.fastjson.JSON; import io.openmessaging.storage.dledger.snapshot.file.FileSnapshotStore; import io.openmessaging.storage.dledger.util.FileTestUtil; import io.openmessaging.storage.dledger.utils.IOUtils; diff --git a/dledger/src/test/java/io/openmessaging/storage/dledger/snapshot/SnapshotWriterTest.java b/dledger/src/test/java/io/openmessaging/storage/dledger/snapshot/SnapshotWriterTest.java index 21df4363..8a46cdb9 100644 --- a/dledger/src/test/java/io/openmessaging/storage/dledger/snapshot/SnapshotWriterTest.java +++ b/dledger/src/test/java/io/openmessaging/storage/dledger/snapshot/SnapshotWriterTest.java @@ -1,6 +1,6 @@ package io.openmessaging.storage.dledger.snapshot; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import io.openmessaging.storage.dledger.snapshot.file.FileSnapshotStore; import io.openmessaging.storage.dledger.snapshot.file.FileSnapshotWriter; import io.openmessaging.storage.dledger.util.FileTestUtil; diff --git a/dledger/src/test/java/io/openmessaging/storage/dledger/statemachine/StateMachineCallerTest.java b/dledger/src/test/java/io/openmessaging/storage/dledger/statemachine/StateMachineCallerTest.java index b9e5a0ac..ae35b077 100644 --- a/dledger/src/test/java/io/openmessaging/storage/dledger/statemachine/StateMachineCallerTest.java +++ b/dledger/src/test/java/io/openmessaging/storage/dledger/statemachine/StateMachineCallerTest.java @@ -16,6 +16,7 @@ package io.openmessaging.storage.dledger.statemachine; +import com.alibaba.fastjson2.JSON; import io.openmessaging.storage.dledger.common.Status; import io.openmessaging.storage.dledger.common.WriteClosure; import io.openmessaging.storage.dledger.common.WriteTask; @@ -25,7 +26,6 @@ import java.util.UUID; import java.util.concurrent.CountDownLatch; -import com.alibaba.fastjson.JSON; import io.openmessaging.storage.dledger.DLedgerConfig; import io.openmessaging.storage.dledger.DLedgerServer; import io.openmessaging.storage.dledger.MemberState; diff --git a/example/src/main/java/io/openmessaging/storage/dledger/example/appender/AppenderDLedger.java b/example/src/main/java/io/openmessaging/storage/dledger/example/appender/AppenderDLedger.java index cc3fad80..6785e74b 100644 --- a/example/src/main/java/io/openmessaging/storage/dledger/example/appender/AppenderDLedger.java +++ b/example/src/main/java/io/openmessaging/storage/dledger/example/appender/AppenderDLedger.java @@ -16,7 +16,7 @@ package io.openmessaging.storage.dledger.example.appender; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import io.openmessaging.storage.dledger.DLedgerConfig; import io.openmessaging.storage.dledger.proxy.DLedgerProxy; import java.util.Collections; diff --git a/example/src/main/java/io/openmessaging/storage/dledger/example/appender/command/AppendCommand.java b/example/src/main/java/io/openmessaging/storage/dledger/example/appender/command/AppendCommand.java index 4bce09ad..7959d489 100644 --- a/example/src/main/java/io/openmessaging/storage/dledger/example/appender/command/AppendCommand.java +++ b/example/src/main/java/io/openmessaging/storage/dledger/example/appender/command/AppendCommand.java @@ -16,7 +16,7 @@ package io.openmessaging.storage.dledger.example.appender.command; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import io.openmessaging.storage.dledger.client.DLedgerClient; diff --git a/example/src/main/java/io/openmessaging/storage/dledger/example/appender/command/GetCommand.java b/example/src/main/java/io/openmessaging/storage/dledger/example/appender/command/GetCommand.java index 87ebf407..283b5326 100644 --- a/example/src/main/java/io/openmessaging/storage/dledger/example/appender/command/GetCommand.java +++ b/example/src/main/java/io/openmessaging/storage/dledger/example/appender/command/GetCommand.java @@ -16,7 +16,7 @@ package io.openmessaging.storage.dledger.example.appender.command; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import io.openmessaging.storage.dledger.client.DLedgerClient; diff --git a/example/src/main/java/io/openmessaging/storage/dledger/example/common/command/LeadershipTransferCommand.java b/example/src/main/java/io/openmessaging/storage/dledger/example/common/command/LeadershipTransferCommand.java index 3b004f86..54d3b3e8 100644 --- a/example/src/main/java/io/openmessaging/storage/dledger/example/common/command/LeadershipTransferCommand.java +++ b/example/src/main/java/io/openmessaging/storage/dledger/example/common/command/LeadershipTransferCommand.java @@ -16,7 +16,7 @@ package io.openmessaging.storage.dledger.example.common.command; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import io.openmessaging.storage.dledger.client.DLedgerClient; diff --git a/example/src/main/java/io/openmessaging/storage/dledger/example/common/command/ReadFileCommand.java b/example/src/main/java/io/openmessaging/storage/dledger/example/common/command/ReadFileCommand.java index d7872672..ac9a9481 100644 --- a/example/src/main/java/io/openmessaging/storage/dledger/example/common/command/ReadFileCommand.java +++ b/example/src/main/java/io/openmessaging/storage/dledger/example/common/command/ReadFileCommand.java @@ -16,7 +16,7 @@ package io.openmessaging.storage.dledger.example.common.command; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import io.openmessaging.storage.dledger.entry.DLedgerEntry; diff --git a/example/src/main/java/io/openmessaging/storage/dledger/example/register/command/ReadCommand.java b/example/src/main/java/io/openmessaging/storage/dledger/example/register/command/ReadCommand.java index 924cbbab..ed1814b7 100644 --- a/example/src/main/java/io/openmessaging/storage/dledger/example/register/command/ReadCommand.java +++ b/example/src/main/java/io/openmessaging/storage/dledger/example/register/command/ReadCommand.java @@ -16,7 +16,7 @@ package io.openmessaging.storage.dledger.example.register.command; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import io.openmessaging.storage.dledger.common.ReadMode; diff --git a/pom.xml b/pom.xml index 061a743d..a2bd68eb 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ 1.7.36 1.30 1.72 - 5.1.0 + 5.5.0 jacoco 3.18.0 1.26.0