commit 8fc529157e6ab5b172ae7f3060c54c2a2401a46e
author Dave Borowitz <dborowitz@google.com> Thu Oct 13 16:14:35 2016 -0400
committer Dave Borowitz <dborowitz@google.com> Thu Oct 13 16:51:28 2016 -0400
tree e79371c7e3a35e6c1d43640d39466c16939bba67
parent 21782e8443dedf7e3e9fccacb1b5632f05020f64

GetServerInfo: Use java.util.Optional

Change-Id: I4949abfe8f8ffb2c47b9e49b6062d870749a6183

gerrit-server/src/main/java/com/google/gerrit/server/config/GetServerInfo.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GetServerInfo.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/GetServerInfo.java
index 447d1be..54fc3fa 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/config/GetServerInfo.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/GetServerInfo.java
@@ -17,7 +17,6 @@
 import static java.util.stream.Collectors.toList;
 
 import com.google.common.base.CharMatcher;
-import com.google.common.base.Optional;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.gerrit.common.data.ContributorAgreement;
@@ -62,6 +61,7 @@
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
 public class GetServerInfo implements RestReadView<ConfigResource> {
@@ -215,11 +215,11 @@
                 .hasField(ChangeField.ASSIGNEE));
     info.largeChange = cfg.getInt("change", "largeChange", 500);
     info.replyTooltip =
-        Optional.fromNullable(cfg.getString("change", null, "replyTooltip"))
-            .or("Reply and score") + " (Shortcut: a)";
+        Optional.ofNullable(cfg.getString("change", null, "replyTooltip"))
+            .orElse("Reply and score") + " (Shortcut: a)";
     info.replyLabel =
-        Optional.fromNullable(cfg.getString("change", null, "replyLabel"))
-            .or("Reply") + "\u2026";
+        Optional.ofNullable(cfg.getString("change", null, "replyLabel"))
+            .orElse("Reply") + "\u2026";
     info.updateDelay = (int) ConfigUtil.getTimeUnit(
         cfg, "change", null, "updateDelay", 30, TimeUnit.SECONDS);
     info.submitWholeTopic = Submit.wholeTopicEnabled(cfg);