diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/Checksum.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/Checksum.java
index 7db1d2b0779b..4113f0a25dd7 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/Checksum.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/Checksum.java
@@ -162,11 +162,9 @@ public ChecksumData computeChecksum(ByteBuffer data)
       data = data.asReadOnlyBuffer();
     }
 
-    final ChecksumData checksumData = new ChecksumData(
-        checksumType, bytesPerChecksum);
     if (checksumType == ChecksumType.NONE) {
       // Since type is set to NONE, we do not need to compute the checksums
-      return checksumData;
+      return new ChecksumData(checksumType, bytesPerChecksum);
     }
 
     final Function<ByteBuffer, ByteString> function;
@@ -188,9 +186,7 @@ public ChecksumData computeChecksum(ByteBuffer data)
     for (int index = 0; index < numChecksums; index++) {
       checksumList.add(computeChecksum(data, function, bytesPerChecksum));
     }
-    checksumData.setChecksums(checksumList);
-
-    return checksumData;
+    return new ChecksumData(checksumType, bytesPerChecksum, checksumList);
   }
 
   /**
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/ChecksumData.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/ChecksumData.java
index 3658b40c929d..aea5c510661e 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/ChecksumData.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/ChecksumData.java
@@ -17,9 +17,9 @@
  */
 package org.apache.hadoop.ozone.common;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
+
+import java.util.Collections;
 import java.util.List;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
@@ -40,7 +40,7 @@ public class ChecksumData {
   private final List<ByteString> checksums;
 
   public ChecksumData(ChecksumType checksumType, int bytesPerChecksum) {
-    this(checksumType, bytesPerChecksum, Lists.newArrayList());
+    this(checksumType, bytesPerChecksum, Collections.emptyList());
   }
 
   public ChecksumData(ChecksumType checksumType, int bytesPerChecksum,
@@ -67,20 +67,10 @@ public int getBytesPerChecksum() {
   /**
    * Getter method for checksums.
    */
-  @VisibleForTesting
   public List<ByteString> getChecksums() {
     return this.checksums;
   }
 
-  /**
-   * Setter method for checksums.
-   * @param checksumList list of checksums
-   */
-  public void setChecksums(List<ByteString> checksumList) {
-    this.checksums.clear();
-    this.checksums.addAll(checksumList);
-  }
-
   /**
    * Construct the Checksum ProtoBuf message.
    * @return Checksum ProtoBuf message
@@ -105,14 +95,10 @@ public static ChecksumData getFromProtoBuf(
       ContainerProtos.ChecksumData checksumDataProto) {
     Preconditions.checkNotNull(checksumDataProto);
 
-    ChecksumData checksumData = new ChecksumData(
-        checksumDataProto.getType(), checksumDataProto.getBytesPerChecksum());
-
-    if (checksumDataProto.getChecksumsCount() != 0) {
-      checksumData.setChecksums(checksumDataProto.getChecksumsList());
-    }
-
-    return checksumData;
+    return new ChecksumData(
+        checksumDataProto.getType(),
+        checksumDataProto.getBytesPerChecksum(),
+        checksumDataProto.getChecksumsList());
   }
 
   /**