You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by el...@apache.org on 2019/09/25 10:19:30 UTC
[hadoop] branch trunk updated: HDDS-1738. Add nullable annotation
for OMResponse classes
This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new e6fb6ee HDDS-1738. Add nullable annotation for OMResponse classes
e6fb6ee is described below
commit e6fb6ee94d8a295384b2367bc1e2967cd1ba888c
Author: Yi Sheng <li...@gmail.com>
AuthorDate: Wed Sep 25 12:14:07 2019 +0200
HDDS-1738. Add nullable annotation for OMResponse classes
Closes #1499
---
.../ozone/om/response/bucket/OMBucketCreateResponse.java | 8 ++++++--
.../ozone/om/response/bucket/OMBucketDeleteResponse.java | 5 ++++-
.../ozone/om/response/bucket/OMBucketSetPropertyResponse.java | 7 +++++--
.../ozone/om/response/file/OMDirectoryCreateResponse.java | 3 ++-
.../hadoop/ozone/om/response/file/OMFileCreateResponse.java | 3 ++-
.../hadoop/ozone/om/response/key/OMAllocateBlockResponse.java | 6 ++++--
.../hadoop/ozone/om/response/key/OMKeyCommitResponse.java | 6 ++++--
.../hadoop/ozone/om/response/key/OMKeyCreateResponse.java | 3 ++-
.../hadoop/ozone/om/response/key/OMKeyDeleteResponse.java | 7 +++++--
.../hadoop/ozone/om/response/key/OMKeyPurgeResponse.java | 3 ++-
.../hadoop/ozone/om/response/key/OMKeyRenameResponse.java | 6 ++++--
.../response/s3/multipart/S3MultipartUploadAbortResponse.java | 4 +++-
.../s3/multipart/S3MultipartUploadCommitPartResponse.java | 11 +++++++----
.../s3/multipart/S3MultipartUploadCompleteResponse.java | 3 ++-
.../ozone/om/response/volume/OMVolumeAclOpResponse.java | 3 ++-
.../ozone/om/response/volume/OMVolumeCreateResponse.java | 4 +++-
.../ozone/om/response/volume/OMVolumeDeleteResponse.java | 4 +++-
.../ozone/om/response/volume/OMVolumeSetOwnerResponse.java | 4 +++-
.../ozone/om/response/volume/OMVolumeSetQuotaResponse.java | 4 +++-
19 files changed, 66 insertions(+), 28 deletions(-)
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 9b24910..3f800d3 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 @@ import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
.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 final class OMBucketCreateResponse extends OMClientResponse {
}
}
+ @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 5dd6cdf..0079851 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.om.response.OMClientResponse;
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 d5e88c6..f9ce204 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 @@ import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
.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 474fda3..2690dda 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.Logger;
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 0354b84..8da7313 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 @@ import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
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 b92c55a..c35fa6c 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.ozone.protocol.proto.OzoneManagerProtocolProtos
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 1c4ff31..0592bae 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.ozone.protocol.proto.OzoneManagerProtocolProtos;
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 2ff40d4..fde646c 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 @@ package org.apache.hadoop.ozone.om.response.key;
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 9a0c936..b9b5f79 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.ozone.protocol.proto.OzoneManagerProtocolProtos
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 @@ import java.io.IOException;
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 class OMKeyDeleteResponse extends OMClientResponse {
* @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 16d6cfb..d71068a 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 org.apache.hadoop.hdds.utils.db.BatchOperation;
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 1e7831b..3800cdd 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.ozone.protocol.proto.OzoneManagerProtocolProtos
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 cd454c5..cabbfd2 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 org.apache.hadoop.hdds.utils.db.BatchOperation;
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 08c443e..dca1005 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
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 0c34053..b0cc8b5 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.ozone.protocol.proto.OzoneManagerProtocolProtos
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 81f763a..2b797d9 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.om.response.OMClientResponse;
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 0c0492f..db2ded4 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.ozone.protocol.proto.OzoneManagerProtocolProtos
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 c04b700..873747e 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 @@ import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
.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 44410b7..ddf1512 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 @@ import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
.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 4adc641..13e05fa 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 org.apache.hadoop.hdds.utils.db.BatchOperation;
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;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org