commit ce680605714687e4cf745289ddc41859a5ab8199
author Edwin Kempin <ekempin@google.com> Fri Dec 13 11:22:02 2019 +0100
committer Edwin Kempin <ekempin@google.com> Fri Dec 13 11:22:02 2019 +0100
tree 477aeddad9473f690175e0d86fb83f8f8acf0242
parent bfad49f9cb9afa7ae9cf0d31ba498d7acfbb6302

RegisterNewEmailSender: Make all methods private which are only within the class

Inline getUserNameEmail method as it is only used once and doesn’t
contain enough logic to justify a separate method.

Change-Id: I6a1b6770743459f80076b900a8e990e316ac06d0
Signed-off-by: Edwin Kempin <ekempin@google.com>

java/com/google/gerrit/server/mail/send/RegisterNewEmailSender.java

diff --git a/java/com/google/gerrit/server/mail/send/RegisterNewEmailSender.java b/java/com/google/gerrit/server/mail/send/RegisterNewEmailSender.java
index 91d8e81..0006ed6 100644
--- a/java/com/google/gerrit/server/mail/send/RegisterNewEmailSender.java
+++ b/java/com/google/gerrit/server/mail/send/RegisterNewEmailSender.java
@@ -58,17 +58,6 @@
     appendText(textTemplate("RegisterNewEmail"));
   }
 
-  public String getUserNameEmail() {
-    return getUserNameEmailFor(user.getAccountId());
-  }
-
-  public String getEmailRegistrationToken() {
-    if (emailToken == null) {
-      emailToken = requireNonNull(tokenVerifier.encode(user.getAccountId(), addr), "token");
-    }
-    return emailToken;
-  }
-
   public boolean isAllowed() {
     return args.emailSender.canEmail(addr);
   }
@@ -77,6 +66,13 @@
   protected void setupSoyContext() {
     super.setupSoyContext();
     soyContextEmailData.put("emailRegistrationToken", getEmailRegistrationToken());
-    soyContextEmailData.put("userNameEmail", getUserNameEmail());
+    soyContextEmailData.put("userNameEmail", getUserNameEmailFor(user.getAccountId()));
+  }
+
+  private String getEmailRegistrationToken() {
+    if (emailToken == null) {
+      emailToken = requireNonNull(tokenVerifier.encode(user.getAccountId(), addr), "token");
+    }
+    return emailToken;
   }
 }