Merge "Return case-preserving email when suggesting reviewers" into stable-2.11

2 files changed, 6 insertions, 2 deletions

diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java
index 7fee9f4fd1..34d6f26e9b 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java
@@ -62,7 +62,7 @@ public class SuggestReviewersIT extends AbstractDaemonTest {
         "users1");
     user2 = accounts.create("user2", "user2@example.com", "First2 Last2",
         "users2");
-    user3 = accounts.create("user3", "user3@example.com", "First3 Last3",
+    user3 = accounts.create("user3", "USER3@example.com", "First3 Last3",
         "users1", "users2");
   }
 
@@ -207,6 +207,10 @@ public class SuggestReviewersIT extends AbstractDaemonTest {
 
     reviewers = suggestReviewers(changeId, "user1 example", 2);
     assertThat(reviewers).hasSize(1);
+
+    reviewers = suggestReviewers(changeId, "user3@example.com", 2);
+    assertThat(reviewers).hasSize(1);
+    assertThat(reviewers.get(0).account.email).isEqualTo("USER3@example.com");
   }
 
   @Test
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerSuggestionCache.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerSuggestionCache.java
index c4c918644e..1a2551cb87 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerSuggestionCache.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerSuggestionCache.java
@@ -172,9 +172,9 @@ public class ReviewerSuggestionCache {
       doc.add(new TextField(NAME, a.getFullName(), Store.YES));
     }
     if (a.getPreferredEmail() != null) {
+      doc.add(new TextField(EMAIL, a.getPreferredEmail(), Store.YES));
       doc.add(new StringField(EMAIL, a.getPreferredEmail().toLowerCase(),
           Store.YES));
-      doc.add(new TextField(EMAIL, a.getPreferredEmail(), Store.YES));
     }
     AccountExternalIdAccess extIdAccess = db.get().accountExternalIds();
     String username = AccountState.getUserName(