hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject [hadoop] branch trunk updated: HDDS-1296. Fix checkstyle issue from Nightly run. Contributed by Xiaoyu Yao. (#616)
Date Mon, 18 Mar 2019 15:39:04 GMT
This is an automated email from the ASF dual-hosted git repository.

ajay 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 66a104b  HDDS-1296. Fix checkstyle issue from Nightly run. Contributed by Xiaoyu
Yao. (#616)
66a104b is described below

commit 66a104bc57242b2817e8c1f67cb6776e70cf5c47
Author: Xiaoyu Yao <xyao@apache.org>
AuthorDate: Mon Mar 18 08:38:55 2019 -0700

    HDDS-1296. Fix checkstyle issue from Nightly run. Contributed by Xiaoyu Yao. (#616)
---
 .../java/org/apache/hadoop/ozone/om/helpers/OmKeyLocationInfo.java  | 1 +
 .../src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java    | 6 ++----
 .../src/main/java/org/apache/hadoop/ozone/om/ScmClient.java         | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyLocationInfo.java
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyLocationInfo.java
index bbd1157..5011d3b 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyLocationInfo.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyLocationInfo.java
@@ -123,6 +123,7 @@ public final class OmKeyLocationInfo {
       return this;
     }
 
+    @SuppressWarnings("checkstyle:hiddenfield")
     public Builder setPipeline(Pipeline pipeline) {
       this.pipeline = pipeline;
       return this;
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
index 38d0922..187509f 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
@@ -96,8 +96,6 @@ import static org.apache.hadoop.util.Time.monotonicNow;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.ws.rs.HEAD;
-
 /**
  * Implementation of keyManager.
  */
@@ -163,8 +161,8 @@ public class KeyManagerImpl implements KeyManager {
           OZONE_BLOCK_DELETING_SERVICE_TIMEOUT,
           OZONE_BLOCK_DELETING_SERVICE_TIMEOUT_DEFAULT,
           TimeUnit.MILLISECONDS);
-      keyDeletingService = new KeyDeletingService(scmClient.getBlockClient(), this,
-          blockDeleteInterval, serviceTimeout, configuration);
+      keyDeletingService = new KeyDeletingService(scmClient.getBlockClient(),
+          this, blockDeleteInterval, serviceTimeout, configuration);
       keyDeletingService.start();
     }
   }
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ScmClient.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ScmClient.java
index 73a0cf9..2a732c7 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ScmClient.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ScmClient.java
@@ -35,7 +35,7 @@ public class ScmClient {
   }
 
   ScmBlockLocationProtocol getBlockClient() {
-     return this.blockClient;
+    return this.blockClient;
   }
 
   StorageContainerLocationProtocol getContainerClient() {


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message