diff --git a/client/src/main/java/org/apache/uniffle/client/record/reader/RMRecordsReader.java b/client/src/main/java/org/apache/uniffle/client/record/reader/RMRecordsReader.java
index 83856bb2aa..311768d642 100644
--- a/client/src/main/java/org/apache/uniffle/client/record/reader/RMRecordsReader.java
+++ b/client/src/main/java/org/apache/uniffle/client/record/reader/RMRecordsReader.java
@@ -194,9 +194,9 @@ public int compare(K o1, K o2) {
 
   public void start() {
     for (int partitionId : partitionIds) {
-      mergeBuffers.put(partitionId, new Queue(maxBufferPerPartition));
+      mergeBuffers.put(partitionId, new Queue<>(maxBufferPerPartition));
       if (this.combiner != null) {
-        combineBuffers.put(partitionId, new Queue(maxBufferPerPartition));
+        combineBuffers.put(partitionId, new Queue<>(maxBufferPerPartition));
       }
       RecordsFetcher fetcher = new RecordsFetcher(partitionId);
       fetcher.start();
diff --git a/integration-test/common/src/test/java/org/apache/uniffle/test/RemoteMergeShuffleWithRssClientTest.java b/integration-test/common/src/test/java/org/apache/uniffle/test/RemoteMergeShuffleWithRssClientTest.java
index 8a892d9a64..29336daec6 100644
--- a/integration-test/common/src/test/java/org/apache/uniffle/test/RemoteMergeShuffleWithRssClientTest.java
+++ b/integration-test/common/src/test/java/org/apache/uniffle/test/RemoteMergeShuffleWithRssClientTest.java
@@ -641,7 +641,7 @@ public void remoteMergeWriteReadTestMultiPartition(String classes) throws Except
     Map<Integer, Set<Long>> ptb = new HashMap<>();
     for (int i = PARTITION_ID; i < PARTITION_ID + 3; i++) {
       final int partitionId = i;
-      ptb.put(partitionId, new HashSet());
+      ptb.put(partitionId, new HashSet<>());
       ptb.get(partitionId)
           .addAll(
               blocks1.stream()
@@ -854,7 +854,7 @@ public void remoteMergeWriteReadTestMultiPartitionWithCombine(String classes) th
     Map<Integer, Set<Long>> ptb = new HashMap<>();
     for (int i = PARTITION_ID; i < PARTITION_ID + 3; i++) {
       final int partitionId = i;
-      ptb.put(partitionId, new HashSet());
+      ptb.put(partitionId, new HashSet<>());
       ptb.get(partitionId)
           .addAll(
               blocks1.stream()
diff --git a/integration-test/common/src/test/java/org/apache/uniffle/test/RemoteMergeShuffleWithRssClientTestWhenShuffleFlushed.java b/integration-test/common/src/test/java/org/apache/uniffle/test/RemoteMergeShuffleWithRssClientTestWhenShuffleFlushed.java
index 2ab9f7b8fd..402d17ead9 100644
--- a/integration-test/common/src/test/java/org/apache/uniffle/test/RemoteMergeShuffleWithRssClientTestWhenShuffleFlushed.java
+++ b/integration-test/common/src/test/java/org/apache/uniffle/test/RemoteMergeShuffleWithRssClientTestWhenShuffleFlushed.java
@@ -655,7 +655,7 @@ public void remoteMergeWriteReadTestMultiPartition(String classes) throws Except
     Map<Integer, Set<Long>> ptb = new HashMap<>();
     for (int i = PARTITION_ID; i < PARTITION_ID + 3; i++) {
       final int partitionId = i;
-      ptb.put(partitionId, new HashSet());
+      ptb.put(partitionId, new HashSet<>());
       ptb.get(partitionId)
           .addAll(
               blocks1.stream()
@@ -869,7 +869,7 @@ public void remoteMergeWriteReadTestMultiPartitionWithCombine(String classes) th
     Map<Integer, Set<Long>> ptb = new HashMap<>();
     for (int i = PARTITION_ID; i < PARTITION_ID + 3; i++) {
       final int partitionId = i;
-      ptb.put(partitionId, new HashSet());
+      ptb.put(partitionId, new HashSet<>());
       ptb.get(partitionId)
           .addAll(
               blocks1.stream()