diff options
author | Shawn Pearce <sop@google.com> | 2010-07-23 11:15:15 -0700 |
---|---|---|
committer | Android Code Review <code-review@android.com> | 2010-07-23 11:15:15 -0700 |
commit | 27f432a38d60731f9aa571f188abaa968474e62e (patch) | |
tree | b82388d8279b4a1ede110484de0610e179271c1a | |
parent | e6784e9701b1aa13132f62b1b9f97961e75c951f (diff) | |
parent | dc8df3553dbdc23e1e7625bd99b596b4a9acc94b (diff) |
Merge "Refactor complex logic out of formatters into getters."
3 files changed, 44 insertions, 26 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/NewChangeSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/NewChangeSender.java index 5b2566d2a3..dc8c2c2b33 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/NewChangeSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/NewChangeSender.java @@ -112,24 +112,31 @@ public abstract class NewChangeSender extends ChangeEmail { } private String getPullUrl() { - final List<HostKey> hostKeys = sshInfo.getHostKeys(); - if (hostKeys.isEmpty()) { + final String host = getSshHost(); + if (host == null) { return ""; } - final String host = hostKeys.get(0).getHost(); final StringBuilder r = new StringBuilder(); r.append("git pull ssh://"); - if (host.startsWith("*:")) { - r.append(getGerritHost()); - r.append(host.substring(1)); - } else { - r.append(host); - } + r.append(host); r.append("/"); r.append(projectName); r.append(" "); r.append(patchSet.getRefName()); return r.toString(); } + + public String getSshHost() { + final List<HostKey> hostKeys = sshInfo.getHostKeys(); + if (hostKeys.isEmpty()) { + return null; + } + + final String host = hostKeys.get(0).getHost(); + if (host.startsWith("*:")) { + return getGerritHost() + host.substring(1); + } + return host; + } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java index 0007efe88d..9b201fd4b5 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java @@ -56,14 +56,7 @@ public class RegisterNewEmailSender extends OutgoingEmail { final StringBuilder url = new StringBuilder(); url.append(getGerritUrl()); url.append("#VE,"); - try { - url.append(authConfig.getEmailRegistrationToken().newToken( - Base64.encodeBytes(addr.getBytes("UTF-8")))); - } catch (XsrfException e) { - throw new IllegalArgumentException(e); - } catch (UnsupportedEncodingException e) { - throw new IllegalArgumentException(e); - } + url.append(getEmailRegistrationToken()); appendText("Welcome to Gerrit Code Review at "); appendText(getGerritHost()); @@ -93,4 +86,15 @@ public class RegisterNewEmailSender extends OutgoingEmail { + " Replies to this message will not\n"); appendText("be read or answered.\n"); } + + public String getEmailRegistrationToken() { + try { + return authConfig.getEmailRegistrationToken().newToken( + Base64.encodeBytes(addr.getBytes("UTF-8"))); + } catch (XsrfException e) { + throw new IllegalArgumentException(e); + } catch (UnsupportedEncodingException e) { + throw new IllegalArgumentException(e); + } + } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/ReplacePatchSetSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/ReplacePatchSetSender.java index 5ac39fa535..841aa355e0 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/ReplacePatchSetSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/ReplacePatchSetSender.java @@ -125,24 +125,31 @@ public class ReplacePatchSetSender extends ReplyToChangeSender { } private String getPullUrl() { - final List<HostKey> hostKeys = sshInfo.getHostKeys(); - if (hostKeys.isEmpty()) { + final String host = getSshHost(); + if (host == null) { return ""; } - final String host = hostKeys.get(0).getHost(); final StringBuilder r = new StringBuilder(); r.append("git pull ssh://"); - if (host.startsWith("*:")) { - r.append(getGerritHost()); - r.append(host.substring(1)); - } else { - r.append(host); - } + r.append(host); r.append("/"); r.append(projectName); r.append(" "); r.append(patchSet.getRefName()); return r.toString(); } + + public String getSshHost() { + final List<HostKey> hostKeys = sshInfo.getHostKeys(); + if (hostKeys.isEmpty()) { + return null; + } + + final String host = hostKeys.get(0).getHost(); + if (host.startsWith("*:")) { + return getGerritHost() + host.substring(1); + } + return host; + } } |