OutgoingEmail: Use UrlFormatter to get settings URL
The settings URL is hard coded based on the site URL, rather than
using the one provided by UrlFormatter.
Extend the UrlFormatter interface to support both the base settings
URL, and URLs for specific settings sections.
Change-Id: Ia4cf6566c3c786fa3822fe3bfd59aa9639717ed3
diff --git a/java/com/google/gerrit/server/config/UrlFormatter.java b/java/com/google/gerrit/server/config/UrlFormatter.java
index 3e94c30..740daf0 100644
--- a/java/com/google/gerrit/server/config/UrlFormatter.java
+++ b/java/com/google/gerrit/server/config/UrlFormatter.java
@@ -61,9 +61,18 @@
}
/** Returns a URL pointing to a section of the settings page. */
+ default Optional<String> getSettingsUrl() {
+ return getWebUrl().map(url -> url + "settings");
+ }
+
+ /**
+ * Returns a URL pointing to a section of the settings page, or the settings page if {@code
+ * section} is null.
+ */
default Optional<String> getSettingsUrl(@Nullable String section) {
- return getWebUrl()
- .map(url -> url + "settings" + (Strings.isNullOrEmpty(section) ? "" : "#" + section));
+ return Strings.isNullOrEmpty(section)
+ ? getSettingsUrl()
+ : getSettingsUrl().map(url -> url + "#" + section);
}
/** Returns a URL pointing to a documentation page, at a given named anchor. */
diff --git a/java/com/google/gerrit/server/mail/send/OutgoingEmail.java b/java/com/google/gerrit/server/mail/send/OutgoingEmail.java
index b0f1e75..7ad5329 100644
--- a/java/com/google/gerrit/server/mail/send/OutgoingEmail.java
+++ b/java/com/google/gerrit/server/mail/send/OutgoingEmail.java
@@ -289,13 +289,7 @@
}
public String getSettingsUrl() {
- if (getGerritUrl() != null) {
- final StringBuilder r = new StringBuilder();
- r.append(getGerritUrl());
- r.append("settings");
- return r.toString();
- }
- return null;
+ return args.urlFormatter.get().getSettingsUrl().orElse(null);
}
private String getGerritUrl() {
