Merge "RegisterNewEmailSender: Make all methods private which are only within the class"
diff --git a/java/com/google/gerrit/server/mail/send/RegisterNewEmailSender.java b/java/com/google/gerrit/server/mail/send/RegisterNewEmailSender.java
index 1983ade..e1daec6 100644
--- a/java/com/google/gerrit/server/mail/send/RegisterNewEmailSender.java
+++ b/java/com/google/gerrit/server/mail/send/RegisterNewEmailSender.java
@@ -62,17 +62,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);
}
@@ -81,6 +70,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;
}
}
