opendev/gerrit
Code Issues Proposed changes

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

Browse Source 
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>
This commit is contained in:
Edwin Kempin
2019-12-13 11:22:02 +01:00
parent bfad49f9cb
commit ce68060571
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
java/com/google/gerrit/server/mail/send/RegisterNewEmailSender.java
View File

@@ -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;
}
}