From ce680605714687e4cf745289ddc41859a5ab8199 Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Fri, 13 Dec 2019 11:22:02 +0100 Subject: [PATCH] RegisterNewEmailSender: Make all methods private which are only within the class MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- .../mail/send/RegisterNewEmailSender.java | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/java/com/google/gerrit/server/mail/send/RegisterNewEmailSender.java b/java/com/google/gerrit/server/mail/send/RegisterNewEmailSender.java index 91d8e817af..0006ed6020 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 @@ public class RegisterNewEmailSender extends OutgoingEmail { 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 @@ public class RegisterNewEmailSender extends OutgoingEmail { 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; } }