diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/OMBucketCreateResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/OMBucketCreateResponse.java
index 9b24910875..3f800d395a 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/OMBucketCreateResponse.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/OMBucketCreateResponse.java
@@ -28,6 +28,9 @@
     .OMResponse;
 import org.apache.hadoop.hdds.utils.db.BatchOperation;
 
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
 /**
  * Response for CreateBucket request.
  */
@@ -35,8 +38,8 @@ public final class OMBucketCreateResponse extends OMClientResponse {
 
   private final OmBucketInfo omBucketInfo;
 
-  public OMBucketCreateResponse(OmBucketInfo omBucketInfo,
-      OMResponse omResponse) {
+  public OMBucketCreateResponse(@Nullable OmBucketInfo omBucketInfo,
+      @Nonnull OMResponse omResponse) {
     super(omResponse);
     this.omBucketInfo = omBucketInfo;
   }
@@ -56,6 +59,7 @@ public void addToDBBatch(OMMetadataManager omMetadataManager,
     }
   }
 
+  @Nullable
   public OmBucketInfo getOmBucketInfo() {
     return omBucketInfo;
   }
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/OMBucketDeleteResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/OMBucketDeleteResponse.java
index 5dd6cdf84f..0079851d2a 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/OMBucketDeleteResponse.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/OMBucketDeleteResponse.java
@@ -25,6 +25,9 @@
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
 import org.apache.hadoop.hdds.utils.db.BatchOperation;
 
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
 /**
  * Response for DeleteBucket request.
  */
@@ -35,7 +38,7 @@ public final class OMBucketDeleteResponse extends OMClientResponse {
 
   public OMBucketDeleteResponse(
       String volumeName, String bucketName,
-      OzoneManagerProtocolProtos.OMResponse omResponse) {
+      @Nonnull OzoneManagerProtocolProtos.OMResponse omResponse) {
     super(omResponse);
     this.volumeName = volumeName;
     this.bucketName = bucketName;
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/OMBucketSetPropertyResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/OMBucketSetPropertyResponse.java
index d5e88c6dbe..f9ce204675 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/OMBucketSetPropertyResponse.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/bucket/OMBucketSetPropertyResponse.java
@@ -27,14 +27,17 @@
     .OMResponse;
 import org.apache.hadoop.hdds.utils.db.BatchOperation;
 
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
 /**
  * Response for SetBucketProperty request.
  */
 public class OMBucketSetPropertyResponse extends OMClientResponse {
   private OmBucketInfo omBucketInfo;
 
-  public OMBucketSetPropertyResponse(OmBucketInfo omBucketInfo,
-      OMResponse omResponse) {
+  public OMBucketSetPropertyResponse(@Nullable OmBucketInfo omBucketInfo,
+      @Nonnull OMResponse omResponse) {
     super(omResponse);
     this.omBucketInfo = omBucketInfo;
   }
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMDirectoryCreateResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMDirectoryCreateResponse.java
index 474fda3f7b..2690dda1b3 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMDirectoryCreateResponse.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMDirectoryCreateResponse.java
@@ -29,6 +29,7 @@
 import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
 import java.io.IOException;
 
 /**
@@ -41,7 +42,7 @@ public class OMDirectoryCreateResponse extends OMClientResponse {
   private OmKeyInfo dirKeyInfo;
 
   public OMDirectoryCreateResponse(@Nullable OmKeyInfo dirKeyInfo,
-      OMResponse omResponse) {
+      @Nonnull OMResponse omResponse) {
     super(omResponse);
     this.dirKeyInfo = dirKeyInfo;
   }
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMFileCreateResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMFileCreateResponse.java
index 0354b8498e..8da7313865 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMFileCreateResponse.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMFileCreateResponse.java
@@ -19,6 +19,7 @@
 package org.apache.hadoop.ozone.om.response.file;
 
 import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
 
 import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
 import org.apache.hadoop.ozone.om.response.key.OMKeyCreateResponse;
@@ -33,7 +34,7 @@
 public class OMFileCreateResponse extends OMKeyCreateResponse {
 
   public OMFileCreateResponse(@Nullable OmKeyInfo omKeyInfo,
-      long openKeySessionID, OMResponse omResponse) {
+      long openKeySessionID, @Nonnull OMResponse omResponse) {
     super(omKeyInfo, openKeySessionID, omResponse);
   }
 
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMAllocateBlockResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMAllocateBlockResponse.java
index b92c55a4ee..c35fa6c89d 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMAllocateBlockResponse.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMAllocateBlockResponse.java
@@ -27,6 +27,8 @@
 import org.apache.hadoop.hdds.utils.db.BatchOperation;
 
 import java.io.IOException;
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
 
 /**
  * Response for AllocateBlock request.
@@ -36,8 +38,8 @@ public class OMAllocateBlockResponse extends OMClientResponse {
   private final OmKeyInfo omKeyInfo;
   private final long clientID;
 
-  public OMAllocateBlockResponse(OmKeyInfo omKeyInfo,
-      long clientID, OMResponse omResponse) {
+  public OMAllocateBlockResponse(@Nullable OmKeyInfo omKeyInfo,
+      long clientID, @Nonnull OMResponse omResponse) {
     super(omResponse);
     this.omKeyInfo = omKeyInfo;
     this.clientID = clientID;
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCommitResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCommitResponse.java
index 1c4ff3122d..0592bae487 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCommitResponse.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCommitResponse.java
@@ -25,6 +25,8 @@
 import org.apache.hadoop.hdds.utils.db.BatchOperation;
 
 import java.io.IOException;
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
 
 /**
  * Response for CommitKey request.
@@ -34,8 +36,8 @@ public class OMKeyCommitResponse extends OMClientResponse {
   private OmKeyInfo omKeyInfo;
   private long openKeySessionID;
 
-  public OMKeyCommitResponse(OmKeyInfo omKeyInfo, long openKeySessionID,
-      OzoneManagerProtocolProtos.OMResponse omResponse) {
+  public OMKeyCommitResponse(@Nullable OmKeyInfo omKeyInfo, long openKeySessionID,
+      @Nonnull OzoneManagerProtocolProtos.OMResponse omResponse) {
     super(omResponse);
     this.omKeyInfo = omKeyInfo;
     this.openKeySessionID = openKeySessionID;
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCreateResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCreateResponse.java
index 2ff40d4d67..fde646cdbf 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCreateResponse.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCreateResponse.java
@@ -20,6 +20,7 @@
 
 import java.io.IOException;
 import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
 
 import org.apache.hadoop.ozone.om.OMMetadataManager;
 import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
@@ -38,7 +39,7 @@ public class OMKeyCreateResponse extends OMClientResponse {
   private long openKeySessionID;
 
   public OMKeyCreateResponse(@Nullable OmKeyInfo omKeyInfo,
-      long openKeySessionID, OMResponse omResponse) {
+      long openKeySessionID, @Nonnull OMResponse omResponse) {
     super(omResponse);
     this.omKeyInfo = omKeyInfo;
     this.openKeySessionID = openKeySessionID;
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponse.java
index 9a0c936797..b9b5f79754 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponse.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponse.java
@@ -29,6 +29,8 @@
 import org.apache.hadoop.hdds.utils.db.BatchOperation;
 
 import java.io.IOException;
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
 
 /**
  * Response for DeleteKey request.
@@ -36,7 +38,8 @@
 public class OMKeyDeleteResponse extends OMClientResponse {
   private OmKeyInfo omKeyInfo;
 
-  public OMKeyDeleteResponse(OmKeyInfo omKeyInfo, OMResponse omResponse) {
+
+  public OMKeyDeleteResponse(@Nullable OmKeyInfo omKeyInfo, @Nonnull OMResponse omResponse) {
     super(omResponse);
     this.omKeyInfo = omKeyInfo;
   }
@@ -83,7 +86,7 @@ public void addToDBBatch(OMMetadataManager omMetadataManager,
    * @param keyInfo
    * @return if empty true, else false.
    */
-  private boolean isKeyEmpty(OmKeyInfo keyInfo) {
+  private boolean isKeyEmpty(@Nullable OmKeyInfo keyInfo) {
     for (OmKeyLocationInfoGroup keyLocationList : keyInfo
         .getKeyLocationVersions()) {
       if (keyLocationList.getLocationList().size() != 0) {
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyPurgeResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyPurgeResponse.java
index 16d6cfb996..d71068ad52 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyPurgeResponse.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyPurgeResponse.java
@@ -27,6 +27,7 @@
 
 import java.io.IOException;
 import java.util.List;
+import javax.annotation.Nonnull;
 
 /**
  * Response for {@link OMKeyPurgeRequest} request.
@@ -35,7 +36,7 @@ public class OMKeyPurgeResponse extends OMClientResponse {
 
   private List<String> purgeKeyList;
 
-  public OMKeyPurgeResponse(List<String> keyList, OMResponse omResponse) {
+  public OMKeyPurgeResponse(List<String> keyList, @Nonnull OMResponse omResponse) {
     super(omResponse);
     this.purgeKeyList = keyList;
   }
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyRenameResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyRenameResponse.java
index 1e7831b431..3800cdd294 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyRenameResponse.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyRenameResponse.java
@@ -27,6 +27,8 @@
 import org.apache.hadoop.hdds.utils.db.BatchOperation;
 
 import java.io.IOException;
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
 
 /**
  * Response for RenameKey request.
@@ -37,8 +39,8 @@ public class OMKeyRenameResponse extends OMClientResponse {
   private final String toKeyName;
   private final String fromKeyName;
 
-  public OMKeyRenameResponse(OmKeyInfo renameKeyInfo, String toKeyName,
-      String fromKeyName, OMResponse omResponse) {
+  public OMKeyRenameResponse(@Nullable OmKeyInfo renameKeyInfo, String toKeyName,
+      String fromKeyName, @Nonnull OMResponse omResponse) {
     super(omResponse);
     this.renameKeyInfo = renameKeyInfo;
     this.toKeyName = toKeyName;
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponse.java
index cd454c5ffd..cabbfd2163 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponse.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponse.java
@@ -33,6 +33,8 @@
 import java.io.IOException;
 import java.util.Map;
 import java.util.TreeMap;
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
 
 /**
  * Response for Multipart Abort Request.
@@ -43,7 +45,7 @@ public class S3MultipartUploadAbortResponse extends OMClientResponse {
   private OmMultipartKeyInfo omMultipartKeyInfo;
 
   public S3MultipartUploadAbortResponse(String multipartKey,
-      OmMultipartKeyInfo omMultipartKeyInfo, OMResponse omResponse) {
+      @Nullable OmMultipartKeyInfo omMultipartKeyInfo, @Nonnull OMResponse omResponse) {
     super(omResponse);
     this.multipartKey = multipartKey;
     this.omMultipartKeyInfo = omMultipartKeyInfo;
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponse.java
index 08c443e593..dca1005ffd 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponse.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponse.java
@@ -34,6 +34,9 @@
 import static org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
     .Status.OK;
 
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
 /**
  * Response for S3MultipartUploadCommitPart request.
  */
@@ -47,10 +50,10 @@ public class S3MultipartUploadCommitPartResponse extends OMClientResponse {
 
 
   public S3MultipartUploadCommitPartResponse(String multipartKey,
-      String openKey, OmKeyInfo deletePartKeyInfo,
-      OmMultipartKeyInfo omMultipartKeyInfo,
-      OzoneManagerProtocolProtos.PartKeyInfo oldPartKeyInfo,
-      OMResponse omResponse) {
+      String openKey, @Nullable OmKeyInfo deletePartKeyInfo,
+      @Nullable OmMultipartKeyInfo omMultipartKeyInfo,
+      @Nullable OzoneManagerProtocolProtos.PartKeyInfo oldPartKeyInfo,
+      @Nonnull OMResponse omResponse) {
     super(omResponse);
     this.multipartKey = multipartKey;
     this.openKey = openKey;
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponse.java
index 0c340532a7..b0cc8b56bd 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponse.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponse.java
@@ -29,6 +29,7 @@
 import org.apache.hadoop.hdds.utils.db.BatchOperation;
 
 import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
 
 /**
  * Response for Multipart Upload Complete request.
@@ -39,7 +40,7 @@ public class S3MultipartUploadCompleteResponse extends OMClientResponse {
 
 
   public S3MultipartUploadCompleteResponse(@Nullable String multipartKey,
-      @Nullable OmKeyInfo omKeyInfo, OMResponse omResponse) {
+      @Nullable OmKeyInfo omKeyInfo, @Nonnull OMResponse omResponse) {
     super(omResponse);
     this.multipartKey = multipartKey;
     this.omKeyInfo = omKeyInfo;
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeAclOpResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeAclOpResponse.java
index 81f763ad0c..2b797d9b7a 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeAclOpResponse.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeAclOpResponse.java
@@ -25,6 +25,7 @@
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse;
 import org.apache.hadoop.hdds.utils.db.BatchOperation;
 
+import javax.annotation.Nonnull;
 import java.io.IOException;
 
 /**
@@ -35,7 +36,7 @@ public class OMVolumeAclOpResponse extends OMClientResponse {
   private OmVolumeArgs omVolumeArgs;
 
   public OMVolumeAclOpResponse(OmVolumeArgs omVolumeArgs,
-      OMResponse omResponse) {
+      @Nonnull OMResponse omResponse) {
     super(omResponse);
     this.omVolumeArgs = omVolumeArgs;
   }
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeCreateResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeCreateResponse.java
index 0c0492fa19..db2ded4874 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeCreateResponse.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeCreateResponse.java
@@ -32,6 +32,8 @@
 
 import org.apache.hadoop.hdds.utils.db.BatchOperation;
 
+import javax.annotation.Nonnull;
+
 /**
  * Response for CreateBucket request.
  */
@@ -41,7 +43,7 @@ public class OMVolumeCreateResponse extends OMClientResponse {
   private OmVolumeArgs omVolumeArgs;
 
   public OMVolumeCreateResponse(OmVolumeArgs omVolumeArgs,
-      VolumeList volumeList, OMResponse omResponse) {
+      VolumeList volumeList, @Nonnull OMResponse omResponse) {
     super(omResponse);
     this.omVolumeArgs = omVolumeArgs;
     this.volumeList = volumeList;
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeDeleteResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeDeleteResponse.java
index c04b700b4e..873747ed7c 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeDeleteResponse.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeDeleteResponse.java
@@ -29,6 +29,8 @@
     .VolumeList;
 import org.apache.hadoop.hdds.utils.db.BatchOperation;
 
+import javax.annotation.Nonnull;
+
 /**
  * Response for CreateVolume request.
  */
@@ -38,7 +40,7 @@ public class OMVolumeDeleteResponse extends OMClientResponse {
   private VolumeList updatedVolumeList;
 
   public OMVolumeDeleteResponse(String volume, String owner,
-      VolumeList updatedVolumeList, OMResponse omResponse) {
+      VolumeList updatedVolumeList, @Nonnull OMResponse omResponse) {
     super(omResponse);
     this.volume = volume;
     this.owner = owner;
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeSetOwnerResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeSetOwnerResponse.java
index 44410b7727..ddf1512d94 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeSetOwnerResponse.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeSetOwnerResponse.java
@@ -31,6 +31,8 @@
     .OMResponse;
 import org.apache.hadoop.hdds.utils.db.BatchOperation;
 
+import javax.annotation.Nonnull;
+
 /**
  * Response for set owner request.
  */
@@ -43,7 +45,7 @@ public class OMVolumeSetOwnerResponse extends OMClientResponse {
 
   public OMVolumeSetOwnerResponse(String oldOwner,
       VolumeList oldOwnerVolumeList, VolumeList newOwnerVolumeList,
-      OmVolumeArgs newOwnerVolumeArgs, OMResponse omResponse) {
+      OmVolumeArgs newOwnerVolumeArgs, @Nonnull OMResponse omResponse) {
     super(omResponse);
     this.oldOwner = oldOwner;
     this.oldOwnerVolumeList = oldOwnerVolumeList;
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeSetQuotaResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeSetQuotaResponse.java
index 4adc641ac0..13e05fa6dd 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeSetQuotaResponse.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeSetQuotaResponse.java
@@ -28,6 +28,8 @@
 
 import java.io.IOException;
 
+import javax.annotation.Nonnull;
+
 /**
  * Response for set quota request.
  */
@@ -35,7 +37,7 @@ public class OMVolumeSetQuotaResponse extends OMClientResponse {
   private OmVolumeArgs omVolumeArgs;
 
   public OMVolumeSetQuotaResponse(OmVolumeArgs omVolumeArgs,
-      OMResponse omResponse) {
+      @Nonnull OMResponse omResponse) {
     super(omResponse);
     this.omVolumeArgs = omVolumeArgs;
   }