Merge "Fix tsetse error"

java/com/google/gerrit/httpd/raw/IndexPreloadingUtil.java

diff --git a/java/com/google/gerrit/httpd/raw/IndexPreloadingUtil.java b/java/com/google/gerrit/httpd/raw/IndexPreloadingUtil.java
index aa378a0..383d982 100644
--- a/java/com/google/gerrit/httpd/raw/IndexPreloadingUtil.java
+++ b/java/com/google/gerrit/httpd/raw/IndexPreloadingUtil.java
@@ -14,6 +14,9 @@
 
 package com.google.gerrit.httpd.raw;
 
+import static com.google.common.collect.ImmutableList.toImmutableList;
+
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.primitives.Ints;
 import com.google.gerrit.common.Nullable;
@@ -25,14 +28,13 @@
 import com.google.gerrit.extensions.restapi.RestApiException;
 import com.google.gerrit.extensions.restapi.Url;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /** Helper for generating preloading parts of {@code index.html}. */
 @UsedAt(Project.GOOGLE)
@@ -76,17 +78,16 @@
   public static final String SELF_YOUR_TURN = YOUR_TURN.replaceAll("\\$\\{user}", "self");
   public static final String SELF_DASHBOARD_ASSIGNED_QUERY =
       DASHBOARD_ASSIGNED_QUERY.replaceAll("\\$\\{user}", "self");
-  public static final List<String> SELF_DASHBOARD_QUERIES =
-      Arrays.asList(
+  public static final ImmutableList<String> SELF_DASHBOARD_QUERIES =
+      Stream.of(
               DASHBOARD_WORK_IN_PROGRESS_QUERY,
               DASHBOARD_OUTGOING_QUERY,
               DASHBOARD_INCOMING_QUERY,
               CC_QUERY,
               DASHBOARD_RECENTLY_CLOSED_QUERY,
               NEW_USER)
-          .stream()
           .map(query -> query.replaceAll("\\$\\{user}", "self"))
-          .collect(Collectors.toList());
+          .collect(toImmutableList());
 
   public static String getDefaultChangeDetailOptionsAsHex() {
     Set<ListChangesOption> options =

javatests/com/google/gerrit/httpd/raw/IndexPreloadingUtilTest.java

diff --git a/javatests/com/google/gerrit/httpd/raw/IndexPreloadingUtilTest.java b/javatests/com/google/gerrit/httpd/raw/IndexPreloadingUtilTest.java
index 2866c38..b6c8d74 100644
--- a/javatests/com/google/gerrit/httpd/raw/IndexPreloadingUtilTest.java
+++ b/javatests/com/google/gerrit/httpd/raw/IndexPreloadingUtilTest.java
@@ -15,33 +15,36 @@
 package com.google.gerrit.httpd.raw;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth8.assertThat;
 import static com.google.gerrit.httpd.raw.IndexPreloadingUtil.computeChangeRequestsPath;
 
 import com.google.gerrit.httpd.raw.IndexPreloadingUtil.RequestedPage;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
+@RunWith(JUnit4.class)
 public class IndexPreloadingUtilTest {
 
   @Test
   public void computeChangePath() throws Exception {
-    assertThat(computeChangeRequestsPath("/c/project/+/123", RequestedPage.CHANGE).get())
-        .isEqualTo("changes/project~123");
+    assertThat(computeChangeRequestsPath("/c/project/+/123", RequestedPage.CHANGE))
+        .hasValue("changes/project~123");
 
-    assertThat(computeChangeRequestsPath("/c/project/+/124/2", RequestedPage.CHANGE).get())
-        .isEqualTo("changes/project~124");
+    assertThat(computeChangeRequestsPath("/c/project/+/124/2", RequestedPage.CHANGE))
+        .hasValue("changes/project~124");
 
-    assertThat(computeChangeRequestsPath("/c/project/src/+/23", RequestedPage.CHANGE).get())
-        .isEqualTo("changes/project%2Fsrc~23");
+    assertThat(computeChangeRequestsPath("/c/project/src/+/23", RequestedPage.CHANGE))
+        .hasValue("changes/project%2Fsrc~23");
 
     assertThat(computeChangeRequestsPath("/q/project/src/+/23", RequestedPage.CHANGE).isPresent())
-        .isEqualTo(false);
+        .isFalse();
 
     assertThat(
             computeChangeRequestsPath("/c/Scripts/+/232/1//COMMIT_MSG", RequestedPage.CHANGE)
                 .isPresent())
-        .isEqualTo(false);
-    assertThat(
-            computeChangeRequestsPath("/c/Scripts/+/232/1//COMMIT_MSG", RequestedPage.DIFF).get())
-        .isEqualTo("changes/Scripts~232");
+        .isFalse();
+    assertThat(computeChangeRequestsPath("/c/Scripts/+/232/1//COMMIT_MSG", RequestedPage.DIFF))
+        .hasValue("changes/Scripts~232");
   }
 }