commit 8ddce240cca79d5b11fba8359ce07e75a27c6cab
author Sven Selberg <svense@axis.com> Mon Jun 08 14:10:03 2020 +0200
committer Sven Selberg <svense@axis.com> Mon Jun 08 14:11:45 2020 +0200
tree a4789fe70c3c7fe2a30a2dd80ff2db99a7e45a6e
parent d4adc451f17793d83a432dceea41e49fad929bce
parent e47ac0b866ed1f21685d25ae01e3c11d71e64b6a

Merge branch 'stable-3.0'

* origin/stable-3.0:
  Fix compilation error: use accessor for preferredEmail

Change-Id: I885f9d1b80acc3f824c847bde85108be6ead9e0d

src/main/java/com/googlesource/gerrit/plugins/avatars/external/ExternalUrlAvatarProvider.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/avatars/external/ExternalUrlAvatarProvider.java b/src/main/java/com/googlesource/gerrit/plugins/avatars/external/ExternalUrlAvatarProvider.java
index 10138a7..dc38718 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/avatars/external/ExternalUrlAvatarProvider.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/avatars/external/ExternalUrlAvatarProvider.java
@@ -131,6 +131,6 @@
   private String fillOutTemplate(String template, IdentifiedUser user) {
     String workString = replaceInUrl("${user}", template, user.getUserName().orElse(null));
     workString = replaceInUrl("${id}", workString, Integer.toString(user.getAccountId().get()));
-    return replaceInUrl("${email}", workString, user.getAccount().getPreferredEmail());
+    return replaceInUrl("${email}", workString, user.getAccount().preferredEmail());
   }
 }