Repository: hadoop Updated Branches: refs/heads/trunk 075dd45a2 -> f66ad1fab
HADOOP-14957. ReconfigurationTaskStatus is exposing guava Optional in its public api. Contributed by Haibo Chen, Xiao Chen. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f66ad1fa Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f66ad1fa Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f66ad1fa Branch: refs/heads/trunk Commit: f66ad1fab958a28ef40c684366c23695237a8e60 Parents: 075dd45 Author: Xiao Chen <[email protected]> Authored: Wed Oct 25 14:10:33 2017 -0700 Committer: Xiao Chen <[email protected]> Committed: Wed Oct 25 14:11:30 2017 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/conf/ReconfigurableBase.java | 4 ++-- .../java/org/apache/hadoop/conf/ReconfigurationTaskStatus.java | 6 +++--- .../test/java/org/apache/hadoop/conf/TestReconfiguration.java | 2 +- .../hadoop/hdfs/protocolPB/ReconfigurationProtocolUtils.java | 4 ++-- .../protocolPB/ReconfigurationProtocolServerSideUtils.java | 3 +-- .../src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java | 2 +- 6 files changed, 10 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f66ad1fa/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurableBase.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurableBase.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurableBase.java index 146c6d8..a705279 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurableBase.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurableBase.java @@ -19,7 +19,6 @@ package org.apache.hadoop.conf; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import org.apache.hadoop.util.Time; @@ -31,6 +30,7 @@ import java.io.IOException; import java.util.Collection; import java.util.Collections; import java.util.Map; +import java.util.Optional; /** * Utility base class for implementing the Reconfigurable interface. @@ -148,7 +148,7 @@ public abstract class ReconfigurableBase } catch (ReconfigurationException e) { errorMessage = e.getCause().getMessage(); } - results.put(change, Optional.fromNullable(errorMessage)); + results.put(change, Optional.ofNullable(errorMessage)); } synchronized (parent.reconfigLock) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/f66ad1fa/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurationTaskStatus.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurationTaskStatus.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurationTaskStatus.java index a3a11cd..05ec907 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurationTaskStatus.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurationTaskStatus.java @@ -18,15 +18,15 @@ package org.apache.hadoop.conf; -import com.google.common.base.Optional; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.ReconfigurationUtil.PropertyChange; import java.util.Map; +import java.util.Optional; [email protected] [email protected] [email protected]({"HDFS", "Management Tools"}) [email protected] public class ReconfigurationTaskStatus { long startTime; long endTime; http://git-wip-us.apache.org/repos/asf/hadoop/blob/f66ad1fa/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestReconfiguration.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestReconfiguration.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestReconfiguration.java index 610c08a..b4dcd54 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestReconfiguration.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestReconfiguration.java @@ -18,7 +18,6 @@ package org.apache.hadoop.conf; -import com.google.common.base.Optional; import com.google.common.base.Supplier; import com.google.common.collect.Lists; import org.apache.hadoop.test.GenericTestUtils; @@ -44,6 +43,7 @@ import java.util.Collection; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeoutException; http://git-wip-us.apache.org/repos/asf/hadoop/blob/f66ad1fa/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocolPB/ReconfigurationProtocolUtils.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocolPB/ReconfigurationProtocolUtils.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocolPB/ReconfigurationProtocolUtils.java index 71195c8..a48c401 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocolPB/ReconfigurationProtocolUtils.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocolPB/ReconfigurationProtocolUtils.java @@ -19,13 +19,13 @@ package org.apache.hadoop.hdfs.protocolPB; import java.util.Map; +import java.util.Optional; import org.apache.hadoop.conf.ReconfigurationTaskStatus; import org.apache.hadoop.conf.ReconfigurationUtil.PropertyChange; import org.apache.hadoop.hdfs.protocol.proto.ReconfigurationProtocolProtos.GetReconfigurationStatusConfigChangeProto; import org.apache.hadoop.hdfs.protocol.proto.ReconfigurationProtocolProtos.GetReconfigurationStatusResponseProto; -import com.google.common.base.Optional; import com.google.common.collect.Maps; /** @@ -56,7 +56,7 @@ public final class ReconfigurationProtocolUtils { if (change.hasErrorMessage()) { errorMessage = change.getErrorMessage(); } - statusMap.put(pc, Optional.fromNullable(errorMessage)); + statusMap.put(pc, Optional.ofNullable(errorMessage)); } } return new ReconfigurationTaskStatus(startTime, endTime, statusMap); http://git-wip-us.apache.org/repos/asf/hadoop/blob/f66ad1fa/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/ReconfigurationProtocolServerSideUtils.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/ReconfigurationProtocolServerSideUtils.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/ReconfigurationProtocolServerSideUtils.java index 9e24204..646e51c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/ReconfigurationProtocolServerSideUtils.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/ReconfigurationProtocolServerSideUtils.java @@ -19,6 +19,7 @@ package org.apache.hadoop.hdfs.protocolPB; import java.util.List; import java.util.Map; +import java.util.Optional; import org.apache.hadoop.conf.ReconfigurationTaskStatus; import org.apache.hadoop.conf.ReconfigurationUtil.PropertyChange; @@ -26,8 +27,6 @@ import org.apache.hadoop.hdfs.protocol.proto.ReconfigurationProtocolProtos.GetRe import org.apache.hadoop.hdfs.protocol.proto.ReconfigurationProtocolProtos.GetReconfigurationStatusResponseProto; import org.apache.hadoop.hdfs.protocol.proto.ReconfigurationProtocolProtos.ListReconfigurablePropertiesResponseProto; -import com.google.common.base.Optional; - /** * This is a server side utility class that handles * common logic to to parameter reconfiguration. http://git-wip-us.apache.org/repos/asf/hadoop/blob/f66ad1fa/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java index 6b4edd5..f4985a6 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java @@ -33,11 +33,11 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.TreeSet; import java.util.concurrent.TimeUnit; import com.google.common.base.Joiner; -import com.google.common.base.Optional; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
