Skip to content

fix: Completely remove the dependency of fastjson1 #334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
3424672656 wants to merge 1 commit into from
Closed

fix: Completely remove the dependency of fastjson1 #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions dledger/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,17 @@
<dependency>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-remoting</artifactId>
<exclusions>
<exclusion>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
<version>2.0.59</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
2 changes: 1 addition & 1 deletion dledger/src/main/java/io/openmessaging/storage/dledger/DLedgerEntryPusher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion dledger/src/main/java/io/openmessaging/storage/dledger/DLedgerLeaderElector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion dledger/src/main/java/io/openmessaging/storage/dledger/DLedgerRpcNettyService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...r/src/main/java/io/openmessaging/storage/dledger/client/DLedgerClientRpcNettyService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion dledger/src/main/java/io/openmessaging/storage/dledger/snapshot/file/FileSnapshotReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion dledger/src/main/java/io/openmessaging/storage/dledger/snapshot/file/FileSnapshotWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion dledger/src/test/java/io/openmessaging/storage/dledger/snapshot/SnapshotManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
3 changes: 1 addition & 2 deletions dledger/src/test/java/io/openmessaging/storage/dledger/snapshot/SnapshotReaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -9,7 +9,6 @@

import java.io.File;
import java.io.IOException;
import java.util.UUID;

public class SnapshotReaderTest {

Expand Down
1 change: 0 additions & 1 deletion dledger/src/test/java/io/openmessaging/storage/dledger/snapshot/SnapshotStoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion dledger/src/test/java/io/openmessaging/storage/dledger/snapshot/SnapshotWriterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...r/src/test/java/io/openmessaging/storage/dledger/statemachine/StateMachineCallerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion example/src/main/java/io/openmessaging/storage/dledger/example/appender/AppenderDLedger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/io/openmessaging/storage/dledger/example/appender/command/AppendCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...e/src/main/java/io/openmessaging/storage/dledger/example/appender/command/GetCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...va/io/openmessaging/storage/dledger/example/common/command/LeadershipTransferCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/io/openmessaging/storage/dledger/example/common/command/ReadFileCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/io/openmessaging/storage/dledger/example/register/command/ReadCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<slf4j-simple.version>1.7.36</slf4j-simple.version>
<snakeyaml.version>1.30</snakeyaml.version>
<jcommander.version>1.72</jcommander.version>
<rocketmq-remoting.version>5.1.0</rocketmq-remoting.version>
<rocketmq-remoting.version>5.5.0</rocketmq-remoting.version>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
<commons-lang3.version>3.18.0</commons-lang3.version>
<opentelemetry.version>1.26.0</opentelemetry.version>
Expand Down
Loading